Master caut now resets sound, disable DUAL FAIL for now. Ready to merge

This commit is contained in:
Jonathan Redpath 2019-02-20 16:35:33 +00:00
parent ba850ae0e9
commit 332bad0b47
4 changed files with 9 additions and 4 deletions

View file

@ -5329,6 +5329,10 @@
if (getprop("/it-autoflight/output/athr-warning") == 1) { if (getprop("/it-autoflight/output/athr-warning") == 1) {
setprop("/it-autoflight/output/athr-warning", 0); setprop("/it-autoflight/output/athr-warning", 0);
} }
if (getprop("/sim/sound/warnings/chime") == 1) {
setprop("/sim/sound/warnings/chime", 0);
}
</script> </script>
</binding> </binding>
</action> </action>

View file

@ -234,6 +234,7 @@ var ECAM_controller = {
clear: func() { clear: func() {
foreach (var w; warnings.vector) { foreach (var w; warnings.vector) {
if (w.active == 1) { if (w.active == 1) {
# if (w.msg == "ENG DUAL FAILURE") { continue; }
w.clearFlag = 1; w.clearFlag = 1;
break; break;
} }

View file

@ -33,12 +33,12 @@ var messages_priority_3 = func {
if (phaseVar >= 5 and phaseVar <= 7 and dualFailNode.getBoolValue()) { if (phaseVar >= 5 and phaseVar <= 7 and dualFailNode.getBoolValue()) {
dualFail.active = 1; dualFail.active = 1;
} elsif (dualFailbatt.clearFlag == 1 and dualFail.clearFlag == 1) { } elsif (dualFail.clearFlag == 1) {
dualFail.active = 0; dualFail.active = 0;
dualFail.noRepeat = 0; dualFail.noRepeat = 0;
dualFail.clearFlag = 0; dualFail.clearFlag = 0;
dualFailFACActive = 1; dualFailFACActive = 1; # reset FAC local variable
} }
if (dualFail.active == 1) { if (dualFail.active == 1) {

View file

@ -16,7 +16,7 @@
position/wow eq 0 position/wow eq 0
/engines/engine[0]/n2 lt 60.9 /engines/engine[0]/n2 lt 60.9
/engines/engine[1]/n2 lt 60.9 /engines/engine[1]/n2 lt 60.9
</test> IAE --> </test> IAE
<test logic="AND" value="1"> <test logic="AND" value="1">
position/wow eq 0 position/wow eq 0
/engines/engine[0]/n2 lt 61.2 /engines/engine[0]/n2 lt 61.2
@ -26,7 +26,7 @@
position/wow eq 0 position/wow eq 0
fcs/engine-cutoff[0] eq 1 fcs/engine-cutoff[0] eq 1
fcs/engine-cutoff[1] eq 1 fcs/engine-cutoff[1] eq 1
</test> </test>-->
</switch> </switch>
</channel> </channel>