diff --git a/Systems/a320-fwc.xml b/Systems/a320-fwc.xml
index 6dbdda6e..2bdfbbba 100644
--- a/Systems/a320-fwc.xml
+++ b/Systems/a320-fwc.xml
@@ -7,367 +7,367 @@
- Timer for the ECAM system
- /ECAM/phases/timer/eng1idle
- 100
- 0.033
-
+ Timer for the ECAM system
+ /ECAM/phases/timer/eng1idle
+ 100
+ 0.033
+
- Timer for the ECAM system
- /ECAM/phases/timer/eng2idle
- 100
- 0.033
-
+ Timer for the ECAM system
+ /ECAM/phases/timer/eng2idle
+ 100
+ 0.033
+
- Timer for the ECAM system
- /ECAM/phases/timer/eng1or2
- 100
- 0.033
-
+ Timer for the ECAM system
+ /ECAM/phases/timer/eng1or2
+ 100
+ 0.033
+
- Timer for the ECAM system
- /ECAM/phases/timer/to-inhibit
- 100
- 0.33
-
+ Timer for the ECAM system
+ /ECAM/phases/timer/to-inhibit
+ 100
+ 0.33
+
- Timer for the ECAM system
- /ECAM/phases/timer/ldg-inhibit
- 100
- 0.33
-
+ Timer for the ECAM system
+ /ECAM/phases/timer/ldg-inhibit
+ 100
+ 0.33
+
- Timer for the ECAM system
- /ECAM/warnings/timer/bleed-1-fault
- 100
- 0.2
-
+ Timer for the ECAM system
+ /ECAM/warnings/timer/bleed-1-fault
+ 100
+ 0.2
+
- Timer for the ECAM system
- /ECAM/warnings/timer/bleed-2-fault
- 100
- 0.2
-
+ Timer for the ECAM system
+ /ECAM/warnings/timer/bleed-2-fault
+ 100
+ 0.2
+
- Timer for the ECAM system
- /ECAM/warnings/logic/apu-bleed-fault
- 100
- 0.1
-
+ Timer for the ECAM system
+ /ECAM/warnings/logic/apu-bleed-fault
+ 100
+ 0.1
+
- Timer for the ECAM system
- /systems/pneumatics/warnings/crossbleed-disag
- 100
- 0.1
-
+ Timer for the ECAM system
+ /systems/pneumatics/warnings/crossbleed-disag
+ 100
+ 0.1
+
- Timer for the ECAM system
- /ECAM/warnings/logic/prv-1-not-shut-apu
- 100
- 1
-
+ Timer for the ECAM system
+ /ECAM/warnings/logic/prv-1-not-shut-apu
+ 100
+ 1
+
- Timer for the ECAM system
- /ECAM/warnings/logic/prv-2-not-shut-apu
- 100
- 1
-
+ Timer for the ECAM system
+ /ECAM/warnings/logic/prv-2-not-shut-apu
+ 100
+ 1
+
- Timer for the ECAM system
- /ECAM/warnings/logic/prv-1-not-shut
- 100
- 1
-
+ Timer for the ECAM system
+ /ECAM/warnings/logic/prv-1-not-shut
+ 100
+ 1
+
- Timer for the ECAM system
- /ECAM/warnings/logic/prv-2-not-shut
- 100
- 1
-
+ Timer for the ECAM system
+ /ECAM/warnings/logic/prv-2-not-shut
+ 100
+ 1
+
- Timer for the ECAM system
- /ECAM/warnings/timer/bleed-1-and-2-low-temp
- 100
- 0.00185185
-
+ Timer for the ECAM system
+ /ECAM/warnings/timer/bleed-1-and-2-low-temp
+ 100
+ 0.00185185
+
- Timer for the ECAM system
- /systems/pneumatics/warnings/lowtemp-1-mem
- 100
- 0.016666
-
+ Timer for the ECAM system
+ /systems/pneumatics/warnings/lowtemp-1-mem
+ 100
+ 0.016666
+
- Timer for the ECAM system
- /systems/pneumatics/warnings/lowtemp-2-mem
- 100
- 0.016666
-
+ Timer for the ECAM system
+ /systems/pneumatics/warnings/lowtemp-2-mem
+ 100
+ 0.016666
+
- Timer for the ECAM system
- /ECAM/warnings/logic/bleed-1-off-60
- 100
- 0.016666
-
+ Timer for the ECAM system
+ /ECAM/warnings/logic/bleed-1-off-60
+ 100
+ 0.016666
+
- Timer for the ECAM system
- /ECAM/warnings/logic/bleed-2-off-60
- 100
- 0.016666
-
+ Timer for the ECAM system
+ /ECAM/warnings/logic/bleed-2-off-60
+ 100
+ 0.016666
+
- Timer for the ECAM system
- /ECAM/warnings/logic/bleed-1-off-5
- 100
- 0.2
-
+ Timer for the ECAM system
+ /ECAM/warnings/logic/bleed-1-off-5
+ 100
+ 0.2
+
- Timer for the ECAM system
- /ECAM/warnings/logic/bleed-2-off-5
- 100
- 0.2
-
+ Timer for the ECAM system
+ /ECAM/warnings/logic/bleed-2-off-5
+ 100
+ 0.2
+
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/eng-aice-1-open
- 100
- 0.2
+ 100
+ 0.2
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/eng-aice-2-open
- 100
- 0.2
+ 100
+ 0.2
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/eng-aice-1-closed
- 100
- 0.1
+ 100
+ 0.1
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/eng-aice-2-closed
- 100
- 0.1
+ 100
+ 0.1
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/wing-anti-ice-flipflop-set-input
- 100
- 0.0285714
+ 100
+ 0.0285714
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/timer/phase-1-input
- 100
- 0.5
+ 100
+ 0.5
- Timer for the ECAM system
+ Timer for the ECAM system
/controls/ice-protection/wing
- 100
- 0.04
+ 100
+ 0.04
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/wing-anti-ice-left-closed-set-input
- 100
- 0.066666
+ 100
+ 0.066666
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/wing-anti-ice-right-closed-set-input
- 100
- 0.066666
+ 100
+ 0.066666
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/proc-wai-shutdown-flipflop
- 100
- 0.1
+ 100
+ 0.1
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/wing-hi-pr-left-input
- 100
- 0.025
+ 100
+ 0.025
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/wing-hi-pr-right-input
- 100
- 0.025
+ 100
+ 0.025
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/cranking-35-sec-input
- 100
- 0.028571
+ 100
+ 0.028571
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/pack-1-fault-closed-input
- 100
- 0.1
+ 100
+ 0.1
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/pack-2-fault-closed-input
- 100
- 0.1
+ 100
+ 0.1
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/pack-1-disagree-input
- 100
- 0.1
+ 100
+ 0.1
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/pack-2-disagree-input
- 100
- 0.1
+ 100
+ 0.1
- Timer for the ECAM system
+ Timer for the ECAM system
/ECAM/warnings/logic/ignition
- 100
- 0.028571
+ 100
+ 0.028571Timer for the ECAM system
/ECAM/warnings/logic/pack-1-fault-input
- 100
- 0.20
+ 100
+ 0.20Timer for the ECAM system
/ECAM/warnings/logic/pack-2-fault-input
- 100
- 0.20
+ 100
+ 0.20Timer for the ECAM system
/ECAM/warnings/logic/pack-1-fault-warning-input
- 100
- 0.50
+ 100
+ 0.50Timer for the ECAM system
/ECAM/warnings/logic/pack-2-fault-warning-input
- 100
- 0.50
+ 100
+ 0.50Timer for the ECAM system
/ECAM/warnings/logic/pack-1-off-input
- 100
- 0.0166666
+ 100
+ 0.0166666Timer for the ECAM system
/ECAM/warnings/logic/pack-2-off-input
- 100
- 0.0166666
+ 100
+ 0.0166666Timer for the ECAM system
/ECAM/warnings/logic/trim-air-fault-input
- 100
- 0.2
+ 100
+ 0.2Timer for the ECAM system
/ECAM/warnings/logic/yaw-damper-1-fault
- 100
- 0.2
+ 100
+ 0.2Timer for the ECAM system
/ECAM/warnings/logic/yaw-damper-2-fault
- 100
- 0.2
+ 100
+ 0.2Timer for the ECAM system
/ECAM/warnings/logic/nav-gpws-terr-fault
- 100
- 1.0
+ 100
+ 1.0Timer for the ECAM system
/ECAM/warnings/logic/gen-1-fault-set
- 100
- 0.1818
+ 100
+ 0.1818Timer for the ECAM system
/ECAM/warnings/logic/gen-2-fault-set
- 100
- 0.1818
+ 100
+ 0.1818Timer for the ECAM system
/ECAM/warnings/logic/apu-gen-fault-set
- 100
- 0.2
+ 100
+ 0.2Timer for the ECAM system
/ECAM/warnings/logic/apu-gen-fault-reset
- 100
- 0.5
+ 100
+ 0.5
@@ -1515,8 +1515,8 @@
/systems/electrical/relay/gen-1-glc/contact-pos
- 100
- 0.5
+ 100
+ 0.5
@@ -1576,8 +1576,8 @@
/systems/electrical/relay/gen-2-glc/contact-pos
- 100
- 0.5
+ 100
+ 0.5
@@ -1773,8 +1773,8 @@
/ECAM/warnings/logic/eng/ground-spoilers
- 100
- 2
+ 100
+ 2
@@ -1795,10 +1795,24 @@
+
+
+
+ /controls/engines/engine[0]/throttle-lever ge 0.13333333333
+ /ECAM/phases/to-power-set eq 0
+
+
+
/ECAM/warnings/logic/eng/eng-1-tla-abv-6
- 100
- 1
+ 100
+ 1
+
+
+
+ /ECAM/warnings/logic/eng/eng-1-tla-abv-6-2
+ 100
+ 1
@@ -1810,8 +1824,8 @@
/ECAM/warnings/logic/eng/eng-1-tla-idle
- 100
- 1
+ 100
+ 1
@@ -1823,8 +1837,8 @@
/ECAM/warnings/logic/eng/eng-1-reverse
- 100
- 1
+ 100
+ 1
@@ -1834,10 +1848,24 @@
+
+
+
+ /controls/engines/engine[1]/throttle-lever ge 0.13333333333
+ /ECAM/phases/to-power-set eq 0
+
+
+
/ECAM/warnings/logic/eng/eng-2-tla-abv-6
- 100
- 1
+ 100
+ 1
+
+
+
+ /ECAM/warnings/logic/eng/eng-2-tla-abv-6-2
+ 100
+ 1
@@ -1849,8 +1877,8 @@
/ECAM/warnings/logic/eng/eng-2-tla-idle
- 100
- 1
+ 100
+ 1
@@ -1862,8 +1890,8 @@
/ECAM/warnings/logic/eng/eng-2-reverse
- 100
- 1
+ 100
+ 1
@@ -1885,7 +1913,7 @@
- /ECAM/warnings/logic/eng/eng-1-tla-abv-6-output eq 1
+ /ECAM/warnings/logic/eng/eng-1-tla-abv-6-2-output eq 1
/engines/engine[0]/state eq 3
/engines/engine[1]/state eq 3
@@ -1901,7 +1929,7 @@
- /ECAM/warnings/logic/eng/eng-2-tla-abv-6-output eq 1
+ /ECAM/warnings/logic/eng/eng-2-tla-abv-6-2-output eq 1
/engines/engine[0]/state eq 3
/engines/engine[1]/state eq 3