From 390779a8a149d13646879176db33d843eeb0604a Mon Sep 17 00:00:00 2001 From: Julian Smith <jules@op59.net> Date: Mon, 11 Nov 2019 22:29:25 +0000 Subject: [PATCH] Nasal/controls.nas: improved handling of /autopilot/locks/passive-mode Use (!passive) instead of (passive == 0), so that passive == nil is treated as 0. E.g. this allows keyboard control of autopilot target speed, heading and altitude in harrier-gr3. --- Nasal/controls.nas | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Nasal/controls.nas b/Nasal/controls.nas index 883eee518..4dd851bbd 100644 --- a/Nasal/controls.nas +++ b/Nasal/controls.nas @@ -341,7 +341,7 @@ var incThrottle = func { var passive = getprop("/autopilot/locks/passive-mode"); var locked = getprop("/autopilot/locks/speed"); # Note: passive/locked may be nil on aircraft without A/P - if ((passive == 0) and (locked)) + if (!passive and (locked)) { var node = props.globals.getNode("/autopilot/settings/target-speed-kt", 1); if (node.getValue() == nil) { @@ -373,7 +373,7 @@ var incAileron = func { var passive = getprop("/autopilot/locks/passive-mode"); var locked = getprop("/autopilot/locks/heading"); # Note: passive/locked may be nil on aircraft without A/P - if ((passive == 0) and (locked == "dg-heading-hold")) + if (!passive and (locked == "dg-heading-hold")) { var node = props.globals.getNode("/autopilot/settings/heading-bug-deg", 1); if (node.getValue() == nil) { @@ -387,7 +387,7 @@ var incAileron = func { node.setValue(node.getValue() - 360.0); } } - else if ((passive == 0) and (locked == "true-heading-hold")) + else if (!passive and (locked == "true-heading-hold")) { var node = props.globals.getNode("/autopilot/settings/true-heading-deg", 1); if (node.getValue() == nil) { @@ -424,7 +424,7 @@ var incElevator = func { var passive = getprop("/autopilot/locks/passive-mode"); var locked = getprop("/autopilot/locks/altitude"); # Note: passive/locked may be nil on aircraft without A/P - if ((passive == 0) and (locked =="altitude-hold")) + if (!passive and (locked =="altitude-hold")) { var node = props.globals.getNode("/autopilot/settings/target-altitude-ft", 1); if (node.getValue() == nil) {