From e3a4672d6ab20ed2bfbb61dcdddac7c2885ffb02 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 1 Jul 2017 16:51:03 -0400
Subject: [PATCH] A3XX: Improve PFD

---
 A320-main.xml                   |  3 +-
 Models/Instruments/PFD/PFD1.xml | 54 +++++++++++++++++++++++++++------
 Models/Instruments/PFD/PFD2.xml | 54 +++++++++++++++++++++++++++------
 3 files changed, 90 insertions(+), 21 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 10db5989..cfa285fe 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -690,7 +690,8 @@
 			<ILS2>0</ILS2>
 			<stallvls>-10</stallvls>
 			<fma>
-				<athr-box>I  .</athr-box>
+				<man-box>O.</man-box>
+				<flex-box>O..</flex-box>
 			</fma>
 		</pfd>
 	</modes>
diff --git a/Models/Instruments/PFD/PFD1.xml b/Models/Instruments/PFD/PFD1.xml
index 2c82656a..bed91a5a 100644
--- a/Models/Instruments/PFD/PFD1.xml
+++ b/Models/Instruments/PFD/PFD1.xml
@@ -2533,7 +2533,7 @@
         <format type="string">%s</format>
         <truncate type="bool">false</truncate>
         <font type="string">helvetica_medium.txf</font>
-        <property>/modes/pfd/fma/athr-box</property>
+        <property>/modes/pfd/fma/man-box</property>
         <draw-text type="bool">false</draw-text>
         <draw-alignment type="bool">false</draw-alignment>
         <draw-boundingbox type="bool">true</draw-boundingbox>
@@ -2557,7 +2557,31 @@
         <format type="string">%s</format>
         <truncate type="bool">false</truncate>
         <font type="string">helvetica_medium.txf</font>
-        <property>/modes/pfd/fma/athr-box</property>
+        <property>/modes/pfd/fma/man-box</property>
+        <draw-text type="bool">false</draw-text>
+        <draw-alignment type="bool">false</draw-alignment>
+        <draw-boundingbox type="bool">true</draw-boundingbox>
+        <character-size>0.020</character-size>
+        <font-resolution>
+            <width type="int">36</width>
+            <height type="int">36</height>
+        </font-resolution>
+    </text>
+	
+    <text>
+        <name>athr-box-c-fma</name>
+        <offsets>
+            <x-m>0.00091828</x-m>
+            <y-m>-0.0546226</y-m>
+            <z-m>0.0670781</z-m>
+        </offsets>
+        <alignment>center-center</alignment>
+        <axis-alignment>yz-plane</axis-alignment>
+        <type type="string">text-value</type>
+        <format type="string">%s</format>
+        <truncate type="bool">false</truncate>
+        <font type="string">helvetica_medium.txf</font>
+        <property>/modes/pfd/fma/flex-box</property>
         <draw-text type="bool">false</draw-text>
         <draw-alignment type="bool">false</draw-alignment>
         <draw-boundingbox type="bool">true</draw-boundingbox>
@@ -2625,14 +2649,22 @@
 						<property>/systems/thrust/state2</property>
 						<value>TOGA</value>
 					</equals>
-					<equals>
-						<property>/systems/thrust/state1</property>
-						<value>MCT</value>
-					</equals>
-					<equals>
-						<property>/systems/thrust/state2</property>
-						<value>MCT</value>
-					</equals>
+					<and>
+						<or>
+							<equals>
+								<property>/systems/thrust/state1</property>
+								<value>MCT</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state2</property>
+								<value>MCT</value>
+							</equals>
+						</or>
+						<not-equals>
+							<property>/controls/engines/thrust-limit</property>
+							<value>FLX</value>
+						</not-equals>
+					</and>
 				</or>
 			</and>
         </condition>
@@ -2723,6 +2755,7 @@
         <type>select</type>
         <object-name>athr-flex-fma</object-name>
         <object-name>athr-flexb-fma</object-name>
+        <object-name>athr-box-c-fma</object-name>
         <condition>
 			<and>
 				<equals>
@@ -3291,6 +3324,7 @@
 		<object-name>athr-flex-fma</object-name>
 		<object-name>athr-thr-fma</object-name>
 		<object-name>athr-box-fma</object-name>
+		<object-name>athr-box-c-fma</object-name>
 		<object-name>athr-lvrclb-fma</object-name>
 		<object-name>vs-num</object-name>
 		<object-name>vs-num-lower</object-name>
diff --git a/Models/Instruments/PFD/PFD2.xml b/Models/Instruments/PFD/PFD2.xml
index 0bb72bf9..f2c41744 100644
--- a/Models/Instruments/PFD/PFD2.xml
+++ b/Models/Instruments/PFD/PFD2.xml
@@ -2533,7 +2533,7 @@
         <format type="string">%s</format>
         <truncate type="bool">false</truncate>
         <font type="string">helvetica_medium.txf</font>
-        <property>/modes/pfd/fma/athr-box</property>
+        <property>/modes/pfd/fma/man-box</property>
         <draw-text type="bool">false</draw-text>
         <draw-alignment type="bool">false</draw-alignment>
         <draw-boundingbox type="bool">true</draw-boundingbox>
@@ -2557,7 +2557,31 @@
         <format type="string">%s</format>
         <truncate type="bool">false</truncate>
         <font type="string">helvetica_medium.txf</font>
-        <property>/modes/pfd/fma/athr-box</property>
+        <property>/modes/pfd/fma/man-box</property>
+        <draw-text type="bool">false</draw-text>
+        <draw-alignment type="bool">false</draw-alignment>
+        <draw-boundingbox type="bool">true</draw-boundingbox>
+        <character-size>0.020</character-size>
+        <font-resolution>
+            <width type="int">36</width>
+            <height type="int">36</height>
+        </font-resolution>
+    </text>
+	
+    <text>
+        <name>athr-box-c-fma</name>
+        <offsets>
+            <x-m>0.00091828</x-m>
+            <y-m>-0.0546226</y-m>
+            <z-m>0.0670781</z-m>
+        </offsets>
+        <alignment>center-center</alignment>
+        <axis-alignment>yz-plane</axis-alignment>
+        <type type="string">text-value</type>
+        <format type="string">%s</format>
+        <truncate type="bool">false</truncate>
+        <font type="string">helvetica_medium.txf</font>
+        <property>/modes/pfd/fma/flex-box</property>
         <draw-text type="bool">false</draw-text>
         <draw-alignment type="bool">false</draw-alignment>
         <draw-boundingbox type="bool">true</draw-boundingbox>
@@ -2625,14 +2649,22 @@
 						<property>/systems/thrust/state2</property>
 						<value>TOGA</value>
 					</equals>
-					<equals>
-						<property>/systems/thrust/state1</property>
-						<value>MCT</value>
-					</equals>
-					<equals>
-						<property>/systems/thrust/state2</property>
-						<value>MCT</value>
-					</equals>
+					<and>
+						<or>
+							<equals>
+								<property>/systems/thrust/state1</property>
+								<value>MCT</value>
+							</equals>
+							<equals>
+								<property>/systems/thrust/state2</property>
+								<value>MCT</value>
+							</equals>
+						</or>
+						<not-equals>
+							<property>/controls/engines/thrust-limit</property>
+							<value>FLX</value>
+						</not-equals>
+					</and>
 				</or>
 			</and>
         </condition>
@@ -2723,6 +2755,7 @@
         <type>select</type>
         <object-name>athr-flex-fma</object-name>
         <object-name>athr-flexb-fma</object-name>
+        <object-name>athr-box-c-fma</object-name>
         <condition>
 			<and>
 				<equals>
@@ -3291,6 +3324,7 @@
 		<object-name>athr-flex-fma</object-name>
 		<object-name>athr-thr-fma</object-name>
 		<object-name>athr-box-fma</object-name>
+		<object-name>athr-box-c-fma</object-name>
 		<object-name>athr-lvrclb-fma</object-name>
 		<object-name>vs-num</object-name>
 		<object-name>vs-num-lower</object-name>