From 066a5235948e122b1efc926bb836f951f000cd97 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 17 Jun 2017 16:15:08 -0400
Subject: [PATCH 1/2] A3XX: Improve Elevator Trim Wheel

---
 Models/FlightDeck/a320.flightdeck.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml
index 75b156d1..3a6cc783 100644
--- a/Models/FlightDeck/a320.flightdeck.xml
+++ b/Models/FlightDeck/a320.flightdeck.xml
@@ -2244,7 +2244,7 @@
 		<type>rotate</type>
 		<object-name>trim_wheel</object-name>
 		<property>/controls/flight/elevator-trim</property>
-		<factor>-100</factor>
+		<factor>-150</factor>
 		<center>
 			<x-m>-0.2373</x-m>
 			<y-m>0</y-m>

From f96d3f0d59ef81b66415e29dcb8841886632bd4f Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 17 Jun 2017 17:46:15 -0400
Subject: [PATCH 2/2] A3XX: Improve Autothrust, Add Thrust Difference CMD to
 A/THR

---
 Systems/custom-autothrust.xml |  24 +-------
 Systems/fadec-cfm.xml         |  66 ++++++++++++++++++++++
 Systems/fadec-iae.xml         | 102 ++++++++++++++++++++++++++++++++++
 3 files changed, 170 insertions(+), 22 deletions(-)

diff --git a/Systems/custom-autothrust.xml b/Systems/custom-autothrust.xml
index 172afb0b..30d9e968 100644
--- a/Systems/custom-autothrust.xml
+++ b/Systems/custom-autothrust.xml
@@ -350,17 +350,7 @@
 		<debug>false</debug>
 		<feedback-if-disabled>true</feedback-if-disabled>
 		<initialize-to>output</initialize-to>
-		<enable>
-			<condition>
-				<equals>
-					<property>/it-autoflight/output/athr</property>
-					<value>1</value>
-				</equals>
-			</condition>
-		</enable>
-		<input>
-			<property>/controls/engines/engine[0]/throttle-cmd-pid</property>
-		</input>
+		<input>/controls/engines/engine[0]/throttle-cmd-pid</input>
 		<output>/controls/engines/engine[0]/throttle-cmd</output>
 		<type>noise-spike</type>
 		<max-rate-of-change>0.1</max-rate-of-change>
@@ -607,17 +597,7 @@
 		<debug>false</debug>
 		<feedback-if-disabled>true</feedback-if-disabled>
 		<initialize-to>output</initialize-to>
-		<enable>
-			<condition>
-				<equals>
-					<property>/it-autoflight/output/athr</property>
-					<value>1</value>
-				</equals>
-			</condition>
-		</enable>
-		<input>
-			<property>/controls/engines/engine[1]/throttle-cmd-pid</property>
-		</input>
+		<input>/controls/engines/engine[1]/throttle-cmd-pid</input>
 		<output>/controls/engines/engine[1]/throttle-cmd</output>
 		<type>noise-spike</type>
 		<max-rate-of-change>0.1</max-rate-of-change>
diff --git a/Systems/fadec-cfm.xml b/Systems/fadec-cfm.xml
index 83d49298..6013fc5f 100644
--- a/Systems/fadec-cfm.xml
+++ b/Systems/fadec-cfm.xml
@@ -125,6 +125,72 @@
 		<output>/engines/engine[1]/n1-cmd</output>
     </filter>
 	
+    <filter>
+        <name>N1 A/THR CMD 1</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <input>
+            <expression>
+                <table>
+                    <property>/controls/engines/engine[0]/throttle-cmd-pid</property>
+                    <entry><ind>0.00</ind><dep> 22.4</dep></entry>
+                    <entry><ind>1.00</ind><dep>105.8</dep></entry>
+                </table>
+            </expression>
+        </input>
+		<output>/engines/engine[0]/n1-athr-cmd</output>
+    </filter>
+	
+    <filter>
+        <name>N1 A/THR CMD 2</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <input>
+            <expression>
+                <table>
+                    <property>/controls/engines/engine[1]/throttle-cmd-pid</property>
+                    <entry><ind>0.00</ind><dep> 22.4</dep></entry>
+                    <entry><ind>1.00</ind><dep>105.8</dep></entry>
+                </table>
+            </expression>
+        </input>
+		<output>/engines/engine[1]/n1-athr-cmd</output>
+    </filter>
+	
+    <filter>
+        <name>N1 A/THR DIFFERENCE 1</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <input>
+            <expression>
+				<dif>
+					<property>/engines/engine[0]/n1</property>
+					<property>/engines/engine[0]/n1-athr-cmd</property>
+				</dif>
+            </expression>
+        </input>
+		<output>/engines/engine[0]/n1-diff</output>
+    </filter>
+	
+    <filter>
+        <name>N1 A/THR DIFFERENCE 2</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <input>
+            <expression>
+				<dif>
+					<property>/engines/engine[1]/n1</property>
+					<property>/engines/engine[1]/n1-athr-cmd</property>
+				</dif>
+            </expression>
+        </input>
+		<output>/engines/engine[1]/n1-diff</output>
+    </filter>
+	
 	<filter>
 		<name>Throttle 1</name>
 		<debug>false</debug>
diff --git a/Systems/fadec-iae.xml b/Systems/fadec-iae.xml
index 904c7f7c..935f01ad 100644
--- a/Systems/fadec-iae.xml
+++ b/Systems/fadec-iae.xml
@@ -272,6 +272,108 @@
 		<output>/engines/engine[1]/epr-cmd</output>
     </filter>
 	
+    <filter>
+        <name>EPR A/THR CMD 1</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <input>
+            <expression>
+                <table>
+                    <property>/controls/engines/engine[0]/throttle-cmd-pid</property>
+                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
+                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
+                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
+                </table>
+            </expression>
+			<scale>/engines/epr-scale</scale>
+        </input>
+		<output>/engines/engine[0]/epr-athr-cmd</output>
+    </filter>
+	
+    <filter>
+        <name>EPR A/THR CMD 1</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <input>
+            <expression>
+				<sum>
+					<property>/engines/engine[0]/epr-athr-cmd</property>
+					<property>/engines/epr-scale-b</property>
+				</sum>
+            </expression>
+        </input>
+		<output>/engines/engine[0]/epr-athr</output>
+    </filter>
+	
+    <filter>
+        <name>EPR A/THR CMD 2</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <input>
+            <expression>
+                <table>
+                    <property>/controls/engines/engine[1]/throttle-cmd-pid</property>
+                    <entry><ind>0.000</ind><dep>0.03</dep></entry>
+                    <entry><ind>0.141</ind><dep>0.20</dep></entry>
+                    <entry><ind>1.000</ind><dep>1.00</dep></entry>
+                </table>
+            </expression>
+			<scale>/engines/epr-scale</scale>
+        </input>
+		<output>/engines/engine[1]/epr-athr-cmd</output>
+    </filter>
+	
+    <filter>
+        <name>EPR A/THR CMD 2</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <input>
+            <expression>
+				<sum>
+					<property>/engines/engine[1]/epr-athr-cmd</property>
+					<property>/engines/epr-scale-b</property>
+				</sum>
+            </expression>
+        </input>
+		<output>/engines/engine[1]/epr-athr</output>
+    </filter>
+	
+    <filter>
+        <name>EPR A/THR DIFFERENCE 1</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <input>
+            <expression>
+				<dif>
+					<property>/engines/engine[0]/epr-actual</property>
+					<property>/engines/engine[0]/epr-athr</property>
+				</dif>
+            </expression>
+        </input>
+		<output>/engines/engine[0]/epr-diff</output>
+    </filter>
+	
+    <filter>
+        <name>EPR A/THR DIFFERENCE 2</name>
+        <type>gain</type>
+        <gain>1</gain>
+        <update-interval-secs type="double">0.05</update-interval-secs>
+        <input>
+            <expression>
+				<dif>
+					<property>/engines/engine[1]/epr-actual</property>
+					<property>/engines/engine[1]/epr-athr</property>
+				</dif>
+            </expression>
+        </input>
+		<output>/engines/engine[1]/epr-diff</output>
+    </filter>
+	
 	<filter>
 		<name>Throttle 1</name>
 		<debug>false</debug>