From 901d2c8e56ba6da52c21414e16811c8dc382eb1d Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Tue, 22 Jan 2019 23:50:15 -0500 Subject: [PATCH 1/8] Control: Fix Rudder Scheduling --- Systems/a320-fcs.xml | 158 +++++++++++++++++++++++-------------------- revision.txt | 2 +- 2 files changed, 86 insertions(+), 74 deletions(-) diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index 9c577e2b..95b5d72e 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -1043,6 +1043,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 +1129,18 @@ + + + + + fbw/yaw/rudder-nul + fbw/yaw/max-deg-switch + + 25 + + + + @@ -1139,7 +1221,7 @@ - + fbw/yaw/law-switch eq 1 fbw/yaw/rudder-nul eq 0 @@ -1484,76 +1566,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 +1611,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/revision.txt b/revision.txt index 21f019a5..98d94780 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4741 \ No newline at end of file +4742 \ No newline at end of file From c6badbc73a6843f64f43b5b689d413e3d10b0948 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Wed, 23 Jan 2019 00:10:05 -0500 Subject: [PATCH 2/8] Fix nothing --- Systems/a320-fcs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index 95b5d72e..c8bac038 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -1136,7 +1136,7 @@ fbw/yaw/rudder-nul fbw/yaw/max-deg-switch - 25 + 25.0 From 2f492f3d5054bb44788ef168f8e9d9f7f41ba35f Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Wed, 23 Jan 2019 17:19:47 -0500 Subject: [PATCH 3/8] Control: Fix Autotrim broken on 2018.3+ --- Systems/a320-fcs.xml | 14 +++++++------- Systems/fadec-iae.xml | 4 ++-- revision.txt | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index c8bac038..c1cafd02 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 @@ -972,7 +972,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 +983,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 diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml index 6aa550fa..9c301780 100644 --- a/Systems/fadec-iae.xml +++ b/Systems/fadec-iae.xml @@ -183,7 +183,7 @@
/fdm/jsbsim/atmosphere/density-altitude - 00.681 + 00.677420000.757
@@ -217,7 +217,7 @@ /fdm/jsbsim/atmosphere/density-altitude - 00.9824 + 00.9834430000.8581
diff --git a/revision.txt b/revision.txt index 98d94780..a7df46a4 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4742 \ No newline at end of file +4743 \ No newline at end of file From 3931ca60a9ffbdc38aa03df02f7a680a38108560 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Wed, 23 Jan 2019 20:58:44 -0500 Subject: [PATCH 4/8] Control: Bugfixes in FBW, FADEC --- Nasal/fadec-common.nas | 4 ++++ Systems/a320-fcs.xml | 30 ++++++++++++++++++++++++------ revision.txt | 2 +- 3 files changed, 29 insertions(+), 7 deletions(-) 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 c1cafd02..12187f69 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -464,11 +464,6 @@ fbw/roll/pid - - 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 diff --git a/revision.txt b/revision.txt index a7df46a4..2b763631 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4743 \ No newline at end of file +4744 \ No newline at end of file From 3cc3cfee89372701ae164681a7a2c283f9c3b540 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Thu, 24 Jan 2019 20:31:29 -0500 Subject: [PATCH 5/8] Control: bugfix autoland yaw --- Systems/fmgc-roll-yaw.xml | 2 -- revision.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) 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 2b763631..71009c06 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4744 \ No newline at end of file +4745 \ No newline at end of file From cf33b8f260ab727c312088125b89d12de1e25c78 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Fri, 25 Jan 2019 15:34:35 -0500 Subject: [PATCH 6/8] Sim: ACCONFIG typo fixed --- AircraftConfig/rendering.xml | 2 +- revision.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/revision.txt b/revision.txt index 71009c06..9b87d390 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4745 \ No newline at end of file +4746 \ No newline at end of file From 8d1ea10f1d731a4d73cbdc1b635bfdae5c49d412 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sun, 27 Jan 2019 11:50:37 -0500 Subject: [PATCH 7/8] Engine: Fix mistakes in EPR calculation - thanks various ytbers --- Systems/fadec-iae.xml | 32 ++++++++++++++++---------------- revision.txt | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml index 9c301780..3cbf412d 100644 --- a/Systems/fadec-iae.xml +++ b/Systems/fadec-iae.xml @@ -183,8 +183,8 @@ /fdm/jsbsim/atmosphere/density-altitude - 00.677 - 420000.757 + 00.6738 + 420000.7570
 @@ -217,8 +217,8 @@ /fdm/jsbsim/atmosphere/density-altitude - 00.9834 - 430000.8581 + 00.9867 + 430000.8584
/fdm/jsbsim/velocities/mach @@ -262,8 +262,8 @@ /engines/engine[0]/n1-actual3.5 - 18.00.00 - 22.40.03 + 24743.10.00 + 53194.60.0311394381.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/revision.txt b/revision.txt index 9b87d390..176f918e 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4746 \ No newline at end of file +4747 \ No newline at end of file From 71320aa1ffb25ada4d551c39bcb2185ecb8e4006 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Mon, 28 Jan 2019 18:49:09 -0500 Subject: [PATCH 8/8] DU: ND Bugfix --- Models/Instruments/ND/canvas/map/RWY-profile.lcontroller | 2 +- revision.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/revision.txt b/revision.txt index 176f918e..5df6aef0 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4747 \ No newline at end of file +4748 \ No newline at end of file