From b4c83e22dfec2993146a5f74d9c32c334adde9b7 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 24 Dec 2017 12:34:22 -0500
Subject: [PATCH] A3XX: Autocoordination handler will now reconfigure tiller to
 use aileron as input, instead of rudder

---
 A320-main.xml         |  1 +
 Nasal/libraries.nas   |  5 +++--
 Systems/a320-fcs.xml  | 13 ++++++++++---
 Systems/libraries.xml | 24 +++++++++---------------
 revision.txt          |  2 +-
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 9ee7f944..9aace4d3 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -527,6 +527,7 @@
 			</engine>
 		</engines>
 		<flight>
+			<aileron-drives-tiller type="bool">0</aileron-drives-tiller>
 			<aileron-input>0</aileron-input>
 			<aileron-left>0.5</aileron-left>
 			<aileron-right>-0.5</aileron-right>
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index ebdaf6cd..1258eb62 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -516,8 +516,9 @@ var r2Pedal = func {
 
 if (getprop("/controls/flight/auto-coordination") == 1) {
 	setprop("/controls/flight/auto-coordination", 0);
-	gui.popupTip("System: Auto Coordination has been turned off for this session.");
-	print("System: Auto Coordination has been turned off for this session.");
+	setprop("/controls/flight/aileron-drives-tiller", 1);
+} else {
+	setprop("/controls/flight/aileron-drives-tiller", 0);
 }
 
 setprop("/systems/acconfig/libraries-loaded", 1);
diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index 00b191ee..04c5f8e1 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -796,11 +796,18 @@
 	
 	<channel name="Tiller">
 		
-		<fcs_function name="fcs/steer-nose-deg[0]">
+		<switch name="hydraulics/tiller/switch">
+			<default value="/controls/flight/rudder"/>
+			<test value="/controls/flight/aileron">
+				/controls/flight/aileron-drives-tiller EQ 1
+			</test>
+		</switch>
+		
+		<fcs_function name="hydraulics/tiller/function">
 			<function>
 				<table>
 					<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
-					<independentVar lookup="column">/controls/flight/rudder</independentVar>
+					<independentVar lookup="column">hydraulics/tiller/switch</independentVar>
 					<tableData>
 						       -1     0  1
 						30.000 -70.0  0  70.0
@@ -811,7 +818,7 @@
 		</fcs_function>
 		
 		<actuator name="fcs/steer-deg">
-			<input>fcs/steer-nose-deg[0]</input>
+			<input>hydraulics/tiller/function</input>
 			<rate_limit>70</rate_limit>
 			<output>fcs/steer-pos-deg[0]</output>
 		</actuator>
diff --git a/Systems/libraries.xml b/Systems/libraries.xml
index c653cf57..0dfa1363 100644
--- a/Systems/libraries.xml
+++ b/Systems/libraries.xml
@@ -675,23 +675,17 @@
 	</filter>
 	
 	<filter>
-		<name>Rudder Limit</name>
+		<name>Force Auto Coordination Off</name>
 		<type>gain</type>
 		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<property>/velocities/airspeed-kt</property>
-					<entry><ind>   0</ind><dep> 30</dep></entry>
-					<entry><ind> 140</ind><dep> 30</dep></entry>
-					<entry><ind> 240</ind><dep> 10</dep></entry>
-					<entry><ind> 380</ind><dep>3.4</dep></entry>
-					<entry><ind>1000</ind><dep>3.4</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/controls/flight/rudder-limit</output>
+		<enable>
+			<condition>
+				<property>/controls/flight/aileron-drives-tiller</property>
+			</condition>
+		</enable>
+		<input>0</input>
+		<output>/controls/flight/auto-coordination</output>
 	</filter>
-	
+
 </PropertyList>
diff --git a/revision.txt b/revision.txt
index f42d26ff..856ff087 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4111
\ No newline at end of file
+4112
\ No newline at end of file