fly/A320-family
1
0
Fork 0
Code Activity

ELEC ECAM page: fix galley indications

Browse source
This commit is contained in:
legoboyvdlp R 2020-05-22 22:04:31 +01:00
parent 1e90784da2
commit b9812c92c4
2 changed files with 58 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Models/Instruments/Lower-ECAM/Lower-ECAM.nas
View file

@ -152,7 +152,7 @@ var gen1_hz = props.globals.getNode("/systems/electrical/sources/idg-1/output-he
var gen2_hz = props.globals.getNode("/systems/electrical/sources/idg-2/output-hertz", 1);
var ext_volts = props.globals.getNode("/systems/electrical/sources/ext/output-volt", 1);
var ext_hz = props.globals.getNode("/systems/electrical/sources/ext/output-hertz", 1);
var galleyshed = props.globals.getNode("/systems/electrical/extra/galleyshed", 1);
var galleyshed = props.globals.getNode("/systems/electrical/some-electric-thingie/galley-shed", 1);
var switch_galley = props.globals.getNode("/controls/electrical/switches/galley", 1);
var dcbat = props.globals.getNode("/systems/electrical/bus/dc-bat", 1);
var ac_ess = props.globals.getNode("/systems/electrical/bus/ac-ess", 1);
@ -1671,7 +1671,7 @@ var canvas_lowerECAM_elec = {
}
}
if (galleyshed.getValue() == 1 or (switch_galley.getValue() == 0)) {
if (galleyshed.getValue()) {
me["GalleyShed"].show();
} else {
me["GalleyShed"].hide();

66
Systems/a320-electrical.xml
View file

@ -989,13 +989,38 @@
</test>
</switch>
<!-- Galleys -->
<fcs_function name="/systems/electrical/some-electric-thingie/galley-shed-sum">
<function>
<sum>
<property>/systems/electrical/relay/apu-glc/contact-pos</property>
<property>/systems/electrical/relay/ext-epc/contact-pos</property>
<property>/systems/electrical/relay/gen-1-glc/contact-pos</property>
<property>/systems/electrical/relay/gen-2-glc/contact-pos</property>
</sum>
</function>
</fcs_function>
<switch name="/systems/electrical/relay/galley-bus-1-shed-switch/contact-pos">
<default value="1"/>
<test logic="OR" value="0">
<default value="0"/>
<test logic="AND" value="1">
/controls/electrical/switches/galley eq 1
<test logic="AND">
/systems/electrical/relay/gen-1-glc/output ne 0
/systems/electrical/relay/gen-2-glc/output ne 0
<test logic="OR">
<test logic="AND">
/gear/gear[1]/wow eq 0
/systems/electrical/some-electric-thingie/galley-shed-sum gt 1
</test>
<test logic="AND">
/gear/gear[1]/wow eq 1
<test logic="OR">
/systems/electrical/relay/apu-glc/output ge 110
/systems/electrical/relay/ext-epc/output ge 110
<test logic="AND">
/systems/electrical/relay/gen-1-glc/output ge 110
/systems/electrical/relay/gen-2-glc/output ge 110
</test>
</test>
</test>
</test>
</test>
</switch>
@ -1008,12 +1033,25 @@
</switch>
<switch name="/systems/electrical/relay/galley-bus-2-shed-switch/contact-pos">
<default value="1"/>
<test logic="OR" value="0">
<default value="0"/>
<test logic="AND" value="1">
/controls/electrical/switches/galley eq 1
<test logic="AND">
/systems/electrical/relay/gen-1-glc/output ne 0
/systems/electrical/relay/gen-2-glc/output ne 0
<test logic="OR">
<test logic="AND">
/gear/gear[1]/wow eq 0
/systems/electrical/some-electric-thingie/galley-shed-sum gt 1
</test>
<test logic="AND">
/gear/gear[1]/wow eq 1
<test logic="OR">
/systems/electrical/relay/apu-glc/output ge 110
/systems/electrical/relay/ext-epc/output ge 110
<test logic="AND">
/systems/electrical/relay/gen-1-glc/output ge 110
/systems/electrical/relay/gen-2-glc/output ge 110
</test>
</test>
</test>
</test>
</test>
</switch>
@ -1025,6 +1063,14 @@
</test>
</switch>
<switch name="/systems/electrical/some-electric-thingie/galley-shed">
<default value="0"/>
<test logic="OR" value="1">
/systems/electrical/relay/galley-bus-1-shed-switch/contact-pos eq 0
/systems/electrical/relay/galley-bus-2-shed-switch/contact-pos eq 0
</test>
</switch>
<!-- AC Bus 1 -->
<switch name="/systems/electrical/bus/ac-1-src">
<description>Tell which source is being used for priority purpose</description>