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-25 16:24:20 -05:00
commit 4bd445138f
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
A320-main.xml
View file

@ -1081,7 +1081,7 @@
<desc>Autothrottle Disconnect</desc> <desc>Autothrottle Disconnect</desc>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>libraries.APPanel.ATDiscSoft();</script> <script>libraries.APPanel.ATDisc();</script>
</binding> </binding>
</key> </key>
<key n="6"> <key n="6">
@ -1320,7 +1320,7 @@
<desc>Autopilot Disconnect</desc> <desc>Autopilot Disconnect</desc>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>libraries.APPanel.APDiscSoft();</script> <script>libraries.APPanel.APDisc();</script>
</binding> </binding>
</key> </key>
<key n="70"> <key n="70">

4
Nasal/buttons.nas
View file

@ -234,7 +234,7 @@ var APPanel = {
} }
} }
}, },
APDiscSoft: func() { APDisc: func() {
if (ap1.getBoolValue() or ap2.getBoolValue()) { if (ap1.getBoolValue() or ap2.getBoolValue()) {
libraries.apOff("soft", 0); libraries.apOff("soft", 0);
} else { } else {
@ -246,7 +246,7 @@ var APPanel = {
setprop("/ECAM/warnings/master-warning-light", 0); setprop("/ECAM/warnings/master-warning-light", 0);
} }
}, },
ATDiscSoft: func() { ATDisc: func() {
if (athr.getBoolValue()) { if (athr.getBoolValue()) {
libraries.athrOff("soft"); libraries.athrOff("soft");
setprop("/ECAM/warnings/master-caution-light", 1); setprop("/ECAM/warnings/master-caution-light", 1);

4
gui/dialogs/a3xx-autoflight-dlg.xml
View file

@ -83,7 +83,7 @@
<pref-width>119</pref-width> <pref-width>119</pref-width>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>libraries.APPanel.ATDiscSoft();</script> <script>libraries.APPanel.ATDisc();</script>
</binding> </binding>
</button> </button>
<button> <button>
@ -91,7 +91,7 @@
<pref-width>119</pref-width> <pref-width>119</pref-width>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script>libraries.APPanel.APDiscSoft();</script> <script>libraries.APPanel.APDisc();</script>
</binding> </binding>
</button> </button>
</group> </group>

2
revision.txt
View file

@ -1 +1 @@
4771 4772