ILS: add to ACP; correct GPS power source

Nasal/Panels/acp.nas

@@ -11,6 +11,10 @@ var mkr_capt_recive = props.globals.initNode("/controls/audio/acp[0]/mkr-recive"
 var mkr_capt_volume = props.globals.initNode("/controls/audio/acp[0]/mkr-volume", 1, "DOUBLE");
 var mkr_fo_recive = props.globals.initNode("/controls/audio/acp[1]/mkr-recive", 0, "BOOL");
 var mkr_fo_volume = props.globals.initNode("/controls/audio/acp[1]/mkr-volume", 1, "DOUBLE");
+var ils_capt_recive = props.globals.initNode("/controls/audio/acp[0]/ils-recive", 0, "BOOL");
+var ils_capt_volume = props.globals.initNode("/controls/audio/acp[0]/ils-volume", 1, "DOUBLE");
+var ils_fo_recive = props.globals.initNode("/controls/audio/acp[1]/ils-recive", 0, "BOOL");
+var ils_fo_volume = props.globals.initNode("/controls/audio/acp[1]/ils-volume", 1, "DOUBLE");
 
 var vhf1_capt_recive = props.globals.initNode("/controls/audio/acp[0]/vhf1-recive", 1, "BOOL");
 var vhf2_capt_recive = props.globals.initNode("/controls/audio/acp[0]/vhf2-recive", 1, "BOOL");

Nasal/Systems/electrical.nas

@@ -49,8 +49,6 @@ var ELEC = {
 		tr2Fault: props.globals.getNode("/systems/failures/electrical/tr-2"),
 	},
 	Generic: {
-		adf: props.globals.initNode("/systems/electrical/outputs/adf", 0, "DOUBLE"),
-		dme: props.globals.initNode("/systems/electrical/outputs/dme", 0, "DOUBLE"),
 		efis: props.globals.initNode("/systems/electrical/outputs/efis", 0, "DOUBLE"),
 		fcpPower: props.globals.initNode("/systems/electrical/outputs/fcp-power", 0, "DOUBLE"),
 		fuelPump0: props.globals.initNode("/systems/electrical/outputs/fuel-pump[0]", 0, "DOUBLE"),
@@ -58,10 +56,6 @@ var ELEC = {
 		fuelPump2: props.globals.initNode("/systems/electrical/outputs/fuel-pump[2]", 0, "DOUBLE"),
 		gps: props.globals.initNode("/systems/electrical/outputs/gps", 0, "DOUBLE"),
 		mkViii: props.globals.initNode("/systems/electrical/outputs/mk-viii", 0, "DOUBLE"),
-		nav0: props.globals.initNode("/systems/electrical/outputs/nav[0]", 0, "DOUBLE"),
-		nav1: props.globals.initNode("/systems/electrical/outputs/nav[1]", 0, "DOUBLE"),
-		nav2: props.globals.initNode("/systems/electrical/outputs/nav[2]", 0, "DOUBLE"),
-		nav3: props.globals.initNode("/systems/electrical/outputs/nav[3]", 0, "DOUBLE"),
 		tacan: props.globals.initNode("/systems/electrical/outputs/tacan", 0, "DOUBLE"),
 		transponder: props.globals.initNode("/systems/electrical/outputs/transponder", 0, "DOUBLE"),
 		turnCoordinator: props.globals.initNode("/systems/electrical/outputs/turn-coordinator", 0, "DOUBLE"),

Systems/a320-electrical.xml

@@ -2242,12 +2242,23 @@
 			<output>/systems/electrical/outputs/fuel-pump[0]</output>
 			<output>/systems/electrical/outputs/fuel-pump[1]</output>
 			<output>/systems/electrical/outputs/fuel-pump[2]</output>
-			<output>/systems/electrical/outputs/gps</output>
 			<output>/systems/electrical/outputs/mk-viii</output>
 			<output>/systems/electrical/outputs/tacan</output>
 			<output>/systems/electrical/outputs/turn-coordinator</output>
 		</switch>
 		
+		<switch name="/systems/electrical/generic-ac-pwr">
+			<description>This makes the FG stuff work because we killed the generic electrical</description>
+			<default value="0"/>
+			<test value="/systems/electrical/bus/ac-ess">
+				/systems/electrical/bus/ac-ess ge 25
+			</test>
+			<test value="/systems/electrical/bus/ac-2">
+				/systems/electrical/bus/ac-2 ge 25
+			</test>
+			<output>/systems/electrical/outputs/gps</output>
+		</switch>
+		
 		<switch name="/instrumentation/comm[0]/power-btn">
 			<default value="0"/>
 			<test logic="AND" value="1">

Systems/a320-misc.xml

@@ -195,7 +195,7 @@
 			
 	</channel>
 	
-	<channel name="VOR" execrate="8">
+	<channel name="DME" execrate="8">
 	
 		<switch name="/instrumentation/dme[0]/power-supply">
 			<default value="0"/>
@@ -329,6 +329,24 @@
 			</test>
 		</switch>
 		
+		<switch name="/instrumentation/nav[0]/volume">
+			<default value="0"/>
+			<test logic="AND" value="/controls/audio/acp[0]/ils-volume">
+				/controls/audio/acp[0]/ils-recive eq 1
+				<test logic="OR">
+					/controls/audio/acp[1]/ils-recive eq 0
+					/controls/audio/acp[0]/ils-volume ge /controls/audio/acp[1]/ils-volume
+				</test>
+			</test>
+			<test logic="AND" value="/controls/audio/acp[1]/ils-volume">
+				/controls/audio/acp[1]/ils-recive eq 1
+				<test logic="OR">
+					/controls/audio/acp[0]/ils-recive eq 0
+					/controls/audio/acp[0]/ils-volume lt /controls/audio/acp[1]/ils-volume
+				</test>
+			</test>
+		</switch>
+		
 		<switch name="/instrumentation/nav[2]/volume">
 			<default value="0"/>
 			<test logic="AND" value="/controls/audio/acp[0]/vor1-volume">

Systems/instrumentation.xml

@@ -129,14 +129,14 @@
 	<dme>  <!-- fake extra dme units for the ILS -->
 		<name>dme</name>
 		<number>0</number>
-		<power-supply>/instrumentation/dme[0]/power-supply-node</power-supply>
+		<power-supply>/systems/electrical/bus/ac-ess</power-supply>
 		<minimum-supply-volts>109.9</minimum-supply-volts>
 	</dme>
 	
 	<dme>
 		<name>dme</name>
 		<number>1</number>
-		<power-supply>/instrumentation/dme[1]/power-supply-node</power-supply>
+		<power-supply>/systems/electrical/bus/ac-2</power-supply>
 		<minimum-supply-volts>109.9</minimum-supply-volts>
 	</dme>
 	
@@ -188,14 +188,14 @@
 	<nav-radio> <!-- ILS unit -->
 		<name>nav</name>
 		<number>0</number>
-		<power-supply>/instrumentation/nav[2]/power-supply-node</power-supply>
+		<power-supply>/systems/electrical/bus/ac-ess</power-supply>
 		<minimum-supply-volts>109.9</minimum-supply-volts>
 	</nav-radio>
 	
 	<nav-radio>
 		<name>nav</name>
 		<number>1</number>
-		<power-supply>/instrumentation/nav[3]/power-supply-node</power-supply>
+		<power-supply>/systems/electrical/bus/ac-2</power-supply>
 		<minimum-supply-volts>109.9</minimum-supply-volts>
 	</nav-radio>