From 94e0d0d158092f6b877aae4104f601745dbe4b6b Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Thu, 1 Jun 2017 22:57:14 -0400
Subject: [PATCH] Add PFD/ND XFR option to shared libraries

---
 AircraftConfig/acconfig.nas           |  1 +
 Models/FlightDeck/a320.flightdeck.xml | 99 +++++++++++++++++++++++----
 Nasal/libraries.nas                   |  6 ++
 3 files changed, 94 insertions(+), 12 deletions(-)

diff --git a/AircraftConfig/acconfig.nas b/AircraftConfig/acconfig.nas
index 57242299..6214222b 100644
--- a/AircraftConfig/acconfig.nas
+++ b/AircraftConfig/acconfig.nas
@@ -58,6 +58,7 @@ var systemsReset = func {
 	setprop("/it-autoflight/input/fd1", 1);
 	setprop("/it-autoflight/input/fd2", 1);
 	libraries.ECAMinit();
+	libraries.variousReset();
 }
 
 var failReset = func {
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 63ed802a..0746fb6d 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -65,6 +65,7 @@
 	<!-- Primary Flight Displays -->
 	
 	<model>
+		<name>PFD1</name>
 		<path>Aircraft/A320Family/Models/Instruments/PFD/PFD1.xml</path>
 		<offsets>
 			<x-m>-0.5807</x-m>
@@ -73,20 +74,39 @@
 			<pitch-deg>-15</pitch-deg>
 		</offsets>
 		<condition>
-			<or>
-				<greater-than-equals>
-					<property>/systems/electrical/bus/ac1</property>
-					<value>25</value>
-				</greater-than-equals>
-				<greater-than-equals>
-					<property>/systems/electrical/bus/ac2</property>
-					<value>25</value>
-				</greater-than-equals>
-			</or>
+			<and>
+				<or>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac1</property>
+						<value>25</value>
+					</greater-than-equals>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac2</property>
+						<value>25</value>
+					</greater-than-equals>
+				</or>
+				<not-equals>
+					<property>/modes/cpt-du-xfr</property>
+					<value>2</value>
+				</not-equals>
+			</and>
 		</condition>
 	</model>
 	
+    <animation>
+        <type>translate</type>
+        <object-name>PFD1</object-name>
+        <property>/modes/cpt-du-xfr</property>
+        <factor>0.18845</factor>
+        <axis>
+            <x>0</x>
+            <y>1</y>
+            <z>0</z>
+        </axis>
+    </animation>
+	
 	<model>
+		<name>PFD2</name>
 		<path>Aircraft/A320Family/Models/Instruments/PFD/PFD2.xml</path>
 		<offsets>
 			<x-m>-0.5807</x-m>
@@ -104,13 +124,30 @@
 					<property>/systems/electrical/bus/ac2</property>
 					<value>25</value>
 				</greater-than-equals>
+				<not-equals>
+					<property>/modes/fo-du-xfr</property>
+					<value>2</value>
+				</not-equals>
 			</and>
 		</condition>
 	</model>
 	
+    <animation>
+        <type>translate</type>
+        <object-name>PFD2</object-name>
+        <property>/modes/fo-du-xfr</property>
+        <factor>-0.19505</factor>
+        <axis>
+            <x>0</x>
+            <y>1</y>
+            <z>0</z>
+        </axis>
+    </animation>
+	
 	<!-- Navigational Displays -->
 	
 	<model>
+		<name>ND1</name>
 		<path>Aircraft/A320Family/Models/Instruments/ND/ND_L.xml</path>
 		<offsets>
 			<x-m>-0.5807</x-m>
@@ -119,7 +156,7 @@
 			<pitch-deg>-15</pitch-deg>
 		</offsets>
 		<condition>
-			<or>
+			<and>
 				<greater-than-equals>
 					<property>/systems/electrical/bus/ac1</property>
 					<value>25</value>
@@ -128,11 +165,28 @@
 					<property>/systems/electrical/bus/ac2</property>
 					<value>25</value>
 				</greater-than-equals>
-			</or>
+				<not-equals>
+					<property>/modes/cpt-du-xfr</property>
+					<value>2</value>
+				</not-equals>
+			</and>
 		</condition>
 	</model>
 	
+    <animation>
+        <type>translate</type>
+        <object-name>ND1</object-name>
+        <property>/modes/cpt-du-xfr</property>
+        <factor>-0.18845</factor>
+        <axis>
+            <x>0</x>
+            <y>1</y>
+            <z>0</z>
+        </axis>
+    </animation>
+	
 	<model>
+		<name>ND2</name>
 		<path>Aircraft/A320Family/Models/Instruments/ND/ND_R.xml</path>
 		<offsets>
 			<x-m>-0.5807</x-m>
@@ -150,13 +204,30 @@
 					<property>/systems/electrical/bus/ac2</property>
 					<value>25</value>
 				</greater-than-equals>
+				<not-equals>
+					<property>/modes/fo-du-xfr</property>
+					<value>2</value>
+				</not-equals>
 			</and>
 		</condition>
 	</model>
 	
+    <animation>
+        <type>translate</type>
+        <object-name>ND2</object-name>
+        <property>/modes/fo-du-xfr</property>
+        <factor>0.19505</factor>
+        <axis>
+            <x>0</x>
+            <y>1</y>
+            <z>0</z>
+        </axis>
+    </animation>
+	
 	<!-- Engine Indications and Crew Alerting System (Upper ECAM) -->
 	
 	<model>
+		<name>UECAM</name>
 		<path>Aircraft/A320Family/Models/Instruments/Upper-ECAM/Upper-ECAM-CFM.xml</path>
 		<offsets>
 			<x-m>-0.5807</x-m>
@@ -186,6 +257,7 @@
 	</model>
 	
 	<model>
+		<name>UECAM</name>
 		<path>Aircraft/A320Family/Models/Instruments/Upper-ECAM/Upper-ECAM-IAE.xml</path>
 		<offsets>
 			<x-m>-0.5807</x-m>
@@ -215,6 +287,7 @@
 	</model>
 	
 	<model>
+		<name>UECAM</name>
 		<path>Aircraft/A320Family/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-CFM.xml</path>
 		<offsets>
 			<x-m>-0.5807</x-m>
@@ -244,6 +317,7 @@
 	</model>
 	
 	<model>
+		<name>UECAM</name>
 		<path>Aircraft/A320Family/Models/Instruments/Upper-ECAM-EIS2/Upper-ECAM-IAE.xml</path>
 		<offsets>
 			<x-m>-0.5807</x-m>
@@ -275,6 +349,7 @@
 	<!-- Lower ECAM -->
 	
 	<model>
+		<name>ECAM</name>
 		<path>Aircraft/A320Family/Models/Instruments/ECAM/ECAM.xml</path>
 		<offsets>
 			<x-m>-0.53631</x-m>
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index 63c10db9..db2cd475 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -161,8 +161,14 @@ setlistener("/sim/signals/fdm-initialized", func {
 	setprop("/it-autoflight/input/fd1", 1);
 	setprop("/it-autoflight/input/fd2", 1);
 	libraries.ECAMinit();
+	libraries.variousReset();
 });
 
+var variousReset = func {
+	setprop("/modes/cpt-du-xfr", 0);
+	setprop("/modes/fo-du-xfr", 0);
+}
+
 var aglgears = func {
     var agl = getprop("/position/altitude-agl-ft") or 0;
     var aglft = agl - 11.101;  # is the position from the Airbus A320 above ground