From 5651f349bf6909e2d586db25fdab881534029a13 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Tue, 20 Jun 2017 14:56:14 -0400
Subject: [PATCH] A3XX: New VOR/LOC system, much better handling

---
 A320-main.xml                 |  2 +-
 Systems/a320-aerodynamics.xml |  2 +-
 Systems/fcs.xml               |  4 ++--
 Systems/fmgc-roll-yaw.xml     | 18 +++++++-----------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 30f2db4f..f598751d 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -308,7 +308,7 @@
 		<cmd>
 			<roll-kp>-0.9</roll-kp>
 			<roll-scale>1.6</roll-scale>
-			<vorloc>-4.0</vorloc>
+			<vorloc>-2.8</vorloc>
 			<vs>0.01</vs>
 			<fpa>0.30</fpa>
 		</cmd>
diff --git a/Systems/a320-aerodynamics.xml b/Systems/a320-aerodynamics.xml
index ebda9b4c..194d97df 100644
--- a/Systems/a320-aerodynamics.xml
+++ b/Systems/a320-aerodynamics.xml
@@ -257,7 +257,7 @@
 				<property>metrics/Sw-sqft</property>
 				<property>metrics/bw-ft</property>
 				<property>fcs/rudder-pos-rad</property>
-				<value>0.003</value>
+				<value>0.002</value>
 			</product>
 		</function>
 
diff --git a/Systems/fcs.xml b/Systems/fcs.xml
index 77a21537..1d4af61f 100644
--- a/Systems/fcs.xml
+++ b/Systems/fcs.xml
@@ -42,7 +42,7 @@
 
 	<aerosurface_scale name="Left Aileron Control">
 		<input>fcs/roll-trim-sum</input>
-		<gain>0.02</gain>
+		<gain>0.022</gain>
 		<range>
 		<min>-15</min>
 		<max>15</max>
@@ -52,7 +52,7 @@
 
 	<aerosurface_scale name="Right Aileron Control">
 		<input>-fcs/roll-trim-sum</input>
-		<gain>0.02</gain>
+		<gain>0.022</gain>
 		<range>
 		<min>-15</min>
 		<max>15</max>
diff --git a/Systems/fmgc-roll-yaw.xml b/Systems/fmgc-roll-yaw.xml
index 50545188..bf4a7048 100644
--- a/Systems/fmgc-roll-yaw.xml
+++ b/Systems/fmgc-roll-yaw.xml
@@ -72,7 +72,7 @@
 		</config>
 	</pi-simple-controller>
 	
-	<pid-controller>
+	<pi-simple-controller>
 		<name>VORLOC TRK</name>
 		<debug>false</debug>
 		<enable>
@@ -131,20 +131,16 @@
 			<Kp>
 				<property>/it-autoflight/config/cmd/vorloc</property>
 			</Kp>
-			<beta>1.0</beta>	
-			<alpha>0.1</alpha>	
-			<gamma>0.0</gamma>		
-			<Ti>10.0</Ti>      
-			<Td>0.00001</Td>   	
-			<u_min>
+			<Ki>0.0001</Ki>
+			<min>
 				<property>/it-autoflight/internal/bank-limit</property>
 				<scale>-1</scale>
-			</u_min>
-			<u_max>
+			</min>
+			<max>
 				<property>/it-autoflight/internal/bank-limit</property>
-			</u_max>
+			</max>
 		</config>
-	</pid-controller>
+	</pi-simple-controller>
 
 	<filter>
 		<name>ROLL DEG SYNC</name>