1
0
Fork 0

Merge branch 'dev' into 3D

This commit is contained in:
Jonathan Redpath 2022-05-11 15:37:02 +01:00
commit a8c3b24aae
2 changed files with 5 additions and 0 deletions

View file

@ -24,6 +24,7 @@ var ELEC = {
acEssBusFault: props.globals.getNode("/systems/failures/electrical/ac-ess-bus"),
ac1BusFault: props.globals.getNode("/systems/failures/electrical/ac-1-bus"),
ac2BusFault: props.globals.getNode("/systems/failures/electrical/ac-2-bus"),
dcBatBusFault: props.globals.getNode("/systems/failures/electrical/dc-bat-bus"),
dcEssBusFault: props.globals.getNode("/systems/failures/electrical/dc-ess-bus"),
dc1BusFault: props.globals.getNode("/systems/failures/electrical/dc-1-bus"),
dc2BusFault: props.globals.getNode("/systems/failures/electrical/dc-2-bus"),
@ -180,6 +181,7 @@ var ELEC = {
me.Fail.acEssBusFault.setBoolValue(0);
me.Fail.ac1BusFault.setBoolValue(0);
me.Fail.ac2BusFault.setBoolValue(0);
me.Fail.dcBatBusFault.setBoolValue(0);
me.Fail.dcEssBusFault.setBoolValue(0);
me.Fail.dc1BusFault.setBoolValue(0);
me.Fail.dc2BusFault.setBoolValue(0);

View file

@ -1991,6 +1991,9 @@
<switch name="/systems/electrical/bus/dc-bat">
<default value="0"/>
<test logic="AND" value="0">
/systems/failures/electrical/dc-bat-bus eq 1
</test>
<test logic="AND" value="/systems/electrical/relay/dc-bat-tie-dc-1/output-tie">
/systems/electrical/bus/dc-bat-src eq 1
</test>