Merge branch 'master' into fix-fuel

.github/CHANGELOG.md

@@ -76,6 +76,8 @@
 1. [FLIGHTMODEL] Fixes some crosswind issues - @donstim (donbikes)
 1. [LIGHTS] Movement of landing lights now requires power and position is output into LVAR -  @Maximilian-Reuter
 1. [CDU] Fix auto weight and balance import on INIT B during GSX boarding not using the target values - @Maximilian-Reuter
+1. [FAC] Improve sideslip estimation - @lukecologne (luke)
+1. [FWC] Implement overspeed VMO/MMO warning - @tracernz (Mike)
 
 ## 0.11.0
 

fbw-a32nx/docs/a320-simvars.md

@@ -1640,6 +1640,10 @@ In the variables below, {number} should be replaced with one item in the set: {
     - Arinc429Word<Knots>
     - The computed airspeed (CAS).
 
+- A32NX_ADIRS_ADR_{number}_MAX_AIRSPEED
+    - Arinc429Word<Knots>
+    - The max allowable airspeed (CAS), considering VMO and MMO.
+
 - A32NX_ADIRS_ADR_{number}_MACH
     - Arinc429Word<Mach>
     - The Mach number (M).
@@ -1664,6 +1668,30 @@ In the variables below, {number} should be replaced with one item in the set: {
     - Arinc429Word<Degrees>
     - The angle of attack (α) of the aircraft
 
+- A32NX_ADIRS_ADR_{number}_DISCRETE_WORD_1
+    - Arinc429Word<flags>
+    - Indicates state of the ADR
+      Bit | Meaning
+      --- | ---
+        0 | ICING_DETECTOR_HEAT (not yet implemented)
+        1 | PITOT_HEAT (not yet implemented)
+        2 | ADR_FAULT
+        3 | RIGHT_STATIC_HEAT (not yet implemented)
+        4 | LEFT_STATIC_HEAT (not yet implemented)
+        5 | TAT_HEAT (not yet implemented)
+        6 | AOA_SENSOR_1_FAULT (not yet implemented)
+        7 | AOA_SENSOR_2_FAULT (not yet implemented)
+        8 | OVERSPEED_WARNING
+       10 | AOA_UNIQUE (not yet implemented)
+       11 | VMO_MMO_1 (not yet implemented)
+       12 | VMO_MMO_2 (not yet implemented)
+       13 | VMO_MMO_3 (not yet implemented)
+       14 | VMO_MMO_4 (not yet implemented)
+       15 | ALTERNATE_SSEC_A (not yet implemented)
+       16 | ALTERNATE_SSEC_B (not yet implemented)
+       17 | BARO_PORT_A (not yet implemented)
+       18 | ZERO_MACH_IGNORE_SSEC (not yet implemented)
+
 - A32NX_ADIRS_IR_{number}_PITCH
     - Arinc429Word<Degrees>
     - The pitch angle of the aircraft.

fbw-a32nx/src/README.md

@@ -9,7 +9,7 @@ The `src` directory is structured as follows:
 - behavior        <behavior sources files>
 - fonts           <fonts files>
 - model           <model sources files>
-- systems         <TypeScrtipt absed systems incl. instruments>
+- systems         <TypeScript based systems incl. instruments>
 - textures        <textures files>
 - wasm            <rust and c++ sources files for wasm>
 ```

fbw-a32nx/src/base/flybywire-aircraft-a320-neo/SimObjects/AirPlanes/FlyByWire_A320_NEO/aircraft.cfg

@@ -72,8 +72,8 @@ model = "" ; model folder
 panel = "" ; panel folder
 sound = "" ; sound folder
 texture = "" ; texture folder
-kb_checklists = "Boeing747-400_check" ; Procedures/Checklist sibling file name
-kb_reference = "Boeing747-400_ref" ; Reference information sibling file name
+kb_checklists = "" ; Procedures/Checklist sibling file name
+kb_reference = "" ; Reference information sibling file name
 description = "TT:AIRCRAFT.DESCRIPTION" ; Variation description.
 wip_indicator = 0 ; know if the variation is good to go or still WIP : -1=Disabled, 0=Rough, 1=1st Pass, 2=Finished
 ui_manufacturer = "FlyByWire Simulations" ; e.g. Boeing, Cessna
@@ -86,11 +86,10 @@ ui_certified_ceiling = 39800 ; service ceiling / max certified operating altitud
 ui_max_range = 3500 ; max distance the aircraft can fly between take-off and landing in (NM)
 ui_autonomy = 7 ; max duration the aircraft can fly between take-off and landing in (Hrs)
 ui_fuel_burn_rate = 5300 ; average fuel consumption per hour (lbs/hr) - reminder: fuel density is ~6.7lbs per US gallon
-atc_id = "ASX320" ; tail number
-atc_id_enable = 0 ; enable tail number
-atc_airline = "" ; airline name
-atc_flight_number = "1123" ; flight number
-atc_heavy = 1 ; heavy?
+atc_id = "FBW320" ; tail number
+atc_airline = "Fly By Wire" ; airline name
+atc_flight_number = "320" ; flight number
+atc_heavy = 0 ;
 atc_parking_types = "GATE,RAMP,CARGO" ; "ANY" / "RAMP" / "CARGO" / "MIL_CARGO" / "MIL_COMBAT" / "GATE" / "DOCK"
 atc_parking_codes = "" ; Comma separated and may be as small as one character each
 atc_id_color = "" ; color for the tail number : i.e. "#ffff00ff"

fbw-a32nx/src/base/flybywire-aircraft-a320-neo/html_ui/Pages/VCockpit/Instruments/Airliners/FlyByWire_A320_Neo/FMC/A32NX_FMCMainDisplay.js

@@ -4600,7 +4600,7 @@ class FMCMainDisplay extends BaseAirliners {
     }
 
     isPdFormat(s) {
-        const pd = s.match(/^([^\/]+)\/([0-9]{1,3}(\.[0-9])?)$/);
+        const pd = s.match(/^([^\/]+)\/([\-\+]?[0-9]{1,3}(\.[0-9])?)$/);
         return pd !== null && this.isPlaceFormat(pd[1]);
     }
 

fbw-a32nx/src/systems/instruments/src/Common/EWDMessages.tsx

@@ -357,6 +357,8 @@ const EWDMessages = {
     '320019503': '\x1b<5m -GPWS SYS...........OFF',
     '340014001': '\x1b<4m\x1b4mNAV\x1bm RA 1 FAULT',
     '340015001': '\x1b<4m\x1b4mNAV\x1bm RA 2 FAULT',
+    '340017001': '\x1b<2m\x1b4mOVER SPEED\x1bm',
+    '340017002': '\x1b<2m -VMO/MMO........350/.82',
     '340050001': '\x1b<4m\x1b4mNAV\x1bm TCAS FAULT',
     '340050701': '\x1b<4m\x1b4mNAV\x1bm TCAS STBY',
     '340021001': '\x1b<2m\x1b4mOVERSPEED\x1bm',

fbw-a32nx/src/systems/instruments/src/EWD/PseudoFWC.ts

@@ -567,6 +567,10 @@ export class PseudoFWC {
 
     private readonly height2Failed = Subject.create(false);
 
+    private adr3OverspeedWarning = new NXLogicMemoryNode(false, false);
+
+    private readonly overspeedWarning = Subject.create(false);
+
     private readonly flapsIndex = Subject.create(0);
 
     /** ENGINE AND THROTTLE */
@@ -1049,6 +1053,21 @@ export class PseudoFWC {
         const height2: Arinc429Word = Arinc429Word.fromSimVarValue('L:A32NX_RA_2_RADIO_ALTITUDE');
         this.height1Failed.set(height1.isFailureWarning());
         this.height2Failed.set(height2.isFailureWarning());
+        // overspeed
+        const adr3Cas = Arinc429Word.fromSimVarValue('L:A32NX_ADIRS_ADR_3_COMPUTED_AIRSPEED');
+        const adr3MaxCas = Arinc429Word.fromSimVarValue('L:A32NX_ADIRS_ADR_3_MAX_AIRSPEED');
+        let overspeedWarning = this.adr3OverspeedWarning.write(
+            adr3Cas.isNormalOperation() && adr3MaxCas.isNormalOperation() && adr3Cas.value > (adr3MaxCas.value + 8),
+            this.aircraftOnGround.get() || !(adr3Cas.isNormalOperation() && adr3MaxCas.isNormalOperation()) || adr3Cas.value < (adr3MaxCas.value + 4),
+        );
+        const adr1Discrete1 = Arinc429Word.fromSimVarValue('L:A32NX_ADIRS_ADR_1_DISCRETE_WORD_1');
+        const adr2Discrete1 = Arinc429Word.fromSimVarValue('L:A32NX_ADIRS_ADR_2_DISCRETE_WORD_1');
+        if (!(adr1Discrete1.isNormalOperation() || adr1Discrete1.isFunctionalTest()) || !(adr2Discrete1.isNormalOperation() || adr2Discrete1.isFunctionalTest())) {
+            const adr3Discrete1 = Arinc429Word.fromSimVarValue('L:A32NX_ADIRS_ADR_3_DISCRETE_WORD_1');
+            overspeedWarning ||= adr3Discrete1.getBitValueOr(9, false);
+        }
+        overspeedWarning ||= adr1Discrete1.getBitValueOr(9, false) || adr2Discrete1.getBitValueOr(9, false);
+        this.overspeedWarning.set(overspeedWarning);
 
         /* LANDING GEAR AND LIGHTS */
 
@@ -1881,6 +1900,17 @@ export class PseudoFWC {
             side: 'LEFT',
         },
         // 34 - NAVIGATION & SURVEILLANCE
+        3400170: { // OVER SPEED VMO/MMO
+            flightPhaseInhib: [2, 3, 4, 8, 9, 10],
+            simVarIsActive: this.overspeedWarning,
+            whichCodeToReturn: () => [0, 1],
+            codesToReturn: ['340017001', '340017002'],
+            memoInhibit: () => false,
+            failure: 3,
+            sysPage: -1,
+            side: 'LEFT',
+            cancel: false,
+        },
         3400210: { // OVERSPEED FLAPS FULL
             flightPhaseInhib: [2, 3, 4, 8, 9, 10],
             simVarIsActive: MappedSubject

fbw-a32nx/src/systems/instruments/src/MsfsAvionicsCommon/providers/DmcPublisher.tsx

@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 FlyByWire Simulations
+// Copyright (c) 2021-2024 FlyByWire Simulations
 //
 // SPDX-License-Identifier: GPL-3.0
 
@@ -41,7 +41,8 @@ export class DmcPublisher extends SimVarPublisher<DmcDiscreteInputEvents> {
         super(simVars, eventBus);
     }
 
-    init(): void {
+    /** @inheritdoc */
+    public startPublish(): void {
         const pub = this.eventBus.getPublisher<DmcLogicEvents>();
 
         this.trueRefActive.sub((v) => {
@@ -65,6 +66,8 @@ export class DmcPublisher extends SimVarPublisher<DmcDiscreteInputEvents> {
         sub.on('magTrackRaw').handle((v) => this.magTrack.setWord(v));
         sub.on('trueHeadingRaw').handle((v) => this.trueHeading.setWord(v));
         sub.on('trueTrackRaw').handle((v) => this.trueTrack.setWord(v));
+
+        super.startPublish();
     }
 
     private handleTrueRef(): void {

fbw-a32nx/src/systems/instruments/src/ND/instrument.tsx

@@ -105,8 +105,6 @@ class NDInstrument implements FsInstrument {
     private doInit(): void {
         this.backplane.init();
 
-        this.dmcPublisher.init();
-
         this.adirsValueProvider.start();
 
         const sub = this.bus.getSubscriber<NDSimvars>();

fbw-a32nx/src/systems/instruments/src/PFD/AttitudeIndicatorHorizon.tsx

@@ -440,10 +440,6 @@ interface SideslipIndicatorProps {
 class SideslipIndicator extends DisplayComponent<SideslipIndicatorProps> {
     private latAccFilter = new LagFilter(0.5);
 
-    private estimatedBetaFilter = new LagFilter(2);
-
-    private betaTargetFilter = new LagFilter(2);
-
     private classNameSub = Subject.create('Yellow');
 
     private filteredLatAccSub = Subject.create(0);

fbw-a32nx/src/systems/instruments/src/PFD/FMA.tsx

@@ -812,7 +812,7 @@ class B1Cell extends ShowForSecondsComponent<CellProps> {
             break;
         }
         case VerticalMode.VS: {
-            const VSText = `${(this.selectedVS > 0 ? '+' : '')}${Math.round(this.selectedVS).toString()}`.padStart(5, ' ');
+            const VSText = `${(this.selectedVS > 0 ? '+' : '')}${Math.round(this.selectedVS).toString()}`.padStart(5, '\xa0');
 
             text = 'V/S';
 
@@ -1536,9 +1536,9 @@ class D3Cell extends DisplayComponent<{bus: ArincEventBus}> {
         ([mdaMode, dh, mda]) => {
             switch (mdaMode) {
             case MdaMode.Baro:
-                return Math.round(mda.value).toString().padStart(6, ' ');
+                return Math.round(mda.value).toString().padStart(6, '\xa0');
             case MdaMode.Radio:
-                return Math.round(dh.value).toString().padStart(4, ' ');
+                return Math.round(dh.value).toString().padStart(4, '\xa0');
             default:
                 return '';
             }

fbw-a32nx/src/systems/instruments/src/PFD/instrument.tsx

@@ -15,6 +15,8 @@ import { SimplaneValueProvider } from './shared/SimplaneValueProvider';
 
 import './style.scss';
 
+// TODO move this whole thing to InstrumentBackplane and GameStateProvider
+
 class A32NX_PFD extends BaseInstrument {
     private bus: ArincEventBus;
 
@@ -75,7 +77,7 @@ class A32NX_PFD extends BaseInstrument {
 
         this.arincProvider.init();
         this.clock.init();
-        this.dmcPublisher.init();
+        this.dmcPublisher.startPublish();
 
         FSComponent.render(<PFDComponent bus={this.bus} instrument={this} />, document.getElementById('PFD_CONTENT'));
 

fbw-a32nx/src/wasm/extra-backend-a32nx/src/AircraftPresets/AircraftPresetProcedures_A32NX.h

@@ -121,36 +121,36 @@ class AircraftPresetProcedures_A32NX {
         ProcedureStep{"FUEL VALVE 10 On",        2040, false, 500,  "(A:FUELSYSTEM VALVE SWITCH:10, Bool)",          "10 (>K:FUELSYSTEM_VALVE_OPEN)"},
         ProcedureStep{"FUEL PUMP 3 On",          2050, false, 100,  "(A:FUELSYSTEM PUMP SWITCH:3, Bool)",            "3 (>K:FUELSYSTEM_PUMP_ON)"},
         ProcedureStep{"FUEL PUMP 6 On",          2060, false, 2000, "(A:FUELSYSTEM PUMP SWITCH:6, Bool)",            "6 (>K:FUELSYSTEM_PUMP_ON)"},
-        ProcedureStep{"COCKPIT DOOR LCK",        2110, false, 2000, "(L:A32NX_COCKPIT_DOOR_LOCKED) 1 ==",            "1 (>L:A32NX_COCKPIT_DOOR_LOCKED)"},
+        // next step will keep a slgitht delay as the A32NX otherwise often did not start up the ENG2 in step 3010
+        ProcedureStep{"Cockpit Door Locked",     2110, false, 2000, "(L:A32NX_COCKPIT_DOOR_LOCKED) 1 ==",            "1 (>L:A32NX_COCKPIT_DOOR_LOCKED)", true},
         ProcedureStep{"Await ADIRS 1 Alignment", 2150, true,  2000, "",                                              "(L:A32NX_ADIRS_ADIRU_1_STATE) 2 =="},
         ProcedureStep{"Await ADIRS 2 Alignment", 2160, true,  2000, "",                                              "(L:A32NX_ADIRS_ADIRU_2_STATE) 2 =="},
         ProcedureStep{"Await ADIRS 3 Alignment", 2170, true,  2000, "",                                              "(L:A32NX_ADIRS_ADIRU_3_STATE) 2 =="},
       },
 
       .PUSHBACK_CONFIG_OFF = {
-        ProcedureStep{"COCKPIT DOOR OP", 2250, false, 2000, "(L:A32NX_COCKPIT_DOOR_LOCKED) 0 ==",          "0 (>L:A32NX_COCKPIT_DOOR_LOCKED)"},
-        ProcedureStep{"FUEL PUMP 2 Off", 2260, false, 100,  "(A:FUELSYSTEM PUMP SWITCH:2, Bool) !",        "2 (>K:FUELSYSTEM_PUMP_OFF)"},
-        ProcedureStep{"FUEL PUMP 5 Off", 2270, false, 500,  "(A:FUELSYSTEM PUMP SWITCH:5, Bool) !",        "5 (>K:FUELSYSTEM_PUMP_OFF)"},
-        ProcedureStep{"FUEL VALVE 9 Off", 2280, false, 100, "(A:FUELSYSTEM VALVE SWITCH:9, Bool) !",       "9 (>K:FUELSYSTEM_VALVE_CLOSE)"},
-        ProcedureStep{"FUEL VALVE 10 Off",2290, false, 500, "(A:FUELSYSTEM VALVE SWITCH:10, Bool) !",      "10 (>K:FUELSYSTEM_VALVE_CLOSE)"},
-        ProcedureStep{"FUEL PUMP 3 Off", 2300, false, 100,  "(A:FUELSYSTEM PUMP SWITCH:3, Bool) !",        "3 (>K:FUELSYSTEM_PUMP_OFF)"},
-        ProcedureStep{"FUEL PUMP 6 Off", 2310, false, 1000, "(A:FUELSYSTEM PUMP SWITCH:6, Bool) !",        "6 (>K:FUELSYSTEM_PUMP_OFF)"},
-        ProcedureStep{"Beacon Off",      2190, false, 1000, "(A:LIGHT BEACON, Bool) !",                    "0 (>K:BEACON_LIGHTS_OFF)"},
+        ProcedureStep{"Cockpit Door open",    2250, false, 2000, "(L:A32NX_COCKPIT_DOOR_LOCKED) 0 ==",                "0 (>L:A32NX_COCKPIT_DOOR_LOCKED)"},
+        ProcedureStep{"Fuel Pump 2 Off",      2260, false,  100, "(A:FUELSYSTEM PUMP SWITCH:2, Bool) !",              "2 (>K:FUELSYSTEM_PUMP_OFF)"},
+        ProcedureStep{"Fuel Pump 5 Off",      2270, false,  500, "(A:FUELSYSTEM PUMP SWITCH:5, Bool) !",              "5 (>K:FUELSYSTEM_PUMP_OFF)"},
+        ProcedureStep{"Fuel Valve 9 Off",     2280, false,  100, "(A:FUELSYSTEM VALVE SWITCH:9, Bool) !",             "9 (>K:FUELSYSTEM_VALVE_CLOSE)"},
+        ProcedureStep{"Fuel Valve 10 Off",    2290, false,  500, "(A:FUELSYSTEM VALVE SWITCH:10, Bool) !",            "10 (>K:FUELSYSTEM_VALVE_CLOSE)"},
+        ProcedureStep{"Fuel Pump 3 Off",      2300, false,  100, "(A:FUELSYSTEM PUMP SWITCH:3, Bool) !",              "3 (>K:FUELSYSTEM_PUMP_OFF)"},
+        ProcedureStep{"Fuel Pump 6 Off",      2310, false, 1000, "(A:FUELSYSTEM PUMP SWITCH:6, Bool) !",              "6 (>K:FUELSYSTEM_PUMP_OFF)"},
+        ProcedureStep{"Beacon Off",           2190, false, 1000, "(A:LIGHT BEACON, Bool) !",                          "0 (>K:BEACON_LIGHTS_OFF)"},
       },
 
       .TAXI_CONFIG_ON = {
         // SOP: ENGINE START
         ProcedureStep{"ENG MODE SEL START",   3000, false, 3000,  "(L:A32NX_ENGINE_STATE:1) 1 == "
-                                                                  "(L:A32NX_ENGINE_STATE:2) 1 == && "
-                                                                  "(K:TURBINE_IGNITION_SWITCH_SET1) 2 == "
-                                                                  "(K:TURBINE_IGNITION_SWITCH_SET2) 2 == && ||",      "2 (>K:TURBINE_IGNITION_SWITCH_SET1) 2 (>K:TURBINE_IGNITION_SWITCH_SET2)"},
-        ProcedureStep{"ENG 2 ON",             3010, false, 60000, "(A:FUELSYSTEM VALVE OPEN:2, Bool)",                "2 (>K:FUELSYSTEM_VALVE_OPEN)"},
-        ProcedureStep{"Await ENG 2 AVAIL",    3020, true,  5000,  "",                                                 "(L:A32NX_ENGINE_STATE:2) 1 =="},
-        ProcedureStep{"ENG 1 ON",             3030, false, 60000, "(A:FUELSYSTEM VALVE OPEN:1, Bool)",                "1 (>K:FUELSYSTEM_VALVE_OPEN)"},
-        ProcedureStep{"Await ENG 1 AVAIL",    3040, true,  5000,  "",                                                 "(L:A32NX_ENGINE_STATE:1) 1 =="},
+                                                                  "(L:A32NX_ENGINE_STATE:2) 1 == && ",                "2 (>K:TURBINE_IGNITION_SWITCH_SET2) "
+                                                                                                                      "2 (>K:TURBINE_IGNITION_SWITCH_SET1)"},
+        ProcedureStep{"ENG 2 On",             3010, false, 60000, "(A:FUELSYSTEM VALVE OPEN:2, Bool)",                "2 (>K:FUELSYSTEM_VALVE_OPEN)"},
+        ProcedureStep{"Await ENG 2 Avail",    3020, true,  5000,  "",                                                 "(L:A32NX_ENGINE_STATE:2) 1 =="},
+        ProcedureStep{"ENG 1 On",             3030, false, 60000, "(A:FUELSYSTEM VALVE OPEN:1, Bool)",                "1 (>K:FUELSYSTEM_VALVE_OPEN)"},
+        ProcedureStep{"Await ENG 1 Avail",    3040, true,  5000,  "",                                                 "(L:A32NX_ENGINE_STATE:1) 1 =="},
         // SOP: AFTER START
-        ProcedureStep{"ENG MODE SEL NORM",    3050, false, 3000,  "(A:TURB ENG IGNITION SWITCH EX1:1, Bool) 1 == "
-                                                                  "(A:TURB ENG IGNITION SWITCH EX1:2, Bool) 1 == &&", "1 (>K:TURBINE_IGNITION_SWITCH_SET1) 1 (>K:TURBINE_IGNITION_SWITCH_SET2)"},
+        ProcedureStep{"ENG MODE SEL Norm",    3050, false, 3000,  "",                                                 "1 (>K:TURBINE_IGNITION_SWITCH_SET1) "
+                                                                                                                      "1 (>K:TURBINE_IGNITION_SWITCH_SET2) "},
         ProcedureStep{"APU Bleed Off",        3060, false, 2000,  "(L:A32NX_OVHD_PNEU_APU_BLEED_PB_IS_ON) 0 ==",      "0 (>L:A32NX_OVHD_PNEU_APU_BLEED_PB_IS_ON)"},
         ProcedureStep{"APU Master Off",       3070, false, 2000,  "(L:A32NX_OVHD_APU_MASTER_SW_PB_IS_ON) 0 ==",       "0 (>L:A32NX_OVHD_APU_MASTER_SW_PB_IS_ON)"},
         ProcedureStep{"Spoiler Arm",          3090, false, 2000,  "(L:A32NX_SPOILERS_ARMED) 1 ==",                    "1 (>K:SPOILERS_ARM_SET)"},
@@ -163,17 +163,17 @@ class AircraftPresetProcedures_A32NX {
         ProcedureStep{"PWS Auto",             2070, false, 1000,  "(L:A32NX_SWITCH_RADAR_PWS_POSITION) 1 ==",         "1 (>L:A32NX_SWITCH_RADAR_PWS_POSITION)"},
         ProcedureStep{"Transponder On",       2080, false, 1000,  "(L:A32NX_TRANSPONDER_MODE) 1 ==",                  "1 (>L:A32NX_TRANSPONDER_MODE)"},
         ProcedureStep{"ATC ALT RPTG On",      2090, false, 1000,  "(L:A32NX_SWITCH_ATC_ALT) 1 ==",                    "1 (>L:A32NX_SWITCH_ATC_ALT)"},
-        ProcedureStep{"TCAS TRAFFIC ABV",     2100, false, 2000,  "(L:A32NX_SWITCH_TCAS_TRAFFIC_POSITION) 2 ==",      "2 (>L:A32NX_SWITCH_TCAS_TRAFFIC_POSITION)"},
+        ProcedureStep{"TCAS TRAFFIC Abv",     2100, false, 2000,  "(L:A32NX_SWITCH_TCAS_TRAFFIC_POSITION) 2 ==",      "2 (>L:A32NX_SWITCH_TCAS_TRAFFIC_POSITION)"},
         ProcedureStep{"Autobrake Max",        3080, false, 2000,  "(L:A32NX_AUTOBRAKES_ARMED_MODE) 3 ==",             "3 (>L:A32NX_AUTOBRAKES_ARMED_MODE_SET)"},
         ProcedureStep{"TERR ON ND Capt. On",  3080, false, 2000,  "(L:A32NX_EFIS_TERR_L_ACTIVE) 1 ==",                "1 (>L:A32NX_EFIS_TERR_L_ACTIVE)"},
         ProcedureStep{"T.O Config",           3085, false, 200,   "",                                                 "1 (>L:A32NX_BTN_TOCONFIG)"},
         ProcedureStep{"T.O Config",           3085, false, 2000,  "",                                                 "0 (>L:A32NX_BTN_TOCONFIG)"},
       },
 
       .TAXI_CONFIG_OFF = {
-        ProcedureStep{"TERR ON ND Capt. Off",  3080, false, 2000, "(L:A32NX_EFIS_TERR_L_ACTIVE) 0 ==",          "0 (>L:A32NX_EFIS_TERR_L_ACTIVE)"},
+        ProcedureStep{"TERR ON ND Capt. Off",  3080, false, 2000, "(L:A32NX_EFIS_TERR_L_ACTIVE) 0 ==",           "0 (>L:A32NX_EFIS_TERR_L_ACTIVE)"},
         ProcedureStep{"Autobrake Off",         3180, false, 2000, "(L:A32NX_AUTOBRAKES_ARMED_MODE) 0 ==",        "0 (>L:A32NX_AUTOBRAKES_ARMED_MODE_SET)"},
-        ProcedureStep{"TCAS TRAFFIC ABV",      2240, false, 1000, "(L:A32NX_SWITCH_TCAS_TRAFFIC_POSITION) 2 ==", "2 (>L:A32NX_SWITCH_TCAS_TRAFFIC_POSITION)"},
+        ProcedureStep{"TCAS TRAFFIC Abv",      2240, false, 1000, "(L:A32NX_SWITCH_TCAS_TRAFFIC_POSITION) 2 ==", "2 (>L:A32NX_SWITCH_TCAS_TRAFFIC_POSITION)"},
         ProcedureStep{"ATC ALT RPTG Off",      2230, false, 1000, "(L:A32NX_SWITCH_ATC_ALT) 1 ==",               "1 (>L:A32NX_SWITCH_ATC_ALT)"},
         ProcedureStep{"Transponder Off",       2220, false, 1000, "(L:A32NX_TRANSPONDER_MODE) 0 ==",             "0 (>L:A32NX_TRANSPONDER_MODE)"},
         ProcedureStep{"PWS Off",               2210, false, 1000, "(L:A32NX_SWITCH_RADAR_PWS_POSITION) 0 ==",    "0 (>L:A32NX_SWITCH_RADAR_PWS_POSITION)"},