From 1483f8e3f414de284f2291265f9e280d9849044a Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Mon, 25 Sep 2017 21:21:09 -0400
Subject: [PATCH] A32X: Add Keyboard Mode

---
 A320-main.xml           | 170 +++++++++++++++++++++++++++++++++++++++-
 AircraftConfig/help.xml |   7 ++
 AircraftConfig/main.xml |   3 -
 revision.txt            |   2 +-
 4 files changed, 175 insertions(+), 7 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index a55b82cd..6863de23 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -850,30 +850,194 @@
 		<keyboard>
 			<key n="49">
 				<name>1</name>
-				<desc>Captain View</desc>
+				<desc>Captain View/Elevator Trim Up</desc>
 				<binding>
+					<condition>
+						<not><property>/options/system/keyboard-mode</property></not>
+					</condition>
 					<command>property-assign</command>
 					<property>/sim/current-view/view-number</property>
 					<value>0</value>
 				</binding>
+				<binding>
+					<condition>
+						<property>/options/system/keyboard-mode</property>
+					</condition>
+					<command>property-adjust</command>
+					<property>/controls/flight/elevator-trim</property>
+					<step>-0.001</step>
+				</binding>
 			</key>
 			<key n="50">
 				<name>2</name>
-				<desc>First Officer View</desc>
+				<desc>First Officer View/Elevator Up</desc>
 				<binding>
+					<condition>
+						<not><property>/options/system/keyboard-mode</property></not>
+					</condition>
 					<command>property-assign</command>
 					<property>/sim/current-view/view-number</property>
 					<value>8</value>
 				</binding>
+				<binding>
+					<condition>
+						<property>/options/system/keyboard-mode</property>
+					</condition>
+					<command>nasal</command>
+					<script>
+						setprop("/controls/flight/elevator", getprop("/controls/flight/elevator") - 0.05);
+					</script>
+				</binding>
 			</key>
 			<key n="51">
 				<name>3</name>
-				<desc>Overhead View</desc>
+				<desc>Overhead View/Throttle Decrease</desc>
 				<binding>
+					<condition>
+						<not><property>/options/system/keyboard-mode</property></not>
+					</condition>
 					<command>property-assign</command>
 					<property>/sim/current-view/view-number</property>
 					<value>9</value>
 				</binding>
+				<binding>
+					<condition>
+						<property>/options/system/keyboard-mode</property>
+					</condition>
+					<command>nasal</command>
+					<script>
+						setprop("/controls/engines/engine[0]/throttle", getprop("/controls/engines/engine[0]/throttle") - 0.01);
+						setprop("/controls/engines/engine[1]/throttle", getprop("/controls/engines/engine[0]/throttle") - 0.01); # Not a typo, always use engine[0] as a reference
+					</script>
+				</binding>
+			</key>
+			<key n="52">
+				<name>4</name>
+				<desc>Aileron Left</desc>
+				<!--binding>
+					<condition>
+						<not><property>/options/system/keyboard-mode</property></not>
+					</condition>
+					<command>property-assign</command>
+					<property>/sim/current-view/view-number</property>
+					<value></value>
+				</binding-->
+				<binding>
+					<condition>
+						<property>/options/system/keyboard-mode</property>
+					</condition>
+					<command>nasal</command>
+					<script>
+						setprop("/controls/flight/aileron", getprop("/controls/flight/aileron") - 0.05);
+					</script>
+				</binding>
+			</key>
+			<key n="53">
+				<name>5</name>
+				<desc>Center Controls</desc>
+				<!--binding>
+					<condition>
+						<not><property>/options/system/keyboard-mode</property></not>
+					</condition>
+					<command>property-assign</command>
+					<property>/sim/current-view/view-number</property>
+					<value></value>
+				</binding-->
+				<binding>
+					<condition>
+						<property>/options/system/keyboard-mode</property>
+					</condition>
+					<command>nasal</command>
+					<script>
+						setprop("/controls/flight/aileron", 0);
+						setprop("/controls/flight/elevator", 0);
+						setprop("/controls/flight/rudder", 0);
+					</script>
+				</binding>
+			</key>
+			<key n="54">
+				<name>6</name>
+				<desc>Aileron Right</desc>
+				<!--binding>
+					<condition>
+						<not><property>/options/system/keyboard-mode</property></not>
+					</condition>
+					<command>property-assign</command>
+					<property>/sim/current-view/view-number</property>
+					<value></value>
+				</binding-->
+				<binding>
+					<condition>
+						<property>/options/system/keyboard-mode</property>
+					</condition>
+					<command>nasal</command>
+					<script>
+						setprop("/controls/flight/aileron", getprop("/controls/flight/aileron") + 0.05);
+					</script>
+				</binding>
+			</key>
+			<key n="55">
+				<name>7</name>
+				<desc>Elevator Trim Down</desc>
+				<!--binding>
+					<condition>
+						<not><property>/options/system/keyboard-mode</property></not>
+					</condition>
+					<command>property-assign</command>
+					<property>/sim/current-view/view-number</property>
+					<value></value>
+				</binding-->
+				<binding>
+					<condition>
+						<property>/options/system/keyboard-mode</property>
+					</condition>
+					<command>property-adjust</command>
+					<property>/controls/flight/elevator-trim</property>
+					<step>0.001</step>
+				</binding>
+			</key>
+			<key n="56">
+				<name>8</name>
+				<desc>Elevator Down</desc>
+				<!--binding>
+					<condition>
+						<not><property>/options/system/keyboard-mode</property></not>
+					</condition>
+					<command>property-assign</command>
+					<property>/sim/current-view/view-number</property>
+					<value></value>
+				</binding-->
+				<binding>
+					<condition>
+						<property>/options/system/keyboard-mode</property>
+					</condition>
+					<command>nasal</command>
+					<script>
+						setprop("/controls/flight/elevator", getprop("/controls/flight/elevator") + 0.05);
+					</script>
+				</binding>
+			</key>
+			<key n="57">
+				<name>9</name>
+				<desc>Throttle Increase</desc>
+				<!--binding>
+					<condition>
+						<not><property>/options/system/keyboard-mode</property></not>
+					</condition>
+					<command>property-assign</command>
+					<property>/sim/current-view/view-number</property>
+					<value></value>
+				</binding-->
+				<binding>
+					<condition>
+						<property>/options/system/keyboard-mode</property>
+					</condition>
+					<command>nasal</command>
+					<script>
+						setprop("/controls/engines/engine[0]/throttle", getprop("/controls/engines/engine[0]/throttle") + 0.01);
+						setprop("/controls/engines/engine[1]/throttle", getprop("/controls/engines/engine[0]/throttle") + 0.01); # Not a typo, always use engine[0] as a reference
+					</script>
+				</binding>
 			</key>
 			<key n="127">
 				<name>DEL</name>
diff --git a/AircraftConfig/help.xml b/AircraftConfig/help.xml
index 41fe6577..adb7bee8 100644
--- a/AircraftConfig/help.xml
+++ b/AircraftConfig/help.xml
@@ -49,6 +49,13 @@
 			
 			<hrule/>
 			
+			<text>
+				<halign>left</halign>
+				<label>Keyboard Mode: Maps flight controls to number pad, and number rows, instead of view shortucts.</label>
+			</text>
+			
+			<hrule/>
+			
 			<text>
 				<halign>left</halign>
 				<label>Key Commands:</label>
diff --git a/AircraftConfig/main.xml b/AircraftConfig/main.xml
index 4f246981..fc7c2de8 100644
--- a/AircraftConfig/main.xml
+++ b/AircraftConfig/main.xml
@@ -359,9 +359,6 @@
 			<checkbox>
 				<label>Keyboard Mode (See Aircraft Help)</label>
 				<halign>left</halign>
-				<enable>
-					<property>/systems/acconfig/unused</property>
-				</enable>
 				<property>/options/system/keyboard-mode</property>
 				<binding>
 					<command>property-toggle</command>
diff --git a/revision.txt b/revision.txt
index 4b3506d6..ec2aa7c8 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-1534
\ No newline at end of file
+1535
\ No newline at end of file