From 450a3d6e25f7a0203eb9531b18d7ab0d8371aafc Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Thu, 2 Jan 2020 11:25:47 +0000
Subject: [PATCH] Fix the fire buttons powersupply in EMER ELEC

---
 Models/Instruments/OHpanel/OHpanel.xml | 252 +++++++++++++++++++++----
 Nasal/ECAM/ECAM-logic.nas              |   2 +-
 Nasal/Systems/fire.nas                 |   4 +-
 3 files changed, 217 insertions(+), 41 deletions(-)

diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index dfd85dc8..aec373f3 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -40,14 +40,6 @@
 		<object-name>ELAC1Btn1F</object-name>
 		<object-name>ELAC1Btn2O</object-name>
 		<object-name>EmerExtLtBtn2O</object-name>
-		<object-name>Eng1FireAgt1Btn1S</object-name>
-		<object-name>Eng1FireAgt1Btn2D</object-name>
-		<object-name>Eng1FireAgt2Btn1S</object-name>
-		<object-name>Eng1FireAgt2Btn2D</object-name>
-		<object-name>Eng2FireAgt1Btn1S</object-name>
-		<object-name>Eng2FireAgt1Btn2D</object-name>
-		<object-name>Eng2FireAgt2Btn1S</object-name>
-		<object-name>Eng2FireAgt2Btn2D</object-name>
 		<object-name>ExtPwrBtn2O</object-name>
 		<object-name>FAC1Btn1F</object-name>
 		<object-name>FAC1Btn2O</object-name>
@@ -65,10 +57,18 @@
 		<object-name>SEC1Btn1F</object-name>
 		<object-name>SEC1Btn2O</object-name>
 		<object-name>VentBlowBtn1F</object-name>
+		<object-name>Eng1FireAgt1Btn1S</object-name>
+		<object-name>Eng1FireAgt1Btn2D</object-name>
+		<object-name>Eng2FireAgt1Btn1S</object-name>
+		<object-name>Eng2FireAgt1Btn2D</object-name>
+		<object-name>Eng1FireAgt2Btn1S</object-name>
+		<object-name>Eng1FireAgt2Btn2D</object-name>
+		<object-name>Eng2FireAgt2Btn1S</object-name>
+		<object-name>Eng2FireAgt2Btn2D</object-name>
 		<condition>
 			<greater-than-equals>
 				<property>systems/electrical/bus/ac-ess</property>
-				<value>25</value>
+				<value>5</value>
 			</greater-than-equals>
 		</condition>
 	</animation>
@@ -167,7 +167,7 @@
 			</greater-than-equals>
 		</condition>
 	</animation>
-
+	
 	<!-- These are not simulated yet, so they only illuminate when the test is on. Remove each light/button once you add its select animation. -JD -->
 	<animation>
 		<type>select</type>
@@ -6484,6 +6484,18 @@
 				<command>property-assign</command>
 				<property>controls/engines/engine[0]/agent1-btn</property>
 				<value>1</value>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-hot-1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-hot-2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 			</binding>
 		</action>
 	</animation>
@@ -6500,6 +6512,12 @@
 				<command>property-assign</command>
 				<property>controls/engines/engine[0]/agent2-btn</property>
 				<value>1</value>
+				<condition>
+					<greater-than-equals>
+						<property>systems/electrical/bus/dc-2</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
 			</binding>
 		</action>
 	</animation>
@@ -6507,22 +6525,60 @@
 	<animation>
 		<type>select</type>
 		<object-name>Eng1FireAgt1Btn1S</object-name>
+		<condition>
+			<and>
+				<or>
+					<equals>
+						<property>controls/engines/engine[0]/fire-btn</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/controls/fire/test-btn-1</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>controls/switches/annun-test</property>
+						<value>1</value>
+					</equals>
+				</or>
+				<or>
+					<greater-than-equals>
+						<property>systems/electrical/bus/dc-hot-1</property>
+						<value>25</value>
+					</greater-than-equals>
+					<greater-than-equals>
+						<property>systems/electrical/bus/dc-hot-2</property>
+						<value>25</value>
+					</greater-than-equals>
+				</or>
+			</and>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
 		<object-name>Eng1FireAgt2Btn1S</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>controls/engines/engine[0]/fire-btn</property>
-					<value>1</value>
-				</equals>
-				<equals>
-					<property>/controls/fire/test-btn-1</property>
-					<value>1</value>
-				</equals>
-				<equals>
-					<property>controls/switches/annun-test</property>
-					<value>1</value>
-				</equals>
-			</or>
+			<and>
+				<or>
+					<equals>
+						<property>controls/engines/engine[0]/fire-btn</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/controls/fire/test-btn-1</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>controls/switches/annun-test</property>
+						<value>1</value>
+					</equals>
+				</or>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-2</property>
+					<value>25</value>
+				</greater-than-equals>
+			</and>
 		</condition>
 	</animation>
 
@@ -6579,6 +6635,24 @@
 				<command>property-assign</command>
 				<property>controls/fire/test-btn-1</property>
 				<value>1</value>
+				<condition>
+					<or>
+						<or>
+							<greater-than-equals>
+								<property>systems/electrical/bus/dc-hot-1</property>
+								<value>25</value>
+							</greater-than-equals>
+							<greater-than-equals>
+								<property>systems/electrical/bus/dc-hot-2</property>
+								<value>25</value>
+							</greater-than-equals>
+						</or>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 			</binding>
 			<mod-up>
 				<binding>
@@ -6600,6 +6674,24 @@
 				<command>property-assign</command>
 				<property>controls/fire/test-btn-2</property>
 				<value>1</value>
+				<condition>
+					<or>
+						<or>
+							<greater-than-equals>
+								<property>systems/electrical/bus/dc-hot-1</property>
+								<value>25</value>
+							</greater-than-equals>
+							<greater-than-equals>
+								<property>systems/electrical/bus/dc-hot-2</property>
+								<value>25</value>
+							</greater-than-equals>
+						</or>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 			</binding>
 			<mod-up>
 				<binding>
@@ -6621,6 +6713,18 @@
 				<command>property-assign</command>
 				<property>controls/fire/apu-test-btn</property>
 				<value>1</value>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-hot-1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-hot-2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 			</binding>
 			<mod-up>
 				<binding>
@@ -6733,6 +6837,22 @@
 				<command>property-assign</command>
 				<property>controls/APU/agent-btn</property>
 				<value>1</value>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-hot-1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-hot-2</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-bat</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 			</binding>
 		</action>
 	</animation>
@@ -6880,6 +7000,18 @@
 				<command>property-assign</command>
 				<property>controls/engines/engine[1]/agent1-btn</property>
 				<value>1</value>
+				<condition>
+					<or>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-hot-1</property>
+							<value>25</value>
+						</greater-than-equals>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-hot-2</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
+				</condition>
 			</binding>
 		</action>
 	</animation>
@@ -6896,6 +7028,12 @@
 				<command>property-assign</command>
 				<property>controls/engines/engine[1]/agent2-btn</property>
 				<value>1</value>
+				<condition>
+					<greater-than-equals>
+						<property>systems/electrical/bus/dc-2</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
 			</binding>
 		</action>
 	</animation>
@@ -6903,22 +7041,60 @@
 	<animation>
 		<type>select</type>
 		<object-name>Eng2FireAgt1Btn1S</object-name>
+		<condition>
+			<and>
+				<or>
+					<equals>
+						<property>controls/engines/engine[1]/fire-btn</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/controls/fire/test-btn-2</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>controls/switches/annun-test</property>
+						<value>1</value>
+					</equals>
+				</or>
+				<or>
+					<greater-than-equals>
+						<property>systems/electrical/bus/dc-hot-1</property>
+						<value>25</value>
+					</greater-than-equals>
+					<greater-than-equals>
+						<property>systems/electrical/bus/dc-hot-2</property>
+						<value>25</value>
+					</greater-than-equals>
+				</or>
+			</and>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>select</type>
 		<object-name>Eng2FireAgt2Btn1S</object-name>
 		<condition>
-			<or>
-				<equals>
-					<property>controls/engines/engine[1]/fire-btn</property>
-					<value>1</value>
-				</equals>
-				<equals>
-					<property>controls/fire/test-btn-2</property>
-					<value>1</value>
-				</equals>
-				<equals>
-					<property>controls/switches/annun-test</property>
-					<value>1</value>
-				</equals>
-			</or>
+			<and>
+				<or>
+					<equals>
+						<property>controls/engines/engine[1]/fire-btn</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/controls/fire/test-btn-2</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>controls/switches/annun-test</property>
+						<value>1</value>
+					</equals>
+				</or>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-2</property>
+					<value>25</value>
+				</greater-than-equals>
+			</and>
 		</condition>
 	</animation>
 
diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas
index 7522adc5..cb4145d8 100644
--- a/Nasal/ECAM/ECAM-logic.nas
+++ b/Nasal/ECAM/ECAM-logic.nas
@@ -1363,7 +1363,7 @@ var messages_config_memo = func {
 		setprop("/ECAM/ldg-memo-2200-set", 0);
 	}
 	
-	if (phaseVar >= 6 and phaseVar <= 8) {
+	if (phaseVar != 6 and phaseVar != 7 and phaseVar != 8) {
 		setprop("/ECAM/ldg-memo-2200-reset", 1);
 	} else {
 		setprop("/ECAM/ldg-memo-2200-reset", 0);
diff --git a/Nasal/Systems/fire.nas b/Nasal/Systems/fire.nas
index d250b14c..69568578 100644
--- a/Nasal/Systems/fire.nas
+++ b/Nasal/Systems/fire.nas
@@ -521,8 +521,8 @@ cargoDetectorLoop.new(2, 1, "/systems/fire/cargo/fwd/temperature", "/systems/fai
 ]);
 
 # Create extinguisher bottles
-var extinguisherBottles = std.Vector.new([extinguisherBottle.new(0, "/systems/fire/engine1/disch1", "/systems/electrical/bus/dc-bat", "/systems/failures/engine-left-fire", "/systems/fire/engine1/warning-active"), extinguisherBottle.new(1, "/systems/fire/engine1/disch2", "/systems/electrical/bus/dc-2", "/systems/failures/engine-left-fire", "/systems/fire/engine1/warning-active"),
-extinguisherBottle.new(0, "/systems/fire/engine2/disch1", "/systems/electrical/bus/dc-bat", "/systems/failures/engine-right-fire", "/systems/fire/engine2/warning-active"), extinguisherBottle.new(1, "/systems/fire/engine2/disch2", "/systems/electrical/bus/dc-2", "/systems/failures/engine-right-fire", "/systems/fire/engine2/warning-active"), 
+var extinguisherBottles = std.Vector.new([extinguisherBottle.new(0, "/systems/fire/engine1/disch1", "/systems/electrical/bus/dc-hot-1", "/systems/failures/engine-left-fire", "/systems/fire/engine1/warning-active"), extinguisherBottle.new(1, "/systems/fire/engine1/disch2", "/systems/electrical/bus/dc-2", "/systems/failures/engine-left-fire", "/systems/fire/engine1/warning-active"),
+extinguisherBottle.new(0, "/systems/fire/engine2/disch1", "/systems/electrical/bus/dc-hot-2", "/systems/failures/engine-right-fire", "/systems/fire/engine2/warning-active"), extinguisherBottle.new(1, "/systems/fire/engine2/disch2", "/systems/electrical/bus/dc-2", "/systems/failures/engine-right-fire", "/systems/fire/engine2/warning-active"), 
 extinguisherBottle.new(9, "/systems/fire/apu/disch", "/systems/electrical/bus/dc-bat", "/systems/failures/apu-fire", "/systems/fire/apu/warning-active") ]);
 
 # There is only one bottle but the system will think there are two, so other parts work