From 3183afd5decb34f7d0c9a82d7dba9574a4155703 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sun, 15 Oct 2017 13:02:21 -0400
Subject: [PATCH] A3XX: FADEC Improvements

---
 Systems/fadec-cfm.xml | 150 ++--------------------------------------
 Systems/fadec-iae.xml | 156 ++----------------------------------------
 revision.txt          |   2 +-
 3 files changed, 9 insertions(+), 299 deletions(-)

diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml
index a6b45fcf..924bf9f1 100644
--- a/Systems/fadec-cfm.xml
+++ b/Systems/fadec-cfm.xml
@@ -256,8 +256,8 @@
 	<filter>
 		<name>Throttle 1</name>
 		<debug>false</debug>
-		<feedback-if-disabled>true</feedback-if-disabled>
-		<initialize-to>output</initialize-to>
+		<type>gain</type>
+		<gain>1</gain>
 		<enable>
 			<condition>
 				<and>
@@ -345,82 +345,13 @@
 		<output>
 			<property>/controls/engines/engine[0]/throttle-fdm</property>
 		</output>
-		<type>noise-spike</type>
-		<max-rate-of-change>
-			<condition>
-				<equals>
-					<property>/systems/thrust/state1</property>
-					<value>MAN THR</value>
-				</equals>
-			</condition>
-			<value>1</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<or>
-						<equals>
-							<property>/systems/thrust/state1</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/systems/thrust/state1</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-			<value>0.40</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<or>
-						<equals>
-							<property>/systems/thrust/state1</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/systems/thrust/state1</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<not-equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</not-equals>
-				</and>
-			</condition>
-			<value>0.2</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<equals>
-					<property>/it-autoflight/output/athr</property>
-					<value>0</value>
-				</equals>
-			</condition>
-			<value>1</value>
-		</max-rate-of-change>
 	</filter>
 	
 	<filter>
 		<name>Throttle 2</name>
 		<debug>false</debug>
-		<feedback-if-disabled>true</feedback-if-disabled>
-		<initialize-to>output</initialize-to>
+		<type>gain</type>
+		<gain>1</gain>
 		<enable>
 			<condition>
 				<and>
@@ -508,75 +439,6 @@
 		<output>
 			<property>/controls/engines/engine[1]/throttle-fdm</property>
 		</output>
-		<type>noise-spike</type>
-		<max-rate-of-change>
-			<condition>
-				<equals>
-					<property>/systems/thrust/state2</property>
-					<value>MAN THR</value>
-				</equals>
-			</condition>
-			<value>1</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<or>
-						<equals>
-							<property>/systems/thrust/state2</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/systems/thrust/state2</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-			<value>0.40</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<or>
-						<equals>
-							<property>/systems/thrust/state2</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/systems/thrust/state2</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<not-equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</not-equals>
-				</and>
-			</condition>
-			<value>0.2</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<equals>
-					<property>/it-autoflight/output/athr</property>
-					<value>0</value>
-				</equals>
-			</condition>
-			<value>1</value>
-		</max-rate-of-change>
 	</filter>
 	
     <filter>
@@ -663,7 +525,6 @@
         <name>Throttle Output One</name>
         <type>gain</type>
         <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
 			<condition>
 				<and>
@@ -699,7 +560,6 @@
         <name>Throttle Output Two</name>
         <type>gain</type>
         <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
 			<condition>
 				<and>
@@ -749,7 +609,6 @@
 				</and>
 			</condition>
 		</enable>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
             <expression>
                 <table>
@@ -780,7 +639,6 @@
 				</and>
 			</condition>
 		</enable>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
             <expression>
                 <table>
diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml
index 55dd6887..fc69eada 100644
--- a/Systems/fadec-iae.xml
+++ b/Systems/fadec-iae.xml
@@ -109,7 +109,6 @@
         <name>EPR Scale</name>
         <type>gain</type>
         <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input> 
             <expression>
                 <table>
@@ -126,7 +125,6 @@
         <name>EPR Scale 2</name>
         <type>gain</type>
         <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input> 
             <expression>
                 <table>
@@ -143,7 +141,6 @@
         <name>EPR 1</name>
         <type>gain</type>
         <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
             <expression>
                 <table>
@@ -162,7 +159,6 @@
         <name>EPR 1</name>
         <type>gain</type>
         <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
             <expression>
 				<sum>
@@ -237,7 +233,6 @@
         <name>EPR 2</name>
         <type>gain</type>
         <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
             <expression>
                 <table>
@@ -256,7 +251,6 @@
         <name>EPR 2</name>
         <type>gain</type>
         <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
             <expression>
 				<sum>
@@ -512,8 +506,8 @@
 	<filter>
 		<name>Throttle 1</name>
 		<debug>false</debug>
-		<feedback-if-disabled>true</feedback-if-disabled>
-		<initialize-to>output</initialize-to>
+		<type>gain</type>
+		<gain>1</gain>
 		<enable>
 			<condition>
 				<and>
@@ -601,82 +595,13 @@
 		<output>
 			<property>/controls/engines/engine[0]/throttle-fdm</property>
 		</output>
-		<type>noise-spike</type>
-		<max-rate-of-change>
-			<condition>
-				<equals>
-					<property>/systems/thrust/state1</property>
-					<value>MAN THR</value>
-				</equals>
-			</condition>
-			<value>1</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<or>
-						<equals>
-							<property>/systems/thrust/state1</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/systems/thrust/state1</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-			<value>0.40</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<or>
-						<equals>
-							<property>/systems/thrust/state1</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/systems/thrust/state1</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<not-equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</not-equals>
-				</and>
-			</condition>
-			<value>0.2</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<equals>
-					<property>/it-autoflight/output/athr</property>
-					<value>0</value>
-				</equals>
-			</condition>
-			<value>1</value>
-		</max-rate-of-change>
 	</filter>
 	
 	<filter>
 		<name>Throttle 2</name>
 		<debug>false</debug>
-		<feedback-if-disabled>true</feedback-if-disabled>
-		<initialize-to>output</initialize-to>
+		<type>gain</type>
+		<gain>1</gain>
 		<enable>
 			<condition>
 				<and>
@@ -764,75 +689,6 @@
 		<output>
 			<property>/controls/engines/engine[1]/throttle-fdm</property>
 		</output>
-		<type>noise-spike</type>
-		<max-rate-of-change>
-			<condition>
-				<equals>
-					<property>/systems/thrust/state2</property>
-					<value>MAN THR</value>
-				</equals>
-			</condition>
-			<value>1</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<or>
-						<equals>
-							<property>/systems/thrust/state2</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/systems/thrust/state2</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</equals>
-				</and>
-			</condition>
-			<value>0.40</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<and>
-					<or>
-						<equals>
-							<property>/systems/thrust/state2</property>
-							<value>CL</value>
-						</equals>
-						<equals>
-							<property>/systems/thrust/state2</property>
-							<value>MAN</value>
-						</equals>
-					</or>
-					<equals>
-						<property>/it-autoflight/output/athr</property>
-						<value>1</value>
-					</equals>
-					<not-equals>
-						<property>/it-autoflight/output/thr-mode</property>
-						<value>0</value>
-					</not-equals>
-				</and>
-			</condition>
-			<value>0.2</value>
-		</max-rate-of-change>
-		<max-rate-of-change>
-			<condition>
-				<equals>
-					<property>/it-autoflight/output/athr</property>
-					<value>0</value>
-				</equals>
-			</condition>
-			<value>1</value>
-		</max-rate-of-change>
 	</filter>
 	
     <filter>
@@ -987,7 +843,6 @@
         <name>Throttle Output One</name>
         <type>gain</type>
         <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
 			<condition>
 				<and>
@@ -1023,7 +878,6 @@
         <name>Throttle Output Two</name>
         <type>gain</type>
         <gain>1</gain>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
 			<condition>
 				<and>
@@ -1073,7 +927,6 @@
 				</and>
 			</condition>
 		</enable>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
             <expression>
                 <table>
@@ -1104,7 +957,6 @@
 				</and>
 			</condition>
 		</enable>
-        <update-interval-secs type="double">0.05</update-interval-secs>
         <input>
             <expression>
                 <table>
diff --git a/revision.txt b/revision.txt
index 13f73a69..cce01b7d 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-2116
\ No newline at end of file
+2117
\ No newline at end of file