Merge branch '3D' of github.com:legoboyvdlp/A320-family into 3D

A320-main.xml

@@ -882,6 +882,17 @@
 			<start type="bool">0</start>
 			<bleed type="bool">0</bleed>
 		</apu>
+		<audio>
+			<acp n="0">
+				<int-rad type="int">1</int-rad>
+			</acp>
+			<acp n="1">
+				<int-rad type="int">1</int-rad>
+			</acp>
+			<acp n="2">
+				<int-rad type="int">1</int-rad>
+			</acp>
+		</audio>
 		<autobrake>
 			<active type="bool">0</active>
 			<brake-left type="double">0</brake-left>
@@ -891,6 +902,18 @@
 			<footwarmer-cpt type="bool">0</footwarmer-cpt>
 			<footwarmer-fo type="bool">0</footwarmer-fo>
 		</cabin>
+		<cockpit>
+			<alt-knb-translate type="double">0.002</alt-knb-translate>
+			<emer-canc-cover type="bool">0</emer-canc-cover>
+			<evac-capt-purs type="int">1</evac-capt-purs>
+			<flaps-lever-translate type="double">0</flaps-lever-translate>
+			<oxygen-mask-cockpit-door-cpt type="double">0</oxygen-mask-cockpit-door-cpt>
+			<oxygen-mask-cockpit-door-fo type="double">0</oxygen-mask-cockpit-door-fo>
+			<park-brk-translate type="double">0</park-brk-translate>
+			<qnh-cpt-knb-translate type="double">0.0015</qnh-cpt-knb-translate>
+			<qnh-fo-knb-translate type="double">0.0015</qnh-fo-knb-translate>
+			<stby-compass type="bool">false</stby-compass>
+		</cockpit>
 		<CVR>
 			<erase type="bool">0</erase>
 			<gndctl type="bool">0</gndctl>
@@ -925,6 +948,11 @@
 				<emer-elec-man-on type="bool">0</emer-elec-man-on>
 			</switches>
 		</electrical>
+		<elt>
+			<elt-switch type="bool">false</elt-switch>
+			<elt-switch-guard type="bool">false</elt-switch-guard>
+			<elt-test-reset type="bool">false</elt-test-reset>
+		</elt>
 		<engines n="0">
 			<engine n="0">
 				<cutoff type="bool">true</cutoff>
@@ -1039,9 +1067,11 @@
 			<DU>
 				<du1 type="double">1</du1>
 				<du2 type="double">1</du2>
+				<du2-layer type="double">1</du2-layer>
 				<du3 type="double">1</du3>
 				<du4 type="double">1</du4>
 				<du5 type="double">1</du5>
+				<du5-layer type="double">1</du5-layer>
 				<du6 type="double">1</du6>
 				<iesi type="double">1</iesi>
 				<mcdu1 type="double">1</mcdu1>
@@ -1080,6 +1110,7 @@
 			<reading-light-left-knb type="double">0</reading-light-left-knb>
 			<reading-light-right-knb type="double">0</reading-light-right-knb>
 			<strobe type="bool">0</strobe>
+			<stby-compass-switch type="bool">0</stby-compass-switch>
 			<no-smoking-sign type="bool">1</no-smoking-sign>
 			<seatbelt-sign type="bool">0</seatbelt-sign>
 			<taxi-light-switch type="float">0</taxi-light-switch>
@@ -1120,23 +1151,30 @@
 				</lights>
 			</adirscp>
 			<switching>
+				<audio type="int">0</audio>
 				<att-hdg type="int">0</att-hdg>
 				<air-data type="int">0</air-data>
 			</switching>
 		</navigation>
 		<OH>
 			<protectors>
-				<ditching type="bool">0</ditching>
-				<elecratman type="bool">0</elecratman>
-				<eng1-manstart type="bool">0</eng1-manstart>
-				<eng2-manstart type="bool">0</eng2-manstart>
-				<eng1-n1 type="bool">0</eng1-n1>
-				<eng2-n1 type="bool">0</eng2-n1>
-				<idg1 type="bool">0</idg1>
-				<idg2 type="bool">0</idg2>
-				<maskman type="bool">0</maskman>
-				<ramair type="bool">0</ramair>
-				<ratman type="bool">0</ratman>
+				<aftdisch type="int">0</aftdisch>
+				<blueelec type="int">0</blueelec>
+				<ditching type="int">0</ditching>
+				<elecratman type="int">0</elecratman>
+				<emercall type="int">0</emercall>
+				<emergentest type="int">0</emergentest>
+				<eng1-manstart type="int">0</eng1-manstart>
+				<eng2-manstart type="int">0</eng2-manstart>
+				<eng1-n1 type="int">0</eng1-n1>
+				<eng2-n1 type="int">0</eng2-n1>
+				<evac type="int">0</evac>
+				<fwddisch type="int">0</fwddisch>
+				<idg1 type="int">0</idg1>
+				<idg2 type="int">0</idg2>
+				<maskman type="int">0</maskman>
+				<ramair type="int">0</ramair>
+				<ratman type="int">0</ratman>
 			</protectors>
 		</OH>
 		<oxygen>
@@ -1159,6 +1197,8 @@
 				<bleed-2 type="bool">1</bleed-2>
 				<blower type="bool">0</blower>
 				<cabin-fans type="bool">1</cabin-fans>
+				<eng1-manstart type="int">0</eng1-manstart>
+				<eng2-manstart type="int">0</eng2-manstart>
 				<extract type="bool">0</extract>
 				<ground-air type="bool">0</ground-air>
 				<hot-air type="bool">1</hot-air>
@@ -1179,8 +1219,11 @@
 			<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>
+			<loudspeaker-r type="float">1.0</loudspeaker-r>
 			<LrainRpt type="bool">0</LrainRpt>
 			<mechCall type="bool">0</mechCall>
 			<no-smoking-sign type="double">0.5</no-smoking-sign>
@@ -1397,7 +1440,9 @@
 				</bat-2>
 			</sources>
 		</electrical>
-		
+		<elt>
+			<light-on type="bool">false</light-on>
+		</elt>
 		<failures n="0">
 			<aileron-left type="bool">0</aileron-left>
 			<aileron-right type="bool">0</aileron-right>
@@ -1647,6 +1692,7 @@
 			<cabinalt-norm type="double">0</cabinalt-norm>
 			<cabinpsi type="double">14.7</cabinpsi>
 			<ditchingpb type="double">14.7</ditchingpb>
+			<outflowpos-man-sw type="int">0</outflowpos-man-sw>
 		</pressurization>
 		
 		<pitot n="0">
@@ -1834,6 +1880,20 @@
 			<volume type="double">0</volume>
 		</dme>
 		
+		<efis n="0">
+			<input>
+				<lh-vor-adf type="int">0</lh-vor-adf>
+				<rh-vor-adf type="int">0</rh-vor-adf>
+			</input>
+		</efis>
+		
+		<efis n="1">
+			<input>
+				<lh-vor-adf type="int">0</lh-vor-adf>
+				<rh-vor-adf type="int">0</rh-vor-adf>
+			</input>
+		</efis>
+		
 		<groundradar>
 			<range type="double">1.0</range>
 		</groundradar>
@@ -1952,6 +2012,9 @@
 					<decision-height-ncd type="bool">0</decision-height-ncd>
 					<decision-height type="double">250</decision-height>
 				</arinc429>
+				<discretes>
+					<momentary-flap-all-override type="bool">0</momentary-flap-all-override>
+				</discretes>
 			</inputs>
 			<speaker>
 				<max-dist type="double">2</max-dist>
@@ -4167,8 +4230,8 @@
 				</binding>
 			</key>
 			<key n="114">
-				<name>r</name>
-				<desc>MCDU</desc>
+				<name>o</name>
+				<desc>Change view to aft overhead</desc>
 				<binding>
 					<condition>
 						<property>/FMGC/keyboard-left</property>
@@ -4183,6 +4246,15 @@
 					<command>nasal</command>
 					<script>mcdu.button("R", 1);</script>
 				</binding>
+				<repeatable type="bool">true</repeatable>
+				<binding>
+					<condition>
+						<not><property>/FMGC/keyboard-left</property></not>
+						<not><property>/FMGC/keyboard-right</property></not>
+					</condition>
+					<command>nasal</command>
+					<script>libraries.aftOverheadView();</script>
+				</binding>
 			</key>
 			<key n="115">
 				<name>s</name>
@@ -4898,6 +4970,9 @@
 			<file>Aircraft/A320-family/Models/Instruments/Lower-ECAM/Lower-ECAM-wheel.nas</file>
 			<file>Aircraft/A320-family/Models/Instruments/Lower-ECAM/Lower-ECAM.nas</file>
 		</canvas_ecam>
+		<canvas_battery>
+			<file>Aircraft/A320-family/Models/Instruments/BatteryVoltage/BatteryVoltage.nas</file>
+		</canvas_battery>
 		<canvas_iesi>
 			<file>Aircraft/A320-family/Models/Instruments/IESI/IESI.nas</file>
 		</canvas_iesi>

Models/Instruments/BatteryVoltage/BatteryVoltage.nas

@@ -0,0 +1,85 @@
+# A3XX IESI
+
+# Copyright (c) 2022 Josh Davidson (Octal450)
+
+var canvas_battery = {
+	new: func(name, num) {
+		var obj = {parents: [canvas_battery] };
+		obj.canvas = canvas.new({
+			"name": "Battery",
+			"size": [600, 256],
+			"view": [600, 256],
+			"mipmapping": 1,
+		});
+		
+		obj.canvas.addPlacement({"node": "batt_voltage.canvas." ~ (num == 0 ? "L" : "R")});
+        obj.group = obj.canvas.createGroup();
+		
+		obj.text = obj.group.createChild("text", "optional-id-for element");
+		obj.text.setText("28.8V");
+        obj.text.setTranslation(50, 128);
+        obj.text.setAlignment("left-center");
+        obj.text.setFont("Airbus7Seg.ttf");
+		obj.text.setFontSize(180);
+		
+		obj.update_items = [
+			props.UpdateManager.FromHashValue("annunTest", 1, func(val) {
+				obj.test = val;
+			}),
+		];
+		
+		if (num == 0) {
+			append(obj.update_items, props.UpdateManager.FromHashValue("dcHot1", 0.05, func(val) {
+				obj.voltage = sprintf("%4.1fV", val);
+			}));
+		} else {
+			append(obj.update_items, props.UpdateManager.FromHashValue("dcHot2", 0.05, func(val) {
+				obj.voltage = sprintf("%4.1fV", val);
+			}));
+		}
+		
+		return obj;
+	},
+	update: func(notification) {
+		foreach(var update_item; me.update_items)
+        {
+            update_item.update(notification);
+        }
+		
+		if (me.test) {
+			me.text.setText("88.8V");
+		} else {
+			me.text.setText(me.voltage);
+		}
+	},
+};
+
+var BatteryRecipient =
+{
+	new: func(_ident, num)
+	{
+		var NewIESIRecipient = emesary.Recipient.new(_ident);
+		NewIESIRecipient.MainScreen = nil;
+		NewIESIRecipient.Receive = func(notification)
+		{
+			if (notification.NotificationType == "FrameNotification")
+			{
+				if (NewIESIRecipient.MainScreen == nil) {
+					NewIESIRecipient.MainScreen = canvas_battery.new("A320 Battery", num);
+				}
+				
+				if (math.mod(notifications.frameNotification.FrameCount,2) == 0) {
+					NewIESIRecipient.MainScreen.update(notification);
+				}
+				return emesary.Transmitter.ReceiptStatus_OK;
+			}
+			return emesary.Transmitter.ReceiptStatus_NotProcessed;
+		};
+		return NewIESIRecipient;
+	},
+};
+
+var A320BatteryL = BatteryRecipient.new("A320 Battery", 0);
+var A320BatteryR = BatteryRecipient.new("A320 Battery", 1);
+emesary.GlobalTransmitter.Register(A320BatteryL);
+emesary.GlobalTransmitter.Register(A320BatteryR);

Models/Instruments/BatteryVoltage/BatteryVoltage.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<!-- Copyright (c) 2022 Josh Davidson (Octal450) -->
+
+<PropertyList>
+
+	<path>res/IESI.ac</path>
+	
+	<animation>
+		<type>pick</type>
+		<object-name>iesi.screen</object-name>
+		<action>
+			<button>0</button>
+			<repeatable>false</repeatable>
+			<binding>
+				<command>nasal</command>
+				<script>canvas_iesi.showIESI();</script>
+			</binding>
+		</action>
+	</animation>
+	
+	<animation>
+		<type>material</type>
+		<object-name>iesi.screen</object-name>
+		<emission>
+			<red>1</red>
+			<green>1</green>
+			<blue>1</blue>
+			<factor-prop>controls/lighting/DU/iesi</factor-prop>
+		</emission>
+	</animation>
+	
+	<effect>
+		<inherits-from>Aircraft/A320-family/Models/Effects/displays/lcd</inherits-from>
+		<parameters>
+			<inner-angle>90</inner-angle> <!-- 0-90, use 90 for LED or plasma display-->
+			<outer-angle>90</outer-angle> <!-- 0-90, but greater than inner -->
+			<black-angle>90</black-angle> <!-- 0-90, but greater than outer -->
+			<dirt-factor>0.09</dirt-factor>
+			<contrast><use>instrumentation/iesi/lcd-contrast</use></contrast>
+		</parameters>
+		<object-name>iesi.screen</object-name>
+	</effect>
+
+</PropertyList>

Models/Instruments/Lower-ECAM/Lower-ECAM-APU.nas

@@ -175,6 +175,7 @@ var canvas_lowerECAMPageApu =
 					obj.showApuParams = 1;
 				} else {
 					obj["APUN"].setColor(0.7333,0.3803,0);
+					obj["APUN-needle"].setColor(0.7333,0.3803,0);
 					obj["APUEGT"].setColor(0.7333,0.3803,0);
 					obj["APUN-needle"].hide();
 					obj["APUEGT-needle"].hide();

Models/Instruments/OHpanel/OHpanelEPR.xml

@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- Copyright (c) 2022 Josh Davidson (Octal450) -->
-
-<PropertyList>
-
-	<path>res/ohpanelEPR.ac</path>
-	
-	<!-- No button lights without power! -->
-	<animation>
-		<type>select</type>
-		<object-name>Eng1N1Btn2O</object-name>
-		<object-name>Eng2N1Btn2O</object-name>
-		<condition>
-			<or>
-				<greater-than-equals>
-					<property>systems/electrical/bus/dc-1</property>
-					<value>25</value>
-				</greater-than-equals>
-				<greater-than-equals>
-					<property>systems/electrical/bus/dc-2</property>
-					<value>25</value>
-				</greater-than-equals>
-			</or>
-		</condition>
-	</animation>
-	
-	<!-- N1 Mode switches -->
-	<animation>
-		<type>pick</type>
-		<object-name>Eng1N1Btn</object-name>
-		<object-name>Eng1N1Btn2O</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<condition>
-					<and>
-						<equals>
-							<property>controls/OH/protectors/eng1-n1</property>
-							<value>1</value>
-						</equals>
-						<or>
-							<greater-than-equals>
-								<property>systems/electrical/bus/dc-1</property>
-								<value>25</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>systems/electrical/bus/dc-2</property>
-								<value>25</value>
-							</greater-than-equals>
-						</or>
-					</and>
-				</condition>
-				<command>property-toggle</command>
-				<property>fdm/jsbsim/fadec/control-1/n1-mode-sw</property>
-			</binding>
-			<binding>
-				<command>property-assign</command>
-				<property>controls/OH/protectors/eng1-n1</property>
-				<value>0</value>
-			</binding>
-			<binding>
-				<condition>
-					<equals>
-						<property>controls/OH/protectors/eng1-n1</property>
-						<value>1</value>
-					</equals>
-				</condition>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-		</action>
-	</animation>
-	
-	<animation>
-		<type>pick</type>
-		<object-name>Eng1N1Prot</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/OH/protectors/eng1-n1</property>
-			</binding>
-			<binding>
-				<condition>
-					<not>
-				<property>controls/OH/protectors/eng1-n1</property>
-					</not>
-				</condition>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-cover", 1);</script>
-			</binding>
-		</action>
-	</animation>
-	
-	<animation>
-		<type>rotate</type>
-		<object-name>Eng1N1Prot</object-name>
-		<property>controls/OH/protectors/eng1-n1</property>
-		<factor>-145</factor>
-		<axis>
-			<x1-m>0.00201</x1-m>
-			<y1-m>0.25404</y1-m>
-			<z1-m>-0.20418</z1-m>
-			<x2-m>0.00489</x2-m>
-			<y2-m>0.27681</y2-m>
-			<z2-m>-0.20418</z2-m>
-		</axis>
-	</animation>
-	
-	<animation>
-		<type>select</type>
-		<object-name>Eng1N1Btn2O</object-name>
-		<condition>
-			<or>
-				<equals>
-					<property>fdm/jsbsim/fadec/control-1/n1-mode-sw</property>
-					<value>1</value>
-				</equals>
-				<equals>
-					<property>controls/switches/annun-test</property>
-					<value>1</value>
-				</equals>
-			</or>
-		</condition>
-	</animation>
-	
-	<animation>
-		<type>pick</type>
-		<object-name>Eng2N1Btn</object-name>
-		<object-name>Eng2N1Btn2O</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<condition>
-					<and>
-						<equals>
-							<property>controls/OH/protectors/eng2-n1</property>
-							<value>1</value>
-						</equals>
-						<or>
-							<greater-than-equals>
-								<property>systems/electrical/bus/dc-1</property>
-								<value>25</value>
-							</greater-than-equals>
-							<greater-than-equals>
-								<property>systems/electrical/bus/dc-2</property>
-								<value>25</value>
-							</greater-than-equals>
-						</or>
-					</and>
-				</condition>
-				<command>property-toggle</command>
-				<property>fdm/jsbsim/fadec/control-2/n1-mode-sw</property>
-			</binding>
-			<binding>
-				<command>property-assign</command>
-				<property>controls/OH/protectors/eng2-n1</property>
-				<value>0</value>
-			</binding>
-			<binding>
-				<condition>
-					<equals>
-						<property>controls/OH/protectors/eng2-n1</property>
-						<value>1</value>
-					</equals>
-				</condition>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-		</action>
-	</animation>
-	
-	<animation>
-		<type>pick</type>
-		<object-name>Eng2N1Prot</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<command>property-toggle</command>
-				<property>controls/OH/protectors/eng2-n1</property>
-			</binding>
-			<binding>
-				<condition>
-					<not>
-				<property>controls/OH/protectors/eng2-n1</property>
-					</not>
-				</condition>
-				<command>nasal</command>
-				<script>setprop("sim/sounde/oh-cover", 1);</script>
-			</binding>
-		</action>
-	</animation>
-	
-	<animation>
-		<type>rotate</type>
-		<object-name>Eng2N1Prot</object-name>
-		<property>controls/OH/protectors/eng2-n1</property>
-		<factor>-145</factor>
-		<axis>
-			<x1-m>0.00616</x1-m>
-			<y1-m>0.2855</y1-m>
-			<z1-m>-0.20418</z1-m>
-			<x2-m>0.00904</x2-m>
-			<y2-m>0.30828</y2-m>
-			<z2-m>-0.20418</z2-m>
-		</axis>
-	</animation>
-	
-	<animation>
-		<type>select</type>
-		<object-name>Eng2N1Btn2O</object-name>
-		<condition>
-			<or>
-				<equals>
-					<property>fdm/jsbsim/fadec/control-2/n1-mode-sw</property>
-					<value>1</value>
-				</equals>
-				<equals>
-					<property>controls/switches/annun-test</property>
-					<value>1</value>
-				</equals>
-			</or>
-		</condition>
-	</animation>
-	
-	<!-- Panel lighting -->
-	<animation>
-		<name>Panel lighting</name>
-		<type>material</type>
-		<object-name>MarkingLts</object-name>
-		<condition>
-			<not>
-				<and>
-					<greater-than>
-						<property>sim/model/lights/dome-light</property>
-						<value>0</value>
-					</greater-than>
-					<less-than>
-						<property>controls/lighting/overhead-panel-norm</property>
-						<value>0.25</value>
-					</less-than>
-				</and>
-			</not>
-		</condition>
-		<emission>
-			<red>1</red>
-			<green>0.824</green>
-			<blue>0.518</blue>
-			<factor-prop>controls/lighting/overhead-panel-norm</factor-prop>
-		</emission>
-	</animation>
-	
-	<animation>
-		<name>Panel lighting</name>
-		<type>material</type>
-		<object-name>MarkingLts</object-name>
-		<condition>
-			<and>
-				<not>
-					<greater-than>
-						<property>controls/lighting/overhead-panel-norm</property>
-						<value>0.25</value>
-					</greater-than>
-				</not>
-				<greater-than>
-					<property>sim/model/lights/dome-light</property>
-					<value>0</value>
-				</greater-than>
-			</and>
-		</condition>
-		<emission>
-			<red>0.20</red>
-			<green>0.20</green>
-			<blue>0.20</blue>
-			<factor-prop>sim/model/lights/dome-light</factor-prop>
-		</emission>
-	</animation>
-
-</PropertyList>

Models/Instruments/OHpanel/SteepAppr.xml

@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- Copyright (c) 2022 Josh Davidson (Octal450) -->
-
-<PropertyList>
-
-	<path>res/SteepAppr.ac</path>
-
-	<!-- ANIMATIONS -->
-	
-	<animation>
-		<type>select</type>
-		<object-name>SteepApprBtn2O</object-name>
-		<condition>
-			<or>
-				<greater-than-equals>
-					<property>systems/electrical/bus/dc-1</property>
-					<value>25</value>
-				</greater-than-equals>
-				<greater-than-equals>
-					<property>systems/electrical/bus/dc-2</property>
-					<value>25</value>
-				</greater-than-equals>
-			</or>
-		</condition>
-	</animation>
-	
-	<!-- Steep Approach -->
-	
-	<animation>
-		<type>pick</type>
-		<object-name>SteepApprBtn1</object-name>
-		<object-name>SteepApprBtn2</object-name>
-		<object-name>SteepApprBtn2O</object-name>
-		<action>
-			<button>0</button>
-			<repeatable>false</repeatable>
-			<binding>
-				<condition>
-					<or>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-1</property>
-							<value>25</value>
-						</greater-than-equals>
-						<greater-than-equals>
-							<property>systems/electrical/bus/dc-2</property>
-							<value>25</value>
-						</greater-than-equals>
-					</or>
-				</condition>
-				<command>property-toggle</command>
-				<property>options/steep-ils</property>
-			</binding>
-			<binding>
-				<command>nasal</command>
-				<script>libraries.pushbutton();</script>
-			</binding>
-		</action>
-	</animation>
-	
-	<animation>
-		<type>select</type>
-		<object-name>SteepApprBtn2O</object-name>
-		<condition>
-			<or>
-				<equals>
-					<property>options/steep-ils</property>
-					<value>1</value>
-				</equals>
-				<equals>
-					<property>controls/switches/annun-test</property>
-					<value>1</value>
-				</equals>
-			</or>
-		</condition>
-	</animation>
-
-	<!-- Panel lighting -->
-	<animation>
-		<name>Panel lighting</name>
-		<type>material</type>
-		<object-name>MarkingLts</object-name>
-		<condition>
-			<not>
-				<and>
-					<greater-than>
-						<property>sim/model/lights/dome-light</property>
-						<value>0</value>
-					</greater-than>
-					<less-than>
-						<property>controls/lighting/overhead-panel-norm</property>
-						<value>0.25</value>
-					</less-than>
-				</and>
-			</not>
-		</condition>
-		<emission>
-			<red>1</red>
-			<green>0.824</green>
-			<blue>0.518</blue>
-			<factor-prop>controls/lighting/overhead-panel-norm</factor-prop>
-		</emission>
-	</animation>
-	
-	<animation>
-		<name>Panel lighting</name>
-		<type>material</type>
-		<object-name>MarkingLts</object-name>
-		<condition>
-			<and>
-				<not>
-					<greater-than>
-						<property>controls/lighting/overhead-panel-norm</property>
-						<value>0.25</value>
-					</greater-than>
-				</not>
-				<greater-than>
-					<property>sim/model/lights/dome-light</property>
-					<value>0</value>
-				</greater-than>
-			</and>
-		</condition>
-		<emission>
-			<red>0.20</red>
-			<green>0.20</green>
-			<blue>0.20</blue>
-			<factor-prop>sim/model/lights/dome-light</factor-prop>
-		</emission>
-	</animation>
-
-</PropertyList>

Models/Instruments/OHpanel/res/SteepAppr.ac

@@ -1,164 +0,0 @@
-AC3Db
-MATERIAL "ac3dmat1" rgb 0.992157 0.992157 0.992157  amb 0.2 0.2 0.2  emis 1 1 1  spec 0 0 0  shi 128  trans 0
-MATERIAL "ac3dmat1" rgb 1 1 1  amb 1 1 1  emis 0 0 0  spec 1 1 1  shi 128  trans 0
-OBJECT world
-kids 4
-OBJECT poly
-name "SteepApprBtn2O"
-loc 0.0102001 -0.168758 -0.244878
-data 8
-Cube.063
-texture "buttons2.png"
-crease 30.000000
-numvert 8
--0.00349075 -0.0464 -0.0536251
--0.00592814 -0.0464 -0.0337741
--0.00295051 -0.0464 -0.0334085
--0.00051312 -0.0464 -0.0532595
--0.00349075 -0.0564 -0.0536251
--0.00592814 -0.0564 -0.0337741
--0.00295051 -0.0564 -0.0334085
--0.00051312 -0.0564 -0.0532595
-numsurf 4
-SURF 0x0
-mat 0
-refs 4
-3 0.5 0.75
-7 0.5 0.5
-4 0.5 0.5
-0 0.5 0.75
-SURF 0x0
-mat 0
-refs 4
-6 0 0.5
-2 9.31321e-008 0.75
-1 9.31321e-008 0.75
-5 0 0.5
-SURF 0x0
-mat 0
-refs 4
-7 0.5 0.5
-3 0.5 0.75
-2 9.31321e-008 0.75
-6 0 0.5
-SURF 0x0
-mat 0
-refs 4
-7 0.5 0.5
-6 0 0.5
-5 0 0.5
-4 0.5 0.5
-kids 0
-OBJECT poly
-name "SteepApprBtn1"
-loc 0.0152448 0.00304149 -0.286474
-data 8
-Cube.031
-texture "buttons.png"
-crease 30.000000
-numvert 8
--0.00561947 -0.2182 -0.0116719
--0.00805682 -0.2182 0.00817901
--0.0110345 -0.2182 0.00781345
--0.0085971 -0.2182 -0.0120375
--0.00561947 -0.2082 -0.0116719
--0.00805682 -0.2082 0.00817901
--0.0110345 -0.2082 0.00781345
--0.0085971 -0.2082 -0.0120375
-numsurf 4
-SURF 0x0
-mat 0
-refs 4
-4 0.5 1
-7 0.5 1
-6 9.31321e-008 1
-5 9.31321e-008 1
-SURF 0x0
-mat 0
-refs 4
-0 0.5 0.75
-4 0.5 1
-5 9.31321e-008 1
-1 0 0.75
-SURF 0x0
-mat 0
-refs 4
-1 0 0.75
-5 9.31321e-008 1
-6 9.31321e-008 1
-2 0 0.75
-SURF 0x0
-mat 0
-refs 4
-4 0.5 1
-0 0.5 0.75
-3 0.5 0.75
-7 0.5 1
-kids 0
-OBJECT poly
-name "SteepApprBtn2"
-loc 0.0152448 0.00304149 -0.286474
-data 8
-Cube.032
-texture "buttons.png"
-crease 30.000000
-numvert 8
--0.0085971 -0.2182 -0.0120375
--0.0110345 -0.2182 0.00781345
--0.00805682 -0.2182 0.00817901
--0.00561947 -0.2182 -0.0116719
--0.0085971 -0.2282 -0.0120375
--0.0110345 -0.2282 0.00781345
--0.00805682 -0.2282 0.00817901
--0.00561947 -0.2282 -0.0116719
-numsurf 4
-SURF 0x0
-mat 0
-refs 4
-3 0.5 0.75
-7 0.5 0.5
-4 0.5 0.5
-0 0.5 0.75
-SURF 0x0
-mat 0
-refs 4
-6 0 0.5
-2 9.31321e-008 0.75
-1 9.31321e-008 0.75
-5 0 0.5
-SURF 0x0
-mat 0
-refs 4
-7 0.5 0.5
-3 0.5 0.75
-2 9.31321e-008 0.75
-6 0 0.5
-SURF 0x0
-mat 0
-refs 4
-7 0.5 0.5
-6 0 0.5
-5 0 0.5
-4 0.5 0.5
-kids 0
-OBJECT poly
-name "MarkingLts"
-loc 0.00126776 -5.00064e-005 -5.00083e-005
-data 9
-Plane.007
-texture "markingsSteepAppr.png"
-crease 30.000000
-numvert 4
-0.00329813 -0.232617 -0.270463
-0.00329813 -0.1956 -0.270463
-0.00775683 -0.232617 -0.306132
-0.00775683 -0.1956 -0.306132
-numsurf 1
-SURF 0x0
-mat 1
-refs 4
-3 0.942185 0.199076
-1 0.888916 0.199076
-0 0.888916 0.142127
-2 0.942185 0.142127
-kids 0

Nasal/Displays/CanvasQNH.nas

@@ -27,7 +27,7 @@ var QNHCanvasParent = {
 			.setFontSize(13, 1)
 			.setColor([0.45,0.98,0.06])
 			.setAlignment("left-bottom-baseline")
-			.setFont("led.txf")
+			.setFont("Airbus7Seg.ttf")
 			.setText("8888");
 			
 		return QNHCanvas;

Nasal/FMGC/FMGC.nas

@@ -970,36 +970,58 @@ var ManagedSPD = maketimer(0.25, func {
 				FMGCInternal.machSwitchover = 0;
 			}
 			
+			var waypoint = flightPlanController.flightplans[2].getWP(FPLN.currentWP.getValue());
+			var constraintSpeed = nil;
+		
+			if (waypoint != nil) {
+				constraintSpeed = flightPlanController.flightplans[2].getWP(FPLN.currentWP.getValue()).speed_cstr;
+			}
+			
 			if ((Modes.PFD.FMA.pitchMode == " " or Modes.PFD.FMA.pitchMode == "SRS") and (FMGCInternal.phase == 0 or FMGCInternal.phase == 1)) {
 				FMGCInternal.mngKtsMach = 0;
 				FMGCInternal.mngSpdCmd = srsSPD;
 			} elsif ((FMGCInternal.phase == 2 or FMGCInternal.phase == 3) and altitude <= FMGCInternal.clbSpdLimAlt) {
 				# Speed is maximum of greendot / climb speed limit
 				FMGCInternal.mngKtsMach = 0;
-				FMGCInternal.mngSpdCmd = FMGCInternal.decel ? FMGCInternal.minspeed : math.clamp(FMGCInternal.clbSpdLim, FMGCInternal.clean, 999);
+				
+				if (constraintSpeed != nil and constraintSpeed != 0) {
+					FMGCInternal.mngSpdCmd = FMGCInternal.decel ? FMGCInternal.minspeed : math.clamp(math.min(FMGCInternal.clbSpdLim, constraintSpeed), FMGCInternal.clean, 999);
+				} else {
+					FMGCInternal.mngSpdCmd = FMGCInternal.decel ? FMGCInternal.minspeed : math.clamp(FMGCInternal.clbSpdLim, FMGCInternal.clean, 999);
+				}
 			} elsif ((FMGCInternal.phase == 2 or FMGCInternal.phase == 3) and altitude > (FMGCInternal.clbSpdLimAlt + 20)) {
 				FMGCInternal.mngKtsMach = FMGCInternal.machSwitchover ? 1 : 0;
-				FMGCInternal.mngSpdCmd = FMGCInternal.machSwitchover ? mng_alt_mach : mng_alt_spd;
+				FMGCInternal.mngSpdCmd = FMGCInternal.machSwitchover ? math.min(mng_alt_mach, ktsToMach(constraintSpeed)) : math.min(mng_alt_spd, constraintSpeed);
 			} elsif ((FMGCInternal.phase >= 4  and FMGCInternal.phase <= 6) and altitude > (FMGCInternal.desSpdLimAlt + 20)) {
 				if (FMGCInternal.decel) {
 					FMGCInternal.mngKtsMach = 0;
 					FMGCInternal.mngSpdCmd = FMGCInternal.minspeed;
 				} else {
 					FMGCInternal.mngKtsMach = FMGCInternal.machSwitchover ? 1 : 0;
-					FMGCInternal.mngSpdCmd = FMGCInternal.machSwitchover ? mng_alt_mach : mng_alt_spd;
+					if (constraintSpeed != nil and constraintSpeed != 0) {
+						FMGCInternal.mngSpdCmd = FMGCInternal.machSwitchover ? math.min(mng_alt_mach, ktsToMach(constraintSpeed)) : math.min(mng_alt_spd, constraintSpeed);
+					} else {
+						FMGCInternal.mngSpdCmd = FMGCInternal.machSwitchover ? mng_alt_mach : mng_alt_spd;
+					}
 				}
-			} elsif ((FMGCInternal.phase >= 4  and FMGCInternal.phase <= 6) and altitude <= FMGCInternal.desSpdLimAlt) {
-				FMGCInternal.mngKtsMach = 0;
+			} elsif ((FMGCInternal.phase >= 4 and FMGCInternal.phase <= 6) and altitude <= FMGCInternal.desSpdLimAlt) {
 				# Speed is maximum of greendot / descent speed limit
-				FMGCInternal.mngSpdCmd = FMGCInternal.decel ? FMGCInternal.minspeed : math.clamp(FMGCInternal.desSpdLim, FMGCInternal.clean, 999);
+				FMGCInternal.mngKtsMach = 0;
+				
+				if (constraintSpeed != nil and constraintSpeed != 0) {
+					FMGCInternal.mngSpdCmd = FMGCInternal.decel ? FMGCInternal.minspeed : math.clamp(math.min(FMGCInternal.desSpdLim, constraintSpeed), FMGCInternal.clean, 999);
+				} else {
+					FMGCInternal.mngSpdCmd = FMGCInternal.decel ? FMGCInternal.minspeed : math.clamp(FMGCInternal.desSpdLim, FMGCInternal.clean, 999);
+				}
 			}
 			
-			# Clamp to vls, maxspeed
+			# Clamp to maneouvering speed of current configuration and maxspeed
+			# Use minspeed node rather than variable, because we don't want to take GS MINI into account
 			if (FMGCInternal.phase >= 2) {
 				if (!FMGCInternal.mngKtsMach) {
-					FMGCInternal.mngSpd = math.clamp(FMGCInternal.mngSpdCmd, FMGCInternal.vls, FMGCInternal.maxspeed);
+					FMGCInternal.mngSpd = math.clamp(FMGCInternal.mngSpdCmd, FMGCNodes.minspeed.getValue(), FMGCInternal.maxspeed);
 				} else {
-					FMGCInternal.mngSpd = math.clamp(FMGCInternal.mngSpdCmd, ktToMach(FMGCInternal.vls), ktToMach(FMGCInternal.maxspeed));
+					FMGCInternal.mngSpd = math.clamp(FMGCInternal.mngSpdCmd, ktToMach(FMGCNodes.minspeed.getValue()), ktToMach(FMGCInternal.maxspeed));
 				}
 			} else {
 				FMGCInternal.mngSpd = FMGCInternal.mngSpdCmd;

Nasal/FMGC/flightplan-delegates.nas

@@ -193,7 +193,7 @@ var A320GPSDelegate = {
 
     _landingCheckTimeout: func
     {
-        if (pts.Gear.wow[0].getValue() and pts.Velocities.groundspeed.getValue() < 25)  {
+        if (pts.Gear.wow[0].getValue() and pts.Velocities.groundspeedKt.getValue() < 25)  {
           logprint(LOG_INFO, 'GPS saw speed < 25kts on destination runway, end of route.');
           me.landingCheck.stop();
           # record touch-down time?

Nasal/FMGC/flightplan.nas

@@ -778,7 +778,7 @@ var flightPlanController = {
 	calculateLvlOffPoint: func(deltaAltitude) {
 		me.distLvl = (deltaAltitude * pts.Velocities.groundspeedKt.getValue()) / (fmgc.Internal.vs.getValue() * 60);
 		
-		if (fmgc.Output.lat.getValue() == 1 and me.distLvl >= 0) { # NAV
+		if (me.active.getBoolValue() and fmgc.Output.lat.getValue() == 1 and me.distLvl >= 0) { # NAV
 			me.lvlOffPoint = me.flightplans[2].pathGeod(me.currentToWptIndex.getValue() - 1, me.flightplans[2].getWP(me.currentToWptIndex.getValue()).leg_distance - me.distToWpt.getValue() + me.distLvl);
 		} elsif (fmgc.Output.lat.getValue() == 0 and me.distLvl >= 0) { # HDG TRK
 			var coord = geo.aircraft_position();

Nasal/Libraries/buttons.nas

@@ -50,14 +50,18 @@ var variousReset = func() {
 	setprop("/controls/lighting/taxi-light-switch", 0);
 	setprop("/controls/lighting/DU/du1", 1);
 	setprop("/controls/lighting/DU/du2", 1);
+	setprop("/controls/lighting/DU/du2-layer", 1);
 	setprop("/controls/lighting/DU/du3", 1);
 	setprop("/controls/lighting/DU/du4", 1);
 	setprop("/controls/lighting/DU/du5", 1);
+	setprop("/controls/lighting/DU/du5-layer", 1);
 	setprop("/controls/lighting/DU/du6", 1);
 	setprop("/controls/lighting/DU/mcdu1", 1);
 	setprop("/controls/lighting/DU/mcdu2", 1);
 	setprop("/controls/navigation/switching/att-hdg", 0);
 	setprop("/controls/navigation/switching/air-data", 0);
+	setprop("/controls/switches/loudspeaker-l", 1);
+	setprop("/controls/switches/loudspeaker-r", 1);
 	pts.Controls.Switches.noSmokingSwitch.setValue(0);
 	pts.Controls.Switches.seatbeltSwitch.setValue(0);
 	pts.Controls.Switches.emerLtsSwitch.setValue(0);

Nasal/Libraries/libraries.nas

@@ -311,22 +311,17 @@ var pilotComfortOnePos = func(prop) {
 var lTray = func() {
 	pilotComfortTwoPos("/controls/tray/lefttrayext");
 }
+
 var rTray = func() {
 	pilotComfortTwoPos("/controls/tray/righttrayext");
 }
 
-var l1Pedal = func() {
-	pilotComfortOnePos("/controls/footrest-cpt[0]");
-}
-var l2Pedal = func() {
-	pilotComfortOnePos("/controls/footrest-cpt[1]");
+var lFootrest = func() {
+	pilotComfortOnePos("/controls/footrest-cpt");
 }
 
-var r1Pedal = func() {
-	pilotComfortOnePos("/controls/footrest-fo[0]");
-}
-var r2Pedal = func() {
-	pilotComfortOnePos("/controls/footrest-fo[1]");
+var rFootrest = func() {
+	pilotComfortOnePos("/controls/footrest-fo");
 }
 
 if (pts.Controls.Flight.autoCoordination.getBoolValue()) {
@@ -382,6 +377,7 @@ var input = {
 	"gearPosNorm2": "/gear/gear[2]/position-norm",
 	"engine1Running": "/engines/engine[0]/running",
 	"engine2Running": "/engines/engine[1]/running",
+	"annunTest": "/controls/switches/annun-test",
 };
 
 foreach (var name; keys(input)) {

Nasal/Libraries/view-controller.nas

@@ -44,6 +44,29 @@ var resetView = func() {
 	} 
 }
 
+var aftOverheadView = func() {
+	if (pts.Sim.CurrentView.viewNumberRaw.getValue() == 0) {
+		if (pts.Sim.Rendering.Headshake.enabled.getBoolValue()) {
+			shakeFlag = 1;
+			pts.Sim.Rendering.Headshake.enabled.setBoolValue(0);
+		} else {
+			shakeFlag = 0;
+		}
+		
+		pts.Sim.CurrentView.fieldOfView.setValue(105.8);
+		pts.Sim.CurrentView.headingOffsetDeg.setValue(360);
+		pts.Sim.CurrentView.pitchOffsetDeg.setValue(63.7);
+		pts.Sim.CurrentView.rollOffsetDeg.setValue(0);
+		pts.Sim.CurrentView.xOffsetM.setValue(0); 
+		pts.Sim.CurrentView.yOffsetM.setValue(0.765); 
+		pts.Sim.CurrentView.zOffsetM.setValue(-15.563);
+		
+		if (shakeFlag) {
+			pts.Sim.Rendering.Headshake.enabled.setBoolValue(1);
+		}
+	} 
+}
+
 var autopilotView = func() {
 	if (pts.Sim.CurrentView.viewNumberRaw.getValue() == 0) {
 		if (pts.Sim.Rendering.Headshake.enabled.getBoolValue()) {

Nasal/Panels/SwitchingPanel.nas

@@ -5,8 +5,9 @@
 
 var SwitchingPanel = {
 	Switches: {
-		attHdg: props.globals.getNode("/controls/navigation/switching/att-hdg"),
+		audio: props.globals.getNode("/controls/navigation/switching/audio"),
 		airData: props.globals.getNode("/controls/navigation/switching/air-data"),
+		attHdg: props.globals.getNode("/controls/navigation/switching/att-hdg"),
 		eisDmc: props.globals.getNode("/controls/navigation/switching/eis-dmc"),
 	},
 	

Sounds/A320-common-sound.xml

@@ -1751,6 +1751,22 @@
 			</volume>
 		</switch>
 		
+		<elt>
+			<name>ELT Signal</name>
+			<mode>looped</mode>
+			<path>Aircraft/A320-family/Sounds/Cockpit/elt-horn.wav</path>
+			<condition>
+				<and>
+					<property>/sim/current-view/internal</property>
+					<property>/systems/elt/elt-horn</property>
+				</and>
+			</condition>
+			<volume>
+				<factor>1.0</factor>
+				<property>/sim/sound/atc/volume</property>
+			</volume>
+		</elt>
+		
 		<cvrtone>
 			<name>CVRtone</name>
 			<mode>once</mode>

Systems/a320-cockpit.xml

@@ -24,7 +24,7 @@
 		
 		<lag_filter name="spoilers/main-lever">
 			<input>spoilers/lever-cmd</input>
-			<c1>20</c1>
+			<c1>8</c1>
 		</lag_filter>
 		
 		<lag_filter name="spoilers/lever-arm">
@@ -32,6 +32,41 @@
 			<c1>20</c1>
 		</lag_filter>
 		
+		<lag_filter name="/controls/switches/rudder-trim-knob">
+			<input>/controls/switches/rudder-trim</input>
+			<c1>12</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/ignition/start-sw-knob">
+			<input>/controls/ignition/start-sw</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/audio/acp[0]/int-rad-pos">
+			<input>/controls/audio/acp[0]/int-rad</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/audio/acp[1]/int-rad-pos">
+			<input>/controls/audio/acp[1]/int-rad</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/audio/acp[2]/int-rad-pos">
+			<input>/controls/audio/acp[2]/int-rad</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/elt-guard-pos">
+			<input>/controls/elt/elt-switch-guard</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/elt-switch-pos">
+			<input>/controls/elt/elt-switch</input>
+			<c1>20</c1>
+		</lag_filter>
+		
 		<fcs_function name="fadec/throttle-lever[0]">
 			<function>
 				<quotient>
@@ -52,24 +87,509 @@
 		
 		<lag_filter name="fadec/reverse-lever[0]">
 			<input>/controls/engines/engine[0]/reverse-lever</input>
-			<c1>20</c1>
+			<c1>16</c1>
 		</lag_filter>
 		
 		<lag_filter name="fadec/reverse-lever[1]">
 			<input>/controls/engines/engine[1]/reverse-lever</input>
-			<c1>20</c1>
+			<c1>16</c1>
 		</lag_filter>
 		
 		<lag_filter name="fcs/engine-cutoff[0]">
 			<input>/controls/engines/engine[0]/cutoff-switch</input>
-			<c1>20</c1>
+			<c1>10</c1>
 		</lag_filter>
 		
 		<lag_filter name="fcs/engine-cutoff[1]">
 			<input>/controls/engines/engine[1]/cutoff-switch</input>
+			<c1>10</c1>
+		</lag_filter>
+		
+		<lag_filter name="fcs/engine-cutoff[1]">
+			<input>/controls/engines/engine[1]/cutoff-switch</input>
+			<c1>10</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/flaps-lever-translate-pos">
+			<input>/controls/cockpit/flaps-lever-translate</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/park-brk-translate-pos">
+			<input>/controls/cockpit/park-brk-translate</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/altimeter/inhg-left-pos">
+			<input>/instrumentation/altimeter/inhg-left</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/altimeter/inhg-right-pos">
+			<input>/instrumentation/altimeter/inhg-right</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/efis/mfd/pnl_mode-num-pos">
+			<input>/instrumentation/efis/mfd/pnl_mode-num</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/efis[1]/mfd/pnl_mode-num-pos">
+			<input>/instrumentation/efis[1]/mfd/pnl_mode-num</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/efis[0]/input/lh-vor-adf-pos">
+			<input>/instrumentation/efis[0]/input/lh-vor-adf</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/efis[0]/input/rh-vor-adf-pos">
+			<input>/instrumentation/efis[0]/input/rh-vor-adf</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/efis[1]/input/lh-vor-adf-pos">
+			<input>/instrumentation/efis[1]/input/lh-vor-adf</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/efis[1]/input/rh-vor-adf-pos">
+			<input>/instrumentation/efis[1]/input/rh-vor-adf</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/efis/inputs/range-nm-pos">
+			<input>/instrumentation/efis/inputs/range-nm</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/efis[1]/inputs/range-nm-pos">
+			<input>/instrumentation/efis[1]/inputs/range-nm</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/doors/doorc-switch-pos">
+			<input>/controls/doors/doorc-switch</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/gear/nws-switch-pos">
+			<input>/controls/gear/nws-switch</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cabin/footwarmer-cpt-pos">
+			<input>/controls/cabin/footwarmer-cpt</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/ddrmi/vor-adf-1-pos">
+			<input>/instrumentation/ddrmi/vor-adf-1</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/ddrmi/vor-adf-2-pos">
+			<input>/instrumentation/ddrmi/vor-adf-2</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cabin/footwarmer-fo-pos">
+			<input>/controls/cabin/footwarmer-fo</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/lighting/console-floor-light-sw-pos">
+			<input>/controls/lighting/console-floor-light-sw</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/lighting/console-floor-light-sw-right-pos">
+			<input>/controls/lighting/console-floor-light-sw-right</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/gear/gear-down-pos">
+			<input>/controls/gear/gear-down</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/clock/utc-selector-pos">
+			<input>/instrumentation/clock/utc-selector</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/instrumentation/clock/et-selector-pos">
+			<input>/instrumentation/clock/et-selector</input>
+			<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>
+		</lag_filter>
+		
+		<lag_filter name="/controls/switches/no-smoking-sign-pos">
+			<input>/controls/switches/no-smoking-sign</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/switches/emer-lights-pos">
+			<input>/controls/switches/emer-lights</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/lighting/stby-compass-switch-pos">
+			<input>/controls/lighting/stby-compass-switch</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/lighting/dome-norm-pos">
+			<input>/controls/lighting/dome-norm</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>
+		
+		<lag_filter name="/it-autoflight/config/altitude-dial-mode-pos">
+			<input>/it-autoflight/config/altitude-dial-mode</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/navigation/switching/air-data-pos">
+			<input>/controls/navigation/switching/air-data</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/navigation/switching/att-hdg-pos">
+			<input>/controls/navigation/switching/att-hdg</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/emer-canc-cover-pos">
+			<input>/controls/cockpit/emer-canc-cover</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/switches/wiperLspd-pos">
+			<input>/controls/switches/wiperLspd</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/switches/wiperRspd-pos">
+			<input>/controls/switches/wiperRspd</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/wxr-radar-sw-pos">
+			<input>/instrumentation/wxr/enabled</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/thrt-all-pos">
+			<input>/controls/atc/thrt-all</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/system-knob-pos">
+			<input>/controls/atc/system-knob</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/atc-mode-knob-pos">
+			<input>/controls/atc/mode-knob</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/abv-blw-pos">
+			<input>/controls/atc/abv-blw</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/outflowpos-man-sw-pos">
+			<input>/systems/pressurization/outflowpos-man-sw</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/ditching-pos">
+			<input>/controls/OH/protectors/ditching</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/ir-mode-1-pos">
+			<input>/controls/navigation/adirscp/switches/ir-1-mode</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/ir-mode-2-pos">
+			<input>/controls/navigation/adirscp/switches/ir-2-mode</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/ir-mode-3-pos">
+			<input>/controls/navigation/adirscp/switches/ir-3-mode</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/fire-btn-cover-1-pos">
+			<input>/controls/engines/engine[0]/fire-btn-cover</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/fire-btn-1-pos">
+			<input>/controls/engines/engine[0]/fire-btn</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/fire-btn-cover-apu-pos">
+			<input>/controls/apu/fire-btn-cover</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/fire-btn-apu-pos">
+			<input>/controls/apu/fire-btn</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/fire-btn-cover-2-pos">
+			<input>/controls/engines/engine[1]/fire-btn-cover</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/fire-btn-2-pos">
+			<input>/controls/engines/engine[1]/fire-btn</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/engines/engine[0]/reverse-cmd-pos">
+			<input>/controls/engines/engine[0]/reverse-cmd</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/engines/engine[1]/reverse-cmd-pos">
+			<input>/controls/engines/engine[1]/reverse-cmd</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/aftdisch-pos">
+			<input>/controls/OH/protectors/aftdisch</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/fwddisch-pos">
+			<input>/controls/OH/protectors/fwddisch</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/ratman-pos">
+			<input>/controls/OH/protectors/ratman</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/blueelec-pos">
+			<input>/controls/OH/protectors/blueelec</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/evac-pos">
+			<input>/controls/OH/protectors/evac</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/evac-capt-purs-pos">
+			<input>/controls/cockpit/evac-capt-purs</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/maskman-pos">
+			<input>/controls/OH/protectors/maskman</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/emercall-pos">
+			<input>/controls/OH/protectors/emercall</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/emergentest-pos">
+			<input>/controls/OH/protectors/emergentest</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/elecratman-pos">
+			<input>/controls/OH/protectors/elecratman</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/eng1-manstart-pos">
+			<input>/controls/OH/protectors/eng1-manstart</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/eng2-manstart-pos">
+			<input>/controls/OH/protectors/eng2-manstart</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/pneumatics/switches/pack-flow-pos">
+			<input>/controls/pneumatics/switches/pack-flow</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/pneumatics/switches/x-bleed-pos">
+			<input>/controls/pneumatics/switches/x-bleed</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/pneumatics/switches/temp-cockpit-pos">
+			<input>/controls/pneumatics/switches/temp-cockpit</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/pneumatics/switches/temp-cabin-fwd-pos">
+			<input>/controls/pneumatics/switches/temp-cabin-fwd</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/pneumatics/switches/temp-cabin-aft-pos">
+			<input>/controls/pneumatics/switches/temp-cabin-aft</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/ramair-pos">
+			<input>/controls/OH/protectors/ramair</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/ramair-pos">
+			<input>/controls/OH/protectors/ramair</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/idg1-pos">
+			<input>/controls/OH/protectors/idg1</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/OH/protectors/idg2-pos">
+			<input>/controls/OH/protectors/idg2</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/rmp-l-on-pos">
+			<input>/controls/radio/rmp[0]/on</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/rmp-r-on-pos">
+			<input>/controls/radio/rmp[1]/on</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/radio/rmp[0]/nav-protect-pos">
+			<input>/controls/radio/rmp[0]/nav-protect</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/radio/rmp[1]/nav-protect-pos">
+			<input>/controls/radio/rmp[1]/nav-protect</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/stby-compass-pos">
+			<input>/controls/cockpit/stby-compass</input>
+			<c1>5</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/oxygen-mask-cockpit-door-cpt-pos">
+			<input>/controls/cockpit/oxygen-mask-cockpit-door-cpt</input>
+			<c1>20</c1>
+		</lag_filter>
+		
+		<lag_filter name="/controls/cockpit/oxygen-mask-cockpit-door-fo-pos">
+			<input>/controls/cockpit/oxygen-mask-cockpit-door-fo</input>
 			<c1>20</c1>
 		</lag_filter>
 	
 	</channel>
 
+	<channel name="Loudspeakers">
+		
+		<switch name="Loudspeaker">
+			<default value="0"/>
+			<test logic="OR" value ="/controls/switches/loudspeaker-l">
+				<test logic="AND">
+					/systems/electrical/bus/dc-ess ge 25
+					/controls/switches/loudspeaker-l ge /controls/switches/loudspeaker-r 
+				</test>
+				<test logic="AND">
+					/systems/electrical/bus/dc-1 ge 25
+					/controls/navigation/switching/audio eq -1
+				</test>
+			</test>
+			<test logic="AND" value ="/controls/switches/loudspeaker-r">
+				<test logic="AND">
+					/systems/electrical/bus/dc-ess ge 25
+					/controls/switches/loudspeaker-r gt /controls/switches/loudspeaker-r 
+				</test>
+				<test logic="AND">
+					/systems/electrical/bus/dc-1 ge 25
+					/controls/navigation/switching/audio eq 1
+				</test>
+			</test>
+			<output>/sim/sound/atc/volume</output>
+			<output>/sim/sound/chatter/volume</output>
+		</switch>
+		
+	</channel>
+	
 </system>

Systems/a320-fcs.xml

@@ -745,7 +745,7 @@
 		
 		<lag_filter name="fcs/flap-lever">
 			<input>/controls/flight/flaps-input</input>
-			<c1>20</c1>
+			<c1>8</c1>
 		</lag_filter>
 		
 		<switch name="fcs/sfcc/unit1-avail">
@@ -1164,7 +1164,7 @@
 		
 		<lag_filter name="fcs/brake-lever">
 			<input>/controls/gear/brake-parking</input>
-			<c1>20</c1>
+			<c1>10</c1>
 		</lag_filter>
 		
 		<actuator name="fcs/brake-left">

Systems/a320-misc.xml

@@ -561,6 +561,107 @@
 		
 	</channel>
 	
+	<channel name="ELT" execrate="8">
+	
+		<actuator name="/systems/elt/elt-test-switch">
+			<rate_limit sense="incr">1</rate_limit>
+			<rate_limit sense="decr">100</rate_limit>
+			<input>/controls/elt/elt-test-reset</input>
+		</actuator>
+		
+		<switch name="/systems/elt/elt-test-cmd">
+			<default value="/systems/elt/elt-test-cmd"/>
+			<test logic="AND" value="1">
+				/systems/elt/elt-operating ne 1
+				/systems/elt/elt-test-switch eq 1
+			</test>
+			<test logic="OR" value="0">
+				/systems/elt/elt-test eq 1.0
+				/systems/elt/elt-operating eq 1
+			</test>
+		</switch>
+		
+		<actuator name="/systems/elt/elt-test">
+			<rate_limit sense="incr">0.1</rate_limit>
+			<rate_limit sense="decr">100</rate_limit>
+			<input>/systems/elt/elt-test-cmd</input>
+		</actuator>
+		
+		<switch name="/systems/elt/elt-operating">
+			<default value="/systems/elt/elt-operating"/>
+			<test logic="OR" value="1">
+				/controls/elt/elt-switch eq 1
+				<test logic="AND">
+					/accelerations/pilot-gdamped gt 5.0
+					/controls/elt/elt-switch eq 0
+				</test>
+			</test>
+			<test logic="OR" value="0">
+				/controls/elt/elt-test-reset eq 1
+			</test>
+		</switch>
+		
+		<switch name="/systems/elt/elt-horn-cmd">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				<test logic="AND">
+					/systems/elt/elt-test ge 0.3
+					/systems/elt/elt-test lt 0.5
+				</test>
+				/systems/elt/elt-operating eq 1
+			</test>
+		</switch>
+		
+		<switch name="/systems/elt/elt-horn">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				<test logic="AND">
+					/systems/elt/elt-horn-cmd eq 1
+					/instrumentation/comm/frequencies/selected-mhz eq 121.5
+					<test logic="OR">
+						/controls/audio/acp/vhf1-recive eq 1
+						/controls/audio/acp[1]/vhf1-recive eq 1
+						/controls/audio/acp[2]/vhf1-recive eq 1
+					</test>
+				</test>
+				<test logic="AND">
+					/systems/elt/elt-horn-cmd eq 1
+					/instrumentation/comm[1]/frequencies/selected-mhz eq 121.5
+					<test logic="OR">
+						/controls/audio/acp/vhf2-recive eq 1
+						/controls/audio/acp[1]/vhf2-recive eq 1
+						/controls/audio/acp[2]/vhf2-recive eq 1
+					</test>
+				</test>
+				<test logic="AND">
+					/systems/elt/elt-horn-cmd eq 1
+					/instrumentation/comm[2]/frequencies/selected-mhz eq 121.5
+					<test logic="OR">
+						/controls/audio/acp/vhf3-recive eq 1
+						/controls/audio/acp[1]/vhf3-recive eq 1
+						/controls/audio/acp[2]/vhf3-recive eq 1
+					</test>
+				</test>
+			</test>
+		</switch>
+		
+		<switch name="/systems/elt/light-on">
+			<default value="0"/>
+			<test logic="OR" value="1">
+				<test logic="AND">
+					/systems/elt/elt-test gt 0.0
+					/systems/elt/elt-test lt 0.5
+				</test>
+				<test logic="AND">
+					/systems/elt/elt-test ge 0.9
+					/systems/elt/elt-test lt 1.0
+				</test>
+				/systems/elt/elt-operating eq 1
+			</test>
+		</switch>
+		
+	</channel>
+	
 	<channel name="DU Power" execrate="8">
 		
 		<switch name="/instrumentation/displays/du3/power-command">

Systems/libraries.xml

@@ -1109,6 +1109,44 @@
 		<output>/instrumentation/ddrmi/needle-2</output>
 	</filter>
 	
+	<filter>
+		<name>DDRMI: FLAG HDG</name>
+		<debug>false</debug>
+		<type>exponential</type>
+		<input>
+			<condition>
+				<and>
+					<greater-than-equals>
+						<property>/systems/electrical/bus/ac-ess</property>
+						<value>110</value>
+					</greater-than-equals>
+					<or>
+						<and>
+							<property>/systems/navigation/aligned-1</property>
+							<not>
+								<equals>
+									<property>/controls/navigation/switching/att-hdg</property>
+									<value>-1</value>
+								</equals>
+							</not>
+						</and>
+						<and>
+							<property>/systems/navigation/aligned-3</property>
+							<equals>
+								<property>/controls/navigation/switching/att-hdg</property>
+								<value>-1</value>
+							</equals>
+						</and>
+					</or>
+				</and>
+			</condition>
+			<value>0</value>
+		</input>
+		<input>1</input>
+		<output>/instrumentation/ddrmi/flag-hdg</output>
+		<filter-time>0.1</filter-time>
+	</filter>
+	
 	<filter>
 		<name>DDRMI: FLAG 1</name>
 		<debug>false</debug>

gui/dialogs/mcdu1-dlg.xml

@@ -183,7 +183,7 @@
 						var root = mcdu_canvas_dlg.createGroup();
 						root.setScale(0.285, 0.25);
 						mcdu_canvas_dlg.setColorBackground(0, 0, 0, 1.0);
-						root.createChild("image").set("src", "canvas://by-index/texture[13]");
+						root.createChild("image").set("src", "canvas://by-index/texture[15]");
 					]]>
 				</load>
 				<unload>

gui/dialogs/mcdu2-dlg.xml

@@ -183,7 +183,7 @@
 						var root = mcdu_canvas_dlg.createGroup();
 						root.setScale(0.285, 0.25);
 						mcdu_canvas_dlg.setColorBackground(0, 0, 0, 1.0);
-						root.createChild("image").set("src", "canvas://by-index/texture[14]");
+						root.createChild("image").set("src", "canvas://by-index/texture[16]");
 					]]>
 				</load>
 				<unload>