diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index 7d5ef0a7..9b5a776c 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -276,7 +276,7 @@
-
+
diff --git a/A320-main.xml b/A320-main.xml
index 81ad3733..129cc4aa 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -705,9 +705,11 @@
1500
IDLE
+ 0
IDLE
+ 0
0
@@ -1321,11 +1323,6 @@
-
- 0
- 0
-
-
0
0
diff --git a/Engines/v2527-a5_1.xml b/Engines/v2527-a5_1.xml
index 549a7598..d915af76 100644
--- a/Engines/v2527-a5_1.xml
+++ b/Engines/v2527-a5_1.xml
@@ -2,21 +2,21 @@
-
+
- 27000
+ 26600
0.445
0.03
- 0.6
- 22.2
- 0.05
- 1.85
- 0.573
- 1.127
- 18.9
- 59.4
- 104.0
- 105.0
+ 4.8
+ 23.9
+ 0.2
+ 1.0
+ 0.365
+ 1.724
+ 22.4
+ 60.9
+ 100.0
+ 100.0
0
0
@@ -50,32 +50,32 @@
-
+
/engines/engine[0]/n1
24 0.6
- 28 1.6
- 46 5.2
- 68 8.3
- 80 10.5
- 94 11.5
- 103 12.6
+ 28 1.5
+ 46 4.9
+ 68 7.8
+ 80 9.9
+ 94 10.8
+ 103 11.9
-
+
/engines/engine[0]/n1
24 0.6
- 28 1.6
- 46 5.2
- 68 8.3
- 80 10.5
- 94 11.5
- 103 12.6
+ 28 1.5
+ 46 4.9
+ 68 7.8
+ 80 9.9
+ 94 10.8
+ 103 11.9
diff --git a/Engines/v2527-a5_2.xml b/Engines/v2527-a5_2.xml
index 79c65063..f1a95966 100644
--- a/Engines/v2527-a5_2.xml
+++ b/Engines/v2527-a5_2.xml
@@ -2,21 +2,21 @@
-
+
- 27000
+ 26600
0.445
0.03
- 0.6
- 22.2
- 0.05
- 1.85
- 0.573
- 1.127
- 18.9
- 59.4
- 104.0
- 105.0
+ 4.8
+ 23.9
+ 0.2
+ 1.0
+ 0.365
+ 1.724
+ 22.4
+ 60.9
+ 100.0
+ 100.0
0
0
@@ -50,32 +50,32 @@
-
+
/engines/engine[1]/n1
24 0.6
- 28 1.6
- 46 5.2
- 68 8.3
- 80 10.5
- 94 11.5
- 103 12.6
+ 28 1.5
+ 46 4.9
+ 68 7.8
+ 80 9.9
+ 94 10.8
+ 103 11.9
-
+
/engines/engine[1]/n1
24 0.6
- 28 1.6
- 46 5.2
- 68 8.3
- 80 10.5
- 94 11.5
- 103 12.6
+ 28 1.5
+ 46 4.9
+ 68 7.8
+ 80 9.9
+ 94 10.8
+ 103 11.9
diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml
index 8a0f0cfe..6bd18519 100644
--- a/Models/Instruments/OHpanel/OHpanelEPR.xml
+++ b/Models/Instruments/OHpanel/OHpanelEPR.xml
@@ -53,7 +53,7 @@
property-toggle
- controls/fadec/n1mode1
+ fdm/jsbsim/fadec/control-1/n1-mode-sw
property-assign
@@ -116,7 +116,7 @@
- controls/fadec/n1mode1
+ fdm/jsbsim/fadec/control-1/n1-mode-sw
1
@@ -154,7 +154,7 @@
property-toggle
- controls/fadec/n1mode2
+ fdm/jsbsim/fadec/control-2/n1-mode-sw
property-assign
@@ -217,7 +217,7 @@
- controls/fadec/n1mode2
+ fdm/jsbsim/fadec/control-2/n1-mode-sw
1
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
index 78b4b04f..cd1ca51d 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas
@@ -1019,13 +1019,13 @@ input = {
egt_2_needle: "/instrumentation/upper-ecam/egt[1]",
# N1 parameters
- EPR_1: "/ECAM/Upper/EPR[0]",
- EPR_2: "/ECAM/Upper/EPR[1]",
+ EPR_1: "/instrumentation/upper-ecam/epr[0]",
+ EPR_2: "/instrumentation/upper-ecam/epr[1]",
EPR_actual_1: "/engines/engine[0]/epr-actual",
EPR_actual_2: "/engines/engine[1]/epr-actual",
- EPR_lim: "/ECAM/Upper/EPRylim",
- EPRthr_1: "/ECAM/Upper/EPRthr[0]",
- EPRthr_2: "/ECAM/Upper/EPRthr[1]",
+ EPR_lim: "/instrumentation/upper-ecam/epr-limit",
+ EPRthr_1: "/instrumentation/upper-ecam/epr-thr[0]",
+ EPRthr_2: "/instrumentation/upper-ecam/epr-thr[1]",
# fuel flow
fuelflow_1: "/engines/engine[0]/ff-actual",
@@ -1051,8 +1051,8 @@ input = {
fadecPower1: "/systems/fadec/powered1",
fadecPower2: "/systems/fadec/powered2",
fadecPowerStart: "/systems/fadec/powerup",
- N1_mode_1: "/fdm/jsbsim/fadec/control-1/n1-mode",
- N1_mode_2: "/fdm/jsbsim/fadec/control-2/n1-mode",
+ N1_mode_1: "/fdm/jsbsim/fadec/control-1/n1-mode-sw",
+ N1_mode_2: "/fdm/jsbsim/fadec/control-2/n1-mode-sw",
eng1_epr: "/systems/fadec/eng1/epr",
eng2_epr: "/systems/fadec/eng2/epr",
eng1_n1: "/systems/fadec/eng1/n1",
diff --git a/Nasal/FMGC/FMGC-b.nas b/Nasal/FMGC/FMGC-b.nas
index 07c6892f..4344c76b 100644
--- a/Nasal/FMGC/FMGC-b.nas
+++ b/Nasal/FMGC/FMGC-b.nas
@@ -355,6 +355,10 @@ var ITAF = {
fcu.apOff("hard", 0);
}
}
+
+ if ((systems.FADEC.n1Mode[0].getValue() > 0 or systems.FADEC.n1Mode[1].getValue() > 0) and Output.athr.getBoolValue()) {
+ fcu.athrOff("hard");
+ }
},
slowLoop: func() {
Velocities.trueAirspeedKtTemp = Velocities.trueAirspeedKt.getValue();
@@ -476,7 +480,7 @@ var ITAF = {
},
athrMaster: func(s) {
if (s == 1) {
- if (systems.ELEC.Bus.acEss.getValue() >= 110 and !pts.FMGC.CasCompare.casRejectAll.getBoolValue() and fbw.FBW.apOff == 0) {
+ if (systems.ELEC.Bus.acEss.getValue() >= 110 and !pts.FMGC.CasCompare.casRejectAll.getBoolValue() and fbw.FBW.apOff == 0 and systems.FADEC.n1Mode[0].getValue() == 0 and systems.FADEC.n1Mode[1].getValue() == 0) {
Output.athr.setBoolValue(1);
Custom.ThrLock.setValue(0);
Custom.Sound.enableAthrOff = 1;
diff --git a/Nasal/Libraries/buttons.nas b/Nasal/Libraries/buttons.nas
index a7b2588f..2decb374 100644
--- a/Nasal/Libraries/buttons.nas
+++ b/Nasal/Libraries/buttons.nas
@@ -14,8 +14,6 @@ var cvr_tone = props.globals.getNode("/controls/CVR/tone");
var variousReset = func() {
setprop("/modes/cpt-du-xfr", 0);
setprop("/modes/fo-du-xfr", 0);
- setprop("/controls/fadec/n1mode1", 0);
- setprop("/controls/fadec/n1mode2", 0);
setprop("/instrumentation/mk-viii/serviceable", 1);
setprop("/instrumentation/mk-viii/inputs/discretes/ta-tcf-inhibit", 0);
setprop("/instrumentation/mk-viii/inputs/discretes/gpws-inhibit", 0);
diff --git a/Nasal/Systems/fadec-cfm.nas b/Nasal/Systems/fadec-cfm.nas
index dc34cdb2..f0fd2d66 100644
--- a/Nasal/Systems/fadec-cfm.nas
+++ b/Nasal/Systems/fadec-cfm.nas
@@ -43,14 +43,6 @@ var FADEC_S = {
n2: 0,
ff: 0,
},
- Switches: {
- n1ModeSwitch1: props.globals.initNode("/controls/fadec/n1mode1", 0, "BOOL"),
- n1ModeSwitch2: props.globals.initNode("/controls/fadec/n1mode2", 0, "BOOL"),
- },
- Modes: {
- n1Mode1: props.globals.initNode("/fdm/jsbsim/fadec/control-1/n1-mode", 0, "BOOL"), # 0 == EPR, 1 == N1 Rated, 2 == N1 Unrated #
- n1Mode2: props.globals.initNode("/fdm/jsbsim/fadec/control-2/n1-mode", 0, "BOOL"),
- },
init: func() {
me.Power.poweredTime.setValue(-300);
me.Eng1.eng1Time.setValue(-300);
diff --git a/Nasal/Systems/fadec-common.nas b/Nasal/Systems/fadec-common.nas
index e2c8b3a2..22012820 100644
--- a/Nasal/Systems/fadec-common.nas
+++ b/Nasal/Systems/fadec-common.nas
@@ -39,6 +39,7 @@ var FADEC = {
manThrAboveMct: [0, 0],
maxDetent: props.globals.getNode("/fdm/jsbsim/fadec/max-detent"),
n1Mode: [props.globals.getNode("/fdm/jsbsim/fadec/control-1/n1-mode"), props.globals.getNode("/fdm/jsbsim/fadec/control-2/n1-mode")],
+ n1ModeSw: [props.globals.getNode("/fdm/jsbsim/fadec/control-1/n1-mode-sw"), props.globals.getNode("/fdm/jsbsim/fadec/control-2/n1-mode-sw")],
togaLk: props.globals.getNode("/fdm/jsbsim/fadec/toga-lk"),
init: func() {
me.engOut.setBoolValue(0);
@@ -46,6 +47,13 @@ var FADEC = {
me.Limit.activeModeInt.setValue(0);
me.Limit.flexActive.setBoolValue(0);
me.Limit.flexActiveCmd.setBoolValue(0);
+ if (pts.Options.eng.getValue() == "IAE") {
+ me.n1ModeSw[0].setBoolValue(1);
+ me.n1ModeSw[1].setBoolValue(1);
+ } else {
+ me.n1ModeSw[0].setBoolValue(0);
+ me.n1ModeSw[1].setBoolValue(0);
+ }
systems.FADEC_S.init();
thrustFlashT.start();
},
@@ -117,7 +125,7 @@ var FADEC = {
pts.Gear.wowTemp[1] = pts.Gear.wow[1].getValue();
pts.Gear.wowTemp[2] = pts.Gear.wow[2].getValue();
- if (me.Limit.flexActiveCmd.getBoolValue() and !me.n1Mode[0].getValue() and !me.n1Mode[1].getValue() and pts.Gear.wowTemp[1] and pts.Gear.wowTemp[2] and pts.Velocities.groundspeedKt.getValue() < 40 and (pts.Engines.Engine.stateTemp[0] == 3 or pts.Engines.Engine.stateTemp[1] == 3)) {
+ if (me.Limit.flexActiveCmd.getBoolValue() and me.n1Mode[0].getValue() == 0 and me.n1Mode[1].getValue() == 0 and pts.Gear.wowTemp[1] and pts.Gear.wowTemp[2] and pts.Velocities.groundspeedKt.getValue() < 40 and (pts.Engines.Engine.stateTemp[0] == 3 or pts.Engines.Engine.stateTemp[1] == 3)) {
if (!me.Limit.flexActive.getBoolValue()) {
me.Limit.flexActive.setBoolValue(1);
}
diff --git a/Nasal/Systems/fadec-iae.nas b/Nasal/Systems/fadec-iae.nas
index b6717b0e..b09b31f2 100644
--- a/Nasal/Systems/fadec-iae.nas
+++ b/Nasal/Systems/fadec-iae.nas
@@ -43,14 +43,6 @@ var FADEC_S = {
n2: 0,
ff: 0,
},
- Switches: {
- n1ModeSwitch1: props.globals.initNode("/controls/fadec/n1mode1", 0, "BOOL"),
- n1ModeSwitch2: props.globals.initNode("/controls/fadec/n1mode2", 0, "BOOL"),
- },
- Modes: {
- n1Mode1: props.globals.initNode("/fdm/jsbsim/fadec/control-1/n1-mode", 0, "BOOL"), # 0 == EPR, 1 == N1 Rated, 2 == N1 Unrated #
- n1Mode2: props.globals.initNode("/fdm/jsbsim/fadec/control-2/n1-mode", 0, "BOOL"),
- },
init: func() {
me.Power.poweredTime.setValue(-300);
me.Eng1.eng1Time.setValue(-300);
@@ -146,7 +138,7 @@ var FADEC_S = {
powerup = me.Power.powerup.getValue();
if (powered1 or powerup or me.Eng1.eng1Off.getValue()) {
- if (me.Modes.n1Mode1.getValue() == 0) {
+ if (FADEC.n1Mode[0].getValue() == 0) {
me.Eng1.epr.setValue(1);
} else {
me.Eng1.epr.setValue(0);
@@ -160,7 +152,7 @@ var FADEC_S = {
}
if (powered2 or powerup or me.Eng2.eng2Off.getValue()) {
- if (me.Modes.n1Mode2.getValue() == 0) {
+ if (FADEC.n1Mode[1].getValue() == 0) {
me.Eng2.epr.setValue(1);
} else {
me.Eng2.epr.setValue(0);
@@ -203,19 +195,3 @@ var FADEC_S = {
}
},
};
-
-setlistener("/controls/fadec/n1mode1", func() {
- if (FADEC.Switches.n1ModeSwitch1.getValue()) {
- FADEC.Modes.n1Mode1.setValue(1);
- } else {
- FADEC.Modes.n1Mode1.setValue(0);
- }
-}, 0, 0);
-
-setlistener("/controls/fadec/n1mode2", func() {
- if (FADEC.Switches.n1ModeSwitch2.getValue()) {
- FADEC.Modes.n1Mode2.setValue(1);
- } else {
- FADEC.Modes.n1Mode2.setValue(0);
- }
-}, 0, 0);
\ No newline at end of file
diff --git a/Systems/a320-cfm56-5b4-engine-fadec.xml b/Systems/a320-cfm56-5b4-engine-fadec.xml
index 159a8f00..f17f0443 100644
--- a/Systems/a320-cfm56-5b4-engine-fadec.xml
+++ b/Systems/a320-cfm56-5b4-engine-fadec.xml
@@ -12,6 +12,8 @@
fadec/limit/max-n1
fadec/athr/cmd
fadec/limit/active-epr
+ fadec/control-1/n1-mode
+ fadec/control-2/n1-mode
diff --git a/Systems/a320-v2527-a5-engine-fadec.xml b/Systems/a320-v2527-a5-engine-fadec.xml
new file mode 100644
index 00000000..fce0d230
--- /dev/null
+++ b/Systems/a320-v2527-a5-engine-fadec.xml
@@ -0,0 +1,1562 @@
+
+
+
+
+
+
+
+ fadec/limit/rated-temp
+ fadec/limit/flex-rated-temp
+ fadec/limit/rated-thrust
+ fadec/limit/min-n1
+ fadec/limit/max-n1
+ fadec/athr/cmd
+ fadec/limit/active-epr
+
+
+
+
+
+
+ fadec/control-1/n1-mode-sw eq 1
+
+
+
+
+
+
+
+ fadec/control-2/n1-mode-sw eq 1
+
+
+
+
+
+
+
+ /position/altitude-ft
+ propulsion/tat-c
+
+ -44 -14 16 46 76
+ 0 77.7 82.3 86.5 90.7 94.8
+ 10000 87.3 91.6 95.5 96.9 95.7
+ 43000 86.0 86.4 91.1 99.3 100.3
+
+
+
+
+
+
+
+
+ velocities/mach
+ atmosphere/density-altitude
+
+ -10000 0 10000 20000 30000 40000 50000
+ 0.0 1.2600 1.0000 0.7400 0.5640 0.3920 0.2710 0.0000
+ 0.2 1.1710 0.9740 0.6970 0.5360 0.3850 0.2610 0.0000
+ 0.4 1.1500 0.9570 0.6920 0.5460 0.3870 0.2530 0.0000
+ 0.6 1.1810 0.9410 0.7210 0.5660 0.3580 0.2180 0.0000
+ 0.8 1.2290 1.0200 0.7820 0.5570 0.3040 0.1930 0.0000
+ 0.9 1.2580 1.0200 0.7820 0.5220 0.2710 0.1140 0.0000
+ 1.0 1.1810 0.9510 0.7210 0.4410 0.1740 0.0450 0.0000
+ 1.2 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
+ 1.4 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000 0.0000
+
+
+
+
+
+
+
+
+
+
+
+ propulsion/engine[0]/IdleThrust
+ fadec/limit/rated-thrust
+
+
+
+ fadec/limit/rated-thrust
+
+ propulsion/engine[0]/IdleThrust
+ fadec/limit/rated-thrust
+
+
+ fadec/limit/milthrust-unmodified
+
+
+
+
+
+
+
+
+
+ propulsion/engine[0]/IdleThrust
+ fadec/limit/rated-thrust
+
+
+
+
+ fadec/limit/rated-thrust
+
+ propulsion/engine[0]/IdleThrust
+ fadec/limit/rated-thrust
+
+
+ fadec/limit/milthrust-unmodified
+
+
+
+ fadec/limit/rated-thrust-n1
+ 22.4
+
+ 77.6
+
+
+
+ fadec/limit/rated-thrust-n1
+ 22.4
+
+ 77.6
+
+
+
+
+
+
+
+
+
+
+ /systems/acconfig/autoconfig-running
+ 1
+
+ 0
+
+
+ fadec/limit/rated-thrust-lbs
+ 0
+
+
+ fadec/limit/fgturbine-thrust-lbs
+ fadec/limit/rated-thrust-lbs
+
+ 1
+
+
+
+
+
+
+
+
+ /position/altitude-ft
+ propulsion/tat-c
+
+ -44 -14 16 46 76
+ 0 77.7 82.3 86.5 90.7 86.4
+ 10000 87.3 91.6 95.5 96.9 92.9
+ 43000 86.0 86.4 91.1 99.3 93.8
+
+
+
+
+
+
+
+
+
+
+
+ fadec/limit/toga-ref
+ 10
+
+ 0.5
+
+
+ 10
+
+
+
+
+
+
+
+ fadec/limit/toga
+
+ 22.4 0
+ 100.0 1
+
+
+
+
+
+
+ fadec/limit/flex-rated-temp
+ -fadec/limit/flex-temp
+ propulsion/tat-c
+
+
+
+
+
+ fadec/limit/toga-ref
+
+ /position/altitude-ft
+ fadec/limit/flex-temp-input
+
+ -44 -14 16 46 76
+ 0 77.7 82.3 86.5 90.7 86.4
+ 10000 87.3 91.6 95.5 96.9 92.9
+ 43000 86.0 86.4 91.1 99.3 93.8
+
+
+
+
+
+
+
+
+
+ /position/altitude-ft
+ propulsion/tat-c
+
+ -65 -35 -5 25 55
+ 0 71.9 76.3 80.6 84.6 83.1
+ 10000 81.3 85.4 89.3 92.2 91.7
+ 43000 82.6 82.9 84.7 89.1 87.5
+
+
+
+
+
+
+
+
+ fadec/limit/flex-active eq 1
+
+
+
+
+
+
+
+
+
+ fadec/limit/mct-flex-ref
+ 10
+
+ 0.5
+
+
+ 10
+
+
+
+
+
+
+
+ fadec/limit/mct
+
+ 22.4 0
+ 100.0 1
+
+
+
+
+
+
+
+
+ /position/altitude-ft
+ propulsion/tat-c
+
+ -65 -35 -5 25 55
+ 0 69.3 73.5 77.5 81.3 79.9
+ 10000 78.2 82.0 85.8 88.5 87.3
+ 43000 79.4 79.8 81.4 85.5 84.0
+
+
+
+
+
+
+
+
+
+
+
+ fadec/limit/climb-ref
+ 10
+
+ 0.5
+
+
+ 10
+
+
+
+
+
+
+
+ fadec/limit/climb
+
+ 22.4 0
+ 100.0 1
+
+
+
+
+
+
+
+
+
+ position/wow
+ 0
+
+
+ velocities/mach
+ /controls/flight/flaps-input
+ /position/altitude-ft
+
+ 0 1
+ 0.21 27.9 33.6
+ 0.70 35.3 39.7
+
+
+ 0 1
+ 0.55 44.2 50.0
+ 0.90 49.7 51.8
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+ fadec/limit/idle-ref
+ 10
+
+ 0.5
+
+
+ 10
+
+
+
+
+
+
+
+ fadec/limit/idle
+
+ 22.4 0
+ 100.0 1
+
+
+
+
+
+
+
+
+ /position/altitude-ft
+ propulsion/tat-c
+
+ -65 -35 -5 25 55
+ 0 62.1 65.5 68.9 72.2 71.0
+ 10000 69.5 72.8 75.9 78.3 77.8
+
+
+
+
+
+
+
+
+
+
+
+ fadec/limit/mrev-ref
+ 10
+
+ 0.5
+
+
+ 10
+
+
+
+
+
+
+
+ fadec/limit/mrev
+
+ 22.4 0
+ 100.0 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /controls/engines/engine[0]/reverse-lever ge 0.25
+
+
+
+
+
+
+
+ /systems/hydraulic/green-psi ge 1500
+ /systems/acconfig/autoconfig-running eq 1
+
+
+
+
+ fadec/reverse-1/position-cmd
+ fadec/reverse-1/position-rate
+
+
+
+
+ fadec/reverse-1/position-norm
+ 3.14
+
+
+
+
+
+ 0.08
+
+
+ /controls/engines/engine[0]/reverse-lever
+ 0.25
+
+
+
+ fadec/limit/mrev-norm
+ 0.08
+
+ 0.75
+
+
+
+
+
+ 0.08
+ fadec/limit/mrev-norm
+
+
+
+
+
+
+
+ /controls/engines/engine[1]/reverse-lever ge 0.25
+
+
+
+
+
+
+
+ /systems/hydraulic/yellow-psi ge 1500
+ /systems/acconfig/autoconfig-running eq 1
+
+
+
+
+ fadec/reverse-2/position-cmd
+ fadec/reverse-2/position-rate
+
+
+
+
+ fadec/reverse-2/position-norm
+ 3.14
+
+
+
+
+
+ 0.08
+
+
+ /controls/engines/engine[1]/reverse-lever
+ 0.25
+
+
+
+ fadec/limit/mrev-norm
+ 0.08
+
+ 0.75
+
+
+
+
+
+ 0.08
+ fadec/limit/mrev-norm
+
+
+
+
+
+
+
+
+
+ /controls/engines/engine[0]/throttle
+ 20
+
+
+
+
+
+ fadec/reverse-1/position-norm ne 0
+
+
+
+
+
+
+ fadec/limit/min-n1
+
+
+ fadec/control-1/throttle-pos
+ /systems/acconfig/options/fadec/idle-t
+
+
+
+ fadec/limit/climb
+ fadec/limit/min-n1
+
+
+ /systems/acconfig/options/fadec/climb-b
+ /systems/acconfig/options/fadec/idle-t
+
+
+
+
+
+
+ fadec/limit/min-n1
+ fadec/limit/climb
+
+
+
+
+
+
+ fadec/limit/climb
+
+
+ fadec/control-1/throttle-pos
+ /systems/acconfig/options/fadec/climb-t
+
+
+
+ fadec/limit/mct
+ fadec/limit/climb
+
+
+ /systems/acconfig/options/fadec/mct-b
+ /systems/acconfig/options/fadec/climb-t
+
+
+
+
+
+
+ fadec/limit/climb
+ fadec/limit/mct
+
+
+
+
+
+
+ fadec/limit/mct
+
+
+ fadec/control-1/throttle-pos
+ /systems/acconfig/options/fadec/mct-t
+
+
+
+ fadec/limit/toga
+ fadec/limit/mct
+
+
+ /systems/acconfig/options/fadec/toga-b
+ /systems/acconfig/options/fadec/mct-t
+
+
+
+
+
+
+ fadec/limit/mct
+ fadec/limit/toga
+
+
+
+
+
+
+ fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+
+
+ fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+
+
+
+
+
+
+ fadec/control-1/lever-n1
+
+ 22.4 0
+ 100.0 1
+
+
+
+
+
+
+
+
+ fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/toga-b
+
+
+ fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+
+
+ fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/mct-b
+
+
+ fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+
+
+ fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/climb-b
+
+
+ fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/idle-t
+
+
+
+
+
+
+ 2
+
+
+ fadec/control-1/throttle-pos
+ /systems/acconfig/options/fadec/idle-t
+
+
+
+ 23
+ 2
+
+
+ /systems/acconfig/options/fadec/climb-b
+ /systems/acconfig/options/fadec/idle-t
+
+
+
+
+
+
+ 2
+ 23
+
+
+
+
+
+
+ 27
+
+
+ fadec/control-1/throttle-pos
+ /systems/acconfig/options/fadec/climb-t
+
+
+
+ 33
+ 27
+
+
+ /systems/acconfig/options/fadec/mct-b
+ /systems/acconfig/options/fadec/climb-t
+
+
+
+
+
+
+ 27
+ 33
+
+
+
+
+
+
+ 37
+
+
+ fadec/control-1/throttle-pos
+ /systems/acconfig/options/fadec/mct-t
+
+
+
+ 43
+ 37
+
+
+ /systems/acconfig/options/fadec/toga-b
+ /systems/acconfig/options/fadec/mct-t
+
+
+
+
+
+
+ 37
+ 43
+
+
+
+
+
+
+ fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/toga-b
+
+
+ fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+
+
+ fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/mct-b
+
+
+ fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+
+
+ fadec/control-1/throttle-pos ge /systems/acconfig/options/fadec/climb-b
+
+
+ fadec/control-1/throttle-pos gt /systems/acconfig/options/fadec/idle-t
+
+
+
+
+
+ /controls/engines/engine[1]/throttle
+ 20
+
+
+
+
+
+ fadec/reverse-2/position-norm ne 0
+
+
+
+
+
+
+ fadec/limit/min-n1
+
+
+ fadec/control-2/throttle-pos
+ /systems/acconfig/options/fadec/idle-t
+
+
+
+ fadec/limit/climb
+ fadec/limit/min-n1
+
+
+ /systems/acconfig/options/fadec/climb-b
+ /systems/acconfig/options/fadec/idle-t
+
+
+
+
+
+
+ fadec/limit/min-n1
+ fadec/limit/climb
+
+
+
+
+
+
+ fadec/limit/climb
+
+
+ fadec/control-2/throttle-pos
+ /systems/acconfig/options/fadec/climb-t
+
+
+
+ fadec/limit/mct
+ fadec/limit/climb
+
+
+ /systems/acconfig/options/fadec/mct-b
+ /systems/acconfig/options/fadec/climb-t
+
+
+
+
+
+
+ fadec/limit/climb
+ fadec/limit/mct
+
+
+
+
+
+
+ fadec/limit/mct
+
+
+ fadec/control-2/throttle-pos
+ /systems/acconfig/options/fadec/mct-t
+
+
+
+ fadec/limit/toga
+ fadec/limit/mct
+
+
+ /systems/acconfig/options/fadec/toga-b
+ /systems/acconfig/options/fadec/mct-t
+
+
+
+
+
+
+ fadec/limit/mct
+ fadec/limit/toga
+
+
+
+
+
+
+ fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+
+
+ fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+
+
+
+
+
+
+ fadec/control-2/lever-n1
+
+ 22.4 0
+ 100.0 1
+
+
+
+
+
+
+
+
+ fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/toga-b
+
+
+ fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+
+
+ fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/mct-b
+
+
+ fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+
+
+ fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/climb-b
+
+
+ fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/idle-t
+
+
+
+
+
+
+ 2
+
+
+ fadec/control-2/throttle-pos
+ /systems/acconfig/options/fadec/idle-t
+
+
+
+ 23
+ 2
+
+
+ /systems/acconfig/options/fadec/climb-b
+ /systems/acconfig/options/fadec/idle-t
+
+
+
+
+
+
+ 2
+ 23
+
+
+
+
+
+
+ 27
+
+
+ fadec/control-2/throttle-pos
+ /systems/acconfig/options/fadec/climb-t
+
+
+
+ 33
+ 27
+
+
+ /systems/acconfig/options/fadec/mct-b
+ /systems/acconfig/options/fadec/climb-t
+
+
+
+
+
+
+ 27
+ 33
+
+
+
+
+
+
+ 37
+
+
+ fadec/control-2/throttle-pos
+ /systems/acconfig/options/fadec/mct-t
+
+
+
+ 43
+ 37
+
+
+ /systems/acconfig/options/fadec/toga-b
+ /systems/acconfig/options/fadec/mct-t
+
+
+
+
+
+
+ 37
+ 43
+
+
+
+
+
+
+ fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/toga-b
+
+
+ fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/mct-t
+
+
+ fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/mct-b
+
+
+ fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/climb-t
+
+
+ fadec/control-2/throttle-pos ge /systems/acconfig/options/fadec/climb-b
+
+
+ fadec/control-2/throttle-pos gt /systems/acconfig/options/fadec/idle-t
+
+
+
+
+
+
+
+ /controls/flight/flaps-pos eq 1
+ /controls/flight/flaps-pos eq 2
+ /controls/flight/flaps-pos eq 3
+
+
+ /controls/flight/flaps-pos eq 4
+
+
+ /controls/flight/flaps-pos eq 5
+
+
+
+
+
+
+ /controls/flight/flaps-pos eq 1
+ /controls/flight/flaps-pos eq 2
+ /controls/flight/flaps-pos eq 3
+
+
+ /controls/flight/flaps-pos eq 4
+
+
+ /controls/flight/flaps-pos eq 5
+
+
+
+
+
+
+ position/wow eq 1
+ /it-fbw/law ne 0
+ fadec/control-1/n1-mode eq 1
+ fadec/control-2/n1-mode eq 1
+
+
+ fadec/eng-out eq 1
+ /controls/flight/flaps-pos ne 0
+
+
+ fadec/alpha-floor-switch eq 1
+ /it-autoflight/output/athr eq 0
+
+
+ aero/alpha-deg-damped gt fadec/alpha-floor-engage
+
+
+ fadec/alpha-floor-switch eq 2
+ aero/alpha-deg-damped lt fadec/alpha-floor-disengage
+
+
+
+
+
+
+ fadec/alpha-floor-switch eq 2
+
+
+
+
+
+
+ fadec/alpha-floor-switch eq 1
+
+
+
+
+
+
+
+
+
+
+ /engines/engine[0]/n1-actual
+ /engines/engine[1]/n1-actual
+
+ 0.005
+
+ fadec/limit/idle
+
+ 1
+ 0
+
+
+
+
+
+
+
+ fadec/control-1/detent
+ fadec/control-2/detent
+
+
+
+
+
+
+
+ /engines/engine[0]/state ne 3
+ /engines/engine[1]/state ne 3
+
+
+ position/wow eq 0
+
+
+
+
+
+
+ /controls/engines/engine[0]/reverse-cmd eq 1
+ /controls/engines/engine[1]/reverse-cmd eq 1
+
+
+ fadec/alpha-floor-switch gt 0
+
+
+ fadec/max-detent le 2
+ fadec/limit/eng-off-wow-switch eq 0
+
+
+ fadec/max-detent eq 4
+ fadec/limit/flex-active eq 1
+ fadec/limit/eng-off-wow-switch eq 0
+
+
+ fadec/max-detent le 4
+ fadec/limit/flex-active eq 1
+ fadec/limit/eng-off-wow-switch eq 1
+
+
+ fadec/max-detent le 4
+ fadec/limit/flex-active ne 1
+ fadec/limit/eng-off-wow-switch eq 0
+
+
+
+
+
+
+ fadec/limit/active-mode-int eq 4
+
+
+ fadec/limit/active-mode-int eq 0
+
+
+ fadec/limit/active-mode-int eq 1
+ fadec/limit/active-mode-int eq 3
+
+
+ fadec/limit/active-mode-int eq 2
+
+
+
+
+
+
+
+ fadec/eng-out eq 1
+
+
+ fadec/limit/idle-norm
+ 1
+
+
+
+
+
+
+ fadec/control-1/lever-norm
+ fadec/control-2/lever-norm
+
+
+
+ fadec/limit/idle-norm
+ fadec/athr/max-clamp
+
+
+
+
+
+
+ fadec/alpha-floor-switch gt 0
+ fadec/control-1/n1-mode eq 1
+ fadec/control-2/n1-mode eq 1
+
+
+ /it-autoflight/output/athr eq 1
+ fadec/eng-out eq 1
+ fadec/max-detent le 4
+ fadec/max-detent ge 1
+
+
+ /it-autoflight/output/athr eq 1
+ fadec/max-detent eq 2
+
+
+ /it-autoflight/output/athr eq 1
+ fadec/max-detent eq 1
+
+
+
+
+ fadec/athr/cmd
+ 1.0
+
+ fadec/limit/idle-norm
+ fadec/athr/max
+
+
+
+
+
+
+
+
+ fadec/thr-locked
+ 1
+
+ fadec/thr-locked-n1
+
+ /engines/engine[0]/n1-actual
+ /engines/engine[1]/n1-actual
+
+
+
+
+
+
+
+
+ fadec/thr-locked-n1
+
+ 22.4 0
+ 100.0 1
+
+
+
+
+
+
+ fadec/control-1/lever-norm
+ 1.0
+
+ fadec/limit/idle-norm
+ 1
+
+
+
+
+
+
+ fadec/reverse-1/position-norm ne 0
+
+
+ fadec/alpha-floor-switch gt 0
+
+
+ fadec/thr-locked eq 1
+
+
+ fadec/athr/active eq 1
+
+
+ /gear/gear[0]/wow eq 0
+
+
+
+
+ fadec/control-1/throttle-output
+ 0.75
+
+
+
+
+ fadec/control-2/lever-norm
+ 1.0
+
+ fadec/limit/idle-norm
+ 1
+
+
+
+
+
+
+ fadec/reverse-2/position-norm ne 0
+
+
+ fadec/alpha-floor-switch gt 0
+
+
+ fadec/thr-locked eq 1
+
+
+ fadec/athr/active eq 1
+
+
+ /gear/gear[0]/wow eq 0
+
+
+
+
+ fadec/control-2/throttle-output
+ 0.75
+
+
+
+
+
+
+
+
+ /engines/engine[0]/n1
+ 2.25
+
+
+
+
+
+ /engines/engine[1]/n1
+ 2.25
+
+
+
+
+
+ /engines/engine[0]/n2
+ 2.25
+
+
+
+
+
+ /engines/engine[1]/n2
+ 2.25
+
+
+
+
+
+ /engines/engine[0]/fuel-flow_pph
+ 3
+
+
+
+
+ /engines/engine[1]/fuel-flow_pph
+ 3
+
+
+
+
+
+
+
+
+
+
+ /engines/engine[0]/epr-actual
+
+ 0.97 -139
+ 1.00 -125
+ 1.20 -55
+ 1.40 16
+ 1.60 87
+ 1.65 98
+
+
+
+
+
+
+
+
+ /engines/engine[0]/epr-actual
+
+ 0.97 -139
+ 1.00 -125
+ 1.20 -55
+ 1.40 16
+ 1.60 87
+ 1.65 98
+
+
+
+
+
+
+
+
+ /engines/engine[0]/epr-actual
+
+ 0.97 -139
+ 1.00 -125
+ 1.20 -55
+ 1.40 16
+ 1.60 87
+ 1.65 98
+
+
+
+
+
+
+
+
+ /engines/engine[1]/epr-actual
+
+ 0.97 -139
+ 1.00 -125
+ 1.20 -55
+ 1.40 16
+ 1.60 87
+ 1.65 98
+
+
+
+
+
+
+
+
+ /engines/engine[0]/epr-actual
+
+ 0.97 -139
+ 1.00 -125
+ 1.20 -55
+ 1.40 16
+ 1.60 87
+ 1.65 98
+
+
+
+
+
+
+
+
+ /engines/engine[0]/n1-actual
+
+ 20 -112.5
+ 40 -67.5
+ 100 67.5
+ 110 90.0
+
+
+
+
+
+
+
+
+ /engines/engine[1]/n1-actual
+
+ 20 -112.5
+ 40 -67.5
+ 100 67.5
+ 110 90.0
+
+
+
+
+
+
+
+
+ fadec/control-1/lever-n1
+
+ 20 -112.5
+ 40 -67.5
+ 100 67.5
+ 110 90.0
+
+
+
+
+
+
+
+
+ fadec/control-2/lever-n1
+
+ 20 -112.5
+ 40 -67.5
+ 100 67.5
+ 110 90.0
+
+
+
+
+
+
+
+
+ fadec/limit/toga
+
+ 20 -112.5
+ 40 -67.5
+ 100 67.5
+ 110 90.0
+
+
+
+
+
+
+
+
+ /engines/engine[0]/egt-actual
+
+ 0 -90
+ 400 0
+ 800 90
+
+
+
+
+
+
+
+
+ /engines/engine[1]/egt-actual
+
+ 0 -90
+ 400 0
+ 800 90
+
+
+
+
+
+
+
+
diff --git a/Systems/upper-ecam.xml b/Systems/upper-ecam.xml
index a8c38000..bf6bac48 100644
--- a/Systems/upper-ecam.xml
+++ b/Systems/upper-ecam.xml
@@ -4,189 +4,6 @@
-
- EPR 1
- gain
- 1.0
-
-
-
- /options/eng
- IAE
-
-
-
-
- /engines/engine[0]/epr-actual
- 0.970-139
- 1.000-125
- 1.200 -55
- 1.400 16
- 1.600 87
- 1.650 98
-
-
-
- 0
-
-
-
-
- EPR THR 1
- gain
- 1.0
-
-
-
- /options/eng
- IAE
-
-
-
-
- /engines/engine[0]/epr-cmd
- 0.970-139
- 1.000-125
- 1.200 -55
- 1.400 16
- 1.600 87
- 1.650 98
-
-
-
- 0
-
-
-
-
- EPR 2
- gain
- 1.0
-
-
-
- /options/eng
- IAE
-
-
-
-
- /engines/engine[1]/epr-actual
- 0.970-139
- 1.000-125
- 1.200 -55
- 1.400 16
- 1.600 87
- 1.650 98
-
-
-
- 0
-
-
-
-
- EPR THR 2
- gain
- 1.0
-
-
-
- /options/eng
- IAE
-
-
-
-
- /engines/engine[1]/epr-cmd
- 0.970-139
- 1.000-125
- 1.200 -55
- 1.400 16
- 1.600 87
- 1.650 98
-
-
-
- 0
-
-
-
-
- EPR LIMIT
- gain
- 1.0
-
-
-
- /options/eng
- IAE
-
-
-
-
- /fdm/jsbsim/fadec/epr/toga-lim
- 0.970-139
- 1.000-125
- 1.200 -55
- 1.400 16
- 1.600 87
- 1.650 98
-
-
-
- 0
-
-
-
-
-
Flap Indicator
gain