From 622ad9ddcce0e11146fef0addf382d912ac0ea26 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 11 Nov 2018 13:53:29 -0500
Subject: [PATCH] GIT: Prepare for merge

---
 A320-main.xml       | 6 ++++--
 Nasal/libraries.nas | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 5f9f85b2..7a4a70ae 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -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>
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index 11d7258a..1b90693a 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -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)) {