From 47223b33671645eb21b07f7a9a448bbb057b2445 Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Sat, 25 Sep 2021 14:08:32 +0100
Subject: [PATCH] Set instrumentation altimeter setting

---
 Models/FlightDeck/a320.flightdeck.xml | 28 +++++++++++++--------------
 Nasal/Displays/DMC.nas                |  2 +-
 Systems/a320-adr.xml                  | 26 +++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 864c0048..b71d309d 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -2950,7 +2950,7 @@
 			<binding>
 				<command>nasal</command>
 				<script>
-				setprop("instrumentation/altimeter/setting-inhg", getprop("instrumentation/altimeter/setting-inhg") + 0.01);
+				setprop("/instrumentation/altimeter/setting-inhg", getprop("/instrumentation/altimeter/setting-inhg") + 0.01);
 				</script>
 				<condition>
 					<and>
@@ -2972,7 +2972,7 @@
 			<binding>
 				<command>nasal</command>
 				<script>
-				setprop("instrumentation/altimeter/setting-hpa", getprop("instrumentation/altimeter/setting-hpa") + 1.0);
+				setprop("/instrumentation/altimeter/setting-hpa", getprop("/instrumentation/altimeter/setting-hpa") + 1.0);
 				</script>
 				<condition>
 					<and>
@@ -3006,7 +3006,7 @@
 			<binding>
 				<command>nasal</command>
 				<script>
-				setprop("instrumentation/altimeter/setting-inhg", getprop("instrumentation/altimeter/setting-inhg") - 0.01);
+				setprop("/instrumentation/altimeter/setting-inhg", getprop("/instrumentation/altimeter/setting-inhg") - 0.01);
 				</script>
 				<condition>
 					<and>
@@ -3028,7 +3028,7 @@
 			<binding>
 				<command>nasal</command>
 				<script>
-				setprop("instrumentation/altimeter/setting-hpa", getprop("instrumentation/altimeter/setting-hpa") - 1.0);
+				setprop("/instrumentation/altimeter/setting-hpa", getprop("/instrumentation/altimeter/setting-hpa") - 1.0);
 				</script>
 				<condition>
 					<and>
@@ -3552,7 +3552,7 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-				if (getprop("instrumentation/efis/inputs/CSTR") != 1) {
+				if (getprop("/instrumentation/efis/inputs/CSTR") != 1) {
 					fcu.cpt_efis_btns("cstr");
 				} else {
 					fcu.cpt_efis_btns("off");
@@ -3597,7 +3597,7 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-				if (getprop("instrumentation/efis[1]/inputs/CSTR") != 1) {
+				if (getprop("/instrumentation/efis[1]/inputs/CSTR") != 1) {
 					fcu.fo_efis_btns("cstr");
 				} else {
 					fcu.fo_efis_btns("off");
@@ -3642,7 +3642,7 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-				if (getprop("instrumentation/efis/inputs/wpt") != 1) {
+				if (getprop("/instrumentation/efis/inputs/wpt") != 1) {
 					fcu.cpt_efis_btns("wpt");
 				} else {
 					fcu.cpt_efis_btns("off");
@@ -3687,7 +3687,7 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-				if (getprop("instrumentation/efis[1]/inputs/wpt") != 1) {
+				if (getprop("/instrumentation/efis[1]/inputs/wpt") != 1) {
 					fcu.fo_efis_btns("wpt");
 				} else {
 					fcu.fo_efis_btns("off");
@@ -3732,7 +3732,7 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-				if (getprop("instrumentation/efis/inputs/VORD") != 1) {
+				if (getprop("/instrumentation/efis/inputs/VORD") != 1) {
 					fcu.cpt_efis_btns("vord");
 				} else {
 					fcu.cpt_efis_btns("off");
@@ -3777,7 +3777,7 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-				if (getprop("instrumentation/efis[1]/inputs/VORD") != 1) {
+				if (getprop("/instrumentation/efis[1]/inputs/VORD") != 1) {
 					fcu.fo_efis_btns("vord");
 				} else {
 					fcu.fo_efis_btns("off");
@@ -3822,7 +3822,7 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-				if (getprop("instrumentation/efis/inputs/NDB") != 1) {
+				if (getprop("/instrumentation/efis/inputs/NDB") != 1) {
 					fcu.cpt_efis_btns("ndb");
 				} else {
 					fcu.cpt_efis_btns("off");
@@ -3867,7 +3867,7 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-				if (getprop("instrumentation/efis[1]/inputs/NDB") != 1) {
+				if (getprop("/instrumentation/efis[1]/inputs/NDB") != 1) {
 					fcu.fo_efis_btns("ndb");
 				} else {
 					fcu.fo_efis_btns("off");
@@ -3912,7 +3912,7 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-				if (getprop("instrumentation/efis/inputs/arpt") != 1) {
+				if (getprop("/instrumentation/efis/inputs/arpt") != 1) {
 					fcu.cpt_efis_btns("arpt");
 				} else {
 					fcu.cpt_efis_btns("off");
@@ -3957,7 +3957,7 @@
 				</condition>
 				<command>nasal</command>
 				<script>
-				if (getprop("instrumentation/efis[1]/inputs/arpt") != 1) {
+				if (getprop("/instrumentation/efis[1]/inputs/arpt") != 1) {
 					fcu.fo_efis_btns("arpt");
 				} else {
 					fcu.fo_efis_btns("off");
diff --git a/Nasal/Displays/DMC.nas b/Nasal/Displays/DMC.nas
index 64b2c274..f9879474 100644
--- a/Nasal/Displays/DMC.nas
+++ b/Nasal/Displays/DMC.nas
@@ -17,7 +17,7 @@ var DMC = {
 		d.sats = [props.globals.getNode("/systems/navigation/adr/output/sat-1", 1), props.globals.getNode("/systems/navigation/adr/output/sat-2", 1), props.globals.getNode("/systems/navigation/adr/output/sat-3", 1)];
 		d.tats = [props.globals.getNode("/systems/navigation/adr/output/tat-1", 1), props.globals.getNode("/systems/navigation/adr/output/tat-2", 1), props.globals.getNode("/systems/navigation/adr/output/tat-3", 1)];
 		d.trends = [props.globals.getNode("/instrumentation/pfd/speed-lookahead-1", 1), props.globals.getNode("/instrumentation/pfd/speed-lookahead-2", 1), props.globals.getNode("/instrumentation/pfd/speed-lookahead-3", 1)];
-		d.altitudeDiffs = [props.globals.getNode("//instrumentation/pfd/alt-diff[0]", 1), props.globals.getNode("//instrumentation/pfd/alt-diff[1]", 1), props.globals.getNode("//instrumentation/pfd/alt-diff[2]", 1)];
+		d.altitudeDiffs = [props.globals.getNode("/instrumentation/pfd/alt-diff[0]", 1), props.globals.getNode("/instrumentation/pfd/alt-diff[1]", 1), props.globals.getNode("/instrumentation/pfd/alt-diff[2]", 1)];
 		d.outputs = [nil, nil, nil, nil, nil, nil, nil, nil]; # airspeed, altitude, mach, pfd altitude, sat, tat, speed trend, altitudeDiffs
 		return d;
 	},
diff --git a/Systems/a320-adr.xml b/Systems/a320-adr.xml
index a1fa63a3..4490f7db 100644
--- a/Systems/a320-adr.xml
+++ b/Systems/a320-adr.xml
@@ -767,6 +767,32 @@
 	
 	<channel name="ADR Output" execrate="2"> <!-- todo - need lowpass? -->
 	
+		<!-- Copy Altimeter Settings -->
+		<pure_gain name="/instrumentation/altimeter[1]/setting-inhg">
+			<input>/instrumentation/altimeter[0]/setting-inhg</input>
+			<gain>1</gain>
+		</pure_gain>
+	
+		<pure_gain name="/instrumentation/altimeter[2]/setting-inhg">
+			<input>/instrumentation/altimeter[0]/setting-inhg</input>
+			<gain>1</gain>
+		</pure_gain>
+	
+		<pure_gain name="/instrumentation/altimeter[3]/setting-inhg">
+			<input>/instrumentation/altimeter[0]/setting-inhg</input>
+			<gain>1</gain>
+		</pure_gain>
+	
+		<pure_gain name="/instrumentation/altimeter[4]/setting-inhg">
+			<input>/instrumentation/altimeter[0]/setting-inhg</input>
+			<gain>1</gain>
+		</pure_gain>
+	
+		<pure_gain name="/instrumentation/altimeter[5]/setting-inhg">
+			<input>/instrumentation/altimeter[0]/setting-inhg</input>
+			<gain>1</gain>
+		</pure_gain>
+	
 		<pure_gain name="/systems/navigation/adr/output/aoa-1">
 			<input>/systems/navigation/probes/aoa-1</input>
 			<gain>/systems/navigation/adr/operating-1</gain>