diff --git a/A320-100-CFM.xml b/A320-100-CFM.xml index c2d553c8..25469134 100644 --- a/A320-100-CFM.xml +++ b/A320-100-CFM.xml @@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 14.3962788 -5.755 @@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 14.3962788 5.755 @@ -449,16 +449,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - - - - + + + + - + diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml index 03ce5e2f..684c57f4 100644 --- a/A320-200-CFM.xml +++ b/A320-200-CFM.xml @@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 14.3962788 -5.755 @@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 14.3962788 5.755 @@ -449,16 +449,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - - - - + + + + - + diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml index af135232..111fc55b 100644 --- a/A320-200-IAE.xml +++ b/A320-200-IAE.xml @@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 14.3962788 -5.755 @@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 14.3962788 5.755 @@ -449,16 +449,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - - - - + + + + - + diff --git a/A320-main.xml b/A320-main.xml index d6db5130..cb5fd8de 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -112,43 +112,39 @@ + Aircraft/IDG-A32X/Systems/hydraulics.xml - Aircraft/IDG-A32X/Systems/fbw-drivers.xml - - - Aircraft/IDG-A32X/Systems/fbw-roll-yaw.xml - - Aircraft/IDG-A32X/Systems/fbw-pitch.xml - + Aircraft/IDG-A32X/Systems/fmgc-drivers.xml - + Aircraft/IDG-A32X/Systems/fmgc-roll-yaw.xml - + Aircraft/IDG-A32X/Systems/fmgc-pitch.xml - + Aircraft/IDG-A32X/Systems/fmgc-thrust.xml - + Aircraft/IDG-A32X/Systems/libraries.xml - + Aircraft/IDG-A32X/Systems/upper-ecam.xml - + Aircraft/IDG-A32X/Systems/lower-ecam.xml - + + Aircraft/IDG-A32X/Systems/pfd.xml - + Aircraft/IDG-A32X/Systems/zoom-views.xml @@ -359,6 +355,8 @@ 30.0 300.0 + + 2018.1.0 @@ -415,6 +413,8 @@ 0 0 + 0 + 0 0 @@ -429,6 +429,12 @@ 0 0 + 33 + 0 + + 0 + 0 + @@ -484,7 +490,7 @@ false false - 0 + 0 0 @@ -537,13 +543,11 @@ 0.5 -0.5 0 - 0 0.1 0.1 0.0 0 0 - 0 0.0 0.0 0.0 @@ -631,7 +635,6 @@ 0 0 - 0 @@ -729,7 +732,8 @@ - 0 + 0 + 0 0 0 @@ -995,8 +999,20 @@ + + CTRL-d + Autothrottle Disconnect + + nasal + + + - Ctrl-X + Ctrl-x Reset zoom to default nasal @@ -1224,6 +1240,21 @@ + + D + Autopilot Disconnect + + nasal + + + X Increase field of view diff --git a/A320neo-CFM.xml b/A320neo-CFM.xml index 3a0cbc76..06583b4d 100644 --- a/A320neo-CFM.xml +++ b/A320neo-CFM.xml @@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 14.3962788 -5.755 @@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 14.3962788 5.755 @@ -449,16 +449,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - - - - + + + + - + diff --git a/A320neo-PW.xml b/A320neo-PW.xml index d06dfd1a..cb7fcf25 100644 --- a/A320neo-PW.xml +++ b/A320neo-PW.xml @@ -334,7 +334,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 14.3962788 -5.755 @@ -360,7 +360,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - + 14.3962788 5.755 @@ -449,16 +449,14 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd"> - - - - - - + + + + - + diff --git a/AircraftConfig/about.xml b/AircraftConfig/about.xml index 6b8d249c..676e9acd 100644 --- a/AircraftConfig/about.xml +++ b/AircraftConfig/about.xml @@ -12,7 +12,6 @@ aircraft-config-about vbox - 800 hbox @@ -66,7 +65,7 @@ left - + diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index 76f32e84..85c34687 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -81,10 +81,20 @@ failReset(); setprop("/systems/acconfig/autoconfig-running", 0); setprop("/systems/acconfig/spinning", 0); setprop("/systems/acconfig/spin", "-"); -setprop("/systems/acconfig/new-revision", ""); +setprop("/systems/acconfig/options/revision", 0); +setprop("/systems/acconfig/new-revision", 0); setprop("/systems/acconfig/out-of-date", 0); setprop("/systems/acconfig/mismatch-code", "0x000"); setprop("/systems/acconfig/mismatch-reason", "XX"); +setprop("/systems/acconfig/options/keyboard-mode", 0); +setprop("/systems/acconfig/options/laptop-mode", 0); +setprop("/systems/acconfig/options/adirs-skip", 0); +setprop("/systems/acconfig/options/welcome-skip", 0); +setprop("/systems/acconfig/options/pfd-rate", 1); +setprop("/systems/acconfig/options/nd-rate", 1); +setprop("/systems/acconfig/options/uecam-rate", 1); +setprop("/systems/acconfig/options/lecam-rate", 1); +setprop("/systems/acconfig/options/iesi-rate", 1); var main_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/main/dialog", "Aircraft/IDG-A32X/AircraftConfig/main.xml"); var welcome_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/welcome/dialog", "Aircraft/IDG-A32X/AircraftConfig/welcome.xml"); var ps_load_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/psload/dialog", "Aircraft/IDG-A32X/AircraftConfig/psload.xml"); @@ -95,14 +105,17 @@ var fbw_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fbw/dialog", "Aircraft/ID var fail_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/fail/dialog", "Aircraft/IDG-A32X/AircraftConfig/fail.xml"); var about_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/about/dialog", "Aircraft/IDG-A32X/AircraftConfig/about.xml"); var update_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/update/dialog", "Aircraft/IDG-A32X/AircraftConfig/update.xml"); +var updated_dlg = gui.Dialog.new("sim/gui/dialogs/acconfig/updated/dialog", "Aircraft/IDG-A32X/AircraftConfig/updated.xml"); 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"); spinning.start(); init_dlg.open(); http.load("https://raw.githubusercontent.com/it0uchpods/IDG-A32X/master/revision.txt").done(func(r) setprop("/systems/acconfig/new-revision", r.response)); var revisionFile = (getprop("/sim/aircraft-dir")~"/revision.txt"); var current_revision = io.readfile(revisionFile); +setprop("/systems/acconfig/revision", current_revision); setlistener("/systems/acconfig/new-revision", func { if (getprop("/systems/acconfig/new-revision") > current_revision) { @@ -113,20 +126,22 @@ setlistener("/systems/acconfig/new-revision", func { }); var mismatch_chk = func { - if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201730) { + if (num(string.replace(getprop("/sim/version/flightgear"),".","")) < 201810) { setprop("/systems/acconfig/mismatch-code", "0x121"); - setprop("/systems/acconfig/mismatch-reason", "FGFS version older than 2017.3.0, please update FlightGear."); + setprop("/systems/acconfig/mismatch-reason", "FGFS version is too old! Please update FlightGear to at least 2018.1.0."); if (getprop("/systems/acconfig/out-of-date") != 1) { error_mismatch.open(); } print("Mismatch: 0x121"); + welcome_dlg.close(); } else if (getprop("/gear/gear[0]/wow") == 0 or getprop("/position/altitude-ft") >= 15000) { setprop("/systems/acconfig/mismatch-code", "0x223"); - setprop("/systems/acconfig/mismatch-reason", "The aircraft position is invalid for initialization. Check your scenery."); + setprop("/systems/acconfig/mismatch-reason", "Preposterous configuration detected for initialization. Check your position or scenery."); if (getprop("/systems/acconfig/out-of-date") != 1) { error_mismatch.open(); } print("Mismatch: 0x223"); + welcome_dlg.close(); } else if (getprop("/systems/acconfig/libraries-loaded") != 1) { setprop("/systems/acconfig/mismatch-code", "0x247"); setprop("/systems/acconfig/mismatch-reason", "System files are missing or damaged. Please download a new copy of the aircraft."); @@ -134,6 +149,7 @@ var mismatch_chk = func { error_mismatch.open(); } print("Mismatch: 0x247"); + welcome_dlg.close(); } } @@ -144,18 +160,30 @@ setlistener("/sim/signals/fdm-initialized", func { print("System: The IDG-A32X is out of date!"); } mismatch_chk(); - if (getprop("/systems/acconfig/out-of-date") != 1 and getprop("/systems/acconfig/mismatch-code") == "0x000") { + readSettings(); + if (getprop("/systems/acconfig/options/revision") < current_revision) { + updated_dlg.open(); + } else if (getprop("/systems/acconfig/out-of-date") != 1 and getprop("/systems/acconfig/mismatch-code") == "0x000" and getprop("/systems/acconfig/options/welcome-skip") != 1) { welcome_dlg.open(); } + setprop("/systems/acconfig/options/revision", current_revision); + writeSettings(); spinning.stop(); }); -var saveSettings = func { - aircraft.data.add("/options/system/keyboard-mode", "/controls/adirs/skip", "/controls/tray/surprise"); - aircraft.data.save(); +var readSettings = func { + io.read_properties(getprop("/sim/fg-home") ~ "/Export/IDG-A32X-config.xml", "/systems/acconfig/options"); + setprop("/options/system/keyboard-mode", getprop("/systems/acconfig/options/keyboard-mode")); + setprop("/options/system/laptop-mode", getprop("/systems/acconfig/options/laptop-mode")); + setprop("/controls/adirs/skip", getprop("/systems/acconfig/options/adirs-skip")); } -saveSettings(); +var writeSettings = func { + setprop("/systems/acconfig/options/keyboard-mode", getprop("/options/system/keyboard-mode")); + setprop("/systems/acconfig/options/laptop-mode", getprop("/options/system/laptop-mode")); + setprop("/systems/acconfig/options/adirs-skip", getprop("/controls/adirs/skip")); + io.write_properties(getprop("/sim/fg-home") ~ "/Export/IDG-A32X-config.xml", "/systems/acconfig/options"); +} ################ # Panel States # @@ -316,14 +344,14 @@ var taxi = func { setprop("/controls/APU/master", 1); setprop("/controls/APU/start", 1); var apu_rpm_chk = setlistener("/systems/apu/rpm", func { - if (getprop("/systems/apu/rpm") >= 99) { + if (getprop("/systems/apu/rpm") >= 98) { removelistener(apu_rpm_chk); taxi_b(); } }); } var taxi_b = func { - # Continue with engine start prep, and start engine 2. + # Continue with engine start prep, and start engines. setprop("/controls/fuel/tank0pump1", 1); setprop("/controls/fuel/tank0pump2", 1); setprop("/controls/fuel/tank1pump1", 1); diff --git a/AircraftConfig/du-quality.xml b/AircraftConfig/du-quality.xml new file mode 100644 index 00000000..8b60725d --- /dev/null +++ b/AircraftConfig/du-quality.xml @@ -0,0 +1,259 @@ + + + + + + + + + aircraft-config-du-quality + vbox + + + hbox + + left + + + + + + + + + vbox + + + left + + + + + table + + + 0 + 0 + left + + + + + 0 + 1 + 250 + /systems/acconfig/options/pfd-rate + 1 + 5 + 0.5 + true + + dialog-apply + + + + + 0 + 2 + left + 1 + + /systems/acconfig/options/pfd-rate + 1 + + + + 1 + 0 + left + + + + + 1 + 1 + 250 + /systems/acconfig/options/nd-rate + 1 + 5 + 0.5 + true + + dialog-apply + + + + + 1 + 2 + left + 1 + + /systems/acconfig/options/nd-rate + 1 + + + + 2 + 0 + left + + + + + 2 + 1 + 250 + /systems/acconfig/options/uecam-rate + 1 + 5 + 0.5 + true + + dialog-apply + + + + + 2 + 2 + left + 1 + + /systems/acconfig/options/uecam-rate + 1 + + + + 3 + 0 + left + + + + + 3 + 1 + 250 + /systems/acconfig/options/lecam-rate + 1 + 5 + 0.5 + true + + dialog-apply + + + + + 3 + 2 + left + 1 + + /systems/acconfig/options/lecam-rate + 1 + + + + 4 + 0 + left + + + + + 4 + 1 + 250 + /systems/acconfig/options/iesi-rate + 1 + 5 + 0.5 + true + + dialog-apply + + + + + 4 + 2 + left + 1 + + /systems/acconfig/options/iesi-rate + 1 + + + + + + + + + + hbox + + + + + + diff --git a/AircraftConfig/error-mismatch.xml b/AircraftConfig/error-mismatch.xml index f0da0ce8..3807b0b3 100644 --- a/AircraftConfig/error-mismatch.xml +++ b/AircraftConfig/error-mismatch.xml @@ -23,7 +23,7 @@ hbox left - + @@ -41,7 +41,7 @@ left - + left diff --git a/AircraftConfig/help.xml b/AircraftConfig/help.xml index fe883f4a..a6fc2457 100644 --- a/AircraftConfig/help.xml +++ b/AircraftConfig/help.xml @@ -53,6 +53,11 @@ + + left + + + @@ -91,6 +96,10 @@ left + + left + + left @@ -99,10 +108,6 @@ left - - left - - left @@ -111,6 +116,14 @@ left + + left + + + + left + + diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml index eef6d27c..542b7f4a 100644 --- a/AircraftConfig/main.xml +++ b/AircraftConfig/main.xml @@ -17,8 +17,23 @@ hbox left - + + 1 + + @@ -340,14 +366,37 @@ nasal true - + + left + + /systems/acconfig/extra-stuff + + /options/system/laptop-mode + + property-toggle + /options/system/laptop-mode + + + dialog-apply + + + nasal + + + true + + + + left /controls/adirs/skip @@ -360,7 +409,7 @@ nasal true diff --git a/AircraftConfig/update.xml b/AircraftConfig/update.xml index 71fabc66..6f5dfef3 100644 --- a/AircraftConfig/update.xml +++ b/AircraftConfig/update.xml @@ -104,7 +104,9 @@ nasal + + + dialog-close + + + + + diff --git a/AircraftConfig/welcome.xml b/AircraftConfig/welcome.xml index e27a5006..7b303da6 100644 --- a/AircraftConfig/welcome.xml +++ b/AircraftConfig/welcome.xml @@ -19,6 +19,21 @@ left + 1 + - + + hbox + + left + + + + - + hbox