GIT: Prepare for merge

This commit is contained in:
Joshua Davidson 2018-11-11 13:53:29 -05:00
parent 8587d55369
commit 622ad9ddcc
2 changed files with 5 additions and 3 deletions

View file

@ -183,7 +183,9 @@
<menubar>
<default>
<menu n="3"> <!-- Force disable Route Manager dialogs, bindings are changed just in case the item is not grayed out properly -->
<!-- Force disable Route Manager dialogs, bindings are changed just in case the item is not grayed out properly -->
<!-- Uncomment when route manager can be replaced by MCDU -->
<!--menu n="3">
<item n="1">
<enabled type="bool" n="0">false</enabled>
<binding n="0">
@ -211,7 +213,7 @@
</script>
</binding>
</item>
</menu>
</menu-->
<menu n="100">
<label>IDG-A32X</label>
<enabled type="bool">true</enabled>

View file

@ -208,7 +208,7 @@ var systemsLoop = maketimer(0.1, func {
libraries.ECAM.loop();
libraries.BUTTONS.update();
fadec.FADEC.loop();
ecam.ECAM_controller.loop();
# ecam.ECAM_controller.loop();
rmp.rmpUpdate();
if ((getprop("/controls/pneumatic/switches/groundair") or getprop("/controls/switches/cart")) and ((getprop("/velocities/groundspeed-kt") > 2) or getprop("/controls/gear/brake-parking") == 0)) {