From 668030b515611b41d3fea95dbb88a675cbdc98f8 Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Sat, 6 Nov 2021 15:05:48 +0000
Subject: [PATCH] IESI: fix power source; also fix the baro knob so that it
 changes inHg only, and works with emergency power.

---
 A320-main.xml                         |   1 -
 Models/FlightDeck/a320.flightdeck.xml | 103 ++++++++++----------------
 Models/Instruments/IESI/IESI.nas      |   2 +-
 Nasal/ECAM/ECAM-logic.nas             |   1 -
 Nasal/Systems/electrical.nas          |   1 +
 5 files changed, 41 insertions(+), 67 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 6af44c57..5b812a29 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -1643,7 +1643,6 @@
 		</altimeter>
 		
 		<altimeter n="6">
-			<inhg type="bool">0</inhg>
 			<indicated-altitude-ft type="double">0</indicated-altitude-ft>
 			<indicated-altitude-ft-pfd type="double">0</indicated-altitude-ft-pfd>
 			<oldqnh type="double">29.92</oldqnh>
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index d4615a7e..71a8e9fa 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -3066,10 +3066,19 @@
 			<repeatable>false</repeatable>
 			<binding>
 				<condition>
-					<greater-than-equals>
-						<property>systems/electrical/bus/dc-ess</property>
-						<value>25</value>
-					</greater-than-equals>
+					<or>
+						<greater-than-equals>
+							<property>systems/electrical/bus/dc-ess</property>
+							<value>25</value>
+						</greater-than-equals>
+						<and>
+							<greater-than-equals>
+								<property>/systems/electrical/bus/sub-bus/dc-hot-1-703</property>
+								<value>25</value>
+							</greater-than-equals>
+							<property>/systems/electrical/sources/si-1/inverter-control/relay-7xb</property>
+						</and>
+					</or>
 				</condition>
 				<command>nasal</command>
 				<script>
@@ -3087,40 +3096,23 @@
 				</script>
 				<condition>
 					<and>
-						<equals>
-							<property>instrumentation/altimeter[6]/inhg</property>
-							<value>1</value>
-						</equals>
 						<equals>
 							<property>instrumentation/altimeter[6]/std</property>
 							<value>0</value>
 						</equals>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
-							<value>25</value>
-						</greater-than-equals>
-					</and>
-				</condition>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>
-				setprop("/instrumentation/altimeter[6]/setting-hpa", getprop("/instrumentation/altimeter[6]/setting-hpa") + 1.0);
-				</script>
-				<condition>
-					<and>
-						<equals>
-							<property>instrumentation/altimeter[6]/inhg</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>instrumentation/altimeter[6]/std</property>
-							<value>0</value>
-						</equals>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
-							<value>25</value>
-						</greater-than-equals>
+						<or>
+							<greater-than-equals>
+								<property>systems/electrical/bus/dc-ess</property>
+								<value>25</value>
+							</greater-than-equals>
+							<and>
+								<greater-than-equals>
+									<property>/systems/electrical/bus/sub-bus/dc-hot-1-703</property>
+									<value>25</value>
+								</greater-than-equals>
+								<property>/systems/electrical/sources/si-1/inverter-control/relay-7xb</property>
+							</and>
+						</or>
 					</and>
 				</condition>
 			</binding>
@@ -3143,40 +3135,23 @@
 				</script>
 				<condition>
 					<and>
-						<equals>
-							<property>instrumentation/altimeter[6]/inhg</property>
-							<value>1</value>
-						</equals>
 						<equals>
 							<property>instrumentation/altimeter[6]/std</property>
 							<value>0</value>
 						</equals>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
-							<value>25</value>
-						</greater-than-equals>
-					</and>
-				</condition>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>
-				setprop("/instrumentation/altimeter[6]/setting-hpa", getprop("/instrumentation/altimeter[6]/setting-hpa") - 1.0);
-				</script>
-				<condition>
-					<and>
-						<equals>
-							<property>instrumentation/altimeter[6]/inhg</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>instrumentation/altimeter[6]/std</property>
-							<value>0</value>
-						</equals>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-ess</property>
-							<value>25</value>
-						</greater-than-equals>
+						<or>
+							<greater-than-equals>
+								<property>systems/electrical/bus/dc-ess</property>
+								<value>25</value>
+							</greater-than-equals>
+							<and>
+								<greater-than-equals>
+									<property>/systems/electrical/bus/sub-bus/dc-hot-1-703</property>
+									<value>25</value>
+								</greater-than-equals>
+								<property>/systems/electrical/sources/si-1/inverter-control/relay-7xb</property>
+							</and>
+						</or>
 					</and>
 				</condition>
 			</binding>
diff --git a/Models/Instruments/IESI/IESI.nas b/Models/Instruments/IESI/IESI.nas
index 6e483049..c3a3c67b 100644
--- a/Models/Instruments/IESI/IESI.nas
+++ b/Models/Instruments/IESI/IESI.nas
@@ -269,7 +269,7 @@ var canvas_IESI = {
 			me.canReset = 1;
 		}
 		
-		if (notification.dcEss >= 25 or (notification.relay7XB and notification.dcHot1 >= 25)) {
+		if (notification.dcEss >= 25 or (notification.relay7XB and notification.dcHot1703 >= 25)) {
 			_showIESI = 1;
 			if (notification.acconfig != 1 and notification.iesiInit != 1) {
 				iesi_init.setBoolValue(1);
diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas
index 269853a7..7b6211a3 100644
--- a/Nasal/ECAM/ECAM-logic.nas
+++ b/Nasal/ECAM/ECAM-logic.nas
@@ -6,7 +6,6 @@
 var dualFailNode = props.globals.initNode("/ECAM/dual-failure-enabled", 0, "BOOL");
 var apWarn       = props.globals.getNode("/it-autoflight/output/ap-warning", 1);
 var athrWarn     = props.globals.getNode("/it-autoflight/output/athr-warning", 1);
-var emerGen      = props.globals.getNode("/controls/electrical/switches/emer-gen", 1);
 
 var acconfig_weight_kgs = props.globals.getNode("/systems/acconfig/options/weight-kgs", 1);
 var state1Node = props.globals.getNode("/engines/engine[0]/state", 1);
diff --git a/Nasal/Systems/electrical.nas b/Nasal/Systems/electrical.nas
index 36e532d4..54894e6d 100644
--- a/Nasal/Systems/electrical.nas
+++ b/Nasal/Systems/electrical.nas
@@ -264,6 +264,7 @@ var input = {
 	"dcEss": "/systems/electrical/bus/dc-ess",
 	"dcEssShed": "/systems/electrical/bus/dc-ess-shed",
 	"dcHot1": "/systems/electrical/bus/dc-hot-1",
+	"dcHot1703": "/systems/electrical/bus/sub-bus/dc-hot-1-703",
 	"dcHot2": "/systems/electrical/bus/dc-hot-2",
 };