From 9c690c3e177793f276dc7a6fd23765ed4d10aa78 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Thu, 20 Dec 2018 00:29:17 -0500 Subject: [PATCH 1/9] Control: FBW Tweaked --- Systems/a320-fcs.xml | 36 ++++++++++++------------------------ revision.txt | 2 +- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml index a0f8bcf9..51828e5a 100644 --- a/Systems/a320-fcs.xml +++ b/Systems/a320-fcs.xml @@ -436,14 +436,10 @@ - - - - fbw/roll/p-r_s-s - fbw/roll/rate-demand-lag - - - + + fbw/roll/p-r_s-s + -fbw/roll/rate-demand-lag + @@ -735,14 +731,10 @@ - - - - fbw/pitch/g-computed - fbw/pitch/g-demand - - - + + fbw/pitch/g-computed + -fbw/pitch/g-demand + @@ -883,14 +875,10 @@ - - - - fbw/pitch/t-r_s-s - fbw/pitch/rate-demand-lag - - - + + fbw/pitch/t-r_s-s + -fbw/pitch/rate-demand-lag + diff --git a/revision.txt b/revision.txt index e0af25d9..2fd0758c 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4714 \ No newline at end of file +4715 \ No newline at end of file From 94389c42ca2bde6cdc00451dee3ea1e99be01361 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Fri, 21 Dec 2018 16:56:55 -0500 Subject: [PATCH 2/9] Sim: ACCONFIG 1.5.1: Rendering options wrong detection --- AircraftConfig/about.xml | 2 +- AircraftConfig/acconfig.nas | 288 ++++++++++++++++++++--------------- AircraftConfig/main.xml | 2 +- AircraftConfig/rendering.xml | 155 +++++++++++++++++++ Nasal/electrical.nas | 2 + revision.txt | 2 +- 6 files changed, 328 insertions(+), 123 deletions(-) create mode 100644 AircraftConfig/rendering.xml diff --git a/AircraftConfig/about.xml b/AircraftConfig/about.xml index ed5952b0..d797a6d3 100644 --- a/AircraftConfig/about.xml +++ b/AircraftConfig/about.xml @@ -61,7 +61,7 @@ left - + diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas index a8ca0464..d0d45c04 100644 --- a/AircraftConfig/acconfig.nas +++ b/AircraftConfig/acconfig.nas @@ -88,6 +88,7 @@ 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/no-rendering-warn", 0); setprop("/systems/acconfig/options/pfd-rate", 1); setprop("/systems/acconfig/options/nd-rate", 1); setprop("/systems/acconfig/options/uecam-rate", 1); @@ -108,6 +109,7 @@ var error_mismatch = gui.Dialog.new("sim/gui/dialogs/acconfig/error/mismatch/dia 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(); @@ -132,6 +134,7 @@ var mismatch_chk = func { if (getprop("/systems/acconfig/out-of-date") != 1) { error_mismatch.open(); } + libraries.systemsLoop.stop(); print("Mismatch: 0x121"); welcome_dlg.close(); } else if (getprop("/gear/gear[0]/wow") == 0 or getprop("/position/altitude-ft") >= 15000) { @@ -140,6 +143,7 @@ var mismatch_chk = func { if (getprop("/systems/acconfig/out-of-date") != 1) { error_mismatch.open(); } + libraries.systemsLoop.stop(); print("Mismatch: 0x223"); welcome_dlg.close(); } else if (getprop("/systems/acconfig/libraries-loaded") != 1) { @@ -148,6 +152,7 @@ var mismatch_chk = func { if (getprop("/systems/acconfig/out-of-date") != 1) { error_mismatch.open(); } + libraries.systemsLoop.stop(); print("Mismatch: 0x247"); welcome_dlg.close(); } @@ -163,14 +168,49 @@ setlistener("/sim/signals/fdm-initialized", func { readSettings(); if (getprop("/systems/acconfig/out-of-date") != 1 and getprop("/systems/acconfig/options/revision") < current_revision and getprop("/systems/acconfig/mismatch-code") == "0x000") { updated_dlg.open(); + if (getprop("/systems/acconfig/options/no-rendering-warn") != 1) { + renderingSettings.check(); + } } 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(); + if (getprop("/systems/acconfig/options/no-rendering-warn") != 1) { + renderingSettings.check(); + } } setprop("/systems/acconfig/options/revision", current_revision); writeSettings(); spinning.stop(); }); +var renderingSettings = { + check: func() { + var rembrandt = getprop("/sim/rendering/rembrandt/enabled"); + var ALS = getprop("/sim/rendering/shaders/skydome"); + var customSettings = getprop("/sim/rendering/shaders/custom-settings") == 1; + var landmass = getprop("/sim/rendering/shaders/landmass") >= 4; + var model = getprop("/sim/rendering/shaders/model") >= 1; + if (!rembrandt and (!ALS or !customSettings or !landmass or !model)) { + rendering_dlg.open(); + } + }, + fixAll: func() { + me.fixCore(); + var landmass = getprop("/sim/rendering/shaders/landmass") >= 4; + var model = getprop("/sim/rendering/shaders/model") >= 1; + if (!landmass) { + setprop("/sim/rendering/shaders/landmass", 4); + } + if (!model) { + setprop("/sim/rendering/shaders/model", 1); + } + }, + fixCore: func() { + setprop("/sim/rendering/shaders/skydome", 1); # ALS on + setprop("/sim/rendering/shaders/custom-settings", 1); + gui.popupTip("Rendering Settings updated!"); + }, +}; + 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")); @@ -191,36 +231,38 @@ var writeSettings = func { # Cold and Dark var colddark = func { - spinning.start(); - ps_load_dlg.open(); - setprop("/systems/acconfig/autoconfig-running", 1); - setprop("/controls/gear/brake-left", 1); - setprop("/controls/gear/brake-right", 1); - # Initial shutdown, and reinitialization. - setprop("/controls/engines/engine-start-switch", 1); - setprop("/controls/engines/engine[0]/cutoff-switch", 1); - setprop("/controls/engines/engine[1]/cutoff-switch", 1); - setprop("/controls/flight/slats", 0.000); - setprop("/controls/flight/flaps", 0.000); - setprop("/controls/flight/flap-lever", 0); - setprop("/controls/flight/flap-pos", 0); - setprop("/controls/flight/flap-txt", " "); - libraries.flaptimer.stop(); - setprop("/controls/flight/speedbrake-arm", 0); - setprop("/controls/flight/speedbrake", 0); - setprop("/controls/gear/gear-down", 1); - setprop("/controls/flight/elevator-trim", 0); - libraries.systemsInit(); - failReset(); - if (getprop("/engines/engine[1]/n2-actual") < 2) { - colddark_b(); - } else { - var colddark_eng_off = setlistener("/engines/engine[1]/n2-actual", func { - if (getprop("/engines/engine[1]/n2-actual") < 2) { - removelistener(colddark_eng_off); - colddark_b(); - } - }); + if (getprop("/systems/acconfig/mismatch-code") == "0x000") { + spinning.start(); + ps_load_dlg.open(); + setprop("/systems/acconfig/autoconfig-running", 1); + setprop("/controls/gear/brake-left", 1); + setprop("/controls/gear/brake-right", 1); + # Initial shutdown, and reinitialization. + setprop("/controls/engines/engine-start-switch", 1); + setprop("/controls/engines/engine[0]/cutoff-switch", 1); + setprop("/controls/engines/engine[1]/cutoff-switch", 1); + setprop("/controls/flight/slats", 0.000); + setprop("/controls/flight/flaps", 0.000); + setprop("/controls/flight/flap-lever", 0); + setprop("/controls/flight/flap-pos", 0); + setprop("/controls/flight/flap-txt", " "); + libraries.flaptimer.stop(); + setprop("/controls/flight/speedbrake-arm", 0); + setprop("/controls/flight/speedbrake", 0); + setprop("/controls/gear/gear-down", 1); + setprop("/controls/flight/elevator-trim", 0); + libraries.systemsInit(); + failReset(); + if (getprop("/engines/engine[1]/n2-actual") < 2) { + colddark_b(); + } else { + var colddark_eng_off = setlistener("/engines/engine[1]/n2-actual", func { + if (getprop("/engines/engine[1]/n2-actual") < 2) { + removelistener(colddark_eng_off); + colddark_b(); + } + }); + } } } var colddark_b = func { @@ -237,41 +279,43 @@ var colddark_b = func { # Ready to Start Eng var beforestart = func { - spinning.start(); - ps_load_dlg.open(); - setprop("/systems/acconfig/autoconfig-running", 1); - setprop("/controls/gear/brake-left", 1); - setprop("/controls/gear/brake-right", 1); - # First, we set everything to cold and dark. - setprop("/controls/engines/engine-start-switch", 1); - setprop("/controls/engines/engine[0]/cutoff-switch", 1); - setprop("/controls/engines/engine[1]/cutoff-switch", 1); - setprop("/controls/flight/slats", 0.000); - setprop("/controls/flight/flaps", 0.000); - setprop("/controls/flight/flap-lever", 0); - setprop("/controls/flight/flap-pos", 0); - setprop("/controls/flight/flap-txt", " "); - libraries.flaptimer.stop(); - setprop("/controls/flight/speedbrake-arm", 0); - setprop("/controls/flight/speedbrake", 0); - setprop("/controls/gear/gear-down", 1); - setprop("/controls/flight/elevator-trim", 0); - libraries.systemsInit(); - failReset(); - setprop("/controls/APU/master", 0); - setprop("/controls/APU/start", 0); - - # Now the Startup! - setprop("/controls/electrical/switches/battery1", 1); - setprop("/controls/electrical/switches/battery2", 1); - setprop("/controls/APU/master", 1); - setprop("/controls/APU/start", 1); - var apu_rpm_chk = setlistener("/systems/apu/rpm", func { - if (getprop("/systems/apu/rpm") >= 98) { - removelistener(apu_rpm_chk); - beforestart_b(); - } - }); + if (getprop("/systems/acconfig/mismatch-code") == "0x000") { + spinning.start(); + ps_load_dlg.open(); + setprop("/systems/acconfig/autoconfig-running", 1); + setprop("/controls/gear/brake-left", 1); + setprop("/controls/gear/brake-right", 1); + # First, we set everything to cold and dark. + setprop("/controls/engines/engine-start-switch", 1); + setprop("/controls/engines/engine[0]/cutoff-switch", 1); + setprop("/controls/engines/engine[1]/cutoff-switch", 1); + setprop("/controls/flight/slats", 0.000); + setprop("/controls/flight/flaps", 0.000); + setprop("/controls/flight/flap-lever", 0); + setprop("/controls/flight/flap-pos", 0); + setprop("/controls/flight/flap-txt", " "); + libraries.flaptimer.stop(); + setprop("/controls/flight/speedbrake-arm", 0); + setprop("/controls/flight/speedbrake", 0); + setprop("/controls/gear/gear-down", 1); + setprop("/controls/flight/elevator-trim", 0); + libraries.systemsInit(); + failReset(); + setprop("/controls/APU/master", 0); + setprop("/controls/APU/start", 0); + + # Now the Startup! + setprop("/controls/electrical/switches/battery1", 1); + setprop("/controls/electrical/switches/battery2", 1); + setprop("/controls/APU/master", 1); + setprop("/controls/APU/start", 1); + var apu_rpm_chk = setlistener("/systems/apu/rpm", func { + if (getprop("/systems/apu/rpm") >= 98) { + removelistener(apu_rpm_chk); + beforestart_b(); + } + }); + } } var beforestart_b = func { # Continue with engine start prep. @@ -312,41 +356,43 @@ var beforestart_b = func { # Ready to Taxi var taxi = func { - spinning.start(); - ps_load_dlg.open(); - setprop("/systems/acconfig/autoconfig-running", 1); - setprop("/controls/gear/brake-left", 1); - setprop("/controls/gear/brake-right", 1); - # First, we set everything to cold and dark. - setprop("/controls/engines/engine-start-switch", 1); - setprop("/controls/engines/engine[0]/cutoff-switch", 1); - setprop("/controls/engines/engine[1]/cutoff-switch", 1); - setprop("/controls/flight/slats", 0.000); - setprop("/controls/flight/flaps", 0.000); - setprop("/controls/flight/flap-lever", 0); - setprop("/controls/flight/flap-pos", 0); - setprop("/controls/flight/flap-txt", " "); - libraries.flaptimer.stop(); - setprop("/controls/flight/speedbrake-arm", 0); - setprop("/controls/flight/speedbrake", 0); - setprop("/controls/gear/gear-down", 1); - setprop("/controls/flight/elevator-trim", 0); - libraries.systemsInit(); - failReset(); - setprop("/controls/APU/master", 0); - setprop("/controls/APU/start", 0); - - # Now the Startup! - setprop("/controls/electrical/switches/battery1", 1); - setprop("/controls/electrical/switches/battery2", 1); - setprop("/controls/APU/master", 1); - setprop("/controls/APU/start", 1); - var apu_rpm_chk = setlistener("/systems/apu/rpm", func { - if (getprop("/systems/apu/rpm") >= 98) { - removelistener(apu_rpm_chk); - taxi_b(); - } - }); + if (getprop("/systems/acconfig/mismatch-code") == "0x000") { + spinning.start(); + ps_load_dlg.open(); + setprop("/systems/acconfig/autoconfig-running", 1); + setprop("/controls/gear/brake-left", 1); + setprop("/controls/gear/brake-right", 1); + # First, we set everything to cold and dark. + setprop("/controls/engines/engine-start-switch", 1); + setprop("/controls/engines/engine[0]/cutoff-switch", 1); + setprop("/controls/engines/engine[1]/cutoff-switch", 1); + setprop("/controls/flight/slats", 0.000); + setprop("/controls/flight/flaps", 0.000); + setprop("/controls/flight/flap-lever", 0); + setprop("/controls/flight/flap-pos", 0); + setprop("/controls/flight/flap-txt", " "); + libraries.flaptimer.stop(); + setprop("/controls/flight/speedbrake-arm", 0); + setprop("/controls/flight/speedbrake", 0); + setprop("/controls/gear/gear-down", 1); + setprop("/controls/flight/elevator-trim", 0); + libraries.systemsInit(); + failReset(); + setprop("/controls/APU/master", 0); + setprop("/controls/APU/start", 0); + + # Now the Startup! + setprop("/controls/electrical/switches/battery1", 1); + setprop("/controls/electrical/switches/battery2", 1); + setprop("/controls/APU/master", 1); + setprop("/controls/APU/start", 1); + var apu_rpm_chk = setlistener("/systems/apu/rpm", func { + if (getprop("/systems/apu/rpm") >= 98) { + removelistener(apu_rpm_chk); + taxi_b(); + } + }); + } } var taxi_b = func { # Continue with engine start prep, and start engines. @@ -404,24 +450,26 @@ var taxi_d = func { # Ready to Takeoff var takeoff = func { - # The same as taxi, except we set some things afterwards. - taxi(); - var eng_one_chk_c = setlistener("/engines/engine[0]/state", func { - if (getprop("/engines/engine[0]/state") == 3) { - removelistener(eng_one_chk_c); - setprop("/controls/lighting/strobe", 1); - setprop("/controls/lighting/landing-lights[1]", 1); - setprop("/controls/lighting/landing-lights[2]", 1); - setprop("/controls/flight/speedbrake-arm", 1); - setprop("/controls/flight/flaps", 0.290); - setprop("/controls/flight/slats", 0.666); - setprop("/controls/flight/flap-lever", 1); - setprop("/controls/flight/flap-pos", 2); - setprop("/controls/flight/flap-txt", "1+F"); - libraries.flaptimer.start(); - setprop("/controls/flight/elevator-trim", -0.07); - systems.arm_autobrake(3); - libraries.ECAM.toConfig(); - } - }); + if (getprop("/systems/acconfig/mismatch-code") == "0x000") { + # The same as taxi, except we set some things afterwards. + taxi(); + var eng_one_chk_c = setlistener("/engines/engine[0]/state", func { + if (getprop("/engines/engine[0]/state") == 3) { + removelistener(eng_one_chk_c); + setprop("/controls/lighting/strobe", 1); + setprop("/controls/lighting/landing-lights[1]", 1); + setprop("/controls/lighting/landing-lights[2]", 1); + setprop("/controls/flight/speedbrake-arm", 1); + setprop("/controls/flight/flaps", 0.290); + setprop("/controls/flight/slats", 0.666); + setprop("/controls/flight/flap-lever", 1); + setprop("/controls/flight/flap-pos", 2); + setprop("/controls/flight/flap-txt", "1+F"); + libraries.flaptimer.start(); + setprop("/controls/flight/elevator-trim", -0.07); + systems.arm_autobrake(3); + libraries.ECAM.toConfig(); + } + }); + } } diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml index 75079a04..035357a0 100644 --- a/AircraftConfig/main.xml +++ b/AircraftConfig/main.xml @@ -13,7 +13,7 @@ hbox left - + 1 + + + + + + vbox + + + left + + + + + left + + + + + left + + + + + left + + + + + left + + + + + + + left + + + + + left + + + + + + + + + hbox + + + + center + /systems/acconfig/options/no-rendering-warn + + property-toggle + /systems/acconfig/options/no-rendering-warn + + + dialog-apply + + + nasal + + + true + + + + + + + + hbox + + + + + + + + + + diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas index 7a3d6182..06c0aa4e 100644 --- a/Nasal/electrical.nas +++ b/Nasal/electrical.nas @@ -160,6 +160,8 @@ var ELEC = { setprop("/systems/electrical/battery2-amps", 0); setprop("/systems/electrical/battery1-percent", 68); setprop("/systems/electrical/battery2-percent", 68); + setprop("/systems/electrical/battery1-time", 0); + setprop("/systems/electrical/battery2-time", 0); setprop("/systems/electrical/bus/dc1", 0); setprop("/systems/electrical/bus/dc2", 0); setprop("/systems/electrical/bus/dcbat", 0); diff --git a/revision.txt b/revision.txt index 2fd0758c..3c596919 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4715 \ No newline at end of file +4716 \ No newline at end of file From e46170ee9ce5f908d1e07cdea5576f5f896d3d95 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 22 Dec 2018 11:50:56 -0500 Subject: [PATCH 3/9] Engine: Fuel Flow fixed --- Systems/libraries.xml | 32 ++++++-------------------------- revision.txt | 2 +- 2 files changed, 7 insertions(+), 27 deletions(-) diff --git a/Systems/libraries.xml b/Systems/libraries.xml index 451c58fa..fd3fdfad 100644 --- a/Systems/libraries.xml +++ b/Systems/libraries.xml @@ -68,38 +68,18 @@ FF 1 - gain - 1.0 - 0.05 - - - - /engines/engine[0]/fuel-flow_pph - 0 0 - 20001387 - 90009847 -
- - + exponential + /engines/engine[0]/fuel-flow_pph /engines/engine[0]/fuel-flow_actual + 0.32 FF 2 - gain - 1.0 - 0.05 - - - - /engines/engine[1]/fuel-flow_pph - 0 0 - 20001387 - 90009847 -
- - + exponential + /engines/engine[1]/fuel-flow_pph /engines/engine[1]/fuel-flow_actual + 0.32 diff --git a/revision.txt b/revision.txt index 3c596919..4c225296 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4716 \ No newline at end of file +4717 \ No newline at end of file From a5a1eed555c81de252310f003ba1defde78e5825 Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Sat, 22 Dec 2018 21:33:56 -0500 Subject: [PATCH 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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