From fc1575f3fa95715a40f319de37b2291074c333d1 Mon Sep 17 00:00:00 2001
From: Jonathan Redpath <legoboyvdlp@gmail.com>
Date: Thu, 17 Feb 2022 21:33:11 +0000
Subject: [PATCH] Lighting panel

---
 A320-main.xml                          |   1 +
 Models/FlightDeck/a320.flightdeck.xml  | 386 ++++++++++++++++--
 Models/Instruments/OHpanel/OHpanel.xml | 539 +------------------------
 Systems/a320-cockpit.xml               |  54 ++-
 4 files changed, 410 insertions(+), 570 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 98189060..2686cbbe 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -1175,6 +1175,7 @@
 			<emerCall type="bool">0</emerCall>
 			<emerCallLtO type="bool">0</emerCallLtO>
 			<emerCallLtC type="bool">0</emerCallLtC>
+			<emer-lights type="float">0</emer-lights>
 			<landing-lights-l type="float">0.0</landing-lights-l>
 			<landing-lights-r type="float">0.0</landing-lights-r>
 			<loudspeaker-l type="float">1.0</loudspeaker-l>
diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 519ea5b3..77f987fc 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -12151,35 +12151,294 @@
 		<range-m>3.0</range-m>
 	</light>
 	
+	<!-- Exterior lights -->
+	<animation>
+		<type>knob</type>
+		<object-name>TurnoffLtSwtch</object-name>
+		<property>controls/lighting/turnoff-light-switch-pos</property>
+		<factor>60</factor>
+		<offset-deg>-30</offset-deg>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
+		<axis>
+			<object-name>TurnoffLtSwtch.axis</object-name>
+		</axis>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/lighting/turnoff-light-switch</property>
+				<value>0</value>
+				<value>1</value>
+				<wrap>false</wrap>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>nav-sw-lbl</tooltip-id>
+				<label>Turnoff lights switch</label>
+			</binding>
+		</hovered>
+	</animation>
 	
+	<animation>
+		<type>knob</type>
+		<object-name>LandingLtSwtch</object-name>
+		<property>controls/switches/landing-lights-l-pos</property>
+		<factor>60</factor>
+		<offset-deg>-30</offset-deg>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
+		<axis>
+			<object-name>LandingLtSwtch.axis</object-name>
+		</axis>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/switches/landing-lights-l</property>
+				<value>0</value>
+				<value>0.5</value>
+				<value>1</value>
+				<wrap>false</wrap>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>nav-sw-lbl</tooltip-id>
+				<label>Landing light switch</label>
+			</binding>
+		</hovered>
+	</animation>
+	
+	<animation>
+		<type>knob</type>
+		<object-name>LandingLtRSwtch</object-name>
+		<property>controls/switches/landing-lights-r-pos</property>
+		<factor>60</factor>
+		<offset-deg>-30</offset-deg>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
+		<axis>
+			<object-name>LandingLtRSwtch.axis</object-name>
+		</axis>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/switches/landing-lights-r</property>
+				<value>0</value>
+				<value>0.5</value>
+				<value>1</value>
+				<wrap>false</wrap>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>nav-sw-lbl</tooltip-id>
+				<label>Landing light switch</label>
+			</binding>
+		</hovered>
+	</animation>
+	
+	<animation>
+		<type>knob</type>
+		<object-name>NoseLtSwtch</object-name>
+		<property>controls/lighting/taxi-light-switch-pos</property>
+		<factor>60</factor>
+		<offset-deg>-30</offset-deg>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
+		<axis>
+			<object-name>NoseLtSwtch.axis</object-name>
+		</axis>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/lighting/taxi-light-switch</property>
+				<value>0</value>
+				<value>0.5</value>
+				<value>1</value>
+				<wrap>false</wrap>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>nav-sw-lbl</tooltip-id>
+				<label>Landing light switch</label>
+			</binding>
+		</hovered>
+	</animation>
+	
+	<animation>
+		<type>knob</type>
+		<object-name>StrobeLtSwtch</object-name>
+		<property>controls/switches/strobe-pos</property>
+		<factor>60</factor>
+		<offset-deg>-30</offset-deg>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
+		<axis>
+			<object-name>StrobeLtSwtch.axis</object-name>
+		</axis>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/switches/strobe</property>
+				<value>0</value>
+				<value>1</value>
+				<wrap>false</wrap>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>nav-sw-lbl</tooltip-id>
+				<label>Strobe lights switch</label>
+			</binding>
+		</hovered>
+	</animation>
+	
+	<animation>
+		<type>knob</type>
+		<object-name>BeaconLtSwtch</object-name>
+		<property>controls/switches/beacon-pos</property>
+		<factor>60</factor>
+		<offset-deg>-30</offset-deg>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
+		<axis>
+			<object-name>BeaconLtSwtch.axis</object-name>
+		</axis>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/switches/beacon</property>
+				<value>0</value>
+				<value>1</value>
+				<wrap>false</wrap>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>nav-sw-lbl</tooltip-id>
+				<label>Beacon lights switch</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>knob</type>
+		<object-name>WingLtSwtch</object-name>
+		<property>controls/switches/wing-lights-pos</property>
+		<factor>60</factor>
+		<offset-deg>-30</offset-deg>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
+		<axis>
+			<object-name>WingLtSwtch.axis</object-name>
+		</axis>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/switches/wing-lights</property>
+				<value>0</value>
+				<value>1</value>
+				<value>2</value>
+				<wrap>false</wrap>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>nav-sw-lbl</tooltip-id>
+				<label>Wing lights switch</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>knob</type>
+		<object-name>NavLogoLtSwtch</object-name>
+		<property>controls/lighting/nav-lights-switch-pos</property>
+		<factor>35</factor>
+		<offset-deg>-35</offset-deg>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
+		<axis>
+			<object-name>NavLogoLtSwtch.axis</object-name>
+		</axis>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/lighting/nav-lights-switch</property>
+				<value>0</value>
+				<value>1</value>
+				<value>2</value>
+				<wrap>false</wrap>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>nav-sw-lbl</tooltip-id>
+				<label>Navigation lights switch</label>
+			</binding>
+		</hovered>
+	</animation>
 
 	<!-- Passenger signs -->
 	<animation>
-		<name>Seatbelt sign pick</name>
 		<type>knob</type>
 		<object-name>SeatBeltSwtch</object-name>
 		<property>controls/switches/seatbelt-sign-pos</property>
-		<factor>-70</factor>
-		<offset-deg>35</offset-deg>
+		<offset-deg>-30</offset-deg>
+		<factor>60</factor>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
 		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
+			<object-name>SeatBeltSwtch.axis</object-name>
 		</axis>
-		<center>
-			<x-m>-0.18311</x-m>
-			<y-m>0.037974</y-m>
-			<z-m>0.888303</z-m>
-		</center>
 		<action>
-			<button>0</button>
-			<button>3</button>
-			<repeatable>false</repeatable>
 			<binding>
 				<command>property-cycle</command>
 				<property>controls/switches/seatbelt-sign</property>
-				<value>0.0</value>
-				<value>1.0</value>
+				<value>0</value>
+				<value>1</value>
 				<wrap>false</wrap>
 			</binding>
 			<binding>
@@ -12197,29 +12456,23 @@
 	</animation>
 
 	<animation>
-		<name>No smoking sign pick</name>
 		<type>knob</type>
 		<object-name>NoSmokingSwtch</object-name>
 		<property>controls/switches/no-smoking-sign-pos</property>
-		<factor>-70</factor>
-		<offset-deg>35</offset-deg>
+		<offset-deg>-30</offset-deg>
+		<factor>60</factor>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
 		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
+			<object-name>NoSmokingSwtch.axis</object-name>
 		</axis>
-		<center>
-			<x-m>-0.18311</x-m>
-			<y-m>0.072264</y-m>
-			<z-m>0.888303</z-m>
-		</center>
 		<action>
 			<binding>
-				<command>property-cycle</command>
+				<command>property-adjust</command>
 				<property>controls/switches/no-smoking-sign</property>
-				<value>0.0</value>
-				<value>0.5</value>
-				<value>1.0</value>
+				<factor>0.5</factor>
+				<min>0.0</min>
+				<max>1.0</max>
 				<wrap>false</wrap>
 			</binding>
 			<binding>
@@ -12235,6 +12488,77 @@
 			</binding>
 		</hovered>
 	</animation>
+	
+	<animation>
+		<type>knob</type>
+		<object-name>AnnunciatorLtSwtch</object-name>
+		<property>controls/switches/annun-test-pos</property>
+		<axis>
+			<object-name>AnnunciatorLtSwtch.axis</object-name>
+		</axis>
+		<offset-deg>0</offset-deg>
+		<factor>30</factor>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/switches/annun-test</property>
+				<value>0</value>
+				<value>1</value>
+				<wrap>false</wrap>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+	</animation>
+
+	<animation>
+		<type>knob</type>
+		<object-name>EmerExtLtSwtch</object-name>
+		<property>controls/switches/emer-lights-pos</property>
+		<offset-deg>-30</offset-deg>
+		<factor>60</factor>
+		<drag-scale-px>3</drag-scale-px>
+		<drag-direction>vertical</drag-direction>
+		<axis>
+			<object-name>EmerExtLtSwtch.axis</object-name>
+		</axis>
+		<action>
+			<binding>
+				<command>property-cycle</command>
+				<property>controls/switches/emer-lights</property>
+				<value>0.0</value>
+				<value>0.5</value>
+				<value>1.0</value>
+				<wrap>false</wrap>
+			</binding>
+			<binding>
+				<command>nasal</command>
+				<script>setprop("sim/sounde/switch1", 1);</script>
+			</binding>
+		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>emer-exit-lbl</tooltip-id>
+				<label>Emergency Exit Light Switch</label>
+			</binding>
+		</hovered>
+	</animation>
+
+	<animation>
+		<type>select</type>
+		<object-name>EmerExtLtBtn2O</object-name>
+		<condition>
+			<or>
+				<not><property>controls/switches/emer-lights</property></not>
+				<property>controls/switches/annun-test</property>
+			</or>
+		</condition>
+	</animation>
 
 	<animation>
 		<type>knob</type>
diff --git a/Models/Instruments/OHpanel/OHpanel.xml b/Models/Instruments/OHpanel/OHpanel.xml
index 2bb3de92..2e4edf6d 100644
--- a/Models/Instruments/OHpanel/OHpanel.xml
+++ b/Models/Instruments/OHpanel/OHpanel.xml
@@ -4936,429 +4936,7 @@
 		</condition>
 	</animation>
 
-	<!-- Exterior lights -->
-	<animation>
-		<name>Strobe lights pick</name>
-		<type>pick</type>
-		<object-name>StrobeLtSwtch</object-name>
-		<action>
-			<button>0</button>
-			<button>3</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/switches/strobe</property>
-				<value>0.0</value>
-				<value>0.5</value>
-				<value>1.0</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-		<action>
-			<button>1</button>
-			<button>4</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/switches/strobe</property>
-				<value>1.0</value>
-				<value>0.5</value>
-				<value>0.0</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<name>Strobe lights rotate</name>
-		<type>rotate</type>
-		<object-name>StrobeLtSwtch</object-name>
-		<property>controls/switches/strobe</property>
-		<interpolation>
-			<entry><ind>0.0</ind><dep>35</dep></entry>
-			<entry><ind>0.5</ind><dep>0</dep></entry>
-			<entry><ind>1.0</ind><dep>-35</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-		<center>
-			<x-m>-0.01</x-m>
-			<y-m>0</y-m>
-			<z-m>-0.265</z-m>
-		</center>
-	</animation>
-
-	<animation>
-		<name>Beacon lights pick</name>
-		<type>pick</type>
-		<object-name>BeaconLtSwtch</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/switches/beacon</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>Beacon lights rotate</name>
-		<type>rotate</type>
-		<object-name>BeaconLtSwtch</object-name>
-		<property>controls/switches/beacon</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>35</dep></entry>
-			<entry><ind>1</ind><dep>-35</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-		<center>
-			<x-m>-0.01</x-m>
-			<y-m>0</y-m>
-			<z-m>-0.265</z-m>
-		</center>
-	</animation>
-
-	<animation>
-		<name>Wing lights pick</name>
-		<type>pick</type>
-		<object-name>WingLtSwtch</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/switches/wing-lights</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>Wing lights rotate</name>
-		<type>rotate</type>
-		<object-name>WingLtSwtch</object-name>
-		<property>controls/switches/wing-lights</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>35</dep></entry>
-			<entry><ind>1</ind><dep>-35</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-		<center>
-			<x-m>-0.01</x-m>
-			<y-m>0</y-m>
-			<z-m>-0.265</z-m>
-		</center>
-	</animation>
-
-	<animation>
-		<name>Nav/logo lights pick</name>
-		<type>pick</type>
-		<object-name>NavLogoLtSwtch</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>0</value>
-				<value>1</value>
-				<value>2</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-		<action>
-			<button>1</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/lighting/nav-lights-switch</property>
-				<value>2</value>
-				<value>1</value>
-				<value>0</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>Nav/logo lights rotate</name>
-		<type>rotate</type>
-		<object-name>NavLogoLtSwtch</object-name>
-		<property>controls/lighting/nav-lights-switch</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>35</dep></entry>
-			<entry><ind>1</ind><dep>0</dep></entry>
-			<entry><ind>2</ind><dep>-35</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-		<center>
-			<x-m>-0.01</x-m>
-			<y-m>0</y-m>
-			<z-m>-0.265</z-m>
-		</center>
-	</animation>
-
-	<animation>
-		<name>Turnoff light pick</name>
-		<type>pick</type>
-		<object-name>TurnoffLtSwtch</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/lighting/turnoff-light-switch</property>
-				<value>0</value>
-				<value>1</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-		<action>
-			<button>1</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/lighting/turnoff-light-switch</property>
-				<value>1</value>
-				<value>0</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<name>turnoff light rotate</name>
-		<type>rotate</type>
-		<object-name>TurnoffLtSwtch</object-name>
-		<property>controls/lighting/turnoff-light-switch</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>35</dep></entry>
-			<entry><ind>1</ind><dep>-35</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-		<center>
-			<x-m>-0.01</x-m>
-			<y-m>0</y-m>
-			<z-m>-0.3037</z-m>
-		</center>
-	</animation>
-
-	<animation>
-		<name>landing light pick</name>
-		<type>pick</type>
-		<object-name>LandingLtLSwtch</object-name>
-		<action>
-			<button>0</button>
-			<button>3</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/switches/landing-lights-l</property>
-				<value>0</value>
-				<value>0.5</value>
-				<value>1</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-		<action>
-			<button>1</button>
-			<button>4</button>			
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/switches/landing-lights-l</property>
-				<value>1</value>
-				<value>0.5</value>
-				<value>0</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<name>landing light pick</name>
-		<type>pick</type>
-		<object-name>LandingLtRSwtch</object-name>
-		<action>
-			<button>0</button>
-			<button>3</button>			
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/switches/landing-lights-r</property>
-				<value>0</value>
-				<value>0.5</value>
-				<value>1</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-		<action>
-			<button>1</button>
-			<button>4</button>			
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/switches/landing-lights-r</property>
-				<value>1</value>
-				<value>0.5</value>
-				<value>0</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-	</animation>
-
-	<animation>
-		<name>landing light rotate</name>
-		<type>rotate</type>
-		<object-name>LandingLtLSwtch</object-name>
-		<property>controls/switches/landing-lights-l</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>35</dep></entry>
-			<entry><ind>1</ind><dep>-35</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-		<center>
-			<x-m>-0.01</x-m>
-			<y-m>0</y-m>
-			<z-m>-0.3037</z-m>
-		</center>
-	</animation>
-
-	<animation>
-		<name>landing light rotate</name>
-		<type>rotate</type>
-		<object-name>LandingLtRSwtch</object-name>
-		<property>controls/switches/landing-lights-r</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>35</dep></entry>
-			<entry><ind>1</ind><dep>-35</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-		<center>
-			<x-m>-0.01</x-m>
-			<y-m>0</y-m>
-			<z-m>-0.3037</z-m>
-		</center>
-	</animation>
-
-	<animation>
-		<name>Nose landing light pick</name>
-		<type>pick</type>
-		<object-name>NoseLtSwtch</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/lighting/taxi-light-switch</property>
-				<value>0</value>
-				<value>0.5</value>
-				<value>1</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-		<action>
-			<button>1</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/lighting/taxi-light-switch</property>
-				<value>1</value>
-				<value>0.5</value>
-				<value>0</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>Nose landing light rotate</name>
-		<type>rotate</type>
-		<object-name>NoseLtSwtch</object-name>
-		<property>controls/lighting/taxi-light-switch</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>35</dep></entry>
-			<entry><ind>0.5</ind><dep>0</dep></entry>
-			<entry><ind>1</ind><dep>-35</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-		<center>
-			<x-m>-0.01</x-m>
-			<y-m>0</y-m>
-			<z-m>-0.3037</z-m>
-		</center>
-	</animation>
+	
 
 	<!-- Anti-ice -->
 	<!-- Eng and Wing -->
@@ -6087,120 +5665,7 @@
 		</center>
 	</animation>
 
-	<animation>
-		<name>Annun lights pick</name>
-		<type>pick</type>
-		<object-name>AnnunciatorLtSwtch</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/switches/annun-test</property>
-				<!--value>-1</value-->
-				<value>0</value>
-				<value>1</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>Annun lights rotate</name>
-		<type>rotate</type>
-		<object-name>AnnunciatorLtSwtch</object-name>
-		<property>controls/switches/annun-test</property>
-		<interpolation>
-			<entry><ind>-1</ind><dep> 35</dep></entry>
-			<entry><ind> 0</ind><dep>  0</dep></entry>
-			<entry><ind> 1</ind><dep>-35</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-		<center>
-			<x-m>-0.01</x-m>
-			<y-m>0</y-m>
-			<z-m>-0.2597</z-m>
-		</center>
-	</animation>
-
-	<animation>
-		<name>Emer Lights pick</name>
-		<type>pick</type>
-		<object-name>EmerExtLtSwtch</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/switches/emer-lights</property>
-				<value>0.0</value>
-				<value>0.5</value>
-				<value>1.0</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-		<action>
-			<button>1</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-cycle</command>
-				<property>controls/switches/emer-lights</property>
-				<value>1.0</value>
-				<value>0.5</value>
-				<value>0.0</value>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/switch1", 1);</script>
-			</binding>
-		</action>
-	</animation>
-	<animation>
-		<name>Emer Lights rotate</name>
-		<type>rotate</type>
-		<object-name>EmerExtLtSwtch</object-name>
-		<property>controls/switches/emer-lights</property>
-		<interpolation>
-			<entry><ind>0</ind><dep>35</dep></entry>
-			<entry><ind>1</ind><dep>-35</dep></entry>
-		</interpolation>
-		<axis>
-			<x>0</x>
-			<y>1</y>
-			<z>0</z>
-		</axis>
-		<center>
-			<x-m>-0.01</x-m>
-			<y-m>0</y-m>
-			<z-m>-0.3037</z-m>
-		</center>
-	</animation>
-
-	<animation>
-		<type>select</type>
-		<object-name>EmerExtLtBtn2O</object-name>
-		<condition>
-			<or>
-				<equals>
-					<property>controls/switches/emer-lights</property>
-					<value>0</value>
-				</equals>
-				<equals>
-					<property>controls/switches/annun-test</property>
-					<value>1</value>
-				</equals>
-			</or>
-		</condition>
-	</animation>
+	
 
 	<!-- Texts -->
 	<text>
diff --git a/Systems/a320-cockpit.xml b/Systems/a320-cockpit.xml
index c73c623f..daf66097 100644
--- a/Systems/a320-cockpit.xml
+++ b/Systems/a320-cockpit.xml
@@ -140,6 +140,51 @@
 			<c1>20</c1>
 		</lag_filter>
 		
+		<lag_filter name="/controls/navigation/switching/audio-pos">
+			<input>/controls/navigation/switching/audio</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/lighting/turnoff-light-switch-pos">
+			<input>/controls/lighting/turnoff-light-switch</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/switches/landing-lights-l-pos">
+			<input>/controls/switches/landing-lights-l</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/switches/landing-lights-r-pos">
+			<input>/controls/switches/landing-lights-r</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/lighting/taxi-light-switch-pos">
+			<input>/controls/lighting/taxi-light-switch</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/switches/strobe-pos">
+			<input>/controls/switches/strobe</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/switches/beacon-pos">
+			<input>/controls/switches/beacon</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/switches/wing-lights-pos">
+			<input>/controls/switches/wing-lights</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/lighting/nav-lights-switch-pos">
+			<input>/controls/lighting/nav-lights-switch</input>
+			<c1>20</c1>
+		</lag_filter>
+		
 		<lag_filter name="/controls/switches/seatbelt-sign-pos">
 			<input>/controls/switches/seatbelt-sign</input>
 			<c1>20</c1>
@@ -150,8 +195,13 @@
 			<c1>20</c1>
 		</lag_filter>
 		
-		<lag_filter name="/controls/navigation/switching/audio-pos">
-			<input>/controls/navigation/switching/audio</input>
+		<lag_filter name="/controls/switches/emer-lights-pos">
+			<input>/controls/switches/emer-lights</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/switches/annun-test-pos">
+			<input>/controls/switches/annun-test</input>
 			<c1>20</c1>
 		</lag_filter>