Merge branch 'master' into ECAM2

This commit is contained in:
Joshua Davidson 2019-02-25 16:48:55 -05:00
commit b3a00a2241

View file

@ -235,6 +235,7 @@ var APPanel = {
}
},
APDisc: func() {
if (dcEss.getValue() >= 25) {
if (ap1.getBoolValue() or ap2.getBoolValue()) {
libraries.apOff("soft", 0);
} else {
@ -245,8 +246,10 @@ var APPanel = {
setprop("/it-autoflight/output/ap-warning", 0);
setprop("/ECAM/warnings/master-warning-light", 0);
}
}
},
ATDisc: func() {
if (dcEss.getValue() >= 25) {
if (athr.getBoolValue()) {
libraries.athrOff("soft");
setprop("/ECAM/warnings/master-caution-light", 1);
@ -256,6 +259,7 @@ var APPanel = {
setprop("/ECAM/warnings/master-caution-light", 0);
}
}
}
},
IASMach: func() {
if (dcEss.getValue() >= 25) {
@ -343,11 +347,14 @@ var APPanel = {
}
},
HDGPush: func() {
if (dcEss.getValue() >= 25) {
if (fd1.getBoolValue() or fd2.getBoolValue() or ap1.getBoolValue() or ap2.getBoolValue()) {
setprop("/it-autoflight/input/lat", 1);
}
}
},
HDGPull: func() {
if (dcEss.getValue() >= 25) {
if (fd1.getBoolValue() or fd2.getBoolValue() or ap1.getBoolValue() or ap2.getBoolValue()) {
if (latMode.getValue() == 0 or !showHDG.getBoolValue()) {
setprop("/it-autoflight/input/lat", 3);
@ -357,6 +364,7 @@ var APPanel = {
showHDG.setBoolValue(1);
}
}
}
},
HDGAdjust: func(d) {
if (dcEss.getValue() >= 25) {