From d6e89fd26a72a2a53a917b82b88c68f2e8dbd438 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 8 Jul 2017 16:49:38 -0400
Subject: [PATCH] A3XX: Improve FBW Pitch axis, fix FMGC bug

---
 Nasal/FMGC-b.nas   |  9 ++++-----
 Systems/it-fbw.xml | 16 ++++++++--------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Nasal/FMGC-b.nas b/Nasal/FMGC-b.nas
index a7129dc1..a4b05c5a 100644
--- a/Nasal/FMGC-b.nas
+++ b/Nasal/FMGC-b.nas
@@ -148,11 +148,10 @@ var fmabox = func {
 		setprop("/it-autoflight/input/trk", 0);
 		setprop("/it-autoflight/input/lat", 3);
 		setprop("/it-autoflight/input/vert", 1);
-		setprop("/it-autoflight/input/vs", 0);
 		setprop("/it-autoflight/output/fma-pwr", 0);
 	} else {
 		setprop("/it-autoflight/input/trk", 0);
-		setprop("/it-autoflight/input/vs", 0);
+		setprop("/it-autoflight/input/vert", 1);
 		setprop("/it-autoflight/output/fma-pwr", 1);
 	}
 }
@@ -476,11 +475,11 @@ setlistener("/it-autoflight/input/kts-mach", func {
 		}
 	} else if (getprop("/it-autoflight/input/kts-mach") == 1) {
 		if (mach >= 0.50 and mach <= 0.95) {
-			setprop("/it-autoflight/input/spd-kts", math.round(mach, 0.001));
+			setprop("/it-autoflight/input/spd-mach", math.round(mach, 0.001));
 		} else if (mach < 0.50) {
-			setprop("/it-autoflight/input/spd-kts", 0.50);
+			setprop("/it-autoflight/input/spd-mach", 0.50);
 		} else if (mach > 0.95) {
-			setprop("/it-autoflight/input/spd-kts", 0.95);
+			setprop("/it-autoflight/input/spd-mach", 0.95);
 		}
 	}
 });
diff --git a/Systems/it-fbw.xml b/Systems/it-fbw.xml
index 2eadb23c..a88c5622 100644
--- a/Systems/it-fbw.xml
+++ b/Systems/it-fbw.xml
@@ -106,8 +106,8 @@
 					<property>/controls/flight/elevator</property>
 					<table>
 						<property>/position/gear-agl-ft</property> 
-						<entry><ind> 5</ind><dep>0.10</dep></entry>
-						<entry><ind>50</ind><dep>0.05</dep></entry>
+						<entry><ind> 5</ind><dep>0.12</dep></entry>
+						<entry><ind>50</ind><dep>0.07</dep></entry>
 					</table>
 				</sum>
             </expression>
@@ -571,9 +571,9 @@
 				<sum>
 					<table>
 						<property>/controls/flight/elevator-input</property> 
-						<entry><ind> 1</ind><dep>-7.0</dep></entry>
+						<entry><ind> 1</ind><dep>-6.0</dep></entry>
 						<entry><ind> 0</ind><dep> 0.0</dep></entry>
-						<entry><ind>-1</ind><dep> 7.0</dep></entry>
+						<entry><ind>-1</ind><dep> 6.0</dep></entry>
 					</table>
 					<product>
 						<table>
@@ -583,7 +583,7 @@
 						</table>
 						<table>
 							<property>/controls/flight/elevator-input</property> 
-							<entry><ind>1</ind><dep>7.0</dep></entry>
+							<entry><ind>1</ind><dep>6.0</dep></entry>
 							<entry><ind>0</ind><dep>0.0</dep></entry>
 						</table>
 					</product>
@@ -596,7 +596,7 @@
 						<table>
 							<property>/controls/flight/elevator-input</property> 
 							<entry><ind> 0</ind><dep> 0.0</dep></entry>
-							<entry><ind>-1</ind><dep>-7.0</dep></entry>
+							<entry><ind>-1</ind><dep>-6.0</dep></entry>
 						</table>
 					</product>
 				</sum>
@@ -612,9 +612,9 @@
             <expression>
 				<table>
 					<property>/controls/flight/elevator-input</property> 
-					<entry><ind> 1</ind><dep>-7.0</dep></entry>
+					<entry><ind> 1</ind><dep>-6.0</dep></entry>
 					<entry><ind> 0</ind><dep> 0.0</dep></entry>
-					<entry><ind>-1</ind><dep> 7.0</dep></entry>
+					<entry><ind>-1</ind><dep> 6.0</dep></entry>
 				</table>
             </expression>
         </input>