From aa0c077dcb1f884749d6df85822de92de66478d0 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Mon, 16 Oct 2017 22:04:03 -0400
Subject: [PATCH] A32X: Fix FMGC bugs, fix managed speed calculation

---
 Nasal/FMGC.nas     |  2 +-
 Systems/fmgc-b.xml | 10 +++-------
 revision.txt       |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Nasal/FMGC.nas b/Nasal/FMGC.nas
index 9d8c89fa..5c18c6db 100644
--- a/Nasal/FMGC.nas
+++ b/Nasal/FMGC.nas
@@ -212,7 +212,7 @@ var phasecheck = maketimer(0.2, func {
 		setprop("/systems/pressurization/mode", "TO");
 	}
 	
-	if ((alt <= cruiseft_b) and (phase == "1") and (phase != "4") and (mode != "SRS")) {
+	if ((alt <= cruiseft_b) and (phase == "1") and (phase != "4") and (mode == "OP CLB" or mode == "CLB" or (modeI == "V/S" and getprop("/it-autoflight/input/vs") >= 100))) {
 		setprop("/FMGC/status/phase", "2");
 		setprop("/systems/pressurization/mode", "TO");
 	} else if ((phase == 3 or phase == 4) and (mode == "OP CLB" or mode == "CLB" or (modeI == "V/S" and getprop("/it-autoflight/input/vs") >= 100))) {
diff --git a/Systems/fmgc-b.xml b/Systems/fmgc-b.xml
index efd264f2..d5e5653e 100644
--- a/Systems/fmgc-b.xml
+++ b/Systems/fmgc-b.xml
@@ -155,11 +155,7 @@
 		<input>
 			<expression>
 				<product>
-					<table>
-						<property>/instrumentation/altimeter/indicated-altitude-ft</property>
-						<entry><ind>10000</ind><dep>286</dep></entry>
-						<entry><ind>42000</ind><dep>249</dep></entry>
-					</table>
+					<value>266</value>
 					<table>
 						<property>/FMGC/internal/cost-index</property>
 						<entry><ind>  0</ind><dep>1.00</dep></entry>
@@ -181,8 +177,8 @@
 				<product>
 					<table>
 						<property>/instrumentation/altimeter/indicated-altitude-ft</property>
-						<entry><ind>26000</ind><dep>0.705</dep></entry>
-						<entry><ind>42000</ind><dep>0.815</dep></entry>
+						<entry><ind>20000</ind><dep>0.585</dep></entry>
+						<entry><ind>42000</ind><dep>0.825</dep></entry>
 					</table>
 					<table>
 						<property>/FMGC/internal/cost-index</property>
diff --git a/revision.txt b/revision.txt
index f91847e9..edaa2d42 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-2130
\ No newline at end of file
+2131
\ No newline at end of file