From db1d6c151f2698d2ecbb3f83364aa10e082032a4 Mon Sep 17 00:00:00 2001 From: Josh Davidson Date: Tue, 13 Aug 2019 17:35:23 -0400 Subject: [PATCH 1/3] System: Fix FMGC bugs --- Nasal/FMGC-b.nas | 14 ++++++++------ revision.txt | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Nasal/FMGC-b.nas b/Nasal/FMGC-b.nas index 460fc224..6ecacadb 100644 --- a/Nasal/FMGC-b.nas +++ b/Nasal/FMGC-b.nas @@ -331,13 +331,13 @@ var ITAF = { if (Internal.altTemp >= Position.indicatedAltitudeFtTemp) { Output.thrMode.setValue(2); Text.thr.setValue("PITCH"); - if (Internal.flchActive) { + if (Internal.flchActive) { # Set before mode change to prevent it from overwriting by mistake Text.vert.setValue("SPD CLB"); } } else { Output.thrMode.setValue(1); Text.thr.setValue("PITCH"); - if (Internal.flchActive) { + if (Internal.flchActive) { # Set before mode change to prevent it from overwriting by mistake Text.vert.setValue("SPD DES"); } } @@ -649,10 +649,12 @@ var ITAF = { Text.vert.setValue("ALT CAP"); } else if (n == 4) { # FLCH Output.apprArm.setBoolValue(0); - Output.vert.setValue(1); - Internal.alt.setValue(Input.alt.getValue()); - Internal.altDiff = Internal.alt.getValue() - Position.indicatedAltitudeFt.getValue(); - if (abs(Internal.altDiff) >= 250) { # SPD CLB or SPD DES + if (abs(Input.altDiff) >= 125) { # SPD CLB or SPD DES + if (Input.alt.getValue() >= Position.indicatedAltitudeFt.getValue()) { # Usually set Thrust Mode Selector, but we do it now due to timer lag + Text.vert.setValue("SPD CLB"); + } else { + Text.vert.setValue("SPD DES"); + } Internal.altCaptureActive = 0; Output.vert.setValue(4); Internal.flchActive = 1; diff --git a/revision.txt b/revision.txt index c04b365d..1488adde 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4802 \ No newline at end of file +4803 \ No newline at end of file From 1e755b1f5718f7e0242206612c1b42e322de20f4 Mon Sep 17 00:00:00 2001 From: Josh Davidson Date: Sun, 18 Aug 2019 16:17:58 -0400 Subject: [PATCH 2/3] Sim: Fix some fucking bullshit --- A320-100-CFM-set.xml | 7 +++++++ A320-200-CFM-set.xml | 7 +++++++ A320-200-IAE-set.xml | 7 +++++++ A320neo-CFM-set.xml | 7 +++++++ A320neo-PW-set.xml | 7 +++++++ revision.txt | 2 +- 6 files changed, 36 insertions(+), 1 deletion(-) diff --git a/A320-100-CFM-set.xml b/A320-100-CFM-set.xml index d93d2dfe..137d39e6 100644 --- a/A320-100-CFM-set.xml +++ b/A320-100-CFM-set.xml @@ -21,6 +21,13 @@ + + 4 + 5 + 5 + 4 + + exterior diff --git a/A320-200-CFM-set.xml b/A320-200-CFM-set.xml index 51409507..ae431ba5 100644 --- a/A320-200-CFM-set.xml +++ b/A320-200-CFM-set.xml @@ -21,6 +21,13 @@ + + 4 + 5 + 5 + 4 + + exterior diff --git a/A320-200-IAE-set.xml b/A320-200-IAE-set.xml index c097fe18..9b02aff7 100644 --- a/A320-200-IAE-set.xml +++ b/A320-200-IAE-set.xml @@ -21,6 +21,13 @@ + + 4 + 5 + 5 + 4 + + exterior diff --git a/A320neo-CFM-set.xml b/A320neo-CFM-set.xml index 53dde178..30fac2aa 100644 --- a/A320neo-CFM-set.xml +++ b/A320neo-CFM-set.xml @@ -21,6 +21,13 @@ + + 4 + 5 + 5 + 4 + + exterior diff --git a/A320neo-PW-set.xml b/A320neo-PW-set.xml index 18c07c08..ee228fe0 100644 --- a/A320neo-PW-set.xml +++ b/A320neo-PW-set.xml @@ -21,6 +21,13 @@ + + 4 + 5 + 5 + 4 + + exterior diff --git a/revision.txt b/revision.txt index 1488adde..bbeee9cd 100644 --- a/revision.txt +++ b/revision.txt @@ -1 +1 @@ -4803 \ No newline at end of file +4804 \ No newline at end of file From 7d25b847620435b7f832ef110360a08e8dfb1571 Mon Sep 17 00:00:00 2001 From: Josh Davidson Date: Sun, 18 Aug 2019 16:20:52 -0400 Subject: [PATCH 3/3] Sim: Get out --- A320-main.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/A320-main.xml b/A320-main.xml index 7c36ee4c..19fe825a 100644 --- a/A320-main.xml +++ b/A320-main.xml @@ -9,13 +9,6 @@ Pre V1.0 - - 4 - 5 - 5 - 4 - - false false