From 6745986efd9831b6d05f3fe9e9d22ad713e5a67d Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Fri, 16 Jun 2017 18:25:33 -0400
Subject: [PATCH] A3XX: Fix MCDU not allowing certain altitudes in THRRED/ACC,
 make Parking Brake lever working, improve hidden ECAM msgs

---
 Models/FlightDeck/a320.flightdeck.xml         |  4 +-
 .../Instruments/Upper-ECAM-MSG/ECAM-MSG.xml   | 40 +++++++++----------
 Nasal/MCDU/MCDU1.nas                          |  2 +-
 Nasal/MCDU/MCDU2.nas                          |  8 ++--
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index e61c4cab..c0e35306 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -4667,7 +4667,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>ParkBrk</object-name>
-		<property>controls/parking-brake</property>
+		<property>/controls/gear/brake-parking</property>
 		<factor>-90</factor>
 		<center>
 			<x-m>0.1270</x-m>
@@ -4689,7 +4689,7 @@
             <repeatable type="bool">false</repeatable>
             <binding>
                 <command>property-toggle</command>
-                <property>controls/parking-brake</property>
+                <property>/controls/gear/brake-parking</property>
             </binding>
         </action>
     </animation>
diff --git a/Models/Instruments/Upper-ECAM-MSG/ECAM-MSG.xml b/Models/Instruments/Upper-ECAM-MSG/ECAM-MSG.xml
index 33413c10..7b05ca0e 100644
--- a/Models/Instruments/Upper-ECAM-MSG/ECAM-MSG.xml
+++ b/Models/Instruments/Upper-ECAM-MSG/ECAM-MSG.xml
@@ -626,26 +626,26 @@
 		<object-name>Line6G</object-name>
 		<object-name>Line7G</object-name>
 		<object-name>Line8G</object-name>
-        <diffuse>
-            <red>0.2</red>
-            <green>0.4</green>
-            <blue>0.2</blue>
-        </diffuse>
-        <ambient>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-        </ambient>
-        <specular>
-            <red>0</red>
-            <green>0</green>
-            <blue>0</blue>
-        </specular>
-        <emission>
-            <red>0.2</red>
-            <green>0.4</green>
-            <blue>0.2</blue>
-        </emission>
+		<diffuse>
+			<red>0</red>
+			<green>0.543</green>
+			<blue>0</blue>
+		</diffuse>
+		<ambient>
+			<red>0</red>
+			<green>0</green>
+			<blue>0</blue>
+		</ambient>
+		<specular>
+			<red>0</red>
+			<green>0</green>
+			<blue>0</blue>
+		</specular>
+		<emission>
+			<red>0</red>
+			<green>0.543</green>
+			<blue>0</blue>
+		</emission>
     </animation>
 	
 	<!-- Blue -->
diff --git a/Nasal/MCDU/MCDU1.nas b/Nasal/MCDU/MCDU1.nas
index 5ab3650f..ca778b4d 100644
--- a/Nasal/MCDU/MCDU1.nas
+++ b/Nasal/MCDU/MCDU1.nas
@@ -577,7 +577,7 @@ var perfTOInput = func(key) {
 			setprop("/MCDU[0]/scratchpad", "");
 		} else {
 			var tfs = size(scratchpad);
-			if (tfs == 9) {
+			if (tfs >= 7 or tfs <= 9) {
 				var thracc = split("/", scratchpad);
 				var thrred = size(thracc[0]);
 				var acc = size(thracc[1]);
diff --git a/Nasal/MCDU/MCDU2.nas b/Nasal/MCDU/MCDU2.nas
index 7d086ead..782020ef 100644
--- a/Nasal/MCDU/MCDU2.nas
+++ b/Nasal/MCDU/MCDU2.nas
@@ -69,9 +69,9 @@ var lskbutton = func(btn) {
 			radnavInput("L2");
 		} else if (getprop("/MCDU[1]/page") == "CLB") {
 			initInputA("L5"); # Does the same thing as on the INIT page
-		} else if (getprop("/MCDU[0]/page") == "CRZ") {
+		} else if (getprop("/MCDU[1]/page") == "CRZ") {
 			initInputA("L5"); 
-		} else if (getprop("/MCDU[0]/page") == "DES") {
+		} else if (getprop("/MCDU[1]/page") == "DES") {
 			initInputA("L5"); 
 		} else {
 			setprop("/MCDU[1]/scratchpad-msg", "1");
@@ -121,7 +121,7 @@ var lskbutton = func(btn) {
 			perfCLBInput("L6");
 		} else if (getprop("/MCDU[1]/page") == "CRZ") {
 			perfCRZInput("L6");
-		} else if (getprop("/MCDU[0]/page") == "DES") {
+		} else if (getprop("/MCDU[1]/page") == "DES") {
 			perfDESInput("L6");
 		} else {
 			setprop("/MCDU[1]/scratchpad-msg", "1");
@@ -577,7 +577,7 @@ var perfTOInput = func(key) {
 			setprop("/MCDU[1]/scratchpad", "");
 		} else {
 			var tfs = size(scratchpad);
-			if (tfs == 9) {
+			if (tfs >= 7 or tfs <= 9) {
 				var thracc = split("/", scratchpad);
 				var thrred = size(thracc[0]);
 				var acc = size(thracc[1]);