fly/A320-family
1
0
Fork 0
Code Activity

Control: Add thrlock logic

Browse source
This commit is contained in:
Josh Davidson 2021-04-27 08:34:07 -04:00
parent 89b5590d01
commit 694c2ea795
3 changed files with 100 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Nasal/FMGC/FCU.nas
View file

@ -512,7 +512,7 @@ var apOff = func(type, side) {
var athrOff = func(type) { var athrOff = func(type) {
if (athrInput.getValue() == 1) { if (athrInput.getValue() == 1) {
if (type == "hard") { if (type == "hard") {
fadec.lockThr(); systems.lockThr();
} }
athrInput.setValue(0); athrInput.setValue(0);
ecam.doAthrWarn(type); ecam.doAthrWarn(type);

94
Nasal/Systems/fadec-common.nas
View file

@ -30,7 +30,6 @@ var FADEC = {
Lock: { Lock: {
thrLockAlert: props.globals.getNode("/fdm/jsbsim/fadec/thr-locked-alert"), thrLockAlert: props.globals.getNode("/fdm/jsbsim/fadec/thr-locked-alert"),
thrLockCmd: props.globals.getNode("/fdm/jsbsim/fadec/thr-locked"), thrLockCmd: props.globals.getNode("/fdm/jsbsim/fadec/thr-locked"),
thrLockCmdN1: [props.globals.getNode("/fdm/jsbsim/fadec/thr-lock-cmd[0]"), props.globals.getNode("/fdm/jsbsim/fadec/thr-lock-cmd[1]")],
thrLockFlash: props.globals.getNode("/fdm/jsbsim/fadec/thr-locked-flash"), thrLockFlash: props.globals.getNode("/fdm/jsbsim/fadec/thr-locked-flash"),
thrLockTime: props.globals.getNode("/fdm/jsbsim/fadec/thr-locked-time"), thrLockTime: props.globals.getNode("/fdm/jsbsim/fadec/thr-locked-time"),
}, },
@ -187,3 +186,96 @@ setlistener("/fdm/jsbsim/fadec/control-2/detent", func() {
setlistener("/fdm/jsbsim/fadec/limit/active-mode-int", func() { setlistener("/fdm/jsbsim/fadec/limit/active-mode-int", func() {
FADEC.updateTxt(); FADEC.updateTxt();
}, 0, 0); }, 0, 0);
var lockThr = func() {
state1 = systems.FADEC.detentText[0].getValue();
state2 = systems.FADEC.detentText[1].getValue();
if ((state1 == "CL" and state2 == "CL" and !systems.FADEC.engOut.getValue()) or (state1 == "MCT" and state2 == "MCT" and systems.FADEC.engOut.getValue())) {
FADEC.Lock.thrLockTime.setValue(pts.Sim.Time.elapsedSec.getValue());
FADEC.Lock.thrLockCmd.setValue(1);
lockTimer.start();
}
}
var checkLockThr = func() {
if (FADEC.Lock.thrLockTime.getValue() + 5 > pts.Sim.Time.elapsedSec.getValue()) { return; }
if (fmgc.Output.athr.getBoolValue()) {
lockTimer.stop();
FADEC.Lock.thrLockCmd.setValue(0);
FADEC.Lock.thrLockAlert.setValue(0);
FADEC.Lock.thrLockTime.setValue(0);
FADEC.Lock.thrLockFlash.setValue(0);
return;
}
if (!FADEC.Lock.thrLockCmd.getValue()) {
lockTimer.stop();
FADEC.Lock.thrLockCmd.setValue(0);
FADEC.Lock.thrLockAlert.setValue(0);
FADEC.Lock.thrLockTime.setValue(0);
FADEC.Lock.thrLockFlash.setValue(0);
return;
}
state1 = systems.FADEC.detentText[0].getValue();
state2 = systems.FADEC.detentText[1].getValue();
if ((state1 != "CL" and state2 != "CL" and !systems.FADEC.engOut.getValue()) or (state1 != "MCT" and state2 != "MCT" and systems.FADEC.engOut.getValue())) {
lockTimer.stop();
FADEC.Lock.thrLockCmd.setValue(0);
FADEC.Lock.thrLockAlert.setValue(0);
FADEC.Lock.thrLockTime.setValue(0);
FADEC.Lock.thrLockFlash.setValue(0);
} elsif ((state1 == "CL" and state2 == "CL" and !systems.FADEC.engOut.getValue()) or (state1 == "MCT" and state2 == "MCT" and systems.FADEC.engOut.getValue())) {
FADEC.Lock.thrLockAlert.setValue(1);
FADEC.Lock.thrLockTime.setValue(pts.Sim.Time.elapsedSec.getValue());
FADEC.Lock.thrLockFlash.setValue(1);
lockTimer.stop();
lockTimer2.start();
}
}
var checkLockThr2 = func() {
if (fmgc.Output.athr.getBoolValue()) {
lockTimer2.stop();
FADEC.Lock.thrLockCmd.setValue(0);
FADEC.Lock.thrLockAlert.setValue(0);
FADEC.Lock.thrLockTime.setValue(0);
FADEC.Lock.thrLockFlash.setValue(0);
return;
}
if (!FADEC.Lock.thrLockCmd.getValue()) {
lockTimer2.stop();
FADEC.Lock.thrLockCmd.setValue(0);
FADEC.Lock.thrLockAlert.setValue(0);
FADEC.Lock.thrLockTime.setValue(0);
FADEC.Lock.thrLockFlash.setValue(0);
return;
}
if (FADEC.Lock.thrLockTime.getValue() + 5 < pts.Sim.Time.elapsedSec.getValue()) {
FADEC.Lock.thrLockFlash.setValue(0);
settimer(func() {
FADEC.Lock.thrLockFlash.setValue(1);
FADEC.Lock.thrLockTime.setValue(pts.Sim.Time.elapsedSec.getValue());
ecam.athr_lock.noRepeat = 0;
ecam.athr_lock.noRepeat2 = 0;
}, 0.2);
}
state1 = systems.FADEC.detentText[0].getValue();
state2 = systems.FADEC.detentText[1].getValue();
if ((state1 != "CL" and state2 != "CL" and !systems.FADEC.engOut.getValue()) or (state1 != "MCT" and state2 != "MCT" and systems.FADEC.engOut.getValue())) {
lockTimer2.stop();
FADEC.Lock.thrLockCmd.setValue(0);
FADEC.Lock.thrLockAlert.setValue(0);
FADEC.Lock.thrLockFlash.setValue(0);
FADEC.Lock.thrLockTime.setValue(0);
}
}
var lockTimer = maketimer(0.1, checkLockThr);
var lockTimer2 = maketimer(0.1, checkLockThr2);

6
Systems/a320-cfm56-5b4-engine-fadec.xml
View file

@ -1152,6 +1152,9 @@
<test value="fadec/reverse-1/throttle-rev"> <test value="fadec/reverse-1/throttle-rev">
fadec/reverse-1/position-norm ne 0 fadec/reverse-1/position-norm ne 0
</test> </test>
<test value="fadec/control-1/throttle-output">
fadec/thr-locked eq 1
</test>
<test value="fadec/athr/output"> <test value="fadec/athr/output">
fadec/athr/active eq 1 fadec/athr/active eq 1
</test> </test>
@ -1180,6 +1183,9 @@
<test value="fadec/reverse-2/throttle-rev"> <test value="fadec/reverse-2/throttle-rev">
fadec/reverse-2/position-norm ne 0 fadec/reverse-2/position-norm ne 0
</test> </test>
<test value="fadec/control-2/throttle-output">
fadec/thr-locked eq 1
</test>
<test value="fadec/athr/output"> <test value="fadec/athr/output">
fadec/athr/active eq 1 fadec/athr/active eq 1
</test> </test>