diff --git a/A320-main.xml b/A320-main.xml
index 9a4124e1..69e9f26f 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -55,10 +55,10 @@
Spoilers
Aircraft/A320Family/Systems/a320-spoilers.xml
-
+
Systems/fl2070_sound.xml
-
-
+
+
Systems/pfd.xml
@@ -298,15 +298,6 @@
false
0.94
-
- none
- 0
- -0.59
- 0
- 0.72
- 0.98
- 1
-
false
diff --git a/Models/A319-200-IAE.xml b/Models/A319-200-IAE.xml
index f009fa08..8a574061 100644
--- a/Models/A319-200-IAE.xml
+++ b/Models/A319-200-IAE.xml
@@ -14,17 +14,7 @@
Fuselage
Aircraft/A320Family/Models/Fuselages/a319.fuselage.xml
-
-
-
- shadow
- Aircraft/A320Family/Models/Effects/shadow.xml
-
- 20.38
- -4.26
- 1.5
-
-
+
Flightdeck
diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml
index f6dbf927..760ca812 100644
--- a/Models/A320-200-IAE.xml
+++ b/Models/A320-200-IAE.xml
@@ -14,16 +14,6 @@
Fuselage
Aircraft/A320Family/Models/Fuselages/a320.fuselage.xml
-
-
-
- shadow
- Aircraft/A320Family/Models/Effects/shadow.xml
-
- 20.38
- -4.26
- 1.5
-
diff --git a/Models/A321-200-IAE.xml b/Models/A321-200-IAE.xml
index 91cbe996..2494a161 100644
--- a/Models/A321-200-IAE.xml
+++ b/Models/A321-200-IAE.xml
@@ -15,16 +15,6 @@
Aircraft/A320Family/Models/Fuselages/a321.fuselage.xml
-
-
- shadow
- Aircraft/A320Family/Models/Effects/shadow.xml
-
- 20.38
- -4.26
- 1.5
-
-
Flightdeck
diff --git a/Models/Effects/NEOreflect.eff b/Models/Effects/NEOreflect.eff
index 57490dce..9cb4e214 100644
--- a/Models/Effects/NEOreflect.eff
+++ b/Models/Effects/NEOreflect.eff
@@ -1,6 +1,6 @@
- Aircraft/A320neo/Models/Effects/NEOreflect
+ Aircraft/A320Family/Models/Effects/NEOreflect
Effects/reflect
diff --git a/Models/Effects/res/shadow.ac b/Models/Effects/res/shadow.ac
deleted file mode 100644
index 38293055..00000000
--- a/Models/Effects/res/shadow.ac
+++ /dev/null
@@ -1,23 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat14" rgb 0.8 0.8 0.8 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.2 0.2 0.2 shi 128 trans 0
-OBJECT world
-kids 1
-OBJECT poly
-name "shadow"
-loc 0 0 6.09085e-007
-texture "shadow.png"
-crease 45.000000
-numvert 4
--18.785 0 17.05
-18.785 0 17.05
-18.785 0 -17.05
--18.785 0 -17.05
-numsurf 1
-SURF 0x10
-mat 0
-refs 4
-0 0 0
-1 1 0
-2 1 1
-3 0 1
-kids 0
diff --git a/Models/Effects/res/shadow.png b/Models/Effects/res/shadow.png
deleted file mode 100644
index fb6e9ef7..00000000
Binary files a/Models/Effects/res/shadow.png and /dev/null differ
diff --git a/Models/Effects/shadow.xml b/Models/Effects/shadow.xml
deleted file mode 100644
index ec1127f5..00000000
--- a/Models/Effects/shadow.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
- res/shadow.ac
-
-
-
-
- shadow
- select
-
-
- /sim/rendering/rembrandt/enabled
-
-
-
-
- Effects/model-transparent
- shadow
-
-
-
- Effects/shadow
- shadow
-
-
-
-
- translate
- shadow
- /controls/lighting/shad-light-alt
- 0.301
-
- 0
- 0
- -1
-
-
-
-
- rotate
- shadow
- /orientation/roll-deg
-
- 0
- 0
- 0
-
-
- -1
- 0
- 0
-
-
-
-
- rotate
- shadow
- /orientation/pitch-deg
-
- 0
- 0
- 0
-
-
- 0
- 1
- 0
-
-
-
-
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index ee113a08..d66103b4 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -1956,9 +1956,13 @@
0.0000010
0.5999933
0.6000035
- 0.7999935
- 0.8000046
- 0.9499946
+ 0.6499935
+ 0.6500037
+ 0.7799944
+ 0.7800046
+ 0.8299946
+ 0.8300048
+ 0.9499953
0.9500055
1.0000055
@@ -2009,9 +2013,13 @@
0.0000010
0.5999933
0.6000035
- 0.7999935
- 0.8000046
- 0.9499946
+ 0.6499935
+ 0.6500037
+ 0.7799944
+ 0.7800046
+ 0.8299946
+ 0.8300048
+ 0.9499953
0.9500055
1.0000055
diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml
index bb2cee4d..2a4f35ff 100644
--- a/Models/Instruments/PFD/PFD1.xml
+++ b/Models/Instruments/PFD/PFD1.xml
@@ -799,7 +799,7 @@
0.00091828
0.0326226
- 0.0531781
+ 0.0581781
center-center
yz-plane
@@ -823,7 +823,7 @@
0.00091828
0.0436226
- 0.0531781
+ 0.0581781
center-center
yz-plane
@@ -998,6 +998,14 @@
/it-autoflight/output/athr
1
+
+ /systems/thrust/state1
+ MAN THR
+
+
+ /systems/thrust/state2
+ MAN THR
+
/systems/thrust/state1
MCT
@@ -1006,14 +1014,6 @@
/systems/thrust/state2
MCT
-
- /systems/thrust/state3
- MCT
-
-
- /systems/thrust/state4
- MCT
-
/systems/thrust/state1
TOGA
@@ -1022,14 +1022,6 @@
/systems/thrust/state2
TOGA
-
- /systems/thrust/state3
- TOGA
-
-
- /systems/thrust/state4
- TOGA
-
@@ -1295,14 +1287,6 @@
/systems/thrust/state2
CL
-
- /systems/thrust/state3
- CL
-
-
- /systems/thrust/state4
- CL
-
@@ -1326,14 +1310,6 @@
/systems/thrust/state2
MAN
-
- /systems/thrust/state3
- MAN
-
-
- /systems/thrust/state4
- MAN
-
/systems/thrust/state1
CL
@@ -1342,15 +1318,15 @@
/systems/thrust/state2
CL
-
- /systems/thrust/state3
- CL
-
-
- /systems/thrust/state4
- CL
-
+
+ /systems/thrust/state1
+ MAN THR
+
+
+ /systems/thrust/state2
+ MAN THR
+
/systems/thrust/state1
MCT
@@ -1359,14 +1335,6 @@
/systems/thrust/state2
MCT
-
- /systems/thrust/state3
- MCT
-
-
- /systems/thrust/state4
- MCT
-
/systems/thrust/state1
TOGA
@@ -1375,14 +1343,6 @@
/systems/thrust/state2
TOGA
-
- /systems/thrust/state3
- TOGA
-
-
- /systems/thrust/state4
- TOGA
-
@@ -1397,6 +1357,14 @@
1
+
+ /systems/thrust/state1
+ MAN THR
+
+
+ /systems/thrust/state2
+ MAN THR
+
/systems/thrust/state1
MCT
@@ -1405,14 +1373,6 @@
/systems/thrust/state2
MCT
-
- /systems/thrust/state3
- MCT
-
-
- /systems/thrust/state4
- MCT
-
/systems/thrust/state1
TOGA
@@ -1421,14 +1381,6 @@
/systems/thrust/state2
TOGA
-
- /systems/thrust/state3
- TOGA
-
-
- /systems/thrust/state4
- TOGA
-
@@ -1532,6 +1484,29 @@
+
+ athr-thr-fma
+
+ 0.00091828
+ -0.0546226
+ 0.0630781
+
+ center-center
+ yz-plane
+ text-value
+ THR
+ autopilot/serviceable
+ helvetica_medium.txf
+ true
+ false
+ false
+ 0.0055
+
+ 32
+ 32
+
+
+
athr-box-fma
@@ -1583,6 +1558,14 @@
/systems/thrust/state2
MCT
+
+ /systems/thrust/state1
+ MAN THR
+
+
+ /systems/thrust/state2
+ MAN THR
+
@@ -1642,6 +1625,45 @@
+
+ select
+ athr-thr-fma
+
+
+
+ /it-autoflight/output/athr
+ 1
+
+
+ /systems/thrust/state1
+ TOGA
+
+
+ /systems/thrust/state2
+ TOGA
+
+
+ /systems/thrust/state1
+ MCT
+
+
+ /systems/thrust/state2
+ MCT
+
+
+
+ /systems/thrust/state1
+ MAN THR
+
+
+ /systems/thrust/state2
+ MAN THR
+
+
+
+
+
+
athr-lvrclb-fma
@@ -1815,6 +1837,7 @@
athr-man-fma
athr-toga-fma
athr-mct-fma
+ athr-thr-fma
athr-box-fma
athr-lvrclb-fma
vs-num
diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml
index 45fdb0b9..dd7de912 100644
--- a/Models/Instruments/PFD/PFD2.xml
+++ b/Models/Instruments/PFD/PFD2.xml
@@ -799,7 +799,7 @@
0.00091828
0.0326226
- 0.0531781
+ 0.0581781
center-center
yz-plane
@@ -823,7 +823,7 @@
0.00091828
0.0436226
- 0.0531781
+ 0.0581781
center-center
yz-plane
@@ -998,6 +998,14 @@
/it-autoflight/output/athr
1
+
+ /systems/thrust/state1
+ MAN THR
+
+
+ /systems/thrust/state2
+ MAN THR
+
/systems/thrust/state1
MCT
@@ -1006,14 +1014,6 @@
/systems/thrust/state2
MCT
-
- /systems/thrust/state3
- MCT
-
-
- /systems/thrust/state4
- MCT
-
/systems/thrust/state1
TOGA
@@ -1022,14 +1022,6 @@
/systems/thrust/state2
TOGA
-
- /systems/thrust/state3
- TOGA
-
-
- /systems/thrust/state4
- TOGA
-
@@ -1295,14 +1287,6 @@
/systems/thrust/state2
CL
-
- /systems/thrust/state3
- CL
-
-
- /systems/thrust/state4
- CL
-
@@ -1326,14 +1310,6 @@
/systems/thrust/state2
MAN
-
- /systems/thrust/state3
- MAN
-
-
- /systems/thrust/state4
- MAN
-
/systems/thrust/state1
CL
@@ -1342,15 +1318,15 @@
/systems/thrust/state2
CL
-
- /systems/thrust/state3
- CL
-
-
- /systems/thrust/state4
- CL
-
+
+ /systems/thrust/state1
+ MAN THR
+
+
+ /systems/thrust/state2
+ MAN THR
+
/systems/thrust/state1
MCT
@@ -1359,14 +1335,6 @@
/systems/thrust/state2
MCT
-
- /systems/thrust/state3
- MCT
-
-
- /systems/thrust/state4
- MCT
-
/systems/thrust/state1
TOGA
@@ -1375,14 +1343,6 @@
/systems/thrust/state2
TOGA
-
- /systems/thrust/state3
- TOGA
-
-
- /systems/thrust/state4
- TOGA
-
@@ -1397,6 +1357,14 @@
1
+
+ /systems/thrust/state1
+ MAN THR
+
+
+ /systems/thrust/state2
+ MAN THR
+
/systems/thrust/state1
MCT
@@ -1405,14 +1373,6 @@
/systems/thrust/state2
MCT
-
- /systems/thrust/state3
- MCT
-
-
- /systems/thrust/state4
- MCT
-
/systems/thrust/state1
TOGA
@@ -1421,14 +1381,6 @@
/systems/thrust/state2
TOGA
-
- /systems/thrust/state3
- TOGA
-
-
- /systems/thrust/state4
- TOGA
-
@@ -1532,6 +1484,29 @@
+
+ athr-thr-fma
+
+ 0.00091828
+ -0.0546226
+ 0.0630781
+
+ center-center
+ yz-plane
+ text-value
+ THR
+ autopilot/serviceable
+ helvetica_medium.txf
+ true
+ false
+ false
+ 0.0055
+
+ 32
+ 32
+
+
+
athr-box-fma
@@ -1583,6 +1558,14 @@
/systems/thrust/state2
MCT
+
+ /systems/thrust/state1
+ MAN THR
+
+
+ /systems/thrust/state2
+ MAN THR
+
@@ -1642,6 +1625,45 @@
+
+ select
+ athr-thr-fma
+
+
+
+ /it-autoflight/output/athr
+ 1
+
+
+ /systems/thrust/state1
+ TOGA
+
+
+ /systems/thrust/state2
+ TOGA
+
+
+ /systems/thrust/state1
+ MCT
+
+
+ /systems/thrust/state2
+ MCT
+
+
+
+ /systems/thrust/state1
+ MAN THR
+
+
+ /systems/thrust/state2
+ MAN THR
+
+
+
+
+
+
athr-lvrclb-fma
@@ -1815,6 +1837,7 @@
athr-man-fma
athr-toga-fma
athr-mct-fma
+ athr-thr-fma
athr-box-fma
athr-lvrclb-fma
vs-num
diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
index 51078bad..0901fde7 100644
--- a/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
+++ b/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml
@@ -1085,15 +1085,20 @@
thrpos1
controls/engines/engine[0]/throttle
- 0.00000 05
- 0.34198 64
- 0.59999102
- 0.60000103
- 0.79999103
- 0.80000107
- 0.94999107
- 0.95000111
- 1.00000111
+ 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
@@ -1112,15 +1117,20 @@
thrpos2
controls/engines/engine[1]/throttle
- 0.00000 05
- 0.34198 64
- 0.59999102
- 0.60000103
- 0.79999103
- 0.80000107
- 0.94999107
- 0.95000111
- 1.00000111
+ 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
@@ -1185,7 +1195,7 @@
n11
engines/engine/n1
- 23 0
+ 20 0
40 47
100159
110170
@@ -1207,7 +1217,7 @@
n12
engines/engine[1]/n1
- 23 0
+ 20 0
40 47
100159
110170
diff --git a/Nasal/systems.nas b/Nasal/systems.nas
index 55fcdc84..fef26987 100644
--- a/Nasal/systems.nas
+++ b/Nasal/systems.nas
@@ -185,7 +185,7 @@ setlistener("/sim/signals/fdm-initialized", func {
setprop("/it-autoflight/settings/land-enable", 1); # Enable or disable automatic landing.
setprop("/it-autoflight/autoland/flare-altitude", 40); # Altitude when the flare mode starts in an autoland.
setprop("/controls/engines/thrust-limit", "TOGA");
- setprop("/controls/engines/epr-limit", 1.379);
+ setprop("/controls/engines/epr-limit", 1.301);
setprop("/controls/engines/n1-limit", 97.8);
});
diff --git a/Nasal/thrust.nas b/Nasal/thrust.nas
index fef1d36d..466f03c2 100644
--- a/Nasal/thrust.nas
+++ b/Nasal/thrust.nas
@@ -6,7 +6,7 @@ setlistener("/sim/signals/fdm-initialized", func {
setprop("/systems/thrust/state1", "IDLE");
setprop("/systems/thrust/state2", "IDLE");
setprop("/systems/thrust/lvrclb", "0");
- setprop("/systems/thrust/clbreduc-ft", "2000");
+ setprop("/systems/thrust/clbreduc-ft", "1500");
lvrclb();
print("Thrust System ... Done!")
});
@@ -16,17 +16,22 @@ setlistener("/controls/engines/engine[0]/throttle", func {
if (thrr < 0.05) {
setprop("/systems/thrust/state1", "IDLE");
atoff_request();
- } else if (thrr >= 0.05 and thrr < 0.60) {
+ } else if (thrr >= 0.01 and thrr < 0.60) {
setprop("/systems/thrust/state1", "MAN");
- } else if (thrr >= 0.60 and thrr < 0.80) {
+ } else if (thrr >= 0.60 and thrr < 0.65) {
setprop("/systems/thrust/state1", "CL");
- } else if (thrr >= 0.80 and thrr < 0.95) {
+ } else if (thrr >= 0.65 and thrr < 0.78) {
+ setprop("/systems/thrust/state1", "MAN THR");
+ } else if (thrr >= 0.78 and thrr < 0.83) {
setprop("/it-autoflight/input/athr", 1);
- setprop("/controls/engines/engine[0]/throttle-fdm", 0.94);
+ setprop("/controls/engines/engine[0]/throttle-fdm", 0.90);
setprop("/systems/thrust/state1", "MCT");
+ } else if (thrr >= 0.83 and thrr < 0.95) {
+ setprop("/it-autoflight/input/athr", 1);
+ setprop("/systems/thrust/state1", "MAN THR");
} else if (thrr >= 0.95) {
setprop("/it-autoflight/input/athr", 1);
- setprop("/controls/engines/engine[0]/throttle-fdm", 0.98);
+ setprop("/controls/engines/engine[0]/throttle-fdm", 0.95);
setprop("/systems/thrust/state1", "TOGA");
}
});
@@ -36,17 +41,22 @@ setlistener("/controls/engines/engine[1]/throttle", func {
if (thrr < 0.05) {
setprop("/systems/thrust/state2", "IDLE");
atoff_request();
- } else if (thrr >= 0.05 and thrr < 0.60) {
+ } else if (thrr >= 0.01 and thrr < 0.60) {
setprop("/systems/thrust/state2", "MAN");
- } else if (thrr >= 0.60 and thrr < 0.80) {
+ } else if (thrr >= 0.60 and thrr < 0.65) {
setprop("/systems/thrust/state2", "CL");
- } else if (thrr >= 0.80 and thrr < 0.95) {
+ } else if (thrr >= 0.65 and thrr < 0.78) {
+ setprop("/systems/thrust/state2", "MAN THR");
+ } else if (thrr >= 0.78 and thrr < 0.83) {
setprop("/it-autoflight/input/athr", 1);
- setprop("/controls/engines/engine[1]/throttle-fdm", 0.94);
+ setprop("/controls/engines/engine[1]/throttle-fdm", 0.90);
setprop("/systems/thrust/state2", "MCT");
+ } else if (thrr >= 0.83 and thrr < 0.95) {
+ setprop("/it-autoflight/input/athr", 1);
+ setprop("/systems/thrust/state2", "MAN THR");
} else if (thrr >= 0.95) {
setprop("/it-autoflight/input/athr", 1);
- setprop("/controls/engines/engine[1]/throttle-fdm", 0.98);
+ setprop("/controls/engines/engine[1]/throttle-fdm", 0.95);
setprop("/systems/thrust/state2", "TOGA");
}
});
diff --git a/Systems/engine-timing.xml b/Systems/engine-timing.xml
index b54dc463..45960eb2 100644
--- a/Systems/engine-timing.xml
+++ b/Systems/engine-timing.xml
@@ -14,7 +14,7 @@
180.988
231.000
351.060
- 105.01.380
+ 105.01.322
@@ -33,7 +33,7 @@
180.988
231.000
351.060
- 105.01.380
+ 105.01.322
diff --git a/Systems/thrust.xml b/Systems/thrust.xml
index b4c4b18a..0094b0a7 100644
--- a/Systems/thrust.xml
+++ b/Systems/thrust.xml
@@ -1,7 +1,7 @@
-
+
@@ -14,8 +14,12 @@
/controls/engines/engine[0]/throttle
- 0.00.00
- 0.60.90
+ 0.000.00
+ 0.600.83
+ 0.650.83
+ 0.780.90
+ 0.830.90
+ 0.950.95
@@ -31,8 +35,12 @@
/controls/engines/engine[1]/throttle
- 0.00.00
- 0.60.90
+ 0.000.00
+ 0.600.83
+ 0.650.83
+ 0.780.90
+ 0.830.90
+ 0.950.95
@@ -47,6 +55,10 @@
+
+ /systems/thrust/state1
+ MAN THR
+
/systems/thrust/state1
CL
@@ -64,26 +76,32 @@
-
+
- /it-autoflight/output/athr
- 0
+ /systems/thrust/state1
+ MAN THR
-
+
- /systems/thrust/state1
- CL
+ /it-autoflight/output/athr
+ 0
-
- /systems/thrust/state1
- MAN
-
-
- /systems/thrust/state1
- IDLE
-
-
-
+
+
+ /systems/thrust/state1
+ CL
+
+
+ /systems/thrust/state1
+ MAN
+
+
+ /systems/thrust/state1
+ IDLE
+
+
+
+
/controls/engines/engine[0]/throttle-man
@@ -112,6 +130,15 @@
/controls/engines/engine[0]/throttle-fdm
noise-spike
+
+
+
+ /systems/thrust/state1
+ MAN THR
+
+
+ 1
+
@@ -168,7 +195,7 @@
- 0.05
+ 0.2
@@ -189,6 +216,10 @@
+
+ /systems/thrust/state2
+ MAN THR
+
/systems/thrust/state2
CL
@@ -206,26 +237,32 @@
-
+
- /it-autoflight/output/athr
- 0
+ /systems/thrust/state2
+ MAN THR
-
+
- /systems/thrust/state2
- CL
+ /it-autoflight/output/athr
+ 0
-
- /systems/thrust/state2
- MAN
-
-
- /systems/thrust/state2
- IDLE
-
-
-
+
+
+ /systems/thrust/state2
+ CL
+
+
+ /systems/thrust/state2
+ MAN
+
+
+ /systems/thrust/state2
+ IDLE
+
+
+
+
/controls/engines/engine[1]/throttle-man
@@ -254,6 +291,15 @@
/controls/engines/engine[1]/throttle-fdm
noise-spike
+
+
+
+ /systems/thrust/state2
+ MAN THR
+
+
+ 1
+
@@ -310,7 +356,7 @@
- 0.05
+ 0.2