From 263a73b665ec33119ad065fd64a4eff9bbd2211b Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 25 Jul 2018 16:30:45 -0400
Subject: [PATCH] Control: AP bugfix, and improve something in A/THR

---
 Systems/fmgc-pitch.xml  | 28 ++++++++++++----------------
 Systems/fmgc-thrust.xml | 18 ++++--------------
 revision.txt            |  2 +-
 3 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/Systems/fmgc-pitch.xml b/Systems/fmgc-pitch.xml
index a3568c22..ed8a1e6e 100644
--- a/Systems/fmgc-pitch.xml
+++ b/Systems/fmgc-pitch.xml
@@ -628,15 +628,13 @@
 					</not-equals>
 				</condition>
 				<expression>
-					<dif>
-						<table>
+					<max>
+						<dif>
 							<property>/orientation/pitch-deg</property>
-							<entry><ind>-10</ind><dep>-5</dep></entry>
-							<entry><ind>  0</ind><dep> 0</dep></entry>
-							<entry><ind> 30</ind><dep>35</dep></entry>
-						</table>
-						<value>5</value>
-					</dif>
+							<value>5</value>
+						</dif>
+						<value>-10</value>
+					</max>
 				</expression>
 			</u_min>
 			<u_min>
@@ -662,15 +660,13 @@
 					</and>
 				</condition>
 				<expression>
-					<sum>
-						<table>
+					<min>
+						<sum>
 							<property>/orientation/pitch-deg</property>
-							<entry><ind>-10</ind><dep>-15</dep></entry>
-							<entry><ind>  0</ind><dep>  0</dep></entry>
-							<entry><ind> 30</ind><dep> 25</dep></entry>
-						</table>
-						<value>5</value>
-					</sum>
+							<value>5</value>
+						</sum>
+						<value>30</value>
+					</min>
 				</expression>
 			</u_max>
 			<u_max>
diff --git a/Systems/fmgc-thrust.xml b/Systems/fmgc-thrust.xml
index cee59197..4bb11f75 100644
--- a/Systems/fmgc-thrust.xml
+++ b/Systems/fmgc-thrust.xml
@@ -133,22 +133,12 @@
 		<type>gain</type>
 		<gain>1.0</gain>
 		<input>
-			<condition>
-				<greater-than-equals>
+			<expression>
+				<max>
 					<property>/controls/engines/engine[0]/throttle-man</property>
 					<property>/controls/engines/engine[1]/throttle-man</property>
-				</greater-than-equals>
-			</condition>
-			<property>/controls/engines/engine[0]/throttle-man</property>
-		</input>
-		<input>
-			<condition>
-				<less-than>
-					<property>/controls/engines/engine[0]/throttle-man</property>
-					<property>/controls/engines/engine[1]/throttle-man</property>
-				</less-than>
-			</condition>
-			<property>/controls/engines/engine[1]/throttle-man</property>
+				</max>
+			</expression>
 		</input>
 		<output>/controls/engines/throttle-pid-max</output>
 	</filter>
diff --git a/revision.txt b/revision.txt
index f203d38e..cd63255e 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4613
\ No newline at end of file
+4614
\ No newline at end of file