From 332bad0b47166c9dc36d25183b53cf482ed6706c Mon Sep 17 00:00:00 2001 From: Jonathan Redpath Date: Wed, 20 Feb 2019 16:35:33 +0000 Subject: [PATCH] Master caut now resets sound, disable DUAL FAIL for now. Ready to merge --- Models/FlightDeck/a320.flightdeck.xml | 4 ++++ Nasal/ECAM/ECAM-controller.nas | 1 + Nasal/ECAM/ECAM-logic.nas | 4 ++-- Systems/a320-ecam.xml | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index c2f702a2..259efaae 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -5329,6 +5329,10 @@ if (getprop("/it-autoflight/output/athr-warning") == 1) { setprop("/it-autoflight/output/athr-warning", 0); } + + if (getprop("/sim/sound/warnings/chime") == 1) { + setprop("/sim/sound/warnings/chime", 0); + } diff --git a/Nasal/ECAM/ECAM-controller.nas b/Nasal/ECAM/ECAM-controller.nas index 5d81ad02..43e11106 100644 --- a/Nasal/ECAM/ECAM-controller.nas +++ b/Nasal/ECAM/ECAM-controller.nas @@ -234,6 +234,7 @@ var ECAM_controller = { clear: func() { foreach (var w; warnings.vector) { if (w.active == 1) { + # if (w.msg == "ENG DUAL FAILURE") { continue; } w.clearFlag = 1; break; } diff --git a/Nasal/ECAM/ECAM-logic.nas b/Nasal/ECAM/ECAM-logic.nas index eb997bf2..dfac52e5 100644 --- a/Nasal/ECAM/ECAM-logic.nas +++ b/Nasal/ECAM/ECAM-logic.nas @@ -33,12 +33,12 @@ var messages_priority_3 = func { if (phaseVar >= 5 and phaseVar <= 7 and dualFailNode.getBoolValue()) { dualFail.active = 1; - } elsif (dualFailbatt.clearFlag == 1 and dualFail.clearFlag == 1) { + } elsif (dualFail.clearFlag == 1) { dualFail.active = 0; dualFail.noRepeat = 0; dualFail.clearFlag = 0; - dualFailFACActive = 1; + dualFailFACActive = 1; # reset FAC local variable } if (dualFail.active == 1) { diff --git a/Systems/a320-ecam.xml b/Systems/a320-ecam.xml index 6b6a6e84..ef902214 100644 --- a/Systems/a320-ecam.xml +++ b/Systems/a320-ecam.xml @@ -16,7 +16,7 @@ position/wow eq 0 /engines/engine[0]/n2 lt 60.9 /engines/engine[1]/n2 lt 60.9 - IAE --> + IAE position/wow eq 0 /engines/engine[0]/n2 lt 61.2 @@ -26,7 +26,7 @@ position/wow eq 0 fcs/engine-cutoff[0] eq 1 fcs/engine-cutoff[1] eq 1 - + -->