From 69e93d8a9098c7d64e3e5d6bb27ac0b53b5236f4 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Thu, 12 Jul 2018 17:03:28 -0400
Subject: [PATCH] Control: G Improvements

---
 Systems/a320-fcs.xml | 51 ++++++--------------------------------------
 Systems/fuel.xml     | 28 ++++++++++++------------
 revision.txt         |  2 +-
 3 files changed, 21 insertions(+), 60 deletions(-)

diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index 837b49e7..e14bbbd6 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -713,61 +713,22 @@
 			</clipto>
 		</fcs_function>
 		
-		<fcs_function name="fbw/pitch/a-n">
-			<function>
-				<difference>
-					<quotient>
-						<sum>
-							<product>
-								<property>velocities/q-rad_sec</property>
-								<property>velocities/u-fps</property>
-							</product>
-							<product>
-								<value>-1</value>
-								<property>velocities/p-rad_sec</property>
-								<property>velocities/v-fps</property>
-							</product>
-							<product>
-								<value>32.174</value>
-								<cos>
-									<property>attitude/theta-rad</property>
-								</cos>
-								<cos>
-									<property>attitude/phi-rad</property>
-								</cos>
-							</product>
-							<product>
-								<value>-1</value>
-								<property>accelerations/wdot-ft_sec2</property>
-							</product>
-						</sum>
-						<value>32.174</value>
-					</quotient>
-					<value>1</value>
-				</difference>
-			</function>
-		</fcs_function>
-		
-		<switch name="fbw/pitch/a-n-IaN">
-			<default value="0"/>
-			<test logic="AND" value="fbw/pitch/a-n">
-				fbw/pitch/a-n lt  30
-				fbw/pitch/a-n gt -30
-				position/wow ne 1
-			</test>
-		</switch>
+		<pure_gain name="fbw/pitch/g-instrumented">
+			<input>/accelerations/pilot-g</input>
+			<gain>1.0</gain>
+		</pure_gain>
 		
 		<fcs_function name="fbw/pitch/g-computed">
 			<function>
 				<sum>
-					<property>fbw/pitch/a-n-IaN</property>
+					<property>fbw/pitch/g-instrumented</property>
 					<quotient>
 						<value>-1</value>
 						<cos>
 							<property>attitude/roll-rad</property>
 						</cos>
 					</quotient>
-					<value>2</value>
+					<value>1</value>
 				</sum>
 			</function>
 		</fcs_function>
diff --git a/Systems/fuel.xml b/Systems/fuel.xml
index b29e2047..0c3b75e3 100644
--- a/Systems/fuel.xml
+++ b/Systems/fuel.xml
@@ -17,8 +17,8 @@
 			<test logic="AND" value="9">
 				/systems/fuel/only-use-ctr-tank == 0
 				/systems/fuel/tank[0]/feed == 1
-				propulsion/tank[0]/contents-lbs GT 0
-				propulsion/tank[3]/contents-lbs LT 9
+				propulsion/tank[0]/contents-lbs gt 0
+				propulsion/tank[3]/contents-lbs lt 9
 			</test>
 		</switch>
 
@@ -26,8 +26,8 @@
 			<default value="0"/>
 			<test logic="AND" value="9">
 				/systems/fuel/tank[1]/feed == 1
-				propulsion/tank[1]/contents-lbs GT 0
-				propulsion/tank[3]/contents-lbs LT 9
+				propulsion/tank[1]/contents-lbs gt 0
+				propulsion/tank[3]/contents-lbs lt 9
 			</test>
 		</switch>
 
@@ -37,9 +37,9 @@
 				/systems/fuel/x-feed == 1
 				/systems/fuel/only-use-ctr-tank == 0
 				/systems/fuel/tank[2]/feed == 1
-				propulsion/tank[0]/contents-lbs EQ 0
-				propulsion/tank[2]/contents-lbs GT 0
-				propulsion/tank[3]/contents-lbs LT 9
+				propulsion/tank[0]/contents-lbs eq 0
+				propulsion/tank[2]/contents-lbs gt 0
+				propulsion/tank[3]/contents-lbs lt 9
 			</test>
 		</switch>
 	</channel>
@@ -50,8 +50,8 @@
 			<test logic="AND" value="9">
 				/systems/fuel/only-use-ctr-tank == 0
 				/systems/fuel/tank[2]/feed == 1
-				propulsion/tank[2]/contents-lbs GT 0
-				propulsion/tank[4]/contents-lbs LT 9
+				propulsion/tank[2]/contents-lbs gt 0
+				propulsion/tank[4]/contents-lbs lt 9
 			</test>
 		</switch>
 
@@ -59,8 +59,8 @@
 			<default value="0"/>
 			<test logic="AND" value="9">
 				/systems/fuel/tank[1]/feed == 1
-				propulsion/tank[1]/contents-lbs GT 0
-				propulsion/tank[4]/contents-lbs LT 9
+				propulsion/tank[1]/contents-lbs gt 0
+				propulsion/tank[4]/contents-lbs lt 9
 			</test>
 		</switch>
 
@@ -70,9 +70,9 @@
 				/systems/fuel/x-feed == 1
 				/systems/fuel/only-use-ctr-tank == 0
 				/systems/fuel/tank[0]/feed == 1
-				propulsion/tank[2]/contents-lbs EQ 0
-				propulsion/tank[0]/contents-lbs GT 0
-				propulsion/tank[4]/contents-lbs LT 9
+				propulsion/tank[2]/contents-lbs eq 0
+				propulsion/tank[0]/contents-lbs gt 0
+				propulsion/tank[4]/contents-lbs lt 9
 			</test>
 		</switch>
 	</channel>
diff --git a/revision.txt b/revision.txt
index 49f27dcb..799d96e2 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4513
\ No newline at end of file
+4515
\ No newline at end of file