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 @@
/systems/electrical/relay/ac-ess-feed-1/auto-switch
- 100
+ 120
0.33333333333
@@ -1873,7 +1873,7 @@
/systems/electrical/relay/ac-ess-feed-inverter/contact-pos
- 100
+ 120
0.1
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 @@
Timer for the Fuel Center pumps
/systems/fuel/quantity/center-low
- 100
+ 120
0.00333
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 @@
Timer for the ECAM phase system
/ECAM/ground-calc-immediate
- 100
+ 120
1
@@ -80,6 +80,19 @@
+
+ /ECAM/phases/monostable/phase-1-300
+ 0.00333333333
+ 120
+
+
+
+
+
+ /ECAM/phases/monostable/phase-1-300-output ne 1
+ /ECAM/phases/monostable/phase-1-300 eq 1
+
+
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 @@
Timer for the ECAM system
/ECAM/phases/timer/eng1idle
- 100
+ 120
0.033
Timer for the ECAM system
/ECAM/phases/timer/eng2idle
- 100
+ 120
0.033
Timer for the ECAM system
/ECAM/phases/timer/eng1or2
- 100
+ 120
0.033
Timer for the ECAM system
/ECAM/phases/timer/to-inhibit
- 100
+ 120
0.33
Timer for the ECAM system
/ECAM/phases/timer/ldg-inhibit
- 100
+ 120
0.33
Timer for the ECAM system
/ECAM/warnings/timer/bleed-1-fault
- 100
+ 120
0.2
Timer for the ECAM system
/ECAM/warnings/timer/bleed-2-fault
- 100
+ 120
0.2
Timer for the ECAM system
/ECAM/warnings/logic/apu-bleed-fault
- 100
+ 120
0.1
Timer for the ECAM system
/systems/pneumatics/warnings/crossbleed-disag
- 100
+ 120
0.1
Timer for the ECAM system
/ECAM/warnings/logic/prv-1-not-shut-apu
- 100
+ 120
1
Timer for the ECAM system
/ECAM/warnings/logic/prv-2-not-shut-apu
- 100
+ 120
1
Timer for the ECAM system
/ECAM/warnings/logic/prv-1-not-shut
- 100
+ 120
1
Timer for the ECAM system
/ECAM/warnings/logic/prv-2-not-shut
- 100
+ 120
1
Timer for the ECAM system
/ECAM/warnings/timer/bleed-1-and-2-low-temp
- 100
+ 120
0.00185185
Timer for the ECAM system
/systems/pneumatics/warnings/lowtemp-1-mem
- 100
+ 120
0.016666
Timer for the ECAM system
/systems/pneumatics/warnings/lowtemp-2-mem
- 100
+ 120
0.016666
Timer for the ECAM system
/ECAM/warnings/logic/bleed-1-off-60
- 100
+ 120
0.016666
Timer for the ECAM system
/ECAM/warnings/logic/bleed-2-off-60
- 100
+ 120
0.016666
Timer for the ECAM system
/ECAM/warnings/logic/bleed-1-off-5
- 100
+ 120
0.2
Timer for the ECAM system
/ECAM/warnings/logic/bleed-2-off-5
- 100
+ 120
0.2
Timer for the ECAM system
/ECAM/warnings/logic/eng-aice-1-open
- 100
+ 120
0.2
Timer for the ECAM system
/ECAM/warnings/logic/eng-aice-2-open
- 100
+ 120
0.2
Timer for the ECAM system
/ECAM/warnings/logic/eng-aice-1-closed
- 100
+ 120
0.1
Timer for the ECAM system
/ECAM/warnings/logic/eng-aice-2-closed
- 100
+ 120
0.1
Timer for the ECAM system
/ECAM/warnings/logic/wing-anti-ice-flipflop-set-input
- 100
+ 120
0.0285714
Timer for the ECAM system
/ECAM/warnings/timer/phase-1-input
- 100
+ 120
0.5
Timer for the ECAM system
/controls/ice-protection/wing
- 100
+ 120
0.04
Timer for the ECAM system
/ECAM/warnings/logic/wing-anti-ice-left-closed-set-input
- 100
+ 120
0.066666
Timer for the ECAM system
/ECAM/warnings/logic/wing-anti-ice-right-closed-set-input
- 100
+ 120
0.066666
Timer for the ECAM system
/ECAM/warnings/logic/proc-wai-shutdown-flipflop
- 100
+ 120
0.1
Timer for the ECAM system
/ECAM/warnings/logic/wing-hi-pr-left-input
- 100
+ 120
0.025
Timer for the ECAM system
/ECAM/warnings/logic/wing-hi-pr-right-input
- 100
+ 120
0.025
Timer for the ECAM system
/ECAM/warnings/logic/cranking-35-sec-input
- 100
+ 120
0.028571
Timer for the ECAM system
/ECAM/warnings/logic/pack-1-fault-closed-input
- 100
+ 120
0.1
Timer for the ECAM system
/ECAM/warnings/logic/pack-2-fault-closed-input
- 100
+ 120
0.1
Timer for the ECAM system
/ECAM/warnings/logic/pack-1-disagree-input
- 100
+ 120
0.1
Timer for the ECAM system
/ECAM/warnings/logic/pack-2-disagree-input
- 100
+ 120
0.1
@@ -275,98 +275,98 @@
Timer for the ECAM system
/ECAM/warnings/logic/pack-1-fault-input
- 100
+ 120
0.20
Timer for the ECAM system
/ECAM/warnings/logic/pack-2-fault-input
- 100
+ 120
0.20
Timer for the ECAM system
/ECAM/warnings/logic/pack-1-fault-warning-input
- 100
+ 120
0.50
Timer for the ECAM system
/ECAM/warnings/logic/pack-2-fault-warning-input
- 100
+ 120
0.50
Timer for the ECAM system
/ECAM/warnings/logic/pack-1-off-input
- 100
+ 120
0.0166666
Timer for the ECAM system
/ECAM/warnings/logic/pack-2-off-input
- 100
+ 120
0.0166666
Timer for the ECAM system
/ECAM/warnings/logic/trim-air-fault-input
- 100
+ 120
0.2
Timer for the ECAM system
/ECAM/warnings/logic/yaw-damper-1-fault
- 100
+ 120
0.2
Timer for the ECAM system
/ECAM/warnings/logic/yaw-damper-2-fault
- 100
+ 120
0.2
Timer for the ECAM system
/ECAM/warnings/logic/nav-gpws-terr-fault
- 100
+ 120
1.0
Timer for the ECAM system
/ECAM/warnings/logic/gen-1-fault-set
- 100
+ 120
0.1818
Timer for the ECAM system
/ECAM/warnings/logic/gen-2-fault-set
- 100
+ 120
0.1818
Timer for the ECAM system
/ECAM/warnings/logic/apu-gen-fault-set
- 100
+ 120
0.2
Timer for the ECAM system
/ECAM/warnings/logic/apu-gen-fault-reset
- 100
+ 120
0.5
@@ -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
@@ -1370,14 +1371,6 @@
-
-
-
- /systems/hydraulic/green-psi lt 1500
- /ECAM/warning-phase ne 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 @@
-
-
-
- /systems/hydraulic/yellow-psi lt 1500
- /ECAM/warning-phase ne 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 @@
+
+
+
+ /systems/navigation/adr/operating-1 eq 1
+ /systems/navigation/adr/operating-2 eq 1
+ /systems/navigation/adr/operating-3 eq 1
+
+
+
+
+ /ECAM/warnings/logic/adr-off-input
+ 120
+ 0.5
+
+
+
+
+
+ /systems/hydraulics/warnings/green-lo-pr eq 0
+ /systems/hydraulics/warnings/yellow-lo-pr eq 0
+
+
+
/ECAM/irs-in-align eq 0
-
- /systems/navigation/adr/operating-1 eq 1
- /systems/navigation/adr/operating-2 eq 1
- /systems/navigation/adr/operating-3 eq 1
-
+ /ECAM/warnings/logic/adr-off ne 1
/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
- /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
@@ -1515,7 +1520,7 @@
/systems/electrical/relay/gen-1-glc/contact-pos
- 100
+ 120
0.5
@@ -1576,7 +1581,7 @@
/systems/electrical/relay/gen-2-glc/contact-pos
- 100
+ 120
0.5
@@ -1773,7 +1778,7 @@
/ECAM/warnings/logic/eng/ground-spoilers
- 100
+ 120
2
@@ -1805,13 +1810,13 @@
/ECAM/warnings/logic/eng/eng-1-tla-abv-6
- 100
+ 120
1
/ECAM/warnings/logic/eng/eng-1-tla-abv-6-2
- 100
+ 120
1
@@ -1824,7 +1829,7 @@
/ECAM/warnings/logic/eng/eng-1-tla-idle
- 100
+ 120
1
@@ -1837,7 +1842,7 @@
/ECAM/warnings/logic/eng/eng-1-reverse
- 100
+ 120
1
@@ -1858,13 +1863,13 @@
/ECAM/warnings/logic/eng/eng-2-tla-abv-6
- 100
+ 120
1
/ECAM/warnings/logic/eng/eng-2-tla-abv-6-2
- 100
+ 120
1
@@ -1877,7 +1882,7 @@
/ECAM/warnings/logic/eng/eng-2-tla-idle
- 100
+ 120
1
@@ -1890,7 +1895,7 @@
/ECAM/warnings/logic/eng/eng-2-reverse
- 100
+ 120
1
@@ -2046,7 +2051,7 @@
/ECAM/warnings/fctl/lrElevFault
- 100
+ 120
3.33333333333
@@ -2147,7 +2152,7 @@
/ECAM/warnings/fctl/gear-not-down-locked-set-input
- 100
+ 120
0.03333333333
@@ -2180,7 +2185,7 @@
/ECAM/warnings/hyd/engines-2-online
- 100
+ 120
1
@@ -2195,7 +2200,7 @@
/ECAM/warnings/hyd/engines-2-off-in-air
- 100
+ 120
0.2
@@ -2214,7 +2219,7 @@
/ECAM/warnings/hyd/engine-1-start
- 100
+ 120
1
@@ -2233,7 +2238,7 @@
/ECAM/warnings/hyd/engine-2-start
- 100
+ 120
1
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 @@
/systems/hydraulic/sources/ptu/ptu-loop-sound-cmd
1
- 100
+ 120
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 @@
/systems/pneumatics/valves/engine-1-prv-valve-autoclose-psi-cmd
- 100
+ 120
0.0666
@@ -294,7 +294,7 @@
/systems/pneumatics/valves/engine-2-prv-valve-autoclose-psi-cmd
- 100
+ 120
0.0666
@@ -438,7 +438,7 @@
/systems/pneumatics/valves/wing-ice-gnd-cmd
0.033333
- 100
+ 120
@@ -981,19 +981,19 @@
/systems/pneumatics/precooler/calc/ovht-5-true
0.2
- 100
+ 120
/systems/pneumatics/precooler/calc/ovht-15-true
0.06666
- 100
+ 120
/systems/pneumatics/precooler/calc/ovht-55-true
0.018182
- 100
+ 120
@@ -1094,19 +1094,19 @@
/systems/pneumatics/precooler/calc/ovht-5-true-2
0.2
- 100
+ 120
/systems/pneumatics/precooler/calc/ovht-15-true-2
0.06666
- 100
+ 120
/systems/pneumatics/precooler/calc/ovht-55-true-2
0.018182
- 100
+ 120
@@ -1180,7 +1180,7 @@
/systems/pneumatics/warnings/apu-bleed-not-on-cmd
0.1
- 100
+ 120
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 @@
-
-
- monostable
-
-
- ECAM/phases/monostable/phase-1-300
-
-
-
-
monostable
+
+ monostable
+
+
+ /ECAM/warnings/logic/green-yellow-press-on-monostable-input
+
+
+
+