From 9f45cf29f24ef568b38b1c8dab8689245c4bb0dc Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Tue, 24 Oct 2017 18:57:27 -0400 Subject: [PATCH] A32X: Add new SRS engagement logic, SRS requires V2 speed --- Models/Instruments/PFD/PFD1.xml | 4294 +++++++++++++++--------------- Models/Instruments/PFD/PFD2.xml | 4296 ++++++++++++++++--------------- Nasal/FMGC-b.nas | 68 +- Nasal/PFD_FMA.nas | 59 +- revision.txt | 2 +- 5 files changed, 4417 insertions(+), 4302 deletions(-) diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml index f249747b..1729597f 100644 --- a/Models/Instruments/PFD/PFD1.xml +++ b/Models/Instruments/PFD/PFD1.xml @@ -19,29 +19,29 @@ - - translate - sidestick-pos - controls/flight/elevator-input-fast - 0.0259 - - 0 - 0 - -1 - - - - - translate - sidestick-pos - controls/flight/aileron-input-fast - 0.0275 - - 0 - 1 - 0 - - + + translate + sidestick-pos + controls/flight/elevator-input-fast + 0.0259 + + 0 + 0 + -1 + + + + + translate + sidestick-pos + controls/flight/aileron-input-fast + 0.0275 + + 0 + 1 + 0 + + select @@ -108,102 +108,102 @@ - spdtrnd-up - instrumentation/pfd/speed-trend-up - textranslate - - 0 - -1 - - + spdtrnd-up + instrumentation/pfd/speed-trend-up + textranslate + + 0 + -1 + + 0.240 00.5 - - - - spdtrnd-down - instrumentation/pfd/speed-trend-down - textranslate - - 0 - -1 - - + + + + spdtrnd-down + instrumentation/pfd/speed-trend-down + textranslate + + 0 + -1 + + -0.240 00.5 - - + + - texmultiple - horizon - - orientation/pitch-deg - textranslate - 0.003955078 - - 0 - 1 - - - - orientation/roll-deg - texrotate -
- 0.50 - 0.50 -
- - 0 - 0 - -1 - - - + texmultiple + horizon + + orientation/pitch-deg + textranslate + 0.003955078 + + 0 + 1 + + + + orientation/roll-deg + texrotate +
+ 0.50 + 0.50 +
+ + 0 + 0 + -1 + + + - texmultiple - horizonhdg - - instrumentation/pfd/horizon-pitch - textranslate - 0.003955078 - - 0 - 1 - - - + texmultiple + horizonhdg + + instrumentation/pfd/horizon-pitch + textranslate + 0.003955078 + + 0 + 1 + + + instrumentation/pfd/heading-deg - textranslate + textranslate 0.0000001 0.00356999976056338 - - 1 - 0 - - - - orientation/roll-deg - texrotate -
- 0.50 - 0.50 -
- - 0 - 0 - -1 - - - + + 1 + 0 + + + + orientation/roll-deg + texrotate +
+ 0.50 + 0.50 +
+ + 0 + 0 + -1 + + + - texrotate + texrotate sky - orientation/roll-deg + orientation/roll-deg
0.50 0.50 @@ -216,103 +216,68 @@ - texmultiple + texmultiple ground - - instrumentation/pfd/horizon-ground - textranslate - 0.003955078 - - 0 - 1 - - - - orientation/roll-deg - texrotate -
- 0.50 - 0.50 -
- - 0 - 0 - -1 - - - - - - rotate - bank - slipskid + + instrumentation/pfd/horizon-ground + textranslate + 0.003955078 + + 0 + 1 + + + + orientation/roll-deg + texrotate +
+ 0.50 + 0.50 +
+ + 0 + 0 + -1 + + + + + + rotate + bank + slipskid radio-alt radio-alt-land - orientation/roll-deg + orientation/roll-deg 1.05 -
- 0 - -0.0051 - 0.00091 -
- - 1 - 0 - 0 - - +
+ 0 + -0.0051 + 0.00091 +
+ + 1 + 0 + 0 + + - - translate - slipskid - instrumentation/slip-skid-ball/indicated-slip-skid - -0.002 - - 0 - 1 - 0 - - + + translate + slipskid + instrumentation/slip-skid-ball/indicated-slip-skid + -0.002 + + 0 + 1 + 0 + + - - select - fd_roll - - - - it-autoflight/output/fd1 - 1 - - gear/gear[1]/wow - gear/gear[2]/wow - - it-autoflight/custom/trk-fpa - 0 - - - orientation/pitch-deg - 25 - - - orientation/pitch-deg - -13 - - - orientation/roll-deg - 45 - - - orientation/roll-deg - -45 - - - - - - - select - fd_pitch - + + select + fd_roll + it-autoflight/output/fd1 @@ -322,11 +287,15 @@ gear/gear[1]/wow gear/gear[2]/wow + + modes/pfd/fma/roll-mode + + - - modes/pfd/fma/pitch-mode - SRS - + + modes/pfd/fma/roll-mode + + it-autoflight/custom/trk-fpa @@ -349,13 +318,60 @@ -45 - - + + - - select + + select + fd_pitch + + + + it-autoflight/output/fd1 + 1 + + + + gear/gear[1]/wow + gear/gear[2]/wow + + modes/pfd/fma/pitch-mode + + + + + modes/pfd/fma/pitch-mode + + + + + it-autoflight/custom/trk-fpa + 0 + + + orientation/pitch-deg + 25 + + + orientation/pitch-deg + -13 + + + orientation/roll-deg + 45 + + + orientation/roll-deg + -45 + + + + + + + select fpv - + gear/gear[1]/wow gear/gear[2]/wow @@ -364,13 +380,13 @@ 1 - - + + - - select + + select fpd - + it-autoflight/output/fd1 @@ -398,14 +414,22 @@ orientation/roll-deg -45 + + modes/pfd/fma/roll-mode + + + + modes/pfd/fma/pitch-mode + + - - + + - - select + + select pitch-mode-box - + @@ -442,13 +466,13 @@ - - + + - - select + + select roll-mode-box - + @@ -485,21 +509,21 @@ - - + + - - select + + select pitch-mode-box pitch-mode-armed-box roll-mode-box roll-mode-armed-box - pitch-mode-fma - roll-mode-fma - pitch-mode-armed-fma - pitch-mode-armed2-fma - roll-mode-armed-fma - + pitch-mode-fma + roll-mode-fma + pitch-mode-armed-fma + pitch-mode-armed2-fma + roll-mode-armed-fma + @@ -532,15 +556,15 @@ ROLL OUT - - + + - - select + + select land-mode-box land-mode-fma landmask - + @@ -575,121 +599,121 @@ - - + + - - select - rudder_bar - + + select + rudder_bar + unused/unused - - + + - - translate - fd_pitch - it-autoflight/fd/pitch-bar - 0.0006 - - 0 - 0 - 1 - - + + translate + fd_pitch + it-autoflight/fd/pitch-bar + 0.0006 + + 0 + 0 + 1 + + - - translate - fd_roll - it-autoflight/fd/roll-bar - 0.0002 - - 0 - 1 - 0 - - + + translate + fd_roll + it-autoflight/fd/roll-bar + 0.0002 + + 0 + 1 + 0 + + - - translate - fpv - instrumentation/pfd/track-diff - 0.00260 - - 0 - 1 - 0 - - + + translate + fpv + instrumentation/pfd/track-diff + 0.00260 + + 0 + 1 + 0 + + - - translate - fpv - orientation/pitch-deg - 0.001955078 - - 0 - 0 - -1 - - + + 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 + 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 + + 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 - - +
+ + -1 + 0 + 0 + + - - textranslate - spd-tape - instrumentation/airspeed-indicator/indicated-speed-kt + + textranslate + spd-tape + instrumentation/airspeed-indicator/indicated-speed-kt 0 0 200.040 @@ -713,65 +737,65 @@ 3800.751 4000.791 - - 1 - - + + 1 + + - - texmultiple - vls-tape - - modes/pfd/stallvls - textranslate - 0.002001953 - - 0 - -1 - 0 - - - - textranslate - instrumentation/airspeed-indicator/indicated-speed-kt - 0.002001953 - - 0 - 1 - 0 - - - - - - texmultiple - stall-tape - - modes/pfd/stallvls - textranslate - 0.002001953 - - 0 - -1 - 0 - - - - textranslate - instrumentation/airspeed-indicator/indicated-speed-kt - 0.002001953 - - 0 - 1 - 0 - - - + + texmultiple + vls-tape + + modes/pfd/stallvls + textranslate + 0.002001953 + + 0 + -1 + 0 + + + + textranslate + instrumentation/airspeed-indicator/indicated-speed-kt + 0.002001953 + + 0 + 1 + 0 + + + + + + texmultiple + stall-tape + + modes/pfd/stallvls + textranslate + 0.002001953 + + 0 + -1 + 0 + + + + textranslate + instrumentation/airspeed-indicator/indicated-speed-kt + 0.002001953 + + 0 + 1 + 0 + + + - - - - + + + + select stall-tape vls-tape @@ -838,82 +862,82 @@ - - - select - vfe-tape - - - controls/flight/flap-lever - 0 - - - + + + select + vfe-tape + + + controls/flight/flap-lever + 0 + + + - textranslate - alt-tape-1 - instrumentation/altimeter/indicated-altitude-ft - 0.000019141 - - 1 - - + textranslate + alt-tape-1 + instrumentation/altimeter/indicated-altitude-ft + 0.000019141 + + 1 + + - texmultiple - radar-alt + texmultiple + radar-alt - textranslate - instrumentation/altimeter/indicated-altitude-ft - 0.000019141 - - 1 - - - - textranslate - instrumentation/pfd/ground-level-diff - 0.000019141 - - 1 - - - - - - texmultiple - landing-elev - - textranslate - instrumentation/altimeter/indicated-altitude-ft - 0.000019141 - - 1 - - - - textranslate - autopilot/route-manager/destination/field-elevation-ft - 0.000019141 - - 1 - - - - - - - textranslate - alt-tape-2 - instrumentation/altimeter/indicated-altitude-ft - 0.009999725 - - 1 - - + textranslate + instrumentation/altimeter/indicated-altitude-ft + 0.000019141 + + 1 + + + + textranslate + instrumentation/pfd/ground-level-diff + 0.000019141 + + 1 + + + + + + texmultiple + landing-elev + + textranslate + instrumentation/altimeter/indicated-altitude-ft + 0.000019141 + + 1 + + + + textranslate + autopilot/route-manager/destination/field-elevation-ft + 0.000019141 + + 1 + + + + + + + textranslate + alt-tape-2 + instrumentation/altimeter/indicated-altitude-ft + 0.009999725 + + 1 + + osgtext-green @@ -964,37 +988,37 @@ 32 - - - radio-alt-land - - 0.0010 - -0.006 - -0.0362 - - center-center - yz-plane - number-value - %4.0f - position/gear-agl-ft - false - helvetica_bold.txf - true - false - false - 0.007 - - 32 - 32 - - - - - - - texrotate - vsi - it-autoflight/internal/vert-speed-fpm-filtered + + + radio-alt-land + + 0.0010 + -0.006 + -0.0362 + + center-center + yz-plane + number-value + %4.0f + position/gear-agl-ft + false + helvetica_bold.txf + true + false + false + 0.007 + + 32 + 32 + + + + + + + texrotate + vsi + it-autoflight/internal/vert-speed-fpm-filtered -3300 58 -3000 57 @@ -1008,191 +1032,191 @@ 3000-57 3300-58 -
- 0.76 - 0.463 -
- - 0 - 0 - -1 - - - - - - - textranslate - hdg-tape - instrumentation/pfd/heading-deg - 0.002783031 - - 1 - - - - - texmultiple - hdg-bug - - textranslate - it-autoflight/input/hdg - 0.002783031 - - -1 - - - - textranslate - instrumentation/pfd/heading-deg - 0.002783031 - - 1 - - - - - - select - hdg-bug - - - it-autoflight/output/lat - 0 - - - - - - texmultiple - trk-ind - - textranslate - instrumentation/pfd/track-deg - 0.002783031 - - -1 - - - - textranslate - instrumentation/pfd/heading-deg - 0.002783031 - - 1 - - - - - - select - trk-ind - - - velocities/groundspeed-kt - 80 - - - - - - texmultiple - loc-crs - - textranslate - instrumentation/nav/radials/selected-deg - 0.002832031 - - -1 - - - - textranslate - orientation/heading-magnetic-deg - 0.002832031 - - 1 - - - - - - select - loc-crs - - modes/pfd/ILS1 - - +
+ 0.76 + 0.463 +
+ + 0 + 0 + -1 + + - - - - select - gsscale - + + + + textranslate + hdg-tape + instrumentation/pfd/heading-deg + 0.002783031 + + 1 + + + + + texmultiple + hdg-bug + + textranslate + it-autoflight/input/hdg + 0.002783031 + + -1 + + + + textranslate + instrumentation/pfd/heading-deg + 0.002783031 + + 1 + + + + + + select + hdg-bug + + + it-autoflight/output/lat + 0 + + + + + + texmultiple + trk-ind + + textranslate + instrumentation/pfd/track-deg + 0.002783031 + + -1 + + + + textranslate + instrumentation/pfd/heading-deg + 0.002783031 + + 1 + + + + + + select + trk-ind + + + velocities/groundspeed-kt + 80 + + + + + + texmultiple + loc-crs + + textranslate + instrumentation/nav/radials/selected-deg + 0.002832031 + + -1 + + + + textranslate + orientation/heading-magnetic-deg + 0.002832031 + + 1 + + + + + + select + loc-crs + modes/pfd/ILS1 - - + + + + - - select - gspointer - - - instrumentation/nav/gs-in-range - instrumentation/nav/has-gs + + select + gsscale + + modes/pfd/ILS1 + + + + + select + gspointer + + + instrumentation/nav/gs-in-range + instrumentation/nav/has-gs modes/pfd/ILS1 - - - + + + - - translate - gspointer - instrumentation/nav/gs-needle-deflection-norm - 0.0322 - - 0 - 0 - 1 - - + + translate + gspointer + instrumentation/nav/gs-needle-deflection-norm + 0.0322 + + 0 + 0 + 1 + + - - select - locscale - + + select + locscale + modes/pfd/ILS1 - - + + - - select - locpointer - - - instrumentation/nav/in-range - instrumentation/nav/nav-loc + + select + locpointer + + + instrumentation/nav/in-range + instrumentation/nav/nav-loc modes/pfd/ILS1 - - - + + + - - translate - locpointer - instrumentation/nav/heading-needle-deflection-norm - -0.0322 - - 0 - -1 - 0 - - + + translate + locpointer + instrumentation/nav/heading-needle-deflection-norm + -0.0322 + + 0 + -1 + 0 + + - + mach-value 0.0010 @@ -1205,7 +1229,7 @@ %0.3f velocities/mach false - helvetica_bold.txf + helvetica_bold.txf true false false @@ -1216,10 +1240,10 @@ - + - qnh-indicator-inhg + qnh-indicator-inhg 0.0010 0.0512 @@ -1241,79 +1265,79 @@ 32 - - - qnh-indicator-hpa - - 0.0010 - 0.0512 - -0.055 - - left-center - yz-plane - number-value - %4.0f - instrumentation/altimeter/setting-hpa - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - - - - qnh-indicator - - 0.0010 - 0.05 - -0.055 - - right-center - yz-plane - literal - QNH - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - - - std-indicator - - 0.0010 - 0.05 - -0.055 - - right-center - yz-plane - literal - STD - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + qnh-indicator-hpa + + 0.0010 + 0.0512 + -0.055 + + left-center + yz-plane + number-value + %4.0f + instrumentation/altimeter/setting-hpa + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - select - qnh-indicator-inhg - + + qnh-indicator + + 0.0010 + 0.05 + -0.055 + + right-center + yz-plane + literal + QNH + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + + + + std-indicator + + 0.0010 + 0.05 + -0.055 + + right-center + yz-plane + literal + STD + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + + + + select + qnh-indicator-inhg + modes/altimeter/inhg @@ -1324,13 +1348,13 @@ 0 - - + + - - select - qnh-indicator-hpa - + + select + qnh-indicator-hpa + modes/altimeter/inhg @@ -1341,380 +1365,380 @@ 0 - - + + - - select - qnh-indicator - - - modes/altimeter/std - 0 - - - + + select + qnh-indicator + + + modes/altimeter/std + 0 + + + - - select - std-indicator - - - modes/altimeter/std - 1 - - - + + select + std-indicator + + + modes/altimeter/std + 1 + + + - select - radio-alt - - - - position/gear-agl-ft - 2500 - - - position/gear-agl-ft - 250 - - - - - + select + radio-alt + + + + position/gear-agl-ft + 2500 + + + position/gear-agl-ft + 250 + + + + + - - select - radio-alt-land - - - position/gear-agl-ft - 250 - - - - - - select - radar-alt - - - position/gear-agl-ft - 2500 - - - - - + + select + radio-alt-land + + + position/gear-agl-ft + 250 + + + - - select - mach-value - - - velocities/mach - 0.500 - - - + + select + radar-alt + + + position/gear-agl-ft + 2500 + + + - - dh-label - - 0.00091828 - 0.0326226 - 0.0584781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/minimums-mode - true - false - false - 0.0055 - - 32 - 32 - - - - - decision-height - - 0.00091828 - 0.0436226 - 0.0584781 - - center-center - yz-plane - number-value - %4.0f - false - helvetica_medium.txf - instrumentation/mk-viii/inputs/arinc429/decision-height - true - false - false - 0.0051 - - 32 - 32 - - + + + + select + mach-value + + + velocities/mach + 0.500 + + + + + + dh-label + + 0.00091828 + 0.0326226 + 0.0584781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/minimums-mode + true + false + false + 0.0055 + + 32 + 32 + + + + + decision-height + + 0.00091828 + 0.0436226 + 0.0584781 + + center-center + yz-plane + number-value + %4.0f + false + helvetica_medium.txf + instrumentation/mk-viii/inputs/arinc429/decision-height + true + false + false + 0.0051 + + 32 + 32 + + - - man-spd - - 0.0010 - -0.042 - 0.0462 - - right-center - yz-plane - number-value - %3.0f - it-autoflight/input/spd-kts - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + man-spd + + 0.0010 + -0.042 + 0.0462 + + right-center + yz-plane + number-value + %3.0f + it-autoflight/input/spd-kts + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - man-spd-lower - - 0.0010 - -0.042 - -0.0462 - - right-center - yz-plane - number-value - %5.0f - it-autoflight/input/spd-kts - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + man-spd-lower + + 0.0010 + -0.042 + -0.0462 + + right-center + yz-plane + number-value + %5.0f + it-autoflight/input/spd-kts + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - mng-spd - - 0.0010 - -0.042 - 0.0462 - - right-center - yz-plane - number-value - %3.0f - it-autoflight/input/spd-kts - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + mng-spd + + 0.0010 + -0.042 + 0.0462 + + right-center + yz-plane + number-value + %3.0f + it-autoflight/input/spd-kts + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - mng-spd-lower - - 0.0010 - -0.042 - -0.0462 - - right-center - yz-plane - number-value - %5.0f - it-autoflight/input/spd-kts - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - - - - man-mach - - 0.0010 - -0.042 - 0.0462 - - right-center - yz-plane - number-value - %1.2f - it-autoflight/input/spd-mach - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + mng-spd-lower + + 0.0010 + -0.042 + -0.0462 + + right-center + yz-plane + number-value + %5.0f + it-autoflight/input/spd-kts + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + + + + man-mach + + 0.0010 + -0.042 + 0.0462 + + right-center + yz-plane + number-value + %1.2f + it-autoflight/input/spd-mach + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - man-mach-lower - - 0.0010 - -0.042 - -0.0462 - - right-center - yz-plane - number-value - %1.2f - it-autoflight/input/spd-mach - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + man-mach-lower + + 0.0010 + -0.042 + -0.0462 + + right-center + yz-plane + number-value + %1.2f + it-autoflight/input/spd-mach + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - mng-mach - - 0.0010 - -0.042 - 0.0462 - - right-center - yz-plane - number-value - %1.2f - it-autoflight/input/spd-mach - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + mng-mach + + 0.0010 + -0.042 + 0.0462 + + right-center + yz-plane + number-value + %1.2f + it-autoflight/input/spd-mach + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - mng-mach-lower - - 0.0010 - -0.042 - -0.0462 - - right-center - yz-plane - number-value - %1.2f - it-autoflight/input/spd-mach - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + mng-mach-lower + + 0.0010 + -0.042 + -0.0462 + + right-center + yz-plane + number-value + %1.2f + it-autoflight/input/spd-mach + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - texmultiple - trgt-spd-man - trgt-spd-mng - - textranslate - FMGC/internal/target-ias-pfd - 0.002001953 - - -1 - 0 - 0 - - - - textranslate - instrumentation/airspeed-indicator/indicated-speed-kt - 0.002001953 - - 1 - 0 - 0 - - - + + texmultiple + trgt-spd-man + trgt-spd-mng + + textranslate + FMGC/internal/target-ias-pfd + 0.002001953 + + -1 + 0 + 0 + + + + textranslate + instrumentation/airspeed-indicator/indicated-speed-kt + 0.002001953 + + 1 + 0 + 0 + + + - - select - trgt-spd-man - + + select + trgt-spd-man + it-autoflight/input/spd-managed 0 - - + + - - select - trgt-spd-mng - + + select + trgt-spd-mng + it-autoflight/input/spd-managed 1 - - + + - - select - man-spd - + + select + man-spd + @@ -1734,13 +1758,13 @@ 0 - - + + - - select - mng-spd - + + select + mng-spd + @@ -1760,13 +1784,13 @@ 1 - - + + - - select - man-spd-lower - + + select + man-spd-lower + @@ -1786,13 +1810,13 @@ 0 - - + + - - select - mng-spd-lower - + + select + mng-spd-lower + @@ -1812,13 +1836,13 @@ 1 - - + + - - select - man-mach - + + select + man-mach + @@ -1838,13 +1862,13 @@ 0 - - + + - - select - mng-mach - + + select + mng-mach + @@ -1864,13 +1888,13 @@ 1 - - + + - - select - man-mach-lower - + + select + man-mach-lower + @@ -1890,13 +1914,13 @@ 0 - - + + - - select - mng-mach-lower - + + select + mng-mach-lower + @@ -1916,182 +1940,182 @@ 1 - - + + - - thrust-mode-fma - - 0.00091828 - -0.0546226 - 0.0710781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/throttle-mode - true - false - false - 0.0055 - - 32 - 32 - - + + thrust-mode-fma + + 0.00091828 + -0.0546226 + 0.0710781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/throttle-mode + true + false + false + 0.0055 + + 32 + 32 + + - - pitch-mode-fma - - 0.00091828 - -0.0210226 - 0.0710781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/pitch-mode - true - false - false - 0.0055 - - 32 - 32 - - + + pitch-mode-fma + + 0.00091828 + -0.0210226 + 0.0710781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/pitch-mode + true + false + false + 0.0055 + + 32 + 32 + + - - land-mode-fma - - 0.00091828 - -0.00521 - 0.0710781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/pitch-mode - true - false - false - 0.0055 - - 32 - 32 - - + + land-mode-fma + + 0.00091828 + -0.00521 + 0.0710781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/pitch-mode + true + false + false + 0.0055 + + 32 + 32 + + - - roll-mode-fma - - 0.00091828 - 0.0106226 - 0.0710781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/roll-mode - true - false - false - 0.0055 - - 32 - 32 - - + + roll-mode-fma + + 0.00091828 + 0.0106226 + 0.0710781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/roll-mode + true + false + false + 0.0055 + + 32 + 32 + + - - pitch-mode-armed-fma - - 0.00091828 - -0.0130226 - 0.0635781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/pitch-mode-armed - true - false - false - 0.0055 - - 32 - 32 - - + + pitch-mode-armed-fma + + 0.00091828 + -0.0130226 + 0.0635781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/pitch-mode-armed + true + false + false + 0.0055 + + 32 + 32 + + - - pitch-mode-armed2-fma - - 0.00091828 - -0.0290226 - 0.0635781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/pitch-mode2-armed - true - false - false - 0.0055 - - 32 - 32 - - + + pitch-mode-armed2-fma + + 0.00091828 + -0.0290226 + 0.0635781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/pitch-mode2-armed + true + false + false + 0.0055 + + 32 + 32 + + - - roll-mode-armed-fma - - 0.00091828 - 0.0106226 - 0.0635781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/roll-mode-armed - true - false - false - 0.0055 - - 32 - 32 - - + + roll-mode-armed-fma + + 0.00091828 + 0.0106226 + 0.0635781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/roll-mode-armed + true + false + false + 0.0055 + + 32 + 32 + + - - select - throttle-mode-box - + + select + throttle-mode-box + systems/thrust/alpha-floor @@ -2144,25 +2168,25 @@ - - + + - - select - pitch-mode-box - land-mode-box - - - modes/pfd/fma/pitch-mode-box - 1 - - - + + select + pitch-mode-box + land-mode-box + + + modes/pfd/fma/pitch-mode-box + 1 + + + - - select - pitch-mode-armed-box - + + select + pitch-mode-armed-box + modes/pfd/fma/pitch-mode-armed-box @@ -2173,35 +2197,35 @@ 1 - - + + - - select - roll-mode-box - - - modes/pfd/fma/roll-mode-box - 1 - - - + + select + roll-mode-box + + + modes/pfd/fma/roll-mode-box + 1 + + + - - select - roll-mode-armed-box - - - modes/pfd/fma/roll-mode-armed-box - 1 - - - + + select + roll-mode-armed-box + + + modes/pfd/fma/roll-mode-armed-box + 1 + + + - - select - ap-mode-box - + + select + ap-mode-box + modes/pfd/fma/ap-mode-box @@ -2218,13 +2242,13 @@ - - + + - - select - fd-mode-box - + + select + fd-mode-box + modes/pfd/fma/fd-mode-box @@ -2241,13 +2265,13 @@ - - + + - - select - athr-mode-box - + + select + athr-mode-box + modes/pfd/fma/athr-mode-box @@ -2258,109 +2282,109 @@ 1 - - + + - - ap-mode-fma - - 0.00091828 - 0.0656226 - 0.0727781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/ap-mode - true - false - false - 0.0055 - - 32 - 32 - - + + ap-mode-fma + + 0.00091828 + 0.0656226 + 0.0727781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/ap-mode + true + false + false + 0.0055 + + 32 + 32 + + - - fd-mode-fma - - 0.00091828 - 0.0656226 - 0.0655781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/fd-mode - true - false - false - 0.0055 - - 32 - 32 - - - - - athr-active-fma - - 0.00091828 - 0.0656226 - 0.0584781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/at-mode - true - false - false - 0.0055 - - 32 - 32 - - + + fd-mode-fma + + 0.00091828 + 0.0656226 + 0.0655781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/fd-mode + true + false + false + 0.0055 + + 32 + 32 + + - - athr-armed-fma - - 0.00091828 - 0.0656226 - 0.0584781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/at-mode - true - false - false - 0.0055 - - 32 - 32 - - + + athr-active-fma + + 0.00091828 + 0.0656226 + 0.0584781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/at-mode + true + false + false + 0.0055 + + 32 + 32 + + - - select - thrust-mode-fma - + + athr-armed-fma + + 0.00091828 + 0.0656226 + 0.0584781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/at-mode + true + false + false + 0.0055 + + 32 + 32 + + + + + select + thrust-mode-fma + it-autoflight/output/athr @@ -2385,13 +2409,13 @@ - - + + - - select - athr-active-fma - + + select + athr-active-fma + systems/thrust/alpha-floor @@ -2448,13 +2472,13 @@ TOGA - - + + - - select - athr-armed-fma - + + select + athr-armed-fma + it-autoflight/output/athr @@ -2495,223 +2519,223 @@ - - + + - - athr-man-fma - - 0.00091828 - -0.0546226 - 0.0710781 - - center-center - yz-plane + + athr-man-fma + + 0.00091828 + -0.0546226 + 0.0710781 + + center-center + yz-plane text-value MAN autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-toga-fma - - 0.00091828 - -0.0546226 - 0.0630781 - - center-center - yz-plane + + athr-toga-fma + + 0.00091828 + -0.0546226 + 0.0630781 + + center-center + yz-plane text-value TOGA autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-mct-fma - - 0.00091828 - -0.0546226 - 0.0630781 - - center-center - yz-plane + + athr-mct-fma + + 0.00091828 + -0.0546226 + 0.0630781 + + center-center + yz-plane text-value MCT autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-flex-fma - - 0.00091828 - -0.0576226 - 0.0630781 - - center-center - yz-plane + + athr-flex-fma + + 0.00091828 + -0.0576226 + 0.0630781 + + center-center + yz-plane text-value FLX + autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-flexb-fma - - 0.00091828 - -0.0466226 - 0.0630781 - - center-center - yz-plane + + athr-flexb-fma + + 0.00091828 + -0.0466226 + 0.0630781 + + center-center + yz-plane text-value %s FMGC/internal/flex - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-thr-fma - - 0.00091828 - -0.0546226 - 0.0630781 - - center-center - yz-plane + + athr-thr-fma + + 0.00091828 + -0.0546226 + 0.0630781 + + center-center + yz-plane text-value THR autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-box-fma - - 0.00091828 - -0.0546226 - 0.0670781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/man-box - false - false - true - 0.020 - - 36 - 36 - - + + athr-box-fma + + 0.00091828 + -0.0546226 + 0.0670781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/man-box + false + false + true + 0.020 + + 36 + 36 + + - - athr-box-b-fma - - 0.00091828 - -0.0546226 - 0.0670781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/man-box - false - false - true - 0.020 - - 36 - 36 - - + + athr-box-b-fma + + 0.00091828 + -0.0546226 + 0.0670781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/man-box + false + false + true + 0.020 + + 36 + 36 + + - - athr-box-c-fma - - 0.00091828 - -0.0546226 - 0.0670781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/flex-box - false - false - true - 0.020 - - 36 - 36 - - + + athr-box-c-fma + + 0.00091828 + -0.0546226 + 0.0670781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/flex-box + false + false + true + 0.020 + + 36 + 36 + + - - select - athr-man-fma - + + select + athr-man-fma + it-autoflight/output/athr @@ -2744,13 +2768,13 @@ - - + + - - select - athr-box-fma - + + select + athr-box-fma + it-autoflight/output/athr @@ -2783,13 +2807,13 @@ - - + + - - select - athr-box-b-fma - + + select + athr-box-b-fma + it-autoflight/output/athr @@ -2806,13 +2830,13 @@ - - + + - - select - athr-toga-fma - + + select + athr-toga-fma + it-autoflight/output/athr @@ -2829,13 +2853,13 @@ - - + + - - select - athr-mct-fma - + + select + athr-mct-fma + it-autoflight/output/athr @@ -2864,15 +2888,15 @@ - - + + - - select - athr-flex-fma - athr-flexb-fma - athr-box-c-fma - + + select + athr-flex-fma + athr-flexb-fma + athr-box-c-fma + it-autoflight/output/athr @@ -2901,13 +2925,13 @@ - - + + - - select - athr-thr-fma - + + select + athr-thr-fma + it-autoflight/output/athr @@ -2940,36 +2964,36 @@ - - + + - - athr-lvrclb-fma - - 0.00091828 - -0.0546226 - 0.0550781 - - center-center - yz-plane + + athr-lvrclb-fma + + 0.00091828 + -0.0546226 + 0.0550781 + + center-center + yz-plane text-value LVR CLB autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - select - athr-lvrclb-fma - + + select + athr-lvrclb-fma + it-autoflight/output/athr @@ -2988,19 +3012,19 @@ 0 - - + + - - select - thrust-mode-fma - athr-lvrclb-fma - athr-thr-fma - athr-mct-fma - athr-toga-fma - athr-man-fma - athr-box-fma - + + select + thrust-mode-fma + athr-lvrclb-fma + athr-thr-fma + athr-mct-fma + athr-toga-fma + athr-man-fma + athr-box-fma + systems/thrust/alpha-floor @@ -3011,59 +3035,59 @@ 0 - - + + - - athr-afloor-fma - - 0.00091828 - -0.0546226 - 0.0710781 - - center-center - yz-plane + + athr-afloor-fma + + 0.00091828 + -0.0546226 + 0.0710781 + + center-center + yz-plane text-value A.FLOOR autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-togalk-fma - - 0.00091828 - -0.0546226 - 0.0710781 - - center-center - yz-plane + + athr-togalk-fma + + 0.00091828 + -0.0546226 + 0.0710781 + + center-center + yz-plane text-value TOGA LK autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - select - athr-afloor-fma - + + select + athr-afloor-fma + systems/thrust/alpha-floor @@ -3074,13 +3098,13 @@ 0 - - + + - - select - athr-togalk-fma - + + select + athr-togalk-fma + systems/thrust/alpha-floor @@ -3091,14 +3115,14 @@ 1 - - + + - - select - athr-afloor-fma + + select + athr-afloor-fma alpha-floor-box - + systems/thrust/alpha-floor @@ -3109,8 +3133,8 @@ 1 - - + + @@ -3137,30 +3161,30 @@ 32 - - - man-alt-lower - - 0.0010 - 0.0553 - -0.0462 - - right-center - yz-plane - text-value - %s - it-autoflight/internal/alt - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + + man-alt-lower + + 0.0010 + 0.0553 + -0.0462 + + right-center + yz-plane + text-value + %s + it-autoflight/internal/alt + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + mng-alt @@ -3185,35 +3209,35 @@ 32 - - - mng-alt-lower - - 0.0010 - 0.0553 - -0.0462 - - right-center - yz-plane - text-value - %s + + + mng-alt-lower + + 0.0010 + 0.0553 + -0.0462 + + right-center + yz-plane + text-value + %s it-autoflight/internal/alt-mng - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - select - man-alt - + + select + man-alt + @@ -3229,13 +3253,13 @@ 8 - - + + - - select - man-alt-lower - + + select + man-alt-lower + @@ -3251,13 +3275,13 @@ 8 - - + + - - select - mng-alt - + + select + mng-alt + @@ -3273,13 +3297,13 @@ 8 - - + + - - select - mng-alt-lower - + + select + mng-alt-lower + @@ -3295,80 +3319,80 @@ 8 - - + + - - texmultiple - target-alt-sel - - textranslate - it-autoflight/internal/alt - 0.000019141 - - -1 - 0 - 0 - - - - textranslate - instrumentation/altimeter/indicated-altitude-ft - 0.000019141 - - 1 - 0 - 0 - - - + + texmultiple + target-alt-sel + + textranslate + it-autoflight/internal/alt + 0.000019141 + + -1 + 0 + 0 + + + + textranslate + instrumentation/altimeter/indicated-altitude-ft + 0.000019141 + + 1 + 0 + 0 + + + - - texmultiple - target-alt-mng - - textranslate - it-autoflight/internal/mng-alt - 0.000019141 - - -1 - 0 - 0 - - - - textranslate - instrumentation/altimeter/indicated-altitude-ft - 0.000019141 - - 1 - 0 - 0 - - - + + texmultiple + target-alt-mng + + textranslate + it-autoflight/internal/mng-alt + 0.000019141 + + -1 + 0 + 0 + + + + textranslate + instrumentation/altimeter/indicated-altitude-ft + 0.000019141 + + 1 + 0 + 0 + + + - - select - target-alt-sel - + + select + target-alt-sel + it-autoflight/output/vert 8 - - + + - - select - target-alt-mng - + + select + target-alt-mng + it-autoflight/output/vert 8 - - + + @@ -3395,149 +3419,149 @@ 32 - - - vs-num-lower - - 0.0010 - 0.0706 - -0.0452 - - right-center - yz-plane - number-value - %2.0f - it-autoflight/internal/vert-speed-fpm-pfd - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - - - select - vs-num - + + vs-num-lower + + 0.0010 + 0.0706 + -0.0452 + + right-center + yz-plane + number-value + %2.0f + it-autoflight/internal/vert-speed-fpm-pfd + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + + + + select + vs-num + it-autoflight/internal/vert-speed-fpm-pfd 2 - - + + - - select - vs-num-lower - + + select + vs-num-lower + it-autoflight/internal/vert-speed-fpm-pfd -2 - - + + - - select - banklim - + + select + banklim + it-fbw/law 0 - - + + - - select - banklimXX - + + select + banklimXX + it-fbw/law 0 - - + + - - usemanpitchtrim - - 0.00091828 - -0.00521 - 0.0570781 - - center-center - yz-plane - text-value - USE MAN PITCH TRIM - false - helvetica_medium.txf - autopilot/serviceable - true - false - false - 0.0051 - - 32 - 32 - - + + usemanpitchtrim + + 0.00091828 + -0.00521 + 0.0570781 + + center-center + yz-plane + text-value + USE MAN PITCH TRIM + false + helvetica_medium.txf + autopilot/serviceable + true + false + false + 0.0051 + + 32 + 32 + + - - select - usemanpitchtrim - + + select + usemanpitchtrim + it-fbw/law 2 - - + + - - manpitchtrimonly - - 0.00091828 - -0.00521 - 0.0570781 - - center-center - yz-plane - text-value - MAN PITCH TRIM ONLY - false - helvetica_medium.txf - autopilot/serviceable - true - false - false - 0.0051 - - 32 - 32 - - + + manpitchtrimonly + + 0.00091828 + -0.00521 + 0.0570781 + + center-center + yz-plane + text-value + MAN PITCH TRIM ONLY + false + helvetica_medium.txf + autopilot/serviceable + true + false + false + 0.0051 + + 32 + 32 + + - - select - manpitchtrimonly - + + select + manpitchtrimonly + it-fbw/law 3 - - + + - - select - fbwmask - + + select + fbwmask + it-fbw/law @@ -3548,15 +3572,15 @@ 3 - - + + - - material - qnh-indicator - dh-label + + material + qnh-indicator + dh-label ap-mode-fma fd-mode-fma athr-active-fma @@ -3570,39 +3594,39 @@ athr-lvrclb-fma vs-num vs-num-lower - - 1 - 1 - 1 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 1 - 1 - 1 - - + + 1 + 1 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 1 + 1 + + material osgtext-cyan - qnh-indicator-inhg - qnh-indicator-hpa + qnh-indicator-inhg + qnh-indicator-hpa roll-mode-armed-fma pitch-mode-armed-fma pitch-mode-armed2-fma athr-flexb-fma - std-indicator + std-indicator 0 0.886 @@ -3631,9 +3655,9 @@ osgtext-green mach-value thrust-mode-fma - pitch-mode-fma - land-mode-fma - roll-mode-fma + pitch-mode-fma + land-mode-fma + roll-mode-fma athr-afloor-fma athr-togalk-fma @@ -3688,11 +3712,11 @@ material man-alt - man-alt-lower - man-spd - man-spd-lower - man-mach - man-mach-lower + man-alt-lower + man-spd + man-spd-lower + man-mach + man-mach-lower 0 0.886 @@ -3716,57 +3740,57 @@ - - material - decision-height + + material + decision-height athr-armed-fma - - 0.06 - 0.55 - 1 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 0.06 - 0.55 - 1 - - + + 0.06 + 0.55 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0.06 + 0.55 + 1 + + - - material - radio-alt-land - - 0.99 - 0.6 - 0.04 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 0.99 - 0.6 - 0.04 - - + + material + radio-alt-land + + 0.99 + 0.6 + 0.04 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0.99 + 0.6 + 0.04 + + @@ -3798,26 +3822,26 @@ material athr-box-b-fma - - 1 - 0.6 - 0 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 1 - 0.6 - 0 - + + 1 + 0.6 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 0.6 + 0 + diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml index 7c475207..d354e9bf 100644 --- a/Models/Instruments/PFD/PFD2.xml +++ b/Models/Instruments/PFD/PFD2.xml @@ -19,29 +19,29 @@ - - translate - sidestick-pos - controls/flight/elevator-input-fast - 0.0259 - - 0 - 0 - -1 - - - - - translate - sidestick-pos - controls/flight/aileron-input-fast - 0.0275 - - 0 - 1 - 0 - - + + translate + sidestick-pos + controls/flight/elevator-input-fast + 0.0259 + + 0 + 0 + -1 + + + + + translate + sidestick-pos + controls/flight/aileron-input-fast + 0.0275 + + 0 + 1 + 0 + + select @@ -108,102 +108,102 @@ - spdtrnd-up - instrumentation/pfd/speed-trend-up - textranslate - - 0 - -1 - - + spdtrnd-up + instrumentation/pfd/speed-trend-up + textranslate + + 0 + -1 + + 0.240 00.5 - - - - spdtrnd-down - instrumentation/pfd/speed-trend-down - textranslate - - 0 - -1 - - + + + + spdtrnd-down + instrumentation/pfd/speed-trend-down + textranslate + + 0 + -1 + + -0.240 00.5 - - + + - texmultiple - horizon - - orientation/pitch-deg - textranslate - 0.003955078 - - 0 - 1 - - - - orientation/roll-deg - texrotate -
- 0.50 - 0.50 -
- - 0 - 0 - -1 - - - + texmultiple + horizon + + orientation/pitch-deg + textranslate + 0.003955078 + + 0 + 1 + + + + orientation/roll-deg + texrotate +
+ 0.50 + 0.50 +
+ + 0 + 0 + -1 + + + - texmultiple - horizonhdg - - instrumentation/pfd/horizon-pitch - textranslate - 0.003955078 - - 0 - 1 - - - + texmultiple + horizonhdg + + instrumentation/pfd/horizon-pitch + textranslate + 0.003955078 + + 0 + 1 + + + instrumentation/pfd/heading-deg - textranslate + textranslate 0.0000001 0.00356999976056338 - - 1 - 0 - - - - orientation/roll-deg - texrotate -
- 0.50 - 0.50 -
- - 0 - 0 - -1 - - - + + 1 + 0 + + + + orientation/roll-deg + texrotate +
+ 0.50 + 0.50 +
+ + 0 + 0 + -1 + + + - texrotate + texrotate sky - orientation/roll-deg + orientation/roll-deg
0.50 0.50 @@ -216,103 +216,68 @@ - texmultiple + texmultiple ground - - instrumentation/pfd/horizon-ground - textranslate - 0.003955078 - - 0 - 1 - - - - orientation/roll-deg - texrotate -
- 0.50 - 0.50 -
- - 0 - 0 - -1 - - - - - - rotate - bank - slipskid + + instrumentation/pfd/horizon-ground + textranslate + 0.003955078 + + 0 + 1 + + + + orientation/roll-deg + texrotate +
+ 0.50 + 0.50 +
+ + 0 + 0 + -1 + + + + + + rotate + bank + slipskid radio-alt radio-alt-land - orientation/roll-deg + orientation/roll-deg 1.05 -
- 0 - -0.0051 - 0.00091 -
- - 1 - 0 - 0 - - +
+ 0 + -0.0051 + 0.00091 +
+ + 1 + 0 + 0 + + - - translate - slipskid - instrumentation/slip-skid-ball/indicated-slip-skid - -0.002 - - 0 - 1 - 0 - - + + translate + slipskid + instrumentation/slip-skid-ball/indicated-slip-skid + -0.002 + + 0 + 1 + 0 + + - - select - fd_roll - - - - it-autoflight/output/fd2 - 1 - - gear/gear[1]/wow - gear/gear[2]/wow - - it-autoflight/custom/trk-fpa - 0 - - - orientation/pitch-deg - 25 - - - orientation/pitch-deg - -13 - - - orientation/roll-deg - 45 - - - orientation/roll-deg - -45 - - - - - - - select - fd_pitch - + + select + fd_roll + it-autoflight/output/fd2 @@ -322,11 +287,15 @@ gear/gear[1]/wow gear/gear[2]/wow + + modes/pfd/fma/roll-mode + + - - modes/pfd/fma/pitch-mode - SRS - + + modes/pfd/fma/roll-mode + + it-autoflight/custom/trk-fpa @@ -349,13 +318,60 @@ -45 - - + + - - select + + select + fd_pitch + + + + it-autoflight/output/fd2 + 1 + + + + gear/gear[1]/wow + gear/gear[2]/wow + + modes/pfd/fma/pitch-mode + + + + + modes/pfd/fma/pitch-mode + + + + + it-autoflight/custom/trk-fpa + 0 + + + orientation/pitch-deg + 25 + + + orientation/pitch-deg + -13 + + + orientation/roll-deg + 45 + + + orientation/roll-deg + -45 + + + + + + + select fpv - + gear/gear[1]/wow gear/gear[2]/wow @@ -364,16 +380,16 @@ 1 - - + + - - select + + select fpd - + - it-autoflight/output/fd2 + it-autoflight/output/fd1 1 gear/gear[1]/wow @@ -398,14 +414,22 @@ orientation/roll-deg -45 + + modes/pfd/fma/roll-mode + + + + modes/pfd/fma/pitch-mode + + - - + + - - select + + select pitch-mode-box - + @@ -442,13 +466,13 @@ - - + + - - select + + select roll-mode-box - + @@ -485,21 +509,21 @@ - - + + - - select + + select pitch-mode-box pitch-mode-armed-box roll-mode-box roll-mode-armed-box - pitch-mode-fma - roll-mode-fma - pitch-mode-armed-fma - pitch-mode-armed2-fma - roll-mode-armed-fma - + pitch-mode-fma + roll-mode-fma + pitch-mode-armed-fma + pitch-mode-armed2-fma + roll-mode-armed-fma + @@ -532,15 +556,15 @@ ROLL OUT - - + + - - select + + select land-mode-box land-mode-fma landmask - + @@ -575,121 +599,121 @@ - - + + - - select - rudder_bar - + + select + rudder_bar + unused/unused - - + + - - translate - fd_pitch - it-autoflight/fd/pitch-bar - 0.0006 - - 0 - 0 - 1 - - + + translate + fd_pitch + it-autoflight/fd/pitch-bar + 0.0006 + + 0 + 0 + 1 + + - - translate - fd_roll - it-autoflight/fd/roll-bar - 0.0002 - - 0 - 1 - 0 - - + + translate + fd_roll + it-autoflight/fd/roll-bar + 0.0002 + + 0 + 1 + 0 + + - - translate - fpv - instrumentation/pfd/track-diff - 0.00260 - - 0 - 1 - 0 - - + + translate + fpv + instrumentation/pfd/track-diff + 0.00260 + + 0 + 1 + 0 + + - - translate - fpv - orientation/pitch-deg - 0.001955078 - - 0 - 0 - -1 - - + + 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 + 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 + + 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 - - +
+ + -1 + 0 + 0 + + - - textranslate - spd-tape - instrumentation/airspeed-indicator/indicated-speed-kt + + textranslate + spd-tape + instrumentation/airspeed-indicator/indicated-speed-kt 0 0 200.040 @@ -713,65 +737,65 @@ 3800.751 4000.791 - - 1 - - + + 1 + + - - texmultiple - vls-tape - - modes/pfd/stallvls - textranslate - 0.002001953 - - 0 - -1 - 0 - - - - textranslate - instrumentation/airspeed-indicator/indicated-speed-kt - 0.002001953 - - 0 - 1 - 0 - - - - - - texmultiple - stall-tape - - modes/pfd/stallvls - textranslate - 0.002001953 - - 0 - -1 - 0 - - - - textranslate - instrumentation/airspeed-indicator/indicated-speed-kt - 0.002001953 - - 0 - 1 - 0 - - - + + texmultiple + vls-tape + + modes/pfd/stallvls + textranslate + 0.002001953 + + 0 + -1 + 0 + + + + textranslate + instrumentation/airspeed-indicator/indicated-speed-kt + 0.002001953 + + 0 + 1 + 0 + + + + + + texmultiple + stall-tape + + modes/pfd/stallvls + textranslate + 0.002001953 + + 0 + -1 + 0 + + + + textranslate + instrumentation/airspeed-indicator/indicated-speed-kt + 0.002001953 + + 0 + 1 + 0 + + + - - - - + + + + select stall-tape vls-tape @@ -838,82 +862,82 @@ - - - select - vfe-tape - - - controls/flight/flap-lever - 0 - - - + + + select + vfe-tape + + + controls/flight/flap-lever + 0 + + + - textranslate - alt-tape-1 - instrumentation/altimeter/indicated-altitude-ft - 0.000019141 - - 1 - - + textranslate + alt-tape-1 + instrumentation/altimeter/indicated-altitude-ft + 0.000019141 + + 1 + + - texmultiple - radar-alt + texmultiple + radar-alt - textranslate - instrumentation/altimeter/indicated-altitude-ft - 0.000019141 - - 1 - - - - textranslate - instrumentation/pfd/ground-level-diff - 0.000019141 - - 1 - - - - - - texmultiple - landing-elev - - textranslate - instrumentation/altimeter/indicated-altitude-ft - 0.000019141 - - 1 - - - - textranslate - autopilot/route-manager/destination/field-elevation-ft - 0.000019141 - - 1 - - - - - - - textranslate - alt-tape-2 - instrumentation/altimeter/indicated-altitude-ft - 0.009999725 - - 1 - - + textranslate + instrumentation/altimeter/indicated-altitude-ft + 0.000019141 + + 1 + + + + textranslate + instrumentation/pfd/ground-level-diff + 0.000019141 + + 1 + + + + + + texmultiple + landing-elev + + textranslate + instrumentation/altimeter/indicated-altitude-ft + 0.000019141 + + 1 + + + + textranslate + autopilot/route-manager/destination/field-elevation-ft + 0.000019141 + + 1 + + + + + + + textranslate + alt-tape-2 + instrumentation/altimeter/indicated-altitude-ft + 0.009999725 + + 1 + + osgtext-green @@ -964,37 +988,37 @@ 32 - - - radio-alt-land - - 0.0010 - -0.006 - -0.0362 - - center-center - yz-plane - number-value - %4.0f - position/gear-agl-ft - false - helvetica_bold.txf - true - false - false - 0.007 - - 32 - 32 - - - - - - - texrotate - vsi - it-autoflight/internal/vert-speed-fpm-filtered + + + radio-alt-land + + 0.0010 + -0.006 + -0.0362 + + center-center + yz-plane + number-value + %4.0f + position/gear-agl-ft + false + helvetica_bold.txf + true + false + false + 0.007 + + 32 + 32 + + + + + + + texrotate + vsi + it-autoflight/internal/vert-speed-fpm-filtered -3300 58 -3000 57 @@ -1008,191 +1032,191 @@ 3000-57 3300-58 -
- 0.76 - 0.463 -
- - 0 - 0 - -1 - - - - - - - textranslate - hdg-tape - instrumentation/pfd/heading-deg - 0.002783031 - - 1 - - - - - texmultiple - hdg-bug - - textranslate - it-autoflight/input/hdg - 0.002783031 - - -1 - - - - textranslate - instrumentation/pfd/heading-deg - 0.002783031 - - 1 - - - - - - select - hdg-bug - - - it-autoflight/output/lat - 0 - - - - - - texmultiple - trk-ind - - textranslate - instrumentation/pfd/track-deg - 0.002783031 - - -1 - - - - textranslate - instrumentation/pfd/heading-deg - 0.002783031 - - 1 - - - - - - select - trk-ind - - - velocities/groundspeed-kt - 80 - - - - - - texmultiple - loc-crs - - textranslate - instrumentation/nav/radials/selected-deg - 0.002832031 - - -1 - - - - textranslate - orientation/heading-magnetic-deg - 0.002832031 - - 1 - - - - - - select - loc-crs - - modes/pfd/ILS2 - - +
+ 0.76 + 0.463 +
+ + 0 + 0 + -1 + + - - - - select - gsscale - + + + + textranslate + hdg-tape + instrumentation/pfd/heading-deg + 0.002783031 + + 1 + + + + + texmultiple + hdg-bug + + textranslate + it-autoflight/input/hdg + 0.002783031 + + -1 + + + + textranslate + instrumentation/pfd/heading-deg + 0.002783031 + + 1 + + + + + + select + hdg-bug + + + it-autoflight/output/lat + 0 + + + + + + texmultiple + trk-ind + + textranslate + instrumentation/pfd/track-deg + 0.002783031 + + -1 + + + + textranslate + instrumentation/pfd/heading-deg + 0.002783031 + + 1 + + + + + + select + trk-ind + + + velocities/groundspeed-kt + 80 + + + + + + texmultiple + loc-crs + + textranslate + instrumentation/nav/radials/selected-deg + 0.002832031 + + -1 + + + + textranslate + orientation/heading-magnetic-deg + 0.002832031 + + 1 + + + + + + select + loc-crs + modes/pfd/ILS2 - - + + + + - - select - gspointer - - - instrumentation/nav/gs-in-range - instrumentation/nav/has-gs + + select + gsscale + + modes/pfd/ILS2 + + + + + select + gspointer + + + instrumentation/nav/gs-in-range + instrumentation/nav/has-gs modes/pfd/ILS2 - - - + + + - - translate - gspointer - instrumentation/nav/gs-needle-deflection-norm - 0.0322 - - 0 - 0 - 1 - - + + translate + gspointer + instrumentation/nav/gs-needle-deflection-norm + 0.0322 + + 0 + 0 + 1 + + - - select - locscale - + + select + locscale + modes/pfd/ILS2 - - + + - - select - locpointer - - - instrumentation/nav/in-range - instrumentation/nav/nav-loc + + select + locpointer + + + instrumentation/nav/in-range + instrumentation/nav/nav-loc modes/pfd/ILS2 - - - + + + - - translate - locpointer - instrumentation/nav/heading-needle-deflection-norm - -0.0322 - - 0 - -1 - 0 - - + + translate + locpointer + instrumentation/nav/heading-needle-deflection-norm + -0.0322 + + 0 + -1 + 0 + + - + mach-value 0.0010 @@ -1205,7 +1229,7 @@ %0.3f velocities/mach false - helvetica_bold.txf + helvetica_bold.txf true false false @@ -1216,10 +1240,10 @@ - + - qnh-indicator-inhg + qnh-indicator-inhg 0.0010 0.0512 @@ -1241,79 +1265,79 @@ 32 - - - qnh-indicator-hpa - - 0.0010 - 0.0512 - -0.055 - - left-center - yz-plane - number-value - %4.0f - instrumentation/altimeter/setting-hpa - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - - - - qnh-indicator - - 0.0010 - 0.05 - -0.055 - - right-center - yz-plane - literal - QNH - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - - - std-indicator - - 0.0010 - 0.05 - -0.055 - - right-center - yz-plane - literal - STD - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + qnh-indicator-hpa + + 0.0010 + 0.0512 + -0.055 + + left-center + yz-plane + number-value + %4.0f + instrumentation/altimeter/setting-hpa + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - select - qnh-indicator-inhg - + + qnh-indicator + + 0.0010 + 0.05 + -0.055 + + right-center + yz-plane + literal + QNH + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + + + + std-indicator + + 0.0010 + 0.05 + -0.055 + + right-center + yz-plane + literal + STD + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + + + + select + qnh-indicator-inhg + modes/altimeter/inhg @@ -1324,13 +1348,13 @@ 0 - - + + - - select - qnh-indicator-hpa - + + select + qnh-indicator-hpa + modes/altimeter/inhg @@ -1341,380 +1365,380 @@ 0 - - + + - - select - qnh-indicator - - - modes/altimeter/std - 0 - - - + + select + qnh-indicator + + + modes/altimeter/std + 0 + + + - - select - std-indicator - - - modes/altimeter/std - 1 - - - + + select + std-indicator + + + modes/altimeter/std + 1 + + + - select - radio-alt - - - - position/gear-agl-ft - 2500 - - - position/gear-agl-ft - 250 - - - - - + select + radio-alt + + + + position/gear-agl-ft + 2500 + + + position/gear-agl-ft + 250 + + + + + - - select - radio-alt-land - - - position/gear-agl-ft - 250 - - - - - - select - radar-alt - - - position/gear-agl-ft - 2500 - - - - - + + select + radio-alt-land + + + position/gear-agl-ft + 250 + + + - - select - mach-value - - - velocities/mach - 0.500 - - - + + select + radar-alt + + + position/gear-agl-ft + 2500 + + + - - dh-label - - 0.00091828 - 0.0326226 - 0.0584781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/minimums-mode - true - false - false - 0.0055 - - 32 - 32 - - - - - decision-height - - 0.00091828 - 0.0436226 - 0.0584781 - - center-center - yz-plane - number-value - %4.0f - false - helvetica_medium.txf - instrumentation/mk-viii/inputs/arinc429/decision-height - true - false - false - 0.0051 - - 32 - 32 - - + + + + select + mach-value + + + velocities/mach + 0.500 + + + + + + dh-label + + 0.00091828 + 0.0326226 + 0.0584781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/minimums-mode + true + false + false + 0.0055 + + 32 + 32 + + + + + decision-height + + 0.00091828 + 0.0436226 + 0.0584781 + + center-center + yz-plane + number-value + %4.0f + false + helvetica_medium.txf + instrumentation/mk-viii/inputs/arinc429/decision-height + true + false + false + 0.0051 + + 32 + 32 + + - - man-spd - - 0.0010 - -0.042 - 0.0462 - - right-center - yz-plane - number-value - %3.0f - it-autoflight/input/spd-kts - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + man-spd + + 0.0010 + -0.042 + 0.0462 + + right-center + yz-plane + number-value + %3.0f + it-autoflight/input/spd-kts + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - man-spd-lower - - 0.0010 - -0.042 - -0.0462 - - right-center - yz-plane - number-value - %5.0f - it-autoflight/input/spd-kts - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + man-spd-lower + + 0.0010 + -0.042 + -0.0462 + + right-center + yz-plane + number-value + %5.0f + it-autoflight/input/spd-kts + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - mng-spd - - 0.0010 - -0.042 - 0.0462 - - right-center - yz-plane - number-value - %3.0f - it-autoflight/input/spd-kts - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + mng-spd + + 0.0010 + -0.042 + 0.0462 + + right-center + yz-plane + number-value + %3.0f + it-autoflight/input/spd-kts + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - mng-spd-lower - - 0.0010 - -0.042 - -0.0462 - - right-center - yz-plane - number-value - %5.0f - it-autoflight/input/spd-kts - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - - - - man-mach - - 0.0010 - -0.042 - 0.0462 - - right-center - yz-plane - number-value - %1.2f - it-autoflight/input/spd-mach - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + mng-spd-lower + + 0.0010 + -0.042 + -0.0462 + + right-center + yz-plane + number-value + %5.0f + it-autoflight/input/spd-kts + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + + + + man-mach + + 0.0010 + -0.042 + 0.0462 + + right-center + yz-plane + number-value + %1.2f + it-autoflight/input/spd-mach + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - man-mach-lower - - 0.0010 - -0.042 - -0.0462 - - right-center - yz-plane - number-value - %1.2f - it-autoflight/input/spd-mach - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + man-mach-lower + + 0.0010 + -0.042 + -0.0462 + + right-center + yz-plane + number-value + %1.2f + it-autoflight/input/spd-mach + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - mng-mach - - 0.0010 - -0.042 - 0.0462 - - right-center - yz-plane - number-value - %1.2f - it-autoflight/input/spd-mach - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + mng-mach + + 0.0010 + -0.042 + 0.0462 + + right-center + yz-plane + number-value + %1.2f + it-autoflight/input/spd-mach + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - mng-mach-lower - - 0.0010 - -0.042 - -0.0462 - - right-center - yz-plane - number-value - %1.2f - it-autoflight/input/spd-mach - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + mng-mach-lower + + 0.0010 + -0.042 + -0.0462 + + right-center + yz-plane + number-value + %1.2f + it-autoflight/input/spd-mach + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - texmultiple - trgt-spd-man - trgt-spd-mng - - textranslate - FMGC/internal/target-ias-pfd - 0.002001953 - - -1 - 0 - 0 - - - - textranslate - instrumentation/airspeed-indicator/indicated-speed-kt - 0.002001953 - - 1 - 0 - 0 - - - + + texmultiple + trgt-spd-man + trgt-spd-mng + + textranslate + FMGC/internal/target-ias-pfd + 0.002001953 + + -1 + 0 + 0 + + + + textranslate + instrumentation/airspeed-indicator/indicated-speed-kt + 0.002001953 + + 1 + 0 + 0 + + + - - select - trgt-spd-man - + + select + trgt-spd-man + it-autoflight/input/spd-managed 0 - - + + - - select - trgt-spd-mng - + + select + trgt-spd-mng + it-autoflight/input/spd-managed 1 - - + + - - select - man-spd - + + select + man-spd + @@ -1734,13 +1758,13 @@ 0 - - + + - - select - mng-spd - + + select + mng-spd + @@ -1760,13 +1784,13 @@ 1 - - + + - - select - man-spd-lower - + + select + man-spd-lower + @@ -1786,13 +1810,13 @@ 0 - - + + - - select - mng-spd-lower - + + select + mng-spd-lower + @@ -1812,13 +1836,13 @@ 1 - - + + - - select - man-mach - + + select + man-mach + @@ -1838,13 +1862,13 @@ 0 - - + + - - select - mng-mach - + + select + mng-mach + @@ -1864,13 +1888,13 @@ 1 - - + + - - select - man-mach-lower - + + select + man-mach-lower + @@ -1890,13 +1914,13 @@ 0 - - + + - - select - mng-mach-lower - + + select + mng-mach-lower + @@ -1916,182 +1940,182 @@ 1 - - + + - - thrust-mode-fma - - 0.00091828 - -0.0546226 - 0.0710781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/throttle-mode - true - false - false - 0.0055 - - 32 - 32 - - + + thrust-mode-fma + + 0.00091828 + -0.0546226 + 0.0710781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/throttle-mode + true + false + false + 0.0055 + + 32 + 32 + + - - pitch-mode-fma - - 0.00091828 - -0.0210226 - 0.0710781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/pitch-mode - true - false - false - 0.0055 - - 32 - 32 - - + + pitch-mode-fma + + 0.00091828 + -0.0210226 + 0.0710781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/pitch-mode + true + false + false + 0.0055 + + 32 + 32 + + - - land-mode-fma - - 0.00091828 - -0.00521 - 0.0710781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/pitch-mode - true - false - false - 0.0055 - - 32 - 32 - - + + land-mode-fma + + 0.00091828 + -0.00521 + 0.0710781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/pitch-mode + true + false + false + 0.0055 + + 32 + 32 + + - - roll-mode-fma - - 0.00091828 - 0.0106226 - 0.0710781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/roll-mode - true - false - false - 0.0055 - - 32 - 32 - - + + roll-mode-fma + + 0.00091828 + 0.0106226 + 0.0710781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/roll-mode + true + false + false + 0.0055 + + 32 + 32 + + - - pitch-mode-armed-fma - - 0.00091828 - -0.0130226 - 0.0635781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/pitch-mode-armed - true - false - false - 0.0055 - - 32 - 32 - - + + pitch-mode-armed-fma + + 0.00091828 + -0.0130226 + 0.0635781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/pitch-mode-armed + true + false + false + 0.0055 + + 32 + 32 + + - - pitch-mode-armed2-fma - - 0.00091828 - -0.0290226 - 0.0635781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/pitch-mode2-armed - true - false - false - 0.0055 - - 32 - 32 - - + + pitch-mode-armed2-fma + + 0.00091828 + -0.0290226 + 0.0635781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/pitch-mode2-armed + true + false + false + 0.0055 + + 32 + 32 + + - - roll-mode-armed-fma - - 0.00091828 - 0.0106226 - 0.0635781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/roll-mode-armed - true - false - false - 0.0055 - - 32 - 32 - - + + roll-mode-armed-fma + + 0.00091828 + 0.0106226 + 0.0635781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/roll-mode-armed + true + false + false + 0.0055 + + 32 + 32 + + - - select - throttle-mode-box - + + select + throttle-mode-box + systems/thrust/alpha-floor @@ -2144,25 +2168,25 @@ - - + + - - select - pitch-mode-box - land-mode-box - - - modes/pfd/fma/pitch-mode-box - 1 - - - + + select + pitch-mode-box + land-mode-box + + + modes/pfd/fma/pitch-mode-box + 1 + + + - - select - pitch-mode-armed-box - + + select + pitch-mode-armed-box + modes/pfd/fma/pitch-mode-armed-box @@ -2173,35 +2197,35 @@ 1 - - + + - - select - roll-mode-box - - - modes/pfd/fma/roll-mode-box - 1 - - - + + select + roll-mode-box + + + modes/pfd/fma/roll-mode-box + 1 + + + - - select - roll-mode-armed-box - - - modes/pfd/fma/roll-mode-armed-box - 1 - - - + + select + roll-mode-armed-box + + + modes/pfd/fma/roll-mode-armed-box + 1 + + + - - select - ap-mode-box - + + select + ap-mode-box + modes/pfd/fma/ap-mode-box @@ -2218,13 +2242,13 @@ - - + + - - select - fd-mode-box - + + select + fd-mode-box + modes/pfd/fma/fd-mode-box @@ -2241,13 +2265,13 @@ - - + + - - select - athr-mode-box - + + select + athr-mode-box + modes/pfd/fma/athr-mode-box @@ -2258,109 +2282,109 @@ 1 - - + + - - ap-mode-fma - - 0.00091828 - 0.0656226 - 0.0727781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/ap-mode - true - false - false - 0.0055 - - 32 - 32 - - + + ap-mode-fma + + 0.00091828 + 0.0656226 + 0.0727781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/ap-mode + true + false + false + 0.0055 + + 32 + 32 + + - - fd-mode-fma - - 0.00091828 - 0.0656226 - 0.0655781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/fd-mode - true - false - false - 0.0055 - - 32 - 32 - - - - - athr-active-fma - - 0.00091828 - 0.0656226 - 0.0584781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/at-mode - true - false - false - 0.0055 - - 32 - 32 - - + + fd-mode-fma + + 0.00091828 + 0.0656226 + 0.0655781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/fd-mode + true + false + false + 0.0055 + + 32 + 32 + + - - athr-armed-fma - - 0.00091828 - 0.0656226 - 0.0584781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/at-mode - true - false - false - 0.0055 - - 32 - 32 - - + + athr-active-fma + + 0.00091828 + 0.0656226 + 0.0584781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/at-mode + true + false + false + 0.0055 + + 32 + 32 + + - - select - thrust-mode-fma - + + athr-armed-fma + + 0.00091828 + 0.0656226 + 0.0584781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/at-mode + true + false + false + 0.0055 + + 32 + 32 + + + + + select + thrust-mode-fma + it-autoflight/output/athr @@ -2385,13 +2409,13 @@ - - + + - - select - athr-active-fma - + + select + athr-active-fma + systems/thrust/alpha-floor @@ -2448,13 +2472,13 @@ TOGA - - + + - - select - athr-armed-fma - + + select + athr-armed-fma + it-autoflight/output/athr @@ -2495,223 +2519,223 @@ - - + + - - athr-man-fma - - 0.00091828 - -0.0546226 - 0.0710781 - - center-center - yz-plane + + athr-man-fma + + 0.00091828 + -0.0546226 + 0.0710781 + + center-center + yz-plane text-value MAN autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-toga-fma - - 0.00091828 - -0.0546226 - 0.0630781 - - center-center - yz-plane + + athr-toga-fma + + 0.00091828 + -0.0546226 + 0.0630781 + + center-center + yz-plane text-value TOGA autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-mct-fma - - 0.00091828 - -0.0546226 - 0.0630781 - - center-center - yz-plane + + athr-mct-fma + + 0.00091828 + -0.0546226 + 0.0630781 + + center-center + yz-plane text-value MCT autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-flex-fma - - 0.00091828 - -0.0576226 - 0.0630781 - - center-center - yz-plane + + athr-flex-fma + + 0.00091828 + -0.0576226 + 0.0630781 + + center-center + yz-plane text-value FLX + autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-flexb-fma - - 0.00091828 - -0.0466226 - 0.0630781 - - center-center - yz-plane + + athr-flexb-fma + + 0.00091828 + -0.0466226 + 0.0630781 + + center-center + yz-plane text-value %s FMGC/internal/flex - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-thr-fma - - 0.00091828 - -0.0546226 - 0.0630781 - - center-center - yz-plane + + athr-thr-fma + + 0.00091828 + -0.0546226 + 0.0630781 + + center-center + yz-plane text-value THR autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-box-fma - - 0.00091828 - -0.0546226 - 0.0670781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/man-box - false - false - true - 0.020 - - 36 - 36 - - + + athr-box-fma + + 0.00091828 + -0.0546226 + 0.0670781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/man-box + false + false + true + 0.020 + + 36 + 36 + + - - athr-box-b-fma - - 0.00091828 - -0.0546226 - 0.0670781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/man-box - false - false - true - 0.020 - - 36 - 36 - - + + athr-box-b-fma + + 0.00091828 + -0.0546226 + 0.0670781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/man-box + false + false + true + 0.020 + + 36 + 36 + + - - athr-box-c-fma - - 0.00091828 - -0.0546226 - 0.0670781 - - center-center - yz-plane - text-value - %s - false - helvetica_medium.txf - modes/pfd/fma/flex-box - false - false - true - 0.020 - - 36 - 36 - - + + athr-box-c-fma + + 0.00091828 + -0.0546226 + 0.0670781 + + center-center + yz-plane + text-value + %s + false + helvetica_medium.txf + modes/pfd/fma/flex-box + false + false + true + 0.020 + + 36 + 36 + + - - select - athr-man-fma - + + select + athr-man-fma + it-autoflight/output/athr @@ -2744,13 +2768,13 @@ - - + + - - select - athr-box-fma - + + select + athr-box-fma + it-autoflight/output/athr @@ -2783,13 +2807,13 @@ - - + + - - select - athr-box-b-fma - + + select + athr-box-b-fma + it-autoflight/output/athr @@ -2806,13 +2830,13 @@ - - + + - - select - athr-toga-fma - + + select + athr-toga-fma + it-autoflight/output/athr @@ -2829,13 +2853,13 @@ - - + + - - select - athr-mct-fma - + + select + athr-mct-fma + it-autoflight/output/athr @@ -2864,15 +2888,15 @@ - - + + - - select - athr-flex-fma - athr-flexb-fma - athr-box-c-fma - + + select + athr-flex-fma + athr-flexb-fma + athr-box-c-fma + it-autoflight/output/athr @@ -2901,13 +2925,13 @@ - - + + - - select - athr-thr-fma - + + select + athr-thr-fma + it-autoflight/output/athr @@ -2940,36 +2964,36 @@ - - + + - - athr-lvrclb-fma - - 0.00091828 - -0.0546226 - 0.0550781 - - center-center - yz-plane + + athr-lvrclb-fma + + 0.00091828 + -0.0546226 + 0.0550781 + + center-center + yz-plane text-value LVR CLB autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - select - athr-lvrclb-fma - + + select + athr-lvrclb-fma + it-autoflight/output/athr @@ -2988,19 +3012,19 @@ 0 - - + + - - select - thrust-mode-fma - athr-lvrclb-fma - athr-thr-fma - athr-mct-fma - athr-toga-fma - athr-man-fma - athr-box-fma - + + select + thrust-mode-fma + athr-lvrclb-fma + athr-thr-fma + athr-mct-fma + athr-toga-fma + athr-man-fma + athr-box-fma + systems/thrust/alpha-floor @@ -3011,59 +3035,59 @@ 0 - - + + - - athr-afloor-fma - - 0.00091828 - -0.0546226 - 0.0710781 - - center-center - yz-plane + + athr-afloor-fma + + 0.00091828 + -0.0546226 + 0.0710781 + + center-center + yz-plane text-value A.FLOOR autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - athr-togalk-fma - - 0.00091828 - -0.0546226 - 0.0710781 - - center-center - yz-plane + + athr-togalk-fma + + 0.00091828 + -0.0546226 + 0.0710781 + + center-center + yz-plane text-value TOGA LK autopilot/serviceable - helvetica_medium.txf - true - false - false - 0.0055 - - 32 - 32 - - + helvetica_medium.txf + true + false + false + 0.0055 + + 32 + 32 + + - - select - athr-afloor-fma - + + select + athr-afloor-fma + systems/thrust/alpha-floor @@ -3074,13 +3098,13 @@ 0 - - + + - - select - athr-togalk-fma - + + select + athr-togalk-fma + systems/thrust/alpha-floor @@ -3091,14 +3115,14 @@ 1 - - + + - - select - athr-afloor-fma + + select + athr-afloor-fma alpha-floor-box - + systems/thrust/alpha-floor @@ -3109,8 +3133,8 @@ 1 - - + + @@ -3137,30 +3161,30 @@ 32 - - - man-alt-lower - - 0.0010 - 0.0553 - -0.0462 - - right-center - yz-plane - text-value - %s - it-autoflight/internal/alt - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + + + man-alt-lower + + 0.0010 + 0.0553 + -0.0462 + + right-center + yz-plane + text-value + %s + it-autoflight/internal/alt + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + mng-alt @@ -3185,35 +3209,35 @@ 32 - - - mng-alt-lower - - 0.0010 - 0.0553 - -0.0462 - - right-center - yz-plane - text-value - %s + + + mng-alt-lower + + 0.0010 + 0.0553 + -0.0462 + + right-center + yz-plane + text-value + %s it-autoflight/internal/alt-mng - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + - - select - man-alt - + + select + man-alt + @@ -3229,13 +3253,13 @@ 8 - - + + - - select - man-alt-lower - + + select + man-alt-lower + @@ -3251,13 +3275,13 @@ 8 - - + + - - select - mng-alt - + + select + mng-alt + @@ -3273,13 +3297,13 @@ 8 - - + + - - select - mng-alt-lower - + + select + mng-alt-lower + @@ -3295,80 +3319,80 @@ 8 - - + + - - texmultiple - target-alt-sel - - textranslate - it-autoflight/internal/alt - 0.000019141 - - -1 - 0 - 0 - - - - textranslate - instrumentation/altimeter/indicated-altitude-ft - 0.000019141 - - 1 - 0 - 0 - - - + + texmultiple + target-alt-sel + + textranslate + it-autoflight/internal/alt + 0.000019141 + + -1 + 0 + 0 + + + + textranslate + instrumentation/altimeter/indicated-altitude-ft + 0.000019141 + + 1 + 0 + 0 + + + - - texmultiple - target-alt-mng - - textranslate - it-autoflight/internal/mng-alt - 0.000019141 - - -1 - 0 - 0 - - - - textranslate - instrumentation/altimeter/indicated-altitude-ft - 0.000019141 - - 1 - 0 - 0 - - - + + texmultiple + target-alt-mng + + textranslate + it-autoflight/internal/mng-alt + 0.000019141 + + -1 + 0 + 0 + + + + textranslate + instrumentation/altimeter/indicated-altitude-ft + 0.000019141 + + 1 + 0 + 0 + + + - - select - target-alt-sel - + + select + target-alt-sel + it-autoflight/output/vert 8 - - + + - - select - target-alt-mng - + + select + target-alt-mng + it-autoflight/output/vert 8 - - + + @@ -3395,149 +3419,149 @@ 32 - - - vs-num-lower - - 0.0010 - 0.0706 - -0.0452 - - right-center - yz-plane - number-value - %2.0f - it-autoflight/internal/vert-speed-fpm-pfd - false - helvetica_bold.txf - true - false - false - 0.006 - - 32 - 32 - - - - select - vs-num - + + vs-num-lower + + 0.0010 + 0.0706 + -0.0452 + + right-center + yz-plane + number-value + %2.0f + it-autoflight/internal/vert-speed-fpm-pfd + false + helvetica_bold.txf + true + false + false + 0.006 + + 32 + 32 + + + + + select + vs-num + it-autoflight/internal/vert-speed-fpm-pfd 2 - - + + - - select - vs-num-lower - + + select + vs-num-lower + it-autoflight/internal/vert-speed-fpm-pfd -2 - - + + - - select - banklim - + + select + banklim + it-fbw/law 0 - - + + - - select - banklimXX - + + select + banklimXX + it-fbw/law 0 - - + + - - usemanpitchtrim - - 0.00091828 - -0.00521 - 0.0570781 - - center-center - yz-plane - text-value - USE MAN PITCH TRIM - false - helvetica_medium.txf - autopilot/serviceable - true - false - false - 0.0051 - - 32 - 32 - - + + usemanpitchtrim + + 0.00091828 + -0.00521 + 0.0570781 + + center-center + yz-plane + text-value + USE MAN PITCH TRIM + false + helvetica_medium.txf + autopilot/serviceable + true + false + false + 0.0051 + + 32 + 32 + + - - select - usemanpitchtrim - + + select + usemanpitchtrim + it-fbw/law 2 - - + + - - manpitchtrimonly - - 0.00091828 - -0.00521 - 0.0570781 - - center-center - yz-plane - text-value - MAN PITCH TRIM ONLY - false - helvetica_medium.txf - autopilot/serviceable - true - false - false - 0.0051 - - 32 - 32 - - + + manpitchtrimonly + + 0.00091828 + -0.00521 + 0.0570781 + + center-center + yz-plane + text-value + MAN PITCH TRIM ONLY + false + helvetica_medium.txf + autopilot/serviceable + true + false + false + 0.0051 + + 32 + 32 + + - - select - manpitchtrimonly - + + select + manpitchtrimonly + it-fbw/law 3 - - + + - - select - fbwmask - + + select + fbwmask + it-fbw/law @@ -3548,15 +3572,15 @@ 3 - - + + - - material - qnh-indicator - dh-label + + material + qnh-indicator + dh-label ap-mode-fma fd-mode-fma athr-active-fma @@ -3570,39 +3594,39 @@ athr-lvrclb-fma vs-num vs-num-lower - - 1 - 1 - 1 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 1 - 1 - 1 - - + + 1 + 1 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 1 + 1 + + material osgtext-cyan - qnh-indicator-inhg - qnh-indicator-hpa + qnh-indicator-inhg + qnh-indicator-hpa roll-mode-armed-fma pitch-mode-armed-fma pitch-mode-armed2-fma athr-flexb-fma - std-indicator + std-indicator 0 0.886 @@ -3631,9 +3655,9 @@ osgtext-green mach-value thrust-mode-fma - pitch-mode-fma - land-mode-fma - roll-mode-fma + pitch-mode-fma + land-mode-fma + roll-mode-fma athr-afloor-fma athr-togalk-fma @@ -3688,11 +3712,11 @@ material man-alt - man-alt-lower - man-spd - man-spd-lower - man-mach - man-mach-lower + man-alt-lower + man-spd + man-spd-lower + man-mach + man-mach-lower 0 0.886 @@ -3716,57 +3740,57 @@ - - material - decision-height + + material + decision-height athr-armed-fma - - 0.06 - 0.55 - 1 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 0.06 - 0.55 - 1 - - + + 0.06 + 0.55 + 1 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0.06 + 0.55 + 1 + + - - material - radio-alt-land - - 0.99 - 0.6 - 0.04 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 0.99 - 0.6 - 0.04 - - + + material + radio-alt-land + + 0.99 + 0.6 + 0.04 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0.99 + 0.6 + 0.04 + + @@ -3798,26 +3822,26 @@ material athr-box-b-fma - - 1 - 0.6 - 0 - - - 0 - 0 - 0 - - - 0 - 0 - 0 - - - 1 - 0.6 - 0 - + + 1 + 0.6 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 0.6 + 0 + diff --git a/Nasal/FMGC-b.nas b/Nasal/FMGC-b.nas index 7b8ead2a..f3142043 100644 --- a/Nasal/FMGC-b.nas +++ b/Nasal/FMGC-b.nas @@ -38,9 +38,9 @@ var APinit = func { setprop("/it-autoflight/input/alt", 10000); setprop("/it-autoflight/input/vs", 0); setprop("/it-autoflight/input/fpa", 0); - setprop("/it-autoflight/input/lat", 5); + setprop("/it-autoflight/input/lat", 9); setprop("/it-autoflight/input/lat-arm", 0); - setprop("/it-autoflight/input/vert", 7); + setprop("/it-autoflight/input/vert", 9); setprop("/it-autoflight/input/trk", 0); setprop("/it-autoflight/input/toga", 0); setprop("/it-autoflight/input/spd-managed", 0); @@ -52,8 +52,8 @@ var APinit = func { setprop("/it-autoflight/output/loc-armed", 0); setprop("/it-autoflight/output/appr-armed", 0); setprop("/it-autoflight/output/thr-mode", 2); - setprop("/it-autoflight/output/lat", 5); - setprop("/it-autoflight/output/vert", 7); + setprop("/it-autoflight/output/lat", 9); + setprop("/it-autoflight/output/vert", 9); setprop("/it-autoflight/output/vert-mng", 4); setprop("/it-autoflight/output/fma-pwr", 0); setprop("/it-autoflight/settings/use-backcourse", 0); @@ -68,10 +68,10 @@ var APinit = func { setprop("/it-autoflight/internal/prof-mode", "XX"); setprop("/it-autoflight/internal/prof-fpm", 0); setprop("/it-autoflight/internal/top-of-des-nm", 0); - setprop("/it-autoflight/mode/thr", "PITCH"); - setprop("/it-autoflight/mode/arm", "HDG"); - setprop("/it-autoflight/mode/lat", "T/O"); - setprop("/it-autoflight/mode/vert", "T/O CLB"); + setprop("/it-autoflight/mode/thr", "THRUST"); + setprop("/it-autoflight/mode/arm", " "); + setprop("/it-autoflight/mode/lat", " "); + setprop("/it-autoflight/mode/vert", " "); setprop("/it-autoflight/input/spd-kts", 100); setprop("/it-autoflight/input/spd-mach", 0.50); setprop("/it-autoflight/custom/show-hdg", 0); @@ -95,6 +95,16 @@ setlistener("/it-autoflight/input/ap1", func { } } else if (apmas == 1 and ac_ess >= 110 and law == 0) { if ((getprop("/gear/gear[1]/wow") == 0) and (getprop("/gear/gear[2]/wow") == 0)) { + if (getprop("/it-autoflight/output/lat") == 9) { + setprop("/it-autoflight/input/lat", 3); + } + if (getprop("/it-autoflight/output/vert") == 9) { + if (getprop("/it-autoflight/custom/trk-fpa") == 0) { + setprop("/it-autoflight/input/vert", 1); + } else if (getprop("/it-autoflight/custom/trk-fpa") == 1) { + setprop("/it-autoflight/input/vert", 5); + } + } fmabox(); setprop("/it-autoflight/output/ap1", 1); setprop("/it-autoflight/sound/enableapoffsound", 1); @@ -117,6 +127,16 @@ setlistener("/it-autoflight/input/ap2", func { } } else if (apmas == 1 and ac_ess >= 110 and law == 0) { if ((getprop("/gear/gear[1]/wow") == 0) and (getprop("/gear/gear[2]/wow") == 0)) { + if (getprop("/it-autoflight/output/lat") == 9) { + setprop("/it-autoflight/input/lat", 3); + } + if (getprop("/it-autoflight/output/vert") == 9) { + if (getprop("/it-autoflight/custom/trk-fpa") == 0) { + setprop("/it-autoflight/input/vert", 1); + } else if (getprop("/it-autoflight/custom/trk-fpa") == 1) { + setprop("/it-autoflight/input/vert", 5); + } + } fmabox(); setprop("/it-autoflight/output/ap2", 1); setprop("/it-autoflight/sound/enableapoffsound2", 1); @@ -239,6 +259,11 @@ var lateral = func { } else if (latset == 5) { setprop("/it-autoflight/output/lat", 5); setprop("/it-autoflight/custom/show-hdg", 0); + } else if (latset == 9) { + setprop("/it-autoflight/output/loc-armed", 0); + setprop("/it-autoflight/output/lat", 9); + setprop("/it-autoflight/mode/lat", " "); + setprop("/it-autoflight/mode/arm", " "); } } @@ -390,7 +415,13 @@ var vertical = func { alandt1.stop(); mng_sys_stop(); setprop("/it-autoflight/output/vert", 7); - setprop("/it-autoflight/mode/arm", " "); + if (getprop("/it-autoflight/output/loc-armed") == 1) { + setprop("/it-autoflight/mode/arm", "LOC"); + } else if (getprop("/it-autoflight/input/lat-arm") == 1) { + # Do nothing + } else { + setprop("/it-autoflight/mode/arm", " "); + } var altinput = getprop("/it-autoflight/input/alt"); setprop("/it-autoflight/internal/alt", altinput); thrustmodet.start(); @@ -416,6 +447,21 @@ var vertical = func { setprop("/it-autoflight/input/vert", 4); vertical(); } + } else if (vertset == 9) { + alandt.stop(); + alandt1.stop(); + mng_sys_stop(); + setprop("/it-autoflight/output/appr-armed", 0); + var altinput = getprop("/it-autoflight/input/alt"); + setprop("/it-autoflight/internal/alt", altinput); + setprop("/it-autoflight/output/vert", 9); + setprop("/it-autoflight/mode/vert", " "); + if (getprop("/it-autoflight/output/loc-armed")) { + setprop("/it-autoflight/mode/arm", "LOC"); + } else { + setprop("/it-autoflight/mode/arm", " "); + } + thrustmode(); } } @@ -534,7 +580,7 @@ setlistener("/it-autoflight/input/kts-mach", func { # Takeoff Modes # Lat Active var latarms = func { - if (getprop("/position/gear-agl-ft") >= 20) { + if (getprop("/position/gear-agl-ft") >= 30) { if (getprop("/it-autoflight/input/lat-arm") == 1) { setprop("/it-autoflight/input/lat", getprop("/it-autoflight/input/lat-arm")); setprop("/it-autoflight/input/lat-arm", 0); @@ -580,7 +626,7 @@ setlistener("/it-autoflight/mode/vert", func { setlistener("/it-autoflight/mode/lat", func { var vertm = getprop("/it-autoflight/mode/lat"); - if (vertm == "T/O") { + if (vertm == "T/O" or vertm == " ") { latarmt.start(); } else { latarmt.stop(); diff --git a/Nasal/PFD_FMA.nas b/Nasal/PFD_FMA.nas index 2f2854d8..fe74638c 100644 --- a/Nasal/PFD_FMA.nas +++ b/Nasal/PFD_FMA.nas @@ -86,28 +86,22 @@ var loopFMA = maketimer(0.05, func { var thr1 = getprop("/controls/engines/engine[0]/throttle-pos"); var thr2 = getprop("/controls/engines/engine[0]/throttle-pos"); if ((state1 == "TOGA" or state2 == "TOGA") or (flx == 1 and (state1 == "MCT" or state2 == "MCT")) or (flx == 1 and ((state1 == "MAN THR" and thr1 >= 0.83) or (state2 == "MAN THR" and thr2 >= 0.83)))) { - if (lat == "T/O") { - if (newlat != "RWY") { - setprop("/modes/pfd/fma/roll-mode", "RWY"); - } - } - if (vert == "T/O CLB") { - if (newvert != "SRS") { - setprop("/modes/pfd/fma/pitch-mode", "SRS"); - } + # RWY Engagement would go here, but automatic ILS selection is not simulated yet. + if (getprop("/FMGC/internal/v2-set") == 1 and getprop("/it-autoflight/output/vert") != 7) { + setprop("/it-autoflight/input/vert", 7); + setprop("/it-autoflight/mode/vert", "T/O CLB"); + fmgc.vertical(); } } else { var gear1 = getprop("/gear/gear[1]/wow"); var gear2 = getprop("/gear/gear[2]/wow"); - if (lat == "T/O" and (gear1 or gear2)) { - if (newlat != " ") { - setprop("/modes/pfd/fma/roll-mode", " "); - } + if (getprop("/it-autoflight/input/lat") == 5 and (gear1 or gear2)) { + setprop("/it-autoflight/input/lat", 9); + fmgc.lateral(); } - if (vert == "T/O CLB" and (gear1 or gear2)) { - if (newvert != " ") { - setprop("/modes/pfd/fma/pitch-mode", " "); - } + if (getprop("/it-autoflight/output/vert") == 7 and (gear1 or gear2)) { + setprop("/it-autoflight/input/vert", 9); + fmgc.vertical(); } } @@ -157,6 +151,14 @@ setlistener("/it-autoflight/mode/lat", func { if (newlat != " ") { setprop("/modes/pfd/fma/roll-mode", " "); } + } else if (lat == "T/O") { + if (newlat != "RWY") { + setprop("/modes/pfd/fma/roll-mode", "RWY"); + } + } else if (lat == " ") { + if (newlat != " ") { + setprop("/modes/pfd/fma/roll-mode", " "); + } } }); @@ -244,9 +246,10 @@ setlistener("/it-autoflight/mode/vert", func { setprop("/modes/pfd/fma/pitch-mode", "ROLL OUT"); } } else if (vert == "T/O CLB") { - if (newvertarm != "CLB") { - setprop("/modes/pfd/fma/pitch-mode2-armed", "CLB"); + if (newvert != "SRS") { + setprop("/modes/pfd/fma/pitch-mode", "SRS"); } + updatePitchArm2(); } else if (vert == "G/A CLB") { if (newvert != "SRS") { setprop("/modes/pfd/fma/pitch-mode", "SRS"); @@ -282,10 +285,28 @@ setlistener("/it-autoflight/mode/vert", func { if (newvertarm != "ALT") { setprop("/modes/pfd/fma/pitch-mode2-armed", "ALT"); } + } else if (vert == " ") { + if (newvert != " ") { + setprop("/modes/pfd/fma/pitch-mode", " "); + } + updatePitchArm2(); } altvert(); }); +setlistener("/FMGC/internal/v2-set", func { + updatePitchArm2(); +}); + +var updatePitchArm2 = func { + var newvertarm = getprop("/modes/pfd/fma/pitch-mode2-armed"); + if (newvertarm != "CLB" and getprop("/FMGC/internal/v2-set") == 1) { + setprop("/modes/pfd/fma/pitch-mode2-armed", "CLB"); + } else if (newvertarm != " " and getprop("/FMGC/internal/v2-set") != 1) { + setprop("/modes/pfd/fma/pitch-mode2-armed", " "); + } +} + var gsupdate = maketimer(0.5, func { var vert = getprop("/it-autoflight/mode/vert"); var newvert = getprop("/modes/pfd/fma/pitch-mode"); diff --git a/revision.txt b/revision.txt index 5bd2156f..8fae38dc 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -3007 \ No newline at end of file +3008 \ No newline at end of file