From 2de2727dc34e6c513ae092484c5f3235e86a1dba Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Fri, 27 Oct 2017 16:22:22 -0400
Subject: [PATCH] A3XX: Tie integrity lighting to electrical

---
 A320-main.xml                          | 12 ++++++++----
 Models/FlightDeck/a320.flightdeck.xml  | 18 +++++++++---------
 Models/Instruments/OHpanel/OHpanel.xml |  6 +++---
 Nasal/electrical.nas                   |  6 ++++++
 revision.txt                           |  2 +-
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 6b2d780e..74058217 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -565,15 +565,19 @@
 			<cockpit type="bool">0</cockpit>
 			<cones type="bool">true</cones>
 			<dome-norm type="double">0</dome-norm>
+			<fcu-panel-knb type="double">0</fcu-panel-knb>
 			<fcu-panel-norm type="double">0</fcu-panel-norm>
 			<landing-lights n="0" type="bool">0</landing-lights>
-			<landing-lights n="1" type="double">0</landing-lights>
-			<landing-lights n="2" type="double">0</landing-lights>
+			<landing-lights n="1" type="bool">0</landing-lights>
+			<landing-lights n="2" type="bool">0</landing-lights>
+			<main-flood-knb type="double">0</main-flood-knb>
 			<main-flood-norm type="double">0</main-flood-norm>
+			<main-panel-knb type="double">0</main-panel-knb>
 			<main-panel-norm type="double">0</main-panel-norm>
 			<nav-lights-switch type="int">0</nav-lights-switch>
-			<overhead-panel-norm type="double">0.0</overhead-panel-norm>
-			<main-panel-pedestal-norm type="double">0.8</main-panel-pedestal-norm>
+			<overhead-panel-knb type="double">0</overhead-panel-knb>
+			<overhead-panel-norm type="double">0</overhead-panel-norm>
+			<main-panel-pedestal-norm type="double">0</main-panel-pedestal-norm>
 			<strobe type="bool">0</strobe>
 			<taxi-light-switch type="float">0</taxi-light-switch>
 		</lighting>
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 25403015..6a1b0cd7 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -4640,7 +4640,7 @@
 			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
-				<property>controls/lighting/main-flood-norm</property>
+				<property>controls/lighting/main-flood-knb</property>
 				<step>0.05</step>
 				<max>1</max>
 			</binding>
@@ -4651,7 +4651,7 @@
 			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
-				<property>controls/lighting/main-flood-norm</property>
+				<property>controls/lighting/main-flood-knb</property>
 				<step>-0.05</step>
 				<min>0</min>
 			</binding>
@@ -4660,7 +4660,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>flood_lt_main</object-name>
-		<property>controls/lighting/main-flood-norm</property>
+		<property>controls/lighting/main-flood-knb</property>
 		<interpolation>
 			<entry><ind>0</ind><dep>-129</dep></entry>
 			<entry><ind>1</ind><dep>129</dep></entry>
@@ -4679,7 +4679,7 @@
 			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
-				<property>controls/lighting/main-panel-norm</property>
+				<property>controls/lighting/main-panel-knb</property>
 				<step>0.05</step>
 				<max>1</max>
 			</binding>
@@ -4690,7 +4690,7 @@
 			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
-				<property>controls/lighting/main-panel-norm</property>
+				<property>controls/lighting/main-panel-knb</property>
 				<step>-0.05</step>
 				<min>0</min>
 			</binding>
@@ -4699,7 +4699,7 @@
 	<animation>
 		<type>rotate</type>
 		<object-name>integ_lt</object-name>
-		<property>controls/lighting/main-panel-norm</property>
+		<property>controls/lighting/main-panel-knb</property>
 		<interpolation>
 			<entry><ind>0</ind><dep>-129</dep></entry>
 			<entry><ind>1</ind><dep>129</dep></entry>
@@ -4718,7 +4718,7 @@
 			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
-				<property>controls/lighting/fcu-panel-norm</property>
+				<property>controls/lighting/fcu-panel-knb</property>
 				<step>0.05</step>
 				<max>1</max>
 			</binding>
@@ -4729,7 +4729,7 @@
 			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
-				<property>controls/lighting/fcu-panel-norm</property>
+				<property>controls/lighting/fcu-panel-knb</property>
 				<step>-0.05</step>
 				<min>0</min>
 			</binding>
@@ -4739,7 +4739,7 @@
 	<!--animation>
 		<type>rotate</type>
 		<object-name>fcu_integ_knb</object-name>
-		<property>controls/lighting/fcu-panel-norm</property>
+		<property>controls/lighting/fcu-panel-knb</property>
 		<factor>10</factor>
 		<axis>
 			<x1-m>-0.45533</x1-m>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 7528d734..71c6f0f3 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -5738,7 +5738,7 @@
 			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
-				<property>controls/lighting/overhead-panel-norm</property>
+				<property>controls/lighting/overhead-panel-knb</property>
 				<step>0.05</step>
 				<max>1</max>
 			</binding>
@@ -5749,7 +5749,7 @@
 			<repeatable>true</repeatable>
 			<binding>
 				<command>property-adjust</command>
-				<property>controls/lighting/overhead-panel-norm</property>
+				<property>controls/lighting/overhead-panel-knb</property>
 				<step>-0.05</step>
 				<min>0</min>
 			</binding>
@@ -5759,7 +5759,7 @@
 		<name>Overhead panel light rotate</name>
 		<type>rotate</type>
 		<object-name>OHPMarkLtKnb</object-name>
-		<property>controls/lighting/overhead-panel-norm</property>
+		<property>controls/lighting/overhead-panel-knb</property>
 		<interpolation>
 			<entry><ind>0</ind><dep>129</dep></entry>
 			<entry><ind>1</ind><dep>-129</dep></entry>
diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas
index 8e0bcacc..3c852c16 100644
--- a/Nasal/electrical.nas
+++ b/Nasal/electrical.nas
@@ -477,6 +477,9 @@ var master_elec = func {
 		setprop("/systems/electrical/outputs/taxi-lights", 0);
 		setprop("/systems/electrical/outputs/transponder", 0);
 		setprop("/systems/electrical/outputs/turn-coordinator", 0);
+		setprop("/controls/lighting/fcu-panel-norm", 0);
+		setprop("/controls/lighting/main-panel-norm", 0);
+		setprop("/controls/lighting/overhead-panel-norm", 0);
 	} else {
 		setprop("/systems/electrical/on", 1);
 #		aispin.start();
@@ -511,6 +514,9 @@ var master_elec = func {
 		setprop("/systems/electrical/outputs/taxi-lights", dc_volt_std);
 		setprop("/systems/electrical/outputs/transponder", dc_volt_std);
 		setprop("/systems/electrical/outputs/turn-coordinator", dc_volt_std);
+		setprop("/controls/lighting/fcu-panel-norm", getprop("/controls/lighting/fcu-panel-knb"));
+		setprop("/controls/lighting/main-panel-norm", getprop("/controls/lighting/main-panel-knb"));
+		setprop("/controls/lighting/overhead-panel-norm", getprop("/controls/lighting/overhead-panel-knb"));
 	}
 	
 	# Fault lights
diff --git a/revision.txt b/revision.txt
index 1fc34794..18f1da7b 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-3017
\ No newline at end of file
+3018
\ No newline at end of file