From 76c937d1818bf6793ef433b9fdcd702d71689b47 Mon Sep 17 00:00:00 2001
From: Joshua Davidson <joshuadavidson2000@gmail.com>
Date: Sat, 16 Mar 2019 22:44:34 -0400
Subject: [PATCH] System: Fix severe mistake in FMGC -- thanks PavlinS + 0762

---
 Nasal/FMGC-b.nas    | 17 +++++++++--------
 Nasal/libraries.nas |  4 +---
 revision.txt        |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Nasal/FMGC-b.nas b/Nasal/FMGC-b.nas
index e3168011..e34e60ea 100644
--- a/Nasal/FMGC-b.nas
+++ b/Nasal/FMGC-b.nas
@@ -86,8 +86,8 @@ var Input = {
 	altDiff: 0,
 	bankLimitSW: props.globals.initNode("/it-autoflight/input/bank-limit-sw", 0, "INT"),
 	bankLimitSWTemp: 0,
-	fd1: props.globals.initNode("/it-autoflight/input/fd1", 0, "BOOL"),
-	fd2: props.globals.initNode("/it-autoflight/input/fd2", 0, "BOOL"),
+	fd1: props.globals.initNode("/it-autoflight/input/fd1", 1, "BOOL"),
+	fd2: props.globals.initNode("/it-autoflight/input/fd2", 1, "BOOL"),
 	fpa: props.globals.initNode("/it-autoflight/input/fpa", 0, "DOUBLE"),
 	hdg: props.globals.initNode("/it-autoflight/input/hdg", 0, "INT"),
 	ias: props.globals.initNode("/it-autoflight/input/spd-kts", 250, "INT"),
@@ -133,9 +133,9 @@ var Output = {
 	apprArm: props.globals.initNode("/it-autoflight/output/appr-armed", 0, "BOOL"),
 	athr: props.globals.initNode("/it-autoflight/output/athr", 0, "BOOL"),
 	athrTemp: 0,
-	fd1: props.globals.initNode("/it-autoflight/output/fd1", 0, "BOOL"),
+	fd1: props.globals.initNode("/it-autoflight/output/fd1", 1, "BOOL"),
 	fd1Temp: 0,
-	fd2: props.globals.initNode("/it-autoflight/output/fd2", 0, "BOOL"),
+	fd2: props.globals.initNode("/it-autoflight/output/fd2", 1, "BOOL"),
 	fd2Temp: 0,
 	lat: props.globals.initNode("/it-autoflight/output/lat", 5, "INT"),
 	latTemp: 5,
@@ -191,8 +191,8 @@ var ITAF = {
 		Input.ap1.setBoolValue(0);
 		Input.ap2.setBoolValue(0);
 		Input.athr.setBoolValue(0);
-		Input.fd1.setBoolValue(0);
-		Input.fd2.setBoolValue(0);
+		Input.fd1.setBoolValue(1);
+		Input.fd2.setBoolValue(1);
 		Input.hdg.setValue(360);
 		Input.alt.setValue(10000);
 		Input.vs.setValue(0);
@@ -206,8 +206,8 @@ var ITAF = {
 		Output.ap1.setBoolValue(0);
 		Output.ap2.setBoolValue(0);
 		Output.athr.setBoolValue(0);
-		Output.fd1.setBoolValue(0);
-		Output.fd2.setBoolValue(0);
+		Output.fd1.setBoolValue(1);
+		Output.fd2.setBoolValue(1);
 		Output.lnavArm.setBoolValue(0);
 		Output.locArm.setBoolValue(0);
 		Output.apprArm.setBoolValue(0);
@@ -859,6 +859,7 @@ var ITAF = {
 		if (!Output.ap1.getBoolValue() and !Output.ap2.getBoolValue() and !Output.fd1.getBoolValue() and !Output.fd2.getBoolValue()) {
 			me.setLatMode(9);
 			me.setVertMode(9);
+			me.setLatArm(0);
 			Custom.Output.fmaPower.setBoolValue(0);
 		} else {
 			Custom.Output.fmaPower.setBoolValue(1);
diff --git a/Nasal/libraries.nas b/Nasal/libraries.nas
index c70d1426..994282a0 100644
--- a/Nasal/libraries.nas
+++ b/Nasal/libraries.nas
@@ -192,15 +192,13 @@ var systemsInit = func {
 	systems.fire_init();
 	systems.autobrake_init();
 	fadec.FADEC.init();
-  	fmgc.ITAF.init();
+	fmgc.ITAF.init();
 	fmgc.FMGCinit();
 	mcdu.MCDU_init(0);
 	mcdu.MCDU_init(1);
 	systemsLoop.start();
 	icing.icingInit();
 	lightsLoop.start();
-	setprop("/it-autoflight/input/fd1", 1);
-	setprop("/it-autoflight/input/fd2", 1);
 	libraries.ECAM.init();
 	libraries.BUTTONS.init();
 	libraries.variousReset();
diff --git a/revision.txt b/revision.txt
index a25be74c..c82e6423 100644
--- a/revision.txt
+++ b/revision.txt
@@ -1 +1 @@
-4782
\ No newline at end of file
+4783
\ No newline at end of file