From 1a6fa687f4bfaf79dc3f6f38fed60dc748648907 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 31 May 2017 14:14:08 -0400
Subject: [PATCH] improve FBW, make MAN RAT button work in Hydraulic panel,
 make rat work properly

---
 Models/Instruments/OHpanel/OHpanel.xml |  18 ++++
 Models/Liveries/A321/IAE/jetBlue.xml   |   2 +-
 Systems/hydraulics.xml                 | 132 +++++++++++++++----------
 Systems/it-fbw-b.xml                   |   8 +-
 Systems/it-fbw.xml                     |  20 ++--
 5 files changed, 115 insertions(+), 65 deletions(-)

diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 11441f24..5e108549 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -1010,6 +1010,24 @@
 		</condition>
 	</animation>
 	
+	<animation>
+		<name>RAT MAN pick</name>
+		<type>pick</type>
+		<object-name>RATMan</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>property-toggle</command>
+				<property>/controls/hydraulic/rat-man</property>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("/sim/sounde/btn1", 1);</script>
+			</binding>
+		</action>
+	</animation>
+	
 	<animation>
 		<name>Blue Elec Pump pick</name>
 		<type>pick</type>
diff --git a/Models/Liveries/A321/IAE/jetBlue.xml b/Models/Liveries/A321/IAE/jetBlue.xml
index a42431a9..7da27acd 100644
--- a/Models/Liveries/A321/IAE/jetBlue.xml
+++ b/Models/Liveries/A321/IAE/jetBlue.xml
@@ -4,7 +4,7 @@
 	<sim>
 		<model>
 			<livery>
-				<name>jetBlue</name>
+				<name>JetBlue Airways</name>
 				<texture>Liveries/A321/IAE/jetBlue.png</texture>
 			</livery>
 		</model>
diff --git a/Systems/hydraulics.xml b/Systems/hydraulics.xml
index 05b14996..bda808a0 100644
--- a/Systems/hydraulics.xml
+++ b/Systems/hydraulics.xml
@@ -191,18 +191,26 @@
 			<condition>
 				<and>
 					<or>
-						<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>
-						<greater-than-equals>
-							<property>/systems/hydraulic/yellow-psi</property>
-							<value>1500</value>
-						</greater-than-equals>
+						<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>
 					<not-equals>
 						<property>/controls/flight/speedbrake-lever</property>
@@ -243,18 +251,26 @@
 		<input>
 			<condition>
 				<or>
-					<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>
-					<greater-than-equals>
-						<property>/systems/hydraulic/yellow-psi</property>
-						<value>1500</value>
-					</greater-than-equals>
+					<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>
 			</condition>
             <expression>
@@ -275,7 +291,7 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-left-cmd</input>
 		<output>/controls/flight/spoiler-left</output>
-		<max-rate-of-change>1.5</max-rate-of-change>
+		<max-rate-of-change>1.0</max-rate-of-change>
 	</filter>
 	
 	<filter>
@@ -286,18 +302,26 @@
 			<condition>
 				<and>
 					<or>
-						<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>
-						<greater-than-equals>
-							<property>/systems/hydraulic/yellow-psi</property>
-							<value>1500</value>
-						</greater-than-equals>
+						<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>
 					<not-equals>
 						<property>/controls/flight/speedbrake-lever</property>
@@ -338,18 +362,26 @@
 		<input>
 			<condition>
 				<or>
-					<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>
-					<greater-than-equals>
-						<property>/systems/hydraulic/yellow-psi</property>
-						<value>1500</value>
-					</greater-than-equals>
+					<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>
 			</condition>
             <expression>
@@ -370,7 +402,7 @@
 		<type>noise-spike</type>
 		<input>/controls/flight/spoiler-right-cmd</input>
 		<output>/controls/flight/spoiler-right</output>
-		<max-rate-of-change>1.5</max-rate-of-change>
+		<max-rate-of-change>1.0</max-rate-of-change>
 	</filter>
 	
 	<filter>
diff --git a/Systems/it-fbw-b.xml b/Systems/it-fbw-b.xml
index bce52586..9aa6ce9e 100644
--- a/Systems/it-fbw-b.xml
+++ b/Systems/it-fbw-b.xml
@@ -106,11 +106,11 @@
 			<property>/controls/flight/aileron-fbw-cmd</property>
 		</output>
 		<config>
-			<Kp>0.14</Kp>
+			<Kp>0.12</Kp>
 			<beta>1</beta>
 			<alpha>0.1</alpha>
 			<gamma>0</gamma>
-			<Ti>5</Ti>
+			<Ti>10</Ti>
 			<Td>0.005</Td>
 			<u_min>-1</u_min>
 			<u_max>1</u_max>
@@ -247,11 +247,11 @@
 			<property>/controls/flight/elevator-fbw-cmd</property>
 		</output>
 		<config>
-			<Kp>-0.25</Kp>
+			<Kp>-0.22</Kp>
 			<beta>1</beta>
 			<alpha>0.1</alpha>
 			<gamma>0</gamma>
-			<Ti>5</Ti>
+			<Ti>10</Ti>
 			<Td>0.005</Td>
 			<u_min>-1</u_min>
 			<u_max>1</u_max>
diff --git a/Systems/it-fbw.xml b/Systems/it-fbw.xml
index bb287675..5a47be0d 100644
--- a/Systems/it-fbw.xml
+++ b/Systems/it-fbw.xml
@@ -39,17 +39,17 @@
 							<independentVar lookup="row">/controls/flight/aileron</independentVar>
 							<tableData>
 							-1.0     -0.1
-							-0.7     -0.05
-							-0.5     -0.02
-							-0.3     -0.011
-							-0.15    -0.004
-							-0.05    -0.0015
+							-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.0015
-							 0.15     0.004
-							 0.3      0.011
-							 0.5      0.02
-							 0.7      0.05
+							 0.05     0.003
+							 0.15     0.008
+							 0.3      0.022
+							 0.5      0.045
+							 0.7      0.07
 							 1.0      0.1
 							</tableData>
 						</table>