From 0068e00aae3a04e71fef7983b262cb50654d3c0b Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 10 Feb 2019 21:01:01 -0500
Subject: [PATCH] Control: Switch to actuators, fix spoiler roll bug

---
 Systems/a320-fcs.xml     |  61 +++++++++++++++---------
 Systems/a320-spoiler.xml | 100 ++++++++++++---------------------------
 revision.txt             |   2 +-
 3 files changed, 69 insertions(+), 94 deletions(-)

diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index 12187f69..83f5b8c9 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -511,11 +511,25 @@
 			</test>
 		</switch>
 		
+		<switch name="fbw/roll/s-i-f-i">
+			<default value="0"/>
+			<test logic="AND" value="fbw/roll/a-i">
+				position/wow eq 0
+				/it-fbw/law eq 0
+			</test>
+			<test value="fbw/roll/a-i-f">
+				fbw/roll/gear-law-switch eq 1
+			</test>
+			<test logic="AND" value="0">
+				/it-fbw/law eq 3
+			</test>
+		</switch>
+		
 		<fcs_function name="fbw/roll/s-i-f">
 			<function>
 				<product>
 					<table>
-						<independentVar lookup="row">fbw/roll/a-i</independentVar>
+						<independentVar lookup="row">fbw/roll/s-i-f-i</independentVar>
 						<tableData>
 							-1.0 -1.0
 							-0.2  0.0
@@ -1353,10 +1367,11 @@
 			</clipto>
 		</switch>
 		
-		<lag_filter name="hydraulics/aileron-l/final">
+		<actuator name="hydraulics/aileron-l/final">
 			<input>hydraulics/aileron-l/switch</input>
-			<c1>14.5</c1>
-		</lag_filter>
+			<rate_limit>100</rate_limit>
+			<lag>14.5</lag>
+		</actuator>
 		
 		<aerosurface_scale name="hydraulics/aileron-l/final-deg">
 			<input>hydraulics/aileron-l/final</input>
@@ -1427,10 +1442,11 @@
 			</clipto>
 		</switch>
 		
-		<lag_filter name="hydraulics/aileron-r/final">
+		<actuator name="hydraulics/aileron-r/final">
 			<input>hydraulics/aileron-r/switch</input>
-			<c1>14.5</c1>
-		</lag_filter>
+			<rate_limit>100</rate_limit>
+			<lag>14.5</lag>
+		</actuator>
 		
 		<aerosurface_scale name="hydraulics/aileron-r/final-deg">
 			<input>hydraulics/aileron-r/final</input>
@@ -1483,11 +1499,12 @@
 			</clipto>
 		</switch>
 		
-		<lag_filter name="hydraulics/elevator-l/final">
+		<actuator name="hydraulics/elevator-l/final">
 			<input>hydraulics/elevator-l/switch</input>
-			<c1>14.5</c1>
+			<rate_limit>100</rate_limit>
+			<lag>14.5</lag>
 			<output>/controls/flight/elevator-left</output>
-		</lag_filter>
+		</actuator>
 		
 		<aerosurface_scale name="hydraulics/elevator-l/final-deg">
 			<input>hydraulics/elevator-l/final</input>
@@ -1521,11 +1538,12 @@
 			</clipto>
 		</switch>
 		
-		<lag_filter name="hydraulics/elevator-r/final">
+		<actuator name="hydraulics/elevator-r/final">
 			<input>hydraulics/elevator-r/switch</input>
-			<c1>14.5</c1>
+			<rate_limit>100</rate_limit>
+			<lag>14.5</lag>
 			<output>/controls/flight/elevator-right</output>
-		</lag_filter>
+		</actuator>
 		
 		<aerosurface_scale name="hydraulics/elevator-r/final-deg">
 			<input>hydraulics/elevator-r/final</input>
@@ -1558,18 +1576,14 @@
 			</test>
 		</switch>
 		
-		<actuator name="hydraulics/elevator-trim/actuator">
+		<actuator name="hydraulics/elevator-trim/final">
 			<input>/controls/flight/elevator-trim</input>
 			<rate_limit>hydraulics/elevator-trim/rate</rate_limit>
+			<lag>10.5</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/elevator-trim/lag">
-			<input>hydraulics/elevator-trim/actuator</input>
-			<c1>10.5</c1>
-		</lag_filter>
-		
 		<aerosurface_scale name="hydraulics/elevator-trim/final-deg">
-			<input>hydraulics/elevator-trim/lag</input>
+			<input>hydraulics/elevator-trim/final</input>
 			<domain>
 				<min>-1.00</min>
 				<max>0.32</max>
@@ -1634,10 +1648,11 @@
 			</clipto>
 		</switch>
 		
-		<lag_filter name="hydraulics/rudder/final">
+		<actuator name="hydraulics/rudder/final">
 			<input>hydraulics/rudder/switch</input>
-			<c1>13.5</c1>
-		</lag_filter>
+			<rate_limit>100</rate_limit>
+			<lag>13.5</lag>
+		</actuator>
 		
 		<aerosurface_scale name="hydraulics/rudder/final-deg">
 			<input>hydraulics/rudder/final</input>
diff --git a/Systems/a320-spoiler.xml b/Systems/a320-spoiler.xml
index cee68275..d30e67a8 100644
--- a/Systems/a320-spoiler.xml
+++ b/Systems/a320-spoiler.xml
@@ -113,16 +113,12 @@
 		
 		<actuator name="hydraulics/spoiler-l1/final">
 			<input>hydraulics/spoiler-l1/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-l1/final-lag">
-			<input>hydraulics/spoiler-l1/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-l1/final-gain">
-			<input>hydraulics/spoiler-l1/final-lag</input>
+			<input>hydraulics/spoiler-l1/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-l1/final-deg</output>
 		</pure_gain>
@@ -216,16 +212,12 @@
 		
 		<actuator name="hydraulics/spoiler-l2/final">
 			<input>hydraulics/spoiler-l2/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-l2/final-lag">
-			<input>hydraulics/spoiler-l2/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-l2/final-gain">
-			<input>hydraulics/spoiler-l2/final-lag</input>
+			<input>hydraulics/spoiler-l2/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-l2/final-deg</output>
 		</pure_gain>
@@ -281,16 +273,12 @@
 		
 		<actuator name="hydraulics/spoiler-l3/final">
 			<input>hydraulics/spoiler-l3/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-l3/final-lag">
-			<input>hydraulics/spoiler-l3/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-l3/final-gain">
-			<input>hydraulics/spoiler-l3/final-lag</input>
+			<input>hydraulics/spoiler-l3/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-l3/final-deg</output>
 		</pure_gain>
@@ -346,16 +334,12 @@
 		
 		<actuator name="hydraulics/spoiler-l4/final">
 			<input>hydraulics/spoiler-l4/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-l4/final-lag">
-			<input>hydraulics/spoiler-l4/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-l4/final-gain">
-			<input>hydraulics/spoiler-l4/final-lag</input>
+			<input>hydraulics/spoiler-l4/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-l4/final-deg</output>
 		</pure_gain>
@@ -412,16 +396,12 @@
 		
 		<actuator name="hydraulics/spoiler-l5/final">
 			<input>hydraulics/spoiler-l5/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-l5/final-lag">
-			<input>hydraulics/spoiler-l5/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-l5/final-gain">
-			<input>hydraulics/spoiler-l5/final-lag</input>
+			<input>hydraulics/spoiler-l5/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-l5/final-deg</output>
 		</pure_gain>
@@ -445,16 +425,12 @@
 		
 		<actuator name="hydraulics/spoiler-r1/final">
 			<input>hydraulics/spoiler-r1/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-r1/final-lag">
-			<input>hydraulics/spoiler-r1/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-r1/final-gain">
-			<input>hydraulics/spoiler-r1/final-lag</input>
+			<input>hydraulics/spoiler-r1/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-r1/final-deg</output>
 		</pure_gain>
@@ -548,16 +524,12 @@
 		
 		<actuator name="hydraulics/spoiler-r2/final">
 			<input>hydraulics/spoiler-r2/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-r2/final-lag">
-			<input>hydraulics/spoiler-r2/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-r2/final-gain">
-			<input>hydraulics/spoiler-r2/final-lag</input>
+			<input>hydraulics/spoiler-r2/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-r2/final-deg</output>
 		</pure_gain>
@@ -613,16 +585,12 @@
 		
 		<actuator name="hydraulics/spoiler-r3/final">
 			<input>hydraulics/spoiler-r3/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-r3/final-lag">
-			<input>hydraulics/spoiler-r3/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-r3/final-gain">
-			<input>hydraulics/spoiler-r3/final-lag</input>
+			<input>hydraulics/spoiler-r3/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-r3/final-deg</output>
 		</pure_gain>
@@ -678,16 +646,12 @@
 		
 		<actuator name="hydraulics/spoiler-r4/final">
 			<input>hydraulics/spoiler-r4/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-r4/final-lag">
-			<input>hydraulics/spoiler-r4/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-r4/final-gain">
-			<input>hydraulics/spoiler-r4/final-lag</input>
+			<input>hydraulics/spoiler-r4/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-r4/final-deg</output>
 		</pure_gain>
@@ -744,16 +708,12 @@
 		
 		<actuator name="hydraulics/spoiler-r5/final">
 			<input>hydraulics/spoiler-r5/switch</input>
-			<rate_limit>0.9</rate_limit>
+			<rate_limit>1.1</rate_limit>
+			<lag>16.3</lag>
 		</actuator>
 		
-		<lag_filter name="hydraulics/spoiler-r5/final-lag">
-			<input>hydraulics/spoiler-r5/final</input>
-			<c1>16.3</c1>
-		</lag_filter>
-		
 		<pure_gain name="hydraulics/spoiler-r5/final-gain">
-			<input>hydraulics/spoiler-r5/final-lag</input>
+			<input>hydraulics/spoiler-r5/final</input>
 			<gain>40.0</gain>
 			<output>hydraulics/spoiler-r5/final-deg</output>
 		</pure_gain>
diff --git a/revision.txt b/revision.txt
index 223d01f2..dd297b88 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4756
\ No newline at end of file
+4757
\ No newline at end of file