From 8c045f46825274355047524e99a68c41e15a9630 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Fri, 23 Jun 2017 12:50:26 -0400
Subject: [PATCH] Revert "A3XX: Fix PFD Conditions"

This reverts commit f5029de0689c01d1cd5d9a1dd4d9e841b2a6b474.
---
 A321-200-IAE.xml                | 22 ++++++------
 Models/Instruments/PFD/PFD1.xml | 61 +++++++++------------------------
 Models/Instruments/PFD/PFD2.xml | 61 +++++++++------------------------
 Systems/a321-aerodynamics.xml   |  1 -
 4 files changed, 43 insertions(+), 102 deletions(-)

diff --git a/A321-200-IAE.xml b/A321-200-IAE.xml
index 629355d6..3b84756d 100644
--- a/A321-200-IAE.xml
+++ b/A321-200-IAE.xml
@@ -26,7 +26,7 @@ xsi:noNamespaceSchemaLocation="http://jsbsim.sourceforge.net/JSBSim.xsd">
 		<z> -25.2091 </z>
 	</location -->
 	<location name="AERORP" unit="IN">
-		<x> 680.00 </x>
+		<x> 700.00 </x>
 		<y> 0 </y>
 		<z> 0.00 </z>
 	</location>
@@ -81,7 +81,7 @@ YAW MOI_________3950000______23089847_______24848934
 		<z> -41.7398 </z>
 	</location -->
 	<location name="CG" unit="IN">
-		<x> 620.00 </x>
+		<x> 652.00 </x>
 		<y> 0 </y>
 		<z> 0.00 </z>
 	</location>
@@ -89,7 +89,7 @@ YAW MOI_________3950000______23089847_______24848934
 	<pointmass name="Cockpit Crew">
 		<weight unit="LBS">400</weight> <!-- MAX: 400lbs, two pilots-->
 		<location name="POINTMASS" unit="IN">
-			<x>150</x>
+			<x>200</x>
 			<y>0</y>
 			<z>0</z>
 		</location>
@@ -97,7 +97,7 @@ YAW MOI_________3950000______23089847_______24848934
 	<pointmass name="Cabin Crew">
 		<weight unit="LBS">600</weight> <!-- MAX: 1320lbs, up to six flight-attendants-->
 		<location name="POINTMASS" unit="IN">
-			<x>666</x>
+			<x>696</x>
 			<y>0</y>
 			<z>0</z>
 		</location>
@@ -105,7 +105,7 @@ YAW MOI_________3950000______23089847_______24848934
 	<pointmass name="PAX 0A (60 seats)">
 		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
 		<location name="POINTMASS" unit="IN">
-			<x>460.1711</x>
+			<x>470.1711</x>
 			<y>0</y>
 			<z>0</z>
 		</location>
@@ -113,7 +113,7 @@ YAW MOI_________3950000______23089847_______24848934
 	<pointmass name="PAX 0B (60 seats)">
 		<weight unit="LBS">6600</weight> <!-- MAX: 13200lbs, 60 seats -->
 		<location name="POINTMASS" unit="IN">
-			<x>789.5669</x>
+			<x>809.5669</x>
 			<y>0</y>
 			<z>0</z>
 		</location>
@@ -121,7 +121,7 @@ YAW MOI_________3950000______23089847_______24848934
 	<pointmass name="PAX 0C (54 seats)">
 		<weight unit="LBS">5940</weight> <!-- MAX: 11880lbs, 54 seats -->
 		<location name="POINTMASS" unit="IN">
-			<x>1123.2729</x>
+			<x>1163.2729</x>
 			<y>0</y>
 			<z>0</z>
 		</location>
@@ -129,7 +129,7 @@ YAW MOI_________3950000______23089847_______24848934
 	<pointmass name="Cargo Hold 1">
 		<weight unit="LBS">2000</weight> <!-- MAX: 7500.126lbs -->
 		<location name="POINTMASS" unit="IN">
-			<x>363.4792</x>
+			<x>383.4792</x>
 			<y>0</y>
 			<z>-29.5</z>	<!-- 1.5m and now half of it for the center point of the load -->
 		</location>
@@ -138,7 +138,7 @@ YAW MOI_________3950000______23089847_______24848934
 	<pointmass name="Cargo Hold 3">
 		<weight unit="LBS">2000</weight> <!-- MAX: 5384.414lbs -->
 		<location name="POINTMASS" unit="IN">
-			<x>821.1324</x>
+			<x>849.1324</x>
 			<y>0</y>
 			<z>-29.5</z>
 		</location>
@@ -146,7 +146,7 @@ YAW MOI_________3950000______23089847_______24848934
 	<pointmass name="Cargo Hold 4">
 		<weight unit="LBS">1500</weight> <!-- MAX: 4651.754lbs -->
 		<location name="POINTMASS" unit="IN">
-			<x>911.0653</x>
+			<x>931.0653</x>
 			<y>0</y>
 			<z>-29.5</z>
 		</location>
@@ -167,7 +167,7 @@ YAW MOI_________3950000______23089847_______24848934
 	<!-- REF-1 page 165 + 271  -->
 	<contact type="BOGEY" name="NOSE_LG">
 		<location unit="IN">
-			<x> 275.6772 </x>
+			<x> 197.6772 </x>
 			<y> 0 </y>
 			<z> -137.9617 </z> 
 		</location>
diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml
index 45f0e486..80a7eb43 100644
--- a/Models/Instruments/PFD/PFD1.xml
+++ b/Models/Instruments/PFD/PFD1.xml
@@ -33,59 +33,31 @@
 	<animation>
 		<type>select</type>
 		<object-name>sidestick-max</object-name>
-        <object-name>sidestick-pos</object-name>
+		<object-name>sidestick-pos</object-name>
 		<condition>
-			<and>
-				<or>
-					<property>/gear/gear[1]/wow</property>
-					<property>/gear/gear[2]/wow</property>
-					<and>
-						<property>/options/pfd/sidestick-pos</property>
-						<equals>
-							<property>/it-autoflight/output/ap1</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-autoflight/output/ap1</property>
-							<value>0</value>
-						</equals>
-					</and>
-				</or>
-				<or>
-					<and>
-						<or>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>1</value>
-							</equals>
-						</or>
+				<and>
+					<property>/options/pfd/sidestick-pos</property>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<or>
 						<equals>
 							<property>/engines/engine[0]/state</property>
 							<value>3</value>
 						</equals>
-					</and>
-					<and>
-						<or>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>1</value>
-							</equals>
-						</or>
 						<equals>
 							<property>/engines/engine[1]/state</property>
 							<value>3</value>
 						</equals>
-					</and>
-				</or>
-			</and>
+						<not><property>/gear/gear[1]/wow</property></not>
+						<not><property>/gear/gear[2]/wow</property></not>
+					</or>
+				</and>
 		</condition>
 	</animation>
 	
@@ -695,7 +667,6 @@
     <animation>
     	<type>textranslate</type>
     	<object-name>alt-tape-2</object-name>
-		<property>octal</property>
     	<property>instrumentation/altimeter/indicated-altitude-ft</property>
     	<factor>0.009999725</factor>
     	<axis>
diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml
index 317794c0..4c9a52c6 100644
--- a/Models/Instruments/PFD/PFD2.xml
+++ b/Models/Instruments/PFD/PFD2.xml
@@ -33,59 +33,31 @@
 	<animation>
 		<type>select</type>
 		<object-name>sidestick-max</object-name>
-        <object-name>sidestick-pos</object-name>
+		<object-name>sidestick-pos</object-name>
 		<condition>
-			<and>
-				<or>
-					<property>/gear/gear[1]/wow</property>
-					<property>/gear/gear[2]/wow</property>
-					<and>
-						<property>/options/pfd/sidestick-pos</property>
-						<equals>
-							<property>/it-autoflight/output/ap1</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-autoflight/output/ap1</property>
-							<value>0</value>
-						</equals>
-					</and>
-				</or>
-				<or>
-					<and>
-						<or>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>1</value>
-							</equals>
-						</or>
+				<and>
+					<property>/options/pfd/sidestick-pos</property>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<equals>
+						<property>/it-autoflight/output/ap1</property>
+						<value>0</value>
+					</equals>
+					<or>
 						<equals>
 							<property>/engines/engine[0]/state</property>
 							<value>3</value>
 						</equals>
-					</and>
-					<and>
-						<or>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/FMGC/status/phase</property>
-								<value>1</value>
-							</equals>
-						</or>
 						<equals>
 							<property>/engines/engine[1]/state</property>
 							<value>3</value>
 						</equals>
-					</and>
-				</or>
-			</and>
+						<not><property>/gear/gear[1]/wow</property></not>
+						<not><property>/gear/gear[2]/wow</property></not>
+					</or>
+				</and>
 		</condition>
 	</animation>
 	
@@ -695,7 +667,6 @@
     <animation>
     	<type>textranslate</type>
     	<object-name>alt-tape-2</object-name>
-		<property>octal</property>
     	<property>instrumentation/altimeter/indicated-altitude-ft</property>
     	<factor>0.009999725</factor>
     	<axis>
diff --git a/Systems/a321-aerodynamics.xml b/Systems/a321-aerodynamics.xml
index 25b20fcc..47a3d268 100644
--- a/Systems/a321-aerodynamics.xml
+++ b/Systems/a321-aerodynamics.xml
@@ -320,7 +320,6 @@
 					<independentVar lookup="row">velocities/mach</independentVar>
 					<tableData>
 						0.0     -1.900
-						0.2     -1.800
 						2.0     -0.900
 					</tableData>
 				</table>