From 764d08f4afcf178573bc6996220189a1522d6c2b Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Thu, 28 Oct 2021 21:06:57 +0100
Subject: [PATCH] Displays - dim with integ knobs

---
 Models/FlightDeck/a320.flightdeck.xml  |  2 ++
 Models/Instruments/OHpanel/OHpanel.xml | 44 ++++++++++++++++++++++----
 Models/Instruments/Radio/Radio1.xml    |  2 ++
 Models/Instruments/Radio/Radio2.xml    |  2 ++
 Systems/a320-lights-proprules.xml      | 22 +++++++++++++
 5 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index b71d309d..5c865839 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -7585,6 +7585,7 @@
 			<red>1.00</red>
 			<green>0.355</green>
 			<blue>0.00</blue>
+			<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
 		</diffuse>
 		<ambient>
 			<red>0</red>
@@ -7600,6 +7601,7 @@
 			<red>1.00</red>
 			<green>0.355</green>
 			<blue>0.00</blue>
+			<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
 		</emission>
 	</animation>
 
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index dd486594..86b468a2 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -6409,7 +6409,7 @@
 
 	<!-- Texts -->
 	<text>
-		<name>Battery-volt</name>
+		<name>Battery-volt1</name>
 		<offsets>
 			<x-m>-0.008</x-m>
 			<y-m>-0.057</y-m>
@@ -6435,7 +6435,7 @@
 	</text>
 
 	<text>
-		<name>Battery-volt-test</name>
+		<name>Battery-volt1-test</name>
 		<offsets>
 			<x-m>-0.008</x-m>
 			<y-m>-0.057</y-m>
@@ -6461,7 +6461,7 @@
 	</text>
 
 	<text>
-		<name>Battery-volt</name>
+		<name>Battery-volt2</name>
 		<offsets>
 			<x-m>-0.008</x-m>
 			<y-m>0.035</y-m>
@@ -6487,7 +6487,7 @@
 	</text>
 
 	<text>
-		<name>Battery-volt-test</name>
+		<name>Battery-volt2-test</name>
 		<offsets>
 			<x-m>-0.008</x-m>
 			<y-m>0.035</y-m>
@@ -6514,7 +6514,8 @@
 
 	<animation>
 		<type>select</type>
-		<object-name>Battery-volt</object-name>
+		<object-name>Battery-volt1</object-name>
+		<object-name>Battery-volt2</object-name>
 		<condition>
 			<equals>
 				<property>controls/switches/annun-test</property>
@@ -6525,7 +6526,8 @@
 
 	<animation>
 		<type>select</type>
-		<object-name>Battery-volt-test</object-name>
+		<object-name>Battery-volt1-test</object-name>
+		<object-name>Battery-volt2-test</object-name>
 		<condition>
 			<equals>
 				<property>controls/switches/annun-test</property>
@@ -6533,6 +6535,36 @@
 			</equals>
 		</condition>
 	</animation>
+	
+	<animation>
+		<type>material</type>
+		<object-name>Battery-volt1</object-name>
+		<object-name>Battery-volt2</object-name>
+		<object-name>Battery-volt1-test</object-name>
+		<object-name>Battery-volt2-test</object-name>
+		<diffuse>
+			<red>1</red>
+			<green>1</green>
+			<blue>1</blue>
+			<factor-prop>controls/lighting/overhead-panel-norm-digital</factor-prop>
+		</diffuse>
+		<ambient>
+			<red>0</red>
+			<green>0</green>
+			<blue>0</blue>
+		</ambient>
+		<specular>
+			<red>0</red>
+			<green>0</green>
+			<blue>0</blue>
+		</specular>
+		<emission>
+			<red>1</red>
+			<green>1</green>
+			<blue>1</blue>
+			<factor-prop>controls/lighting/overhead-panel-norm-digital</factor-prop>
+		</emission>
+	</animation>
 
 	<!-- Fire Buttons -->
 	<!-- Engine 1 -->
diff --git a/Models/Instruments/Radio/Radio1.xml b/Models/Instruments/Radio/Radio1.xml
index a02a2e68..19afe077 100644
--- a/Models/Instruments/Radio/Radio1.xml
+++ b/Models/Instruments/Radio/Radio1.xml
@@ -2179,6 +2179,7 @@
 			<red>1.00</red>
 			<green>0.355</green>
 			<blue>0.00</blue>
+			<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
 		</diffuse>
 		<ambient>
 			<red>0</red>
@@ -2194,6 +2195,7 @@
 			<red>1.00</red>
 			<green>0.355</green>
 			<blue>0.00</blue>
+			<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
 		</emission>
 	</animation>
 	
diff --git a/Models/Instruments/Radio/Radio2.xml b/Models/Instruments/Radio/Radio2.xml
index 8ef9b533..0e492559 100644
--- a/Models/Instruments/Radio/Radio2.xml
+++ b/Models/Instruments/Radio/Radio2.xml
@@ -2179,6 +2179,7 @@
 			<red>1.00</red>
 			<green>0.355</green>
 			<blue>0.00</blue>
+			<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
 		</diffuse>
 		<ambient>
 			<red>0</red>
@@ -2194,6 +2195,7 @@
 			<red>1.00</red>
 			<green>0.355</green>
 			<blue>0.00</blue>
+			<factor-prop>controls/lighting/main-panel-norm-digital</factor-prop>
 		</emission>
 	</animation>
 	
diff --git a/Systems/a320-lights-proprules.xml b/Systems/a320-lights-proprules.xml
index 710606aa..c1e702cd 100644
--- a/Systems/a320-lights-proprules.xml
+++ b/Systems/a320-lights-proprules.xml
@@ -46,6 +46,17 @@
         <output>/controls/lighting/main-panel-norm</output>
     </filter>
 	
+    <filter>
+        <type>gain</type>
+        <gain>1.0</gain>
+        <input>
+			<property>/controls/lighting/main-panel-norm-tied</property>
+			<min>0.15</min>
+			<max>1.0</max>
+		</input>
+        <output>/controls/lighting/main-panel-norm-digital</output>
+    </filter>
+	
     <filter>
         <type>gain</type>
         <gain>1.0</gain>
@@ -53,6 +64,17 @@
         <output>/controls/lighting/overhead-panel-norm</output>
     </filter>
 	
+    <filter>
+        <type>gain</type>
+        <gain>1.0</gain>
+        <input>
+			<property>/controls/lighting/overhead-panel-norm-tied</property>
+			<min>0.15</min>
+			<max>1.0</max>
+		</input>
+        <output>/controls/lighting/overhead-panel-norm-digital</output>
+    </filter>
+	
     <filter>
         <type>gain</type>
         <gain>1.0</gain>