A32X: Canvas PFD is now default, many fixes to FMGC-b

A320-main.xml

@@ -256,6 +256,24 @@
 							<value>1</value>
 						</binding>
 					</item>
+					<item>
+						<label>Show Captain's PFD</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							canvas_pfd.showPFD1();
+							</script>
+						</binding>
+					</item>
+					<item>
+						<label>Show First Officer's PFD</label>
+						<binding>
+							<command>nasal</command>
+							<script>
+							canvas_pfd.showPFD2();
+							</script>
+						</binding>
+					</item>
 					<item>
 						<label>Show Captain's ND</label>
 						<binding>
@@ -292,19 +310,6 @@
 							</script>
 						</binding>
 					</item>
-					<item>
-						<label>Test Canvas</label>
-						<binding>
-							<command>nasal</command>
-							<script>
-							if (getprop("/options/test-canvas") != 1) {
-								setprop("/options/test-canvas", 1);
-							} else {
-								setprop("/options/test-canvas", 0);
-							}
-							</script>
-						</binding>
-					</item>
 				</menu>
 			</default>
 		</menubar>
@@ -911,6 +916,28 @@
 
 	<input>
 		<keyboard>
+			<key n="33">
+				<name>PAGE UP</name>
+				<desc>Throttle Increase</desc>
+				<binding>
+					<command>nasal</command>
+					<script>
+						setprop("/controls/engines/engine[0]/throttle", getprop("/controls/engines/engine[0]/throttle") + 0.01);
+						setprop("/controls/engines/engine[1]/throttle", getprop("/controls/engines/engine[0]/throttle") + 0.01); # Not a typo, always use engine[0] as a reference
+					</script>
+				</binding>
+			</key>
+			<key n="34">
+				<name>PAGE DN</name>
+				<desc>Throttle Decrease</desc>
+				<binding>
+					<command>nasal</command>
+					<script>
+						setprop("/controls/engines/engine[0]/throttle", getprop("/controls/engines/engine[0]/throttle") - 0.01);
+						setprop("/controls/engines/engine[1]/throttle", getprop("/controls/engines/engine[0]/throttle") - 0.01); # Not a typo, always use engine[0] as a reference
+					</script>
+				</binding>
+			</key>
 			<key n="49">
 				<name>1</name>
 				<desc>Captain View/Elevator Trim Up</desc>
@@ -1270,7 +1297,7 @@
 			<file>Aircraft/IDG-A32X/Nasal/MCDU2/STATUS.nas</file>
 		</mcdu2>
 		<canvas_pfd>
-			<file>Aircraft/IDG-A32X/Models/Instruments/PFD-WIP/PFD.nas</file>
+			<file>Aircraft/IDG-A32X/Models/Instruments/PFD/PFD.nas</file>
 		</canvas_pfd>
 		<canvas_nd>
 			<file>Aircraft/IDG-A32X/Models/Instruments/ND/canvas/ND.nas</file>

Models/FlightDeck/a320.flightdeck.xml

@@ -151,29 +151,6 @@
 	</model>
 
 	<!-- Primary Flight Displays -->
-	<model>
-		<name>PFD1</name>
-		<path>Aircraft/IDG-A32X/Models/Instruments/PFD-WIP/PFD1.xml</path>
-		<offsets>
-			<x-m>-0.55415</x-m>
-			<y-m>-0.5526</y-m>
-			<z-m>0.22256</z-m>
-			<pitch-deg>-16.534</pitch-deg>
-		</offsets>
-		<condition>
-			<and>
-				<equals>
-					<property>systems/acconfig/mismatch-code</property>
-					<value>0x000</value>
-				</equals>
-				<equals>
-					<property>options/test-canvas</property>
-					<value>1</value>
-				</equals>
-			</and>
-		</condition>
-	</model>
-	
 	<model>
 		<name>PFD1</name>
 		<path>Aircraft/IDG-A32X/Models/Instruments/PFD/PFD1.xml</path>
@@ -184,26 +161,10 @@
 			<pitch-deg>-16.534</pitch-deg>
 		</offsets>
 		<condition>
-			<and>
-				<or>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac1</property>
-						<value>110</value>
-					</greater-than-equals>
-					<greater-than-equals>
-						<property>systems/electrical/bus/ac2</property>
-						<value>110</value>
-					</greater-than-equals>
-				</or>
-				<equals>
-					<property>systems/acconfig/mismatch-code</property>
-					<value>0x000</value>
-				</equals>
-				<not-equals>
-					<property>options/test-canvas</property>
-					<value>1</value>
-				</not-equals>
-			</and>
+			<equals>
+				<property>systems/acconfig/mismatch-code</property>
+				<value>0x000</value>
+			</equals>
 		</condition>
 	</model>
 	
@@ -237,29 +198,6 @@
 		</axis>
 	</animation>
 	
-	<model>
-		<name>PFD2</name>
-		<path>Aircraft/IDG-A32X/Models/Instruments/PFD-WIP/PFD2.xml</path>
-		<offsets>
-			<x-m>-0.55415</x-m>
-			<y-m>0.5526</y-m>
-			<z-m>0.22256</z-m>
-			<pitch-deg>-16.534</pitch-deg>
-		</offsets>
-		<condition>
-			<and>
-				<equals>
-					<property>systems/acconfig/mismatch-code</property>
-					<value>0x000</value>
-				</equals>
-				<equals>
-					<property>options/test-canvas</property>
-					<value>1</value>
-				</equals>
-			</and>
-		</condition>
-	</model>
-	
 	<model>
 		<name>PFD2</name>
 		<path>Aircraft/IDG-A32X/Models/Instruments/PFD/PFD2.xml</path>
@@ -270,28 +208,10 @@
 			<pitch-deg>-16.534</pitch-deg>
 		</offsets>
 		<condition>
-			<and>
-				<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>
-				<not-equals>
-					<property>controls/electrical/switches/emer-gen</property>
-					<value>1</value>
-				</not-equals>
-				<equals>
-					<property>systems/acconfig/mismatch-code</property>
-					<value>0x000</value>
-				</equals>
-				<not-equals>
-					<property>options/test-canvas</property>
-					<value>1</value>
-				</not-equals>
-			</and>
+			<equals>
+				<property>systems/acconfig/mismatch-code</property>
+				<value>0x000</value>
+			</equals>
 		</condition>
 	</model>
 	

Models/Instruments/PFD-WIP/PFD1.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-#########################################
-# Copyright (c) it0uchpods Design Group #
-#########################################
--->
-
-<PropertyList>
-
-	<path>res/PFD1.ac</path>
-	
-	<animation>
-		<type>scale</type>
-		<x-offset>1.05</x-offset>
-		<y-offset>1.05</y-offset>
-		<z-offset>1.05</z-offset>
-	</animation>
-	
-	<animation>
-		<type>pick</type>
-		<object-name>pfd1.screen</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>canvas_pfd.showPFD1();</script>
-			</binding>
-		</action>
-	</animation>
-	
-	<animation>
-		<type>material</type>
-		<object-name>pfd1.screen</object-name>
-		<emission>
-			<red>1</red>
-			<green>1</green>
-			<blue>1</blue>
-			<factor-prop>controls/lighting/DU/du1</factor-prop>
-		</emission>
-	</animation>
-
-</PropertyList>

Models/Instruments/PFD-WIP/PFD2.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-#########################################
-# Copyright (c) it0uchpods Design Group #
-#########################################
--->
-
-<PropertyList>
-
-	<path>res/PFD2.ac</path>
-	
-	<animation>
-		<type>scale</type>
-		<x-offset>1.05</x-offset>
-		<y-offset>1.05</y-offset>
-		<z-offset>1.05</z-offset>
-	</animation>
-	
-	<animation>
-		<type>pick</type>
-		<object-name>pfd2.screen</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>nasal</command>
-				<script>canvas_pfd.showPFD2();</script>
-			</binding>
-		</action>
-	</animation>
-	
-	<animation>
-		<type>material</type>
-		<object-name>pfd2.screen</object-name>
-		<emission>
-			<red>1</red>
-			<green>1</green>
-			<blue>1</blue>
-			<factor-prop>controls/lighting/DU/du6</factor-prop>
-		</emission>
-	</animation>
-
-</PropertyList>

Models/Instruments/PFD/PFD.nas

@@ -18,9 +18,13 @@ setprop("/it-autoflight/output/ap2", 0);
 setprop("/it-autoflight/output/fd1", 0);
 setprop("/it-autoflight/output/fd2", 0);
 setprop("/it-autoflight/output/athr", 0);
+setprop("/instrumentation/pfd/heading-deg", 0);
 setprop("/instrumentation/pfd/horizon-pitch", 0);
 setprop("/instrumentation/pfd/horizon-ground", 0);
 setprop("/instrumentation/pfd/hdg-diff", 0);
+setprop("/instrumentation/pfd/heading-scale", 0);
+setprop("/instrumentation/pfd/track-deg", 0);
+setprop("/instrumentation/pfd/track-hdg-diff", 0);
 setprop("/it-autoflight/internal/vert-speed-fpm-pfd", 0);
 setprop("/position/gear-agl-ft", 0);
 setprop("/controls/flight/aileron-input-fast", 0);
@@ -105,15 +109,14 @@ var canvas_PFD_base = {
 		return [];
 	},
 	update: func() {
-		if ((getprop("/systems/electrical/bus/ac1") >= 110 or getprop("/systems/electrical/bus/ac2") >= 110) and getprop("/options/test-canvas") == 1 and getprop("/controls/lighting/DU/du1") > 0) {
+		if ((getprop("/systems/electrical/bus/ac1") >= 110 or getprop("/systems/electrical/bus/ac2") >= 110) and getprop("/controls/lighting/DU/du1") > 0) {
 			PFD_1.page.show();
 			PFD_1.update();
 		} else {
 			PFD_1.page.hide();
 		}
 		
-		if (getprop("/systems/electrical/bus/ac1") >= 110 and getprop("/systems/electrical/ac1-src") != "RAT" and getprop("/systems/electrical/bus/ac2") >= 110 and getprop("/systems/electrical/ac2-src") != "RAT" and getprop("/options/test-canvas") == 1 
-		and getprop("/controls/lighting/DU/du6") > 0) {
+		if (getprop("/systems/electrical/bus/ac1") >= 110 and getprop("/systems/electrical/ac1-src") != "RAT" and getprop("/systems/electrical/bus/ac2") >= 110 and getprop("/systems/electrical/ac2-src") != "RAT" and getprop("/controls/lighting/DU/du6") > 0) {
 			PFD_2.page.show();
 			PFD_2.update();
 		} else {
@@ -559,12 +562,12 @@ var canvas_PFD_1 = {
 			me["LOC_scale"].hide();
 			me["GS_scale"].hide();
 		}
-		if (getprop("/modes/pfd/ILS1") == 1 and getprop("/instrumentation/nav[0]/in-range") == 1 and getprop("/instrumentation/nav[0]/nav-loc") == 1) {
+		if (getprop("/modes/pfd/ILS1") == 1 and getprop("/instrumentation/nav[0]/in-range") == 1 and getprop("/instrumentation/nav[0]/nav-loc") == 1 and getprop("/instrumentation/nav[0]/signal-quality-norm") > 0.99) {
 			me["LOC_pointer"].show();
 		} else {
 			me["LOC_pointer"].hide();
 		}
-		if (getprop("/modes/pfd/ILS1") == 1 and getprop("/instrumentation/nav[0]/gs-in-range") == 1 and getprop("/instrumentation/nav[0]/has-gs") == 1) {
+		if (getprop("/modes/pfd/ILS1") == 1 and getprop("/instrumentation/nav[0]/gs-in-range") == 1 and getprop("/instrumentation/nav[0]/has-gs") == 1 and getprop("/instrumentation/nav[0]/signal-quality-norm") > 0.99) {
 			me["GS_pointer"].show();
 		} else {
 			me["GS_pointer"].hide();
@@ -575,7 +578,7 @@ var canvas_PFD_1 = {
 		me["GS_pointer"].setTranslation(0, getprop("/instrumentation/nav[0]/gs-needle-deflection-norm") * -197);
 		
 		# Heading
-		me.heading = getprop("/instrumentation/pfd/heading-deg");
+		me.heading = getprop("/instrumentation/pfd/heading-scale");
 		me.headOffset = me.heading / 10 - int (me.heading / 10);
 		me.middleText = roundabout(me.heading / 10);
 		me.middleOffset = nil;
@@ -624,8 +627,9 @@ var canvas_PFD_1 = {
 			me["HDG_target"].hide();
 		}
 		
+		me["TRK_pointer"].setTranslation((getprop("/instrumentation/pfd/track-hdg-diff") / 10) * 98.5416, 0);
+		
 		me["CRS_pointer"].hide();
-		me["TRK_pointer"].hide();
 		
 		# AI HDG
 		me.AI_horizon_hdg_trans.setTranslation(me.middleOffset, getprop("/instrumentation/pfd/horizon-pitch") * 11.825);
@@ -1071,12 +1075,12 @@ var canvas_PFD_2 = {
 			me["LOC_scale"].hide();
 			me["GS_scale"].hide();
 		}
-		if (getprop("/modes/pfd/ILS2") == 1 and getprop("/instrumentation/nav[0]/in-range") == 1 and getprop("/instrumentation/nav[0]/nav-loc") == 1) {
+		if (getprop("/modes/pfd/ILS2") == 1 and getprop("/instrumentation/nav[0]/in-range") == 1 and getprop("/instrumentation/nav[0]/nav-loc") == 1 and getprop("/instrumentation/nav[0]/signal-quality-norm") > 0.99) {
 			me["LOC_pointer"].show();
 		} else {
 			me["LOC_pointer"].hide();
 		}
-		if (getprop("/modes/pfd/ILS2") == 1 and getprop("/instrumentation/nav[0]/gs-in-range") == 1 and getprop("/instrumentation/nav[0]/has-gs") == 1) {
+		if (getprop("/modes/pfd/ILS2") == 1 and getprop("/instrumentation/nav[0]/gs-in-range") == 1 and getprop("/instrumentation/nav[0]/has-gs") == 1 and getprop("/instrumentation/nav[0]/signal-quality-norm") > 0.99) {
 			me["GS_pointer"].show();
 		} else {
 			me["GS_pointer"].hide();
@@ -1087,7 +1091,7 @@ var canvas_PFD_2 = {
 		me["GS_pointer"].setTranslation(0, getprop("/instrumentation/nav[0]/gs-needle-deflection-norm") * -197);
 		
 		# Heading
-		me.heading = getprop("/instrumentation/pfd/heading-deg");
+		me.heading = getprop("/instrumentation/pfd/heading-scale");
 		me.headOffset = me.heading / 10 - int (me.heading / 10);
 		me.middleText = roundabout(me.heading / 10);
 		me.middleOffset = nil;
@@ -1136,8 +1140,9 @@ var canvas_PFD_2 = {
 			me["HDG_target"].hide();
 		}
 		
+		me["TRK_pointer"].setTranslation((getprop("/instrumentation/pfd/track-hdg-diff") / 10) * 98.5416, 0);
+		
 		me["CRS_pointer"].hide();
-		me["TRK_pointer"].hide();
 		
 		# AI HDG
 		me.AI_horizon_hdg_trans.setTranslation(me.middleOffset, getprop("/instrumentation/pfd/horizon-pitch") * 11.825);
@@ -1166,8 +1171,8 @@ setlistener("sim/signals/fdm-initialized", func {
 	var group_pfd1 = PFD1_display.createGroup();
 	var group_pfd2 = PFD2_display.createGroup();
 
-	PFD_1 = canvas_PFD_1.new(group_pfd1, "Aircraft/IDG-A32X/Models/Instruments/PFD-WIP/res/pfd.svg");
-	PFD_2 = canvas_PFD_2.new(group_pfd2, "Aircraft/IDG-A32X/Models/Instruments/PFD-WIP/res/pfd.svg");
+	PFD_1 = canvas_PFD_1.new(group_pfd1, "Aircraft/IDG-A32X/Models/Instruments/PFD/res/pfd.svg");
+	PFD_2 = canvas_PFD_2.new(group_pfd2, "Aircraft/IDG-A32X/Models/Instruments/PFD/res/pfd.svg");
 	
 	PFD_update.start();
 });

Nasal/FMGC-b.nas

@@ -199,8 +199,8 @@ var fmabox = func {
 		}
 		setprop("/it-autoflight/output/fma-pwr", 0);
 	} else {
-		setprop("/it-autoflight/input/vs", int(getprop("/velocities/vertical-speed-fps")*0.6)*100);
-		setprop("/it-autoflight/input/fpa", int(10*getprop("/it-autoflight/internal/fpa"))*0.1);
+		setprop("/it-autoflight/input/vs", math.round(getprop("/it-autoflight/internal/vert-speed-fpm"), 100));
+		setprop("/it-autoflight/input/fpa", math.round(getprop("/it-autoflight/internal/fpa"), 0.1));
 		setprop("/it-autoflight/output/fma-pwr", 1);
 	}
 }
@@ -251,7 +251,7 @@ var lateral = func {
 		alandt1.stop();
 		setprop("/it-autoflight/output/loc-armed", 0);
 		setprop("/it-autoflight/output/appr-armed", 0);
-		var hdg5sec = int(getprop("/it-autoflight/internal/heading-5-sec-ahead")+0.5);
+		var hdg5sec = int(getprop("/it-autoflight/internal/heading-5-sec-ahead") + 0.5);
 		setprop("/it-autoflight/input/hdg", hdg5sec);
 		setprop("/it-autoflight/output/lat", 0);
 		setprop("/it-autoflight/mode/lat", "HDG");
@@ -287,7 +287,11 @@ var lat_arm = func {
 			gui.popupTip("Please make sure you have a route set, and that it is Activated!");
 		}
 	} else if (latset == 3) {
-		var hdgnow = int(getprop("/orientation/heading-magnetic-deg")+0.5);
+		if (getprop("/it-autoflight/custom/trk-fpa") == 1) {
+			var hdgnow = int(getprop("/instrumentation/pfd/track-deg") + 0.5);
+		} else {
+			var hdgnow = int(getprop("/instrumentation/pfd/heading-deg") + 0.5);
+		}
 		setprop("/it-autoflight/input/hdg", hdgnow);
 		setprop("/it-autoflight/input/lat-arm", 0);
 		setprop("/it-autoflight/mode/arm", " ");
@@ -329,7 +333,7 @@ var vertical = func {
 		setprop("/it-autoflight/output/appr-armed", 0);
 		var altinput = getprop("/it-autoflight/input/alt");
 		setprop("/it-autoflight/internal/alt", altinput);
-		var vsnow = int(getprop("/velocities/vertical-speed-fps")*0.6)*100;
+		var vsnow = math.round(getprop("/it-autoflight/internal/vert-speed-fpm"), 100);
 		setprop("/it-autoflight/input/vs", vsnow);
 		setprop("/it-autoflight/output/vert", 1);
 		setprop("/it-autoflight/mode/vert", "V/S");
@@ -402,7 +406,7 @@ var vertical = func {
 		setprop("/it-autoflight/output/appr-armed", 0);
 		var altinput = getprop("/it-autoflight/input/alt");
 		setprop("/it-autoflight/internal/alt", altinput);
-		var fpanow = (int(10*getprop("/it-autoflight/internal/fpa")))*0.1;
+		var fpanow = math.round(getprop("/it-autoflight/internal/fpa"), 0.1);
 		setprop("/it-autoflight/input/fpa", fpanow);
 		setprop("/it-autoflight/output/vert", 5);
 		setprop("/it-autoflight/mode/vert", "FPA");

Systems/fmgc-drivers.xml

@@ -24,7 +24,7 @@
 					<value>0</value>
 				</equals>
 			</condition>
-			<property>/orientation/heading-magnetic-deg</property>
+			<property>/instrumentation/pfd/heading-deg</property>
 		</input>
 		<input>
 			<condition>
@@ -33,7 +33,7 @@
 					<value>1</value>
 				</equals>
 			</condition>
-			<property>/orientation/track-magnetic-deg</property>
+			<property>/instrumentation/pfd/track-deg</property>
 		</input>
 		<output>/it-autoflight/internal/heading-5-sec-ahead</output>
 		<seconds>5.0</seconds>
@@ -116,7 +116,7 @@
 			<expression>
 				<table>
 					<property>/position/gear-agl-ft</property> 
-					<entry><ind>100</ind><dep>-600</dep></entry>
+					<entry><ind>100</ind><dep>-650</dep></entry>
 					<entry><ind> 50</ind><dep>-500</dep></entry>
 					<entry><ind> 45</ind><dep> -70</dep></entry>
 				</table>
@@ -134,7 +134,7 @@
 			<expression>
 				<table>
 					<property>/position/gear-agl-ft</property> 
-					<entry><ind>100</ind><dep>-600</dep></entry>
+					<entry><ind>100</ind><dep>-650</dep></entry>
 					<entry><ind> 50</ind><dep>-500</dep></entry>
 					<entry><ind> 40</ind><dep>-400</dep></entry>
 					<entry><ind> 30</ind><dep>-300</dep></entry>
@@ -405,7 +405,7 @@
 			</condition>
 			<property>/it-autoflight/input/hdg</property>
 			<offset>
-				<property>/orientation/heading-magnetic-deg</property>
+				<property>/instrumentation/pfd/heading-deg</property>
 				<scale>-1.0</scale>
 			</offset>
 		</input>
@@ -424,7 +424,7 @@
 			</condition>
 			<property>/it-autoflight/input/hdg</property>
 			<offset>
-				<property>/orientation/heading-deg</property>
+				<property>/instrumentation/pfd/track-deg</property>
 				<scale>-1.0</scale>
 			</offset>
 		</input>

Systems/pfd.xml

@@ -19,7 +19,7 @@
 		<reference>
 			<property>/instrumentation/altimeter/indicated-altitude-ft</property>
 		</reference>
-		<output>instrumentation/pfd/ground-level-diff</output>
+		<output>/instrumentation/pfd/ground-level-diff</output>
 	</filter>
 	
 	<filter>
@@ -31,9 +31,9 @@
 			<property>/it-autoflight/internal/alt</property>
 		</input>
 		<reference>
-			<property>instrumentation/altimeter/indicated-altitude-ft</property>
+			<property>/instrumentation/altimeter/indicated-altitude-ft</property>
 		</reference>
-		<output>instrumentation/pfd/sel-alt-diff</output>
+		<output>/instrumentation/pfd/sel-alt-diff</output>
 	</filter>
 	
 	<filter>
@@ -45,45 +45,59 @@
 			<property>/it-autoflight/internal/mng-alt</property>
 		</input>
 		<reference>
-			<property>instrumentation/altimeter/indicated-altitude-ft</property>
+			<property>/instrumentation/altimeter/indicated-altitude-ft</property>
 		</reference>
-		<output>instrumentation/pfd/mng-alt-diff</output>
+		<output>/instrumentation/pfd/mng-alt-diff</output>
 	</filter>
 	
 	<filter>
 		<name>Heading Deg</name>
 		<type>gain</type>
-		<update-interval-secs type="double">0.05</update-interval-secs>
 		<gain>1.0</gain>
 		<input>
-			<property>/orientation/heading-deg</property>
 			<condition>
-				<property>instrumentation/efis/mfd/true-north</property>
+				<property>/instrumentation/efis/mfd/true-north</property>
 			</condition>
+			<property>/orientation/heading-deg</property>
 		</input>
 		<input>
 			<property>/orientation/heading-magnetic-deg</property>
 		</input>
 		<reference>0</reference>
-		<output>instrumentation/pfd/heading-deg</output>
+		<output>/instrumentation/pfd/heading-deg</output>
 	</filter>
 	
 	<filter>
 		<name>Track Deg</name>
 		<type>gain</type>
-		<update-interval-secs type="double">0.05</update-interval-secs>
 		<gain>1.0</gain>
 		<input>
-			<property>/orientation/track-deg</property>
 			<condition>
-				<property>instrumentation/efis/mfd/true-north</property>
+				<and>
+					<property>/instrumentation/efis/mfd/true-north</property>
+					<greater-than>
+						<property>/velocities/groundspeed-kt</property>
+						<value>1</value>
+					</greater-than>
+				</and>
 			</condition>
+			<property>/orientation/track-deg</property>
 		</input>
 		<input>
+			<condition>
+				<and>
+					<not><property>/instrumentation/efis/mfd/true-north</property></not>
+					<greater-than>
+						<property>/velocities/groundspeed-kt</property>
+						<value>1</value>
+					</greater-than>
+				</and>
+			</condition>
 			<property>/orientation/track-magnetic-deg</property>
 		</input>
+		<input>/instrumentation/pfd/heading-deg</input>
 		<reference>0</reference>
-		<output>instrumentation/pfd/track-deg</output>
+		<output>/instrumentation/pfd/track-deg</output>
 	</filter>
 	
 	<filter>
@@ -91,19 +105,28 @@
 		<type>gain</type>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<gain>1.0</gain>
+		<input>
+			<property>/orientation/track-deg</property>
+		</input>
+		<reference>
+			<property>/instrumentation/pfd/heading-deg</property>
+		</reference>
+		<output>/instrumentation/pfd/track-diff</output>
+	</filter>
+	
+	<filter>
+		<name>Heading scale</name>
+		<type>gain</type>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<gain>1.0</gain>
 		<input>
 			<condition>
 				<property>/it-autoflight/custom/trk-fpa</property>
 			</condition>
-			<property>/orientation/track-deg</property>
+			<property>/instrumentation/pfd/track-deg</property>
 		</input>
-		<input>
-			<property>/orientation/track-magnetic-deg</property>
-		</input>
-		<reference>
-			<property>instrumentation/pfd/heading-deg</property>
-		</reference>
-		<output>instrumentation/pfd/track-diff</output>
+		<input>/instrumentation/pfd/heading-deg</input>
+		<output>/instrumentation/pfd/heading-scale</output>
 	</filter>
 	
 	<filter>
@@ -119,13 +142,39 @@
 			</period>
 		</input>
 		<reference>
-			<property>instrumentation/pfd/heading-deg</property>
+			<property>/instrumentation/pfd/heading-scale</property>
 			<period>
 				<min>-180.0</min>
 				<max>180.0</max>
 			</period>
 		</reference>
-		<output>instrumentation/pfd/hdg-diff</output>
+		<output>/instrumentation/pfd/hdg-diff</output>
+		<period>
+			<min>-180.0</min>
+			<max>180.0</max>
+		</period>
+	</filter>
+	
+	<filter>
+		<name>Track bug diff</name>
+		<type>gain</type>
+		<update-interval-secs type="double">0.05</update-interval-secs>
+		<gain>1.0</gain>
+		<input>
+			<property>/instrumentation/pfd/track-deg</property>
+			<period>
+				<min>-180.0</min>
+				<max>180.0</max>
+			</period>
+		</input>
+		<reference>
+			<property>/instrumentation/pfd/heading-scale</property>
+			<period>
+				<min>-180.0</min>
+				<max>180.0</max>
+			</period>
+		</reference>
+		<output>/instrumentation/pfd/track-hdg-diff</output>
 		<period>
 			<min>-180.0</min>
 			<max>180.0</max>
@@ -138,33 +187,24 @@
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<gain>1.0</gain>
 		<input>
-			<property>/instrumentation/nav/radials/selected-deg</property>
+			<property>/instrumentation/nav[0]/radials/selected-deg</property>
 			<period>
 				<min>-180.0</min>
 				<max>180.0</max>
 			</period>
 		</input>
 		<reference>
-			<property>instrumentation/pfd/heading-deg</property>
+			<property>/instrumentation/pfd/heading-deg</property>
 			<period>
 				<min>-180.0</min>
 				<max>180.0</max>
 			</period>
 		</reference>
-		<output>instrumentation/pfd/loc-crs-diff</output>
+		<output>/instrumentation/pfd/loc-crs-diff</output>
 		<period>
 			<min>-180.0</min>
 			<max>180.0</max>
 		</period>
-		<enable>
-			<property>/flight-management/freq/ils-mode</property>
-			<not>
-				<equals>
-					<property>/instrumentation/nav/nav-id</property>
-					<value></value>
-				</equals>
-			</not>
-		</enable>
 	</filter>
 	
   <!-- =============================================================== -->
@@ -176,13 +216,13 @@
 	  <type>gain</type>
 	  <gain>1.0</gain>
 	  <input>
-		  <property>instrumentation/weu/state/stall-speed</property>
+		  <property>/instrumentation/weu/state/stall-speed</property>
 	  </input>
 	  <reference>
-		  <property>velocities/airspeed-kt</property>
+		  <property>/velocities/airspeed-kt</property>
 		  <offset>85</offset>
 	  </reference>
-	  <output>instrumentation/pfd/stallspeed-diff</output>
+	  <output>/instrumentation/pfd/stallspeed-diff</output>
 	  <min>-205</min>
 	  <max>10</max>
   </filter>
@@ -192,13 +232,13 @@
 	  <type>gain</type>
 	  <gain>-1.0</gain>
 	  <input>
-		  <property>instrumentation/afds/max-airspeed-kts</property>
+		  <property>/instrumentation/afds/max-airspeed-kts</property>
 	  </input>
 	  <reference>
-		  <property>velocities/airspeed-kt</property>
+		  <property>/velocities/airspeed-kt</property>
 		  <offset>-95</offset>
 	  </reference>
-	  <output>instrumentation/pfd/overspeed-diff</output>
+	  <output>/instrumentation/pfd/overspeed-diff</output>
 	  <min>-200</min>
 	  <max>-10</max>
   </filter>  
@@ -210,8 +250,8 @@
   <predict-simple>
 	<name>speed predictor (smoothed)</name>
 	<debug>false</debug>
-	<input>velocities/airspeed-kt</input>
-	<output>instrumentation/pfd/speed-lookahead</output>
+	<input>/velocities/airspeed-kt</input>
+	<output>/instrumentation/pfd/speed-lookahead</output>
 	<seconds>10.0</seconds>
 	<filter-gain>0.01</filter-gain>
   </predict-simple>
@@ -221,14 +261,14 @@
 	<debug>false</debug>
 	<type>gain</type>
 	<input>
-	  <property>instrumentation/pfd/speed-lookahead</property>
+	  <property>/instrumentation/pfd/speed-lookahead</property>
 	</input>
 	<reference>
-	  <property>velocities/airspeed-kt</property>
+	  <property>/velocities/airspeed-kt</property>
 	  <offset>90</offset>
 	</reference>
 	<gain>-0.002667</gain>
-	<output>instrumentation/pfd/speed-trend-up</output>
+	<output>/instrumentation/pfd/speed-trend-up</output>
 	<max>0.24</max>
 	<min>0</min>
   </filter>
@@ -238,15 +278,15 @@
 	<debug>false</debug>
 	<type>gain</type>
 	<input>
-	  <property>instrumentation/pfd/speed-lookahead</property>
+	  <property>/instrumentation/pfd/speed-lookahead</property>
 	  <min>0</min>
 	</input>
 	<reference>
-	  <property>velocities/airspeed-kt</property>
+	  <property>/velocities/airspeed-kt</property>
 	  <offset>-90</offset>
 	</reference>
 	<gain>-0.002667</gain>
-	<output>instrumentation/pfd/speed-trend-down</output>
+	<output>/instrumentation/pfd/speed-trend-down</output>
 	<min>-0.24</min>
 	<max>0</max>
   </filter>
@@ -254,93 +294,11 @@
   <!-- =============================================================== -->
   <!--                            Other stuff                          -->
   <!-- =============================================================== -->
-
-	<filter>
-		<name>Ground Horizon</name>
-		<type>gain</type>
-		<gain>1</gain>
-		<enable>
-			<condition>
-				<not-equals>
-					<property>/options/test-canvas</property>
-					<value>1</value>
-				</not-equals>
-			</condition>
-		</enable>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-			<expression>
-				<dif>
-					<table>
-						<property>/position/gear-agl-ft</property> 
-						<entry><ind>  1</ind><dep>  0</dep></entry>
-						<entry><ind>150</ind><dep> 16</dep></entry>
-					</table>
-					<table>
-						<property>/orientation/pitch-deg</property>
-						<entry><ind> 0</ind><dep>  0</dep></entry>
-						<entry><ind>16</ind><dep>-16</dep></entry>
-					</table>
-				</dif>
-			</expression>
-		</input>
-		<input>
-			<condition>
-				<or>
-					<equals>
-						<property>/gear/gear[1]/wow</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/gear/gear[2]/wow</property>
-						<value>1</value>
-					</equals>
-				</or>
-			</condition>
-			<expression>
-				<dif>
-					<table>
-						<property>/position/gear-agl-ft</property> 
-						<entry><ind>  1</ind><dep>  0</dep></entry>
-						<entry><ind>150</ind><dep> 16</dep></entry>
-					</table>
-					<table>
-						<property>/orientation/pitch-deg</property>
-						<entry><ind>-16</ind><dep> 16</dep></entry>
-						<entry><ind>  0</ind><dep>  0</dep></entry>
-						<entry><ind> 16</ind><dep>-16</dep></entry>
-					</table>
-				</dif>
-			</expression>
-		</input>
-		<output>/instrumentation/pfd/horizon-ground</output>
-		<min>-16</min>
-		<max>16</max>
-	</filter>
   
 	<filter>
 		<name>Ground Horizon</name>
 		<type>gain</type>
 		<gain>1</gain>
-		<enable>
-			<condition>
-				<equals>
-					<property>/options/test-canvas</property>
-					<value>1</value>
-				</equals>
-			</condition>
-		</enable>
 		<input>
 			<condition>
 				<and>
@@ -407,32 +365,6 @@
 		<name>Horizon Heading Pitch</name>
 		<type>gain</type>
 		<gain>1</gain>
-		<enable>
-			<condition>
-				<not-equals>
-					<property>/options/test-canvas</property>
-					<value>1</value>
-				</not-equals>
-			</condition>
-		</enable>
-		<input>/orientation/pitch-deg</input>
-		<output>/instrumentation/pfd/horizon-pitch</output>
-		<min>-15</min>
-		<max>16</max>
-	</filter>
-	
-	<filter>
-		<name>Horizon Heading Pitch</name>
-		<type>gain</type>
-		<gain>1</gain>
-		<enable>
-			<condition>
-				<equals>
-					<property>/options/test-canvas</property>
-					<value>1</value>
-				</equals>
-			</condition>
-		</enable>
 		<input>/orientation/pitch-deg</input>
 		<output>/instrumentation/pfd/horizon-pitch</output>
 		<min>-17.35</min>

revision.txt

@@ -1 +1 @@
-4003
+4004