feat: electrical systems (flybywiresim#2582)

tomprovence2 · Mar 1, 2021 · 39de157 · 39de157
1 parent dfbc3f3
commit 39de157
Show file tree

Hide file tree

Showing 61 changed files with 7,770 additions and 2,156 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -116,6 +116,61 @@
 1. [ECAM] Refactor COND/OXY page to use new useSimVars - @RichardPilbery (tricky_dicky[Z+0]#3571)
 1. [LIGHTS] Added ambient light to the cockpit - @ImenesFBW (Imenes)
 1. [MCDU] INIT-B page - Fixed Trip Wind value handling - @SergeySoprykin (SergeyS)
+1. [ELEC] Basic integrated drive generator implementation - @davidwalschots (David Walschots)
+1. [ELEC] A fully functional ELEC page on the lower ECAM - @davidwalschots (David Walschots)
+1. [ELEC] Contactor logic is fully modelled - @davidwalschots (David Walschots)
+1. [ELEC] GEN 1 and GEN 2 have priority over the APU and EXT PWR - @davidwalschots (David Walschots)
+1. [ELEC] EXT PWR has priority over the APU - @davidwalschots (David Walschots)
+1. [ELEC] When a single engine generator is active, it powers both AC BUS 1 and 2 - @davidwalschots (David Walschots)
+1. [ELEC] When only the APU is active, it powers both AC BUS 1 and 2 - @davidwalschots (David Walschots)
+1. [ELEC] When only EXT PWR is active, it powers both AC BUS 1 and 2 - @davidwalschots (David Walschots)
+1. [ELEC] When the BUS TIE push button is OFF, GEN n can only power AC BUS n - @davidwalschots (David Walschots)
+1. [ELEC] When the BUS TIE push button is OFF, APU and EXT PWR cannot power the aircraft - @davidwalschots (David Walschots)
+1. [ELEC] When the APU GEN push button is OFF, the APU cannot power the aircraft - @davidwalschots (David Walschots)
+1. [ELEC] When the EXT PWR push button is OFF, EXT PWR cannot power the aircraft - @davidwalschots (David Walschots)
+1. [ELEC] When the GEN n push button is OFF, GEN n cannot power the aircraft - @davidwalschots (David Walschots)
+1. [ELEC] When the IDG n push button is RELEASED, GEN n cannot power the aircraft - @davidwalschots (David Walschots)
+1. [ELEC] When AC BUS 1 is powered, it powers AC ESS BUS - @davidwalschots (David Walschots)
+1. [ELEC] When AC BUS 1 is unpowered and AC BUS 2 is powered, AC ESS BUS is automatically powered by AC BUS 2 after three seconds - @davidwalschots (David Walschots)
+1. [ELEC] When AC BUS 1 becomes powered after being unpowered, AC ESS BUS is powered by AC BUS 1 without delay - @davidwalschots (David Walschots)
+1. [ELEC] When AC ESS FEED push button is set to ALTN, AC ESS BUS is powered by AC BUS 2 without delay - @davidwalschots (David Walschots)
+1. [ELEC] In normal conditions, TR 1 supplies power to DC BUS 1, DC BAT BUS, and DC ESS BUS - @davidwalschots (David Walschots)
+1. [ELEC] In normal conditions, TR 2 supplies power to DC BUS 2 - @davidwalschots (David Walschots)
+1. [ELEC] When TR 1 is unavailable, TR 2 supplies power to DC BUS 2, DC BAT BUS, and DC BUS 1 - @davidwalschots (David Walschots)
+1. [ELEC] When TR 2 is unavailable, TR 1 supplies power to DC BUS 1, DC BAT BUS, and DC BUS 2 - @davidwalschots (David Walschots)
+1. [ELEC] When TR n is unavailable, TR ESS supplies power to DC ESS BUS - @davidwalschots (David Walschots)
+1. [ELEC] Above 100 knots, when TR 1 + 2 are unavailable, DC BAT BUS is unpowered - @davidwalschots (David Walschots)
+1. [ELEC] At or below 100 knots, when TR 1 + 2 are unavailable DC BAT BUS is powered by the batteries - @davidwalschots (David Walschots)
+1. [ELEC] In certain conditions DC ESS BUS is powered by BAT 2 - @davidwalschots (David Walschots)
+1. [ELEC] In certain conditions AC STAT INV BUS is powered by BAT 1 through the static inverter - @davidwalschots (David Walschots)
+1. [ELEC] In certain conditions AC ESS BUS is powered by BAT 1 via the static inverter - @davidwalschots (David Walschots)
+1. [ELEC] When the BAT 1 to static inverter contactor is closed, an arrow with STAT INV appears next to BAT 1 on the ECAM - @davidwalschots (David Walschots)
+1. [ELEC] Both galleys are shed when none of the main power sources (GEN 1, GEN 2, APU GEN, or EXT PWR) is powering the aircraft - @davidwalschots (David Walschots)
+1. [ELEC] The main galley is shed when the aircraft is powered by a single engine generator - @davidwalschots (David Walschots)
+1. [ELEC] The main galley is shed when the aircraft is in flight and supplied by APU GEN only - @davidwalschots (David Walschots)
+1. [ELEC] The main and secondary galley are shed when the COMMERCIAL push button is OFF - @davidwalschots (David Walschots)
+1. [ELEC] The main and secondary galley are shed when the GALY & CAB push button is OFF - @davidwalschots (David Walschots)
+1. [ELEC] When the main or secondary galley is shed GALLEY SHED is indicated on the ECAM - @davidwalschots (David Walschots)
+1. [ELEC] The AC ESS FEED FAULT light illuminates when AC ESS BUS isn't powered - @davidwalschots (David Walschots)
+1. [ELEC] The battery voltage is equal to the ECAM indicated voltage - @davidwalschots (David Walschots)
+1. [ELEC] The legend of buses is displayed in green when powered, amber otherwise - @davidwalschots (David Walschots)
+1. [ELEC] The DC BAT BUS legend becomes amber XX when unpowered - @davidwalschots (David Walschots)
+1. [ELEC] When the BAT n push button is OFF, OFF is indicated. Otherwise the electrical parameters are displayed - @davidwalschots (David Walschots)
+1. [ELEC] When DC BAT BUS powered by batteries, the BAT to DC BAT BUS wire is displayed - @davidwalschots (David Walschots)
+1. [ELEC] Transformer rectifiers legend is white, unless V or A is amber, then it is also amber - @davidwalschots (David Walschots)
+1. [ELEC] When AC BUS 1 or AC BUS 2 are unpowered, the wires leading to TR 1 and TR 2 turn amber - @davidwalschots (David Walschots)
+1. [ELEC] ESS TR arrow and wire appear in green when ESS TR contactor is closed - @davidwalschots (David Walschots)
+1. [ELEC] A basic emergency generator implementation is created, but not yet usable until HYD is implemented - @davidwalschots (David Walschots)
+1. [ELEC] GEN 1 + 2 legend indicates amber OFF when the respective GEN push button is OFF - @davidwalschots (David Walschots)
+1. [ELEC] GEN 1 + 2 indicates electrical parameters - @davidwalschots (David Walschots)
+1. [ELEC] EXT PWR indicates electrical parameters - @davidwalschots (David Walschots)
+1. [ELEC] The static inverter legend is displayed when BAT 1 supplies AC ESS through the static inverter - @davidwalschots (David Walschots)
+1. [ELEC] The static inverter box is displayed when BAT 1 supplies AC ESS through the static inverter - @davidwalschots (David Walschots)
+1. [ELEC] IDG oil outlet temperature is indicated - @davidwalschots (David Walschots)
+1. [ELEC] When the IDG is disconnected, the IDG text becomes amber - @davidwalschots (David Walschots)
+1. [ELEC] When the IDG is disconnected, DISC appears in amber - @davidwalschots (David Walschots)
+1. [ELEC] SHED appears below the AC ESS BUS when AC ESS SHED BUS is unpowered - @davidwalschots (David Walschots)
+1. [ELEC] SHED appears below the DC ESS BUS when DC ESS SHED BUS is unpowered - @davidwalschots (David Walschots)
 
 ## 0.5.2
 1. [CDU] Changing CRZ/DES speed to acknowledge any speed restriction - @Watsi01 (RogePete)

diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/Checklist/Library.xml b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/Checklist/Library.xml
@@ -2055,7 +2055,7 @@
          <Test>
             <TestValue>
                <Operator OpType="EQUAL">
-                  <Val Code="(L:A32NX_APU_MASTER_SW_ACTIVATED)"/>
+                  <Val Code="(L:A32NX_OVHD_APU_MASTER_SW_PB_IS_ON)"/>
                   <Val Value="0"/>
                </Operator>
             </TestValue>

diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/approach.FLT b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/approach.FLT
@@ -138,15 +138,16 @@ A32NX_BARO_BRIGHTNESS=0.75
 A32NX_SWITCH_RADAR_PWS_Position=1
 A32NX_SWITCH_TCAS_Position=2
 A32NX_COCKPIT_DOOR_LOCKED=1
-A32NX_ELEC_COMMERCIAL_FAULT=0
-A32NX_ELEC_COMMERCIAL_TOGGLE=1
-A32NX_ELEC_GALYCAB_FAULT=0
-A32NX_ELEC_GALYCAB_TOGGLE=1
-A32NX_ELEC_IDG1_FAULT=0
-A32NX_ELEC_IDG2_FAULT=0
-A32NX_ELEC_BUSTIE_TOGGLE=1
-A32NX_ELEC_ACESSFEED_FAULT=0
-A32NX_ELEC_ACESSFEED_TOGGLE=1
+A32NX_OVHD_ELEC_COMMERCIAL_PB_IS_ON=1
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_IDG_1_PB_IS_RELEASED=0
+A32NX_OVHD_ELEC_IDG_2_PB_IS_RELEASED=0
+A32NX_OVHD_ELEC_BAT_10_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_BAT_11_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_BUS_TIE_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_IS_NORMAL=1
 A32NX_ELEC_IDG1LOCK_TOGGLE=0
 A32NX_ELEC_IDG2LOCK_TOGGLE=0
 A32NX_KNOB_OVHD_AIRCOND_XBLEED_Position=1

diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/apron.FLT b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/apron.FLT
@@ -144,17 +144,18 @@ PUSH_OVHD_OXYGEN_CREW=1
 STROBE_1_Auto=0
 A32NX_BARO_BRIGHTNESS=0.15
 A32NX_COLD_AND_DARK_SPAWN=1
-A32NX_ELEC_COMMERCIAL_FAULT=0
-A32NX_ELEC_COMMERCIAL_TOGGLE=1
-A32NX_ELEC_GALYCAB_FAULT=0
-A32NX_ELEC_IDG1_FAULT=0
-A32NX_ELEC_IDG2_FAULT=0
-A32NX_ELEC_BUSTIE_TOGGLE=1
-A32NX_ELEC_ACESSFEED_FAULT=0
-A32NX_ELEC_ACESSFEED_TOGGLE=1
+A32NX_OVHD_ELEC_COMMERCIAL_PB_IS_ON=1
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_IDG_1_PB_IS_RELEASED=0
+A32NX_OVHD_ELEC_IDG_2_PB_IS_RELEASED=0
+A32NX_OVHD_ELEC_BAT_10_PB_IS_AUTO=0
+A32NX_OVHD_ELEC_BAT_11_PB_IS_AUTO=0
+A32NX_OVHD_ELEC_BUS_TIE_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_IS_NORMAL=1
 A32NX_ELEC_IDG1LOCK_TOGGLE=0
 A32NX_ELEC_IDG2LOCK_TOGGLE=0
-A32NX_ELEC_GALYCAB_TOGGLE=1
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_IS_AUTO=1
 A32NX_KNOB_OVHD_AIRCOND_XBLEED_Position=1
 A32NX_KNOB_OVHD_AIRCOND_PACKFLOW_Position=1
 A32NX_AIRCOND_PACK1_FAULT=0

diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/cruise.FLT b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/cruise.FLT
@@ -138,15 +138,16 @@ A32NX_BARO_BRIGHTNESS=0.75
 A32NX_SWITCH_RADAR_PWS_Position=1
 A32NX_SWITCH_TCAS_Position=2
 A32NX_COCKPIT_DOOR_LOCKED=1
-A32NX_ELEC_COMMERCIAL_FAULT=0
-A32NX_ELEC_COMMERCIAL_TOGGLE=1
-A32NX_ELEC_GALYCAB_FAULT=0
-A32NX_ELEC_GALYCAB_TOGGLE=1
-A32NX_ELEC_IDG1_FAULT=0
-A32NX_ELEC_IDG2_FAULT=0
-A32NX_ELEC_BUSTIE_TOGGLE=1
-A32NX_ELEC_ACESSFEED_FAULT=0
-A32NX_ELEC_ACESSFEED_TOGGLE=1
+A32NX_OVHD_ELEC_COMMERCIAL_PB_IS_ON=1
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_IDG_1_PB_IS_RELEASED=0
+A32NX_OVHD_ELEC_IDG_2_PB_IS_RELEASED=0
+A32NX_OVHD_ELEC_BAT_10_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_BAT_11_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_BUS_TIE_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_IS_NORMAL=1
 A32NX_ELEC_IDG1LOCK_TOGGLE=0
 A32NX_ELEC_IDG2LOCK_TOGGLE=0
 A32NX_KNOB_OVHD_AIRCOND_XBLEED_Position=1

diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/final.FLT b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/final.FLT
@@ -138,15 +138,16 @@ A32NX_BARO_BRIGHTNESS=0.75
 A32NX_SWITCH_RADAR_PWS_Position=1
 A32NX_SWITCH_TCAS_Position=2
 A32NX_COCKPIT_DOOR_LOCKED=1
-A32NX_ELEC_COMMERCIAL_FAULT=0
-A32NX_ELEC_COMMERCIAL_TOGGLE=1
-A32NX_ELEC_GALYCAB_FAULT=0
-A32NX_ELEC_GALYCAB_TOGGLE=1
-A32NX_ELEC_IDG1_FAULT=0
-A32NX_ELEC_IDG2_FAULT=0
-A32NX_ELEC_BUSTIE_TOGGLE=1
-A32NX_ELEC_ACESSFEED_FAULT=0
-A32NX_ELEC_ACESSFEED_TOGGLE=1
+A32NX_OVHD_ELEC_COMMERCIAL_PB_IS_ON=1
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_IDG_1_PB_IS_RELEASED=0
+A32NX_OVHD_ELEC_IDG_2_PB_IS_RELEASED=0
+A32NX_OVHD_ELEC_BAT_10_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_BAT_11_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_BUS_TIE_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_IS_NORMAL=1
 A32NX_ELEC_IDG1LOCK_TOGGLE=0
 A32NX_ELEC_IDG2LOCK_TOGGLE=0
 A32NX_KNOB_OVHD_AIRCOND_XBLEED_Position=1

diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/model/A320_NEO_INTERIOR.xml b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/model/A320_NEO_INTERIOR.xml
@@ -1328,34 +1328,33 @@
                 <UseTemplate Name="FBW_Push_Toggle">
                     <NODE_ID>PUSH_OVHD_ELEC_COMMERCIAL</NODE_ID>
 
-                    <TOGGLE_SIMVAR>L:A32NX_ELEC_COMMERCIAL_TOGGLE</TOGGLE_SIMVAR>
+                    <TOGGLE_SIMVAR>L:A32NX_OVHD_ELEC_COMMERCIAL_PB_IS_ON</TOGGLE_SIMVAR>
 
-                    <SEQ1_CODE>(L:A32NX_ELEC_COMMERCIAL_FAULT, Bool)</SEQ1_CODE>
-                    <SEQ2_CODE>(L:A32NX_ELEC_COMMERCIAL_TOGGLE, Bool) !</SEQ2_CODE>
+                    <SEQ2_CODE>(L:A32NX_OVHD_ELEC_COMMERCIAL_PB_IS_ON, Bool) !</SEQ2_CODE>
 
-                    <TOOLTIPID>%((L:A32NX_ELEC_COMMERCIAL_TOGGLE, Bool))%{if}Turn OFF commercial%{else}Turn ON commercial%{end}</TOOLTIPID>
+                    <TOOLTIPID>%((L:A32NX_OVHD_ELEC_COMMERCIAL_PB_IS_ON, Bool))%{if}Turn OFF commercial%{else}Turn ON commercial%{end}</TOOLTIPID>
                 </UseTemplate>
 
                 <!-- ELEC GALY & CAB AUTO -->
                 <UseTemplate Name="FBW_Push_Toggle">
                     <NODE_ID>PUSH_OVHD_ELEC_GALYCAB</NODE_ID>
 
-                    <TOGGLE_SIMVAR>L:A32NX_ELEC_GALYCAB_TOGGLE</TOGGLE_SIMVAR>
+                    <TOGGLE_SIMVAR>L:A32NX_OVHD_ELEC_GALY_AND_CAB_PB_IS_AUTO</TOGGLE_SIMVAR>
 
-                    <SEQ1_CODE>(L:A32NX_ELEC_GALYCAB_FAULT, Bool)</SEQ1_CODE>
-                    <SEQ2_CODE>(L:A32NX_ELEC_GALYCAB_TOGGLE, Bool) !</SEQ2_CODE>
+                    <SEQ1_CODE>(L:A32NX_OVHD_ELEC_GALY_AND_CAB_PB_HAS_FAULT, Bool)</SEQ1_CODE>
+                    <SEQ2_CODE>(L:A32NX_OVHD_ELEC_GALY_AND_CAB_PB_IS_AUTO, Bool) !</SEQ2_CODE>
 
-                    <TOOLTIPID>%((L:A32NX_ELEC_GALYCAB_TOGGLE, Bool))%{if}Turn OFF galy &amp; cab%{else}Turn ON galy &amp; cab%{end}</TOOLTIPID>
+                    <TOOLTIPID>%((L:A32NX_OVHD_ELEC_GALY_AND_CAB_PB_IS_AUTO, Bool))%{if}Turn OFF galy &amp; cab%{else}Turn ON galy &amp; cab%{end}</TOOLTIPID>
                 </UseTemplate>
 
                 <!-- IDG 1 -->
                 <UseTemplate Name="FBW_Covered_Push_Toggle">
                     <NODE_ID>PUSH_OVHD_ELEC_IDG1</NODE_ID>
                     <LOCK_NODE_ID>LOCK_OVHD_ELEC_IDG1</LOCK_NODE_ID>
 
-                    <LEFT_SINGLE_CODE>1 (&gt;L:A32NX_ELEC_IDG1_FAULT)</LEFT_SINGLE_CODE>
+                    <LEFT_SINGLE_CODE>1 (&gt;L:A32NX_OVHD_ELEC_IDG_1_PB_IS_RELEASED)</LEFT_SINGLE_CODE>
 
-                    <SEQ1_CODE>(L:A32NX_ELEC_IDG1_FAULT)</SEQ1_CODE>
+                    <SEQ1_CODE>(L:A32NX_OVHD_ELEC_IDG_1_PB_HAS_FAULT)</SEQ1_CODE>
 
                     <MOMENTARY/>
                 </UseTemplate>
@@ -1365,9 +1364,9 @@
                     <NODE_ID>PUSH_OVHD_ELEC_IDG2</NODE_ID>
                     <LOCK_NODE_ID>LOCK_OVHD_ELEC_IDG2</LOCK_NODE_ID>
 
-                    <LEFT_SINGLE_CODE>1 (&gt;L:A32NX_ELEC_IDG2_FAULT)</LEFT_SINGLE_CODE>
+                    <LEFT_SINGLE_CODE>1 (&gt;L:A32NX_OVHD_ELEC_IDG_2_PB_IS_RELEASED)</LEFT_SINGLE_CODE>
 
-                    <SEQ1_CODE>(L:A32NX_ELEC_IDG2_FAULT)</SEQ1_CODE>
+                    <SEQ1_CODE>(L:A32NX_OVHD_ELEC_IDG_2_PB_HAS_FAULT)</SEQ1_CODE>
 
                     <MOMENTARY/>
                 </UseTemplate>
@@ -1376,46 +1375,46 @@
                 <UseTemplate Name="FBW_Push_Toggle">
                     <NODE_ID>PUSH_OVHD_ELEC_BUSTIE</NODE_ID>
 
-                    <TOGGLE_SIMVAR>L:A32NX_ELEC_BUSTIE_TOGGLE</TOGGLE_SIMVAR>
+                    <TOGGLE_SIMVAR>L:A32NX_OVHD_ELEC_BUS_TIE_PB_IS_AUTO</TOGGLE_SIMVAR>
 
-                    <SEQ2_CODE>(L:A32NX_ELEC_BUSTIE_TOGGLE, Bool) !</SEQ2_CODE>
+                    <SEQ2_CODE>(L:A32NX_OVHD_ELEC_BUS_TIE_PB_IS_AUTO, Bool) !</SEQ2_CODE>
                 </UseTemplate>
 
                 <!-- AC ESS FEED -->
                 <UseTemplate Name="FBW_Push_Toggle">
                     <NODE_ID>PUSH_OVHD_ELEC_ACESSFEED</NODE_ID>
 
-                    <TOGGLE_SIMVAR>L:A32NX_ELEC_ACESSFEED_TOGGLE</TOGGLE_SIMVAR>
+                    <TOGGLE_SIMVAR>L:A32NX_OVHD_ELEC_AC_ESS_FEED_PB_IS_NORMAL</TOGGLE_SIMVAR>
 
-                    <SEQ1_CODE>(L:A32NX_ELEC_ACESSFEED_FAULT, Bool)</SEQ1_CODE>
-                    <SEQ2_CODE>(L:A32NX_ELEC_ACESSFEED_TOGGLE, Bool) !</SEQ2_CODE>
+                    <SEQ1_CODE>(L:A32NX_OVHD_ELEC_AC_ESS_FEED_PB_HAS_FAULT, Bool)</SEQ1_CODE>
+                    <SEQ2_CODE>(L:A32NX_OVHD_ELEC_AC_ESS_FEED_PB_IS_NORMAL, Bool) !</SEQ2_CODE>
                 </UseTemplate>
 
                 <!-- APU MASTER SW -->
                 <UseTemplate Name="FBW_Push_Toggle">
                     <NODE_ID>PUSH_OVHD_APU_MASTERSW</NODE_ID>
                     <PART_ID>ELECTRICAL_Switch_APU_Master</PART_ID>
                     <LEFT_SINGLE_CODE>
-                        (L:A32NX_APU_MASTER_SW_ACTIVATED, Bool) if{
-                            0 (&gt;L:A32NX_APU_MASTER_SW_ACTIVATED)
+                        (L:A32NX_OVHD_APU_MASTER_SW_PB_IS_ON, Bool) if{
+                            0 (&gt;L:A32NX_OVHD_APU_MASTER_SW_PB_IS_ON)
                         } els{
                             (A:ELECTRICAL MAIN BUS VOLTAGE, Volts) 20 &gt; if{
-                                1 (&gt;L:A32NX_APU_MASTER_SW_ACTIVATED)
+                                1 (&gt;L:A32NX_OVHD_APU_MASTER_SW_PB_IS_ON)
                             }
                         }
                     </LEFT_SINGLE_CODE>
-                    <DOWN_CODE>(L:A32NX_APU_MASTER_SW_ACTIVATED, Bool)</DOWN_CODE>
+                    <DOWN_CODE>(L:A32NX_OVHD_APU_MASTER_SW_PB_IS_ON, Bool)</DOWN_CODE>
 
-                    <SEQ1_CODE>(L:A32NX_APU_MASTER_FAULT, Bool)</SEQ1_CODE>
-                    <SEQ2_CODE>(L:A32NX_APU_MASTER_SW_ACTIVATED, Bool)</SEQ2_CODE>
+                    <SEQ1_CODE>(L:A32NX_OVHD_APU_MASTER_SW_PB_HAS_FAULT, Bool)</SEQ1_CODE>
+                    <SEQ2_CODE>(L:A32NX_OVHD_APU_MASTER_SW_PB_IS_ON, Bool)</SEQ2_CODE>
 
-                    <TOOLTIPID>%((L:A32NX_APU_MASTER_SW_ACTIVATED, Bool))%{if}TT:COCKPIT.TOOLTIPS.APU_SWITCH_TURN_OFF%{else}TT:COCKPIT.TOOLTIPS.APU_SWITCH_TURN_ON%{end}</TOOLTIPID>
+                    <TOOLTIPID>%((L:A32NX_OVHD_APU_MASTER_SW_PB_IS_ON, Bool))%{if}TT:COCKPIT.TOOLTIPS.APU_SWITCH_TURN_OFF%{else}TT:COCKPIT.TOOLTIPS.APU_SWITCH_TURN_ON%{end}</TOOLTIPID>
                 </UseTemplate>
 
                 <!-- APU START -->
                 <UseTemplate Name="FBW_Airbus_APU_Starter_Switch">
                     <NODE_ID>PUSH_OVHD_APU_START</NODE_ID>
-                    <EXTRA_CONDITION>(A:ELECTRICAL MAIN BUS VOLTAGE, Volts) 20 &gt; (L:A32NX_APU_MASTER_SW_ACTIVATED, Bool) and</EXTRA_CONDITION>
+                    <EXTRA_CONDITION>(A:ELECTRICAL MAIN BUS VOLTAGE, Volts) 20 &gt; (L:A32NX_OVHD_APU_MASTER_SW_PB_IS_ON, Bool) and</EXTRA_CONDITION>
                 </UseTemplate>
             </Component>
 

diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/runway.FLT b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/runway.FLT
@@ -145,15 +145,16 @@ A32NX_BARO_BRIGHTNESS=0.75
 A32NX_SWITCH_RADAR_PWS_Position=1
 A32NX_SWITCH_TCAS_Position=2
 A32NX_COCKPIT_DOOR_LOCKED=1
-A32NX_ELEC_COMMERCIAL_FAULT=0
-A32NX_ELEC_COMMERCIAL_TOGGLE=1
-A32NX_ELEC_GALYCAB_FAULT=0
-A32NX_ELEC_GALYCAB_TOGGLE=1
-A32NX_ELEC_IDG1_FAULT=0
-A32NX_ELEC_IDG2_FAULT=0
-A32NX_ELEC_BUSTIE_TOGGLE=1
-A32NX_ELEC_ACESSFEED_FAULT=0
-A32NX_ELEC_ACESSFEED_TOGGLE=1
+A32NX_OVHD_ELEC_COMMERCIAL_PB_IS_ON=1
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_IDG_1_PB_IS_RELEASED=0
+A32NX_OVHD_ELEC_IDG_2_PB_IS_RELEASED=0
+A32NX_OVHD_ELEC_BAT_10_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_BAT_11_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_BUS_TIE_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_IS_NORMAL=1
 A32NX_ELEC_IDG1LOCK_TOGGLE=0
 A32NX_ELEC_IDG2LOCK_TOGGLE=0
 A32NX_KNOB_OVHD_AIRCOND_XBLEED_Position=1

diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/sound/sound.xml b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/sound/sound.xml
@@ -115,7 +115,7 @@
             <Range LowerBound="1.0" />
         </Sound>
 
-        <Sound WwiseData="true" WwiseEvent="apuflapopen" FadeOutType="2" FadeOutTime="1" Continuous="true" ViewPoint="Inside" NodeName="LIGHT_ASOBO_NAVIGATIONTAILRIGHT" LocalVar="A32NX_APU_MASTER_SW_ACTIVATED" Units="BOOLEAN">
+        <Sound WwiseData="true" WwiseEvent="apuflapopen" FadeOutType="2" FadeOutTime="1" Continuous="true" ViewPoint="Inside" NodeName="LIGHT_ASOBO_NAVIGATIONTAILRIGHT" LocalVar="A32NX_OVHD_APU_MASTER_SW_PB_IS_ON" Units="BOOLEAN">
             <Range LowerBound="1.0" />
             <Requires LocalVar="APU_FLAP_OPEN" Units="PERCENT" Index="0">
                 <Range UpperBound="99" />

diff --git a/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/taxi.flt b/A32NX/SimObjects/AirPlanes/Asobo_A320_NEO/taxi.flt
@@ -149,17 +149,18 @@ A320_Neo_AIRCOND_LVL_3=50
 STROBE_1_Auto=1
 A32NX_BARO_BRIGHTNESS=0.75
 A32NX_COCKPIT_DOOR_LOCKED=1
-A32NX_ELEC_COMMERCIAL_FAULT=0
-A32NX_ELEC_COMMERCIAL_TOGGLE=1
-A32NX_ELEC_GALYCAB_FAULT=0
-A32NX_ELEC_GALYCAB_TOGGLE=1
-A32NX_ELEC_IDG1_FAULT=0
+A32NX_OVHD_ELEC_COMMERCIAL_PB_IS_ON=1
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_GALY_AND_CAB_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_IDG_1_PB_IS_RELEASED=0
 A32NX_ELEC_IDG1_TOGGLE=1
-A32NX_ELEC_IDG2_FAULT=0
+A32NX_OVHD_ELEC_IDG_2_PB_IS_RELEASED=0
 A32NX_ELEC_IDG2_TOGGLE=1
-A32NX_ELEC_BUSTIE_TOGGLE=1
-A32NX_ELEC_ACESSFEED_FAULT=0
-A32NX_ELEC_ACESSFEED_TOGGLE=1
+A32NX_OVHD_ELEC_BAT_10_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_BAT_11_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_BUS_TIE_PB_IS_AUTO=1
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_HAS_FAULT=0
+A32NX_OVHD_ELEC_AC_ESS_FEED_PB_IS_NORMAL=1
 A32NX_ELEC_IDG1LOCK_TOGGLE=0
 A32NX_ELEC_IDG2LOCK_TOGGLE=0
 A32NX_KNOB_OVHD_AIRCOND_XBLEED_Position=1