From ab5b080545fd3cb119de9209a9cce96dd5727c53 Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Mon, 11 May 2020 13:45:00 +0100
Subject: [PATCH] Bleed off warning, more improvements to bleed fault warnings

---
 Models/Instruments/OHpanel/OHpanel.xml |  60 ++++++++------
 Nasal/ECAM/ECAM-controller.nas         |   4 +
 Nasal/ECAM/ECAM-logic.nas              |  12 +++
 Systems/a320-fwc.xml                   | 110 +++++++++++++++++++++++--
 Systems/a320-pneumatic.xml             |  21 +++++
 Systems/ecam-proprules.xml             |  22 +++++
 6 files changed, 196 insertions(+), 33 deletions(-)

diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index d284b9ea..c8795bcf 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -53,8 +53,6 @@
 	
 	<animation>
 		<type>select</type>
-		<object-name>APUBleedBtn1F</object-name>
-		<object-name>APUBleedBtn2O</object-name>
 		<object-name>APUGenBtn1F</object-name>
 		<object-name>APUGenBtn2O</object-name>
 		<object-name>APUMasterBtn1F</object-name>
@@ -184,23 +182,21 @@
 		<type>select</type>
 		<object-name>Eng1BleedBtn1F</object-name>
 		<object-name>Eng1BleedBtn2O</object-name>
-		<condition>
-			<greater-than-equals>
-				<property>systems/electrical/bus/dc-ess-shed</property>
-				<value>25</value>
-			</greater-than-equals>
-		</condition>
-	</animation>
-
-	<animation>
-		<type>select</type>
 		<object-name>Eng2BleedBtn1F</object-name>
 		<object-name>Eng2BleedBtn2O</object-name>
+		<object-name>APUBleedBtn1F</object-name>
+		<object-name>APUBleedBtn2O</object-name>
 		<condition>
-			<greater-than-equals>
-				<property>systems/electrical/bus/dc-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>
+				<greater-than-equals>
+					<property>systems/electrical/bus/dc-ess-shed</property>
+					<value>25</value>
+				</greater-than-equals>
+			</or>
 		</condition>
 	</animation>
 	
@@ -4187,10 +4183,16 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-ess-shed</property>
-						<value>25</value>
-					</greater-than-equals>
+					<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>
 				</condition>
 				<command>property-toggle</command>
 				<property>controls/pneumatics/switches/bleed-1</property>
@@ -4256,11 +4258,11 @@
 				<condition>
 					<or>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc-bat</property>
+							<property>systems/electrical/bus/dc-2</property>
 							<value>25</value>
 						</greater-than-equals>
 						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
+							<property>systems/electrical/bus/dc-ess-shed</property>
 							<value>25</value>
 						</greater-than-equals>
 					</or>
@@ -4327,10 +4329,16 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-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>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-ess-shed</property>
+							<value>25</value>
+						</greater-than-equals>
+					</or>
 				</condition>
 				<command>property-toggle</command>
 				<property>controls/pneumatics/switches/bleed-2</property>
diff --git a/Nasal/ECAM/ECAM-controller.nas b/Nasal/ECAM/ECAM-controller.nas
index 30c582cf..03e15e97 100644
--- a/Nasal/ECAM/ECAM-controller.nas
+++ b/Nasal/ECAM/ECAM-controller.nas
@@ -54,6 +54,10 @@ var warningNodes = {
 		bleed2NotShutOutput: props.globals.initNode("/ECAM/warnings/timer/prv-2-not-shut-output"),
 		bleed1And2LoTemp: props.globals.initNode("/ECAM/warnings/timer/bleed-1-and-2-low-temp"),
 		bleed1And2LoTempOutput: props.globals.initNode("/ECAM/warnings/timer/bleed-1-and-2-low-temp-output"),
+		bleed1Off60Output: props.globals.initNode("/ECAM/warnings/logic/bleed-1-off-60-output"),
+		bleed1Off5Output: props.globals.initNode("/ECAM/warnings/logic/bleed-1-off-5-output"),
+		bleed2Off60Output: props.globals.initNode("/ECAM/warnings/logic/bleed-2-off-60-output"),
+		bleed2Off5Output: props.globals.initNode("/ECAM/warnings/logic/bleed-2-off-5-output"),
 	},
 	Flipflops: {
 		bleed1LowTemp: props.globals.initNode("/ECAM/warnings/logic/bleed-1-low-temp-flipflop-output"),
diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas
index bf2159b2..4357b941 100644
--- a/Nasal/ECAM/ECAM-logic.nas
+++ b/Nasal/ECAM/ECAM-logic.nas
@@ -1353,6 +1353,18 @@ var messages_priority_2 = func {
 		ECAM_controller.warningReset(xBleedIcing);
 	}
 	
+	if (bleed1Off.clearFlag == 0 and (warningNodes.Timers.bleed1Off60Output.getValue() == 1 or warningNodes.Timers.bleed1Off5Output.getValue() == 1) and FWC.Timer.eng1idleOutput.getBoolValue()) {
+		bleed1Off.active = 1;
+	} else {
+		ECAM_controller.warningReset(bleed1Off);
+	}
+	
+	if (bleed2Off.clearFlag == 0 and (warningNodes.Timers.bleed2Off60Output.getValue() == 1 or warningNodes.Timers.bleed2Off5Output.getValue() == 1) and FWC.Timer.eng2idleOutput.getBoolValue()) {
+		bleed2Off.active = 1;
+	} else {
+		ECAM_controller.warningReset(bleed2Off);
+	}
+	
 	# BMC
 	if (bleedMonFault.clearFlag == 0 and systems.PNEU.Fail.bmc1.getValue() and systems.PNEU.Fail.bmc2.getValue()) {
 		bleedMonFault.active = 1;
diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml
index ac2c4a52..0e7e00fa 100644
--- a/Systems/a320-fwc.xml
+++ b/Systems/a320-fwc.xml
@@ -106,17 +106,45 @@
 		
 		<actuator name="/ECAM/warnings/timer/bleed-1-low-temp-output">
             <description>Timer for the ECAM system</description>
-            <input>/systems/pneumatics/warnings/lowtemp-1</input>
+            <input>/systems/pneumatics/warnings/lowtemp-1-mem</input>
             <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
             <rate_limit sense="incr">0.016666</rate_limit> <!-- 60 seconds -->
         </actuator>
 		
 		<actuator name="/ECAM/warnings/timer/bleed-2-low-temp-output">
             <description>Timer for the ECAM system</description>
-            <input>/systems/pneumatics/warnings/lowtemp-2</input>
+            <input>/systems/pneumatics/warnings/lowtemp-2-mem</input>
             <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
             <rate_limit sense="incr">0.016666</rate_limit> <!-- 60 seconds -->
         </actuator>
+		
+		<actuator name="/ECAM/warnings/logic/bleed-1-off-60-output">
+            <description>Timer for the ECAM system</description>
+            <input>/ECAM/warnings/logic/bleed-1-off-60</input>
+            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="incr">0.016666</rate_limit> <!-- 60 seconds -->
+        </actuator>
+		
+		<actuator name="/ECAM/warnings/logic/bleed-2-off-60-output">
+            <description>Timer for the ECAM system</description>
+            <input>/ECAM/warnings/logic/bleed-2-off-60</input>
+            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="incr">0.016666</rate_limit> <!-- 60 seconds -->
+        </actuator>
+		
+		<actuator name="/ECAM/warnings/logic/bleed-1-off-5-output">
+            <description>Timer for the ECAM system</description>
+            <input>/ECAM/warnings/logic/bleed-1-off-5</input>
+            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
+        </actuator>
+		
+		<actuator name="/ECAM/warnings/logic/bleed-2-off-5-output">
+            <description>Timer for the ECAM system</description>
+            <input>/ECAM/warnings/logic/bleed-2-off-5</input>
+            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
+        </actuator>
 	</channel>
 	
 	<channel name="ECAM">
@@ -398,13 +426,81 @@
 			</test>
 		</switch>
 		
-		<switch name="/ECAM/warnings/logic/bleed-2-lo-temp-unsucc">
+		<switch name="/ECAM/warnings/logic/bleed-1-off-60">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/pneumatics/warnings/lowtemp-1-mem eq 0
+				/ECAM/warning-phase eq 6
+				/controls/pneumatics/switches/bleed-1 eq 0
+				/ECAM/warnings/logic/prv-1-not-shut eq 0
+				/ECAM/warnings/logic/bleed-1-off-flipflop eq 0
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/bleed-1-off-5">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/pneumatics/warnings/lowtemp-1-mem eq 0
+				/ECAM/warning-phase eq 2
+				/controls/pneumatics/switches/bleed-1 eq 0
+				/ECAM/warnings/logic/prv-1-not-shut eq 0
+				/ECAM/warnings/logic/bleed-1-off-flipflop eq 0
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/bleed-1-off-flipflop-set">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/pneumatics/valves/engine-1-prv-valve-disag eq 1
+				/controls/pneumatics/switches/bleed-1 eq 1
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/bleed-1-off-flipflop-reset">
 			<default value="0"/>
 			<test logic="OR" value="1">
-				/ECAM/warnings/logic/bleed-1-wai-avail eq 0
-				/ECAM/warnings/logic/bleed-2-lo-temp-xbleed eq 1
-				/ECAM/warnings/logic/bleed-2-lo-temp-bleed eq 1
-				/ECAM/warnings/logic/bleed-2-lo-temp-pack eq 1
+				/ECAM/warning-phase eq 1
+				/ECAM/warning-phase eq 3
+				/ECAM/warning-phase eq 7
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/bleed-2-off-60">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/pneumatics/warnings/lowtemp-2-mem eq 0
+				/ECAM/warning-phase eq 6
+				/controls/pneumatics/switches/bleed-2 eq 0
+				/ECAM/warnings/logic/prv-2-not-shut eq 0
+				/ECAM/warnings/logic/bleed-2-off-flipflop eq 0
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/bleed-2-off-5">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/pneumatics/warnings/lowtemp-2-mem eq 0
+				/ECAM/warning-phase eq 2
+				/controls/pneumatics/switches/bleed-2 eq 0
+				/ECAM/warnings/logic/prv-2-not-shut eq 0
+				/ECAM/warnings/logic/bleed-2-off-flipflop eq 0
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/bleed-2-off-flipflop-set">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/pneumatics/valves/engine-2-prv-valve-disag eq 1
+				/controls/pneumatics/switches/bleed-2 eq 1
+			</test>
+		</switch>
+		
+		<switch name="/ECAM/warnings/logic/bleed-2-off-flipflop-reset">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				/ECAM/warning-phase eq 1
+				/ECAM/warning-phase eq 3
+				/ECAM/warning-phase eq 7
 			</test>
 		</switch>
 	</channel>
diff --git a/Systems/a320-pneumatic.xml b/Systems/a320-pneumatic.xml
index eb01ab4e..10fdd290 100644
--- a/Systems/a320-pneumatic.xml
+++ b/Systems/a320-pneumatic.xml
@@ -830,6 +830,16 @@
 			</test>
 		</switch>
 		
+		<switch name="/systems/pneumatics/warnings/lowtemp-1-mem">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/pneumatics/warnings/lowtemp-1-mem eq 1
+				/controls/pneumatics/switches/bleed-1 eq 1
+			</test>
+			<test logic="AND" value="1">
+				/systems/pneumatics/warnings/lowtemp-1 eq 1
+			</test>
+		</switch>
 	</channel>
 	 
 	<channel name="Precooler Right" execute="/systems/pneumatics/indicating/bmc2-working">  <!-- These values come from BMC, so makes sense to not have them when BMC lacks power -->
@@ -932,6 +942,17 @@
 				/gear/gear[1]/wow eq 0
 			</test>
 		</switch>
+		
+		<switch name="/systems/pneumatics/warnings/lowtemp-2-mem">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/pneumatics/warnings/lowtemp-2-mem eq 1
+				/controls/pneumatics/switches/bleed-2 eq 1
+			</test>
+			<test logic="AND" value="1">
+				/systems/pneumatics/warnings/lowtemp-2 eq 1
+			</test>
+		</switch>
 	</channel>
 	
 	<channel name="ECAM">
diff --git a/Systems/ecam-proprules.xml b/Systems/ecam-proprules.xml
index b3efe0dc..b3afd071 100644
--- a/Systems/ecam-proprules.xml
+++ b/Systems/ecam-proprules.xml
@@ -566,4 +566,26 @@
 		<output>/ECAM/warnings/logic/wai-falling-pulse</output>
 	</flipflop>
 	
+	<flipflop>
+		<type>RS</type>
+		<S>
+			<property>/ECAM/warnings/logic/bleed-1-off-flipflop-set</property>
+		</S>
+		<R>
+			<property>/ECAM/warnings/logic/bleed-1-off-flipflop-reset</property>
+		</R>
+		<output>/ECAM/warnings/logic/bleed-1-off-flipflop</output>
+	</flipflop>
+	
+	<flipflop>
+		<type>RS</type>
+		<S>
+			<property>/ECAM/warnings/logic/bleed-2-off-flipflop-set</property>
+		</S>
+		<R>
+			<property>/ECAM/warnings/logic/bleed-2-off-flipflop-reset</property>
+		</R>
+		<output>/ECAM/warnings/logic/bleed-2-off-flipflop</output>
+	</flipflop>
+	
 </PropertyList>