Merge branch 'dev' into preflight
This commit is contained in:
commit
f6cde90ca4
2 changed files with 2 additions and 6 deletions
|
@ -663,7 +663,7 @@ var messages_priority_3 = func {
|
||||||
if (gearNotDownLocked.clearFlag == 0 and warningNodes.Logic.gearNotDownLocked.getBoolValue() and phaseVar3 != 3 and phaseVar3 != 4 and phaseVar3 != 5 and phaseVar3 != 8) {
|
if (gearNotDownLocked.clearFlag == 0 and warningNodes.Logic.gearNotDownLocked.getBoolValue() and phaseVar3 != 3 and phaseVar3 != 4 and phaseVar3 != 5 and phaseVar3 != 8) {
|
||||||
gearNotDownLocked.active = 1;
|
gearNotDownLocked.active = 1;
|
||||||
|
|
||||||
if (gearNotDownLockedRec.clearFlag == 0 and !warningNodes.Logic.gearNotDownLockedFlipflop.getBoolValue()) {
|
if (gearNotDownLockedRec.clearFlag == 0 and warningNodes.Logic.gearNotDownLockedFlipflop.getValue() == 0) {
|
||||||
gearNotDownLockedRec.active = 1;
|
gearNotDownLockedRec.active = 1;
|
||||||
gearNotDownLockedWork.active = 1;
|
gearNotDownLockedWork.active = 1;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -2328,11 +2328,7 @@
|
||||||
<test logic="AND" value="1">
|
<test logic="AND" value="1">
|
||||||
/ECAM/warnings/fctl/gear-lever-down-pulse eq 1
|
/ECAM/warnings/fctl/gear-lever-down-pulse eq 1
|
||||||
/ECAM/warnings/fctl/gear-lever-down eq 1
|
/ECAM/warnings/fctl/gear-lever-down eq 1
|
||||||
<test logic="OR">
|
/ECAM/warnings/fctl/gear-not-down-locked eq 1
|
||||||
/gear/gear[0]/position-norm ne 1
|
|
||||||
/gear/gear[1]/position-norm ne 1
|
|
||||||
/gear/gear[2]/position-norm ne 1
|
|
||||||
</test>
|
|
||||||
</test>
|
</test>
|
||||||
</switch>
|
</switch>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue