fly/fgdata
1
0
Fork 0
Code Activity

Nasal/controls.nas: improved handling of /autopilot/locks/passive-mode

Browse source 
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.
This commit is contained in:
Julian Smith 2019-11-11 22:29:25 +00:00
parent 96ab5884f9
commit 390779a8a1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Nasal/controls.nas
View file

@ -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) {