From 21062e9ba25e09e2ec66a84f1507aa46de548f66 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 22 Jul 2018 10:13:33 -0400
Subject: [PATCH 1/4] Control: Add PLD function to autospoiler

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

diff --git a/Systems/a320-spoiler.xml b/Systems/a320-spoiler.xml
index fb075409..15a9f285 100644
--- a/Systems/a320-spoiler.xml
+++ b/Systems/a320-spoiler.xml
@@ -50,7 +50,14 @@
 				spoilers/throttle[1] ge 0.01
 				/controls/flight/speedbrake-arm ne 1
 			</test>
-			<test logic="AND" value="1"> <!-- Set -->
+			<test logic="AND" value="1"> <!-- EXT Set -->
+				spoilers/throttle[0] lt 0.01
+				spoilers/throttle[1] lt 0.01
+				/controls/flight/speedbrake-arm eq 1
+				spoilers/main-gear-and eq 1
+				/velocities/groundspeed-kt ge 72
+			</test>
+			<test logic="AND" value="0.25"> <!-- PLD Set -->
 				spoilers/throttle[0] lt 0.01
 				spoilers/throttle[1] lt 0.01
 				/controls/flight/speedbrake-arm eq 1
diff --git a/revision.txt b/revision.txt
index e1f7107c..d314d87a 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4603
\ No newline at end of file
+4604
\ No newline at end of file

From 17a12bad5963a93cf5a33068cd7ae298d2f1c64a Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 22 Jul 2018 12:14:32 -0400
Subject: [PATCH 2/4] Sim: add support for spoiler joystick binding

---
 A320-main.xml                         | 59 +++++++++++++--------------
 Models/FlightDeck/a320.flightdeck.xml |  3 +-
 Nasal/libraries.nas                   | 25 ++++++++++++
 revision.txt                          |  2 +-
 4 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index ae8d070f..15ecbee0 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -314,28 +314,28 @@
 		<!-- Multiplayer properties -->
 		<multiplay>
 			<generic>
-				<float n="0" alias="/controls/lighting/dome-norm" />
-				<float n="1" alias="/gear/gear[0]/steering-norm" />
-				<float n="2" alias="/engines/engine[0]/reverser-pos-norm" />
-				<float n="3" alias="/engines/engine[1]/reverser-pos-norm" />
-				<float n="4" alias="/fdm/jsbsim/hydraulics/elevator-l/final-deg" />
-				<float n="5" alias="/fdm/jsbsim/hydraulics/elevator-r/final-deg" />
-				<float n="6" alias="/fdm/jsbsim/hydraulics/aileron-l/final-deg" />
-				<float n="7" alias="/fdm/jsbsim/hydraulics/aileron-r/final-deg" />
-				<float n="8" alias="/fdm/jsbsim/hydraulics/rudder/final-deg" />
-				<float n="9" alias="/fdm/jsbsim/hydraulics/elevator-trim/final-deg" />
-				<float n="11" alias="/fdm/jsbsim/fcs/slat-pos-norm" />
-				<int n="2" alias="/controls/lighting/landing-lights[0]" />
-				<int n="3" alias="/controls/lighting/landing-lights[1]" />
-				<int n="4" alias="/controls/lighting/landing-lights[2]" />
-				<int n="5" alias="/sim/model/lights/nav-lights" />
-				<int n="6" alias="/sim/model/lights/logo-lights" />
-				<int n="7" alias="/sim/model/lights/strobe/state" />
-				<int n="8" alias="/controls/lighting/wing-lights" />
-				<int n="9" alias="/sim/model/lights/beacon/state" />
-				<int n="10" alias="/engines/engine[0]/contrail" />
-				<int n="11" alias="/engines/engine[1]/contrail" />
-				<int n="12" alias="/sharklet" />
+				<float n="0" alias="/controls/lighting/dome-norm"/>
+				<float n="1" alias="/gear/gear[0]/steering-norm"/>
+				<float n="2" alias="/engines/engine[0]/reverser-pos-norm"/>
+				<float n="3" alias="/engines/engine[1]/reverser-pos-norm"/>
+				<float n="4" alias="/fdm/jsbsim/hydraulics/elevator-l/final-deg"/>
+				<float n="5" alias="/fdm/jsbsim/hydraulics/elevator-r/final-deg"/>
+				<float n="6" alias="/fdm/jsbsim/hydraulics/aileron-l/final-deg"/>
+				<float n="7" alias="/fdm/jsbsim/hydraulics/aileron-r/final-deg"/>
+				<float n="8" alias="/fdm/jsbsim/hydraulics/rudder/final-deg"/>
+				<float n="9" alias="/fdm/jsbsim/hydraulics/elevator-trim/final-deg"/>
+				<float n="11" alias="/fdm/jsbsim/fcs/slat-pos-norm"/>
+				<int n="2" alias="/controls/lighting/landing-lights[0]"/>
+				<int n="3" alias="/controls/lighting/landing-lights[1]"/>
+				<int n="4" alias="/controls/lighting/landing-lights[2]"/>
+				<int n="5" alias="/sim/model/lights/nav-lights"/>
+				<int n="6" alias="/sim/model/lights/logo-lights"/>
+				<int n="7" alias="/sim/model/lights/strobe/state"/>
+				<int n="8" alias="/controls/lighting/wing-lights"/>
+				<int n="9" alias="/sim/model/lights/beacon/state"/>
+				<int n="10" alias="/engines/engine[0]/contrail"/>
+				<int n="11" alias="/engines/engine[1]/contrail"/>
+				<int n="12" alias="/sharklet"/>
 			</generic>
 		</multiplay>
 		
@@ -379,25 +379,25 @@
 	<payload>
 		<weight n="0">
 			<name>Cockpit Crew</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[0]" />
+			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[0]"/>
 			<min-lb type="double">200</min-lb>
 			<max-lb type="double">440</max-lb>
 		</weight>
 		<weight n="1">
 			<name>Passengers</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]" />
+			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]"/>
 			<min-lb type="double">1500</min-lb>
 			<max-lb type="double">27000</max-lb>
 		</weight>
 		<weight n="2">
 			<name>Forward Cargo</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]" />
+			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]"/>
 			<min-lb type="double">300</min-lb>
 			<max-lb type="double">8765</max-lb>
 		</weight>
 		<weight n="3">
 			<name>Aft Cargo</name>
-			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]" />
+			<weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]"/>
 			<min-lb type="double">300</min-lb>
 			<max-lb type="double">8765</max-lb>
 		</weight>
@@ -540,7 +540,6 @@
 			<elevator-input>0</elevator-input>
 			<elevator-trim-fdm>0.0</elevator-trim-fdm>
 			<flap-pos type="int">0</flap-pos>
-			<ground-spoilers-armed type="bool">0</ground-spoilers-armed>
 			<rudder-trim-fdm>0.0</rudder-trim-fdm>
 			<speedbrake-arm>0</speedbrake-arm>
 			<slats>0</slats>
@@ -1370,7 +1369,7 @@
 						</and>
 					</condition>
 					<command>property-cycle</command>
-					<property>controls/flight/speedbrake</property>
+					<property>/controls/flight/speedbrake</property>
 					<value>0.0</value>
 					<value>1.0</value>
 				</binding>
@@ -1392,14 +1391,14 @@
 						</and>
 					</condition>
 					<command>property-cycle</command>
-					<property>controls/flight/speedbrake</property>
+					<property>/controls/flight/speedbrake</property>
 					<value>0.0</value>
 					<value>0.5</value>
 					<value>1.0</value>
 				</binding>
 				<binding>
 					<command>property-assign</command>
-					<property>controls/flight/speedbrake-arm</property>
+					<property>/controls/flight/speedbrake-arm</property>
 					<value>0</value>
 				</binding>
 			</key>
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 9dd871b2..243143a2 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -4935,9 +4935,8 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>SpdBrk</object-name>
-		<property>controls/flight/speedbrake</property>
+		<property>fdm/jsbsim/spoilers/speedbrake-nul</property>
 		<factor>45</factor>
-		<!--offset-deg>10</offset-deg-->
 		<axis>
 			<object-name>SpdBrk.axis</object-name>
 		</axis>
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index b60b87f2..a046043d 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -399,6 +399,31 @@ var flaptimer = maketimer(0.5, func {
 	}
 });
 
+controls.stepSpoilers = func(step) {
+	setprop("/controls/flight/speedbrake-arm", 0);
+	if (step == 1) {
+		deploySpeedbrake();
+	} else if (step == -1) {
+		retractSpeedbrake();
+	}
+}
+
+var deploySpeedbrake = func {
+	if (getprop("/controls/flight/speedbrake") < 0.5) {
+		setprop("/controls/flight/speedbrake", 0.5);
+	} else if (getprop("/controls/flight/speedbrake") < 1.0) {
+		setprop("/controls/flight/speedbrake", 1.0);
+	}
+}
+
+var retractSpeedbrake = func {
+	if (getprop("/controls/flight/speedbrake") > 0.5) {
+		setprop("/controls/flight/speedbrake", 0.5);
+	} else if (getprop("/controls/flight/speedbrake") > 0.0) {
+		setprop("/controls/flight/speedbrake", 0.0);
+	}
+}
+
 var slewProp = func(prop, delta) {
 	delta *= getprop("/sim/time/delta-realtime-sec");
 	setprop(prop, getprop(prop) + delta);
diff --git a/revision.txt b/revision.txt
index d314d87a..1a819b2b 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4604
\ No newline at end of file
+4605
\ No newline at end of file

From 53527ba0e3c72428d3d362fa66131e23188ae359 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 22 Jul 2018 12:19:58 -0400
Subject: [PATCH 3/4] Sim: add support for spoiler joystick binding

---
 Nasal/libraries.nas | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index a046043d..28272cb8 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -409,18 +409,30 @@ controls.stepSpoilers = func(step) {
 }
 
 var deploySpeedbrake = func {
-	if (getprop("/controls/flight/speedbrake") < 0.5) {
-		setprop("/controls/flight/speedbrake", 0.5);
-	} else if (getprop("/controls/flight/speedbrake") < 1.0) {
-		setprop("/controls/flight/speedbrake", 1.0);
+	if (getprop("/gear/gear[1]/wow") == 1 or getprop("/gear/gear[2]/wow") == 1) {
+		if (getprop("/controls/flight/speedbrake") < 1.0) {
+			setprop("/controls/flight/speedbrake", 1.0);
+		}
+	} else {
+		if (getprop("/controls/flight/speedbrake") < 0.5) {
+			setprop("/controls/flight/speedbrake", 0.5);
+		} else if (getprop("/controls/flight/speedbrake") < 1.0) {
+			setprop("/controls/flight/speedbrake", 1.0);
+		}
 	}
 }
 
 var retractSpeedbrake = func {
-	if (getprop("/controls/flight/speedbrake") > 0.5) {
-		setprop("/controls/flight/speedbrake", 0.5);
-	} else if (getprop("/controls/flight/speedbrake") > 0.0) {
-		setprop("/controls/flight/speedbrake", 0.0);
+	if (getprop("/gear/gear[1]/wow") == 1 or getprop("/gear/gear[2]/wow") == 1) {
+		if (getprop("/controls/flight/speedbrake") > 0.0) {
+			setprop("/controls/flight/speedbrake", 0.0);
+		}
+	} else {
+		if (getprop("/controls/flight/speedbrake") > 0.5) {
+			setprop("/controls/flight/speedbrake", 0.5);
+		} else if (getprop("/controls/flight/speedbrake") > 0.0) {
+			setprop("/controls/flight/speedbrake", 0.0);
+		}
 	}
 }
 

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 4/4] 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