From d53fd0122b10d65d47fae2d7809101dca3833b00 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 22 Jul 2018 13:55:24 -0400
Subject: [PATCH] Control: Spoiler correction

---
 Systems/a320-spoiler.xml | 68 ++++++----------------------------------
 revision.txt             |  2 +-
 2 files changed, 11 insertions(+), 59 deletions(-)

diff --git a/Systems/a320-spoiler.xml b/Systems/a320-spoiler.xml
index 15a9f285..ae3553d6 100644
--- a/Systems/a320-spoiler.xml
+++ b/Systems/a320-spoiler.xml
@@ -103,15 +103,7 @@
 	<channel name="Spoiler L1">
 		
 		<switch name="hydraulics/spoiler-l1/switch">
-			<default value="hydraulics/spoiler-l1/switch"/>
-			<test logic="AND" value="0">
-				/systems/hydraulic/green-psi ge 1500
-				spoilers/main-gear-and eq 0
-			</test>
-			<test logic="AND" value="0">
-				/systems/hydraulic/green-psi ge 1500
-				/systems/failures/spoiler-l1 eq 1
-			</test>
+			<default value="0"/>
 			<test logic="AND" value="spoilers/main-cmd">
 				/systems/hydraulic/green-psi ge 1500
 				spoilers/main-gear-and eq 1
@@ -201,11 +193,7 @@
 		</fcs_function>
 		
 		<switch name="hydraulics/spoiler-l2/switch">
-			<default value="hydraulics/spoiler-l2/switch"/>
-			<test logic="AND" value="0">
-				/systems/hydraulic/yellow-psi ge 1500
-				/systems/failures/spoiler-l2 eq 1
-			</test>
+			<default value="0"/>
 			<test logic="AND" value="hydraulics/spoiler-l2/air-extended">
 				/systems/hydraulic/yellow-psi ge 1500
 				spoilers/main-gear-and eq 0
@@ -276,11 +264,7 @@
 		</fcs_function>
 		
 		<switch name="hydraulics/spoiler-l3/switch">
-			<default value="hydraulics/spoiler-l3/switch"/>
-			<test logic="AND" value="0">
-				/systems/hydraulic/blue-psi ge 1500
-				/systems/failures/spoiler-l3 eq 1
-			</test>
+			<default value="0"/>
 			<test logic="AND" value="hydraulics/spoiler-l3/extended">
 				/systems/hydraulic/blue-psi ge 1500
 				/systems/failures/spoiler-l3 eq 0
@@ -344,11 +328,7 @@
 		</fcs_function>
 		
 		<switch name="hydraulics/spoiler-l4/switch">
-			<default value="hydraulics/spoiler-l4/switch"/>
-			<test logic="AND" value="0">
-				/systems/hydraulic/yellow-psi ge 1500
-				/systems/failures/spoiler-l4 eq 1
-			</test>
+			<default value="0"/>
 			<test logic="AND" value="hydraulics/spoiler-l4/extended">
 				/systems/hydraulic/yellow-psi ge 1500
 				/systems/failures/spoiler-l4 eq 0
@@ -412,11 +392,7 @@
 		</fcs_function>
 		
 		<switch name="hydraulics/spoiler-l5/switch">
-			<default value="hydraulics/spoiler-l5/switch"/>
-			<test logic="AND" value="0">
-				/systems/hydraulic/green-psi ge 1500
-				/systems/failures/spoiler-l5 eq 1
-			</test>
+			<default value="0"/>
 			<test logic="AND" value="hydraulics/spoiler-l5/ground-extended">
 				/systems/hydraulic/green-psi ge 1500
 				spoilers/main-gear-and eq 1
@@ -454,15 +430,7 @@
 	<channel name="Spoiler R1">
 		
 		<switch name="hydraulics/spoiler-r1/switch">
-			<default value="hydraulics/spoiler-r1/switch"/>
-			<test logic="AND" value="0">
-				/systems/hydraulic/green-psi ge 1500
-				spoilers/main-gear-and eq 0
-			</test>
-			<test logic="AND" value="0">
-				/systems/hydraulic/green-psi ge 1500
-				/systems/failures/spoiler-r1 eq 1
-			</test>
+			<default value="0"/>
 			<test logic="AND" value="spoilers/main-cmd">
 				/systems/hydraulic/green-psi ge 1500
 				spoilers/main-gear-and eq 1
@@ -552,11 +520,7 @@
 		</fcs_function>
 		
 		<switch name="hydraulics/spoiler-r2/switch">
-			<default value="hydraulics/spoiler-r2/switch"/>
-			<test logic="AND" value="0">
-				/systems/hydraulic/yellow-psi ge 1500
-				/systems/failures/spoiler-r2 eq 1
-			</test>
+			<default value="0"/>
 			<test logic="AND" value="hydraulics/spoiler-r2/air-extended">
 				/systems/hydraulic/yellow-psi ge 1500
 				spoilers/main-gear-and eq 0
@@ -627,11 +591,7 @@
 		</fcs_function>
 		
 		<switch name="hydraulics/spoiler-r3/switch">
-			<default value="hydraulics/spoiler-r3/switch"/>
-			<test logic="AND" value="0">
-				/systems/hydraulic/blue-psi ge 1500
-				/systems/failures/spoiler-r3 eq 1
-			</test>
+			<default value="0"/>
 			<test logic="AND" value="hydraulics/spoiler-r3/extended">
 				/systems/hydraulic/blue-psi ge 1500
 				/systems/failures/spoiler-r3 eq 0
@@ -695,11 +655,7 @@
 		</fcs_function>
 		
 		<switch name="hydraulics/spoiler-r4/switch">
-			<default value="hydraulics/spoiler-r4/switch"/>
-			<test logic="AND" value="0">
-				/systems/hydraulic/yellow-psi ge 1500
-				/systems/failures/spoiler-r4 eq 1
-			</test>
+			<default value="0"/>
 			<test logic="AND" value="hydraulics/spoiler-r4/extended">
 				/systems/hydraulic/yellow-psi ge 1500
 				spoilers/main-gear-and eq 0
@@ -764,11 +720,7 @@
 		</fcs_function>
 		
 		<switch name="hydraulics/spoiler-r5/switch">
-			<default value="hydraulics/spoiler-r5/switch"/>
-			<test logic="AND" value="0">
-				/systems/hydraulic/green-psi ge 1500
-				/systems/failures/spoiler-r5 eq 1
-			</test>
+			<default value="0"/>
 			<test logic="AND" value="hydraulics/spoiler-r5/ground-extended">
 				/systems/hydraulic/green-psi ge 1500
 				spoilers/main-gear-and eq 1
diff --git a/revision.txt b/revision.txt
index 1a819b2b..7e6bab41 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4605
\ No newline at end of file
+4606
\ No newline at end of file