diff --git a/A319-100-CFM-set.xml b/A319-100-CFM-set.xml index 2688b11f..aeb9f6b7 100644 --- a/A319-100-CFM-set.xml +++ b/A319-100-CFM-set.xml @@ -102,6 +102,12 @@ + + + Aircraft/A320Family/Systems/fadec-cfm.xml + + + diff --git a/A319-100-IAE-set.xml b/A319-100-IAE-set.xml index bfb8b492..15692cb1 100644 --- a/A319-100-IAE-set.xml +++ b/A319-100-IAE-set.xml @@ -101,14 +101,12 @@ 85 - - - - - - - - + + + + Aircraft/A320Family/Systems/fadec-iae.xml + + diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml index e477fee4..9487d310 100644 --- a/A320-200-CFM-set.xml +++ b/A320-200-CFM-set.xml @@ -95,6 +95,12 @@ + + + Aircraft/A320Family/Systems/fadec-cfm.xml + + + diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml index 03b8bd17..8c5310a2 100644 --- a/A320-200-IAE-set.xml +++ b/A320-200-IAE-set.xml @@ -95,6 +95,12 @@ + + + Aircraft/A320Family/Systems/fadec-iae.xml + + + diff --git a/A320-main.xml b/A320-main.xml index 0a45ba63..19cf1835 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -60,34 +60,31 @@ - + Aircraft/A320Family/Systems/hydraulics.xml - + Aircraft/A320Family/Systems/it-fbw-b.xml - + Aircraft/A320Family/Systems/it-autoflight.xml - + Aircraft/A320Family/Systems/custom-autothrust.xml - - Aircraft/A320Family/Systems/thrust.xml - - + Custom engine values system Aircraft/A320Family/Systems/engine-timing.xml - + Autobrake Aircraft/A320Family/Systems/a320-autobrake.xml - + Spoilers Aircraft/A320Family/Systems/a320-spoilers.xml - + Systems/fl2070_sound.xml diff --git a/A321-200-CFM-set.xml b/A321-200-CFM-set.xml index f2390696..acdd3cc8 100644 --- a/A321-200-CFM-set.xml +++ b/A321-200-CFM-set.xml @@ -94,14 +94,12 @@ 85 - - - - - - - - + + + + Aircraft/A320Family/Systems/fadec-cfm.xml + + diff --git a/A321-200-IAE-set.xml b/A321-200-IAE-set.xml index 1c639059..0137fd9b 100644 --- a/A321-200-IAE-set.xml +++ b/A321-200-IAE-set.xml @@ -95,6 +95,12 @@ + + + Aircraft/A320Family/Systems/fadec-iae.xml + + + diff --git a/ACJ-IAE-set.xml b/ACJ-IAE-set.xml index a6d06341..99c42dc0 100644 --- a/ACJ-IAE-set.xml +++ b/ACJ-IAE-set.xml @@ -100,14 +100,12 @@ 85 - - - - - - - - + + + + Aircraft/A320Family/Systems/fadec-iae.xml + + diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml index dbcebeab..0a732850 100644 --- a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml +++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml @@ -931,21 +931,12 @@ rotate thrpos1 - /controls/engines/engine[0]/throttle-lever + /engines/engine[0]/n1-cmd - 0.00000-12 - 0.23350 53 - 0.59999135 - 0.60000136 - 0.64999136 - 0.65000137 - 0.77999146 - 0.78000147 - 0.82999147 - 0.83000148 - 0.94999154 - 0.95000155 - 1.00000155 + 23-13 + 50 53 + 100152 + 110170
0 @@ -962,21 +953,12 @@ rotate thrpos2 - /controls/engines/engine[1]/throttle-lever + /engines/engine[1]/n1-cmd - 0.00000-12 - 0.23350 53 - 0.59999135 - 0.60000136 - 0.64999136 - 0.65000137 - 0.77999146 - 0.78000147 - 0.82999147 - 0.83000148 - 0.94999154 - 0.95000155 - 1.00000155 + 23-13 + 50 53 + 100152 + 110170
0 diff --git a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml index 90ce01a0..60ae37a7 100644 --- a/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml +++ b/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml @@ -1137,22 +1137,14 @@ rotate thrpos1 - /controls/engines/engine[0]/throttle-lever + /engines/engine[0]/epr-cmd - 0.00000-10 - 0.19560 28 - 0.42999 63 - 0.59999 84 - 0.60000 85 - 0.64999 85 - 0.65000 86 - 0.77999 91 - 0.78000 92 - 0.82999 92 - 0.83000 93 - 0.94999 95 - 0.95000 96 - 1.00000 96 + 0.8-18 + 1.0-11 + 1.1 28 + 1.2 63 + 1.4125 + 1.6191
0 @@ -1169,22 +1161,14 @@ rotate thrpos2 - /controls/engines/engine[1]/throttle-lever + /engines/engine[1]/epr-cmd - 0.00000-10 - 0.19560 28 - 0.42999 63 - 0.59999 84 - 0.60000 85 - 0.64999 85 - 0.65000 86 - 0.77999 91 - 0.78000 92 - 0.82999 92 - 0.83000 93 - 0.94999 95 - 0.95000 96 - 1.00000 96 + 0.8-18 + 1.0-11 + 1.1 28 + 1.2 63 + 1.4125 + 1.6191
0 diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml index 16158554..577188e6 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml @@ -935,21 +935,13 @@ rotate thrpos1 - /controls/engines/engine[0]/throttle-lever + /engines/engine[0]/n1-cmd - 0.00000 -2 - 0.23350 72 - 0.59999160 - 0.60000161 - 0.64999161 - 0.65000162 - 0.77999172 - 0.78000173 - 0.82999173 - 0.83000174 - 0.94999180 - 0.95000181 - 1.00000181 + 0 -3 + 23 -3 + 50 72 + 100178 + 110195
0 @@ -966,21 +958,13 @@ rotate thrpos2 - /controls/engines/engine[1]/throttle-lever + /engines/engine[1]/n1-cmd - 0.00000 -2 - 0.23350 72 - 0.59999160 - 0.60000161 - 0.64999161 - 0.65000162 - 0.77999172 - 0.78000173 - 0.82999173 - 0.83000174 - 0.94999180 - 0.95000181 - 1.00000181 + 0 -3 + 23 -3 + 50 72 + 100178 + 110195
0 diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml index a301d6eb..93dac485 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml @@ -1137,22 +1137,14 @@ rotate thrpos1 - /controls/engines/engine[0]/throttle-lever + /engines/engine[0]/epr-cmd - 0.0000005 - 0.1956033 - 0.4299964 - 0.5999982 - 0.6000083 - 0.6499983 - 0.6500084 - 0.7799988 - 0.7800089 - 0.8299989 - 0.8300090 - 0.9499992 - 0.9500093 - 1.0000093 + 0.8 0 + 1.0 05 + 1.1 33 + 1.2 64 + 1.4117 + 1.6165
0 @@ -1169,22 +1161,14 @@ rotate thrpos2 - /controls/engines/engine[1]/throttle-lever + /engines/engine[1]/epr-cmd - 0.0000005 - 0.1956033 - 0.4299964 - 0.5999982 - 0.6000083 - 0.6499983 - 0.6500084 - 0.7799988 - 0.7800089 - 0.8299989 - 0.8300090 - 0.9499992 - 0.9500093 - 1.0000093 + 0.8 0 + 1.0 05 + 1.1 33 + 1.2 64 + 1.4117 + 1.6165
0 diff --git a/Nasal/thrust.nas b/Nasal/thrust.nas index d18e067c..836ee519 100644 --- a/Nasal/thrust.nas +++ b/Nasal/thrust.nas @@ -1,19 +1,24 @@ -# A3XX Throttle Control System by Joshua Davidson (it0uchpods) -# Set A/THR modes to Custom IT-AUTOTHRUST, and other thrust modes like MCT, TOGA and eventually TO FLEX. -# Also handles FADEC -# V1.9.5 +# A3XX FADEC/Throttle Control System by Joshua Davidson (it0uchpods) +# V2.0.0 setprop("/systems/thrust/alpha-floor", 0); setprop("/systems/thrust/toga-lk", 0); +setprop("/systems/thrust/epr/toga-lim", 0.0); +setprop("/systems/thrust/epr/mct-lim", 0.0); +setprop("/systems/thrust/epr/clb-lim", 0.0); + setlistener("/sim/signals/fdm-initialized", func { setprop("/controls/engines/thrust-limit", "TOGA"); setprop("/controls/engines/epr-limit", 1.308); - setprop("/controls/engines/n1-limit", 101.9); + setprop("/controls/engines/n1-limit", 101.8); setprop("/systems/thrust/state1", "IDLE"); setprop("/systems/thrust/state2", "IDLE"); setprop("/systems/thrust/lvrclb", "0"); setprop("/systems/thrust/clbreduc-ft", "1500"); + setprop("/systems/thrust/toga-lim", 0.0); + setprop("/systems/thrust/mct-lim", 0.0); + setprop("/systems/thrust/clb-lim", 0.0); setprop("/systems/thrust/lim-flex", 0); thrustt.start(); }); @@ -149,33 +154,36 @@ var thrust_lim = func { var state2 = getprop("/systems/thrust/state2"); var thr1 = getprop("/controls/engines/engine[0]/throttle-pos"); var thr2 = getprop("/controls/engines/engine[0]/throttle-pos"); + var eprtoga = getprop("/systems/thrust/epr/toga-lim") + 0.001; + var eprmct = getprop("/systems/thrust/epr/mct-lim") + 0.001; + var eprclb = getprop("/systems/thrust/epr/clb-lim") + 0.001; if (getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0) { if ((state1 == "TOGA" or state2 == "TOGA" or (state1 == "MAN THR" and thr1 >= 0.83) or (state2 == "MAN THR" and thr2 >= 0.83)) or getprop("/systems/thrust/alpha-floor") == 1 or getprop("/systems/thrust/toga-lk") == 1) { setprop("/controls/engines/thrust-limit", "TOGA"); - setprop("/controls/engines/epr-limit", 1.308); + setprop("/controls/engines/epr-limit", eprtoga); setprop("/controls/engines/n1-limit", 101.8); } else if ((state1 == "MCT" or state2 == "MCT" or (state1 == "MAN THR" and thr1 < 0.83) or (state2 == "MAN THR" and thr2 < 0.83)) and getprop("/systems/thrust/lim-flex") == 0) { setprop("/controls/engines/thrust-limit", "MCT"); - setprop("/controls/engines/epr-limit", 1.293); + setprop("/controls/engines/epr-limit", eprmct); setprop("/controls/engines/n1-limit", 97.7); } else if ((state1 == "MCT" or state2 == "MCT" or (state1 == "MAN THR" and thr1 < 0.83) or (state2 == "MAN THR" and thr2 < 0.83)) and getprop("/systems/thrust/lim-flex") == 1) { setprop("/controls/engines/thrust-limit", "FLX"); - setprop("/controls/engines/epr-limit", 1.293); + setprop("/controls/engines/epr-limit", eprmct); setprop("/controls/engines/n1-limit", 97.7); } else if (state1 == "CL" or state2 == "CL" or state1 == "MAN" or state2 == "MAN" or state1 == "IDLE" or state2 == "IDLE") { setprop("/controls/engines/thrust-limit", "CLB"); - setprop("/controls/engines/epr-limit", 1.271); + setprop("/controls/engines/epr-limit", eprclb); setprop("/controls/engines/n1-limit", 91.9); } } else if (getprop("/FMGC/internal/flex-set") == 1) { setprop("/systems/thrust/lim-flex", 1); setprop("/controls/engines/thrust-limit", "FLX"); - setprop("/controls/engines/epr-limit", 1.293); + setprop("/controls/engines/epr-limit", eprmct); setprop("/controls/engines/n1-limit", 97.7); } else { setprop("/controls/engines/thrust-limit", "TOGA"); - setprop("/controls/engines/epr-limit", 1.308); - setprop("/controls/engines/n1-limit", 101.9); + setprop("/controls/engines/epr-limit", eprtoga); + setprop("/controls/engines/n1-limit", 101.8); } } @@ -208,7 +216,8 @@ var thrust_loop = func { setprop("/systems/thrust/lvrclb", "0"); } } - + +# Disabled until FDE AoA and stall characteristics are correct. # var AoA = getprop("/fdm/jsbsim/aero/alpha-deg"); # var flaps = getprop("/controls/flight/flap-lever"); # if (getprop("/gear/gear[1]/wow") == 0 and getprop("/gear/gear[2]/wow") == 0 and getprop("/it-fbw/law") == 0) { diff --git a/Systems/custom-autothrust.xml b/Systems/custom-autothrust.xml index cc39d982..3e7dfe7d 100644 --- a/Systems/custom-autothrust.xml +++ b/Systems/custom-autothrust.xml @@ -195,7 +195,7 @@ 0.0 10.0 0.00001 - 0.04 + 0.01 /controls/engines/engine[0]/throttle-man @@ -468,7 +468,7 @@ 0.0 10.0 0.00001 - 0.04 + 0.01 /controls/engines/engine[1]/throttle-man diff --git a/Systems/engine-timing.xml b/Systems/engine-timing.xml index 4f951145..6d2dece3 100644 --- a/Systems/engine-timing.xml +++ b/Systems/engine-timing.xml @@ -2,44 +2,6 @@ - - EPR 1 - gain - 1 - 0.05 - - - - /engines/engine[0]/n1 - 180.988 - 231.000 - 351.060 - 105.81.322 -
- - - /engines/engine[0]/epr-actual - - - - EPR 2 - gain - 1 - 0.05 - - - - /engines/engine[1]/n1 - 180.988 - 231.000 - 351.060 - 105.81.322 -
- - - /engines/engine[1]/epr-actual - - EGT L gain @@ -209,7 +171,7 @@ /it-autoflight/internal/vert-speed-fpm-pfd - 10 + 50 @@ -220,7 +182,7 @@ /it-autoflight/internal/vert-speed-fpm /it-autoflight/internal/vert-speed-fpm-filtered - 1000 + 5000 diff --git a/Systems/thrust.xml b/Systems/fadec-cfm.xml similarity index 89% rename from Systems/thrust.xml rename to Systems/fadec-cfm.xml index ace2163b..923b680e 100644 --- a/Systems/thrust.xml +++ b/Systems/fadec-cfm.xml @@ -1,8 +1,5 @@ - - - @@ -47,6 +44,40 @@ /controls/engines/engine[1]/throttle-man + + N1 CMD 1 + gain + 1 + 0.05 + + + + /controls/engines/engine[0]/throttle-man + 0.00 23.4 + 0.95101.7 +
+ + + /engines/engine[0]/n1-cmd + + + + N1 CMD 2 + gain + 1 + 0.05 + + + + /controls/engines/engine[1]/throttle-man + 0.00 23.4 + 0.95101.7 +
+ + + /engines/engine[1]/n1-cmd + + Throttle 1 false @@ -259,7 +290,7 @@ - /systems/thrust/state2 + /systems/thrust/state1 MAN THR diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml new file mode 100644 index 00000000..679ad66b --- /dev/null +++ b/Systems/fadec-iae.xml @@ -0,0 +1,671 @@ + + + + + + MAN One + gain + 1 + 0.05 + + + + /controls/engines/engine[0]/throttle-pos + 0.000.00 + 0.600.83 + 0.650.83 + 0.780.90 + 0.830.90 + 0.950.95 +
+ + + /controls/engines/engine[0]/throttle-man + + + + MAN Two + gain + 1 + 0.05 + + + + /controls/engines/engine[1]/throttle-pos + 0.000.00 + 0.600.83 + 0.650.83 + 0.780.90 + 0.830.90 + 0.950.95 +
+ + + /controls/engines/engine[1]/throttle-man + + + + EPR Scale + gain + 1 + 0.05 + + + + /position/altitude-ft + 00.344 + 420000.644 +
+ + + /engines/epr-scale + + + + EPR Scale 2 + gain + 1 + 0.05 + + + + /position/altitude-ft + 00.993 + 120000.979 + 410000.968 +
+ + + /engines/epr-scale-b + + + + EPR 1 + gain + 1 + 0.05 + + + + /engines/engine[0]/n1 + 18.00.00 + 23.40.03 + 35.00.20 + 105.81.00 +
+ + /engines/epr-scale + + /engines/engine[0]/epr-actual-cmd + + + + EPR 1 + gain + 1 + 0.05 + + + + /engines/engine[0]/epr-actual-cmd + /engines/epr-scale-b + + + + /engines/engine[0]/epr-actual + + + + EPR CMD 1 + gain + 1 + 0.05 + + + + /controls/engines/engine[0]/throttle-man + 0.0000.03 + 0.1410.20 + 1.0001.00 +
+ + /engines/epr-scale + + /engines/engine[0]/epr-cmd-cmd + + + + EPR CMD 1 + gain + 1 + 0.05 + + + + /engines/engine[0]/epr-cmd-cmd + /engines/epr-scale-b + + + + /engines/engine[0]/epr-cmd + + + + EPR 2 + gain + 1 + 0.05 + + + + /engines/engine[1]/n1 + 18.00.00 + 23.40.03 + 35.00.20 + 105.81.00 +
+ + /engines/epr-scale + + /engines/engine[1]/epr-actual-cmd + + + + EPR 2 + gain + 1 + 0.05 + + + + /engines/engine[1]/epr-actual-cmd + /engines/epr-scale-b + + + + /engines/engine[1]/epr-actual + + + + EPR CMD 2 + gain + 1 + 0.05 + + + + /controls/engines/engine[1]/throttle-man + 0.0000.03 + 0.1410.20 + 1.0001.00 +
+ + /engines/epr-scale + + /engines/engine[1]/epr-cmd-cmd + + + + EPR CMD 2 + gain + 1 + 0.05 + + + + /engines/engine[1]/epr-cmd-cmd + /engines/epr-scale-b + + + + /engines/engine[1]/epr-cmd + + + + Throttle 1 + false + true + output + + + + + /systems/thrust/alpha-floor + 0 + + + /systems/thrust/toga-lk + 0 + + + + /systems/thrust/state1 + MAN THR + + + /systems/thrust/state1 + CL + + + /systems/thrust/state1 + MAN + + + /systems/thrust/state1 + IDLE + + + + + + + + + + /systems/thrust/state1 + MAN THR + + + + /it-autoflight/output/athr + 0 + + + + /systems/thrust/state1 + CL + + + /systems/thrust/state1 + MAN + + + /systems/thrust/state1 + IDLE + + + + + + /controls/engines/engine[0]/throttle-man + + + + + + /it-autoflight/output/athr + 1 + + + + /systems/thrust/state1 + CL + + + /systems/thrust/state1 + MAN + + + + + /controls/engines/engine[0]/throttle-cmd + + + /controls/engines/engine[0]/throttle-fdm + + noise-spike + + + + /systems/thrust/state1 + MAN THR + + + 1 + + + + + + + /systems/thrust/state1 + CL + + + /systems/thrust/state1 + MAN + + + + /it-autoflight/output/athr + 1 + + + /it-autoflight/output/thr-mode + 0 + + + /it-autoflight/output/retard + 0 + + + + 0.40 + + + + + + + /systems/thrust/state1 + CL + + + /systems/thrust/state1 + MAN + + + + /it-autoflight/output/athr + 1 + + + /it-autoflight/output/thr-mode + 0 + + + /it-autoflight/output/retard + 0 + + + + 0.2 + + + + + /it-autoflight/output/athr + 0 + + + 1 + + + + + Throttle 2 + false + true + output + + + + + /systems/thrust/alpha-floor + 0 + + + /systems/thrust/toga-lk + 0 + + + + /systems/thrust/state2 + MAN THR + + + /systems/thrust/state2 + CL + + + /systems/thrust/state2 + MAN + + + /systems/thrust/state2 + IDLE + + + + + + + + + + /systems/thrust/state1 + MAN THR + + + + /it-autoflight/output/athr + 0 + + + + /systems/thrust/state2 + CL + + + /systems/thrust/state2 + MAN + + + /systems/thrust/state2 + IDLE + + + + + + /controls/engines/engine[1]/throttle-man + + + + + + /it-autoflight/output/athr + 1 + + + + /systems/thrust/state2 + CL + + + /systems/thrust/state2 + MAN + + + + + /controls/engines/engine[1]/throttle-cmd + + + /controls/engines/engine[1]/throttle-fdm + + noise-spike + + + + /systems/thrust/state2 + MAN THR + + + 1 + + + + + + + /systems/thrust/state2 + CL + + + /systems/thrust/state2 + MAN + + + + /it-autoflight/output/athr + 1 + + + /it-autoflight/output/thr-mode + 0 + + + /it-autoflight/output/retard + 0 + + + + 0.40 + + + + + + + /systems/thrust/state2 + CL + + + /systems/thrust/state2 + MAN + + + + /it-autoflight/output/athr + 1 + + + /it-autoflight/output/thr-mode + 0 + + + /it-autoflight/output/retard + 0 + + + + 0.2 + + + + + /it-autoflight/output/athr + 0 + + + 1 + + + + + EPR Limit TOGA + gain + 1 + 0.05 + + + + 0.95 + 0.0000.03 + 0.1410.20 + 1.0001.00 +
+ + /engines/epr-scale + + /systems/thrust/epr/toga-lim-cmd + + + + EPR CMD TOGA + gain + 1 + 0.05 + + + + /systems/thrust/epr/toga-lim-cmd + /engines/epr-scale-b + + + + /systems/thrust/epr/toga-lim + + + + EPR Limit MCT + gain + 1 + 0.05 + + + + 0.90 + 0.0000.03 + 0.1410.20 + 1.0001.00 +
+ + /engines/epr-scale + + /systems/thrust/epr/mct-lim-cmd + + + + EPR CMD MCT + gain + 1 + 0.05 + + + + /systems/thrust/epr/mct-lim-cmd + /engines/epr-scale-b + + + + /systems/thrust/epr/mct-lim + + + + EPR Limit CLB + gain + 1 + 0.05 + + + + 0.83 + 0.0000.03 + 0.1410.20 + 1.0001.00 +
+ + /engines/epr-scale + + /systems/thrust/epr/clb-lim-cmd + + + + EPR CMD CLB + gain + 1 + 0.05 + + + + /systems/thrust/epr/clb-lim-cmd + /engines/epr-scale-b + + + + /systems/thrust/epr/clb-lim + + +