From e32d066631edb3a856d2411dd582553435a806bd Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Thu, 30 Dec 2021 20:22:54 +0000
Subject: [PATCH] All LED pushbuttons, FCU display now have their correct power
 source, 5VAC

---
 Models/FlightDeck/a320.flightdeck.xml  | 300 +++++++++++-------
 Models/Instruments/OHpanel/OHpanel.xml | 422 ++++++++++++++-----------
 Systems/a320-lights.xml                |   7 +-
 3 files changed, 411 insertions(+), 318 deletions(-)

diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 6744b7b6..f5d94e87 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -557,14 +557,6 @@
 		<object-name>radar_glare</object-name>
 	</effect>
 
-	<animation>
-		<type>select</type>
-		<object-name>engine_fault_1</object-name>
-		<condition>
-			<property>systems/unused/unused-ped</property>
-		</condition>
-	</animation>
-
 	<animation>
 		<type>select</type>
 		<object-name>engine_fire_1</object-name>
@@ -585,15 +577,7 @@
 			<blue>1.0</blue>
 		</emission>
 	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>engine_fault_2</object-name>
-		<condition>
-			<property>systems/unused/unused-ped</property>
-		</condition>
-	</animation>
-
+	
 	<animation>
 		<type>select</type>
 		<object-name>engine_fire_2</object-name>
@@ -1058,12 +1042,13 @@
 		<path>Aircraft/A320-family/Models/Instruments/IESI/IESI.xml</path>
 	</model>
 
-	<!-- No button lights without power! -->
+	<!-- Button lights 115 mA, 5 VAC on BRT setting -->
+	<!-- Sourced from 4 transformers -->
+	
+	
+	<!-- 31LP AC ESS SHED 801XP 5VAC transformer -->
 	<animation>
 		<type>select</type>
-		<object-name>abs_low_on</object-name>
-		<object-name>abs_med_on</object-name>
-		<object-name>abs_max_on</object-name>
 		<object-name>alt-text</object-name>
 		<object-name>alt-text-test</object-name>
 		<object-name>ap1_led</object-name>
@@ -1071,9 +1056,9 @@
 		<object-name>appr_led</object-name>
 		<object-name>arpt_led</object-name>
 		<object-name>arpt_led.001</object-name>
-		<object-name>a-thr_led</object-name>
 		<object-name>atc-code</object-name>
 		<object-name>atc-test</object-name>
+		<object-name>a-thr_led</object-name>
 		<object-name>audio_att_led</object-name>
 		<object-name>audio_att_sgn</object-name>
 		<object-name>audio_call_hf2_led</object-name>
@@ -1085,19 +1070,165 @@
 		<object-name>audio_hf2_led</object-name>
 		<object-name>audio_mech_led</object-name>
 		<object-name>audio_mech_sgn</object-name>
+		<object-name>audio_pa_led</object-name>
 		<object-name>audio_voice_led</object-name>
 		<object-name>audio_vhf1_led</object-name>
 		<object-name>audio_vhf2_led</object-name>
 		<object-name>audio_vhf3_led</object-name>
-		<object-name>autoland_light_on</object-name>
-		<object-name>brk_fan_on</object-name>
-		<object-name>brk_hot_on</object-name>
-<!--		<object-name>clock_glare</object-name>-->
 		<object-name>cstr_led</object-name>
 		<object-name>cstr_led.001</object-name>
+		<object-name>exped_led</object-name>
+		<object-name>fcu_screen</object-name>
+		<object-name>fd1_led</object-name>
+		<object-name>fd2_led</object-name>
+		<object-name>fpa-text</object-name>
+		<object-name>hdg-text</object-name>
+		<object-name>hdg-text-test</object-name>
+		<object-name>ils_led</object-name>
+		<object-name>ils2_led</object-name>
+		<object-name>loc_led</object-name>
+		<object-name>mach-text</object-name>
+		<object-name>ndb_led</object-name>
+		<object-name>ndb_led.001</object-name>
+		<object-name>qnh-hpa</object-name>
+		<object-name>qnh-inhg</object-name>
+		<object-name>qnh-std</object-name>
+		<object-name>qnh-test</object-name>
+		<object-name>radio_adf_led</object-name>
+		<object-name>radio_am_led</object-name>
+		<object-name>radio_bfo_led</object-name>
+		<object-name>radio_hf1_led</object-name>
+		<object-name>radio_hf2_led</object-name>
+		<object-name>radio_ls_led</object-name>
+		<object-name>radio_nav_led</object-name>
+		<object-name>radio_opt_led</object-name>
+		<object-name>radio_vhf1_led</object-name>
+		<object-name>radio_vhf2_led</object-name>
+		<object-name>radio_vhf3_led</object-name>
+		<object-name>radio_vor_led</object-name>
+		<object-name>spd-text</object-name>
+		<object-name>spd-text-test</object-name>
+		<object-name>vord_led</object-name>
+		<object-name>vord_led.001</object-name>
+		<object-name>vs-text</object-name>
+		<object-name>vs-text-last-2-digits</object-name>
+		<object-name>vs-text-test</object-name>
+		<object-name>wpt_led</object-name>
+		<object-name>wpt_led.001</object-name>
+		<condition>
+			<or>
+				<greater-than-equals>
+					<property>systems/electrical/bus/ac-si-bus</property>
+					<value>110</value>
+				</greater-than-equals>
+				<greater-than-equals>
+					<property>systems/electrical/bus/ac-ess-shed</property>
+					<value>110</value>
+				</greater-than-equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<!-- Special for master warning -->
+	<animation>
+		<type>select</type>
+		<object-name>autoland_light_on</object-name>
+		<object-name>master_caution_on</object-name>
+		<object-name>master_warning_on</object-name>
+		<condition>
+			<or>
+				<greater-than-equals>
+					<property>systems/electrical/bus/ac-si-bus</property>
+					<value>110</value>
+				</greater-than-equals>
+				<greater-than-equals>
+					<property>systems/electrical/bus/ac-ess-shed</property>
+					<value>110</value>
+				</greater-than-equals>
+				<greater-than>
+					<property>/systems/electrical/bus/ac-2</property>
+					<value>110</value>
+				</greater-than>
+			</or>
+		</condition>
+	</animation>
+	
+	<!-- 35LP AC ESS SHED 801XP 5VAC transformer 
+		 BACKUP 901XP STAT INV
+	-->
+	<animation>
+		<type>select</type>
+		<object-name>engine_fire_1</object-name>
+		<object-name>engine_fire_2</object-name>
+		<object-name>gear_lever_down_arrow</object-name>
+		<object-name>lgear_down</object-name>
+		<object-name>lgear_unlk</object-name>
+		<object-name>ngear_down</object-name>
+		<object-name>ngear_unlk</object-name>
+		<object-name>rgear_down</object-name>
+		<object-name>rgear_unlk</object-name>
+		<condition>
+			<or>
+				<greater-than-equals>
+					<property>systems/electrical/bus/ac-si-bus</property>
+					<value>110</value>
+				</greater-than-equals>
+				<greater-than-equals>
+					<property>systems/electrical/bus/ac-ess-shed</property>
+					<value>110</value>
+				</greater-than-equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<!-- 36LP AC 2 202XP 5VAC transformer -->
+	<!-- ATC MSG (dual power with 37LP?) -->
+	<animation>
+		<type>select</type>
+		<object-name>brk_fan_on</object-name>
+		<object-name>brk_hot_on</object-name>
+		<object-name>CockpitDoorFault</object-name>
+		<object-name>CockpitDoorOpen</object-name>
+		<object-name>engine_fault_1</object-name>
+		<object-name>engine_fault_2</object-name>
+		<object-name>prio_fo.arrow</object-name>
+		<object-name>prio_fo_fo</object-name>
+		<condition>
+			<greater-than>
+				<property>/systems/electrical/bus/ac-2</property>
+				<value>110</value>
+			</greater-than>
+		</condition>
+	</animation>
+	
+	<!-- 37LP AC 1 103XP 5VAC transformer -->
+	<!-- ATC MSG, GPWS annunciator -->
+	<animation>
+		<type>select</type>
+		<object-name>abs_low_on</object-name>
+		<object-name>abs_med_on</object-name>
+		<object-name>abs_max_on</object-name>
 		<object-name>dec_low_on</object-name>
 		<object-name>dec_med_on</object-name>
 		<object-name>dec_max_on</object-name>
+		<object-name>prio_capt.arrow</object-name>
+		<object-name>prio_capt.arrow.001</object-name>
+		<object-name>prio_capt.capt</object-name>
+		<object-name>prio_capt.capt.001</object-name>
+		<object-name>radio_sel_led</object-name>
+		<object-name>terr_on_nd_on_l</object-name>
+		<object-name>terr_on_nd_on_r</object-name>
+		<condition>
+			<greater-than>
+				<property>/systems/electrical/bus/ac-1</property>
+				<value>110</value>
+			</greater-than>
+		</condition>
+	</animation>
+	
+	<!-- Direct DC power from DC2 206PP to ECP LEDs -->
+	<animation>
+		<type>select</type>
 		<object-name>ecam_apu_led</object-name>
 		<object-name>ecam_bleed_led</object-name>
 		<object-name>ecam_cond_led</object-name>
@@ -1114,59 +1245,9 @@
 		<object-name>ecam_press_led</object-name>
 		<object-name>ecam_sts_led</object-name>
 		<object-name>ecam_wheel_led</object-name>
-		<object-name>exped_led</object-name>
-		<object-name>fcu_screen</object-name>
-		<object-name>fd1_led</object-name>
-		<object-name>fd2_led</object-name>
-		<object-name>fpa-text</object-name>
-		<object-name>hdg-text</object-name>
-		<object-name>hdg-text-test</object-name>
-		<object-name>ils_led</object-name>
-		<object-name>ils2_led</object-name>
-		<object-name>lgear_down</object-name>
-		<object-name>lgear_unlk</object-name>
-		<object-name>loc_led</object-name>
-		<object-name>mach-text</object-name>
-		<object-name>master_caution_on</object-name>
-		<object-name>master_warning_on</object-name>
-		<object-name>ndb_led</object-name>
-		<object-name>ndb_led.001</object-name>
-		<object-name>ngear_down</object-name>
-		<object-name>ngear_unlk</object-name>
-		<object-name>qnh-hpa</object-name>
-		<object-name>qnh-inhg</object-name>
-		<object-name>qnh-std</object-name>
-		<object-name>qnh-test</object-name>
-		<object-name>radio_adf_led</object-name>
-		<object-name>radio_am_led</object-name>
-		<object-name>radio_bfo_led</object-name>
-		<object-name>radio_hf1_led</object-name>
-		<object-name>radio_hf2_led</object-name>
-		<object-name>radio_ls_led</object-name>
-		<object-name>radio_nav_led</object-name>
-		<object-name>radio_opt_led</object-name>
-		<object-name>radio_sel_led</object-name>
-		<object-name>radio_vhf1_led</object-name>
-		<object-name>radio_vhf2_led</object-name>
-		<object-name>radio_vhf3_led</object-name>
-		<object-name>radio_vor_led</object-name>
-		<object-name>rgear_down</object-name>
-		<object-name>rgear_unlk</object-name>
-		<object-name>spd-text</object-name>
-		<object-name>spd-text-test</object-name>
-		<object-name>terr_on_nd_label</object-name>
-		<object-name>terr_on_nd_on_l</object-name>
-		<object-name>terr_on_nd_on_r</object-name>
-		<object-name>vord_led</object-name>
-		<object-name>vord_led.001</object-name>
-		<object-name>vs-text</object-name>
-		<object-name>vs-text-last-2-digits</object-name>
-		<object-name>vs-text-test</object-name>
-		<object-name>wpt_led</object-name>
-		<object-name>wpt_led.001</object-name>
 		<condition>
 			<greater-than-equals>
-				<property>systems/electrical/bus/dc-ess</property>
+				<property>systems/electrical/bus/dc-2</property>
 				<value>25</value>
 			</greater-than-equals>
 		</condition>
@@ -1201,7 +1282,6 @@
 	<!-- Remove from this animation once you simulate -->
 	<animation>
 		<type>select</type>
-		<object-name>atc-test</object-name>
 		<object-name>audio_att_sgn</object-name>
 		<object-name>audio_call_hf2_led</object-name>
 		<object-name>audio_call_hf1_led</object-name>
@@ -5916,28 +5996,16 @@
 		<type>select</type>
 		<object-name>gear_lever_down_arrow</object-name>
 		<condition>
-			<and>
-				<or>
-					<greater-than>
-						<property>systems/electrical/bus/ac-ess</property>
-						<value>110</value>
-					</greater-than>
-					<greater-than>
-						<property>systems/electrical/bus/ac-2</property>
-						<value>110</value>
-					</greater-than>
-				</or>
-				<or>
-					<equals>
-						<property>controls/switches/annun-test</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>ECAM/warnings/landing-gear-warning-light</property>
-						<value>1</value>
-					</equals>
-				</or>
-			</and>
+			<or>
+				<equals>
+					<property>controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>ECAM/warnings/landing-gear-warning-light</property>
+					<value>1</value>
+				</equals>
+			</or>
 		</condition>
 	</animation>
 	
@@ -5945,28 +6013,16 @@
 		<type>material</type>
 		<object-name>gear_lever_down_arrow</object-name>
 		<condition>
-			<and>
-				<or>
-					<greater-than>
-						<property>systems/electrical/bus/ac-ess</property>
-						<value>110</value>
-					</greater-than>
-					<greater-than>
-						<property>systems/electrical/bus/ac-2</property>
-						<value>110</value>
-					</greater-than>
-				</or>
-				<or>
-					<equals>
-						<property>controls/switches/annun-test</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>ECAM/warnings/landing-gear-warning-light</property>
-						<value>1</value>
-					</equals>
-				</or>
-			</and>
+			<or>
+				<equals>
+					<property>controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>ECAM/warnings/landing-gear-warning-light</property>
+					<value>1</value>
+				</equals>
+			</or>
 		</condition>
 		<emission>
 			<red>1.00</red>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 9b5b6504..971d182c 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -8,57 +8,70 @@
 
 	<!-- ANIMATIONS -->
 
-	<!-- No button lights without power! -->
+	<!-- Button lights 115 mA, 5 VAC on BRT setting -->
+	<!-- 31LP AC ESS SHED 801XP 5VAC transformer -->
 	<animation>
 		<type>select</type>
-		<object-name>ACPack1Btn1F</object-name>
-		<object-name>ACPack1Btn2O</object-name>
-		<object-name>ACPack2Btn1F</object-name>
-		<object-name>ACPack2Btn2O</object-name>
-		<object-name>ADR1Btn1F</object-name>
-		<object-name>ADR1Btn2O</object-name>
-		<object-name>ADR2Btn1F</object-name>
-		<object-name>ADR2Btn2O</object-name>
-		<object-name>ADR3Btn1F</object-name>
-		<object-name>ADR3Btn2O</object-name>
-		<object-name>BatteryBtn11F</object-name>
-		<object-name>BatteryBtn21F</object-name>
-		<object-name>BusTieBtn2O</object-name>
-		<object-name>DitchBtn2O</object-name>
-		<object-name>EmerExtLtBtn2O</object-name>
-		<object-name>Eng1AntiIceBtn1F</object-name>
-		<object-name>Eng1AntiIceBtn2O</object-name>
-		<object-name>Eng2AntiIceBtn1F</object-name>
-		<object-name>Eng2AntiIceBtn2O</object-name>
-		<object-name>ExtPwrBtn2O</object-name>
-		<object-name>IR1Btn1F</object-name>
-		<object-name>IR1Btn2O</object-name>
-		<object-name>IR2Btn1F</object-name>
-		<object-name>IR2Btn2O</object-name>
-		<object-name>IR3Btn1F</object-name>
-		<object-name>IR3Btn2O</object-name>
+		<object-name>AftCargoIsoBtn1F</object-name>
+		<object-name>AftCargoIsoBtn2O</object-name>
+		<object-name>APUBleedBtn1F</object-name>
+		<object-name>APUBleedBtn2O</object-name>
+		<object-name>BlueElecPump1F</object-name>
+		<object-name>BlueElecPump2O</object-name>
+		<object-name>CargoHotAirBtn1F</object-name>
+		<object-name>CargoHotAirBtn2O</object-name>
+		<object-name>CrewOxyBtn2O</object-name>
+		<object-name>ExtPwrBtn1A</object-name>
+		<object-name>GalleyPwrBtn1F</object-name>
+		<object-name>GalleyPwrBtn2O</object-name>
+		<object-name>Gen1LineBtn1S</object-name>
+		<object-name>Gen1LineBtn2O</object-name>
+		<object-name>FuelXfeedBtn1O</object-name>
+		<object-name>FuelXfeedBtn2O</object-name>
+		<object-name>LFuelTank1Btn1F</object-name>
+		<object-name>LFuelTank1Btn2O</object-name>
+		<object-name>PassOxyInd1S</object-name>
 		<object-name>RamAirBtn2O</object-name>
+		<object-name>RFuelTank1Btn1F</object-name>
+		<object-name>RFuelTank1Btn2O</object-name>
 		<object-name>WingAntiIceBtn1F</object-name>
 		<object-name>WingAntiIceBtn2O</object-name>
-		<object-name>VentBlowBtn1F</object-name>
 		<condition>
 			<greater-than-equals>
-				<property>systems/electrical/bus/ac-ess</property>
-				<value>5</value>
+				<property>systems/electrical/bus/ac-ess-shed</property>
+				<value>110</value>
 			</greater-than-equals>
 		</condition>
 	</animation>
 	
+	<!-- 35LP AC ESS SHED 801XP 5VAC transformer 
+		 BACKUP 901XP STAT INV
+	-->
 	<animation>
 		<type>select</type>
+		<object-name>ACPack1Btn1F</object-name>
+		<object-name>ACPack1Btn2O</object-name>
+		<object-name>APUFireAgtBtn1S</object-name>
+		<object-name>APUFireAgtBtn2D</object-name>
 		<object-name>APUGenBtn1F</object-name>
 		<object-name>APUGenBtn2O</object-name>
 		<object-name>APUMasterBtn1F</object-name>
 		<object-name>APUMasterBtn2O</object-name>
 		<object-name>APUStartBtn1A</object-name>
 		<object-name>APUStartBtn2O</object-name>
-		<object-name>APUFireAgtBtn1S</object-name>
-		<object-name>APUFireAgtBtn2D</object-name>
+		<object-name>BatteryBtn11F</object-name>
+		<object-name>BatteryBtn21F</object-name>
+		<object-name>BatteryBtn12O</object-name>
+		<object-name>BatteryBtn22O</object-name>
+		<object-name>BusTieBtn2O</object-name>
+		<object-name>CabinPressModeBtn1F</object-name>
+		<object-name>CabinPressModeBtn2M</object-name>
+		<object-name>DitchBtn2O</object-name>
+		<object-name>ELAC1Btn1F</object-name>
+		<object-name>ELAC1Btn2O</object-name>
+		<object-name>EmerCallBtn1C</object-name>
+		<object-name>EmerCallBtn2O</object-name>
+		<object-name>EmerExtLtBtn2O</object-name>
 		<object-name>Eng1FireAgt1Btn1S</object-name>
 		<object-name>Eng1FireAgt1Btn2D</object-name>
 		<object-name>Eng2FireAgt1Btn1S</object-name>
@@ -67,69 +80,100 @@
 		<object-name>Eng1FireAgt2Btn2D</object-name>
 		<object-name>Eng2FireAgt2Btn1S</object-name>
 		<object-name>Eng2FireAgt2Btn2D</object-name>
-		<object-name>ELAC1Btn1F</object-name>
-		<object-name>ELAC1Btn2O</object-name>
-		<object-name>FAC1Btn1F</object-name>
-		<object-name>FAC1Btn2O</object-name>
-		<object-name>Gen1Btn2O</object-name>
-		<object-name>Gen2Btn2O</object-name>
-		<object-name>SEC1Btn1F</object-name>
-		<object-name>SEC1Btn2O</object-name>
-		<condition>
-			<or>
-				<greater-than-equals>
-					<property>systems/electrical/bus/ac-si-bus</property>
-					<value>5</value>
-				</greater-than-equals>
-				<greater-than-equals>
-					<property>systems/electrical/bus/ac-ess</property>
-					<value>5</value>
-				</greater-than-equals>
-			</or>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>ACESSFeedBtn1F</object-name>
-		<object-name>ACESSFeedBtn2A</object-name>
-		<object-name>AftCargoIsoBtn1F</object-name>
-		<object-name>AftCargoIsoBtn2O</object-name>
-		<object-name>AftCargoSmkBtn1S</object-name>
-		<object-name>AftCargoSmkBtn2D</object-name>
-		<object-name>BlueElecPump1F</object-name>
-		<object-name>BlueElecPump2O</object-name>
-		<object-name>CabinPressModeBtn1F</object-name>
-		<object-name>CabinPressModeBtn2M</object-name>
-		<object-name>CabinFansBtn2O</object-name>
-		<object-name>CargoHotAirBtn1F</object-name>
-		<object-name>CargoHotAirBtn2O</object-name>
-		<object-name>CFuelTank1Btn1F</object-name>
-		<object-name>CFuelTank1Btn2O</object-name>
-		<object-name>CFuelTank2Btn1F</object-name>
-		<object-name>CFuelTank2Btn2O</object-name>
-		<object-name>CrewOxyBtn2O</object-name>
-		<object-name>ELAC2Btn1F</object-name>
-		<object-name>ELAC2Btn2O</object-name>
-		<object-name>EmerCallBtn1C</object-name>
-		<object-name>EmerCallBtn2O</object-name>
-		<object-name>EmerGenInd1F</object-name>
 		<object-name>Eng1ManStartBtn2O</object-name>
 		<object-name>Eng2ManStartBtn2O</object-name>
 		<object-name>EvacCommandBtn1E</object-name>
 		<object-name>EvacCommandBtn2O</object-name>
+		<object-name>FAC1Btn1F</object-name>
+		<object-name>FAC1Btn2O</object-name>
+		<object-name>Gen1Btn2O</object-name>
+		<object-name>Gen2Btn2O</object-name>
+		<object-name>IDG1Btn1F</object-name>
+		<object-name>IDG2Btn1F</object-name>
+		<object-name>SEC1Btn1F</object-name>
+		<object-name>SEC1Btn2O</object-name>
+		<object-name>VentBlowBtn1F</object-name>
+		<object-name>VentBlowBtn2O</object-name>
+		<object-name>VentExtractBtn1F</object-name>
+		<object-name>VentExtractBtn2O</object-name>
+		<condition>
+			<or>
+				<greater-than-equals>
+					<property>systems/electrical/bus/ac-si-bus</property>
+					<value>110</value>
+				</greater-than-equals>
+				<greater-than-equals>
+					<property>systems/electrical/bus/ac-ess-shed</property>
+					<value>110</value>
+				</greater-than-equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<!-- 36LP AC 2 202XP 5VAC transformer -->
+	<animation>
+		<type>select</type>
+		<object-name>ACESSFeedBtn1F</object-name>
+		<object-name>ACESSFeedBtn2A</object-name>
+		<object-name>ACPack2Btn1F</object-name>
+		<object-name>ACPack2Btn2O</object-name>
+		<object-name>CFuelTank1Btn1F</object-name>
+		<object-name>CFuelTank1Btn2O</object-name>
+		<object-name>ELAC2Btn1F</object-name>
+		<object-name>ELAC2Btn2O</object-name>
+		<object-name>Eng2AntiIceBtn1F</object-name>
+		<object-name>Eng2AntiIceBtn2O</object-name>
+		<object-name>Eng2BleedBtn1F</object-name>
+		<object-name>Eng2BleedBtn2O</object-name>
 		<object-name>FAC2Btn1F</object-name>
 		<object-name>FAC2Btn2O</object-name>
+		<object-name>LFuelTank2Btn1F</object-name>
+		<object-name>LFuelTank2Btn2O</object-name>
+		<object-name>PrbWinHeatBtn2O</object-name>
+		<object-name>PTU1F</object-name>
+		<object-name>PTU2O</object-name>
+		<object-name>RFuelTank2Btn1F</object-name>
+		<object-name>RFuelTank2Btn2O</object-name>
+		<object-name>SEC2Btn1F</object-name>
+		<object-name>SEC2Btn2O</object-name>
+		<object-name>SEC3Btn1F</object-name>
+		<object-name>SEC3Btn2O</object-name>
+		<object-name>YellowElecPump1F</object-name>
+		<object-name>YellowElecPump2O</object-name>
+		<object-name>YellowEngPump1F</object-name>
+		<object-name>YellowEngPump2O</object-name>
+		<condition>
+			<greater-than>
+				<property>/systems/electrical/bus/ac-2</property>
+				<value>110</value>
+			</greater-than>
+		</condition>
+	</animation>
+	
+	<!-- 37LP AC 1 103XP 5VAC transformer -->
+	<animation>
+		<type>select</type>
+		<object-name>ADR1Btn1F</object-name>
+		<object-name>ADR1Btn2O</object-name>
+		<object-name>ADR2Btn1F</object-name>
+		<object-name>ADR2Btn2O</object-name>
+		<object-name>ADR3Btn1F</object-name>
+		<object-name>ADR3Btn2O</object-name>
+		<object-name>AftCargoSmkBtn1S</object-name>
+		<object-name>AftCargoSmkBtn2D</object-name>
+		<object-name>CabinFansBtn2O</object-name>
+		<object-name>CFuelTank2Btn1F</object-name>
+		<object-name>CFuelTank2Btn2O</object-name>
+		<object-name>EmerGenInd1F</object-name>
+		<object-name>Eng1AntiIceBtn1F</object-name>
+		<object-name>Eng1AntiIceBtn2O</object-name>
+		<object-name>Eng1BleedBtn1F</object-name>
+		<object-name>Eng1BleedBtn2O</object-name>
+		<object-name>ExtPwrBtn2O</object-name>
 		<object-name>FuelModeBtn1F</object-name>
 		<object-name>FuelModeBtn2O</object-name>
-		<object-name>FuelXfeedBtn1O</object-name>
-		<object-name>FuelXfeedBtn2O</object-name>
 		<object-name>FwdCargoSmkBtn1S</object-name>
 		<object-name>FwdCargoSmkBtn2D</object-name>
-		<object-name>GalleyPwrBtn1F</object-name>
-		<object-name>GalleyPwrBtn2O</object-name>
-		<object-name>Gen1LineBtn1S</object-name>
-		<object-name>Gen1LineBtn2O</object-name>
 		<object-name>GPWSBtn1F</object-name>
 		<object-name>GPWSBtn2O</object-name>
 		<object-name>GPWSFlpBtn2O</object-name>
@@ -141,60 +185,18 @@
 		<object-name>GreenEngPump2O</object-name>
 		<object-name>HotAirBtn1F</object-name>
 		<object-name>HotAirBtn2O</object-name>
-		<object-name>IDG1Btn1F</object-name>
-		<object-name>IDG2Btn1F</object-name>
-		<object-name>LFuelTank1Btn1F</object-name>
-		<object-name>LFuelTank1Btn2O</object-name>
-		<object-name>LFuelTank2Btn1F</object-name>
-		<object-name>LFuelTank2Btn2O</object-name>
-		<object-name>PassOxyInd1S</object-name>
-		<object-name>PrbWinHeatBtn2O</object-name>
-		<object-name>PTU1F</object-name>
-		<object-name>PTU2O</object-name>
-		<object-name>RamAirBtn2O</object-name>
+		<object-name>IR1Btn1F</object-name>
+		<object-name>IR1Btn2O</object-name>
+		<object-name>IR2Btn1F</object-name>
+		<object-name>IR2Btn2O</object-name>
+		<object-name>IR3Btn1F</object-name>
+		<object-name>IR3Btn2O</object-name>
 		<object-name>RcdrGndCtlBtn2O</object-name>
-		<object-name>RFuelTank1Btn1F</object-name>
-		<object-name>RFuelTank1Btn2O</object-name>
-		<object-name>RFuelTank2Btn1F</object-name>
-		<object-name>RFuelTank2Btn2O</object-name>
-		<object-name>SEC2Btn1F</object-name>
-		<object-name>SEC2Btn2O</object-name>
-		<object-name>SEC3Btn1F</object-name>
-		<object-name>SEC3Btn2O</object-name>
-		<object-name>VentBlowBtn2O</object-name>
-		<object-name>VentExtractBtn1F</object-name>
-		<object-name>VentExtractBtn2O</object-name>
-		<object-name>YellowElecPump1F</object-name>
-		<object-name>YellowElecPump2O</object-name>
-		<object-name>YellowEngPump1F</object-name>
-		<object-name>YellowEngPump2O</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>systems/electrical/bus/dc-ess</property>
-				<value>25</value>
-			</greater-than-equals>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>Eng1BleedBtn1F</object-name>
-		<object-name>Eng1BleedBtn2O</object-name>
-		<object-name>Eng2BleedBtn1F</object-name>
-		<object-name>Eng2BleedBtn2O</object-name>
-		<object-name>APUBleedBtn1F</object-name>
-		<object-name>APUBleedBtn2O</object-name>
-		<condition>
-			<or>
-				<greater-than-equals>
-					<property>systems/electrical/bus/dc-2</property>
-					<value>25</value>
-				</greater-than-equals>
-				<greater-than-equals>
-					<property>systems/electrical/bus/dc-ess-shed</property>
-					<value>25</value>
-				</greater-than-equals>
-			</or>
+			<greater-than>
+				<property>/systems/electrical/bus/ac-1</property>
+				<value>110</value>
+			</greater-than>
 		</condition>
 	</animation>
 	
@@ -3041,22 +3043,16 @@
 		<type>select</type>
 		<object-name>BatteryBtn12O</object-name>
 		<condition>
-			<and>
-				<or>
-					<equals>
-						<property>controls/electrical/switches/bat-1</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>controls/switches/annun-test</property>
-						<value>1</value>
-					</equals>
-				</or>
-				<greater-than>
-					<property>systems/electrical/bus/dc-bat</property>
-					<value>25</value>
-				</greater-than>
-			</and>
+			<or>
+				<equals>
+					<property>controls/electrical/switches/bat-1</property>
+					<value>0</value>
+				</equals>
+				<equals>
+					<property>controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
 		</condition>
 	</animation>
 
@@ -3108,22 +3104,16 @@
 		<type>select</type>
 		<object-name>BatteryBtn22O</object-name>
 		<condition>
-			<and>
-				<or>
-					<equals>
-						<property>controls/electrical/switches/bat-2</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>controls/switches/annun-test</property>
-						<value>1</value>
-					</equals>
-				</or>
-				<greater-than>
-					<property>systems/electrical/bus/dc-bat</property>
-					<value>25</value>
-				</greater-than>
-			</and>
+			<or>
+				<equals>
+					<property>controls/electrical/switches/bat-2</property>
+					<value>0</value>
+				</equals>
+				<equals>
+					<property>controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+			</or>
 		</condition>
 	</animation>
 	
@@ -3516,18 +3506,10 @@
 					<property>controls/electrical/ground-cart</property>
 					<value>1</value>
 				</equals>
-				<and>
-					<equals>
-						<property>controls/switches/annun-test</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<greater-than-equals>
-							<property>systems/electrical/bus/ac-ess</property>
-							<value>110</value>
-						</greater-than-equals>
-					</or>
-				</and>
+				<equals>
+					<property>controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
 			</or>
 		</condition>
 	</animation>
@@ -6661,10 +6643,28 @@
 		<type>material</type>
 		<object-name>Eng1FireBtn</object-name>
 		<condition>
-			<or>
-				<property>systems/fire/engine1/warning-active</property>
-				<property>controls/switches/annun-test</property>
-			</or>
+			<and>
+				<or>
+					<property>systems/fire/engine1/warning-active</property>
+					<property>controls/switches/annun-test</property>
+				</or>
+				<or>
+					<!-- 35LP -->
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac-si-bus</property>
+						<value>110</value>
+					</greater-than-equals>
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac-ess-shed</property>
+						<value>110</value>
+					</greater-than-equals>
+					<!-- 37LP -->
+					<greater-than>
+						<property>/systems/electrical/bus/ac-1</property>
+						<value>110</value>
+					</greater-than>
+				</or>
+			</and>
 		</condition>
 		<emission>
 			<red>1.0</red>
@@ -7008,10 +7008,28 @@
 		<type>material</type>
 		<object-name>APUFireBtn</object-name>
 		<condition>
-			<or>
-				<property>systems/fire/apu/warning-active</property>
-				<property>controls/switches/annun-test</property>
-			</or>
+			<and>
+				<or>
+					<property>systems/fire/apu/warning-active</property>
+					<property>controls/switches/annun-test</property>
+				</or>
+				<or>
+					<!-- 35LP -->
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac-si-bus</property>
+						<value>110</value>
+					</greater-than-equals>
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac-ess-shed</property>
+						<value>110</value>
+					</greater-than-equals>
+					<!-- 37LP -->
+					<greater-than>
+						<property>/systems/electrical/bus/ac-1</property>
+						<value>110</value>
+					</greater-than>
+				</or>
+			</and>
 		</condition>
 		<emission>
 			<red>1.0</red>
@@ -7161,10 +7179,28 @@
 		<type>material</type>
 		<object-name>Eng2FireBtn</object-name>
 		<condition>
-			<or>
-				<property>systems/fire/engine2/warning-active</property>
-				<property>controls/switches/annun-test</property>
-			</or>
+			<and>
+				<or>
+					<property>systems/fire/engine2/warning-active</property>
+					<property>controls/switches/annun-test</property>
+				</or>
+				<or>
+					<!-- 35LP -->
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac-si-bus</property>
+						<value>110</value>
+					</greater-than-equals>
+					<greater-than-equals>
+						<property>systems/electrical/bus/ac-ess-shed</property>
+						<value>110</value>
+					</greater-than-equals>
+					<!-- 37LP -->
+					<greater-than>
+						<property>/systems/electrical/bus/ac-1</property>
+						<value>110</value>
+					</greater-than>
+				</or>
+			</and>
 		</condition>
 		<emission>
 			<red>1.0</red>
diff --git a/Systems/a320-lights.xml b/Systems/a320-lights.xml
index b4f01878..da4104f0 100644
--- a/Systems/a320-lights.xml
+++ b/Systems/a320-lights.xml
@@ -28,14 +28,15 @@
 		<switch name="/controls/lighting/fcu-panel-norm-tied">
 			<default value="0" />
 			<test value="/controls/lighting/fcu-panel-knb">
-				/systems/electrical/bus/ac-1 gt 25
+				/systems/electrical/bus/ac-1 gt 110
 			</test>
 		</switch>
 		
 		<switch name="/controls/lighting/fcu-digit-norm-tied">
 			<default value="0" />
-			<test value="/controls/lighting/fcu-digit-knb">
-				/systems/electrical/bus/ac-1 gt 25
+			<test logic="OR" value="/controls/lighting/fcu-digit-knb">
+				/systems/electrical/bus/ac-si-bus ge 110
+				/systems/electrical/bus/ac-ess-shed ge 110
 			</test>
 		</switch>