Merge branch 'master' into Lower-ECAM

This commit is contained in:
Joshua Davidson 2018-05-16 19:29:34 -04:00
commit c7066a19c1

View file

@ -7,13 +7,16 @@
--> -->
<system name="A320: Electrical"> <system name="A320: Electrical">
<property>/controls/electrical/switches/battery1</property> <property>/controls/electrical/switches/battery1</property>
<property>/systems/failures/elec-batt1</property> <property>/systems/failures/elec-batt1</property>
<property>/controls/electrical/switches/battery2</property> <property>/controls/electrical/switches/battery2</property>
<property>/systems/failures/elec-batt2</property> <property>/systems/failures/elec-batt2</property>
<channel name="Battery"> <channel name="Battery">
<switch name="electrical/battery-1"> <switch name="electrical/battery-1">
<default value="0"/>
<test logic="AND" value="150"> <test logic="AND" value="150">
/controls/electrical/switches/battery1 eq 1 /controls/electrical/switches/battery1 eq 1
/systems/failures/elec-batt1 eq 0 /systems/failures/elec-batt1 eq 0
@ -23,6 +26,7 @@
</switch> </switch>
<switch name="electrical/battery-2"> <switch name="electrical/battery-2">
<default value="0"/>
<test logic="AND" value="150"> <test logic="AND" value="150">
/controls/electrical/switches/battery2 eq 1 /controls/electrical/switches/battery2 eq 1
/systems/failures/elec-batt2 eq 0 /systems/failures/elec-batt2 eq 0
@ -30,6 +34,7 @@
<delay type="time">0.85</delay> <delay type="time">0.85</delay>
<output>/systems/electrical/battery2-amps</output> <output>/systems/electrical/battery2-amps</output>
</switch> </switch>
</channel> </channel>
</system> </system>