fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into ECAM2

Browse source
This commit is contained in:
Joshua Davidson 2019-02-24 17:36:09 -05:00
commit bf4d542cbb
3 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Nasal/FMGC-b.nas
View file

@ -614,6 +614,10 @@ var vertical = func {
} }
} }
var disarmLOC = func {
setprop("/it-autoflight/output/loc-armed", 0);
}
var disarmGS = func { var disarmGS = func {
alandt.stop(); alandt.stop();
alandt1.stop(); alandt1.stop();

27
Nasal/buttons.nas
View file

@ -388,10 +388,21 @@ var APPanel = {
if (dcEss.getValue() >= 25) { if (dcEss.getValue() >= 25) {
var vertTemp = vertMode.getValue(); var vertTemp = vertMode.getValue();
if ((locArm.getBoolValue() or latMode.getValue() == 2) and !apprArm.getBoolValue() and vertTemp != 2 and vertTemp != 6) { if ((locArm.getBoolValue() or latMode.getValue() == 2) and !apprArm.getBoolValue() and vertTemp != 2 and vertTemp != 6) {
setprop("/it-autoflight/input/lat", 0); if (latMode.getValue() == 2) {
setprop("/it-autoflight/input/lat", 0);
} else {
fmgc.disarmLOC();
}
if (vertTemp == 2 or vertTemp == 6) {
me.VSPull();
} else {
fmgc.disarmGS();
}
} else { } else {
setprop("/it-autoflight/input/lat", 2); setprop("/it-autoflight/input/lat", 2);
if (apprArm.getBoolValue() or vertTemp == 2) { if (vertTemp == 2 or vertTemp == 6) {
me.VSPull();
} else {
fmgc.disarmGS(); fmgc.disarmGS();
} }
} }
@ -513,8 +524,16 @@ var APPanel = {
if (dcEss.getValue() >= 25) { if (dcEss.getValue() >= 25) {
var vertTemp = vertMode.getValue(); var vertTemp = vertMode.getValue();
if ((locArm.getBoolValue() or latMode.getValue() == 2) and (apprArm.getBoolValue() or vertTemp == 2 or vertTemp == 6)) { if ((locArm.getBoolValue() or latMode.getValue() == 2) and (apprArm.getBoolValue() or vertTemp == 2 or vertTemp == 6)) {
setprop("/it-autoflight/input/lat", 0); if (latMode.getValue() == 2) {
me.VSPull(); setprop("/it-autoflight/input/lat", 0);
} else {
fmgc.disarmLOC();
}
if (vertTemp == 2 or vertTemp == 6) {
me.VSPull();
} else {
fmgc.disarmGS();
}
} else { } else {
setprop("/it-autoflight/input/vert", 2); setprop("/it-autoflight/input/vert", 2);
} }

2
revision.txt
View file

@ -1 +1 @@
4770 4771