From 20fc17746ab81ab858a996f7e530e71ae924d77a Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 20 Dec 2017 22:08:37 -0500
Subject: [PATCH] A32X: Add proper Rudder Trim

---
 A320-main.xml                         |  1 +
 Models/FlightDeck/a320.flightdeck.xml |  2 +-
 Systems/a320-fcs.xml                  | 28 +++++++++++++++++++++----
 Systems/hydraulics.xml                | 30 +++++++++++++++++++++++++++
 Systems/libraries.xml                 | 18 ----------------
 5 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index bec69879..a1faff12 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -516,6 +516,7 @@
 			<flap-pos type="int">0</flap-pos>
 			<ground-spoilers-armed type="bool">0</ground-spoilers-armed>
 			<roll-fbw>0</roll-fbw>
+			<rudder-trim-fdm>0.0</rudder-trim-fdm>
 			<spoiler-l1>0.0</spoiler-l1>
 			<spoiler-l2>0.0</spoiler-l2>
 			<spoiler-l3>0.0</spoiler-l3>
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index b657f861..1e6ae8b6 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -574,7 +574,7 @@
 		<axis-alignment>xy-plane</axis-alignment>
 		<type type="string">number-value</type>
 		<format type="string">%2.1f</format>
-		<property>controls/flight/rudder-trim-deg</property>
+		<property>fdm/jsbsim/fcs/rudder-trim-cmd-deg</property>
 		<truncate type="bool">false</truncate>
 		<font type="string">led.txf</font>
 		<draw-text type="bool">true</draw-text>
diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index 5dd29c98..1b64a8d5 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -572,9 +572,29 @@
 			</test>
 		</switch>
 		
+		<aerosurface_scale name="fcs/rudder-trim-cmd-deg">
+			<input>/controls/flight/rudder-trim</input>
+			<domain>
+				<min>-1.0</min>
+				<max>1.0</max>
+			</domain>
+			<range>
+				<min>-20.0</min>
+				<max>20.0</max>
+			</range>
+		</aerosurface_scale>
+		
+		<aerosurface_scale name="hydraulics/rudder/trim-norm">
+			<input>/controls/flight/rudder-trim-fdm</input>
+			<range>
+				<min>-0.8</min>
+				<max>0.8</max>
+			</range>
+		</aerosurface_scale>
+		
 		<summer name="hydraulics/rudder/summer">
 			<input>/controls/flight/rudder-fbw</input>
-			<input>/controls/flight/rudder-trim</input>
+			<input>hydraulics/rudder/trim-norm</input>
 			<clipto>
 				<min>-1</min>
 				<max>1</max>
@@ -782,9 +802,9 @@
 					<independentVar lookup="row">/velocities/groundspeed-kt</independentVar>
 					<independentVar lookup="column">/controls/flight/rudder</independentVar>
 					<tableData>
-						        -1     0  1
-						30.000  -70.0  0  70.0
-						30.001  -10.0  0  10.0
+						       -1     0  1
+						30.000 -70.0  0  70.0
+						30.001 -10.0  0  10.0
 					</tableData>
 				</table>
 			</function>
diff --git a/Systems/hydraulics.xml b/Systems/hydraulics.xml
index e4f8eb5e..db526172 100644
--- a/Systems/hydraulics.xml
+++ b/Systems/hydraulics.xml
@@ -1159,6 +1159,10 @@
 		</input>
 		<output>/controls/flight/spoiler-r-sum</output>
 	</filter>
+	
+ <!-- =============================================================== -->
+ <!-- Trims                                                           -->
+ <!-- =============================================================== -->
 
 	<filter>
 		<debug>false</debug>
@@ -1176,6 +1180,32 @@
 		<max-rate-of-change>0.1</max-rate-of-change>
 	</filter>
 	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<enable>
+			<condition>
+				<or>
+					<greater-than-equals>
+						<property>/systems/hydraulic/green-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<greater-than-equals>
+						<property>/systems/hydraulic/blue-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+					<greater-than-equals>
+						<property>/systems/hydraulic/yellow-psi</property>
+						<value>1500</value>
+					</greater-than-equals>
+				</or>
+			</condition>
+		</enable>
+		<input>/controls/flight/rudder-trim</input>
+		<output>/controls/flight/rudder-trim-fdm</output>
+		<max-rate-of-change>0.5</max-rate-of-change>
+	</filter>
+	
  <!-- =============================================================== -->
  <!-- Speedbrake Logic                                                -->
  <!-- =============================================================== -->
diff --git a/Systems/libraries.xml b/Systems/libraries.xml
index 1cbb5aed..c653cf57 100644
--- a/Systems/libraries.xml
+++ b/Systems/libraries.xml
@@ -70,24 +70,6 @@
 		<filter-gain>0.0</filter-gain>
 	</predict-simple>
 	
-	<filter>
-		<name>Rudder Trim</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs type="double">0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<property>/controls/flight/rudder-trim</property>
-					<entry><ind>-1</ind><dep>-10.0</dep></entry>
-					<entry><ind> 0</ind><dep>  0.0</dep></entry>
-					<entry><ind> 1</ind><dep> 10.0</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/controls/flight/rudder-trim-deg</output>
-	</filter>
-
 	<filter>
 		<name>FF 1</name>
 		<type>gain</type>