From 0444502186fa7d7b0fa6095950076f0a72c81d9c Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 10 Jun 2017 16:42:29 -0400
Subject: [PATCH] A3XX: Fix EXT PWR lights on overhead

---
 Models/Instruments/OHpanel/OHpanel.xml | 42 +++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index c5f2174a..64d4a66a 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -2440,14 +2440,40 @@
 		<object-name>ExtPwrBtn1A</object-name>
 		<condition>
 			<or>
-				<equals>
-					<property>/controls/switches/cart</property>
-					<value>1</value>
-				</equals>
-				<equals>
-					<property>/controls/switches/annun-test</property>
-					<value>1</value>
-				</equals>
+				<and>
+					<equals>
+						<property>/controls/switches/cart</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/controls/electrical/switches/gen-ext</property>
+						<value>0</value>
+					</equals>
+				</and>
+				<and>
+					<equals>
+						<property>/controls/switches/annun-test</property>
+						<value>1</value>
+					</equals>
+					<or>
+						<greater-than-equals>
+							<property>/systems/electrical/battery1-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/battery2-amps</property>
+							<value>120</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>/systems/electrical/bus/dc2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</and>
 			</or>
 		</condition>
 	</animation>