From f69ed58384336620b29fb0b689b6f00abdef2123 Mon Sep 17 00:00:00 2001 From: legoboyvdlp R Date: Tue, 15 Sep 2020 18:22:35 +0100 Subject: [PATCH] Nasal fixup --- A320-main.xml | 8 ++++++++ Nasal/Systems/FADEC/engines-cfm.nas | 9 --------- Nasal/Systems/FADEC/engines-common.nas | 16 ++++++++-------- Nasal/Systems/FADEC/engines-iae.nas | 9 --------- 4 files changed, 16 insertions(+), 26 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index 9efa3013..d1236ada 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -719,6 +719,10 @@ 0.94 0 0 + 0 + 0 + 0 + B true @@ -732,6 +736,10 @@ 0.94 0 0 + 0 + 0 + 0 + B true diff --git a/Nasal/Systems/FADEC/engines-cfm.nas b/Nasal/Systems/FADEC/engines-cfm.nas index 1dff0379..e8749cbd 100644 --- a/Nasal/Systems/FADEC/engines-cfm.nas +++ b/Nasal/Systems/FADEC/engines-cfm.nas @@ -17,15 +17,6 @@ var egt_lightdn_time = 10; var shutdown_time = 20; var egt_shutdown_time = 20; -setprop("/controls/engines/engine[0]/reverser", 0); -setprop("/controls/engines/engine[1]/reverser", 0); -setprop("/controls/engines/engine[0]/igniter-a", 0); -setprop("/controls/engines/engine[1]/igniter-a", 0); -setprop("/controls/engines/engine[0]/igniter-b", 0); -setprop("/controls/engines/engine[1]/igniter-b", 0); -setprop("/controls/engines/engine[0]/last-igniter", "B"); -setprop("/controls/engines/engine[1]/last-igniter", "B"); - var eng_init = func { setprop("/controls/engines/engine[0]/man-start", 0); setprop("/controls/engines/engine[1]/man-start", 0); diff --git a/Nasal/Systems/FADEC/engines-common.nas b/Nasal/Systems/FADEC/engines-common.nas index 54790554..52a71b10 100644 --- a/Nasal/Systems/FADEC/engines-common.nas +++ b/Nasal/Systems/FADEC/engines-common.nas @@ -50,7 +50,7 @@ var doTOGAThrust = func { # Reverse Thrust System var toggleFastRevThrust = func { - if (pts.Systems.Thrust.state[0].getValue() == "IDLE" and pts.Systems.Thrust.state[1].getValue() == "IDLE" and pts.Controls.Engines.Engine.reverser[0].getValue() == "0" and pts.Controls.Engines.Engine.reverser[1].getValue() == "0" and pts.Gear.wow[1].getValue() == 1 and pts.Gear.wow[2].getValue() == 1) { + if (pts.Systems.Thrust.state[0].getValue() == "IDLE" and pts.Systems.Thrust.state[1].getValue() == "IDLE" and pts.Controls.Engines.Engine.reverser[0].getValue() == 0 and pts.Controls.Engines.Engine.reverser[1].getValue() == 0 and pts.Gear.wow[1].getValue() == 1 and pts.Gear.wow[2].getValue() == 1) { if (pts.Sim.Input.Selected.engine[0].getBoolValue()) { interpolate("/engines/engine[0]/reverser-pos-norm", 1, 1.4); pts.Controls.Engines.Engine.reverser[0].setValue(1); @@ -63,7 +63,7 @@ var toggleFastRevThrust = func { pts.Controls.Engines.Engine.throttleRev[1].setValue(0.65); pts.Fdm.JSBsim.Propulsion.Engine.reverserAngle[1].setValue(3.14); } - } else if (pts.Controls.Engines.Engine.reverser[0].getValue() == "1" or pts.Controls.Engines.Engine.reverser[1].getValue() == "1") { + } else if (pts.Controls.Engines.Engine.reverser[0].getValue() == 1 or pts.Controls.Engines.Engine.reverser[1].getValue() == 1) { interpolate("/engines/engine[0]/reverser-pos-norm", 0, 1.0); interpolate("/engines/engine[1]/reverser-pos-norm", 0, 1.0); pts.Controls.Engines.Engine.throttleRev[0].setValue(0); @@ -80,26 +80,26 @@ var doRevThrust = func { # Can't select reverse if not on the ground return; } - if (pts.Sim.Input.Selected.engine[0].getBoolValue() and pts.Controls.Engines.Engine.reverser[0].getValue() == "1") { + if (pts.Sim.Input.Selected.engine[0].getBoolValue() and pts.Controls.Engines.Engine.reverser[0].getValue() == 1) { var pos = pts.Controls.Engines.Engine.throttleRev[0].getValue(); if (pos < 0.649) { pts.Controls.Engines.Engine.throttleRev[0].setValue(pos + 0.15); } } - if (pts.Sim.Input.Selected.engine[1].getBoolValue() and pts.Controls.Engines.Engine.reverser[1].getValue() == "1") { + if (pts.Sim.Input.Selected.engine[1].getBoolValue() and pts.Controls.Engines.Engine.reverser[1].getValue() == 1) { var pos = pts.Controls.Engines.Engine.throttleRev[1].getValue(); if (pos < 0.649) { pts.Controls.Engines.Engine.throttleRev[1].setValue(pos + 0.15); } } - if (pts.Sim.Input.Selected.engine[0].getBoolValue() and pts.Systems.Thrust.state[0].getValue() == "IDLE" and pts.Controls.Engines.Engine.reverser[0].getValue() == "0") { + if (pts.Sim.Input.Selected.engine[0].getBoolValue() and pts.Systems.Thrust.state[0].getValue() == "IDLE" and pts.Controls.Engines.Engine.reverser[0].getValue() == 0) { interpolate("/engines/engine[0]/reverser-pos-norm", 1, 1.4); pts.Controls.Engines.Engine.throttleRev[0].setValue(0.05); pts.Controls.Engines.Engine.reverser[0].setValue(1); pts.Fdm.JSBsim.Propulsion.Engine.reverserAngle[0].setValue(3.14); } - if (pts.Sim.Input.Selected.engine[1].getBoolValue() and pts.Systems.Thrust.state[1].getValue() == "IDLE" and pts.Controls.Engines.Engine.reverser[1].getValue() == "0") { + if (pts.Sim.Input.Selected.engine[1].getBoolValue() and pts.Systems.Thrust.state[1].getValue() == "IDLE" and pts.Controls.Engines.Engine.reverser[1].getValue() == 0) { interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4); pts.Controls.Engines.Engine.throttleRev[1].setValue(0.05); pts.Controls.Engines.Engine.reverser[1].setValue(1); @@ -108,7 +108,7 @@ var doRevThrust = func { } var unRevThrust = func { - if (pts.Sim.Input.Selected.engine[0].getBoolValue() and pts.Controls.Engines.Engine.reverser[0].getValue() == "1") { + if (pts.Sim.Input.Selected.engine[0].getBoolValue() and pts.Controls.Engines.Engine.reverser[0].getValue() == 1) { var pos = pts.Controls.Engines.Engine.throttleRev[0].getValue(); if (pos > 0.051) { pts.Controls.Engines.Engine.throttleRev[0].setValue(pos - 0.15); @@ -119,7 +119,7 @@ var unRevThrust = func { pts.Fdm.JSBsim.Propulsion.Engine.reverserAngle[0].setValue(0); } } - if (pts.Sim.Input.Selected.engine[1].getBoolValue() and pts.Controls.Engines.Engine.reverser[1].getValue() == "1") { + if (pts.Sim.Input.Selected.engine[1].getBoolValue() and pts.Controls.Engines.Engine.reverser[1].getValue() == 1) { var pos = pts.Controls.Engines.Engine.throttleRev[1].getValue(); if (pos > 0.051) { pts.Controls.Engines.Engine.throttleRev[1].setValue(pos - 0.15); diff --git a/Nasal/Systems/FADEC/engines-iae.nas b/Nasal/Systems/FADEC/engines-iae.nas index 40f2fd8c..41c8ccd2 100644 --- a/Nasal/Systems/FADEC/engines-iae.nas +++ b/Nasal/Systems/FADEC/engines-iae.nas @@ -17,15 +17,6 @@ var egt_lightdn_time = 10; var shutdown_time = 20; var egt_shutdown_time = 20; -setprop("/controls/engines/engine[0]/reverser", 0); -setprop("/controls/engines/engine[1]/reverser", 0); -setprop("/controls/engines/engine[0]/igniter-a", 0); -setprop("/controls/engines/engine[1]/igniter-a", 0); -setprop("/controls/engines/engine[0]/igniter-b", 0); -setprop("/controls/engines/engine[1]/igniter-b", 0); -setprop("/controls/engines/engine[0]/last-igniter", "B"); -setprop("/controls/engines/engine[1]/last-igniter", "B"); - var eng_init = func { setprop("/controls/engines/engine[0]/man-start", 0); setprop("/controls/engines/engine[1]/man-start", 0);