From 85bc70404002b8339c2321d19b7130f050a42448 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 7 Jun 2017 18:00:34 -0400
Subject: [PATCH] A3XX: Improve Spoilers, Improve FlyByWire

---
 A319-100-CFM.xml       |  2 +-
 A319-100-IAE.xml       |  2 +-
 A320-200-CFM.xml       |  2 +-
 A320-200-IAE.xml       |  2 +-
 A320-main.xml          |  1 +
 A321-200-CFM.xml       |  2 +-
 A321-200-IAE.xml       |  2 +-
 Systems/hydraulics.xml | 81 +++++++++++++++++++++++++++++++++++++++---
 8 files changed, 84 insertions(+), 10 deletions(-)

diff --git a/A319-100-CFM.xml b/A319-100-CFM.xml
index 7176f6f1..c6c2a2ca 100644
--- a/A319-100-CFM.xml
+++ b/A319-100-CFM.xml
@@ -835,7 +835,7 @@ YAW MOI_________3950000______23089847_______24848934
 
 	<channel name="Speedbrake">
 		<kinematic name="Speedbrake">
-			<input>fcs/speedbrake-cmd-norm</input>
+			<input>/controls/flight/spoiler-output</input>
 			<traverse>
 			<setting>
 				<position>0</position>
diff --git a/A319-100-IAE.xml b/A319-100-IAE.xml
index 45b6875f..155a35ee 100644
--- a/A319-100-IAE.xml
+++ b/A319-100-IAE.xml
@@ -835,7 +835,7 @@ YAW MOI_________3950000______23089847_______24848934
 
 	<channel name="Speedbrake">
 		<kinematic name="Speedbrake">
-			<input>fcs/speedbrake-cmd-norm</input>
+			<input>/controls/flight/spoiler-output</input>
 			<traverse>
 			<setting>
 				<position>0</position>
diff --git a/A320-200-CFM.xml b/A320-200-CFM.xml
index f682174b..7761aba8 100644
--- a/A320-200-CFM.xml
+++ b/A320-200-CFM.xml
@@ -835,7 +835,7 @@ YAW MOI_________3950000______23089847_______24848934
 
 	<channel name="Speedbrake">
 		<kinematic name="Speedbrake">
-			<input>fcs/speedbrake-cmd-norm</input>
+			<input>/controls/flight/spoiler-output</input>
 			<traverse>
 			<setting>
 				<position>0</position>
diff --git a/A320-200-IAE.xml b/A320-200-IAE.xml
index f567bcfb..9a8f44fc 100644
--- a/A320-200-IAE.xml
+++ b/A320-200-IAE.xml
@@ -835,7 +835,7 @@ YAW MOI_________3950000______23089847_______24848934
 
 	<channel name="Speedbrake">
 		<kinematic name="Speedbrake">
-			<input>fcs/speedbrake-cmd-norm</input>
+			<input>/controls/flight/spoiler-output</input>
 			<traverse>
 			<setting>
 				<position>0</position>
diff --git a/A320-main.xml b/A320-main.xml
index 1e5f2b64..51620a5c 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -438,6 +438,7 @@
 			<elevator-right>0.1</elevator-right>
 			<elevator-sum>0.2</elevator-sum>
 			<spoiler-left>0.0</spoiler-left>
+			<spoiler-output>0.0</spoiler-output>
 			<spoiler-right>0.0</spoiler-right>
 			<speedbrake-arm>0</speedbrake-arm>
 			<ground-spoilers-armed type="bool">0</ground-spoilers-armed>
diff --git a/A321-200-CFM.xml b/A321-200-CFM.xml
index a3593a9e..c5312ba2 100644
--- a/A321-200-CFM.xml
+++ b/A321-200-CFM.xml
@@ -835,7 +835,7 @@ YAW MOI_________3950000______23089847_______24848934
 
 	<channel name="Speedbrake">
 		<kinematic name="Speedbrake">
-			<input>fcs/speedbrake-cmd-norm</input>
+			<input>/controls/flight/spoiler-output</input>
 			<traverse>
 			<setting>
 				<position>0</position>
diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml
index c6350a01..553776a5 100644
--- a/A321-200-IAE.xml
+++ b/A321-200-IAE.xml
@@ -835,7 +835,7 @@ YAW MOI_________3950000______23089847_______24848934
 
 	<channel name="Speedbrake">
 		<kinematic name="Speedbrake">
-			<input>fcs/speedbrake-cmd-norm</input>
+			<input>/controls/flight/spoiler-output</input>
 			<traverse>
 			<setting>
 				<position>0</position>
diff --git a/Systems/hydraulics.xml b/Systems/hydraulics.xml
index 764fd2f0..e27e2bb5 100644
--- a/Systems/hydraulics.xml
+++ b/Systems/hydraulics.xml
@@ -64,7 +64,7 @@
 						</greater-than-equals>
 					</or>
 					<equals>
-						<property>/controls/flight/speedbrake-lever</property>
+						<property>/surface-positions/speedbrake-pos-norm</property>
 						<value>1.0</value>
 					</equals>
 					<equals>
@@ -178,7 +178,7 @@
 						</greater-than-equals>
 					</or>
 					<equals>
-						<property>/controls/flight/speedbrake-lever</property>
+						<property>/surface-positions/speedbrake-pos-norm</property>
 						<value>1.0</value>
 					</equals>
 					<equals>
@@ -504,7 +504,7 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-left-cmd</input>
 		<output>/controls/flight/spoiler-left</output>
-		<max-rate-of-change>1.0</max-rate-of-change>
+		<max-rate-of-change>0.5</max-rate-of-change>
 	</filter>
 	
 	<filter>
@@ -732,7 +732,80 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-right-cmd</input>
 		<output>/controls/flight/spoiler-right</output>
-		<max-rate-of-change>1.0</max-rate-of-change>
+		<max-rate-of-change>0.5</max-rate-of-change>
+	</filter>
+	
+	<filter>
+		<debug>false</debug>
+		<type>noise-spike</type>
+		<input>
+			<condition>
+				<and>
+					<or>
+						<and>
+							<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>
+						</and>
+						<and>
+							<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>
+						</and>
+					</or>
+					<equals>
+						<property>/systems/failures/spoiler-left</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/systems/failures/spoiler-right</property>
+						<value>0</value>
+					</equals>
+				</and>
+			</condition>
+			<property>/fdm/jsbsim/fcs/speedbrake-cmd-norm</property>
+		</input>
+		<input>
+			<condition>
+				<or>
+					<and>
+						<less-than>
+							<property>/systems/hydraulic/green-psi</property>
+							<value>1500</value>
+						</less-than>
+						<less-than>
+							<property>/systems/hydraulic/blue-psi</property>
+							<value>1500</value>
+						</less-than>
+						<less-than>
+							<property>/systems/hydraulic/yellow-psi</property>
+							<value>1500</value>
+						</less-than>
+					</and>
+					<equals>
+						<property>/systems/failures/spoiler-left</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>/systems/failures/spoiler-right</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</condition>
+			<value>0.0</value>
+		</input>
+		<output>/controls/flight/spoiler-output</output>
+		<max-rate-of-change>0.5</max-rate-of-change>
 	</filter>
 	
  <!-- =============================================================== -->