From 62ab5483f08a7f50f3c9998b6b940b13a87383a9 Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Tue, 20 Oct 2020 22:24:29 +0100
Subject: [PATCH] Bugfix for yaw damper fault on startup

---
 Nasal/ECAM/ECAM-logic.nas    |   6 +-
 Nasal/ECAM/ECAM-messages.nas |   3 +-
 Nasal/ECAM/ECAM-phases.nas   |   4 +-
 Systems/a320-electrical.xml  |   4 +-
 Systems/a320-fuel.xml        |   2 +-
 Systems/a320-fwc-phases.xml  |  15 ++-
 Systems/a320-fwc.xml         | 193 ++++++++++++++++++-----------------
 Systems/a320-hydraulic.xml   |   2 +-
 Systems/a320-pneumatic.xml   |  20 ++--
 Systems/ecam-proprules.xml   |  23 ++---
 10 files changed, 146 insertions(+), 126 deletions(-)

diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas
index 2aa703d6..a654498f 100644
--- a/Nasal/ECAM/ECAM-logic.nas
+++ b/Nasal/ECAM/ECAM-logic.nas
@@ -1403,10 +1403,12 @@ var messages_priority_2 = func {
 	
 	if (yawDamperSysFault.clearFlag == 0 and phaseVar2 != 4 and phaseVar2 != 5 and phaseVar2 != 7 and phaseVar2 != 8 and phaseVar2 != 10 and warningNodes.Logic.yawDamper12Fault.getBoolValue()) {
 		yawDamperSysFault.active = 1;
-		yawDamperSysFaultFac.active = 1;
+		yawDamperSysFaultFac1.active = 1;
+		yawDamperSysFaultFac2.active = 1;
 	} else {
 		ECAM_controller.warningReset(yawDamperSysFault);
-		ECAM_controller.warningReset(yawDamperSysFaultFac);
+		ECAM_controller.warningReset(yawDamperSysFaultFac1);
+		ECAM_controller.warningReset(yawDamperSysFaultFac2);
 	}
 	
 	if (rudTravLimSysFault.clearFlag == 0 and phaseVar2 != 4 and phaseVar2 != 5 and phaseVar2 != 7 and phaseVar2 != 8 and warningNodes.Logic.rtlu12Fault.getBoolValue()) {
diff --git a/Nasal/ECAM/ECAM-messages.nas b/Nasal/ECAM/ECAM-messages.nas
index a62d76a9..c4a925b6 100644
--- a/Nasal/ECAM/ECAM-messages.nas
+++ b/Nasal/ECAM/ECAM-messages.nas
@@ -287,7 +287,8 @@ var warnings				  = std.Vector.new([
 	var fac12FaultSuccess     = warning.new(msg: "   •IF UNSUCCESSFUL :",     colour: "w"),
 	var fac12FaultFacOff      = warning.new(msg: " -FAC 1+2............OFF",  colour: "c"),
 	var yawDamperSysFault     = warning.new(msg: "AUTO FLT YAW DAMPER SYS",   colour: "a", aural: 1, light: 1, isMainMsg: 1),
-	var yawDamperSysFaultFac  = warning.new(msg: " -FAC 1+2....OFF THEN ON",  colour: "c"),
+	var yawDamperSysFaultFac1 = warning.new(msg: " -FAC 1......OFF THEN ON",  colour: "c"),
+	var yawDamperSysFaultFac2 = warning.new(msg: " -FAC 2......OFF THEN ON",  colour: "c"),
 	# var rudderTrimSysFault    = warning.new(msg: "AUTO FLT RUD TRIM SYS",     colour: "a", aural: 1, light: 1, isMainMsg: 1), not implemented
 	# var rudderTrimSysFaultFac = warning.new(msg: " -FAC 1+2....OFF THEN ON",  colour: "c"),
 	var rudTravLimSysFault    = warning.new(msg: "AUTO FLT RUD TRV LIM SYS",  colour: "a", aural: 1, light: 1, isMainMsg: 1),
diff --git a/Nasal/ECAM/ECAM-phases.nas b/Nasal/ECAM/ECAM-phases.nas
index a0188197..81a670ce 100644
--- a/Nasal/ECAM/ECAM-phases.nas
+++ b/Nasal/ECAM/ECAM-phases.nas
@@ -29,7 +29,7 @@ var FWC = {
 		phase5: props.globals.initNode("/ECAM/phases/monostable/phase-5", 0, "BOOL"),
 		phase7: props.globals.initNode("/ECAM/phases/monostable/phase-7", 0, "BOOL"),
 		phase9: props.globals.initNode("/ECAM/phases/monostable/phase-9", 0, "BOOL"),
-		phase1Output: props.globals.initNode("/ECAM/phases/monostable/phase-1-output"),
+		phase1Output: props.globals.initNode("/ECAM/phases/monostable/phase-1-300-output"),
 		phase5Output: props.globals.initNode("/ECAM/phases/monostable/phase-5-output"),
 		phase7Output: props.globals.initNode("/ECAM/phases/monostable/phase-7-output"),
 		phase9Output: props.globals.initNode("/ECAM/phases/monostable/phase-9-output"),
@@ -150,7 +150,7 @@ var phaseLoop = func() {
 	}
 	
 	if ((FWC.Logic.gnd.getBoolValue() and twoEngOff and myPhase == 9) and FWC.Flipflop.phase10Output.getBoolValue()) {
-		FWC.Monostable.phase1.setBoolValue(1);
+		FWC.Monostable.phase1.setBoolValue(1); # true for 300 sec then false
 	}	else {
 		FWC.Monostable.phase1.setBoolValue(0);
 	}
diff --git a/Systems/a320-electrical.xml b/Systems/a320-electrical.xml
index 8fb63914..37e0fce0 100644
--- a/Systems/a320-electrical.xml
+++ b/Systems/a320-electrical.xml
@@ -1079,7 +1079,7 @@
 		
 		<actuator name="/systems/electrical/relay/ac-ess-feed-1/auto-switch-timer">
 			<input>/systems/electrical/relay/ac-ess-feed-1/auto-switch</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.33333333333</rate_limit> <!-- 3 seconds -->
 		</actuator>
 		
@@ -1873,7 +1873,7 @@
 		
 		<actuator name="/systems/electrical/some-electric-thingie/static-inverter-timer">
             <input>/systems/electrical/relay/ac-ess-feed-inverter/contact-pos</input>
-            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="decr">120</rate_limit> <!-- Instant -->
             <rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->
         </actuator>
 		
diff --git a/Systems/a320-fuel.xml b/Systems/a320-fuel.xml
index d6006798..76648294 100644
--- a/Systems/a320-fuel.xml
+++ b/Systems/a320-fuel.xml
@@ -188,7 +188,7 @@
 		<actuator name="/systems/fuel/pumps/center-control-low-level">
             <description>Timer for the Fuel Center pumps</description>
             <input>/systems/fuel/quantity/center-low</input>
-            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="decr">120</rate_limit> <!-- Instant -->
             <rate_limit sense="incr">0.00333</rate_limit> <!-- 300 seconds -->
         </actuator>
 		
diff --git a/Systems/a320-fwc-phases.xml b/Systems/a320-fwc-phases.xml
index 33d5a6b1..dceae541 100644
--- a/Systems/a320-fwc-phases.xml
+++ b/Systems/a320-fwc-phases.xml
@@ -9,7 +9,7 @@
 		<actuator name="/ECAM/timer/ground-calc">
             <description>Timer for the ECAM phase system</description>
             <input>/ECAM/ground-calc-immediate</input>
-            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="decr">120</rate_limit> <!-- Instant -->
             <rate_limit sense="incr">1</rate_limit> <!-- 1 second -->
         </actuator>
 	</channel>
@@ -80,6 +80,19 @@
 			</test>
 		</switch>
 		
+		<actuator name="/ECAM/phases/monostable/phase-1-300-output">
+			<input>/ECAM/phases/monostable/phase-1-300</input>
+			<rate_limit sense="incr">0.00333333333</rate_limit>
+			<rate_limit sense="decr">120</rate_limit>
+		</actuator>
+		
+		<switch name="/ECAM/phases/monostable/phase-1-300-output">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/ECAM/phases/monostable/phase-1-300-output ne 1
+				/ECAM/phases/monostable/phase-1-300 eq 1
+			</test>
+		</switch>
 	</channel>
 
 </system>
diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml
index 8a63074c..579c39d5 100644
--- a/Systems/a320-fwc.xml
+++ b/Systems/a320-fwc.xml
@@ -9,259 +9,259 @@
 		<actuator name="/ECAM/phases/timer/eng1idle-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/phases/timer/eng1idle</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.033</rate_limit> <!-- 30 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/phases/timer/eng2idle-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/phases/timer/eng2idle</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.033</rate_limit> <!-- 30 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/phases/timer/eng1or2-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/phases/timer/eng1or2</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.033</rate_limit> <!-- 30 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/phases/timer/to-inhibit-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/phases/timer/to-inhibit</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.33</rate_limit> <!-- 3 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/phases/timer/ldg-inhibit-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/phases/timer/ldg-inhibit</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.33</rate_limit> <!-- 3 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/bleed-1-fault-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/timer/bleed-1-fault</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/bleed-2-fault-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/timer/bleed-2-fault</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/apu-fault-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/apu-bleed-fault</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/xbleed-fault-output">
 			<description>Timer for the ECAM system</description>
 			<input>/systems/pneumatics/warnings/crossbleed-disag</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/prv-1-not-shut-apu-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/prv-1-not-shut-apu</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 second -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/prv-2-not-shut-apu-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/prv-2-not-shut-apu</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 second -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/prv-1-not-shut-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/prv-1-not-shut</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 second -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/prv-2-not-shut-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/prv-2-not-shut</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 second -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/bleed-1-and-2-low-temp-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/timer/bleed-1-and-2-low-temp</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.00185185</rate_limit> <!-- 540 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/bleed-1-low-temp-output">
 			<description>Timer for the ECAM system</description>
 			<input>/systems/pneumatics/warnings/lowtemp-1-mem</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</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-mem</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</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="decr">120</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="decr">120</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="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/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="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/eng-aice-1-open-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/eng-aice-1-open</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/eng-aice-2-open-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/eng-aice-2-open</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/eng-aice-1-closed-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/eng-aice-1-closed</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/eng-aice-2-closed-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/eng-aice-2-closed</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/logic/wing-anti-ice-flipflop-set">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/wing-anti-ice-flipflop-set-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.0285714</rate_limit> <!-- 35 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/phase-1">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/timer/phase-1-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.5</rate_limit> <!-- 2 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/wing-anti-ice-25">
 			<description>Timer for the ECAM system</description>
 			<input>/controls/ice-protection/wing</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.04</rate_limit> <!-- 25 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/logic/wing-anti-ice-left-closed-set">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/wing-anti-ice-left-closed-set-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.066666</rate_limit> <!-- 15 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/logic/wing-anti-ice-right-closed-set">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/wing-anti-ice-right-closed-set-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.066666</rate_limit> <!-- 15 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/logic/proc-wai-shutdown-output">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/proc-wai-shutdown-flipflop</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/wing-hi-pr-left">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/wing-hi-pr-left-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.025</rate_limit> <!-- 40 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/wing-hi-pr-right">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/wing-hi-pr-right-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.025</rate_limit> <!-- 40 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/cranking-35-sec">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/cranking-35-sec-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.028571</rate_limit> <!-- 35 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/pack-1-fault-closed">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/pack-1-fault-closed-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/pack-2-fault-closed">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/pack-2-fault-closed-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/pack-1-disagree">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/pack-1-disagree-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/pack-2-disagree">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/pack-2-disagree-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.1</rate_limit> <!-- 10 seconds -->
 		</actuator>
 		
@@ -275,98 +275,98 @@
 		<actuator name="/ECAM/warnings/timer/pack-1-fault-5">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/pack-1-fault-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.20</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/pack-2-fault-5">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/pack-2-fault-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.20</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/pack-1-fault-2">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/pack-1-fault-warning-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.50</rate_limit> <!-- 2 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/pack-2-fault-2">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/pack-2-fault-warning-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.50</rate_limit> <!-- 2 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/pack-1-off">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/pack-1-off-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.0166666</rate_limit> <!-- 60 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/pack-2-off">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/pack-2-off-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.0166666</rate_limit> <!-- 60 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/trim-air-fault">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/trim-air-fault-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/yaw-damper-1-fault">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/yaw-damper-1-fault</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/yaw-damper-2-fault">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/yaw-damper-2-fault</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/nav-gpws-terr-fault">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/nav-gpws-terr-fault</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1.0</rate_limit> <!-- 1 second -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/gen-1-fault-set">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/gen-1-fault-set</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.1818</rate_limit> <!-- 5.5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/gen-2-fault-set">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/gen-2-fault-set</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.1818</rate_limit> <!-- 5.5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/apu-gen-fault-set">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/apu-gen-fault-set</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/timer/apu-gen-fault-reset">
 			<description>Timer for the ECAM system</description>
 			<input>/ECAM/warnings/logic/apu-gen-fault-reset</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.5</rate_limit> <!-- 2 seconds -->
 		</actuator>
 	</channel>
@@ -1343,7 +1343,8 @@
 				/systems/navigation/adr/operating-1 eq 1
 				/systems/navigation/adr/operating-3 eq 1
 				/systems/electrical/bus/dc-ess-shed ge 25
-				/systems/electrical/bus/ac-1 ge 110
+				/systems/electrical/bus/dc-ess ge 25
+				/systems/electrical/bus/ac-ess ge 110
 				/systems/fctl/fac1-healthy-signal eq 0
 				/systems/fctl/fac2-healthy-signal eq 1
 			</test>
@@ -1370,14 +1371,6 @@
 			</test>
 		</switch>
 		
-		<switch name="/ECAM/warnings/logic/yaw-damper-1-fault-green">
-			<default value="0"/>
-			<test logic="AND" value="1">
-				/systems/hydraulic/green-psi lt 1500
-				/ECAM/warning-phase ne 1
-			</test>
-		</switch>
-		
 		<switch name="/ECAM/warnings/logic/yaw-damper-1-fault-adr">
 			<default value="0"/>
 			<test logic="AND" value="1">
@@ -1398,7 +1391,7 @@
 				/systems/electrical/bus/dc-ess-shed ge 25
 				/systems/electrical/bus/ac-1 ge 110
 				/ECAM/warnings/logic/yaw-damper-1-fault-eng-start eq 0
-				/ECAM/warnings/logic/yaw-damper-1-fault-green eq 0
+				/systems/hydraulic/green-psi ge 1500
 				/ECAM/warnings/logic/yaw-damper-1-fault-adr eq 0
 				/ECAM/irs-in-align eq 0
 				/systems/fctl/yawdamper-1-active eq 0
@@ -1415,14 +1408,6 @@
 			</test>
 		</switch>
 		
-		<switch name="/ECAM/warnings/logic/yaw-damper-2-fault-yellow">
-			<default value="0"/>
-			<test logic="AND" value="1">
-				/systems/hydraulic/yellow-psi lt 1500
-				/ECAM/warning-phase ne 1
-			</test>
-		</switch>
-		
 		<switch name="/ECAM/warnings/logic/yaw-damper-2-fault-adr">
 			<default value="0"/>
 			<test logic="AND" value="1">
@@ -1443,7 +1428,7 @@
 				/systems/electrical/bus/dc-2 ge 25
 				/systems/electrical/bus/ac-2 ge 110
 				/ECAM/warnings/logic/yaw-damper-2-fault-eng-start eq 0
-				/ECAM/warnings/logic/yaw-damper-2-fault-yellow eq 0
+				/systems/hydraulic/yellow-psi ge 1500
 				/ECAM/warnings/logic/yaw-damper-2-fault-adr eq 0
 				/ECAM/irs-in-align eq 0
 				/systems/fctl/yawdamper-2-active eq 0
@@ -1451,23 +1436,43 @@
 			</test>
 		</switch>
 		
+		<switch name="/ECAM/warnings/logic/adr-off-input">
+			<default value="1"/>
+			<test logic="OR" value="0">
+				/systems/navigation/adr/operating-1 eq 1
+				/systems/navigation/adr/operating-2 eq 1
+				/systems/navigation/adr/operating-3 eq 1
+			</test>
+		</switch>
+		
+		<actuator name="/ECAM/warnings/logic/adr-off">
+			<input>/ECAM/warnings/logic/adr-off-input</input>
+			<rate_limit sense="decr">120</rate_limit>
+			<rate_limit sense="incr">0.5</rate_limit>
+		</actuator>
+		
+		<switch name="/ECAM/warnings/logic/green-yellow-press-on-monostable-input">
+			<default value="0"/>
+			<test logic="AND" value="1">
+				/systems/hydraulics/warnings/green-lo-pr eq 0
+				/systems/hydraulics/warnings/yellow-lo-pr eq 0
+			</test>
+		</switch>
+		
 		<switch name="/ECAM/warnings/logic/yaw-damper-12-fault">
 			<default value="0"/>
 			<test logic="AND" value="1">
 				/ECAM/irs-in-align eq 0
-				<test logic="OR">
-					/systems/navigation/adr/operating-1 eq 1
-					/systems/navigation/adr/operating-2 eq 1
-					/systems/navigation/adr/operating-3 eq 1
-				</test>
+				/ECAM/warnings/logic/adr-off ne 1
 				<test logic="OR">
 					/systems/electrical/bus/dc-ess-shed ge 25
 					/systems/electrical/bus/ac-1 ge 110
 					/systems/electrical/bus/dc-2 ge 25
 					/systems/electrical/bus/ac-2 ge 110
 				</test>
-				/ECAM/warnings/logic/yaw-damper-1-fault-green eq 0
-				/ECAM/warnings/logic/yaw-damper-2-fault-yellow eq 0
+				/ECAM/warnings/logic/green-yellow-press-on-monostable eq 0
+				/systems/hydraulic/green-psi ge 1500
+				/systems/hydraulic/yellow-psi ge 1500
 				/ECAM/warnings/logic/yaw-damper-1-fault eq 1
 				/ECAM/warnings/logic/yaw-damper-2-fault eq 1
 			</test>
@@ -1515,7 +1520,7 @@
 		
 		<actuator name="/ECAM/warnings/logic/glc-1-online-2-sec">
 			<input>/systems/electrical/relay/gen-1-glc/contact-pos</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.5</rate_limit> <!-- 2 seconds -->
 		</actuator>
 		
@@ -1576,7 +1581,7 @@
 		
 		<actuator name="/ECAM/warnings/logic/glc-2-online-2-sec">
 			<input>/systems/electrical/relay/gen-2-glc/contact-pos</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.5</rate_limit> <!-- 2 seconds -->
 		</actuator>
 		
@@ -1773,7 +1778,7 @@
 		
 		<actuator name="/ECAM/warnings/logic/eng/ground-spoilers-output">
 			<input>/ECAM/warnings/logic/eng/ground-spoilers</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">2</rate_limit> <!-- 0.5 seconds -->
 		</actuator>
 		
@@ -1805,13 +1810,13 @@
 		
 		<actuator name="/ECAM/warnings/logic/eng/eng-1-tla-abv-6-output">
 			<input>/ECAM/warnings/logic/eng/eng-1-tla-abv-6</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/logic/eng/eng-1-tla-abv-6-2-output">
 			<input>/ECAM/warnings/logic/eng/eng-1-tla-abv-6-2</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 seconds -->
 		</actuator>
 		
@@ -1824,7 +1829,7 @@
 		
 		<actuator name="/ECAM/warnings/logic/eng/eng-1-tla-idle-output">
 			<input>/ECAM/warnings/logic/eng/eng-1-tla-idle</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 seconds -->
 		</actuator>
 		
@@ -1837,7 +1842,7 @@
 		
 		<actuator name="/ECAM/warnings/logic/eng/eng-1-reverse-output">
 			<input>/ECAM/warnings/logic/eng/eng-1-reverse</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 seconds -->
 		</actuator>
 		
@@ -1858,13 +1863,13 @@
 		
 		<actuator name="/ECAM/warnings/logic/eng/eng-2-tla-abv-6-output">
 			<input>/ECAM/warnings/logic/eng/eng-2-tla-abv-6</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 seconds -->
 		</actuator>
 		
 		<actuator name="/ECAM/warnings/logic/eng/eng-2-tla-abv-6-2-output">
 			<input>/ECAM/warnings/logic/eng/eng-2-tla-abv-6-2</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 seconds -->
 		</actuator>
 		
@@ -1877,7 +1882,7 @@
 		
 		<actuator name="/ECAM/warnings/logic/eng/eng-2-tla-idle-output">
 			<input>/ECAM/warnings/logic/eng/eng-2-tla-idle</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 seconds -->
 		</actuator>
 		
@@ -1890,7 +1895,7 @@
 		
 		<actuator name="/ECAM/warnings/logic/eng/eng-2-reverse-output">
 			<input>/ECAM/warnings/logic/eng/eng-2-reverse</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit> <!-- 1 seconds -->
 		</actuator>
 		
@@ -2046,7 +2051,7 @@
 		
 		<actuator name="/ECAM/warnings/fctl/lrElevFault-output">
 			<input>/ECAM/warnings/fctl/lrElevFault</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">3.33333333333</rate_limit> <!-- 0.3 seconds -->
 		</actuator>
 		
@@ -2147,7 +2152,7 @@
 		
 		<actuator name="/ECAM/warnings/fctl/gear-not-down-locked-set-output">
 			<input>/ECAM/warnings/fctl/gear-not-down-locked-set-input</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.03333333333</rate_limit> <!-- 30 seconds -->
 		</actuator>
 		
@@ -2180,7 +2185,7 @@
 		
 		<actuator name="/ECAM/warnings/hyd/engines-2-online-output">
 			<input>/ECAM/warnings/hyd/engines-2-online</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit>
 		</actuator>
 		
@@ -2195,7 +2200,7 @@
 		
 		<actuator name="/ECAM/warnings/hyd/engines-2-off-in-air-output">
 			<input>/ECAM/warnings/hyd/engines-2-off-in-air</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">0.2</rate_limit> <!-- 5 seconds -->
 		</actuator>
 		
@@ -2214,7 +2219,7 @@
 		
 		<actuator name="/ECAM/warnings/hyd/engine-1-start-output">
 			<input>/ECAM/warnings/hyd/engine-1-start</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit>
 		</actuator>
 		
@@ -2233,7 +2238,7 @@
 		
 		<actuator name="/ECAM/warnings/hyd/engine-2-start-output">
 			<input>/ECAM/warnings/hyd/engine-2-start</input>
-			<rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- Instant -->
 			<rate_limit sense="incr">1</rate_limit>
 		</actuator>
 		
diff --git a/Systems/a320-hydraulic.xml b/Systems/a320-hydraulic.xml
index f4d0ed26..89113580 100644
--- a/Systems/a320-hydraulic.xml
+++ b/Systems/a320-hydraulic.xml
@@ -477,7 +477,7 @@
 		<actuator name="/systems/hydraulic/sources/ptu/ptu-loop-sound">
 			<input>/systems/hydraulic/sources/ptu/ptu-loop-sound-cmd</input>
 			<rate_limit sense="incr">1</rate_limit>
-			<rate_limit sense="decr">100</rate_limit> <!-- instant -->
+			<rate_limit sense="decr">120</rate_limit> <!-- instant -->
 		</actuator>
 		
 		<switch name="/systems/hydraulic/sources/ptu/yellow-green">
diff --git a/Systems/a320-pneumatic.xml b/Systems/a320-pneumatic.xml
index 345575d0..bfe656d7 100644
--- a/Systems/a320-pneumatic.xml
+++ b/Systems/a320-pneumatic.xml
@@ -214,7 +214,7 @@
 		
 		<actuator name="/systems/pneumatics/valves/engine-1-prv-valve-autoclose-psi">
             <input>/systems/pneumatics/valves/engine-1-prv-valve-autoclose-psi-cmd</input>
-            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="decr">120</rate_limit> <!-- Instant -->
             <rate_limit sense="incr">0.0666</rate_limit> <!-- 15 seconds -->
         </actuator>
 		
@@ -294,7 +294,7 @@
 		
 		<actuator name="/systems/pneumatics/valves/engine-2-prv-valve-autoclose-psi">
             <input>/systems/pneumatics/valves/engine-2-prv-valve-autoclose-psi-cmd</input>
-            <rate_limit sense="decr">100</rate_limit> <!-- Instant -->
+            <rate_limit sense="decr">120</rate_limit> <!-- Instant -->
             <rate_limit sense="incr">0.0666</rate_limit> <!-- 15 seconds -->
         </actuator>
 		
@@ -438,7 +438,7 @@
 		<actuator name="/systems/pneumatics/valves/wing-ice-gnd">
 			<input>/systems/pneumatics/valves/wing-ice-gnd-cmd</input>
 			<rate_limit sense="incr">0.033333</rate_limit> <!-- 30 seconds -->
-			<rate_limit sense="decr">100</rate_limit>
+			<rate_limit sense="decr">120</rate_limit>
 		</actuator>
 		
 		<switch name="/systems/pneumatics/valves/wing-ice-1-cmd">
@@ -981,19 +981,19 @@
 		<actuator name="/systems/pneumatics/precooler/calc/ovht-5">
 			<input>/systems/pneumatics/precooler/calc/ovht-5-true</input>
 			<rate_limit sense="incr">0.2</rate_limit>
-			<rate_limit sense="decr">100</rate_limit>
+			<rate_limit sense="decr">120</rate_limit>
 		</actuator>
 		
 		<actuator name="/systems/pneumatics/precooler/calc/ovht-15">
 			<input>/systems/pneumatics/precooler/calc/ovht-15-true</input>
 			<rate_limit sense="incr">0.06666</rate_limit>
-			<rate_limit sense="decr">100</rate_limit>
+			<rate_limit sense="decr">120</rate_limit>
 		</actuator>
 		
 		<actuator name="/systems/pneumatics/precooler/calc/ovht-55">
 			<input>/systems/pneumatics/precooler/calc/ovht-55-true</input>
 			<rate_limit sense="incr">0.018182</rate_limit>
-			<rate_limit sense="decr">100</rate_limit>
+			<rate_limit sense="decr">120</rate_limit>
 		</actuator>
 		
 		<switch name="/systems/pneumatics/precooler/ovht-1">
@@ -1094,19 +1094,19 @@
 		<actuator name="/systems/pneumatics/precooler/calc/ovht-5-2">
 			<input>/systems/pneumatics/precooler/calc/ovht-5-true-2</input>
 			<rate_limit sense="incr">0.2</rate_limit>
-			<rate_limit sense="decr">100</rate_limit>
+			<rate_limit sense="decr">120</rate_limit>
 		</actuator>
 		
 		<actuator name="/systems/pneumatics/precooler/calc/ovht-15-2">
 			<input>/systems/pneumatics/precooler/calc/ovht-15-true-2</input>
 			<rate_limit sense="incr">0.06666</rate_limit>
-			<rate_limit sense="decr">100</rate_limit>
+			<rate_limit sense="decr">120</rate_limit>
 		</actuator>
 		
 		<actuator name="/systems/pneumatics/precooler/calc/ovht-55-2">
 			<input>/systems/pneumatics/precooler/calc/ovht-55-true-2</input>
 			<rate_limit sense="incr">0.018182</rate_limit>
-			<rate_limit sense="decr">100</rate_limit>
+			<rate_limit sense="decr">120</rate_limit>
 		</actuator>
 		
 		<switch name="/systems/pneumatics/precooler/ovht-2">
@@ -1180,7 +1180,7 @@
 		<actuator name="/systems/pneumatics/warnings/apu-bleed-not-on">
 			<input>/systems/pneumatics/warnings/apu-bleed-not-on-cmd</input>
 			<rate_limit sense="incr">0.1</rate_limit>
-			<rate_limit sense="decr">100</rate_limit>
+			<rate_limit sense="decr">120</rate_limit>
 		</actuator>
 		
 		<switch name="/systems/pneumatics/warnings/crossbleed-disag-open">
diff --git a/Systems/ecam-proprules.xml b/Systems/ecam-proprules.xml
index 1e1bd8c9..167de57c 100644
--- a/Systems/ecam-proprules.xml
+++ b/Systems/ecam-proprules.xml
@@ -203,18 +203,6 @@
 		<output>ECAM/phases/monostable/gnd-output</output>
 	</flipflop>
 	
-	
-	<flipflop>
-		<type>monostable</type>
-		<time>
-			<value>300.0</value>
-		</time>
-		<S>
-			<property>ECAM/phases/monostable/phase-1-300</property>
-		</S>
-		<output>ECAM/phases/monostable/phase-1-output</output>
-	</flipflop>
-	
 	<flipflop>
 		<type>monostable</type>
 		<time>
@@ -1070,4 +1058,15 @@
 		<output>/ECAM/warnings/fctl/gear-not-down-locked</output>
 	</flipflop>
 	
+	<flipflop>
+		<type>monostable</type>
+		<time>
+			<value>40</value>
+		</time>
+		<S>
+			<property>/ECAM/warnings/logic/green-yellow-press-on-monostable-input</property>
+		</S>
+		<output>/ECAM/warnings/logic/green-yellow-press-on-monostable</output>
+	</flipflop>
+	
 </PropertyList>