From a5a1eed555c81de252310f003ba1defde78e5825 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 22 Dec 2018 21:33:56 -0500 Subject: [PATCH 01/16] GIT: Formatting --- Models/A320-200-IAE.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml index 6d717738..8afa4997 100644 --- a/Models/A320-200-IAE.xml +++ b/Models/A320-200-IAE.xml @@ -378,7 +378,6 @@ - ground_services From b3339776f774c332f45e81ced1879fbdcbde1c51 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sun, 23 Dec 2018 13:19:11 -0500 Subject: [PATCH 02/16] Control: FlyByWire Attitude Stability improved --- Systems/a320-fcs.xml | 22 +++++++++++----------- revision.txt | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index 51828e5a..8e07315d 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -277,8 +277,8 @@ -1 0 1 -0.575959 0.261799 0.000000 0.000000 - -0.575958 0.000000 0.000000 0.000000 - 0.575958 0.000000 0.000000 0.000000 + -0.488692 0.000000 0.000000 0.000000 + 0.488692 0.000000 0.000000 0.000000 0.575959 0.000000 0.000000 -0.261799 @@ -306,11 +306,11 @@ attitude/roll-rad fbw/roll/a-i - -1 0 1 - -1.169370 0.261799 0.000000 0.000000 - -1.169369 0.000000 0.000000 0.000000 - 1.169369 0.000000 0.000000 0.000000 - 1.169370 0.000000 0.000000 -0.261799 + -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 @@ -367,8 +367,8 @@ -1 0 1 -0.698132 0.261799 0.000000 0.000000 - -0.698131 0.000000 0.000000 0.000000 - 0.698131 0.000000 0.000000 0.000000 + -0.610865 0.000000 0.000000 0.000000 + 0.610865 0.000000 0.000000 0.000000 0.698132 0.000000 0.000000 -0.261799
@@ -769,8 +769,8 @@ -1 0 1 -0.261799 0.000000 0.000000 0.087266 - -0.261798 0.000000 0.000000 0.000000 - 0.523598 0.000000 0.000000 0.000000 + -0.174533 0.000000 0.000000 0.000000 + 0.436332 0.000000 0.000000 0.000000 0.523599 -0.087266 0.000000 0.000000 diff --git a/revision.txt b/revision.txt index 4c225296..2dfddf10 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4717 \ No newline at end of file +4718 \ No newline at end of file From 31fb75dd251ee519f894db47b5e7bc6adbf2d2e5 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sun, 23 Dec 2018 13:22:20 -0500 Subject: [PATCH 03/16] Control: FlyByWire Attitude Stability improved --- Systems/a320-fcs.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index 8e07315d..4123cf3e 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -1,5 +1,4 @@ - @@ -807,7 +806,7 @@ fbw/pitch/g-pi-switched -1 0 - 0.523598 -0.026180 0.000000 + 0.436332 -0.026180 0.000000 0.523599 -0.087266 0.000000 From 8564a747b8e48898d2e898460ce8b382b5bd9791 Mon Sep 17 00:00:00 2001 From: merspieler Date: Mon, 24 Dec 2018 02:22:20 +0000 Subject: [PATCH 04/16] Applied fixes to autopush Signed-off-by: merspieler --- Nasal/autopush.nas | 4 ++-- Nasal/autopush_driver.nas | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Nasal/autopush.nas b/Nasal/autopush.nas index d024c7e2..02bdf7f1 100644 --- a/Nasal/autopush.nas +++ b/Nasal/autopush.nas @@ -42,7 +42,7 @@ var _loop = func() { var time = getprop("/sim/time/elapsed-sec"); var prop = math.min(math.max(_K_p * deltaV, -_F_p), _F_p); var speedup = getprop("/sim/speed-up"); - var deriv = 0; + var deriv = 0.0; dt = time - _time; # XXX Sanitising dt. Smaller chance of freakout on lag spike. if(dt > 0.0) { @@ -50,7 +50,7 @@ var _loop = func() { _int = math.min(math.max(_int + _K_i * dV * dt, -_F_i), _F_i); } if(dt > 0.002) { - var deriv = math.min(math.max(_K_d * dV / dt, -_F_d), _F_d); + deriv = math.min(math.max(_K_d * dV / dt, -_F_d), _F_d); } } var accel = prop + _int + deriv; diff --git a/Nasal/autopush_driver.nas b/Nasal/autopush_driver.nas index 53170c27..5d6577cd 100644 --- a/Nasal/autopush_driver.nas +++ b/Nasal/autopush_driver.nas @@ -34,7 +34,7 @@ var _loop = func() { D *= NM2M; # FIXME Use _K_V and total remaining distance. var V = _F_V; - if ((D < _D_min) or (abs(geo.normdeg180(A - psi) > 90.0))) { + if ((D < _D_min) or (abs(geo.normdeg180(A - psi) > 45.0))) { _to_wp += 1; if (_to_wp == size(_route)) { _done(); From 028b0fef463ba5ac9a295d28ae2565fb1a711736 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sun, 23 Dec 2018 21:37:10 -0500 Subject: [PATCH 05/16] Sim: Revision --- revision.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/revision.txt b/revision.txt index 2dfddf10..d2bef931 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4718 \ No newline at end of file +4719 \ No newline at end of file From 035b15d99a600afdb6cb487bb218fe3c11265100 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Fri, 28 Dec 2018 12:47:05 -0500 Subject: [PATCH 06/16] System: HDG reset time changed to 45 --- Nasal/FMGC-c.nas | 2 +- revision.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Nasal/FMGC-c.nas b/Nasal/FMGC-c.nas index 49bacfdd..fcf7257d 100644 --- a/Nasal/FMGC-c.nas +++ b/Nasal/FMGC-c.nas @@ -203,7 +203,7 @@ var loopFMA = maketimer(0.05, func { } # Preselect HDG - if (getprop("/modes/fcu/hdg-time") + 10 >= elapsedtime) { + if (getprop("/modes/fcu/hdg-time") + 45 >= elapsedtime) { setprop("/it-autoflight/custom/show-hdg", 1); } else if (getprop("/it-autoflight/output/lat") != 0 and getprop("/it-autoflight/output/lat") != 5 and getprop("/it-autoflight/output/lat") != 9) { setprop("/it-autoflight/custom/show-hdg", 0); diff --git a/revision.txt b/revision.txt index d2bef931..c3a4e75b 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4719 \ No newline at end of file +4720 \ No newline at end of file From 2b5174faa7f91663fc7179ee114a30137933cf75 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 29 Dec 2018 17:26:48 -0500 Subject: [PATCH 07/16] Engine: New EPR Calculation Curves --- Systems/fadec-cfm.xml | 1 - Systems/fadec-iae.xml | 231 +++++++++++++++++------------------------- revision.txt | 2 +- 3 files changed, 92 insertions(+), 142 deletions(-) diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml index 178f40c5..98c9cd8a 100644 --- a/Systems/fadec-cfm.xml +++ b/Systems/fadec-cfm.xml @@ -3,7 +3,6 @@ - diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml index ef83867a..16f3b6ad 100644 --- a/Systems/fadec-iae.xml +++ b/Systems/fadec-iae.xml @@ -3,7 +3,6 @@ - @@ -184,8 +183,8 @@ /fdm/jsbsim/atmosphere/density-altitude - 00.576 - 420000.876 + 00.681 + 420000.757
 @@ -218,8 +217,8 @@ /fdm/jsbsim/atmosphere/density-altitude - 00.988 - 430000.858 + 00.9813 + 430000.8581
/fdm/jsbsim/velocities/mach @@ -231,9 +230,9 @@
/fdm/jsbsim/aero/alpha-deg-norm - 0.0 0.00 - 7.5 0.01 - 17.0 0.03 + 0.00.00 + 7.50.01 + 17.00.03
 @@ -252,44 +251,6 @@ - - EPR N1 Input Engine 1 - gain - 1.0 - - - - /engines/engine[0]/n1-actual - - /engines/engine[0]/n1-actual - 22.4 1 - 103.850 -
- - - - /engines/engine[0]/epr-n1-input - - - - EPR N1 Input Engine 2 - gain - 1.0 - - - - /engines/engine[1]/n1-actual - - /engines/engine[1]/n1-actual - 22.4 1 - 103.850 -
- - - - /engines/engine[1]/epr-n1-input - - EPR THR Input Engine 1 gain @@ -386,10 +347,13 @@ - /engines/engine[0]/epr-n1-input - 18.00.00 - 22.40.03 - 5190.01.00 + + /engines/engine[0]/n1-actual + 3.5 + + 18.00.00 + 22.40.03 + 11394381.01.00
 /engines/epr-scale @@ -398,7 +362,7 @@ - EPR 1 + EPR 1 B gain 1.0 @@ -416,7 +380,6 @@ EPR CMD 1 gain 1.0 - 0.05 @@ -432,9 +395,19 @@ - /engines/epr-flex-input - 22.40.03 - 5190.01.00 + +
+ + 0.99 + /engines/flx-throttle + + 0.0 22.4 + 1.0103.8 +
+ 3.5 + + 22.40.03 + 11394381.01.00 /engines/epr-scale @@ -442,9 +415,16 @@ - /engines/engine[0]/epr-thr-input - 22.40.03 - 5190.01.00 + +
+ /controls/engines/engine[0]/throttle-cmd-man + 0.0 22.4 + 1.0103.8 +
+ 3.5 + + 22.40.03 + 11394381.01.00 /engines/epr-scale @@ -453,10 +433,9 @@ - EPR CMD 1 + EPR CMD 1 B gain 1.0 - 0.05 @@ -475,10 +454,13 @@ - /engines/engine[1]/epr-n1-input - 18.00.00 - 22.40.03 - 5190.01.00 + + /engines/engine[1]/n1-actual + 3.5 + + 18.00.00 + 22.40.03 + 11394381.01.00
 /engines/epr-scale @@ -487,7 +469,7 @@ - EPR 2 + EPR 2 B gain 1.0 @@ -505,7 +487,6 @@ EPR CMD 2 gain 1.0 - 0.05 @@ -521,9 +502,19 @@ - /engines/epr-flex-input - 22.40.03 - 5190.01.00 + +
+ + 0.99 + /engines/flx-throttle + + 0.0 22.4 + 1.0103.8 +
+ 3.5 + + 22.40.03 + 11394381.01.00 /engines/epr-scale @@ -531,9 +522,16 @@ - /engines/engine[1]/epr-thr-input - 22.40.03 - 5190.01.00 + +
+ /controls/engines/engine[1]/throttle-cmd-man + 0.0 22.4 + 1.0103.8 +
+ 3.5 + + 22.40.03 + 11394381.01.00 /engines/epr-scale @@ -542,10 +540,9 @@ - EPR CMD 2 + EPR CMD 2 B gain 1.0 - 0.05 @@ -561,7 +558,6 @@ N1 CMD 1 gain 1.0 - 0.05 @@ -602,7 +598,6 @@ N1 CMD 2 gain 1.0 - 0.05 @@ -1431,7 +1426,7 @@ - +
0.99 @@ -1440,21 +1435,10 @@ 0.0 22.4 1.0103.8
- -
- - 0.99 - /controls/engines/throttle-scale - - 0.0 22.4 - 1.0103.8 -
- 22.4 1 - 103.850 - - - 22.40.03 - 5190.01.00 + 3.5 + + 22.40.03 + 11394381.01.00 /engines/epr-scale @@ -1486,7 +1470,7 @@ - +
0.95 @@ -1495,21 +1479,10 @@ 0.0 22.4 1.0103.8
- -
- - 0.95 - /controls/engines/throttle-scale - - 0.0 22.4 - 1.0103.8 -
- 22.4 1 - 103.850 - - - 22.40.03 - 5190.01.00 + 3.5 + + 22.40.03 + 11394381.01.00 /engines/epr-scale @@ -1541,7 +1514,7 @@ - +
0.99 @@ -1550,21 +1523,10 @@ 0.0 22.4 1.0103.8
- -
- - 0.99 - /engines/flx-throttle - - 0.0 22.4 - 1.0103.8 -
- 22.4 1 - 103.850 - - - 22.40.03 - 5190.01.00 + 3.5 + + 22.40.03 + 11394381.01.00 /engines/epr-scale @@ -1596,7 +1558,7 @@ - +
0.91 @@ -1605,21 +1567,10 @@ 0.0 22.4 1.0103.8
- -
- - 0.91 - /controls/engines/throttle-scale - - 0.0 22.4 - 1.0103.8 -
- 22.4 1 - 103.850 - - - 22.40.03 - 5190.01.00 + 3.5 + + 22.40.03 + 11394381.01.00 /engines/epr-scale diff --git a/revision.txt b/revision.txt index c3a4e75b..3a5f22c3 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4720 \ No newline at end of file +4722 \ No newline at end of file From 758f74d5bcc2a86ff80b00448f83a8d0e2693bdd Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 29 Dec 2018 22:16:02 -0500 Subject: [PATCH 08/16] Sim: Sync with autopush 'lite' bugfixes, experimental coeffs for smoother performance --- A320-main.xml | 8 ++++---- Nasal/autopush.nas | 14 +++++++------- revision.txt | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index a6b4d59f..c437bb3c 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -32,10 +32,10 @@ 1.0 0.0 - 1.0 - 0.1 - 0.01 - 2.0 + 0.5 + 0.15 + 0.25 + 0.1 0.0 0.0 diff --git a/Nasal/autopush.nas b/Nasal/autopush.nas index 02bdf7f1..e13b1fcd 100644 --- a/Nasal/autopush.nas +++ b/Nasal/autopush.nas @@ -17,7 +17,7 @@ var _K_d = nil; var _F_d = nil; var _F = nil; var _int = nil; -var _deltaV = nil; +var _V = nil; var _T_f = nil; var _K_yaw = nil; var _yasim = 0; @@ -36,9 +36,9 @@ var _loop = func() { var y = 0.0; # Rollspeed is only adequate if the wheel is touching the ground. if (getprop("/gear/gear[0]/wow")) { - var deltaV = getprop("/sim/model/pushback/target-speed-km_h"); - deltaV -= getprop("/gear/gear[0]/rollspeed-ms") * 3.6; - var dV = deltaV - _deltaV; + var V = getprop("/gear/gear[0]/rollspeed-ms") * 3.6; + var deltaV = getprop("/sim/model/pushback/target-speed-km_h") - V; + var dV = V - _V; var time = getprop("/sim/time/elapsed-sec"); var prop = math.min(math.max(_K_p * deltaV, -_F_p), _F_p); var speedup = getprop("/sim/speed-up"); @@ -47,7 +47,7 @@ var _loop = func() { # XXX Sanitising dt. Smaller chance of freakout on lag spike. if(dt > 0.0) { if(dt < 0.05) { - _int = math.min(math.max(_int + _K_i * dV * dt, -_F_i), _F_i); + _int = math.min(math.max(_int + _K_i * deltaV * dt, -_F_i), _F_i); } if(dt > 0.002) { deriv = math.min(math.max(_K_d * dV / dt, -_F_d), _F_d); @@ -57,7 +57,7 @@ var _loop = func() { if (_debug > 2) { print("pushback prop " ~ prop ~ ", _int " ~ _int ~ ", deriv " ~ deriv); } - _deltaV = deltaV; + _V = V; _time = time; if (!_yasim) { force = accel * getprop("/fdm/jsbsim/inertia/weight-lbs") * _unitconv; @@ -98,7 +98,7 @@ var _start = func() { _yasim = (getprop("/sim/flight-model") == "yasim"); _debug = getprop("/sim/model/pushback/debug") or 0; _int = 0.0; - _deltaV = 0.0; + _V = 0.0; _time = getprop("/sim/time/elapsed-sec"); setprop("/sim/model/pushback/connected", 1); if (!_timer.isRunning) { diff --git a/revision.txt b/revision.txt index 3a5f22c3..d9c2ba3e 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4722 \ No newline at end of file +4723 \ No newline at end of file From 2b014a46cd6154b88d85ca88b39358d8136a8535 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 29 Dec 2018 22:53:57 -0500 Subject: [PATCH 09/16] Sim: Move autopush dialog to gui/dialogs --- A320-main.xml | 6 ++---- AircraftConfig/acconfig.nas | 1 - {AircraftConfig => gui/dialogs}/autopush.xml | 0 3 files changed, 2 insertions(+), 5 deletions(-) rename {AircraftConfig => gui/dialogs}/autopush.xml (100%) diff --git a/A320-main.xml b/A320-main.xml index c437bb3c..63e481f0 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -266,10 +266,8 @@ - nasal - + dialog-show + autopush diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index d0d45c04..7d4c5ae3 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -108,7 +108,6 @@ var updated_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/updated/dialog", "Air var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dialog", "Aircraft/IDG-A32X/AircraftConfig/error-mismatch.xml"); var groundservices_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/groundsrvc/dialog", "Aircraft/IDG-A32X/AircraftConfig/groundservices.xml"); var du_quality = gui.Dialog.new("sim/gui/dialogs/acconfig/du-quality/dialog", "Aircraft/IDG-A32X/AircraftConfig/du-quality.xml"); -var autopush_dlg = gui.Dialog.new("sim/gui/dialogs/autopush/dialog", "Aircraft/IDG-A32X/AircraftConfig/autopush.xml"); var rendering_dlg = gui.Dialog.new("sim/gui/dialogs/rendering/dialog", "Aircraft/IDG-A32X/AircraftConfig/rendering.xml"); spinning.start(); init_dlg.open(); diff --git a/AircraftConfig/autopush.xml b/gui/dialogs/autopush.xml similarity index 100% rename from AircraftConfig/autopush.xml rename to gui/dialogs/autopush.xml From 3a0bac5940d7d726032efde844207466c16efc7f Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sun, 30 Dec 2018 16:28:02 -0500 Subject: [PATCH 10/16] Control: Nose Gear refactored, autopush updated/fixed, Sim: UI changes --- A320-main.xml | 229 +++++++++++++-------------- Models/Services/Pushback/Douglas.xml | 17 -- Nasal/libraries.nas | 8 + Systems/a320-fcs.xml | 32 ++-- gui/dialogs/autopush.xml | 2 + revision.txt | 2 +- 6 files changed, 144 insertions(+), 146 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index 63e481f0..3ba61688 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -24,12 +24,13 @@ + 0 0 1 - - - + + + 1.0 0.0 0.5 @@ -179,39 +180,12 @@ - - - - + + false + + + true @@ -232,9 +206,109 @@ - + + + + + + dialog-show + autopilot + + + + + + dialog-show + route-manager + + + + + + + + + nasal + + + + + + + nasal + + + + + + + nasal + + + + + + + nasal + + + + + + + nasal + + + + + + + nasal + + + + + + + nasal + + + + + + + nasal + + + + + + + nasal + + + + + - true @@ -287,87 +361,6 @@ 1 - - - - nasal - - - - - - - nasal - - - - - - - nasal - - - - - - - nasal - - - - - - - nasal - - - - - - - nasal - - - - - - - nasal - - - - - - - nasal - - - - - - - nasal - - - diff --git a/Models/Services/Pushback/Douglas.xml b/Models/Services/Pushback/Douglas.xml index f872f582..ab6207d6 100644 --- a/Models/Services/Pushback/Douglas.xml +++ b/Models/Services/Pushback/Douglas.xml @@ -90,23 +90,6 @@ 1 - - - rotate - gear/gear[0]/steering-norm - -70 -
- 0 - 0 - 0 -
- - 0 - 0 - 1 - - - diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index fb8fa513..29266255 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -9,6 +9,14 @@ print("------------------------------------------------------------------------- setprop("/sim/replay/was-active", 0); +setprop("/sim/menubar/default/menu[0]/item[0]/enabled", 0); +setprop("/sim/menubar/default/menu[2]/item[0]/enabled", 0); +setprop("/sim/menubar/default/menu[2]/item[2]/enabled", 0); +setprop("/sim/menubar/default/menu[3]/enabled", 0); +setprop("/sim/menubar/default/menu[5]/item[9]/enabled", 0); +setprop("/sim/menubar/default/menu[5]/item[10]/enabled", 0); +setprop("/sim/menubar/default/menu[5]/item[11]/enabled", 0); + # Dimmers setprop("/controls/lighting/ndl-norm", 1); setprop("/controls/lighting/ndr-norm", 1); diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index 4123cf3e..efd1bf0c 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -1870,15 +1870,27 @@ - - /velocities/groundspeed-kt - hydraulics/tiller/switch - - -1 0 1 - 30.000 -70.0 0 70.0 - 30.001 -10.0 0 10.0 - -
+ + + /sim/model/pushback/connected + 1 + + + hydraulics/tiller/autopush-cmd + 70 + + + /velocities/groundspeed-kt + hydraulics/tiller/switch + + -1 0 1 + 0.500 00.0 0.0 00.0 + 1.000 -70.0 0.0 70.0 + 30.000 -70.0 0.0 70.0 + 30.001 -10.0 0.0 10.0 + +
+ @@ -1891,7 +1903,7 @@ - /sim/model/pushback/position-norm gt 0.999 + /sim/model/pushback/connected eq 1 diff --git a/gui/dialogs/autopush.xml b/gui/dialogs/autopush.xml index ef031d33..02632b5d 100644 --- a/gui/dialogs/autopush.xml +++ b/gui/dialogs/autopush.xml @@ -90,6 +90,7 @@ Distribute under the terms of GPLv2. 2 -1.0 1.0 + 0.1 /sim/model/pushback/steer-cmd-norm true @@ -155,6 +156,7 @@ Distribute under the terms of GPLv2. -25 25 /sim/model/pushback/target-speed-km_h + 1.0 true dialog-apply diff --git a/revision.txt b/revision.txt index d9c2ba3e..3084ff19 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4723 \ No newline at end of file +4724 \ No newline at end of file From 767ace542015bc8e1987335fd1b78b2f416ea787 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Tue, 1 Jan 2019 01:03:06 -0500 Subject: [PATCH 11/16] Sim: 2019 --- A320-100-CFM-set.xml | 2 +- A320-100-CFM.xml | 2 +- A320-200-CFM-set.xml | 2 +- A320-200-CFM.xml | 2 +- A320-200-IAE-set.xml | 2 +- A320-200-IAE.xml | 2 +- A320-main.xml | 2 +- A320neo-CFM-set.xml | 2 +- A320neo-CFM.xml | 2 +- A320neo-PW-set.xml | 2 +- A320neo-PW.xml | 2 +- A32X-Checklists.xml | 2 +- AircraftConfig/about.xml | 2 +- AircraftConfig/ac_init.xml | 2 +- AircraftConfig/acconfig.nas | 2 +- AircraftConfig/announce.xml | 2 +- AircraftConfig/du-quality.xml | 2 +- AircraftConfig/error-mismatch.xml | 2 +- AircraftConfig/fail.xml | 2 +- AircraftConfig/fbw.xml | 2 +- AircraftConfig/groundservices.xml | 2 +- AircraftConfig/help.xml | 2 +- AircraftConfig/main.xml | 2 +- AircraftConfig/psload.xml | 2 +- AircraftConfig/psloaded.xml | 2 +- AircraftConfig/rendering.xml | 2 +- AircraftConfig/update.xml | 2 +- AircraftConfig/updated.xml | 2 +- AircraftConfig/welcome.xml | 2 +- Engines/cfm56_5a1_1.xml | 2 +- Engines/cfm56_5a1_2.xml | 2 +- Engines/cfm56_5b4_1.xml | 2 +- Engines/cfm56_5b4_2.xml | 2 +- Engines/direct.xml | 2 +- Engines/leap1a26_1.xml | 2 +- Engines/leap1a26_2.xml | 2 +- Engines/pw1127g_1.xml | 2 +- Engines/pw1127g_2.xml | 2 +- Engines/v2527_a5_1.xml | 2 +- Engines/v2527_a5_2.xml | 2 +- Models/A320-100-CFM.xml | 2 +- Models/A320-200-CFM.xml | 2 +- Models/A320-200-IAE.xml | 2 +- Models/A320neo-CFM.xml | 2 +- Models/A320neo-PW.xml | 2 +- Models/Effects/enginefire.xml | 2 +- Models/Effects/sparks.xml | 2 +- Models/Effects/tire-smoke-left.xml | 2 +- Models/Effects/tire-smoke-nose.xml | 2 +- Models/Effects/tire-smoke-right.xml | 2 +- Models/Effects/wet-runway-nose.xml | 2 +- Models/Effects/wet-runway.xml | 2 +- Models/Engines/NEO/LeapXLeft.xml | 2 +- Models/Engines/NEO/LeapXRight.xml | 2 +- Models/Engines/NEO/PW1100GLeft.xml | 2 +- Models/Engines/NEO/PW1100GRight.xml | 2 +- Models/Engines/XMLs/a320.cfm.xml | 2 +- Models/Engines/XMLs/a320.engine.cfm.left.xml | 2 +- Models/Engines/XMLs/a320.engine.cfm.right.xml | 2 +- Models/Engines/XMLs/a320.engine.iae.left.xml | 2 +- Models/Engines/XMLs/a320.engine.iae.right.xml | 2 +- Models/Engines/XMLs/a320.nacelle.cfm.xml | 2 +- Models/Engines/XMLs/a320.nacelle.iae.left.xml | 2 +- Models/Engines/XMLs/a320.nacelle.iae.right.xml | 2 +- Models/Engines/XMLs/a320.pylon.cfm.left.xml | 2 +- Models/Engines/XMLs/a320.pylon.cfm.right.xml | 2 +- Models/Engines/XMLs/a320.pylon.iae.left.xml | 2 +- Models/Engines/XMLs/a320.pylon.iae.right.xml | 2 +- Models/Engines/XMLs/a320.v2500.xml | 2 +- Models/FlightDeck/a320.flightdeck.xml | 2 +- Models/Fuselages/A320-100/fuselage.xml | 2 +- Models/Fuselages/A320-100/hstab.xml | 2 +- Models/Fuselages/A320-100/vstab.xml | 2 +- Models/Fuselages/A320/fuselage.xml | 2 +- Models/Fuselages/A320/hstab.xml | 2 +- Models/Fuselages/A320/vstab.xml | 2 +- Models/Fuselages/A320neo/fuselage.xml | 2 +- Models/Fuselages/A320neo/hstab.xml | 2 +- Models/Fuselages/A320neo/vstab.xml | 2 +- Models/Instruments/ATC/ATC.xml | 2 +- Models/Instruments/Brakes/Brakes.xml | 2 +- Models/Instruments/IESI/IESI.nas | 2 +- Models/Instruments/IESI/IESI.xml | 2 +- Models/Instruments/Lower-ECAM/Lower-ECAM.nas | 2 +- Models/Instruments/Lower-ECAM/Lower-ECAM.xml | 2 +- Models/Instruments/MCDU/MCDU.nas | 2 +- Models/Instruments/MCDU/MCDU1.xml | 2 +- Models/Instruments/MCDU/MCDU2.xml | 2 +- Models/Instruments/ND/ND_L.xml | 2 +- Models/Instruments/ND/ND_R.xml | 2 +- Models/Instruments/ND/canvas/A3XX_ND.nas | 2 +- Models/Instruments/ND/canvas/A3XX_ND_drivers.nas | 2 +- Models/Instruments/ND/canvas/ND.nas | 2 +- Models/Instruments/ND/canvas/ND_config.nas | 2 +- Models/Instruments/ND/canvas/framework/MapDrivers.nas | 2 +- Models/Instruments/ND/canvas/framework/canvas.nas | 2 +- Models/Instruments/ND/canvas/framework/navdisplay.nas | 2 +- Models/Instruments/ND/canvas/helpers.nas | 2 +- Models/Instruments/ND/canvas/loaders.nas | 2 +- Models/Instruments/ND/canvas/style.nas | 2 +- Models/Instruments/ND/canvas/wxr_api.xml | 2 +- Models/Instruments/OHpanel/OHpanel.xml | 2 +- Models/Instruments/OHpanel/OHpanelEPR.xml | 2 +- Models/Instruments/OHpanel/SteepAppr.xml | 2 +- Models/Instruments/PFD/PFD.nas | 2 +- Models/Instruments/PFD/PFD1.xml | 2 +- Models/Instruments/PFD/PFD2.xml | 2 +- Models/Instruments/Pedestal_up/Pedestal_up.xml | 2 +- Models/Instruments/Upper-ECAM/Upper-ECAM.nas | 2 +- Models/Instruments/Upper-ECAM/Upper-ECAM.xml | 2 +- Models/Interior/a320.interior.xml | 2 +- Models/LandingGears/a320.mlg.left.xml | 2 +- Models/LandingGears/a320.mlg.right.xml | 2 +- Models/LandingGears/a320.mlg.tires.xml | 2 +- Models/LandingGears/a320.nlg.tires.xml | 2 +- Models/LandingGears/a320.nlg.xml | 2 +- Models/Lights/ALS/beacon.xml | 2 +- Models/Lights/ALS/greennav.xml | 2 +- Models/Lights/ALS/landinglightL.xml | 2 +- Models/Lights/ALS/landinglightR.xml | 2 +- Models/Lights/ALS/left-strobe.xml | 2 +- Models/Lights/ALS/rednav.xml | 2 +- Models/Lights/ALS/right-strobe.xml | 2 +- Models/Lights/ALS/tail-strobe.xml | 2 +- Models/Lights/ALS/tailnav.xml | 2 +- Models/Lights/ALS/taxilight.xml | 2 +- Models/Lights/ALS/turnoffL.xml | 2 +- Models/Lights/ALS/turnoffR.xml | 2 +- Models/Lights/beacon.xml | 2 +- Models/Lights/greennav.xml | 2 +- Models/Lights/landing-nose.xml | 2 +- Models/Lights/landing-port.xml | 2 +- Models/Lights/landing-stbd.xml | 2 +- Models/Lights/light-cone.xml | 2 +- Models/Lights/rednav.xml | 2 +- Models/Lights/strobe.xml | 2 +- Models/Lights/tailnav.xml | 2 +- Models/Lights/tailstrobe.xml | 2 +- Models/RAT/RAT.xml | 2 +- Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml | 2 +- Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml | 2 +- Models/Services/Catering/warning-light.xml | 2 +- Models/Services/De-Icing/volvo_deicing_truck.xml | 2 +- Models/Services/Stairs/stairs.xml | 2 +- Models/Tablet/Tablet.nas | 2 +- Models/Tablet/Tablet.xml | 2 +- Models/Wings/a320.sharklets.xml | 2 +- Models/Wings/a320.winglets.xml | 2 +- Models/Wings/a320.wings.cfm.xml | 2 +- Models/Wings/a320.wings.iae.xml | 2 +- Models/Wings/a320.wings.neocfm.xml | 2 +- Models/Wings/a320.wings.neopw.xml | 2 +- Models/Wings/a320neo.sharklets.xml | 2 +- Nasal/ADIRS.nas | 2 +- Nasal/ECAM-controller.nas | 2 +- Nasal/ECAM.nas | 2 +- Nasal/FMGC-b.nas | 2 +- Nasal/FMGC-c.nas | 2 +- Nasal/FMGC.nas | 2 +- Nasal/MCDU/DATA.nas | 2 +- Nasal/MCDU/F-PLNA.nas | 2 +- Nasal/MCDU/INITA.nas | 2 +- Nasal/MCDU/INITB.nas | 2 +- Nasal/MCDU/MCDU.nas | 2 +- Nasal/MCDU/PERFCLB.nas | 2 +- Nasal/MCDU/PERFCRZ.nas | 2 +- Nasal/MCDU/PERFDES.nas | 2 +- Nasal/MCDU/PERFTO.nas | 2 +- Nasal/MCDU/RADNAV.nas | 2 +- Nasal/MCDU/STATUS.nas | 2 +- Nasal/brakes.nas | 2 +- Nasal/buttons.nas | 2 +- Nasal/efis.nas | 2 +- Nasal/electrical.nas | 2 +- Nasal/engines-cfm.nas | 2 +- Nasal/engines-common.nas | 2 +- Nasal/engines-iae.nas | 2 +- Nasal/fadec-cfm.nas | 2 +- Nasal/fadec-common.nas | 2 +- Nasal/fadec-iae.nas | 2 +- Nasal/fire.nas | 2 +- Nasal/fuel.nas | 2 +- Nasal/hydraulics.nas | 2 +- Nasal/icing.nas | 2 +- Nasal/it-fbw.nas | 2 +- Nasal/libraries.nas | 2 +- Nasal/pneumatics.nas | 2 +- Nasal/shake.nas | 2 +- Nasal/walk.nas | 2 +- Nasal/zoom-views.nas | 2 +- Sounds/A320-common-sound.xml | 2 +- Sounds/cfm56-sound.xml | 2 +- Sounds/leapx-sound.xml | 2 +- Sounds/v2500-sound.xml | 2 +- Systems/a320-aerodynamics.xml | 2 +- Systems/a320-external-reactions.xml | 2 +- Systems/a320-fcs.xml | 2 +- Systems/a320-ground-reactions.xml | 2 +- Systems/a320-mass-balance.xml | 2 +- Systems/a320-metrics.xml | 2 +- Systems/a320-spoiler.xml | 2 +- Systems/cfm56-sound.xml | 2 +- Systems/fadec-cfm.xml | 2 +- Systems/fadec-iae.xml | 2 +- Systems/fbw-pitch.xml | 2 +- Systems/flight-recorder.xml | 2 +- Systems/fmgc-drivers.xml | 2 +- Systems/fmgc-pitch.xml | 2 +- Systems/fmgc-roll-yaw.xml | 2 +- Systems/fmgc-thrust.xml | 2 +- Systems/fuel.xml | 2 +- Systems/glass-effect1.xml | 2 +- Systems/glass-effect2.xml | 2 +- Systems/instrumentation.xml | 2 +- Systems/libraries.xml | 2 +- Systems/lower-ecam.xml | 2 +- Systems/pfd.xml | 2 +- Systems/upper-ecam.xml | 2 +- Systems/v2500-sound.xml | 2 +- gui/dialogs/a3xx-autoflight-dlg.xml | 2 +- gui/dialogs/mcdu1-dlg.xml | 2 +- gui/dialogs/mcdu2-dlg.xml | 2 +- gui/it-gui.xml | 2 +- 223 files changed, 223 insertions(+), 223 deletions(-) diff --git a/A320-100-CFM-set.xml b/A320-100-CFM-set.xml index 93741f3e..89dd7288 100644 --- a/A320-100-CFM-set.xml +++ b/A320-100-CFM-set.xml @@ -1,6 +1,6 @@ - + diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml index 95105672..67885a74 100644 --- a/A320-100-CFM.xml +++ b/A320-100-CFM.xml @@ -1,7 +1,7 @@ - + - + diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml index 00d18cce..6af27858 100644 --- a/A320-200-CFM.xml +++ b/A320-200-CFM.xml @@ -1,7 +1,7 @@ - + - + diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index f429c1b1..59fdf761 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -1,7 +1,7 @@ - + - + diff --git a/A320neo-CFM-set.xml b/A320neo-CFM-set.xml index 84436151..ee20048a 100644 --- a/A320neo-CFM-set.xml +++ b/A320neo-CFM-set.xml @@ -1,6 +1,6 @@ - + diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml index ddaa9a44..08e7d88b 100644 --- a/A320neo-CFM.xml +++ b/A320neo-CFM.xml @@ -1,7 +1,7 @@ - + - + diff --git a/A320neo-PW.xml b/A320neo-PW.xml index a72cfc40..913ef1cf 100644 --- a/A320neo-PW.xml +++ b/A320neo-PW.xml @@ -1,7 +1,7 @@ - + - + diff --git a/AircraftConfig/about.xml b/AircraftConfig/about.xml index d797a6d3..1cd0ba44 100644 --- a/AircraftConfig/about.xml +++ b/AircraftConfig/about.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/ac_init.xml b/AircraftConfig/ac_init.xml index 8578b9ed..0ab50b80 100644 --- a/AircraftConfig/ac_init.xml +++ b/AircraftConfig/ac_init.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index 7d4c5ae3..5169daba 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -1,7 +1,7 @@ # Aircraft Config Center # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var spinning = maketimer(0.05, func { var spinning = getprop("/systems/acconfig/spinning"); diff --git a/AircraftConfig/announce.xml b/AircraftConfig/announce.xml index d05d0713..5d9c7053 100644 --- a/AircraftConfig/announce.xml +++ b/AircraftConfig/announce.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/du-quality.xml b/AircraftConfig/du-quality.xml index c795498e..eefc0361 100644 --- a/AircraftConfig/du-quality.xml +++ b/AircraftConfig/du-quality.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/error-mismatch.xml b/AircraftConfig/error-mismatch.xml index a1607bde..f59271fd 100644 --- a/AircraftConfig/error-mismatch.xml +++ b/AircraftConfig/error-mismatch.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml index c85b3bca..96cbb469 100644 --- a/AircraftConfig/fail.xml +++ b/AircraftConfig/fail.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/fbw.xml b/AircraftConfig/fbw.xml index 02fcce72..0edf9672 100644 --- a/AircraftConfig/fbw.xml +++ b/AircraftConfig/fbw.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/groundservices.xml b/AircraftConfig/groundservices.xml index aa068c77..b5f6929e 100644 --- a/AircraftConfig/groundservices.xml +++ b/AircraftConfig/groundservices.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/help.xml b/AircraftConfig/help.xml index 46e4595f..0a9b2c3b 100644 --- a/AircraftConfig/help.xml +++ b/AircraftConfig/help.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml index 035357a0..f4a0ad2d 100644 --- a/AircraftConfig/main.xml +++ b/AircraftConfig/main.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/psload.xml b/AircraftConfig/psload.xml index 67339ca0..cf2aa204 100644 --- a/AircraftConfig/psload.xml +++ b/AircraftConfig/psload.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/psloaded.xml b/AircraftConfig/psloaded.xml index 5210f551..3758b077 100644 --- a/AircraftConfig/psloaded.xml +++ b/AircraftConfig/psloaded.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/rendering.xml b/AircraftConfig/rendering.xml index b9c88c51..a7ccbdc3 100644 --- a/AircraftConfig/rendering.xml +++ b/AircraftConfig/rendering.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/update.xml b/AircraftConfig/update.xml index a8f0841b..b2850a63 100644 --- a/AircraftConfig/update.xml +++ b/AircraftConfig/update.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/updated.xml b/AircraftConfig/updated.xml index 9ae8a8b8..dc5ae23f 100644 --- a/AircraftConfig/updated.xml +++ b/AircraftConfig/updated.xml @@ -1,6 +1,6 @@ - + diff --git a/AircraftConfig/welcome.xml b/AircraftConfig/welcome.xml index c7b9887b..49af5f5b 100644 --- a/AircraftConfig/welcome.xml +++ b/AircraftConfig/welcome.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/cfm56_5a1_1.xml b/Engines/cfm56_5a1_1.xml index c570469b..67147044 100644 --- a/Engines/cfm56_5a1_1.xml +++ b/Engines/cfm56_5a1_1.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/cfm56_5a1_2.xml b/Engines/cfm56_5a1_2.xml index 1ef4c840..122236e0 100644 --- a/Engines/cfm56_5a1_2.xml +++ b/Engines/cfm56_5a1_2.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/cfm56_5b4_1.xml b/Engines/cfm56_5b4_1.xml index f2fb4e08..e6c4ec41 100644 --- a/Engines/cfm56_5b4_1.xml +++ b/Engines/cfm56_5b4_1.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/cfm56_5b4_2.xml b/Engines/cfm56_5b4_2.xml index 13b0a478..81acffd7 100644 --- a/Engines/cfm56_5b4_2.xml +++ b/Engines/cfm56_5b4_2.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/direct.xml b/Engines/direct.xml index 17a74b41..244e53be 100644 --- a/Engines/direct.xml +++ b/Engines/direct.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/leap1a26_1.xml b/Engines/leap1a26_1.xml index 78d27989..534e076e 100644 --- a/Engines/leap1a26_1.xml +++ b/Engines/leap1a26_1.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/leap1a26_2.xml b/Engines/leap1a26_2.xml index 86719783..f2930ec3 100644 --- a/Engines/leap1a26_2.xml +++ b/Engines/leap1a26_2.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/pw1127g_1.xml b/Engines/pw1127g_1.xml index 3a3d5702..8d13b1c6 100644 --- a/Engines/pw1127g_1.xml +++ b/Engines/pw1127g_1.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/pw1127g_2.xml b/Engines/pw1127g_2.xml index 5527372c..3a487ef4 100644 --- a/Engines/pw1127g_2.xml +++ b/Engines/pw1127g_2.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/v2527_a5_1.xml b/Engines/v2527_a5_1.xml index 9123d87b..aaaf9ada 100644 --- a/Engines/v2527_a5_1.xml +++ b/Engines/v2527_a5_1.xml @@ -1,6 +1,6 @@ - + diff --git a/Engines/v2527_a5_2.xml b/Engines/v2527_a5_2.xml index 89f3d0bb..2494b0d5 100644 --- a/Engines/v2527_a5_2.xml +++ b/Engines/v2527_a5_2.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/A320-100-CFM.xml b/Models/A320-100-CFM.xml index 8b9ac4c6..ed7d2e18 100644 --- a/Models/A320-100-CFM.xml +++ b/Models/A320-100-CFM.xml @@ -1,6 +1,6 @@ - + A320-100 diff --git a/Models/A320-200-CFM.xml b/Models/A320-200-CFM.xml index 39d625e0..faee1f00 100644 --- a/Models/A320-200-CFM.xml +++ b/Models/A320-200-CFM.xml @@ -1,6 +1,6 @@ - + A320-200 diff --git a/Models/A320-200-IAE.xml b/Models/A320-200-IAE.xml index 8afa4997..55752740 100644 --- a/Models/A320-200-IAE.xml +++ b/Models/A320-200-IAE.xml @@ -1,6 +1,6 @@ - + A320-200 diff --git a/Models/A320neo-CFM.xml b/Models/A320neo-CFM.xml index e292ee52..7c68810a 100644 --- a/Models/A320neo-CFM.xml +++ b/Models/A320neo-CFM.xml @@ -1,6 +1,6 @@ - + A320-200 diff --git a/Models/A320neo-PW.xml b/Models/A320neo-PW.xml index c28bed59..ea12ab35 100644 --- a/Models/A320neo-PW.xml +++ b/Models/A320neo-PW.xml @@ -1,6 +1,6 @@ - + A320-200 diff --git a/Models/Effects/enginefire.xml b/Models/Effects/enginefire.xml index a41450cf..78ce7c1d 100644 --- a/Models/Effects/enginefire.xml +++ b/Models/Effects/enginefire.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Effects/sparks.xml b/Models/Effects/sparks.xml index 89d4a819..6c8743dd 100644 --- a/Models/Effects/sparks.xml +++ b/Models/Effects/sparks.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Effects/tire-smoke-left.xml b/Models/Effects/tire-smoke-left.xml index 8b402092..de352110 100644 --- a/Models/Effects/tire-smoke-left.xml +++ b/Models/Effects/tire-smoke-left.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Effects/tire-smoke-nose.xml b/Models/Effects/tire-smoke-nose.xml index f281083a..3e2f5b3c 100644 --- a/Models/Effects/tire-smoke-nose.xml +++ b/Models/Effects/tire-smoke-nose.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Effects/tire-smoke-right.xml b/Models/Effects/tire-smoke-right.xml index b21e0eea..d3ce1fcf 100644 --- a/Models/Effects/tire-smoke-right.xml +++ b/Models/Effects/tire-smoke-right.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Effects/wet-runway-nose.xml b/Models/Effects/wet-runway-nose.xml index 11f7eacd..eab3b3b0 100644 --- a/Models/Effects/wet-runway-nose.xml +++ b/Models/Effects/wet-runway-nose.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Effects/wet-runway.xml b/Models/Effects/wet-runway.xml index 996d2ec0..f33ade72 100644 --- a/Models/Effects/wet-runway.xml +++ b/Models/Effects/wet-runway.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/NEO/LeapXLeft.xml b/Models/Engines/NEO/LeapXLeft.xml index 52da1ec5..3c4b52ca 100644 --- a/Models/Engines/NEO/LeapXLeft.xml +++ b/Models/Engines/NEO/LeapXLeft.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/NEO/LeapXRight.xml b/Models/Engines/NEO/LeapXRight.xml index cee10f22..00af4ec4 100644 --- a/Models/Engines/NEO/LeapXRight.xml +++ b/Models/Engines/NEO/LeapXRight.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/NEO/PW1100GLeft.xml b/Models/Engines/NEO/PW1100GLeft.xml index 67d59996..472ba329 100644 --- a/Models/Engines/NEO/PW1100GLeft.xml +++ b/Models/Engines/NEO/PW1100GLeft.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/NEO/PW1100GRight.xml b/Models/Engines/NEO/PW1100GRight.xml index fc879f87..e42f5f9f 100644 --- a/Models/Engines/NEO/PW1100GRight.xml +++ b/Models/Engines/NEO/PW1100GRight.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.cfm.xml b/Models/Engines/XMLs/a320.cfm.xml index 98c1956e..a79843b8 100644 --- a/Models/Engines/XMLs/a320.cfm.xml +++ b/Models/Engines/XMLs/a320.cfm.xml @@ -1,6 +1,6 @@ - + ../Models/cfm56.ac diff --git a/Models/Engines/XMLs/a320.engine.cfm.left.xml b/Models/Engines/XMLs/a320.engine.cfm.left.xml index 14dad651..2e6f9546 100644 --- a/Models/Engines/XMLs/a320.engine.cfm.left.xml +++ b/Models/Engines/XMLs/a320.engine.cfm.left.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.engine.cfm.right.xml b/Models/Engines/XMLs/a320.engine.cfm.right.xml index aa35c0bb..429af2f1 100644 --- a/Models/Engines/XMLs/a320.engine.cfm.right.xml +++ b/Models/Engines/XMLs/a320.engine.cfm.right.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.engine.iae.left.xml b/Models/Engines/XMLs/a320.engine.iae.left.xml index 97461a8e..6960e878 100644 --- a/Models/Engines/XMLs/a320.engine.iae.left.xml +++ b/Models/Engines/XMLs/a320.engine.iae.left.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.engine.iae.right.xml b/Models/Engines/XMLs/a320.engine.iae.right.xml index 93ade12a..15902dea 100644 --- a/Models/Engines/XMLs/a320.engine.iae.right.xml +++ b/Models/Engines/XMLs/a320.engine.iae.right.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.nacelle.cfm.xml b/Models/Engines/XMLs/a320.nacelle.cfm.xml index 4c408bdb..217d7f94 100644 --- a/Models/Engines/XMLs/a320.nacelle.cfm.xml +++ b/Models/Engines/XMLs/a320.nacelle.cfm.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.nacelle.iae.left.xml b/Models/Engines/XMLs/a320.nacelle.iae.left.xml index a7de8abe..fe9ba0ce 100644 --- a/Models/Engines/XMLs/a320.nacelle.iae.left.xml +++ b/Models/Engines/XMLs/a320.nacelle.iae.left.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.nacelle.iae.right.xml b/Models/Engines/XMLs/a320.nacelle.iae.right.xml index aea36b99..5aef82dc 100644 --- a/Models/Engines/XMLs/a320.nacelle.iae.right.xml +++ b/Models/Engines/XMLs/a320.nacelle.iae.right.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.pylon.cfm.left.xml b/Models/Engines/XMLs/a320.pylon.cfm.left.xml index 358c8e8b..dd5ba97b 100644 --- a/Models/Engines/XMLs/a320.pylon.cfm.left.xml +++ b/Models/Engines/XMLs/a320.pylon.cfm.left.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.pylon.cfm.right.xml b/Models/Engines/XMLs/a320.pylon.cfm.right.xml index b785a782..374aa828 100644 --- a/Models/Engines/XMLs/a320.pylon.cfm.right.xml +++ b/Models/Engines/XMLs/a320.pylon.cfm.right.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.pylon.iae.left.xml b/Models/Engines/XMLs/a320.pylon.iae.left.xml index c6952d97..4f4e04b3 100644 --- a/Models/Engines/XMLs/a320.pylon.iae.left.xml +++ b/Models/Engines/XMLs/a320.pylon.iae.left.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.pylon.iae.right.xml b/Models/Engines/XMLs/a320.pylon.iae.right.xml index 1348bb05..b7dd64ac 100644 --- a/Models/Engines/XMLs/a320.pylon.iae.right.xml +++ b/Models/Engines/XMLs/a320.pylon.iae.right.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Engines/XMLs/a320.v2500.xml b/Models/Engines/XMLs/a320.v2500.xml index 333ec9eb..1d67ea85 100644 --- a/Models/Engines/XMLs/a320.v2500.xml +++ b/Models/Engines/XMLs/a320.v2500.xml @@ -1,6 +1,6 @@ - + ../Models/v2500.ac diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 30ce4eef..6d5301e7 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Fuselages/A320-100/fuselage.xml b/Models/Fuselages/A320-100/fuselage.xml index a836e2d3..1ad2878d 100644 --- a/Models/Fuselages/A320-100/fuselage.xml +++ b/Models/Fuselages/A320-100/fuselage.xml @@ -1,6 +1,6 @@ - + Fuselage diff --git a/Models/Fuselages/A320-100/hstab.xml b/Models/Fuselages/A320-100/hstab.xml index 354443d2..c1fcd9e0 100644 --- a/Models/Fuselages/A320-100/hstab.xml +++ b/Models/Fuselages/A320-100/hstab.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Fuselages/A320-100/vstab.xml b/Models/Fuselages/A320-100/vstab.xml index e38df962..5dc95fc0 100644 --- a/Models/Fuselages/A320-100/vstab.xml +++ b/Models/Fuselages/A320-100/vstab.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Fuselages/A320/fuselage.xml b/Models/Fuselages/A320/fuselage.xml index a836e2d3..1ad2878d 100644 --- a/Models/Fuselages/A320/fuselage.xml +++ b/Models/Fuselages/A320/fuselage.xml @@ -1,6 +1,6 @@ - + Fuselage diff --git a/Models/Fuselages/A320/hstab.xml b/Models/Fuselages/A320/hstab.xml index 354443d2..c1fcd9e0 100644 --- a/Models/Fuselages/A320/hstab.xml +++ b/Models/Fuselages/A320/hstab.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Fuselages/A320/vstab.xml b/Models/Fuselages/A320/vstab.xml index e38df962..5dc95fc0 100644 --- a/Models/Fuselages/A320/vstab.xml +++ b/Models/Fuselages/A320/vstab.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Fuselages/A320neo/fuselage.xml b/Models/Fuselages/A320neo/fuselage.xml index a836e2d3..1ad2878d 100644 --- a/Models/Fuselages/A320neo/fuselage.xml +++ b/Models/Fuselages/A320neo/fuselage.xml @@ -1,6 +1,6 @@ - + Fuselage diff --git a/Models/Fuselages/A320neo/hstab.xml b/Models/Fuselages/A320neo/hstab.xml index 354443d2..c1fcd9e0 100644 --- a/Models/Fuselages/A320neo/hstab.xml +++ b/Models/Fuselages/A320neo/hstab.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Fuselages/A320neo/vstab.xml b/Models/Fuselages/A320neo/vstab.xml index e38df962..5dc95fc0 100644 --- a/Models/Fuselages/A320neo/vstab.xml +++ b/Models/Fuselages/A320neo/vstab.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/ATC/ATC.xml b/Models/Instruments/ATC/ATC.xml index 4ed7fafc..c26ae9fd 100644 --- a/Models/Instruments/ATC/ATC.xml +++ b/Models/Instruments/ATC/ATC.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/Brakes/Brakes.xml b/Models/Instruments/Brakes/Brakes.xml index 2c557f57..656f95a8 100644 --- a/Models/Instruments/Brakes/Brakes.xml +++ b/Models/Instruments/Brakes/Brakes.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/IESI/IESI.nas b/Models/Instruments/IESI/IESI.nas index a1706c93..182fe5e0 100644 --- a/Models/Instruments/IESI/IESI.nas +++ b/Models/Instruments/IESI/IESI.nas @@ -1,6 +1,6 @@ # A3XX IESI -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var IESI = nil; var IESI_display = nil; diff --git a/Models/Instruments/IESI/IESI.xml b/Models/Instruments/IESI/IESI.xml index a4f531d6..89957172 100644 --- a/Models/Instruments/IESI/IESI.xml +++ b/Models/Instruments/IESI/IESI.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas index af9c8165..c3ee50e1 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.nas +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.nas @@ -1,6 +1,6 @@ # A3XX Lower ECAM Canvas -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var lowerECAM_apu = nil; var lowerECAM_bleed = nil; diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.xml b/Models/Instruments/Lower-ECAM/Lower-ECAM.xml index e09a90a4..3b322897 100644 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM.xml +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/MCDU/MCDU.nas b/Models/Instruments/MCDU/MCDU.nas index 5f9c6667..aa82f6fb 100644 --- a/Models/Instruments/MCDU/MCDU.nas +++ b/Models/Instruments/MCDU/MCDU.nas @@ -1,6 +1,6 @@ # A3XX MCDU -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var MCDU_1 = nil; var MCDU_2 = nil; diff --git a/Models/Instruments/MCDU/MCDU1.xml b/Models/Instruments/MCDU/MCDU1.xml index 14929fa1..a871ab91 100644 --- a/Models/Instruments/MCDU/MCDU1.xml +++ b/Models/Instruments/MCDU/MCDU1.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/MCDU/MCDU2.xml b/Models/Instruments/MCDU/MCDU2.xml index 0c215245..183cdfc0 100644 --- a/Models/Instruments/MCDU/MCDU2.xml +++ b/Models/Instruments/MCDU/MCDU2.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/ND/ND_L.xml b/Models/Instruments/ND/ND_L.xml index 6f1ab168..9702730f 100644 --- a/Models/Instruments/ND/ND_L.xml +++ b/Models/Instruments/ND/ND_L.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/ND/ND_R.xml b/Models/Instruments/ND/ND_R.xml index 7048b420..f1779432 100644 --- a/Models/Instruments/ND/ND_R.xml +++ b/Models/Instruments/ND/ND_R.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/ND/canvas/A3XX_ND.nas b/Models/Instruments/ND/canvas/A3XX_ND.nas index 345207d5..e75fda0c 100644 --- a/Models/Instruments/ND/canvas/A3XX_ND.nas +++ b/Models/Instruments/ND/canvas/A3XX_ND.nas @@ -2,7 +2,7 @@ # Joshua Davidson (it0uchpods) # Based on work by artix -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var get_local_path = func(file){ var aircraft_dir = split("/", getprop("/sim/aircraft-dir"))[-1]; diff --git a/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas b/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas index 3dbe4f56..32fd95c7 100644 --- a/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas +++ b/Models/Instruments/ND/canvas/A3XX_ND_drivers.nas @@ -2,7 +2,7 @@ # Joshua Davidson (it0uchpods) # Based on work by artix -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var A3XXRouteDriver = { new: func(){ diff --git a/Models/Instruments/ND/canvas/ND.nas b/Models/Instruments/ND/canvas/ND.nas index 64611b48..cfaca568 100644 --- a/Models/Instruments/ND/canvas/ND.nas +++ b/Models/Instruments/ND/canvas/ND.nas @@ -1,6 +1,6 @@ # A3XX ND Canvas -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) io.include("A3XX_ND.nas"); diff --git a/Models/Instruments/ND/canvas/ND_config.nas b/Models/Instruments/ND/canvas/ND_config.nas index 5056656e..ec22a4ee 100644 --- a/Models/Instruments/ND/canvas/ND_config.nas +++ b/Models/Instruments/ND/canvas/ND_config.nas @@ -2,7 +2,7 @@ # Joshua Davidson (it0uchpods) # Based on work by artix -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) canvas.NDConfig = { properties: { diff --git a/Models/Instruments/ND/canvas/framework/MapDrivers.nas b/Models/Instruments/ND/canvas/framework/MapDrivers.nas index ac67dbce..2609d4b0 100644 --- a/Models/Instruments/ND/canvas/framework/MapDrivers.nas +++ b/Models/Instruments/ND/canvas/framework/MapDrivers.nas @@ -2,7 +2,7 @@ # Joshua Davidson (it0uchpods) # Based on work by artix -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) canvas.RouteDriver = { new: func(){ diff --git a/Models/Instruments/ND/canvas/framework/canvas.nas b/Models/Instruments/ND/canvas/framework/canvas.nas index d585e26a..88abe555 100644 --- a/Models/Instruments/ND/canvas/framework/canvas.nas +++ b/Models/Instruments/ND/canvas/framework/canvas.nas @@ -2,7 +2,7 @@ # Joshua Davidson (it0uchpods) # Based on work by artix -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var assert_m = canvas.assert_m; diff --git a/Models/Instruments/ND/canvas/framework/navdisplay.nas b/Models/Instruments/ND/canvas/framework/navdisplay.nas index b1436055..7675d7c0 100644 --- a/Models/Instruments/ND/canvas/framework/navdisplay.nas +++ b/Models/Instruments/ND/canvas/framework/navdisplay.nas @@ -2,7 +2,7 @@ # Joshua Davidson (it0uchpods) # Based on work by artix -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) # Override FGDATA/Nasal/canvas/map/navdisplay.mfd diff --git a/Models/Instruments/ND/canvas/helpers.nas b/Models/Instruments/ND/canvas/helpers.nas index a322a888..6c072421 100644 --- a/Models/Instruments/ND/canvas/helpers.nas +++ b/Models/Instruments/ND/canvas/helpers.nas @@ -2,7 +2,7 @@ # Joshua Davidson (it0uchpods) # Based on work by artix -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var SymbolPainter = { aircraft_dir: nil, diff --git a/Models/Instruments/ND/canvas/loaders.nas b/Models/Instruments/ND/canvas/loaders.nas index 9fe90f67..14807371 100644 --- a/Models/Instruments/ND/canvas/loaders.nas +++ b/Models/Instruments/ND/canvas/loaders.nas @@ -2,7 +2,7 @@ # Joshua Davidson (it0uchpods) # Based on work by artix -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var version = getprop("sim/version/flightgear"); var v = split(".", version); diff --git a/Models/Instruments/ND/canvas/style.nas b/Models/Instruments/ND/canvas/style.nas index 6699fef5..a2191912 100644 --- a/Models/Instruments/ND/canvas/style.nas +++ b/Models/Instruments/ND/canvas/style.nas @@ -2,7 +2,7 @@ # Joshua Davidson (it0uchpods) # Based on work by artix -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var ALWAYS = func 1; var NOTHING = func nil; diff --git a/Models/Instruments/ND/canvas/wxr_api.xml b/Models/Instruments/ND/canvas/wxr_api.xml index ce13628e..5a3cad46 100644 --- a/Models/Instruments/ND/canvas/wxr_api.xml +++ b/Models/Instruments/ND/canvas/wxr_api.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml index 441e6baa..82dca242 100644 --- a/Models/Instruments/OHpanel/OHpanel.xml +++ b/Models/Instruments/OHpanel/OHpanel.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/OHpanel/OHpanelEPR.xml b/Models/Instruments/OHpanel/OHpanelEPR.xml index 1bf11a98..0591a525 100644 --- a/Models/Instruments/OHpanel/OHpanelEPR.xml +++ b/Models/Instruments/OHpanel/OHpanelEPR.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/OHpanel/SteepAppr.xml b/Models/Instruments/OHpanel/SteepAppr.xml index 073e0235..48a4693e 100644 --- a/Models/Instruments/OHpanel/SteepAppr.xml +++ b/Models/Instruments/OHpanel/SteepAppr.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index e582a64d..aa26b172 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -1,6 +1,6 @@ # A3XX PFD -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var PFD_1 = nil; var PFD_2 = nil; diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml index 177c314f..00bd7f56 100644 --- a/Models/Instruments/PFD/PFD1.xml +++ b/Models/Instruments/PFD/PFD1.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml index 6dc88298..99bfd32a 100644 --- a/Models/Instruments/PFD/PFD2.xml +++ b/Models/Instruments/PFD/PFD2.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/Pedestal_up/Pedestal_up.xml b/Models/Instruments/Pedestal_up/Pedestal_up.xml index b0ec1213..682223c8 100644 --- a/Models/Instruments/Pedestal_up/Pedestal_up.xml +++ b/Models/Instruments/Pedestal_up/Pedestal_up.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas index dae786c1..30590b6b 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.nas +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.nas @@ -1,6 +1,6 @@ # A3XX Upper ECAM Canvas -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var upperECAM_cfm_eis2 = nil; var upperECAM_iae_eis2 = nil; diff --git a/Models/Instruments/Upper-ECAM/Upper-ECAM.xml b/Models/Instruments/Upper-ECAM/Upper-ECAM.xml index 393b8d07..ee8e74c8 100644 --- a/Models/Instruments/Upper-ECAM/Upper-ECAM.xml +++ b/Models/Instruments/Upper-ECAM/Upper-ECAM.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Interior/a320.interior.xml b/Models/Interior/a320.interior.xml index 35e71a95..43ab6697 100644 --- a/Models/Interior/a320.interior.xml +++ b/Models/Interior/a320.interior.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/LandingGears/a320.mlg.left.xml b/Models/LandingGears/a320.mlg.left.xml index 082191a4..2951c933 100644 --- a/Models/LandingGears/a320.mlg.left.xml +++ b/Models/LandingGears/a320.mlg.left.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/LandingGears/a320.mlg.right.xml b/Models/LandingGears/a320.mlg.right.xml index e45db6ab..366786f8 100644 --- a/Models/LandingGears/a320.mlg.right.xml +++ b/Models/LandingGears/a320.mlg.right.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/LandingGears/a320.mlg.tires.xml b/Models/LandingGears/a320.mlg.tires.xml index 3a8a27b0..084c73d1 100644 --- a/Models/LandingGears/a320.mlg.tires.xml +++ b/Models/LandingGears/a320.mlg.tires.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/LandingGears/a320.nlg.tires.xml b/Models/LandingGears/a320.nlg.tires.xml index 59a5d831..91d613d6 100644 --- a/Models/LandingGears/a320.nlg.tires.xml +++ b/Models/LandingGears/a320.nlg.tires.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/LandingGears/a320.nlg.xml b/Models/LandingGears/a320.nlg.xml index d02e2681..bb8f2537 100644 --- a/Models/LandingGears/a320.nlg.xml +++ b/Models/LandingGears/a320.nlg.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/beacon.xml b/Models/Lights/ALS/beacon.xml index d1904170..bde0291a 100644 --- a/Models/Lights/ALS/beacon.xml +++ b/Models/Lights/ALS/beacon.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/greennav.xml b/Models/Lights/ALS/greennav.xml index 61078fc1..f817bf79 100644 --- a/Models/Lights/ALS/greennav.xml +++ b/Models/Lights/ALS/greennav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/landinglightL.xml b/Models/Lights/ALS/landinglightL.xml index 709a7fa9..a1b2ea28 100644 --- a/Models/Lights/ALS/landinglightL.xml +++ b/Models/Lights/ALS/landinglightL.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/landinglightR.xml b/Models/Lights/ALS/landinglightR.xml index 4bea35be..960c0752 100644 --- a/Models/Lights/ALS/landinglightR.xml +++ b/Models/Lights/ALS/landinglightR.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/left-strobe.xml b/Models/Lights/ALS/left-strobe.xml index 6d4ea4f1..71f81921 100644 --- a/Models/Lights/ALS/left-strobe.xml +++ b/Models/Lights/ALS/left-strobe.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/rednav.xml b/Models/Lights/ALS/rednav.xml index 37b9edc8..4c4cb814 100644 --- a/Models/Lights/ALS/rednav.xml +++ b/Models/Lights/ALS/rednav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/right-strobe.xml b/Models/Lights/ALS/right-strobe.xml index a52083d8..2a36edb1 100644 --- a/Models/Lights/ALS/right-strobe.xml +++ b/Models/Lights/ALS/right-strobe.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/tail-strobe.xml b/Models/Lights/ALS/tail-strobe.xml index ea386bce..6aff16bf 100644 --- a/Models/Lights/ALS/tail-strobe.xml +++ b/Models/Lights/ALS/tail-strobe.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/tailnav.xml b/Models/Lights/ALS/tailnav.xml index 0db1f5d2..3b7b03e6 100644 --- a/Models/Lights/ALS/tailnav.xml +++ b/Models/Lights/ALS/tailnav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/taxilight.xml b/Models/Lights/ALS/taxilight.xml index 33e3fe87..13b25323 100644 --- a/Models/Lights/ALS/taxilight.xml +++ b/Models/Lights/ALS/taxilight.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/turnoffL.xml b/Models/Lights/ALS/turnoffL.xml index 2de101a2..c8d07859 100644 --- a/Models/Lights/ALS/turnoffL.xml +++ b/Models/Lights/ALS/turnoffL.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/ALS/turnoffR.xml b/Models/Lights/ALS/turnoffR.xml index 60fd17a2..2a6c51c1 100644 --- a/Models/Lights/ALS/turnoffR.xml +++ b/Models/Lights/ALS/turnoffR.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/beacon.xml b/Models/Lights/beacon.xml index 92c314fc..842ae141 100644 --- a/Models/Lights/beacon.xml +++ b/Models/Lights/beacon.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/greennav.xml b/Models/Lights/greennav.xml index da2fab01..dd49f873 100644 --- a/Models/Lights/greennav.xml +++ b/Models/Lights/greennav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/landing-nose.xml b/Models/Lights/landing-nose.xml index cc0815bf..ba342e38 100644 --- a/Models/Lights/landing-nose.xml +++ b/Models/Lights/landing-nose.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/landing-port.xml b/Models/Lights/landing-port.xml index 283e4ad3..66584fe6 100644 --- a/Models/Lights/landing-port.xml +++ b/Models/Lights/landing-port.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/landing-stbd.xml b/Models/Lights/landing-stbd.xml index 66691f86..59e22f55 100644 --- a/Models/Lights/landing-stbd.xml +++ b/Models/Lights/landing-stbd.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/light-cone.xml b/Models/Lights/light-cone.xml index f501555d..5da1aad8 100644 --- a/Models/Lights/light-cone.xml +++ b/Models/Lights/light-cone.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/rednav.xml b/Models/Lights/rednav.xml index 3c247e05..29441192 100644 --- a/Models/Lights/rednav.xml +++ b/Models/Lights/rednav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/strobe.xml b/Models/Lights/strobe.xml index 78dd7e5e..02a890c0 100644 --- a/Models/Lights/strobe.xml +++ b/Models/Lights/strobe.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/tailnav.xml b/Models/Lights/tailnav.xml index 7199d477..2412f200 100644 --- a/Models/Lights/tailnav.xml +++ b/Models/Lights/tailnav.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Lights/tailstrobe.xml b/Models/Lights/tailstrobe.xml index 575b3e4a..ab152f53 100644 --- a/Models/Lights/tailstrobe.xml +++ b/Models/Lights/tailstrobe.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/RAT/RAT.xml b/Models/RAT/RAT.xml index a62dba4c..1cac6882 100644 --- a/Models/RAT/RAT.xml +++ b/Models/RAT/RAT.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml b/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml index f3ebe7ef..55671a23 100644 --- a/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml +++ b/Models/Services/Catering/Catering_Loader_Truck_VolvoFM.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml b/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml index 964c4b75..d4b02b74 100644 --- a/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml +++ b/Models/Services/Catering/L_T_VolvoFM-4_5m-set.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Services/Catering/warning-light.xml b/Models/Services/Catering/warning-light.xml index 397b7d04..f503fa46 100644 --- a/Models/Services/Catering/warning-light.xml +++ b/Models/Services/Catering/warning-light.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Services/De-Icing/volvo_deicing_truck.xml b/Models/Services/De-Icing/volvo_deicing_truck.xml index ea1b4b9b..31da5c9e 100644 --- a/Models/Services/De-Icing/volvo_deicing_truck.xml +++ b/Models/Services/De-Icing/volvo_deicing_truck.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Services/Stairs/stairs.xml b/Models/Services/Stairs/stairs.xml index 835bffb7..c929c1a5 100644 --- a/Models/Services/Stairs/stairs.xml +++ b/Models/Services/Stairs/stairs.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Tablet/Tablet.nas b/Models/Tablet/Tablet.nas index d0bbba04..648b3b15 100644 --- a/Models/Tablet/Tablet.nas +++ b/Models/Tablet/Tablet.nas @@ -1,7 +1,7 @@ # IDG Tablet # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var Tablet1 = nil; var Tablet_1 = nil; diff --git a/Models/Tablet/Tablet.xml b/Models/Tablet/Tablet.xml index 12ebabc6..c6c1e5ea 100644 --- a/Models/Tablet/Tablet.xml +++ b/Models/Tablet/Tablet.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Wings/a320.sharklets.xml b/Models/Wings/a320.sharklets.xml index 8cc763f1..adbcf10e 100644 --- a/Models/Wings/a320.sharklets.xml +++ b/Models/Wings/a320.sharklets.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Wings/a320.winglets.xml b/Models/Wings/a320.winglets.xml index 1f0dc453..4f1921bd 100644 --- a/Models/Wings/a320.winglets.xml +++ b/Models/Wings/a320.winglets.xml @@ -1,6 +1,6 @@ - + diff --git a/Models/Wings/a320.wings.cfm.xml b/Models/Wings/a320.wings.cfm.xml index 9f48ecd3..cad1d559 100644 --- a/Models/Wings/a320.wings.cfm.xml +++ b/Models/Wings/a320.wings.cfm.xml @@ -1,6 +1,6 @@ - + res/a320.wings.ac diff --git a/Models/Wings/a320.wings.iae.xml b/Models/Wings/a320.wings.iae.xml index 79e2d0a7..c8c0901f 100644 --- a/Models/Wings/a320.wings.iae.xml +++ b/Models/Wings/a320.wings.iae.xml @@ -1,6 +1,6 @@ - + res/a320.wings.ac diff --git a/Models/Wings/a320.wings.neocfm.xml b/Models/Wings/a320.wings.neocfm.xml index b5963121..63fa1fb5 100644 --- a/Models/Wings/a320.wings.neocfm.xml +++ b/Models/Wings/a320.wings.neocfm.xml @@ -1,6 +1,6 @@ - + res/a320.wings.ac diff --git a/Models/Wings/a320.wings.neopw.xml b/Models/Wings/a320.wings.neopw.xml index f4a6b8a7..03b02064 100644 --- a/Models/Wings/a320.wings.neopw.xml +++ b/Models/Wings/a320.wings.neopw.xml @@ -1,6 +1,6 @@ - + res/a320.wings.ac diff --git a/Models/Wings/a320neo.sharklets.xml b/Models/Wings/a320neo.sharklets.xml index 0e6e7156..c71f5e01 100644 --- a/Models/Wings/a320neo.sharklets.xml +++ b/Models/Wings/a320neo.sharklets.xml @@ -1,6 +1,6 @@ - + diff --git a/Nasal/ADIRS.nas b/Nasal/ADIRS.nas index 02f4ea80..4ede741a 100644 --- a/Nasal/ADIRS.nas +++ b/Nasal/ADIRS.nas @@ -1,7 +1,7 @@ # A3XX ADIRS System # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var knob = 0; var roll = 0; diff --git a/Nasal/ECAM-controller.nas b/Nasal/ECAM-controller.nas index a9f0c746..5ca010e8 100644 --- a/Nasal/ECAM-controller.nas +++ b/Nasal/ECAM-controller.nas @@ -1,7 +1,7 @@ # A3XX Electronic Centralised Aircraft Monitoring System # Jonathan Redpath (legoboyvdlp) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) # Colors: # 1 - Red, 2 - Amber, 3 - Cyan 4 - Green 5 - White diff --git a/Nasal/ECAM.nas b/Nasal/ECAM.nas index c665a982..8ab33b7c 100644 --- a/Nasal/ECAM.nas +++ b/Nasal/ECAM.nas @@ -1,7 +1,7 @@ # A3XX ECAM # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var stateL = 0; var stateR = 0; diff --git a/Nasal/FMGC-b.nas b/Nasal/FMGC-b.nas index a4a57b92..b537edee 100644 --- a/Nasal/FMGC-b.nas +++ b/Nasal/FMGC-b.nas @@ -1,7 +1,7 @@ # A3XX FMGC/Autoflight # Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) ################################# # IT-AUTOFLIGHT Based Autopilot # diff --git a/Nasal/FMGC-c.nas b/Nasal/FMGC-c.nas index fcf7257d..67e33d8c 100644 --- a/Nasal/FMGC-c.nas +++ b/Nasal/FMGC-c.nas @@ -1,7 +1,7 @@ # A3XX FMGC/Autoflight # Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) setprop("/FMGC/internal/cruise-ft", 10000); setprop("/it-autoflight/internal/alt", 10000); diff --git a/Nasal/FMGC.nas b/Nasal/FMGC.nas index b0bdcf51..6091cf5b 100644 --- a/Nasal/FMGC.nas +++ b/Nasal/FMGC.nas @@ -1,7 +1,7 @@ # A3XX FMGC/Autoflight # Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) ################## # Init Functions # diff --git a/Nasal/MCDU/DATA.nas b/Nasal/MCDU/DATA.nas index 474902c9..d261a0c4 100644 --- a/Nasal/MCDU/DATA.nas +++ b/Nasal/MCDU/DATA.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var dataInput = func(key, i) { if (key == "L1") { diff --git a/Nasal/MCDU/F-PLNA.nas b/Nasal/MCDU/F-PLNA.nas index 9cf4cabf..1bb66dda 100644 --- a/Nasal/MCDU/F-PLNA.nas +++ b/Nasal/MCDU/F-PLNA.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) setprop("/MCDUC/F-PLNA/left-1", "F-PLN PAGE IS NOT ENABLED"); setprop("/MCDUC/F-PLNA/left-2", "BECAUSE IT IS NOT READY"); diff --git a/Nasal/MCDU/INITA.nas b/Nasal/MCDU/INITA.nas index 23128434..712d311d 100644 --- a/Nasal/MCDU/INITA.nas +++ b/Nasal/MCDU/INITA.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var initInputA = func(key, i) { var scratchpad = getprop("/MCDU[" ~ i ~ "]/scratchpad"); diff --git a/Nasal/MCDU/INITB.nas b/Nasal/MCDU/INITB.nas index 24bc01a5..44d77af7 100644 --- a/Nasal/MCDU/INITB.nas +++ b/Nasal/MCDU/INITB.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var initInputB = func(key, i) { var scratchpad = getprop("/MCDU[" ~ i ~ "]/scratchpad"); diff --git a/Nasal/MCDU/MCDU.nas b/Nasal/MCDU/MCDU.nas index cfe13c96..ded8ce89 100644 --- a/Nasal/MCDU/MCDU.nas +++ b/Nasal/MCDU/MCDU.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var MCDU_init = func(i) { MCDU_reset(i); # Reset MCDU, clears data diff --git a/Nasal/MCDU/PERFCLB.nas b/Nasal/MCDU/PERFCLB.nas index 44b05f0c..de4b020a 100644 --- a/Nasal/MCDU/PERFCLB.nas +++ b/Nasal/MCDU/PERFCLB.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var perfCLBInput = func(key, i) { var scratchpad = getprop("/MCDU[" ~ i ~ "]/scratchpad"); diff --git a/Nasal/MCDU/PERFCRZ.nas b/Nasal/MCDU/PERFCRZ.nas index 9942740a..ac482e38 100644 --- a/Nasal/MCDU/PERFCRZ.nas +++ b/Nasal/MCDU/PERFCRZ.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var perfCRZInput = func(key, i) { if (key == "L6") { diff --git a/Nasal/MCDU/PERFDES.nas b/Nasal/MCDU/PERFDES.nas index ad573849..51d2466c 100644 --- a/Nasal/MCDU/PERFDES.nas +++ b/Nasal/MCDU/PERFDES.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var perfDESInput = func(key, i) { if (key == "L6") { diff --git a/Nasal/MCDU/PERFTO.nas b/Nasal/MCDU/PERFTO.nas index c98cbaf6..7756f3dc 100644 --- a/Nasal/MCDU/PERFTO.nas +++ b/Nasal/MCDU/PERFTO.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var perfTOInput = func(key, i) { var scratchpad = getprop("/MCDU[" ~ i ~ "]/scratchpad"); diff --git a/Nasal/MCDU/RADNAV.nas b/Nasal/MCDU/RADNAV.nas index ebfdefc1..22a22bae 100644 --- a/Nasal/MCDU/RADNAV.nas +++ b/Nasal/MCDU/RADNAV.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var radnavInput = func(key, i) { var scratchpad = getprop("/MCDU[" ~ i ~ "]/scratchpad"); diff --git a/Nasal/MCDU/STATUS.nas b/Nasal/MCDU/STATUS.nas index a6a722e3..389d5cbb 100644 --- a/Nasal/MCDU/STATUS.nas +++ b/Nasal/MCDU/STATUS.nas @@ -1,6 +1,6 @@ # A3XX mCDU by Joshua Davidson (it0uchpods) and Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var statusInput = func(key, i) { if (key == "L3") { diff --git a/Nasal/brakes.nas b/Nasal/brakes.nas index d4c5b4fb..bd82e55c 100644 --- a/Nasal/brakes.nas +++ b/Nasal/brakes.nas @@ -1,7 +1,7 @@ # A3XX Autobrake # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var thr1 = 0; var thr2 = 0; diff --git a/Nasal/buttons.nas b/Nasal/buttons.nas index ac03a451..ec36e35d 100644 --- a/Nasal/buttons.nas +++ b/Nasal/buttons.nas @@ -1,7 +1,7 @@ # A3XX Buttons # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) # Resets buttons to the default values var variousReset = func { diff --git a/Nasal/efis.nas b/Nasal/efis.nas index 745c888a..796c6036 100644 --- a/Nasal/efis.nas +++ b/Nasal/efis.nas @@ -1,6 +1,6 @@ # A3XX EFIS controller by Joshua Davidson (it0uchpods). -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) setlistener("sim/signals/fdm-initialized", func { setprop("/instrumentation/efis[0]/nd/display-mode", "NAV"); diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas index 06c0aa4e..0352dd5d 100644 --- a/Nasal/electrical.nas +++ b/Nasal/electrical.nas @@ -1,7 +1,7 @@ # A3XX Electrical System # Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var ac_volt_std = 115; var ac_volt_min = 110; diff --git a/Nasal/engines-cfm.nas b/Nasal/engines-cfm.nas index 07755dd2..b025beea 100644 --- a/Nasal/engines-cfm.nas +++ b/Nasal/engines-cfm.nas @@ -1,7 +1,7 @@ # A3XX IAE V2500 Engine # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) ##################### # Initializing Vars # diff --git a/Nasal/engines-common.nas b/Nasal/engines-common.nas index 2353ebaa..d6af729f 100644 --- a/Nasal/engines-common.nas +++ b/Nasal/engines-common.nas @@ -1,7 +1,7 @@ # A3XX Engine Control # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) if (getprop("/options/eng") == "IAE") { io.include("engines-iae.nas"); diff --git a/Nasal/engines-iae.nas b/Nasal/engines-iae.nas index f4a28438..eeecd296 100644 --- a/Nasal/engines-iae.nas +++ b/Nasal/engines-iae.nas @@ -1,7 +1,7 @@ # A3XX IAE V2500 Engine # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) ##################### # Initializing Vars # diff --git a/Nasal/fadec-cfm.nas b/Nasal/fadec-cfm.nas index b0b449cc..43c4bb7b 100644 --- a/Nasal/fadec-cfm.nas +++ b/Nasal/fadec-cfm.nas @@ -1,6 +1,6 @@ # A3XX CFM FADEC by Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) setprop("/systems/fadec/n1mode1", 0); # Doesn't do anything, just here for other logic # setprop("/systems/fadec/n1mode2", 0); # Doesn't do anything, just here for other logic # diff --git a/Nasal/fadec-common.nas b/Nasal/fadec-common.nas index b07621c1..20cfdd4a 100644 --- a/Nasal/fadec-common.nas +++ b/Nasal/fadec-common.nas @@ -1,7 +1,7 @@ # A3XX FADEC/Throttle Control System # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) if (getprop("/options/eng") == "IAE") { io.include("fadec-iae.nas"); diff --git a/Nasal/fadec-iae.nas b/Nasal/fadec-iae.nas index 4008c8d8..b2f5b1d2 100644 --- a/Nasal/fadec-iae.nas +++ b/Nasal/fadec-iae.nas @@ -1,6 +1,6 @@ # A3XX IAE FADEC by Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) setprop("/controls/fadec/n1mode1", 0); setprop("/controls/fadec/n1mode2", 0); diff --git a/Nasal/fire.nas b/Nasal/fire.nas index 626e6ed9..324cbf90 100644 --- a/Nasal/fire.nas +++ b/Nasal/fire.nas @@ -1,7 +1,7 @@ # A3XX Fire System # Jonathan Redpath -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) ############# # Init Vars # diff --git a/Nasal/fuel.nas b/Nasal/fuel.nas index 3d0312dc..ac001c23 100644 --- a/Nasal/fuel.nas +++ b/Nasal/fuel.nas @@ -1,7 +1,7 @@ # A3XX Fuel System # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var xfeed_sw = getprop("/controls/fuel/x-feed"); var tank0pump1_sw = 0; diff --git a/Nasal/hydraulics.nas b/Nasal/hydraulics.nas index e122416a..3a508aa1 100644 --- a/Nasal/hydraulics.nas +++ b/Nasal/hydraulics.nas @@ -1,7 +1,7 @@ # A3XX Hydraulic System # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var eng1_pump_sw = 0; var eng2_pump_sw = 0; diff --git a/Nasal/icing.nas b/Nasal/icing.nas index 7bc76068..9c47cb2d 100644 --- a/Nasal/icing.nas +++ b/Nasal/icing.nas @@ -1,7 +1,7 @@ # A3XX Icing System # Jonathan Redpath (legoboyvdlp) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var dewpoint = 0; var temperature = 0; diff --git a/Nasal/it-fbw.nas b/Nasal/it-fbw.nas index 3040c453..13294d4d 100644 --- a/Nasal/it-fbw.nas +++ b/Nasal/it-fbw.nas @@ -1,7 +1,7 @@ # Airbus A3XX FBW/Flight Control Computer System # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) # If All ELACs Fail, Alternate Law diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index 29266255..b693745a 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -1,7 +1,7 @@ # A320 Main Libraries # Joshua Davidson (it0uchpods) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) print("-----------------------------------------------------------------------------"); print("Copyright (c) 2017-2018 Joshua Davidson (it0uchpods)"); diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas index f7285ed2..4def42a8 100644 --- a/Nasal/pneumatics.nas +++ b/Nasal/pneumatics.nas @@ -1,7 +1,7 @@ # A3XX Pneumatic System # Joshua Davidson (it0uchpods) and Jonathan Redpath (legoboyvdlp) -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var altitude = 0; var bleed1_sw = 0; diff --git a/Nasal/shake.nas b/Nasal/shake.nas index 2fcf17b1..d5fa8e56 100644 --- a/Nasal/shake.nas +++ b/Nasal/shake.nas @@ -1,6 +1,6 @@ # A3XX Shaking -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) var shakeEffectA3XX = props.globals.initNode("/systems/shake/effect", 0, "BOOL"); var shakeA3XX = props.globals.initNode("/systems/shake/shaking", 0, "DOUBLE"); diff --git a/Nasal/walk.nas b/Nasal/walk.nas index 1e66f74d..996a811e 100644 --- a/Nasal/walk.nas +++ b/Nasal/walk.nas @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) # view nodes and offsets -------------------------------------------- var zNoseNode = props.globals.getNode("sim/view/config/y-offset-m", 1); diff --git a/Nasal/zoom-views.nas b/Nasal/zoom-views.nas index 415981c7..2e880069 100644 --- a/Nasal/zoom-views.nas +++ b/Nasal/zoom-views.nas @@ -1,5 +1,5 @@ # IDG Distance Zooming -# Copyright (c) 2018 Joshua Davidson (it0uchpods) +# Copyright (c) 2019 Joshua Davidson (it0uchpods) # Based on PropertyRule file by onox var distance = 0; diff --git a/Sounds/A320-common-sound.xml b/Sounds/A320-common-sound.xml index c7e0c571..d6c41416 100644 --- a/Sounds/A320-common-sound.xml +++ b/Sounds/A320-common-sound.xml @@ -1,4 +1,4 @@ - + diff --git a/Sounds/cfm56-sound.xml b/Sounds/cfm56-sound.xml index 40e5db86..5c632f89 100644 --- a/Sounds/cfm56-sound.xml +++ b/Sounds/cfm56-sound.xml @@ -1,4 +1,4 @@ - + diff --git a/Sounds/leapx-sound.xml b/Sounds/leapx-sound.xml index 7e845f2d..0fa01af9 100644 --- a/Sounds/leapx-sound.xml +++ b/Sounds/leapx-sound.xml @@ -1,4 +1,4 @@ - + diff --git a/Sounds/v2500-sound.xml b/Sounds/v2500-sound.xml index 41d60606..7ef403b5 100644 --- a/Sounds/v2500-sound.xml +++ b/Sounds/v2500-sound.xml @@ -1,4 +1,4 @@ - + diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml index 9cb2815c..573a8e6e 100644 --- a/Systems/a320-aerodynamics.xml +++ b/Systems/a320-aerodynamics.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/a320-external-reactions.xml b/Systems/a320-external-reactions.xml index 7d84b950..d0a55a2f 100644 --- a/Systems/a320-external-reactions.xml +++ b/Systems/a320-external-reactions.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index efd1bf0c..63decf65 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/a320-ground-reactions.xml b/Systems/a320-ground-reactions.xml index 9d68a637..eb8848f0 100644 --- a/Systems/a320-ground-reactions.xml +++ b/Systems/a320-ground-reactions.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/a320-mass-balance.xml b/Systems/a320-mass-balance.xml index 789aea70..e4178798 100644 --- a/Systems/a320-mass-balance.xml +++ b/Systems/a320-mass-balance.xml @@ -1,7 +1,7 @@ - + 611903 diff --git a/Systems/a320-metrics.xml b/Systems/a320-metrics.xml index aacc4bf5..e9470f20 100644 --- a/Systems/a320-metrics.xml +++ b/Systems/a320-metrics.xml @@ -1,7 +1,7 @@ - + 1319.79 diff --git a/Systems/a320-spoiler.xml b/Systems/a320-spoiler.xml index 3a5b1a3c..cee68275 100644 --- a/Systems/a320-spoiler.xml +++ b/Systems/a320-spoiler.xml @@ -1,7 +1,7 @@ - + diff --git a/Systems/cfm56-sound.xml b/Systems/cfm56-sound.xml index 989c7e18..b0f8000b 100644 --- a/Systems/cfm56-sound.xml +++ b/Systems/cfm56-sound.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml index 98c9cd8a..9e7d7617 100644 --- a/Systems/fadec-cfm.xml +++ b/Systems/fadec-cfm.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml index 16f3b6ad..ba61c3cc 100644 --- a/Systems/fadec-iae.xml +++ b/Systems/fadec-iae.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/fbw-pitch.xml b/Systems/fbw-pitch.xml index c421ee58..a5a00d21 100644 --- a/Systems/fbw-pitch.xml +++ b/Systems/fbw-pitch.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/flight-recorder.xml b/Systems/flight-recorder.xml index 81b2fe9b..df05fe8f 100644 --- a/Systems/flight-recorder.xml +++ b/Systems/flight-recorder.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/fmgc-drivers.xml b/Systems/fmgc-drivers.xml index 15659433..7b10669e 100644 --- a/Systems/fmgc-drivers.xml +++ b/Systems/fmgc-drivers.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml index 5b4e50c3..28cd2678 100644 --- a/Systems/fmgc-pitch.xml +++ b/Systems/fmgc-pitch.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml index e9b2d488..3e94e558 100644 --- a/Systems/fmgc-roll-yaw.xml +++ b/Systems/fmgc-roll-yaw.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/fmgc-thrust.xml b/Systems/fmgc-thrust.xml index 6dcf401c..7048ec5e 100644 --- a/Systems/fmgc-thrust.xml +++ b/Systems/fmgc-thrust.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/fuel.xml b/Systems/fuel.xml index c683e741..c091eddc 100644 --- a/Systems/fuel.xml +++ b/Systems/fuel.xml @@ -3,7 +3,7 @@ - + diff --git a/Systems/glass-effect1.xml b/Systems/glass-effect1.xml index daaf9fff..130309c0 100644 --- a/Systems/glass-effect1.xml +++ b/Systems/glass-effect1.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/glass-effect2.xml b/Systems/glass-effect2.xml index 00dfe35e..6436f74c 100644 --- a/Systems/glass-effect2.xml +++ b/Systems/glass-effect2.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/instrumentation.xml b/Systems/instrumentation.xml index 754cd537..c51c857b 100644 --- a/Systems/instrumentation.xml +++ b/Systems/instrumentation.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/libraries.xml b/Systems/libraries.xml index fd3fdfad..9cfa1f88 100644 --- a/Systems/libraries.xml +++ b/Systems/libraries.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/lower-ecam.xml b/Systems/lower-ecam.xml index 3d757a9e..14671188 100644 --- a/Systems/lower-ecam.xml +++ b/Systems/lower-ecam.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/pfd.xml b/Systems/pfd.xml index dbaa2707..6d57329d 100644 --- a/Systems/pfd.xml +++ b/Systems/pfd.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/upper-ecam.xml b/Systems/upper-ecam.xml index c883d595..f62d8f45 100644 --- a/Systems/upper-ecam.xml +++ b/Systems/upper-ecam.xml @@ -1,6 +1,6 @@ - + diff --git a/Systems/v2500-sound.xml b/Systems/v2500-sound.xml index 995cda84..c9277a44 100644 --- a/Systems/v2500-sound.xml +++ b/Systems/v2500-sound.xml @@ -1,6 +1,6 @@ - + diff --git a/gui/dialogs/a3xx-autoflight-dlg.xml b/gui/dialogs/a3xx-autoflight-dlg.xml index 9708d567..32a14d0b 100644 --- a/gui/dialogs/a3xx-autoflight-dlg.xml +++ b/gui/dialogs/a3xx-autoflight-dlg.xml @@ -1,6 +1,6 @@ - + diff --git a/gui/dialogs/mcdu1-dlg.xml b/gui/dialogs/mcdu1-dlg.xml index 2afaf0e5..544d29dc 100644 --- a/gui/dialogs/mcdu1-dlg.xml +++ b/gui/dialogs/mcdu1-dlg.xml @@ -1,6 +1,6 @@ - + diff --git a/gui/dialogs/mcdu2-dlg.xml b/gui/dialogs/mcdu2-dlg.xml index 2bc1d0d6..cdd0b2e3 100644 --- a/gui/dialogs/mcdu2-dlg.xml +++ b/gui/dialogs/mcdu2-dlg.xml @@ -1,6 +1,6 @@ - + diff --git a/gui/it-gui.xml b/gui/it-gui.xml index 93e59607..3b15fd29 100644 --- a/gui/it-gui.xml +++ b/gui/it-gui.xml @@ -2,7 +2,7 @@ - + From 815f8bb8fa2db7e59f4d82fe6b31f9ec8849d1a9 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Tue, 1 Jan 2019 01:07:19 -0500 Subject: [PATCH 12/16] Sim: 2019 --- Nasal/libraries.nas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index b693745a..cf748ebf 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -4,7 +4,7 @@ # Copyright (c) 2019 Joshua Davidson (it0uchpods) print("-----------------------------------------------------------------------------"); -print("Copyright (c) 2017-2018 Joshua Davidson (it0uchpods)"); +print("Copyright (c) 2016-2019 Joshua Davidson (it0uchpods)"); print("-----------------------------------------------------------------------------"); setprop("/sim/replay/was-active", 0); From bf88b873060daa1480a5935aae59f13602019715 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Fri, 4 Jan 2019 18:37:56 -0500 Subject: [PATCH 13/16] DU: Fix stupid behavior of altitude when negative, Sim: Fix hackCanvas bug --- Models/Instruments/PFD/PFD.nas | 8 +++++++- Nasal/libraries.nas | 2 +- Systems/libraries.xml | 18 +++++++++--------- revision.txt | 2 +- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Models/Instruments/PFD/PFD.nas b/Models/Instruments/PFD/PFD.nas index aa26b172..424c3323 100644 --- a/Models/Instruments/PFD/PFD.nas +++ b/Models/Instruments/PFD/PFD.nas @@ -19,6 +19,7 @@ var ASItrgtdiff = 0; var ASImax = 0; var ASItrend = 0; var altTens = 0; +var altPolarity = ""; # Fetch nodes: var state1 = props.globals.getNode("/systems/thrust/state1", 1); @@ -807,7 +808,12 @@ var canvas_PFD_base = { me["ALT_two"].setText(sprintf("%03d", abs(me.middleAltText-5))); me["ALT_one"].setText(sprintf("%03d", abs(me.middleAltText-10))); - me["ALT_digits"].setText(sprintf("%s", altitude_pfd.getValue())); + if (altitude.getValue() < 0) { + altPolarity = "-"; + } else { + altPolarity = ""; + } + me["ALT_digits"].setText(sprintf("%s%d", altPolarity, altitude_pfd.getValue())); altTens = num(right(sprintf("%02d", altitude.getValue()), 2)); me["ALT_tens"].setTranslation(0, altTens * 1.392); diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas index cf748ebf..67d5ec48 100644 --- a/Nasal/libraries.nas +++ b/Nasal/libraries.nas @@ -276,7 +276,7 @@ setlistener("/options/steep-ils", func { canvas.Text._lastText = canvas.Text["_lastText"]; canvas.Text.setText = func(text) { - if (text == me._lastText) {return me;} + if (text == me._lastText and text != nil and size(text) == size(me._lastText)) {return me;} me._lastText = text; me.set("text", typeof(text) == 'scalar' ? text : ""); }; diff --git a/Systems/libraries.xml b/Systems/libraries.xml index 9cfa1f88..5d635c95 100644 --- a/Systems/libraries.xml +++ b/Systems/libraries.xml @@ -90,7 +90,7 @@ - /engines/engine[0]/n2-actual + /engines/engine[0]/n2-actual11 25848
@@ -107,7 +107,7 @@ - /engines/engine[1]/n2-actual + /engines/engine[1]/n2-actual11 25848
@@ -125,7 +125,7 @@
- /instrumentation/altimeter/indicated-altitude-ft + /instrumentation/altimeter/indicated-altitude-ft 100
@@ -143,7 +143,7 @@
- /it-autoflight/internal/vert-speed-fpm + /it-autoflight/internal/vert-speed-fpm 100
@@ -372,7 +372,7 @@ Outflow Valve noise-spike - /systems/pressurization/outflowpos + /systems/pressurization/outflowpos /systems/pressurization/outflowpos-norm 1 @@ -408,7 +408,7 @@ Cabin VS noise-spike - /systems/pressurization/vs + /systems/pressurization/vs /systems/pressurization/vs-norm 500 @@ -442,7 +442,7 @@ - /it-autoflight/internal/vert-speed-fpm + /it-autoflight/internal/vert-speed-fpm-50000 -750 -2000 -750 -1000 -250 @@ -468,7 +468,7 @@
- /systems/pressurization/outflowpos-man + /systems/pressurization/outflowpos-man0.0-10000.5 01.0 2500 @@ -555,7 +555,7 @@
- fdm/jsbsim/inertia/weight-kg + fdm/jsbsim/inertia/weight-kg160000405001650004000017000039500 diff --git a/revision.txt b/revision.txt index 3084ff19..175c1b51 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4724 \ No newline at end of file +4725 \ No newline at end of file From 31931e93e014bcd872e64a7d9f82b77b586602a1 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Fri, 4 Jan 2019 21:36:06 -0500 Subject: [PATCH 14/16] System: Fix broken Bleed EXT fail --- AircraftConfig/fail.xml | 6 +++--- Nasal/pneumatics.nas | 13 ++++++------- revision.txt | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/AircraftConfig/fail.xml b/AircraftConfig/fail.xml index 96cbb469..9550ada6 100644 --- a/AircraftConfig/fail.xml +++ b/AircraftConfig/fail.xml @@ -199,9 +199,9 @@ - + - + vbox @@ -376,7 +376,7 @@ - + vbox diff --git a/Nasal/pneumatics.nas b/Nasal/pneumatics.nas index 4def42a8..8ce2f892 100644 --- a/Nasal/pneumatics.nas +++ b/Nasal/pneumatics.nas @@ -203,6 +203,12 @@ var PNEU = { setprop("/systems/pneumatic/bleedapu", 0); } + if (groundair_supp and !bleedext_fail) { + setprop("/systems/pneumatic/groundair", 39); + } else { + setprop("/systems/pneumatic/groundair", 0); + } + ground = getprop("/systems/pneumatic/groundair"); bleedapu = getprop("/systems/pneumatic/bleedapu"); @@ -295,12 +301,6 @@ var PNEU = { setprop("/systems/pneumatic/total-psi", total_psi_calc); } - if (groundair_supp) { - setprop("/systems/pneumatic/groundair", 39); - } else { - setprop("/systems/pneumatic/groundair", 0); - } - if (engantiice1 and bleed1 > 20) { # shut down anti-ice if bleed is lost else turn it on setprop("/controls/deice/lengine", 0); setprop("/controls/deice/eng1-on", 0); @@ -320,7 +320,6 @@ var PNEU = { } total_psi = getprop("/systems/pneumatic/total-psi"); - phase = getprop("/FMGC/status/phase"); pressmode = getprop("/systems/pressurization/mode"); state1 = getprop("/systems/thrust/state1"); diff --git a/revision.txt b/revision.txt index 175c1b51..e34c801c 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4725 \ No newline at end of file +4726 \ No newline at end of file From 11c5f81f1fc727a59541e9bb946fca5305c86adb Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Fri, 4 Jan 2019 23:37:07 -0500 Subject: [PATCH 15/16] Sim: ACCONFIG bugfix --- AircraftConfig/acconfig.nas | 3 +++ revision.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index 5169daba..b2f18448 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -232,6 +232,7 @@ var writeSettings = func { var colddark = func { if (getprop("/systems/acconfig/mismatch-code") == "0x000") { spinning.start(); + ps_loaded_dlg.close(); ps_load_dlg.open(); setprop("/systems/acconfig/autoconfig-running", 1); setprop("/controls/gear/brake-left", 1); @@ -280,6 +281,7 @@ var colddark_b = func { var beforestart = func { if (getprop("/systems/acconfig/mismatch-code") == "0x000") { spinning.start(); + ps_loaded_dlg.close(); ps_load_dlg.open(); setprop("/systems/acconfig/autoconfig-running", 1); setprop("/controls/gear/brake-left", 1); @@ -357,6 +359,7 @@ var beforestart_b = func { var taxi = func { if (getprop("/systems/acconfig/mismatch-code") == "0x000") { spinning.start(); + ps_loaded_dlg.close(); ps_load_dlg.open(); setprop("/systems/acconfig/autoconfig-running", 1); setprop("/controls/gear/brake-left", 1); diff --git a/revision.txt b/revision.txt index e34c801c..295e96b2 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4726 \ No newline at end of file +4727 \ No newline at end of file From 0ded7d04c1818505f6c06b512d7242c34d8fa46c Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 5 Jan 2019 13:20:49 -0500 Subject: [PATCH 16/16] Engine: Fuel consumption fixed --- Engines/cfm56_5a1_1.xml | 2 +- Engines/cfm56_5a1_2.xml | 2 +- Engines/cfm56_5b4_1.xml | 2 +- Engines/cfm56_5b4_2.xml | 2 +- Engines/leap1a26_1.xml | 2 +- Engines/leap1a26_2.xml | 2 +- Engines/pw1127g_1.xml | 2 +- Engines/pw1127g_2.xml | 2 +- Engines/v2527_a5_1.xml | 2 +- Engines/v2527_a5_2.xml | 2 +- revision.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Engines/cfm56_5a1_1.xml b/Engines/cfm56_5a1_1.xml index 67147044..4bf2fbe7 100644 --- a/Engines/cfm56_5a1_1.xml +++ b/Engines/cfm56_5a1_1.xml @@ -5,7 +5,7 @@ 25000 - 0.5 + 0.41 0.03 19.7 61.2 diff --git a/Engines/cfm56_5a1_2.xml b/Engines/cfm56_5a1_2.xml index 122236e0..beff2f2f 100644 --- a/Engines/cfm56_5a1_2.xml +++ b/Engines/cfm56_5a1_2.xml @@ -5,7 +5,7 @@ 25000 - 0.5 + 0.41 0.03 19.7 61.2 diff --git a/Engines/cfm56_5b4_1.xml b/Engines/cfm56_5b4_1.xml index e6c4ec41..c831a9e5 100644 --- a/Engines/cfm56_5b4_1.xml +++ b/Engines/cfm56_5b4_1.xml @@ -5,7 +5,7 @@ 27000 - 0.5 + 0.41 0.03 19.7 61.2 diff --git a/Engines/cfm56_5b4_2.xml b/Engines/cfm56_5b4_2.xml index 81acffd7..618842af 100644 --- a/Engines/cfm56_5b4_2.xml +++ b/Engines/cfm56_5b4_2.xml @@ -5,7 +5,7 @@ 27000 - 0.5 + 0.41 0.03 19.7 61.2 diff --git a/Engines/leap1a26_1.xml b/Engines/leap1a26_1.xml index 534e076e..2433ccac 100644 --- a/Engines/leap1a26_1.xml +++ b/Engines/leap1a26_1.xml @@ -5,7 +5,7 @@ 27000 - 0.5 + 0.41 0.03 19.7 61.2 diff --git a/Engines/leap1a26_2.xml b/Engines/leap1a26_2.xml index f2930ec3..52165b3f 100644 --- a/Engines/leap1a26_2.xml +++ b/Engines/leap1a26_2.xml @@ -5,7 +5,7 @@ 27000 - 0.5 + 0.41 0.03 19.7 61.2 diff --git a/Engines/pw1127g_1.xml b/Engines/pw1127g_1.xml index 8d13b1c6..56e09cab 100644 --- a/Engines/pw1127g_1.xml +++ b/Engines/pw1127g_1.xml @@ -5,7 +5,7 @@ 26345 - 0.5 + 0.41 0.03 19.7 61.2 diff --git a/Engines/pw1127g_2.xml b/Engines/pw1127g_2.xml index 3a487ef4..43049c01 100644 --- a/Engines/pw1127g_2.xml +++ b/Engines/pw1127g_2.xml @@ -5,7 +5,7 @@ 26345 - 0.5 + 0.41 0.03 19.7 61.2 diff --git a/Engines/v2527_a5_1.xml b/Engines/v2527_a5_1.xml index aaaf9ada..b3ac4d6b 100644 --- a/Engines/v2527_a5_1.xml +++ b/Engines/v2527_a5_1.xml @@ -5,7 +5,7 @@ 26600 - 0.5 + 0.41 0.03 22.4 60.9 diff --git a/Engines/v2527_a5_2.xml b/Engines/v2527_a5_2.xml index 2494b0d5..f7b1c318 100644 --- a/Engines/v2527_a5_2.xml +++ b/Engines/v2527_a5_2.xml @@ -5,7 +5,7 @@ 26600 - 0.5 + 0.41 0.03 22.4 60.9 diff --git a/revision.txt b/revision.txt index 295e96b2..aeb1e712 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4727 \ No newline at end of file +4728 \ No newline at end of file