GIT: Merge master

Models/FlightDeck/a320.flightdeck.xml

@@ -4715,6 +4715,53 @@
 		</action>
 	</animation>
 	
+	<animation>
+		<type>select</type>
+		<object-name>gear_lever_label-lit</object-name>
+		<condition>
+			<or>
+				<equals>
+					<property>controls/switches/annun-test</property>
+					<value>1</value>
+				</equals>
+				<equals>
+					<property>systems/gear/landing-gear-warning-light</property>
+					<value>1</value>
+				</equals>
+			</or>
+		</condition>
+	</animation>
+	
+	<animation>
+		<type>material</type>
+		<object-name>gear_lever_label-lit</object-name>
+		<emission>
+			<red>1</red>
+			<green>0.725</green>
+			<blue>0.259</blue>
+			<factor-prop>systems/gear/landing-gear-warning-light</factor-prop>
+		</emission>
+	</animation>
+	
+	<animation>
+		<type>select</type>
+		<object-name>gear_lever_label</object-name>
+		<condition>
+			<not>
+				<or>
+					<equals>
+						<property>controls/switches/annun-test</property>
+						<value>1</value>
+					</equals>
+					<equals>
+						<property>systems/gear/landing-gear-warning-light</property>
+						<value>1</value>
+					</equals>
+				</or>
+			</not>
+		</condition>
+	</animation>
+	
 	<!-- Landing Gear Lights -->
 	<animation>
 		<type>select</type>

Models/FlightDeck/res/fd_complete.ac

@@ -132139,22 +132139,41 @@ OBJECT poly
 name "gear_lever_label"
 data 21
 gear_lever_label.mesh
-crease 45.0
 texture "main_labels.png"
-texrep 1 1
+crease 45.000000
 numvert 4
 -0.53286 0.14914 -0.16915
 -0.53286 0.14914 -0.15553
 -0.50721 0.06388 -0.15553
 -0.50721 0.06388 -0.16915
 numsurf 1
-SURF 0X0
+SURF 0x0
 mat 19
 refs 4
-0 0.118804 0.584625
+0 0.0944362 0.584625
-1 0.026698 0.584625
+1 0.00233023 0.584625
-2 0.026698 0.015592
+2 0.00233023 0.015592
-3 0.118804 0.015592
+3 0.0944362 0.015592
+kids 0
+OBJECT poly
+name "gear_lever_label-lit"
+data 21
+gear_lever_label.mesh
+texture "main_labels.png"
+crease 45.000000
+numvert 4
+-0.50721 0.06388 -0.16915
+-0.50721 0.06388 -0.15553
+-0.53286 0.14914 -0.15553
+-0.53286 0.14914 -0.16915
+numsurf 1
+SURF 0x0
+mat 19
+refs 4
+3 0.192803 0.584625
+2 0.100697 0.584625
+1 0.100697 0.015592
+0 0.192803 0.015592
 kids 0
 OBJECT poly
 name "gear_lever_slot"

Nasal/ECAM.nas

@@ -31,6 +31,7 @@ var ECAM = {
 		setprop("/ECAM/to-memo-enable", 1);
 		setprop("/ECAM/to-config", 0);
 		setprop("/ECAM/ldg-memo-enable", 0);
+		setprop("/systems/gear/landing-gear-warning-light", 0);
 		setprop("/ECAM/Lower/page", "door");
 		setprop("/ECAM/Lower/man-select", 0);
 		setprop("/ECAM/Lower/fault-select", 0);

Systems/a320-fcs.xml

@@ -1686,14 +1686,12 @@
 		<lag_filter name="fcs/throttle1">
 			<input>/controls/engines/engine[0]/throttle-output</input>
 			<c1>0.95</c1>
-			<output>fcs/throttle-cmd-norm</output>
+			<output>fcs/throttle-pos-norm[0]</output>
-			<output>fcs/throttle-pos-norm</output>
 		</lag_filter>
 		
 		<lag_filter name="fcs/throttle2">
 			<input>/controls/engines/engine[1]/throttle-output</input>
 			<c1>0.95</c1>
-			<output>fcs/throttle-cmd-norm[1]</output>
 			<output>fcs/throttle-pos-norm[1]</output>
 		</lag_filter>
 		

revision.txt

@@ -1 +1 @@
-4666
+4667