From 650d9fdb3f74a2469303c76f7425933bf11c2ea8 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Thu, 18 May 2017 09:53:16 -0400
Subject: [PATCH] move all button logic to nasal

---
 Models/Instruments/MCDU1/MCDU1.xml | 257 +++++++++++++++++----
 Models/Instruments/MCDU2/MCDU2.xml | 355 +++++++++++++++++++++--------
 Nasal/MCDU1.nas                    |  75 ++++--
 Nasal/MCDU2.nas                    |  77 +++++--
 4 files changed, 572 insertions(+), 192 deletions(-)

diff --git a/Models/Instruments/MCDU1/MCDU1.xml b/Models/Instruments/MCDU1/MCDU1.xml
index e9549faa..c8cd2c4e 100644
--- a/Models/Instruments/MCDU1/MCDU1.xml
+++ b/Models/Instruments/MCDU1/MCDU1.xml
@@ -182,29 +182,71 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu1.pagebutton("perfto");</script>
+				<script>mcdu1.pagebutton("perf");</script>
 				<condition>
-				<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<or>
-						<equals>
-							<property>/FMGC/status/phase</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/FMGC/status/phase</property>
-							<value>1</value>
-						</equals>
-					</or>
-				</and>
 				</condition>
 			</binding>
 		</action>
 	</animation>
 	
+	<animation>
+		<type>pick</type>
+		<object-name>L1</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu1.latbutton("1");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>L2</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu1.latbutton("2");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>L3</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu1.latbutton("3");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
 	<animation>
 		<type>pick</type>
 		<object-name>L4</object-name>
@@ -213,18 +255,48 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu1.pagebutton("status");</script>
+				<script>mcdu1.latbutton("4");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>L5</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu1.latbutton("5");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>L6</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu1.latbutton("6");</script>
 				<condition>
-					<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<equals>
-						<property>/MCDU[0]/page</property>
-						<value>DATA</value>
-					</equals>
-					</and>
 				</condition>
 			</binding>
 		</action>
@@ -232,28 +304,113 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>right</object-name>
+		<object-name>R1</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu1.pagebutton("data2");</script>
+				<script>mcdu1.vertbutton("1");</script>
 				<condition>
-					<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<equals>
-						<property>/MCDU[0]/page</property>
-						<value>DATA</value>
-					</equals>
-					</and>
 				</condition>
 			</binding>
 		</action>
 	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>R2</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu1.vertbutton("2");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>R3</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu1.vertbutton("3");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>R4</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu1.vertbutton("4");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>R5</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu1.vertbutton("5");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>R6</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu1.vertbutton("6");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	
 	<animation>
 		<type>pick</type>
 		<object-name>left</object-name>
@@ -262,18 +419,12 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu1.pagebutton("data2");</script>
+				<script>mcdu1.arrowbutton("left");</script>
 				<condition>
-					<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<equals>
-						<property>/MCDU[0]/page</property>
-						<value>DATA</value>
-					</equals>
-					</and>
 				</condition>
 			</binding>
 		</action>
@@ -286,42 +437,48 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu1.pagebutton("data");</script>
+				<script>mcdu1.arrowbutton("right");</script>
 				<condition>
-					<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<equals>
-						<property>/MCDU[0]/page</property>
-						<value>DATA2</value>
-					</equals>
-					</and>
 				</condition>
 			</binding>
 		</action>
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>left</object-name>
+		<object-name>up</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu1.pagebutton("data");</script>
+				<script>mcdu1.arrowbutton("up");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>down</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu1.arrowbutton("down");</script>
 				<condition>
-					<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<equals>
-						<property>/MCDU[0]/page</property>
-						<value>DATA2</value>
-					</equals>
-					</and>
 				</condition>
 			</binding>
 		</action>
diff --git a/Models/Instruments/MCDU2/MCDU2.xml b/Models/Instruments/MCDU2/MCDU2.xml
index cf660c8d..e126bcee 100644
--- a/Models/Instruments/MCDU2/MCDU2.xml
+++ b/Models/Instruments/MCDU2/MCDU2.xml
@@ -20,7 +20,7 @@
 		</offsets>
 		<condition>
 			<greater-than-equals>
-				<property>/systems/electrical/bus/ac2</property>
+				<property>/systems/electrical/bus/ac1</property>
 				<value>25</value>
 			</greater-than-equals>
 		</condition>
@@ -37,7 +37,7 @@
 		<condition>
 			<and>
 				<greater-than-equals>
-					<property>/systems/electrical/bus/ac2</property>
+					<property>/systems/electrical/bus/ac1</property>
 					<value>25</value>
 				</greater-than-equals>
 				<equals>
@@ -59,7 +59,7 @@
 		<condition>
 			<and>
 				<greater-than-equals>
-					<property>/systems/electrical/bus/ac2</property>
+					<property>/systems/electrical/bus/ac1</property>
 					<value>25</value>
 				</greater-than-equals>
 				<equals>
@@ -81,7 +81,7 @@
 		<condition>
 			<and>
 				<greater-than-equals>
-					<property>/systems/electrical/bus/ac2</property>
+					<property>/systems/electrical/bus/ac1</property>
 					<value>25</value>
 				</greater-than-equals>
 				<equals>
@@ -103,7 +103,7 @@
 		<condition>
 			<and>
 				<greater-than-equals>
-					<property>/systems/electrical/bus/ac2</property>
+					<property>/systems/electrical/bus/ac1</property>
 					<value>25</value>
 				</greater-than-equals>
 				<equals>
@@ -147,7 +147,7 @@
 				<script>mcdu2.pagebutton("init");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -166,7 +166,7 @@
 				<script>mcdu2.pagebutton("data");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -182,29 +182,71 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu2.pagebutton("perfto");</script>
+				<script>mcdu2.pagebutton("perf");</script>
 				<condition>
-				<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<or>
-						<equals>
-							<property>/FMGC/status/phase</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/FMGC/status/phase</property>
-							<value>1</value>
-						</equals>
-					</or>
-				</and>
 				</condition>
 			</binding>
 		</action>
 	</animation>
 	
+	<animation>
+		<type>pick</type>
+		<object-name>L1</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu2.latbutton("1");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>L2</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu2.latbutton("2");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>L3</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu2.latbutton("3");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
 	<animation>
 		<type>pick</type>
 		<object-name>L4</object-name>
@@ -213,18 +255,48 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu2.pagebutton("status");</script>
+				<script>mcdu2.latbutton("4");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>L5</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu2.latbutton("5");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>L6</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu2.latbutton("6");</script>
 				<condition>
-					<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<equals>
-						<property>/MCDU[1]/page</property>
-						<value>DATA</value>
-					</equals>
-					</and>
 				</condition>
 			</binding>
 		</action>
@@ -232,28 +304,113 @@
 	
 	<animation>
 		<type>pick</type>
-		<object-name>right</object-name>
+		<object-name>R1</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu2.pagebutton("data2");</script>
+				<script>mcdu2.vertbutton("1");</script>
 				<condition>
-					<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<equals>
-						<property>/MCDU[1]/page</property>
-						<value>DATA</value>
-					</equals>
-					</and>
 				</condition>
 			</binding>
 		</action>
 	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>R2</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu2.vertbutton("2");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>R3</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu2.vertbutton("3");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>R4</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu2.vertbutton("4");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>R5</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu2.vertbutton("5");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>R6</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu2.vertbutton("6");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	
 	<animation>
 		<type>pick</type>
 		<object-name>left</object-name>
@@ -262,18 +419,12 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu2.pagebutton("data2");</script>
+				<script>mcdu2.arrowbutton("left");</script>
 				<condition>
-					<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<equals>
-						<property>/MCDU[1]/page</property>
-						<value>DATA</value>
-					</equals>
-					</and>
 				</condition>
 			</binding>
 		</action>
@@ -286,42 +437,48 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu2.pagebutton("data");</script>
+				<script>mcdu2.arrowbutton("right");</script>
 				<condition>
-					<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<equals>
-						<property>/MCDU[1]/page</property>
-						<value>DATA2</value>
-					</equals>
-					</and>
 				</condition>
 			</binding>
 		</action>
 	</animation>
 	<animation>
 		<type>pick</type>
-		<object-name>left</object-name>
+		<object-name>up</object-name>
 		<action>
 			<button>0</button>
 			<repeatable>false</repeatable>
 			<binding>
 				<command>nasal</command>
-				<script>mcdu2.pagebutton("data");</script>
+				<script>mcdu2.arrowbutton("up");</script>
+				<condition>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+				</condition>
+			</binding>
+		</action>
+	</animation>
+	<animation>
+		<type>pick</type>
+		<object-name>down</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>mcdu2.arrowbutton("down");</script>
 				<condition>
-					<and>
 					<greater-than-equals>
 						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
-					<equals>
-						<property>/MCDU[1]/page</property>
-						<value>DATA2</value>
-					</equals>
-					</and>
 				</condition>
 			</binding>
 		</action>
@@ -338,7 +495,7 @@
 				<script>mcdu2.button("A");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -356,7 +513,7 @@
 				<script>mcdu2.button("B");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -374,7 +531,7 @@
 				<script>mcdu2.button("C");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -392,7 +549,7 @@
 				<script>mcdu2.button("D");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -410,7 +567,7 @@
 				<script>mcdu2.button("E");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -428,7 +585,7 @@
 				<script>mcdu2.button("F");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -446,7 +603,7 @@
 				<script>mcdu2.button("G");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -464,7 +621,7 @@
 				<script>mcdu2.button("H");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -482,7 +639,7 @@
 				<script>mcdu2.button("I");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -500,7 +657,7 @@
 				<script>mcdu2.button("J");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -518,7 +675,7 @@
 				<script>mcdu2.button("K");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -536,7 +693,7 @@
 				<script>mcdu2.button("L");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -554,7 +711,7 @@
 				<script>mcdu2.button("M");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -572,7 +729,7 @@
 				<script>mcdu2.button("N");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -590,7 +747,7 @@
 				<script>mcdu2.button("O");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -608,7 +765,7 @@
 				<script>mcdu2.button("P");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -626,7 +783,7 @@
 				<script>mcdu2.button("Q");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -644,7 +801,7 @@
 				<script>mcdu2.button("R");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -662,7 +819,7 @@
 				<script>mcdu2.button("S");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -680,7 +837,7 @@
 				<script>mcdu2.button("T");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -698,7 +855,7 @@
 				<script>mcdu2.button("U");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -716,7 +873,7 @@
 				<script>mcdu2.button("V");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -734,7 +891,7 @@
 				<script>mcdu2.button("W");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -752,7 +909,7 @@
 				<script>mcdu2.button("X");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -770,7 +927,7 @@
 				<script>mcdu2.button("Y");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -788,7 +945,7 @@
 				<script>mcdu2.button("Z");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -806,7 +963,7 @@
 				<script>mcdu2.button("SLASH");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -824,7 +981,7 @@
 				<script>mcdu2.button("SP");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -842,7 +999,7 @@
 				<script>mcdu2.button("OVFY");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -860,7 +1017,7 @@
 				<script>mcdu2.button("CLR");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -878,7 +1035,7 @@
 				<script>mcdu2.button("0");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -896,7 +1053,7 @@
 				<script>mcdu2.button("1");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -914,7 +1071,7 @@
 				<script>mcdu2.button("2");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -932,7 +1089,7 @@
 				<script>mcdu2.button("3");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -950,7 +1107,7 @@
 				<script>mcdu2.button("4");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -968,7 +1125,7 @@
 				<script>mcdu2.button("5");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -986,7 +1143,7 @@
 				<script>mcdu2.button("6");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -1004,7 +1161,7 @@
 				<script>mcdu2.button("7");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -1022,7 +1179,7 @@
 				<script>mcdu2.button("8");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -1040,7 +1197,7 @@
 				<script>mcdu2.button("9");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -1058,7 +1215,7 @@
 				<script>mcdu2.button("DOT");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
@@ -1076,7 +1233,7 @@
 				<script>mcdu2.button("PLUSMINUS");</script>
 				<condition>
 					<greater-than-equals>
-						<property>/systems/electrical/bus/ac2</property>
+						<property>/systems/electrical/bus/ac1</property>
 						<value>25</value>
 					</greater-than-equals>
 				</condition>
diff --git a/Nasal/MCDU1.nas b/Nasal/MCDU1.nas
index 7f0407d2..1624f954 100644
--- a/Nasal/MCDU1.nas
+++ b/Nasal/MCDU1.nas
@@ -14,37 +14,70 @@ var MCDU_reset = func {
 	setprop("/MCDU[0]/scratchpad", " ");
 }
 
+var latbutton = func(btn) {
+	if (btn == "4") {
+		if (getprop("/MCDU[0]/page") == "DATA") {
+			setprop("/MCDU[0]/page", "NONE");
+			settimer(func {
+				setprop("/MCDU[0]/page", "STATUS");
+			}, 0.2);
+		}
+	}
+}
+
+var vertbutton = func(btn) {
+	# LOL Nothing here :D
+}
+
+var arrowbutton = func(btn) {
+	if (btn == "left") {
+		setprop("/MCDU[0]/page", "NONE");
+		if (getprop("/MCDU[0]/page") == "DATA") {
+			settimer(func {
+				setprop("/MCDU[0]/page", "DATA2");
+			}, 0.2);
+		} else if (getprop("/MCDU[0]/page") == "DATA2") {
+			settimer(func {
+				setprop("/MCDU[0]/page", "DATA");
+			}, 0.2);
+		}
+	} else if (btn == "right") {
+		setprop("/MCDU[0]/page", "NONE");
+		if (getprop("/MCDU[0]/page") == "DATA") {
+			settimer(func {
+				setprop("/MCDU[0]/page", "DATA2");
+			}, 0.2);
+		} else if (getprop("/MCDU[0]/page") == "DATA2") {
+			settimer(func {
+				setprop("/MCDU[0]/page", "DATA");
+			}, 0.2);
+		}
+	} else if (btn == "up") {
+		# Nothing for now
+	} else if (btn == "down") {
+		# Nothing for now
+	}
+}
+
 var pagebutton = func(btn) {
-	if (btn == "init") {
+	if (btn == "perf") {
+		setprop("/MCDU[0]/page", "NONE");
+		if (getprop("/FMGC/status/phase") == 0 or getprop("/FMGC/status/phase") == 1) {
+			settimer(func {
+				setprop("/MCDU[0]/page", "TO");
+			}, 0.2);
+		}
+	} else if (btn == "init") {
 		setprop("/MCDU[0]/page", "NONE");	
 		settimer(func {
 			setprop("/MCDU[0]/page", "INITA");
 		}, 0.2);
-	}
-	if (btn == "data") {
+	} else if (btn == "data") {
 		setprop("/MCDU[0]/page", "NONE");	
 		settimer(func {
 			setprop("/MCDU[0]/page", "DATA");
 		}, 0.2);
 	}
-	if (btn == "status") {
-		setprop("/MCDU[0]/page", "NONE");	
-		settimer(func {
-			setprop("/MCDU[0]/page", "STATUS");
-		}, 0.2);
-	}
-	if (btn == "data2") {
-		setprop("/MCDU[0]/page", "NONE");	
-		settimer(func {
-			setprop("/MCDU[0]/page", "DATA2");
-		}, 0.2);
-	}
-	if (btn == "perfto") {
-		setprop("/MCDU[0]/page", "NONE");	
-		settimer(func {
-			setprop("/MCDU[0]/page", "TO");
-		}, 0.2);
-	}
 }
 
 var button = func(btn) {
diff --git a/Nasal/MCDU2.nas b/Nasal/MCDU2.nas
index 55bf4d54..0f3613a9 100644
--- a/Nasal/MCDU2.nas
+++ b/Nasal/MCDU2.nas
@@ -14,37 +14,70 @@ var MCDU_reset = func {
 	setprop("/MCDU[1]/scratchpad", " ");
 }
 
+var latbutton = func(btn) {
+	if (btn == "4") {
+		if (getprop("/MCDU[1]/page") == "DATA") {
+			setprop("/MCDU[1]/page", "NONE");
+			settimer(func {
+				setprop("/MCDU[1]/page", "STATUS");
+			}, 0.2);
+		}
+	}
+}
+
+var vertbutton = func(btn) {
+	# LOL Nothing here :D
+}
+
+var arrowbutton = func(btn) {
+	if (btn == "left") {
+		setprop("/MCDU[1]/page", "NONE");
+		if (getprop("/MCDU[1]/page") == "DATA") {
+			settimer(func {
+				setprop("/MCDU[1]/page", "DATA2");
+			}, 0.2);
+		} else if (getprop("/MCDU[1]/page") == "DATA2") {
+			settimer(func {
+				setprop("/MCDU[1]/page", "DATA");
+			}, 0.2);
+		}
+	} else if (btn == "right") {
+		setprop("/MCDU[1]/page", "NONE");
+		if (getprop("/MCDU[1]/page") == "DATA") {
+			settimer(func {
+				setprop("/MCDU[1]/page", "DATA2");
+			}, 0.2);
+		} else if (getprop("/MCDU[1]/page") == "DATA2") {
+			settimer(func {
+				setprop("/MCDU[1]/page", "DATA");
+			}, 0.2);
+		}
+	} else if (btn == "up") {
+		# Nothing for now
+	} else if (btn == "down") {
+		# Nothing for now
+	}
+}
+
 var pagebutton = func(btn) {
-	if (btn == "init") {
+	if (btn == "perf") {
+		setprop("/MCDU[1]/page", "NONE");
+		if (getprop("/FMGC/status/phase") == 0 or getprop("/FMGC/status/phase") == 1) {
+			settimer(func {
+				setprop("/MCDU[1]/page", "TO");
+			}, 0.2);
+		}
+	} else if (btn == "init") {
 		setprop("/MCDU[1]/page", "NONE");	
 		settimer(func {
 			setprop("/MCDU[1]/page", "INITA");
 		}, 0.2);
-	}
-	if (btn == "data") {
+	} else if (btn == "data") {
 		setprop("/MCDU[1]/page", "NONE");	
 		settimer(func {
 			setprop("/MCDU[1]/page", "DATA");
 		}, 0.2);
 	}
-	if (btn == "status") {
-		setprop("/MCDU[1]/page", "NONE");	
-		settimer(func {
-			setprop("/MCDU[1]/page", "STATUS");
-		}, 0.2);
-	}
-	if (btn == "data2") {
-		setprop("/MCDU[1]/page", "NONE");	
-		settimer(func {
-			setprop("/MCDU[1]/page", "DATA2");
-		}, 0.2);
-	}
-	if (btn == "perfto") {
-		setprop("/MCDU[1]/page", "NONE");	
-		settimer(func {
-			setprop("/MCDU[1]/page", "TO");
-		}, 0.2);
-	}
 }
 
 var button = func(btn) {
@@ -104,7 +137,7 @@ var button = func(btn) {
 	} else if (btn == "SLASH") {
 		setprop("/MCDU[1]/scratchpad", scratchpad ~ "/");
 	} else if (btn == "SP") {
-		setprop("/MCDU[1]/scratchpad", scratchpad ~ " "); # adds a space
+		setprop("/MCDU[1]/scratchpad", scratchpad ~ " "); # this button adds a space
 	} else if (btn == "CLR") {
 		var scratchpad = getprop("/MCDU[1]/scratchpad");
 		if (scratchpad == " ") {