diff --git a/A320-main.xml b/A320-main.xml index b645ef0f..2a602a6a 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -322,7 +322,7 @@ 3300.320 - + 0 @@ -344,7 +344,7 @@ -0.9 1.6 - -4.0 + -2.8 0.01 0.30 diff --git a/Engines/cfm56_5a1.xml b/Engines/cfm56_5a1.xml index 1d269ac8..0d275c85 100644 --- a/Engines/cfm56_5a1.xml +++ b/Engines/cfm56_5a1.xml @@ -2,8 +2,8 @@ 27000 - 7.2 - 0.412 + 8.1 + 0.5 0.03 22.4 60.9 diff --git a/Engines/cfm56_5b3.xml b/Engines/cfm56_5b3.xml index a30d5cbe..7fd73b02 100644 --- a/Engines/cfm56_5b3.xml +++ b/Engines/cfm56_5b3.xml @@ -2,8 +2,8 @@ 27000 - 7.2 - 0.412 + 8.1 + 0.5 0.03 22.4 60.9 diff --git a/Engines/cfm56_5b4.xml b/Engines/cfm56_5b4.xml index 315abf3a..6d9cd7e0 100644 --- a/Engines/cfm56_5b4.xml +++ b/Engines/cfm56_5b4.xml @@ -2,8 +2,8 @@ 27000 - 7.2 - 0.412 + 8.1 + 0.5 0.03 22.4 60.9 diff --git a/Engines/cfm56_5b6.xml b/Engines/cfm56_5b6.xml index 01510828..21d7fbaa 100644 --- a/Engines/cfm56_5b6.xml +++ b/Engines/cfm56_5b6.xml @@ -2,8 +2,8 @@ 27000 - 7.2 - 0.412 + 8.1 + 0.5 0.03 22.4 60.9 diff --git a/Engines/leap1a26.xml b/Engines/leap1a26.xml index 3a11f61e..27b38804 100644 --- a/Engines/leap1a26.xml +++ b/Engines/leap1a26.xml @@ -2,8 +2,8 @@ 27000 - 7.2 - 0.412 + 8.1 + 0.5 0.03 22.4 60.9 diff --git a/Engines/leap1a32.xml b/Engines/leap1a32.xml index fdfb0764..a19244f0 100644 --- a/Engines/leap1a32.xml +++ b/Engines/leap1a32.xml @@ -2,8 +2,8 @@ 27000 - 7.2 - 0.412 + 8.1 + 0.5 0.03 22.4 60.9 diff --git a/Engines/v2522_a5.xml b/Engines/v2522_a5.xml index c1c38516..c663509b 100644 --- a/Engines/v2522_a5.xml +++ b/Engines/v2522_a5.xml @@ -2,8 +2,8 @@ 26600 - 7.1 - 0.412 + 10.1 + 0.5 0.03 22.4 60.9 diff --git a/Engines/v2527_a5.xml b/Engines/v2527_a5.xml index cfdcc9ad..a88fa781 100644 --- a/Engines/v2527_a5.xml +++ b/Engines/v2527_a5.xml @@ -2,8 +2,8 @@ 26600 - 7.1 - 0.412 + 10.1 + 0.5 0.03 22.4 60.9 diff --git a/Engines/v2533_a5.xml b/Engines/v2533_a5.xml index c1c38516..c663509b 100644 --- a/Engines/v2533_a5.xml +++ b/Engines/v2533_a5.xml @@ -2,8 +2,8 @@ 26600 - 7.1 - 0.412 + 10.1 + 0.5 0.03 22.4 60.9 diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml index f79b6019..e02f6b77 100644 --- a/Models/Instruments/PFD/PFD1.xml +++ b/Models/Instruments/PFD/PFD1.xml @@ -195,6 +195,38 @@ /gear/gear[1]/wow /gear/gear[2]/wow + + /it-autoflight/custom/trk-fpa + 0 + + + orientation/roll-deg + 45 + + + orientation/roll-deg + -45 + + + + + + + select + fpd + fpv + + + + /it-autoflight/output/fd1 + 1 + + /gear/gear[1]/wow + /gear/gear[2]/wow + + /it-autoflight/custom/trk-fpa + 1 + orientation/roll-deg 45 @@ -328,11 +360,87 @@ 0 + + + translate + fpv + /instrumentation/pfd/track-diff + 0.00260 + + 0 + 1 + 0 + + + + + translate + fpv + /orientation/pitch-deg + 0.001955078 + + 0 + 0 + -1 + + + + + translate + fpd + /instrumentation/pfd/track-diff + 0.00260 + + 0 + 1 + 0 + + + + + translate + fpd + /orientation/pitch-deg + 0.001955078 + + 0 + 0 + -1 + + + + + translate + fpd + /it-autoflight/fd/pitch-bar + 0.001955078 + + 0 + 0 + 1 + + + + + rotate + fpd + /it-autoflight/fd/roll-bar +
+ 0.0 + -0.005 + -0.0005 +
+ + -1 + 0 + 0 + + textranslate spd-tape - instrumentation/airspeed-indicator/indicated-speed-kt + /instrumentation/airspeed-indicator/indicated-speed-kt 0 0 200.040 diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml index 57a42e68..8d56eabf 100644 --- a/Models/Instruments/PFD/PFD2.xml +++ b/Models/Instruments/PFD/PFD2.xml @@ -195,6 +195,38 @@ /gear/gear[1]/wow /gear/gear[2]/wow + + /it-autoflight/custom/trk-fpa + 0 + + + orientation/roll-deg + 45 + + + orientation/roll-deg + -45 + + + + + + + select + fpd + fpv + + + + /it-autoflight/output/fd2 + 1 + + /gear/gear[1]/wow + /gear/gear[2]/wow + + /it-autoflight/custom/trk-fpa + 1 + orientation/roll-deg 45 @@ -328,11 +360,87 @@ 0 + + + translate + fpv + /instrumentation/pfd/track-diff + 0.00260 + + 0 + 1 + 0 + + + + + translate + fpv + /orientation/pitch-deg + 0.001955078 + + 0 + 0 + -1 + + + + + translate + fpd + /instrumentation/pfd/track-diff + 0.00260 + + 0 + 1 + 0 + + + + + translate + fpd + /orientation/pitch-deg + 0.001955078 + + 0 + 0 + -1 + + + + + translate + fpd + /it-autoflight/fd/pitch-bar + 0.001955078 + + 0 + 0 + 1 + + + + + rotate + fpd + /it-autoflight/fd/roll-bar +
+ 0.0 + -0.005 + -0.0005 +
+ + -1 + 0 + 0 + + textranslate spd-tape - instrumentation/airspeed-indicator/indicated-speed-kt + /instrumentation/airspeed-indicator/indicated-speed-kt 0 0 200.040 diff --git a/Models/Instruments/PFD/res/box.ac b/Models/Instruments/PFD/res/box.ac deleted file mode 100644 index f0df8e9a..00000000 --- a/Models/Instruments/PFD/res/box.ac +++ /dev/null @@ -1,58 +0,0 @@ -AC3Db -MATERIAL "white" rgb 1 1 1 amb 1 1 1 emis 0.798 0.798 0.798 spec 0 0 0 shi 0 trans 0 -OBJECT world -kids 1 -OBJECT poly -name "Box-speed" -loc 0.002941 0.0876799 0.042908 -data 6 -Circle -texture "box.png" -crease 30.000000 -numvert 16 -0 -0.00312543 -0.0156029 -0 -0.00377741 -0.0156029 -0 -0.00377742 0.0155739 -0 -0.00312544 0.0155739 -0 0.00374188 -0.0155771 -0 0.0030899 -0.0155771 -0 0.00308989 0.0155997 -0 0.00374188 0.0155997 -0 0.00379864 0.0162948 -0 0.00379864 0.0156428 -0 -0.00384059 0.0156428 -0 -0.00384059 0.0162948 -0 0.0038406 -0.0156428 -0 0.0038406 -0.0162948 -0 -0.00379863 -0.0162948 -0 -0.00379863 -0.0156428 -numsurf 4 -SURF 0x0 -mat 0 -refs 4 -3 0.654297 0.439453 -2 0.679687 0.439453 -1 0.679687 0.464844 -0 0.654297 0.464844 -SURF 0x0 -mat 0 -refs 4 -7 0.654297 0.439453 -6 0.679687 0.439453 -5 0.679687 0.464844 -4 0.654297 0.464844 -SURF 0x0 -mat 0 -refs 4 -11 0.654297 0.439453 -10 0.679687 0.439453 -9 0.679687 0.464844 -8 0.654297 0.464844 -SURF 0x0 -mat 0 -refs 4 -15 0.654297 0.439453 -14 0.679687 0.439453 -13 0.679687 0.464844 -12 0.654297 0.464844 -kids 0 diff --git a/Models/Instruments/PFD/res/pfd-3d.ac b/Models/Instruments/PFD/res/pfd-3d.ac index 1104c871..8c026325 100644 --- a/Models/Instruments/PFD/res/pfd-3d.ac +++ b/Models/Instruments/PFD/res/pfd-3d.ac @@ -3,7 +3,45 @@ MATERIAL "ac3dmat1" rgb 1 1 1 amb 0 0 0 emis 0.658824 0.670588 0.67451 spec 0 MATERIAL "white" rgb 1 1 1 amb 1 1 1 emis 0.798 0.798 0.798 spec 0 0 0 shi 0 trans 0 MATERIAL "ac3dmat0" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 0 trans 0 OBJECT world -kids 46 +kids 48 +OBJECT poly +name "fpd" +loc 0.00031928 0.00206621 -0.013179 +texture "fpd.png" +crease 45.000000 +numvert 4 +0 0.000714729 0.0410065 +0 -0.00397787 0.0410065 +0 -0.00397787 -0.00440941 +0 0.000714729 -0.00440941 +numsurf 1 +SURF 0x30 +mat 0 +refs 4 +3 1 1 +2 0 1 +1 0 0 +0 1 0 +kids 0 +OBJECT poly +name "fpv" +loc 0.000590373 8.6652e-005 0.00320951 +texture "fpv.png" +crease 45.000000 +numvert 4 +0 0.00651645 0.00810495 +0 -0.00384307 0.00810495 +0 -0.00384307 -0.00440941 +0 0.00651645 -0.00440941 +numsurf 1 +SURF 0x30 +mat 0 +refs 4 +3 1 1 +2 0 1 +1 0 0 +0 1 0 +kids 0 OBJECT poly name "land-mode-box" loc 0.000386977 0.0698612 0.00523137 diff --git a/Models/Instruments/PFD/res/rudder-bar.png b/Models/Instruments/PFD/res/rudder-bar.png index 4b73ad2d..3b2936ea 100644 Binary files a/Models/Instruments/PFD/res/rudder-bar.png and b/Models/Instruments/PFD/res/rudder-bar.png differ diff --git a/Models/Liveries/A319/CFM/UAL.png b/Models/Liveries/A319/CFM/UAL.png new file mode 100644 index 00000000..f7964686 Binary files /dev/null and b/Models/Liveries/A319/CFM/UAL.png differ diff --git a/Models/Liveries/A319/CFM/UAL.xml b/Models/Liveries/A319/CFM/UAL.xml new file mode 100644 index 00000000..4c74da3f --- /dev/null +++ b/Models/Liveries/A319/CFM/UAL.xml @@ -0,0 +1,16 @@ + + + + + + + United Airlines (Post Continental merger livery) + Liveries/A319/CFM/UAL.png + + + + + 1 + + 0 + diff --git a/Models/Liveries/A319/IAE/UAL3.png b/Models/Liveries/A319/IAE/UAL3.png new file mode 100644 index 00000000..41f8499a Binary files /dev/null and b/Models/Liveries/A319/IAE/UAL3.png differ diff --git a/Models/Liveries/A319/IAE/UAL3.xml b/Models/Liveries/A319/IAE/UAL3.xml new file mode 100644 index 00000000..7fed28ba --- /dev/null +++ b/Models/Liveries/A319/IAE/UAL3.xml @@ -0,0 +1,16 @@ + + + + + + + United Airlines (Post Continental merger livery) + Liveries/A319/IAE/UAL3.png + + + + + 1 + + 0 + diff --git a/Models/Liveries/A320/IAE/N475UA.png b/Models/Liveries/A320/IAE/N475UA.png new file mode 100644 index 00000000..f9f56f2c Binary files /dev/null and b/Models/Liveries/A320/IAE/N475UA.png differ diff --git a/Models/Liveries/A320/IAE/N475UA.xml b/Models/Liveries/A320/IAE/N475UA.xml new file mode 100644 index 00000000..37c789cc --- /dev/null +++ b/Models/Liveries/A320/IAE/N475UA.xml @@ -0,0 +1,16 @@ + + + + + United Airlines (Retro livery) + Liveries/A320/IAE/N475UA.png + + + + + + 1 + + + 0 + diff --git a/Models/Liveries/A320/IAE/UAL.xml b/Models/Liveries/A320/IAE/UAL.xml index 0c1c2c4a..d7dae3f9 100644 --- a/Models/Liveries/A320/IAE/UAL.xml +++ b/Models/Liveries/A320/IAE/UAL.xml @@ -2,7 +2,7 @@ - United Airlines + United Airlines (Blue Tulip livery) Liveries/A320/IAE/UAL.png diff --git a/Models/Liveries/A320/IAE/UAL2.xml b/Models/Liveries/A320/IAE/UAL2.xml index 0211a1b3..5a7ad548 100644 --- a/Models/Liveries/A320/IAE/UAL2.xml +++ b/Models/Liveries/A320/IAE/UAL2.xml @@ -4,7 +4,7 @@ - United Airlines (Battleship) + United Airlines (Battleship livery) Liveries/A320/IAE/UAL2.png diff --git a/Models/Liveries/A320/IAE/UAL3.png b/Models/Liveries/A320/IAE/UAL3.png new file mode 100644 index 00000000..01fbce2c Binary files /dev/null and b/Models/Liveries/A320/IAE/UAL3.png differ diff --git a/Models/Liveries/A320/IAE/UAL3.xml b/Models/Liveries/A320/IAE/UAL3.xml new file mode 100644 index 00000000..bfa3b1c5 --- /dev/null +++ b/Models/Liveries/A320/IAE/UAL3.xml @@ -0,0 +1,18 @@ + + + + + + + United Airlines (Post Continental merger livery) + Liveries/A320/IAE/UAL3.png + + + + + + 0 + + + 0 + diff --git a/Nasal/PFD_FMA.nas b/Nasal/PFD_FMA.nas index 17be541c..f2c95831 100644 --- a/Nasal/PFD_FMA.nas +++ b/Nasal/PFD_FMA.nas @@ -52,14 +52,32 @@ setlistener("/it-autoflight/output/thr-mode", func { speedmach(); }); +var hdgmde = func { + var lat = getprop("/it-autoflight/mode/lat"); + var newlat = getprop("/modes/pfd/fma/roll-mode"); + var trk = getprop("/it-autoflight/custom/trk-fpa"); + if (lat == "HDG" and trk == 0) { + if (newlat != "HDG") { + setprop("/modes/pfd/fma/roll-mode", "HDG"); + } + } else if (lat == "HDG" and trk == 1) { + if (newlat != "TRACK") { + setprop("/modes/pfd/fma/roll-mode", "TRACK"); + } + } +} + +# HDG/TRK +setlistener("/it-autoflight/custom/trk-fpa", func { + hdgmde(); +}); + # Master Lateral setlistener("/it-autoflight/mode/lat", func { var lat = getprop("/it-autoflight/mode/lat"); var newlat = getprop("/modes/pfd/fma/roll-mode"); if (lat == "HDG") { - if (newlat != "HDG") { - setprop("/modes/pfd/fma/roll-mode", "HDG"); - } + hdgmde(); } else if (lat == "LNAV") { if (newlat != "NAV") { setprop("/modes/pfd/fma/roll-mode", "NAV"); diff --git a/Systems/custom-autothrust.xml b/Systems/custom-autothrust.xml index 30d9e968..df0b3325 100644 --- a/Systems/custom-autothrust.xml +++ b/Systems/custom-autothrust.xml @@ -158,7 +158,7 @@ /controls/engines/engine[0]/throttle-cmd-pid - 0.1 + 0.05 1.0 0.1 0.0 @@ -222,7 +222,7 @@ /controls/engines/engine[0]/throttle-cmd-pid - 0.1 + 0.05 1.0 0.1 0.0 @@ -277,7 +277,7 @@ /controls/engines/engine[0]/throttle-cmd-pid - 0.01 + 0.008 1.0 0.1 0.0 @@ -332,7 +332,7 @@ /controls/engines/engine[0]/throttle-cmd-pid - 0.01 + 0.008 1.0 0.1 0.0 @@ -405,7 +405,7 @@ /controls/engines/engine[1]/throttle-cmd-pid - 0.1 + 0.05 1.0 0.1 0.0 @@ -469,7 +469,7 @@ /controls/engines/engine[1]/throttle-cmd-pid - 0.1 + 0.05 1.0 0.1 0.0 @@ -524,7 +524,7 @@ /controls/engines/engine[1]/throttle-cmd-pid - 0.01 + 0.008 1.0 0.1 0.0 @@ -579,7 +579,7 @@ /controls/engines/engine[1]/throttle-cmd-pid - 0.01 + 0.008 1.0 0.1 0.0 diff --git a/Systems/fcs.xml b/Systems/fcs.xml index 77a21537..1d4af61f 100644 --- a/Systems/fcs.xml +++ b/Systems/fcs.xml @@ -42,7 +42,7 @@ fcs/roll-trim-sum - 0.02 + 0.022 -15 15 @@ -52,7 +52,7 @@ -fcs/roll-trim-sum - 0.02 + 0.022 -15 15 diff --git a/Systems/fmgc-b.xml b/Systems/fmgc-b.xml index 811dc415..e6b4de17 100644 --- a/Systems/fmgc-b.xml +++ b/Systems/fmgc-b.xml @@ -540,6 +540,19 @@ + + + IT-CONTROLLER: TARGET ROLL CMD + false + true + output + + /it-autoflight/internal/target-roll-deg + + /it-autoflight/internal/target-roll-fd + noise-spike + 15 + FD: ROLL @@ -561,7 +574,7 @@ - /it-autoflight/internal/target-roll + /it-autoflight/internal/target-roll-fd /orientation/roll-deg diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml index 50545188..bf4a7048 100644 --- a/Systems/fmgc-roll-yaw.xml +++ b/Systems/fmgc-roll-yaw.xml @@ -72,7 +72,7 @@ - + VORLOC TRK false @@ -131,20 +131,16 @@ /it-autoflight/config/cmd/vorloc - 1.0 - 0.1 - 0.0 - 10.0 - 0.00001 - + 0.0001 + /it-autoflight/internal/bank-limit -1 - - + + /it-autoflight/internal/bank-limit - + - + ROLL DEG SYNC diff --git a/Systems/pfd.xml b/Systems/pfd.xml index 5b429c98..39dddb00 100644 --- a/Systems/pfd.xml +++ b/Systems/pfd.xml @@ -98,7 +98,7 @@ 1.0 - instrumentation/efis/mfd/true-north + /it-autoflight/custom/trk-fpa /orientation/track-deg