A3XX: Rework reverse system, add MREV FADEC mode

Models/Instruments/Upper-ECAM/Upper-ECAM.nas

@@ -461,20 +461,24 @@ var canvas_upperECAM_cfm_eis2 = {
 		
 		if (getprop("/systems/fadec/powered1") == 1 or getprop("/systems/fadec/powered2") == 1) {
 			me["N1Lim-mode"].show();
-			me["N1Lim"].show();
-			me["N1Lim-decpnt"].show();
-			me["N1Lim-decimal"].show();
-			me["N1Lim-percent"].show();
 			me["N1Lim-XX"].hide();
 			me["N1Lim-XX2"].hide();
 		} else {
 			me["N1Lim-mode"].hide();
+			me["N1Lim-XX"].show();
+			me["N1Lim-XX2"].show();
+		}
+		
+		if ((getprop("/systems/fadec/powered1") == 1 or getprop("/systems/fadec/powered2") == 1) and getprop("/controls/engines/thrust-limit") != "MREV") {
+			me["N1Lim"].show();
+			me["N1Lim-decpnt"].show();
+			me["N1Lim-decimal"].show();
+			me["N1Lim-percent"].show();
+		} else {
 			me["N1Lim"].hide();
 			me["N1Lim-decpnt"].hide();
 			me["N1Lim-decimal"].hide();
 			me["N1Lim-percent"].hide();
-			me["N1Lim-XX"].show();
-			me["N1Lim-XX2"].show();
 		}
 		
 		me.updateBase();
@@ -748,18 +752,22 @@ var canvas_upperECAM_iae_eis2 = {
 		
 		if (getprop("/systems/fadec/powered1") == 1 or getprop("/systems/fadec/powered2") == 1) {
 			me["EPRLim-mode"].show();
-			me["EPRLim"].show();
-			me["EPRLim-decpnt"].show();
-			me["EPRLim-decimal"].show();
 			me["EPRLim-XX"].hide();
 			me["EPRLim-XX2"].hide();
 		} else {
 			me["EPRLim-mode"].hide();
+			me["EPRLim-XX"].show();
+			me["EPRLim-XX2"].show();
+		}
+		
+		if ((getprop("/systems/fadec/powered1") == 1 or getprop("/systems/fadec/powered2") == 1) and getprop("/controls/engines/thrust-limit") != "MREV") {
+			me["EPRLim"].show();
+			me["EPRLim-decpnt"].show();
+			me["EPRLim-decimal"].show();
+		} else {
 			me["EPRLim"].hide();
 			me["EPRLim-decpnt"].hide();
 			me["EPRLim-decimal"].hide();
-			me["EPRLim-XX"].show();
-			me["EPRLim-XX2"].show();
 		}
 		
 		me.updateBase();

Nasal/engines-common.nas

@@ -84,8 +84,8 @@ var toggleFastRevThrust = func {
 		interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
 		setprop("/controls/engines/engine[0]/reverser", 1);
 		setprop("/controls/engines/engine[1]/reverser", 1);
-		setprop("/controls/engines/engine[0]/throttle-rev", 0.4);
+		setprop("/controls/engines/engine[0]/throttle-rev", 0.65);
-		setprop("/controls/engines/engine[1]/throttle-rev", 0.4);
+		setprop("/controls/engines/engine[1]/throttle-rev", 0.65);
 		setprop("/fdm/jsbsim/propulsion/engine[0]/reverser-angle-rad", 3.14);
 		setprop("/fdm/jsbsim/propulsion/engine[1]/reverser-angle-rad", 3.14);
 	} else if ((getprop("/controls/engines/engine[0]/reverser") == "1") or (getprop("/controls/engines/engine[1]/reverser") == "1") and (getprop("/gear/gear[1]/wow") == 1) and (getprop("/gear/gear[2]/wow") == 1)) {
@@ -104,18 +104,18 @@ var doRevThrust = func {
 	if (getprop("/controls/engines/engine[0]/reverser") == "1" and getprop("/controls/engines/engine[1]/reverser") == "1" and getprop("/gear/gear[1]/wow") == 1 and getprop("/gear/gear[2]/wow") == 1) {
 		var pos1 = getprop("/controls/engines/engine[0]/throttle-rev");
 		var pos2 = getprop("/controls/engines/engine[1]/throttle-rev");
-		if (pos1 < 0.4) {
+		if (pos1 < 0.65) {
-			setprop("/controls/engines/engine[0]/throttle-rev", pos1 + 0.133333333);
+			setprop("/controls/engines/engine[0]/throttle-rev", pos1 + 0.15);
 		}
-		if (pos2 < 0.4) {
+		if (pos2 < 0.65) {
-			setprop("/controls/engines/engine[1]/throttle-rev", pos2 + 0.133333333);
+			setprop("/controls/engines/engine[1]/throttle-rev", pos2 + 0.15);
 		}
 	}
 	var state1 = getprop("/systems/thrust/state1");
 	var state2 = getprop("/systems/thrust/state2");
 	if (state1 == "IDLE" and state2 == "IDLE" and getprop("/controls/engines/engine[0]/reverser") == "0" and getprop("/controls/engines/engine[1]/reverser") == "0" and getprop("/gear/gear[1]/wow") == 1 and getprop("/gear/gear[2]/wow") == 1) {
-		setprop("/controls/engines/engine[0]/throttle-rev", 0);
+		setprop("/controls/engines/engine[0]/throttle-rev", 0.05);
-		setprop("/controls/engines/engine[1]/throttle-rev", 0);
+		setprop("/controls/engines/engine[1]/throttle-rev", 0.05);
 		interpolate("/engines/engine[0]/reverser-pos-norm", 1, 1.4);
 		interpolate("/engines/engine[1]/reverser-pos-norm", 1, 1.4);
 		setprop("/controls/engines/engine[0]/reverser", 1);
@@ -129,13 +129,13 @@ var unRevThrust = func {
 	if (getprop("/controls/engines/engine[0]/reverser") == "1" or getprop("/controls/engines/engine[1]/reverser") == "1") {
 		var pos1 = getprop("/controls/engines/engine[0]/throttle-rev");
 		var pos2 = getprop("/controls/engines/engine[1]/throttle-rev");
-		if (pos1 > 0.0) {
+		if (pos1 > 0.05) {
-			setprop("/controls/engines/engine[0]/throttle-rev", pos1 - 0.133333333);
+			setprop("/controls/engines/engine[0]/throttle-rev", pos1 - 0.15);
 		} else {
 			unRevThrust_b();
 		}
-		if (pos2 > 0.0) {
+		if (pos2 > 0.05) {
-			setprop("/controls/engines/engine[1]/throttle-rev", pos2 - 0.133333333);
+			setprop("/controls/engines/engine[1]/throttle-rev", pos2 - 0.15);
 		} else {
 			unRevThrust_b();
 		}

Nasal/fadec-common.nas

@@ -216,7 +216,11 @@ var thrust_lim = func {
 	} else if (getprop("/FMGC/internal/flex-set") == 0 and engstate1 != 3 and engstate2 != 3) {
 		setprop("/systems/thrust/lim-flex", 0);
 	}
-	if (getprop("/gear/gear[1]/wow") == 0 or getprop("/gear/gear[2]/wow") == 0 or (engstate1 != 3 and engstate2 != 3)) {
+	if (getprop("/controls/engines/engine[0]/reverser") == "1" or getprop("/controls/engines/engine[1]/reverser") == "1") {
+		setprop("/controls/engines/thrust-limit", "MREV");
+		setprop("/controls/engines/epr-limit", 1.000);
+		setprop("/controls/engines/n1-limit", 0.0);
+	} else if (getprop("/gear/gear[1]/wow") == 0 or getprop("/gear/gear[2]/wow") == 0 or (engstate1 != 3 and engstate2 != 3)) {
 		if ((state1 == "TOGA" or state2 == "TOGA" or (state1 == "MAN THR" and thr1 >= 0.83) or (state2 == "MAN THR" and thr2 >= 0.83)) or getprop("/systems/thrust/alpha-floor") == 1 or getprop("/systems/thrust/toga-lk") == 1) {
 			setprop("/controls/engines/thrust-limit", "TOGA");
 			setprop("/controls/engines/epr-limit", eprtoga);

Systems/fadec-cfm.xml

@@ -14,7 +14,7 @@
 	<filter>
 		<name>OAT Thrust Scale</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -32,7 +32,7 @@
 	<filter>
 		<name>FLX Thrust Scale</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -50,7 +50,7 @@
 	<filter>
 		<name>IDLE Limit</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
@@ -89,7 +89,7 @@
 	<filter>
 		<name>MAN One</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -111,7 +111,7 @@
 	<filter>
 		<name>MAN Two</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -133,7 +133,7 @@
 	<filter>
 		<name>MAN CMD One</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -158,7 +158,7 @@
 	<filter>
 		<name>MAN CMD Two</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -183,7 +183,7 @@
 	<filter>
 		<name>N1 CMD 1</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
@@ -224,7 +224,7 @@
 	<filter>
 		<name>N1 CMD 2</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
@@ -266,7 +266,7 @@
 		<name>Throttle 1</name>
 		<debug>false</debug>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<enable>
 			<condition>
 				<and>
@@ -360,7 +360,7 @@
 		<name>Throttle 2</name>
 		<debug>false</debug>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<enable>
 			<condition>
 				<and>
@@ -453,7 +453,7 @@
 	<filter>
 		<name>N1 Limit TOGA</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -473,7 +473,7 @@
 	<filter>
 		<name>N1 Limit MCT</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -493,7 +493,7 @@
 	<filter>
 		<name>N1 Limit FLX</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -513,7 +513,7 @@
 	<filter>
 		<name>N1 Limit CLB</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -533,7 +533,16 @@
 	<filter>
 		<name>Throttle Output One</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<equals>
+					<property>/controls/engines/engine[0]/reverser</property>
+					<value>1</value>
+				</equals>
+			</condition>
+			<property>/controls/engines/engine[0]/throttle-rev</property>
+		</input>
 		<input>
 			<condition>
 				<and>
@@ -572,7 +581,16 @@
 	<filter>
 		<name>Throttle Output Two</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<equals>
+					<property>/controls/engines/engine[1]/reverser</property>
+					<value>1</value>
+				</equals>
+			</condition>
+			<property>/controls/engines/engine[1]/throttle-rev</property>
+		</input>
 		<input>
 			<condition>
 				<and>
@@ -611,7 +629,7 @@
 	<filter>
 		<name>EGT L</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<enable>
 			<condition>
 				<and>
@@ -641,7 +659,7 @@
 	<filter>
 		<name>EGT R</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<enable>
 			<condition>
 				<and>

Systems/fadec-iae.xml

@@ -14,7 +14,7 @@
 	<filter>
 		<name>OAT Thrust Scale</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -32,7 +32,7 @@
 	<filter>
 		<name>FLX Thrust Scale</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -50,7 +50,7 @@
 	<filter>
 		<name>IDLE Limit</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
@@ -89,7 +89,7 @@
 	<filter>
 		<name>MAN One</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -111,7 +111,7 @@
 	<filter>
 		<name>MAN Two</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -133,7 +133,7 @@
 	<filter>
 		<name>MAN CMD One</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -158,7 +158,7 @@
 	<filter>
 		<name>MAN CMD Two</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -183,7 +183,7 @@
 	<filter>
 		<name>EPR Scale</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input> 
 			<expression>
 				<table>
@@ -199,7 +199,7 @@
 	<filter>
 		<name>EPR Scale 2</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input> 
 			<expression>
 				<table>
@@ -217,7 +217,7 @@
 	<filter>
 		<name>EPR N1 Input Engine 1</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input> 
 			<expression>
 				<product>
@@ -236,7 +236,7 @@
 	<filter>
 		<name>EPR N1 Input Engine 2</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input> 
 			<expression>
 				<product>
@@ -255,7 +255,7 @@
 	<filter>
 		<name>EPR THR Input Engine 1</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input> 
 			<expression>
 				<product>
@@ -282,7 +282,7 @@
 	<filter>
 		<name>EPR THR Input Engine 2</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input> 
 			<expression>
 				<product>
@@ -309,7 +309,7 @@
 	<filter>
 		<name>EPR THR Input Flex</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input> 
 			<expression>
 				<product>
@@ -344,7 +344,7 @@
 	<filter>
 		<name>EPR 1</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input>
 			<expression>
 				<table>
@@ -362,7 +362,7 @@
 	<filter>
 		<name>EPR 1</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input>
 			<expression>
 				<sum>
@@ -377,7 +377,7 @@
 	<filter>
 		<name>EPR CMD 1</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
@@ -417,7 +417,7 @@
 	<filter>
 		<name>EPR CMD 1</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -433,7 +433,7 @@
 	<filter>
 		<name>EPR 2</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input>
 			<expression>
 				<table>
@@ -451,7 +451,7 @@
 	<filter>
 		<name>EPR 2</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input>
 			<expression>
 				<sum>
@@ -466,7 +466,7 @@
 	<filter>
 		<name>EPR CMD 2</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
@@ -506,7 +506,7 @@
 	<filter>
 		<name>EPR CMD 2</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -522,7 +522,7 @@
 	<filter>
 		<name>N1 CMD 1</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
@@ -563,7 +563,7 @@
 	<filter>
 		<name>N1 CMD 2</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<condition>
@@ -605,7 +605,7 @@
 		<name>Throttle 1</name>
 		<debug>false</debug>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<enable>
 			<condition>
 				<and>
@@ -699,7 +699,7 @@
 		<name>Throttle 2</name>
 		<debug>false</debug>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<enable>
 			<condition>
 				<and>
@@ -792,7 +792,7 @@
 	<filter>
 		<name>EPR Limit TOGA</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -831,7 +831,7 @@
 	<filter>
 		<name>EPR CMD TOGA</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -847,7 +847,7 @@
 	<filter>
 		<name>EPR Limit MCT</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -886,7 +886,7 @@
 	<filter>
 		<name>EPR CMD MCT</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -902,7 +902,7 @@
 	<filter>
 		<name>EPR Limit FLX</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -941,7 +941,7 @@
 	<filter>
 		<name>EPR CMD FLX</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -957,7 +957,7 @@
 	<filter>
 		<name>EPR Limit CLB</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -996,7 +996,7 @@
 	<filter>
 		<name>EPR CMD CLB</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -1012,7 +1012,16 @@
 	<filter>
 		<name>Throttle Output One</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<equals>
+					<property>/controls/engines/engine[0]/reverser</property>
+					<value>1</value>
+				</equals>
+			</condition>
+			<property>/controls/engines/engine[0]/throttle-rev</property>
+		</input>
 		<input>
 			<condition>
 				<and>
@@ -1051,7 +1060,16 @@
 	<filter>
 		<name>Throttle Output Two</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
+		<input>
+			<condition>
+				<equals>
+					<property>/controls/engines/engine[1]/reverser</property>
+					<value>1</value>
+				</equals>
+			</condition>
+			<property>/controls/engines/engine[1]/throttle-rev</property>
+		</input>
 		<input>
 			<condition>
 				<and>
@@ -1090,7 +1108,7 @@
 	<filter>
 		<name>EGT L</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<enable>
 			<condition>
 				<and>
@@ -1120,7 +1138,7 @@
 	<filter>
 		<name>EGT R</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<enable>
 			<condition>
 				<and>

Systems/libraries.xml

@@ -11,7 +11,7 @@
 	<filter>
 		<name>Gear AGL Altitude FT</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -29,7 +29,7 @@
 	<filter>
 		<name>Gear AGL Altitude M</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -56,7 +56,7 @@
 	<filter>
 		<name>Rudder Trim</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -74,7 +74,7 @@
 	<filter>
 		<name>FF 1</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -92,7 +92,7 @@
 	<filter>
 		<name>FF 2</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -110,7 +110,7 @@
 	<filter>
 		<name>OIL PSI 1</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -127,7 +127,7 @@
 	<filter>
 		<name>OIL PSI 2</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -144,7 +144,7 @@
 	<filter>
 		<name>Altitude PFD</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>
@@ -184,7 +184,7 @@
 	<filter>
 		<name>Throttle L</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input>
 			<condition>
 				<equals>
@@ -203,13 +203,16 @@
 			</condition>
 			<value>0</value>
 		</input>
-		<output>/controls/engines/engine[0]/throttle-lever</output>
+		<output>
+			<property>/controls/engines/engine[0]/throttle-lever</property>
+			<property>/controls/engines/engine[0]/throttle-pos</property>
+		</output>
 	</filter>
 
 	<filter>
 		<name>Throttle R</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input>
 			<condition>
 				<equals>
@@ -228,63 +231,16 @@
 			</condition>
 			<value>0</value>
 		</input>
-		<output>/controls/engines/engine[1]/throttle-lever</output>
+		<output>
-	</filter>
+			<property>/controls/engines/engine[1]/throttle-lever</property>
-
+			<property>/controls/engines/engine[1]/throttle-pos</property>
-	<filter>
+		</output>
-		<name>Throttle L</name>
-		<type>gain</type>
-		<gain>1</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/controls/engines/engine[0]/reverser</property>
-					<value>0</value>
-				</equals>
-			</condition>
-			<property>/controls/engines/engine[0]/throttle</property>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/controls/engines/engine[0]/reverser</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<property>/controls/engines/engine[0]/throttle-rev</property>
-		</input>
-		<output>/controls/engines/engine[0]/throttle-pos</output>
-	</filter>
-
-	<filter>
-		<name>Throttle R</name>
-		<type>gain</type>
-		<gain>1</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/controls/engines/engine[1]/reverser</property>
-					<value>0</value>
-				</equals>
-			</condition>
-			<property>/controls/engines/engine[1]/throttle</property>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/controls/engines/engine[1]/reverser</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<property>/controls/engines/engine[1]/throttle-rev</property>
-		</input>
-		<output>/controls/engines/engine[1]/throttle-pos</output>
 	</filter>
 
 	<filter>
 		<name>Target Pressurize Altitude CMD</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.1</update-interval-secs>
 		<input> 
 			<expression>
@@ -306,7 +262,7 @@
 	<filter>
 		<name>Target Pressurize Altitude</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.1</update-interval-secs>
 		<input> 
 			<condition>
@@ -338,7 +294,7 @@
 	<filter>
 		<name>Cabin PSI target</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.1</update-interval-secs>
 		<input> 
 			<expression>
@@ -364,7 +320,7 @@
 	<filter>
 		<name>VS-target</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.1</update-interval-secs>
 		<input> 
 			<condition>
@@ -390,7 +346,7 @@
 	<filter>
 		<name>Ambient PSI (ICAO std)</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.1</update-interval-secs>
 		<input> 
 			<expression>
@@ -450,7 +406,7 @@
 	<filter>
 		<name>Outflow logic</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.1</update-interval-secs>
 		<input> 
 			<condition>
@@ -506,7 +462,7 @@
 	<filter>
 		<name>VS-target-cmd</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -532,7 +488,7 @@
 	<filter>
 		<name>VS-target-cmd-man</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -550,7 +506,7 @@
 	<filter>
 		<name>VS-target</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.1</update-interval-secs>
 		<input> 
 			<condition>
@@ -576,7 +532,7 @@
 	<filter>
 		<name>Icing Severity</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.1</update-interval-secs>
 		<input> 
 			<expression>
@@ -597,7 +553,7 @@
 	<filter>
 		<name>TAS</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<input> 
 			<expression>
 				<product>
@@ -612,7 +568,7 @@
 	<filter>
 		<name>LBtoKG</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<product>
@@ -626,7 +582,7 @@
 	<filter>
 		<name>optalt</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input>
 			<expression>
@@ -658,7 +614,7 @@
 	<filter>
 		<name>Ambient Temp (ICAO std)</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.1</update-interval-secs>
 		<input> 
 			<expression>
@@ -708,7 +664,7 @@
 	<filter>
 		<name>Difference to ISA Temp (Actual - ISA)</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.1</update-interval-secs>
 		<input> 
 			<difference>
@@ -722,7 +678,7 @@
 	<filter>
 		<name>Rudder Limit</name>
 		<type>gain</type>
-		<gain>1</gain>
+		<gain>1.0</gain>
 		<update-interval-secs type="double">0.05</update-interval-secs>
 		<input> 
 			<expression>

revision.txt

@@ -1 +1 @@
-4051
+4052