From aae575169ba9067d5a5dfd7eb8b5cf402878e884 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Wed, 7 Nov 2018 00:01:11 -0500
Subject: [PATCH] Control: Fix FBW Pitch CStar oscilation

---
 Systems/fbw-pitch.xml | 32 ++++++++++++++++++++------------
 revision.txt          |  2 +-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Systems/fbw-pitch.xml b/Systems/fbw-pitch.xml
index 3247bd11..c17033c7 100644
--- a/Systems/fbw-pitch.xml
+++ b/Systems/fbw-pitch.xml
@@ -6,7 +6,7 @@
 ##############################################
 -->
 
-<!-- Airbus A320 FBW System -->
+<!-- Airbus A3XX FBW System -->
 <!-- Joshua Davidson (it0uchpods) -->
 <!-- I didn't see an easy way to do this controller in JSBsim, so I keep it here -->
 
@@ -15,17 +15,19 @@
 	<pi-simple-controller>
 		<name>FBW PITCH G PI</name>
 		<debug>false</debug>
-		<input>
-			<property>/fdm/jsbsim/fbw/pitch/g-error</property>
-		</input>
-		<reference>
-			<value>0</value>
-		</reference>
-		<output>
-			<property>/fdm/jsbsim/fbw/pitch/g-pi</property>
-		</output>
+		<input>/fdm/jsbsim/fbw/pitch/g-error</input>
+		<reference>0</reference>
+		<output>/fdm/jsbsim/fbw/pitch/g-pi</output>
 		<config>
-			<Kp>-1.5</Kp>
+			<Kp>
+				<expression>
+					<table>
+						<property>/fdm/jsbsim/velocities/vc-kts</property>
+						<entry><ind>140</ind><dep>-1.5</dep></entry>
+						<entry><ind>350</ind><dep>-0.6</dep></entry>
+					</table>
+				</expression>
+			</Kp>
 			<Ki>
 				<condition>
 					<and>
@@ -45,7 +47,13 @@
 						</or>
 					</and>
 				</condition>
-				<value>-1.5</value>
+				<expression>
+					<table>
+						<property>/fdm/jsbsim/velocities/vc-kts</property>
+						<entry><ind>140</ind><dep>-1.5</dep></entry>
+						<entry><ind>350</ind><dep>-0.6</dep></entry>
+					</table>
+				</expression>
 			</Ki>
 			<Ki>0.0</Ki>
 			<min>
diff --git a/revision.txt b/revision.txt
index 4a57c83e..421c7926 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4690
\ No newline at end of file
+4691
\ No newline at end of file