diff --git a/AircraftConfig/rendering.xml b/AircraftConfig/rendering.xml
index a7ccbdc3..70e7c884 100644
--- a/AircraftConfig/rendering.xml
+++ b/AircraftConfig/rendering.xml
@@ -54,7 +54,7 @@
left
-
+
diff --git a/Models/Instruments/ND/canvas/map/RWY-profile.lcontroller b/Models/Instruments/ND/canvas/map/RWY-profile.lcontroller
index 70ca2ddf..ae93812a 100644
--- a/Models/Instruments/ND/canvas/map/RWY-profile.lcontroller
+++ b/Models/Instruments/ND/canvas/map/RWY-profile.lcontroller
@@ -29,7 +29,7 @@ var new = func(layer) {
#m.addVisibilityListener();
var driver = opt_member(m.layer.options, 'route_driver');
if(driver == nil){
- driver = RouteDriver.new();
+ driver = A3XXRouteDriver.new();
}
var driver_listeners = driver.getListeners();
foreach(var listener; driver_listeners){
diff --git a/Nasal/fadec-common.nas b/Nasal/fadec-common.nas
index 1663ea78..9cb08221 100644
--- a/Nasal/fadec-common.nas
+++ b/Nasal/fadec-common.nas
@@ -281,10 +281,14 @@ var thrust_loop = maketimer(0.04, func {
setprop("/systems/thrust/alpha-floor", 1);
setprop("/systems/thrust/toga-lk", 0);
setprop("/it-autoflight/input/athr", 1);
+ setprop("/controls/engines/engine[0]/throttle-fdm", 0.99);
+ setprop("/controls/engines/engine[1]/throttle-fdm", 0.99);
} else if (getprop("/systems/thrust/alpha-floor") == 1 and alpha < togaLock) {
setprop("/systems/thrust/alpha-floor", 0);
setprop("/it-autoflight/input/athr", 1);
setprop("/systems/thrust/toga-lk", 1);
+ setprop("/controls/engines/engine[0]/throttle-fdm", 0.99);
+ setprop("/controls/engines/engine[1]/throttle-fdm", 0.99);
}
} else {
setprop("/systems/thrust/alpha-floor", 0);
diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index 9c577e2b..12187f69 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -305,11 +305,11 @@
attitude/roll-rad
fbw/roll/a-i
- -1.0 -0.1 0.0 0.1 1.0
- -1.169370 0.261799 0.000000 0.000000 0.000000 0.000000
- -1.082100 0.000000 0.000000 0.000000 0.000000 0.000000
- 1.082100 0.000000 0.000000 0.000000 0.000000 0.000000
- 1.169370 0.000000 0.000000 0.000000 0.000000 -0.261799
+ -1.0 0.0 1.0
+ -1.169370 0.261799 0.000000 0.000000
+ -1.082100 0.000000 0.000000 0.000000
+ 1.082100 0.000000 0.000000 0.000000
+ 1.169370 0.000000 0.000000 -0.261799
@@ -464,11 +464,6 @@
-
- fbw/fmgc/yaw-cmd
- -0.5
-
-
@@ -478,6 +473,24 @@
+
+
+
+
+ /orientation/roll-deg
+
+ -30 -30
+ -1 0
+ 0 0
+ 1 0
+ 30 30
+
+
+ -0.1
+
+
+
+
@@ -488,7 +501,7 @@
fbw/fmgc/enabled eq 0
fbw/roll/gear-law-switch eq 1
-
+
fbw/fmgc/enabled eq 1
position/wow eq 1
/it-fbw/law eq 0
@@ -946,6 +959,11 @@
fbw/fmgc/enabled eq 1
position/wow eq 1
+ gear/unit[0]/WOW eq 0
+
+
+ fbw/fmgc/enabled eq 1
+ position/wow eq 1
/it-fbw/law eq 3
@@ -972,7 +990,7 @@
attitude/roll-rad lt 0.628319
attitude/roll-rad gt -0.628319
fbw/pitch/pid-switched ge 0.01
- forces/load-factor lt -0.5
+ fbw/pitch/g-instrumented ge 0.5
/it-fbw/protections/overspeed ne 1
/controls/flight/elevator-trim le 0.32
position/wow eq 0
@@ -983,7 +1001,7 @@
attitude/roll-rad lt 0.628319
attitude/roll-rad gt -0.628319
fbw/pitch/pid-switched le -0.01
- forces/load-factor lt -0.5
+ fbw/pitch/g-instrumented ge 0.5
/it-fbw/protections/overspeed ne 1
/controls/flight/elevator-trim ge -1.0
position/wow eq 0
@@ -1043,6 +1061,76 @@
+
+
+
+ velocities/vc-kts
+
+ 160.00 25.000
+ 162.15 23.649
+ 165.02 22.226
+ 168.64 21.015
+ 172.25 19.734
+ 176.59 18.595
+ 181.67 17.525
+ 186.75 16.385
+ 191.83 15.316
+ 197.65 14.318
+ 205.65 13.247
+ 212.93 12.318
+ 219.48 11.462
+ 227.48 10.533
+ 236.96 9.7450
+ 246.43 8.8863
+ 255.18 8.0990
+ 266.12 7.4525
+ 277.06 6.7704
+ 288.00 6.0884
+ 299.67 5.5124
+ 311.35 5.0075
+ 323.03 4.5736
+ 335.44 4.2104
+ 347.13 3.9186
+ 358.81 3.6979
+ 370.50 3.5482
+ 380.00 3.4000
+
+
+
+
+
+
+
+
+ /systems/fctl/fac1 eq 1
+ /systems/fctl/fac2 eq 1
+ /gear/gear[1]/wow eq 0
+ /gear/gear[2]/wow eq 0
+
+
+ /controls/flight/slats eq 0
+ /gear/gear[1]/wow eq 0
+ /gear/gear[2]/wow eq 0
+
+
+
+
+ fbw/yaw/max-deg-switch
+
+ -25
+ 25
+
+
+ -1
+ 1
+
+
+
+
+ fbw/yaw/max-deg-scale
+ -1.0
+
+
@@ -1059,6 +1147,18 @@
+
+
+
+
+ fbw/yaw/rudder-nul
+ fbw/yaw/max-deg-switch
+
+ 25.0
+
+
+
+
@@ -1139,7 +1239,7 @@
-
+
fbw/yaw/law-switch eq 1
fbw/yaw/rudder-nul eq 0
@@ -1484,76 +1584,6 @@
-
-
-
- /velocities/airspeed-kt
-
- 160.00 25.000
- 162.15 23.649
- 165.02 22.226
- 168.64 21.015
- 172.25 19.734
- 176.59 18.595
- 181.67 17.525
- 186.75 16.385
- 191.83 15.316
- 197.65 14.318
- 205.65 13.247
- 212.93 12.318
- 219.48 11.462
- 227.48 10.533
- 236.96 9.7450
- 246.43 8.8863
- 255.18 8.0990
- 266.12 7.4525
- 277.06 6.7704
- 288.00 6.0884
- 299.67 5.5124
- 311.35 5.0075
- 323.03 4.5736
- 335.44 4.2104
- 347.13 3.9186
- 358.81 3.6979
- 370.50 3.5482
- 380.00 3.4000
-
-
-
-
-
-
-
-
- /systems/fctl/fac1 eq 1
- /systems/fctl/fac2 eq 1
- /gear/gear[1]/wow eq 0
- /gear/gear[2]/wow eq 0
-
-
- /controls/flight/slats eq 0
- /gear/gear[1]/wow eq 0
- /gear/gear[2]/wow eq 0
-
-
-
-
- hydraulics/rudder/max-deg-switch
-
- -25
- 25
-
-
- -1
- 1
-
-
-
-
- hydraulics/rudder/max-deg-scale
- -1.0
-
-
@@ -1599,8 +1629,8 @@
/systems/failures/rudder eq 0
- hydraulics/rudder/max-deg-scale-neg
- hydraulics/rudder/max-deg-scale
+ fbw/yaw/max-deg-scale-neg
+ fbw/yaw/max-deg-scale
diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml
index 6aa550fa..3cbf412d 100644
--- a/Systems/fadec-iae.xml
+++ b/Systems/fadec-iae.xml
@@ -183,8 +183,8 @@
/fdm/jsbsim/atmosphere/density-altitude
- 00.681
- 420000.757
+ 00.6738
+ 420000.7570
@@ -217,8 +217,8 @@
/fdm/jsbsim/atmosphere/density-altitude
- 00.9824
- 430000.8581
+ 00.9867
+ 430000.8584
/fdm/jsbsim/velocities/mach
@@ -262,8 +262,8 @@
/engines/engine[0]/n1-actual
3.5
- 18.00.00
- 22.40.03
+ 24743.10.00
+ 53194.60.03
11394381.01.00
@@ -317,7 +317,7 @@
3.5
- 22.40.03
+ 53194.60.03
11394381.01.00
@@ -334,7 +334,7 @@
3.5
- 22.40.03
+ 53194.60.03
11394381.01.00
@@ -369,8 +369,8 @@
/engines/engine[1]/n1-actual
3.5
- 18.00.00
- 22.40.03
+ 24743.10.00
+ 53194.60.03
11394381.01.00
@@ -424,7 +424,7 @@
3.5
- 22.40.03
+ 53194.60.03
11394381.01.00
@@ -441,7 +441,7 @@
3.5
- 22.40.03
+ 53194.60.03
11394381.01.00
@@ -1348,7 +1348,7 @@
3.5
- 22.40.03
+ 53194.60.03
11394381.01.00
@@ -1392,7 +1392,7 @@
3.5
- 22.40.03
+ 53194.60.03
11394381.01.00
@@ -1436,7 +1436,7 @@
3.5
- 22.40.03
+ 53194.60.03
11394381.01.00
@@ -1480,7 +1480,7 @@
3.5
- 22.40.03
+ 53194.60.03
11394381.01.00
diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml
index d1c1d319..ad641450 100644
--- a/Systems/fmgc-roll-yaw.xml
+++ b/Systems/fmgc-roll-yaw.xml
@@ -261,8 +261,6 @@
IT-CONTROLLER: RUDDER CMD
false
noise-spike
- true
- output
diff --git a/revision.txt b/revision.txt
index 21f019a5..5df6aef0 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4741
\ No newline at end of file
+4748
\ No newline at end of file