From 03cefb16b947aa7680cf6b9c8809d65489da13ef Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 31 May 2017 14:46:20 -0400
Subject: [PATCH] Hydraulic and FBW: Improve Flight Control Response, fix
 spoileron activation

---
 A320-main.xml          |  1 +
 Systems/hydraulics.xml | 20 ++++++++--------
 Systems/it-fbw-b.xml   | 52 +++++++++++++++++++++++++++++++++++++-----
 Systems/it-fbw.xml     | 20 ++++++++--------
 4 files changed, 67 insertions(+), 26 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 5e2c7307..cdd0d313 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -426,6 +426,7 @@
 			</engine>
 		</engines>
 		<flight>
+			<aileron-input>0</aileron-input>
 			<aileron-fbw>0</aileron-fbw>
 			<aileron-left>0.5</aileron-left>
 			<aileron-right>-0.5</aileron-right>
diff --git a/Systems/hydraulics.xml b/Systems/hydraulics.xml
index bda808a0..5c4cf66d 100644
--- a/Systems/hydraulics.xml
+++ b/Systems/hydraulics.xml
@@ -222,9 +222,9 @@
 				<sum>
 					<property>/surface-positions/speedbrake-pos-norm</property>
 					<table>
-						<property>/controls/flight/aileron-fbw</property> 
-						<entry><ind>0</ind><dep>   0</dep></entry>
-						<entry><ind>1</ind><dep>-0.5</dep></entry>
+						<property>/controls/flight/spoiler-left-fbw-cmd</property> 
+						<entry><ind>0.2</ind><dep>   0</dep></entry>
+						<entry><ind>1.0</ind><dep>-0.5</dep></entry>
 					</table>
 				</sum>
 			</expression>
@@ -275,8 +275,8 @@
 			</condition>
             <expression>
                 <table>
-                    <property>/controls/flight/aileron-fbw</property> 
-                    <entry><ind> 0.0</ind><dep>  0</dep></entry>
+                    <property>/controls/flight/spoiler-left-fbw-cmd</property> 
+                    <entry><ind>-0.2</ind><dep>  0</dep></entry>
                     <entry><ind>-1.0</ind><dep>0.5</dep></entry>
                 </table>
             </expression>
@@ -333,9 +333,9 @@
 				<sum>
 					<property>/surface-positions/speedbrake-pos-norm</property>
 					<table>
-						<property>/controls/flight/aileron-fbw</property> 
-						<entry><ind> 0</ind><dep>   0</dep></entry>
-						<entry><ind>-1</ind><dep>-0.5</dep></entry>
+						<property>/controls/flight/spoiler-right-fbw-cmd</property> 
+						<entry><ind> 0.2</ind><dep>   0</dep></entry>
+						<entry><ind>-1.0</ind><dep>-0.5</dep></entry>
 					</table>
 				</sum>
 			</expression>
@@ -386,8 +386,8 @@
 			</condition>
             <expression>
                 <table>
-                    <property>/controls/flight/aileron-fbw</property> 
-                    <entry><ind>0.0</ind><dep>  0</dep></entry>
+                    <property>/controls/flight/spoiler-right-fbw-cmd</property> 
+                    <entry><ind>0.2</ind><dep>  0</dep></entry>
                     <entry><ind>1.0</ind><dep>0.5</dep></entry>
                 </table>
             </expression>
diff --git a/Systems/it-fbw-b.xml b/Systems/it-fbw-b.xml
index 9aa6ce9e..70a8c9d5 100644
--- a/Systems/it-fbw-b.xml
+++ b/Systems/it-fbw-b.xml
@@ -5,14 +5,22 @@
 
 <PropertyList>
 
+
  <!-- =============================================================== -->
- <!-- Elevator Position Feeding                                       -->
+ <!-- Surface Position Feeding                                        -->
  <!-- =============================================================== -->
 
 	<filter>
 		<debug>false</debug>
-		<type>gain</type>
-		<gain>1.0</gain>
+		<type>noise-spike</type>
+		<input>/controls/flight/aileron</input>
+		<output>/controls/flight/aileron-input</output>
+		<max-rate-of-change>2.5</max-rate-of-change>
+	</filter>
+
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
 		<input>
 			<condition>
 				<and>
@@ -61,6 +69,7 @@
 			<property>/controls/flight/elevator</property>
 		</input>
 		<output>/controls/flight/elevator-input</output>
+		<max-rate-of-change>2.5</max-rate-of-change>
 	</filter>
 
  <!-- =============================================================== -->
@@ -178,7 +187,7 @@
 					</equals>
 				</or>
 			</condition>
-			<property>/controls/flight/aileron</property>
+			<property>/controls/flight/aileron-input</property>
 		</input>
 		<input>
 			<condition>
@@ -189,11 +198,42 @@
 			</condition>
 			<value>0</value>
 		</input>
-		<output>/controls/flight/aileron-fbw</output>
+		<output>/controls/flight/roll-fbw</output>
 		<type>noise-spike</type>
 		<max-rate-of-change>10</max-rate-of-change>
 	</filter>
 	
+	<filter>
+		<name>IT-FBW: AILERON</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>/controls/flight/roll-fbw</input>
+		<output>/controls/flight/aileron-fbw</output>
+	</filter>
+	
+	<filter>
+		<name>IT-FBW: LEFT SPOILER</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>/controls/flight/roll-fbw</input>
+		<output>/controls/flight/spoiler-left-fbw-cmd</output>
+		<min>-1</min>
+		<max>0</max>
+	</filter>
+	
+	<filter>
+		<name>IT-FBW: RIGHT SPOILER</name>
+		<type>gain</type>
+		<gain>1</gain>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<input>/controls/flight/roll-fbw</input>
+		<output>/controls/flight/spoiler-right-fbw-cmd</output>
+		<min>0</min>
+		<max>1</max>
+	</filter>
+	
  <!-- =============================================================== -->
  <!-- Vertical                                                        -->
  <!-- =============================================================== -->
@@ -321,7 +361,7 @@
 					</equals>
 				</or>
 			</condition>
-			<property>/controls/flight/elevator</property>
+			<property>/controls/flight/elevator-input</property>
 		</input>
 		<input>
 			<condition>
diff --git a/Systems/it-fbw.xml b/Systems/it-fbw.xml
index 5a47be0d..5aab3337 100644
--- a/Systems/it-fbw.xml
+++ b/Systems/it-fbw.xml
@@ -36,19 +36,19 @@
 					<sum>
 						<property>/it-fbw/roll-deg</property>
 						<table>
-							<independentVar lookup="row">/controls/flight/aileron</independentVar>
+							<independentVar lookup="row">/controls/flight/aileron-input</independentVar>
 							<tableData>
 							-1.0     -0.1
 							-0.7     -0.07
-							-0.5     -0.045
-							-0.3     -0.022
-							-0.15    -0.008
-							-0.05    -0.003
-							 0.00     0.000
-							 0.05     0.003
-							 0.15     0.008
-							 0.3      0.022
-							 0.5      0.045
+							-0.5     -0.04
+							-0.3     -0.02
+							-0.15    -0.01
+							-0.05    -0.005
+							 0.00     0.00
+							 0.05     0.005
+							 0.15     0.01
+							 0.3      0.02
+							 0.5      0.04
 							 0.7      0.07
 							 1.0      0.1
 							</tableData>