From ba6591faf9c603077448a6a3e919308779870c5a Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 20 Oct 2018 13:03:31 -0400
Subject: [PATCH] Control: Fix A/P Yaw Axis

---
 Systems/fmgc-roll-yaw.xml | 36 +++++++++++++++++-------------------
 revision.txt              |  2 +-
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml
index 71b1e2b0..fa3398f4 100644
--- a/Systems/fmgc-roll-yaw.xml
+++ b/Systems/fmgc-roll-yaw.xml
@@ -250,21 +250,7 @@
 				</condition>
 				<value>-0.05</value>
 			</Kp>
-			<Kp>
-				<condition>
-					<or>
-						<equals>
-							<property>/gear/gear[1]/wow</property>
-							<value>1</value>
-						</equals>
-						<equals>
-							<property>/gear/gear[2]/wow</property>
-							<value>1</value>
-						</equals>
-					</or>
-				</condition>
-				<value>-0.02</value>
-			</Kp>
+			<Kp>-0.02</Kp>
 			<Ki>0</Ki>
 		</config>
 		<min>-0.15</min>
@@ -279,10 +265,22 @@
 		<initialize-to>output</initialize-to>
 		<input>
 			<condition>
-				<equals>
-					<property>/it-autoflight/output/lat</property>
-					<value>4</value>
-				</equals>
+				<and>
+					<or>
+						<equals>
+							<property>/it-autoflight/output/ap1</property>
+							<value>1</value>
+						</equals>
+						<equals>
+							<property>/it-autoflight/output/ap2</property>
+							<value>1</value>
+						</equals>
+					</or>
+					<equals>
+						<property>/it-autoflight/output/lat</property>
+						<value>4</value>
+					</equals>
+				</and>
 			</condition>
 			<property>/it-autoflight/internal/rudder-cmd</property>
 		</input>
diff --git a/revision.txt b/revision.txt
index 5d3c1d34..607f57d7 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4680
\ No newline at end of file
+4681
\ No newline at end of file