From 5be6d11265949ce1637c4e7a6a616878726932b3 Mon Sep 17 00:00:00 2001
From: Josh Davidson <joshuadavidson2000@gmail.com>
Date: Tue, 18 May 2021 12:01:52 -0400
Subject: [PATCH] Control: Begin EPR simulation for IAE

---
 Nasal/Systems/fadec-common.nas         |    9 +-
 Systems/a320-v2527-a5-engine-fadec.xml |  167 ++-
 Systems/fadec-iae.xml                  | 1710 ------------------------
 Systems/libraries.xml                  |   59 +-
 4 files changed, 224 insertions(+), 1721 deletions(-)
 delete mode 100644 Systems/fadec-iae.xml

diff --git a/Nasal/Systems/fadec-common.nas b/Nasal/Systems/fadec-common.nas
index 22012820..558f7cd0 100644
--- a/Nasal/Systems/fadec-common.nas
+++ b/Nasal/Systems/fadec-common.nas
@@ -47,13 +47,8 @@ var FADEC = {
 		me.Limit.activeModeInt.setValue(0);
 		me.Limit.flexActive.setBoolValue(0);
 		me.Limit.flexActiveCmd.setBoolValue(0);
-		if (pts.Options.eng.getValue() == "IAE") {
-			me.n1ModeSw[0].setBoolValue(1);
-			me.n1ModeSw[1].setBoolValue(1);
-		} else {
-			me.n1ModeSw[0].setBoolValue(0);
-			me.n1ModeSw[1].setBoolValue(0);
-		}
+		me.n1ModeSw[0].setBoolValue(0);
+		me.n1ModeSw[1].setBoolValue(0);
 		systems.FADEC_S.init();
 		thrustFlashT.start();
 	},
diff --git a/Systems/a320-v2527-a5-engine-fadec.xml b/Systems/a320-v2527-a5-engine-fadec.xml
index ebb14b98..ee918171 100644
--- a/Systems/a320-v2527-a5-engine-fadec.xml
+++ b/Systems/a320-v2527-a5-engine-fadec.xml
@@ -5,6 +5,8 @@
 
 <system name="A320: V2500 Engine">
 	
+	<property value="1">fadec/epr/c1</property> <!-- Done in property rule because its easier to tune -->
+	<property value="1">fadec/epr/c2</property> <!-- Done in property rule because its easier to tune -->
 	<property value="46">fadec/limit/rated-temp</property>
 	<property value="30">fadec/limit/flex-rated-temp</property>
 	<property value="26600">fadec/limit/rated-thrust</property>
@@ -199,6 +201,51 @@
 			</function>
 		</fcs_function>
 		
+		<fcs_function name="fadec/limit/toga-epr-input">
+			<function>
+				<pow>
+					<property>fadec/limit/toga-ref</property>
+					<value>3.5</value>
+				</pow>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/toga-epr-ref">
+			<function>
+				<sum>
+					<product>
+						<table>
+							<independentVar lookup="row">fadec/limit/toga-epr-input</independentVar>
+							<tableData>
+								   24743.1  0.00
+								   53194.6  0.03
+								10000000.0  1.00
+							</tableData>
+						</table>
+						<property>fadec/epr/c1</property>
+					</product>
+					<property>fadec/epr/c2</property>
+				</sum>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/limit/toga-epr">
+			<function>
+				<quotient>
+					<integer>
+						<sum>
+							<product>
+								<property>fadec/limit/toga-epr-ref</property>
+								<value>1000</value>
+							</product>
+							<value>0.5</value> <!-- Make it round correctly -->
+						</sum>
+					</integer>
+					<value>1000</value>
+				</quotient>
+			</function>
+		</fcs_function>
+		
 		<fcs_function name="fadec/limit/toga-norm">
 			<function>
 				<table>
@@ -677,6 +724,34 @@
 			</function>
 		</fcs_function>
 		
+		<fcs_function name="fadec/control-1/lever-epr-ref">
+			<function>
+				<pow>
+					<property>fadec/control-1/lever-n1</property>
+					<value>3.5</value>
+				</pow>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/control-1/lever-epr">
+			<function>
+				<sum>
+					<product>
+						<table>
+							<independentVar lookup="row">fadec/control-1/lever-epr-ref</independentVar>
+							<tableData>
+								   24743.1  0.00
+								   53194.6  0.03
+								10000000.0  1.00
+							</tableData>
+						</table>
+						<property>fadec/epr/c1</property>
+					</product>
+					<property>fadec/epr/c2</property>
+				</sum>
+			</function>
+		</fcs_function>
+		
 		<switch name="fadec/control-1/detent">
 			<default value="0"/> <!-- IDLE -->
 			<test value="6"> <!-- TOGA -->
@@ -924,6 +999,34 @@
 			</function>
 		</fcs_function>
 		
+		<fcs_function name="fadec/control-2/lever-epr-ref">
+			<function>
+				<pow>
+					<property>fadec/control-2/lever-n1</property>
+					<value>3.5</value>
+				</pow>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/control-2/lever-epr">
+			<function>
+				<sum>
+					<product>
+						<table>
+							<independentVar lookup="row">fadec/control-2/lever-epr-ref</independentVar>
+							<tableData>
+								   24743.1  0.00
+								   53194.6  0.03
+								10000000.0  1.00
+							</tableData>
+						</table>
+						<property>fadec/epr/c1</property>
+					</product>
+					<property>fadec/epr/c2</property>
+				</sum>
+			</function>
+		</fcs_function>
+		
 		<switch name="fadec/control-2/detent">
 			<default value="0"/> <!-- IDLE -->
 			<test value="6"> <!-- TOGA -->
@@ -1456,6 +1559,64 @@
 			<output>/engines/engine[4]/n1</output>
 		</lag_filter>
 		
+		<fcs_function name="fadec/epr-actual-1-ref">
+			<function>
+				<pow>
+					<property>fadec/n1-actual-1</property>
+					<value>3.5</value>
+				</pow>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/epr-actual-1">
+			<function>
+				<sum>
+					<product>
+						<table>
+							<independentVar lookup="row">fadec/epr-actual-1-ref</independentVar>
+							<tableData>
+								   24743.1  0.00
+								   53194.6  0.03
+								10000000.0  1.00
+							</tableData>
+						</table>
+						<property>fadec/epr/c1</property>
+					</product>
+					<property>fadec/epr/c2</property>
+				</sum>
+			</function>
+			<output>/engines/engine[0]/epr-actual</output>
+		</fcs_function>
+		
+		<fcs_function name="fadec/epr-actual-2-ref">
+			<function>
+				<pow>
+					<property>fadec/n1-actual-2</property>
+					<value>3.5</value>
+				</pow>
+			</function>
+		</fcs_function>
+		
+		<fcs_function name="fadec/epr-actual-2">
+			<function>
+				<sum>
+					<product>
+						<table>
+							<independentVar lookup="row">fadec/epr-actual-2-ref</independentVar>
+							<tableData>
+								   24743.1  0.00
+								   53194.6  0.03
+								10000000.0  1.00
+							</tableData>
+						</table>
+						<property>fadec/epr/c1</property>
+					</product>
+					<property>fadec/epr/c2</property>
+				</sum>
+			</function>
+			<output>/engines/engine[1]/epr-actual</output>
+		</fcs_function>
+		
 		<lag_filter name="fadec/n2-actual-1">
 			<input>/engines/engine[0]/n2</input>
 			<c1>2.25</c1>
@@ -1521,7 +1682,7 @@
 		<fcs_function name="/instrumentation/upper-ecam/epr-thr[0]">
 			<function>
 				<table>
-					<independentVar lookup="row">/engines/engine[0]/epr-actual</independentVar> <!-- Fix prop -->
+					<independentVar lookup="row">fadec/control-1/lever-epr</independentVar>
 					<tableData>
 						0.97 -139
 						1.00 -125
@@ -1537,7 +1698,7 @@
 		<fcs_function name="/instrumentation/upper-ecam/epr-thr[1]">
 			<function>
 				<table>
-					<independentVar lookup="row">/engines/engine[1]/epr-actual</independentVar> <!-- Fix prop -->
+					<independentVar lookup="row">fadec/control-1/lever-epr</independentVar>
 					<tableData>
 						0.97 -139
 						1.00 -125
@@ -1553,7 +1714,7 @@
 		<fcs_function name="/instrumentation/upper-ecam/epr-limit">
 			<function>
 				<table>
-					<independentVar lookup="row">/engines/engine[0]/epr-actual</independentVar> <!-- Fix prop -->
+					<independentVar lookup="row">fadec/limit/toga-epr</independentVar>
 					<tableData>
 						0.97 -139
 						1.00 -125
diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml
deleted file mode 100644
index 1d453fea..00000000
--- a/Systems/fadec-iae.xml
+++ /dev/null
@@ -1,1710 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright (c) 2021 Josh Davidson (Octal450) -->
-
-<!-- A3XX IAE V2500 FADEC -->
-
-<PropertyList>
-
-	<filter>
-		<name>OAT Thrust Scale</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<property>/environment/temperature-degc</property>
-					<entry><ind> 70</ind><dep>0.797</dep></entry>
-					<entry><ind> 40</ind><dep>0.822</dep></entry>
-					<entry><ind>-60</ind><dep>1.000</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/controls/engines/throttle-scale</output>
-	</filter>
-	
-	<filter>
-		<name>FLX Thrust Scale</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<property>/fdm/jsbsim/fadec/limit/flex-temp</property>
-					<entry><ind> 70</ind><dep>0.797</dep></entry>
-					<entry><ind> 40</ind><dep>0.822</dep></entry>
-					<entry><ind>-60</ind><dep>1.000</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/engines/flx-throttle</output>
-	</filter>
-
-	<filter>
-		<name>IDLE Limit</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<condition>
-				<and>
-					<not-equals>
-						<property>/controls/flight/flaps-input</property>
-						<value>0</value>
-					</not-equals>
-					<equals>
-						<property>/gear/gear[0]/wow</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-			<value>0.1</value>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/gear/gear[0]/wow</property>
-					<value>0</value>
-				</equals>
-			</condition>
-			<expression>
-				<table>
-					<property>/fdm/jsbsim/atmosphere/density-altitude</property> 
-					<entry><ind>    0</ind><dep>0.035</dep></entry>
-					<entry><ind>42000</ind><dep>0.285</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>0</input>
-		<output>/controls/engines/idle-limit</output>
-	</filter>
-	
-	<filter>
-		<name>Engines At Idle Stage 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<difference>
-					<table>
-						<max>
-							<property>/engines/engine[0]/n1-actual</property>
-							<property>/engines/engine[1]/n1-actual</property>
-						</max>
-						<entry><ind> 22.4</ind><dep>0</dep></entry>
-						<entry><ind>103.8</ind><dep>1</dep></entry>
-					</table>
-					<value>0.005</value>
-				</difference>
-			</expression>
-		</input>
-		<output>/engines/highest-n1-buffer</output>
-	</filter>
-	
-	<logic>
-		<name>Engines At Idle Stage 2</name>
-		<input>
-			<less-than-equals>
-				<property>/engines/highest-n1-buffer</property>
-				<property>/controls/engines/idle-limit</property>
-			</less-than-equals>
-		</input>
-		<output>/engines/both-at-idle</output>
-	</logic>
-	
-	<filter>
-		<name>MAN One</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<property>/controls/engines/engine[0]/throttle-pos</property>
-					<entry><ind>0.00</ind><dep>0.00</dep></entry>
-					<entry><ind>0.01</ind><dep>0.00</dep></entry>
-					<entry><ind>0.60</ind><dep>0.91</dep></entry>
-					<entry><ind>0.65</ind><dep>0.91</dep></entry>
-					<entry><ind>0.78</ind><dep>0.95</dep></entry>
-					<entry><ind>0.83</ind><dep>0.95</dep></entry>
-					<entry><ind>0.95</ind><dep>0.99</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[0]/throttle-man</output>
-	</filter>
-	
-	<filter>
-		<name>MAN Two</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<property>/controls/engines/engine[1]/throttle-pos</property>
-					<entry><ind>0.00</ind><dep>0.00</dep></entry>
-					<entry><ind>0.01</ind><dep>0.00</dep></entry>
-					<entry><ind>0.60</ind><dep>0.91</dep></entry>
-					<entry><ind>0.65</ind><dep>0.91</dep></entry>
-					<entry><ind>0.78</ind><dep>0.95</dep></entry>
-					<entry><ind>0.83</ind><dep>0.95</dep></entry>
-					<entry><ind>0.95</ind><dep>0.99</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[1]/throttle-man</output>
-	</filter>
-	
-	<filter>
-		<name>MAN CMD One</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<product>
-					<table>
-						<property>/controls/engines/engine[0]/throttle-pos</property>
-						<entry><ind>0.00</ind><dep>0.00</dep></entry>
-						<entry><ind>0.01</ind><dep>0.00</dep></entry>
-						<entry><ind>0.60</ind><dep>0.91</dep></entry>
-						<entry><ind>0.65</ind><dep>0.91</dep></entry>
-						<entry><ind>0.78</ind><dep>0.95</dep></entry>
-						<entry><ind>0.83</ind><dep>0.95</dep></entry>
-						<entry><ind>0.95</ind><dep>0.99</dep></entry>
-					</table>
-					<property>/controls/engines/throttle-scale</property>
-				</product>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[0]/throttle-cmd-man</output>
-	</filter>
-	
-	<filter>
-		<name>MAN CMD Two</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<product>
-					<table>
-						<property>/controls/engines/engine[1]/throttle-pos</property>
-						<entry><ind>0.00</ind><dep>0.00</dep></entry>
-						<entry><ind>0.01</ind><dep>0.00</dep></entry>
-						<entry><ind>0.60</ind><dep>0.91</dep></entry>
-						<entry><ind>0.65</ind><dep>0.91</dep></entry>
-						<entry><ind>0.78</ind><dep>0.95</dep></entry>
-						<entry><ind>0.83</ind><dep>0.95</dep></entry>
-						<entry><ind>0.95</ind><dep>0.99</dep></entry>
-					</table>
-					<property>/controls/engines/throttle-scale</property>
-				</product>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[1]/throttle-cmd-man</output>
-	</filter>
-
-	<filter>
-		<name>EPR Scale</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<table>
-					<property>/fdm/jsbsim/atmosphere/density-altitude</property> 
-					<entry><ind>    0</ind><dep>0.6740</dep></entry>
-					<entry><ind>42000</ind><dep>0.7570</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/engines/epr-scale</output>
-	</filter>
-	
-	<filter>
-		<name>EPR Scale 2 Sum/Difference</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<difference>
-					<table>
-						<property>/fdm/jsbsim/atmosphere/density-altitude</property> 
-						<entry><ind>    0</ind><dep>0.9857</dep></entry>
-						<entry><ind>43000</ind><dep>0.8584</dep></entry>
-					</table>
-					<table>
-						<property>/fdm/jsbsim/velocities/mach</property>
-						<entry><ind>0.00</ind><dep>0.000</dep></entry>
-						<entry><ind>0.09</ind><dep>0.000</dep></entry>
-						<entry><ind>0.15</ind><dep>0.016</dep></entry>
-						<entry><ind>0.22</ind><dep>0.022</dep></entry>
-						<entry><ind>1.00</ind><dep>0.010</dep></entry>
-					</table>
-					<table>
-						<property>/fdm/jsbsim/aero/alpha-deg-norm</property>
-						<entry><ind> 0.0</ind><dep>0.00</dep></entry>
-						<entry><ind> 7.5</ind><dep>0.01</dep></entry>
-						<entry><ind>17.0</ind><dep>0.03</dep></entry>
-					</table>
-				</difference>
-			</expression>
-		</input>
-		<output>/engines/epr-scale-b-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>EPR Scale 2 Sum/Difference Exponential</name>
-		<type>exponential</type>
-		<gain>1.0</gain>
-		<input>/engines/epr-scale-b-cmd</input>
-		<output>/engines/epr-scale-b</output>
-		<filter-time>0.32</filter-time>
-	</filter>
-	
-	<!-- -->
-
-	<filter>
-		<name>EPR 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<table>
-					<pow>
-						<property>/engines/engine[0]/n1-actual</property> 
-						<value>3.5</value>
-					</pow>
-					<entry><ind>   24743.1</ind><dep>0.00</dep></entry>
-					<entry><ind>   53194.6</ind><dep>0.03</dep></entry>
-					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
-				</table>
-			</expression>
-			<scale>/engines/epr-scale</scale>
-		</input>
-		<output>/engines/engine[0]/epr-actual-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>EPR 1 B</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<sum>
-					<property>/engines/engine[0]/epr-actual-cmd</property>
-					<property>/engines/epr-scale-b</property>
-				</sum>
-			</expression>
-		</input>
-		<output>/engines/engine[0]/epr-actual</output>
-	</filter>
-	
-	<filter>
-		<name>EPR CMD 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/limit/active-mode</property>
-						<value>FLX</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-						<value>MCT</value>
-					</equals>
-				</and>
-			</condition>
-			<expression>
-				<table>
-					<pow>
-						<table>
-							<product>
-								<value>0.99</value>
-								<property>/engines/flx-throttle</property>
-							</product>
-							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-							<entry><ind>1.0</ind><dep>103.8</dep></entry>
-						</table>
-						<value>3.5</value>
-					</pow>
-					<entry><ind>   53194.6</ind><dep>0.03</dep></entry>
-					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
-				</table>
-			</expression>
-			<scale>/engines/epr-scale</scale>
-		</input>
-		<input>
-			<expression>
-				<table>
-					<pow>
-						<table>
-							<property>/controls/engines/engine[0]/throttle-cmd-man</property> 
-							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-							<entry><ind>1.0</ind><dep>103.8</dep></entry>
-						</table>
-						<value>3.5</value>
-					</pow>
-					<entry><ind>   53194.6</ind><dep>0.03</dep></entry>
-					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
-				</table>
-			</expression>
-			<scale>/engines/epr-scale</scale>
-		</input>
-		<output>/engines/engine[0]/epr-cmd-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>EPR CMD 1 B</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<sum>
-					<property>/engines/engine[0]/epr-cmd-cmd</property>
-					<property>/engines/epr-scale-b</property>
-				</sum>
-			</expression>
-		</input>
-		<output>/engines/engine[0]/epr-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>EPR 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<table>
-					<pow>
-						<property>/engines/engine[1]/n1-actual</property> 
-						<value>3.5</value>
-					</pow>
-					<entry><ind>   24743.1</ind><dep>0.00</dep></entry>
-					<entry><ind>   53194.6</ind><dep>0.03</dep></entry>
-					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
-				</table>
-			</expression>
-			<scale>/engines/epr-scale</scale>
-		</input>
-		<output>/engines/engine[1]/epr-actual-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>EPR 2 B</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<sum>
-					<property>/engines/engine[1]/epr-actual-cmd</property>
-					<property>/engines/epr-scale-b</property>
-				</sum>
-			</expression>
-		</input>
-		<output>/engines/engine[1]/epr-actual</output>
-	</filter>
-	
-	<filter>
-		<name>EPR CMD 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/limit/active-mode</property>
-						<value>FLX</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-						<value>MCT</value>
-					</equals>
-				</and>
-			</condition>
-			<expression>
-				<table>
-					<pow>
-						<table>
-							<product>
-								<value>0.99</value>
-								<property>/engines/flx-throttle</property>
-							</product>
-							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-							<entry><ind>1.0</ind><dep>103.8</dep></entry>
-						</table>
-						<value>3.5</value>
-					</pow>
-					<entry><ind>   53194.6</ind><dep>0.03</dep></entry>
-					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
-				</table>
-			</expression>
-			<scale>/engines/epr-scale</scale>
-		</input>
-		<input>
-			<expression>
-				<table>
-					<pow>
-						<table>
-							<property>/controls/engines/engine[1]/throttle-cmd-man</property> 
-							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-							<entry><ind>1.0</ind><dep>103.8</dep></entry>
-						</table>
-						<value>3.5</value>
-					</pow>
-					<entry><ind>   53194.6</ind><dep>0.03</dep></entry>
-					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
-				</table>
-			</expression>
-			<scale>/engines/epr-scale</scale>
-		</input>
-		<output>/engines/engine[1]/epr-cmd-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>EPR CMD 2 B</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<expression>
-				<sum>
-					<property>/engines/engine[1]/epr-cmd-cmd</property>
-					<property>/engines/epr-scale-b</property>
-				</sum>
-			</expression>
-		</input>
-		<output>/engines/engine[1]/epr-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>N1 CMD 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/limit/active-mode</property>
-						<value>FLX</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-						<value>MCT</value>
-					</equals>
-				</and>
-			</condition>
-			<expression>
-				<table>
-					<product>
-						<value>0.99</value>
-						<property>/engines/flx-throttle</property>
-					</product>
-					<entry><ind>0.00</ind><dep> 22.4</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>
-			<expression>
-				<table>
-					<property>/controls/engines/engine[0]/throttle-cmd-man</property>
-					<entry><ind>0.00</ind><dep> 22.4</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/engines/engine[0]/n1-actual-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>N1 CMD 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/limit/active-mode</property>
-						<value>FLX</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-						<value>MCT</value>
-					</equals>
-				</and>
-			</condition>
-			<expression>
-				<table>
-					<product>
-						<value>0.99</value>
-						<property>/engines/flx-throttle</property>
-					</product>
-					<entry><ind>0.00</ind><dep> 22.4</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<input>
-			<expression>
-				<table>
-					<property>/controls/engines/engine[1]/throttle-cmd-man</property>
-					<entry><ind>0.00</ind><dep> 22.4</dep></entry>
-					<entry><ind>1.00</ind><dep>103.8</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/engines/engine[1]/n1-actual-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>A/THR FEED 1</name>
-		<type>noise-spike</type>
-		<input>/controls/engines/throttle-cmd-pid</input>
-		<output>/controls/engines/engine[0]/throttle-cmd</output>
-		<max-rate-of-change>
-			<condition>
-				<or>
-					<and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/eng-out</property>
-							<value>0</value>
-						</equals>
-						<less-than>
-							<property>/controls/engines/engine[0]/throttle-pos</property>
-							<value>0.83</value>
-						</less-than>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<greater-than-equals>
-							<property>/controls/engines/engine[0]/throttle-pos</property>
-							<value>0.83</value>
-						</greater-than-equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<equals>
-							<property>/it-autoflight/output/athr</property>
-							<value>0</value>
-						</equals>
-						<or>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-									<value>0</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-									<value>MCT</value>
-								</equals>
-							</and>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-									<value>MAN THR</value>
-								</equals>
-							</and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>CL</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MAN</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>IDLE</value>
-							</equals>
-						</or>
-					</and>
-				</or>
-			</condition>
-			<value>1000</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[0]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<or>
-						<equals>
-							<property>/it-autoflight/output/thr-mode</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-autoflight/mode/thr</property>
-							<value>RETARD</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-			<value>0.3</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[0]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<not-equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</not-equals>
-				</and>
-			</condition>
-			<value>0.05</value>
-		</max-rate-of-change>
-		<max-rate-of-change>1000</max-rate-of-change>
-	</filter>
-	
-	<filter>
-		<name>A/THR FEED LIMIT 1</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>/controls/engines/engine[0]/throttle-cmd</input>
-		<output>/controls/engines/engine[0]/throttle-cmd-feed</output>
-		<min>
-			<condition>
-				<equals>
-					<property>/it-autoflight/mode/thr</property>
-					<value>RETARD</value>
-				</equals>
-			</condition>
-			<value>0.0</value>
-		</min>
-		<min>
-			<property>/controls/engines/idle-limit</property>
-		</min>
-		<max>
-			<property>/controls/engines/engine[0]/throttle-man</property>
-		</max>
-	</filter>
-	
-	<filter>
-		<name>A/THR FEED 2</name>
-		<type>noise-spike</type>
-		<input>/controls/engines/throttle-cmd-pid</input>
-		<output>/controls/engines/engine[1]/throttle-cmd</output>
-		<max-rate-of-change>
-			<condition>
-				<or>
-					<and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/eng-out</property>
-							<value>0</value>
-						</equals>
-						<less-than>
-							<property>/controls/engines/engine[1]/throttle-pos</property>
-							<value>0.83</value>
-						</less-than>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<greater-than-equals>
-							<property>/controls/engines/engine[1]/throttle-pos</property>
-							<value>0.83</value>
-						</greater-than-equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<equals>
-							<property>/it-autoflight/output/athr</property>
-							<value>0</value>
-						</equals>
-						<or>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-									<value>0</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-									<value>MCT</value>
-								</equals>
-							</and>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-									<value>MAN THR</value>
-								</equals>
-							</and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>CL</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MAN</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>IDLE</value>
-							</equals>
-						</or>
-					</and>
-				</or>
-			</condition>
-			<value>1000</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[1]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<or>
-						<equals>
-							<property>/it-autoflight/output/thr-mode</property>
-							<value>0</value>
-						</equals>
-						<equals>
-							<property>/it-autoflight/mode/thr</property>
-							<value>RETARD</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-			<value>0.3</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[1]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<not-equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</not-equals>
-				</and>
-			</condition>
-			<value>0.05</value>
-		</max-rate-of-change>
-		<max-rate-of-change>1000</max-rate-of-change>
-	</filter>
-	
-	<filter>
-		<name>A/THR FEED LIMIT 2</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>/controls/engines/engine[1]/throttle-cmd</input>
-		<output>/controls/engines/engine[1]/throttle-cmd-feed</output>
-		<min>
-			<condition>
-				<equals>
-					<property>/it-autoflight/mode/thr</property>
-					<value>RETARD</value>
-				</equals>
-			</condition>
-			<value>0.0</value>
-		</min>
-		<min>
-			<property>/controls/engines/idle-limit</property>
-		</min>
-		<max>
-			<property>/controls/engines/engine[1]/throttle-man</property>
-		</max>
-	</filter>
-	
-	<filter>
-		<name>Throttle 1</name>
-		<debug>false</debug>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/alpha-floor</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/toga-lk</property>
-						<value>0</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>IDLE</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<condition>
-				<or>
-					<and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/eng-out</property>
-							<value>0</value>
-						</equals>
-						<less-than>
-							<property>/controls/engines/engine[0]/throttle-pos</property>
-							<value>0.83</value>
-						</less-than>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<greater-than-equals>
-							<property>/controls/engines/engine[0]/throttle-pos</property>
-							<value>0.83</value>
-						</greater-than-equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<equals>
-							<property>/it-autoflight/output/athr</property>
-							<value>0</value>
-						</equals>
-						<or>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-									<value>0</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-									<value>MCT</value>
-								</equals>
-							</and>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-									<value>MAN THR</value>
-								</equals>
-							</and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>CL</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MAN</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>IDLE</value>
-							</equals>
-						</or>
-					</and>
-				</or>
-			</condition>
-			<property>/controls/engines/engine[0]/throttle-man</property>
-		</input>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[0]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-			<property>/controls/engines/engine[0]/throttle-cmd-feed</property>
-		</input>
-		<output>
-			<property>/controls/engines/engine[0]/throttle-fdm</property>
-		</output>
-	</filter>
-	
-	<filter>
-		<name>Throttle 2</name>
-		<debug>false</debug>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/alpha-floor</property>
-						<value>0</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/toga-lk</property>
-						<value>0</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>IDLE</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<condition>
-				<or>
-					<and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/eng-out</property>
-							<value>0</value>
-						</equals>
-						<less-than>
-							<property>/controls/engines/engine[1]/throttle-pos</property>
-							<value>0.83</value>
-						</less-than>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<greater-than-equals>
-							<property>/controls/engines/engine[1]/throttle-pos</property>
-							<value>0.83</value>
-						</greater-than-equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN THR</value>
-						</equals>
-					</and>
-					<and>
-						<equals>
-							<property>/it-autoflight/output/athr</property>
-							<value>0</value>
-						</equals>
-						<or>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-									<value>0</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-									<value>MCT</value>
-								</equals>
-							</and>
-							<and>
-								<equals>
-									<property>/fdm/jsbsim/fadec/eng-out</property>
-									<value>1</value>
-								</equals>
-								<equals>
-									<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-									<value>MAN THR</value>
-								</equals>
-							</and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>CL</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MAN</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>IDLE</value>
-							</equals>
-						</or>
-					</and>
-				</or>
-			</condition>
-			<property>/controls/engines/engine[1]/throttle-man</property>
-		</input>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<or>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/limit/flex-active</property>
-								<value>0</value>
-							</equals>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MCT</value>
-							</equals>
-						</and>
-						<and>
-							<equals>
-								<property>/fdm/jsbsim/fadec/eng-out</property>
-								<value>1</value>
-							</equals>
-							<less-than>
-								<property>/controls/engines/engine[1]/throttle-pos</property>
-								<value>0.83</value>
-							</less-than>
-							<equals>
-								<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-								<value>MAN THR</value>
-							</equals>
-						</and>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-				</and>
-			</condition>
-			<property>/controls/engines/engine[1]/throttle-cmd-feed</property>
-		</input>
-		<output>
-			<property>/controls/engines/engine[1]/throttle-fdm</property>
-		</output>
-	</filter>
-	
-	<filter>
-		<name>EPR Limit TOGA</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<pow>
-						<table>
-							<product>
-								<value>0.99</value>
-								<property>/controls/engines/throttle-scale</property>
-							</product>
-							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-							<entry><ind>1.0</ind><dep>103.8</dep></entry>
-						</table>
-						<value>3.5</value>
-					</pow>
-					<entry><ind>   53194.6</ind><dep>0.03</dep></entry>
-					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
-				</table>
-			</expression>
-			<scale>/engines/epr-scale</scale>
-		</input>
-		<output>/fdm/jsbsim/fadec/epr/toga-lim-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>EPR CMD TOGA</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<sum>
-					<property>/fdm/jsbsim/fadec/epr/toga-lim-cmd</property>
-					<property>/engines/epr-scale-b</property>
-				</sum>
-			</expression>
-		</input>
-		<output>/fdm/jsbsim/fadec/epr/toga-lim</output>
-	</filter>
-	
-	<filter>
-		<name>EPR Limit MCT</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<pow>
-						<table>
-							<product>
-								<value>0.95</value>
-								<property>/controls/engines/throttle-scale</property>
-							</product>
-							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-							<entry><ind>1.0</ind><dep>103.8</dep></entry>
-						</table>
-						<value>3.5</value>
-					</pow>
-					<entry><ind>   53194.6</ind><dep>0.03</dep></entry>
-					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
-				</table>
-			</expression>
-			<scale>/engines/epr-scale</scale>
-		</input>
-		<output>/fdm/jsbsim/fadec/epr/mct-lim-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>EPR CMD MCT</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<sum>
-					<property>/fdm/jsbsim/fadec/epr/mct-lim-cmd</property>
-					<property>/engines/epr-scale-b</property>
-				</sum>
-			</expression>
-		</input>
-		<output>/fdm/jsbsim/fadec/epr/mct-lim</output>
-	</filter>
-	
-	<filter>
-		<name>EPR Limit FLX</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<pow>
-						<table>
-							<product>
-								<value>0.99</value>
-								<property>/engines/flx-throttle</property>
-							</product>
-							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-							<entry><ind>1.0</ind><dep>103.8</dep></entry>
-						</table>
-						<value>3.5</value>
-					</pow>
-					<entry><ind>   53194.6</ind><dep>0.03</dep></entry>
-					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
-				</table>
-			</expression>
-			<scale>/engines/epr-scale</scale>
-		</input>
-		<output>/fdm/jsbsim/fadec/epr/flx-lim-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>EPR CMD FLX</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<sum>
-					<property>/fdm/jsbsim/fadec/epr/flx-lim-cmd</property>
-					<property>/engines/epr-scale-b</property>
-				</sum>
-			</expression>
-		</input>
-		<output>/fdm/jsbsim/fadec/epr/flx-lim</output>
-	</filter>
-	
-	<filter>
-		<name>EPR Limit CLB</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<table>
-					<pow>
-						<table>
-							<product>
-								<value>0.91</value>
-								<property>/controls/engines/throttle-scale</property>
-							</product>
-							<entry><ind>0.0</ind><dep> 22.4</dep></entry>
-							<entry><ind>1.0</ind><dep>103.8</dep></entry>
-						</table>
-						<value>3.5</value>
-					</pow>
-					<entry><ind>   53194.6</ind><dep>0.03</dep></entry>
-					<entry><ind>11394381.0</ind><dep>1.00</dep></entry>
-				</table>
-			</expression>
-			<scale>/engines/epr-scale</scale>
-		</input>
-		<output>/fdm/jsbsim/fadec/epr/clb-lim-cmd</output>
-	</filter>
-	
-	<filter>
-		<name>EPR CMD CLB</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<update-interval-secs>0.05</update-interval-secs>
-		<input>
-			<expression>
-				<sum>
-					<property>/fdm/jsbsim/fadec/epr/clb-lim-cmd</property>
-					<property>/engines/epr-scale-b</property>
-				</sum>
-			</expression>
-		</input>
-		<output>/fdm/jsbsim/fadec/epr/clb-lim</output>
-	</filter>
-	
-	<filter>
-		<name>Throttle Output One</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/controls/engines/engine[0]/reverse-cmd</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<property>/controls/engines/engine[0]/reverse-lever</property>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/fdm/jsbsim/fadec/thr-locked</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<property>/fdm/jsbsim/fadec/thr-lock-cmd[0]</property>
-		</input>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/limit/active-mode</property>
-						<value>FLX</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/control-1/detent-text</property>
-						<value>MCT</value>
-					</equals>
-				</and>
-			</condition>
-			<expression>
-				<product>
-					<property>/controls/engines/engine[0]/throttle-fdm</property>
-					<property>/engines/flx-throttle</property>
-				</product>
-			</expression>
-		</input>
-		<input>
-			<expression>
-				<product>
-					<property>/controls/engines/engine[0]/throttle-fdm</property>
-					<property>/controls/engines/throttle-scale</property>
-				</product>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[0]/throttle-output</output>
-		<min>
-			<property>/controls/engines/idle-limit</property>
-		</min>
-		<max>1.0</max>
-	</filter>
-	
-	<filter>
-		<name>Throttle Output Two</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<input>
-			<condition>
-				<equals>
-					<property>/controls/engines/engine[1]/reverse-cmd</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<property>/controls/engines/engine[1]/reverse-lever</property>
-		</input>
-		<input>
-			<condition>
-				<equals>
-					<property>/fdm/jsbsim/fadec/thr-locked</property>
-					<value>1</value>
-				</equals>
-			</condition>
-			<property>/fdm/jsbsim/fadec/thr-lock-cmd[1]</property>
-		</input>
-		<input>
-			<condition>
-				<and>
-					<equals>
-						<property>/fdm/jsbsim/fadec/limit/active-mode</property>
-						<value>FLX</value>
-					</equals>
-					<equals>
-						<property>/fdm/jsbsim/fadec/control-2/detent-text</property>
-						<value>MCT</value>
-					</equals>
-				</and>
-			</condition>
-			<expression>
-				<product>
-					<property>/controls/engines/engine[1]/throttle-fdm</property>
-					<property>/engines/flx-throttle</property>
-				</product>
-			</expression>
-		</input>
-		<input>
-			<expression>
-				<product>
-					<property>/controls/engines/engine[1]/throttle-fdm</property>
-					<property>/controls/engines/throttle-scale</property>
-				</product>
-			</expression>
-		</input>
-		<output>/controls/engines/engine[1]/throttle-output</output>
-		<min>
-			<property>/controls/engines/idle-limit</property>
-		</min>
-		<max>1.0</max>
-	</filter>
-	
-	<filter>
-		<name>EGT L</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/engines/engine[0]/state</property>
-						<value>3</value>
-					</equals>
-					<greater-than>
-						<property>/engines/engine[0]/n1-actual</property>
-						<value>22</value>
-					</greater-than>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<expression>
-				<table>
-					<property>/engines/engine[0]/n1-actual</property> 
-					<entry><ind> 22.4</ind><dep>434</dep></entry>
-					<entry><ind>110.0</ind><dep>620</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/engines/engine[0]/egt-actual</output>
-	</filter>
-	
-	<filter>
-		<name>EGT R</name>
-		<type>gain</type>
-		<gain>1.0</gain>
-		<enable>
-			<condition>
-				<and>
-					<equals>
-						<property>/engines/engine[1]/state</property>
-						<value>3</value>
-					</equals>
-					<greater-than>
-						<property>/engines/engine[1]/n1-actual</property>
-						<value>22</value>
-					</greater-than>
-				</and>
-			</condition>
-		</enable>
-		<input>
-			<expression>
-				<table>
-					<property>/engines/engine[1]/n1-actual</property> 
-					<entry><ind> 22.4</ind><dep>434</dep></entry>
-					<entry><ind>110.0</ind><dep>620</dep></entry>
-				</table>
-			</expression>
-		</input>
-		<output>/engines/engine[1]/egt-actual</output>
-	</filter>
-
-</PropertyList>
\ No newline at end of file
diff --git a/Systems/libraries.xml b/Systems/libraries.xml
index 2dffb176..851be919 100644
--- a/Systems/libraries.xml
+++ b/Systems/libraries.xml
@@ -3,7 +3,64 @@
 <!-- Copyright (c) 2021 Josh Davidson (Octal450) -->
 
 <PropertyList>
-
+	
+	<filter>
+		<name>EPR Scale</name>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<expression>
+				<table>
+					<property>/position/altitude-ft</property>
+					<entry><ind>    0</ind><dep>0.674</dep></entry>
+					<entry><ind>43000</ind><dep>1.120</dep></entry>
+				</table>
+			</expression>
+		</input>
+		<output>/fdm/jsbsim/fadec/epr/c1</output>
+	</filter>
+	
+	<filter>
+		<name>EPR Scale 2 Sum/Difference</name>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<input>
+			<expression>
+				<difference>
+					<table>
+						<property>/position/altitude-ft</property>
+						<entry><ind>    0</ind><dep>0.9857</dep></entry>
+						<entry><ind>43000</ind><dep>0.8584</dep></entry>
+					</table>
+					<table>
+						<property>/fdm/jsbsim/velocities/mach</property>
+						<entry><ind>0.00</ind><dep>0.000</dep></entry>
+						<entry><ind>0.09</ind><dep>0.000</dep></entry>
+						<entry><ind>0.15</ind><dep>0.016</dep></entry>
+						<entry><ind>0.22</ind><dep>0.022</dep></entry>
+						<entry><ind>1.00</ind><dep>0.010</dep></entry>
+					</table>
+					<table>
+						<property>/fdm/jsbsim/aero/alpha-deg-norm</property>
+						<entry><ind> 0.0</ind><dep>0.00</dep></entry>
+						<entry><ind> 7.5</ind><dep>0.01</dep></entry>
+						<entry><ind>17.0</ind><dep>0.03</dep></entry>
+					</table>
+				</difference>
+			</expression>
+		</input>
+		<output>/fdm/jsbsim/fadec/epr/c2-raw</output>
+	</filter>
+	
+	<filter>
+		<name>EPR Scale 2 Sum/Difference Exponential</name>
+		<type>exponential</type>
+		<gain>1.0</gain>
+		<input>/fdm/jsbsim/fadec/epr/c2-raw</input>
+		<output>/fdm/jsbsim/fadec/epr/c2</output>
+		<filter-time>0.32</filter-time>
+	</filter>
+	
 	<filter>
 		<name>Groundspeed Meters Per Second</name>
 		<type>gain</type>