From 644ec49c61eb857c20ed6386fff9da9a7fd926d8 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 2 Dec 2017 20:40:00 -0500
Subject: [PATCH] A3XX: A/THR issues fixed

---
 Systems/fmgc-thrust.xml | 168 +++++++++++++++++++++++++++++++++++++---
 revision.txt            |   2 +-
 2 files changed, 157 insertions(+), 13 deletions(-)

diff --git a/Systems/fmgc-thrust.xml b/Systems/fmgc-thrust.xml
index 62b06f75..d0e68f94 100644
--- a/Systems/fmgc-thrust.xml
+++ b/Systems/fmgc-thrust.xml
@@ -152,14 +152,17 @@
 		</input>
 		<output>/controls/engines/throttle-pid-max</output>
 	</filter>
-
-	<!-- Auto throttle --> 
+	
 	<pid-controller>
-		<name>IAS THR</name>
+		<name>IT-CONTROLLER: IAS THRUST</name>
 		<debug>false</debug>
 		<enable>
 			<condition>
 				<and>
+					<equals>
+						<property>/it-autoflight/output/athr</property>
+						<value>1</value>
+					</equals>
 					<equals>
 						<property>/it-autoflight/input/kts-mach</property>
 						<value>0</value>
@@ -188,6 +191,24 @@
 							<value>0</value>
 						</equals>
 					</or>
+					<or>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>MAN</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>MAN</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>CL</value>
+						</equals>
+					</or>
 				</and>
 			</condition>
 		</enable>
@@ -215,14 +236,17 @@
 			</u_max>
 		</config>
 	</pid-controller>
-
-	<!-- Auto throttle (Mach Hold)-->
+	
 	<pid-controller>
-		<name>MACH THR</name>
+		<name>IT-CONTROLLER: MACH THRUST</name>
 		<debug>false</debug>
 		<enable>
 			<condition>
 				<and>
+					<equals>
+						<property>/it-autoflight/output/athr</property>
+						<value>1</value>
+					</equals>
 					<equals>
 						<property>/it-autoflight/input/kts-mach</property>
 						<value>1</value>
@@ -251,6 +275,24 @@
 							<value>0</value>
 						</equals>
 					</or>
+					<or>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>MAN</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>MAN</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>CL</value>
+						</equals>
+					</or>
 				</and>
 			</condition>
 		</enable>
@@ -280,16 +322,19 @@
 			</u_max>
 		</config>
 	</pid-controller>
-
-	<!-- IDLE THR -->
+	
 	<filter>
-		<name>IDLE</name>
+		<name>IT-CONTROLLER: IDLE THRUST</name>
 		<debug>false</debug>
 		<type>gain</type>
 		<gain>1.0</gain>
 		<enable>
 			<condition>
 				<and>
+					<equals>
+						<property>/it-autoflight/output/athr</property>
+						<value>1</value>
+					</equals>
 					<or>
 						<equals>
 							<property>/it-autoflight/output/fd1</property>
@@ -312,6 +357,24 @@
 						<property>/it-autoflight/output/thr-mode</property>
 						<value>1</value>
 					</equals>
+					<or>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>MAN</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>MAN</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>CL</value>
+						</equals>
+					</or>
 				</and>
 			</condition>
 		</enable>
@@ -331,16 +394,19 @@
 			<property>/controls/engines/throttle-cmd-pid</property>
 		</output>
 	</filter>
-
-	<!-- CLB THR -->
+	
 	<filter>
-		<name>CLB</name>
+		<name>IT-CONTROLLER: LIMIT THRUST</name>
 		<debug>false</debug>
 		<type>gain</type>
 		<gain>1.0</gain>
 		<enable>
 			<condition>
 				<and>
+					<equals>
+						<property>/it-autoflight/output/athr</property>
+						<value>1</value>
+					</equals>
 					<or>
 						<equals>
 							<property>/it-autoflight/output/fd1</property>
@@ -363,6 +429,24 @@
 						<property>/it-autoflight/output/thr-mode</property>
 						<value>2</value>
 					</equals>
+					<or>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>MAN</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state1</property>
+							<value>CL</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>MAN</value>
+						</equals>
+						<equals>
+							<property>/systems/thrust/state2</property>
+							<value>CL</value>
+						</equals>
+					</or>
 				</and>
 			</condition>
 		</enable>
@@ -374,6 +458,66 @@
 		</output>
 	</filter>
 	
+	<filter>
+		<name>IT-CONTROLLER: FEEDBACK IF DISABLED</name>
+		<debug>false</debug>
+		<type>gain</type>
+		<gain>1.0</gain>
+		<enable>
+			<condition>
+				<or>
+					<equals>
+						<property>/it-autoflight/output/athr</property>
+						<value>0</value>
+					</equals>
+					<and>
+						<not-equals>
+							<property>/systems/thrust/state1</property>
+							<value>MAN</value>
+						</not-equals>
+						<not-equals>
+							<property>/systems/thrust/state1</property>
+							<value>CL</value>
+						</not-equals>
+						<not-equals>
+							<property>/systems/thrust/state2</property>
+							<value>MAN</value>
+						</not-equals>
+						<not-equals>
+							<property>/systems/thrust/state2</property>
+							<value>CL</value>
+						</not-equals>
+					</and>
+				</or>
+			</condition>
+		</enable>
+		<input>
+			<condition>
+				<and>
+					<not-equals>
+						<property>/systems/thrust/state1</property>
+						<value>IDLE</value>
+					</not-equals>
+					<not-equals>
+						<property>/systems/thrust/state2</property>
+						<value>IDLE</value>
+					</not-equals>
+				</and>
+			</condition>
+			<value>1</value>
+		</input>
+		<input>0</input>
+		<output>
+			<property>/controls/engines/throttle-cmd-pid</property>
+		</output>
+		<min>
+			<property>/controls/engines/idle-limit</property>
+		</min>
+		<max>
+			<property>/controls/engines/throttle-pid-max</property>
+		</max>
+	</filter>
+	
 	<!-- Engine 1 -->
 	<filter>
 		<name>Thrust Filter 1</name>
diff --git a/revision.txt b/revision.txt
index 3a995431..980bf523 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4053
\ No newline at end of file
+4057
\ No newline at end of file