fly/A320-family
1
0
Fork 0
Code Activity

Fix the fire buttons powersupply in EMER ELEC

Browse source
This commit is contained in:
legoboyvdlp R 2020-01-02 11:25:47 +00:00
parent a0fbcccff0
commit 450a3d6e25
3 changed files with 217 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

200
Models/Instruments/OHpanel/OHpanel.xml
View file

@ -40,14 +40,6 @@
<object-name>ELAC1Btn1F</object-name> <object-name>ELAC1Btn1F</object-name>
<object-name>ELAC1Btn2O</object-name> <object-name>ELAC1Btn2O</object-name>
<object-name>EmerExtLtBtn2O</object-name> <object-name>EmerExtLtBtn2O</object-name>
<object-name>Eng1FireAgt1Btn1S</object-name>
<object-name>Eng1FireAgt1Btn2D</object-name>
<object-name>Eng1FireAgt2Btn1S</object-name>
<object-name>Eng1FireAgt2Btn2D</object-name>
<object-name>Eng2FireAgt1Btn1S</object-name>
<object-name>Eng2FireAgt1Btn2D</object-name>
<object-name>Eng2FireAgt2Btn1S</object-name>
<object-name>Eng2FireAgt2Btn2D</object-name>
<object-name>ExtPwrBtn2O</object-name> <object-name>ExtPwrBtn2O</object-name>
<object-name>FAC1Btn1F</object-name> <object-name>FAC1Btn1F</object-name>
<object-name>FAC1Btn2O</object-name> <object-name>FAC1Btn2O</object-name>
@ -65,10 +57,18 @@
<object-name>SEC1Btn1F</object-name> <object-name>SEC1Btn1F</object-name>
<object-name>SEC1Btn2O</object-name> <object-name>SEC1Btn2O</object-name>
<object-name>VentBlowBtn1F</object-name> <object-name>VentBlowBtn1F</object-name>
<object-name>Eng1FireAgt1Btn1S</object-name>
<object-name>Eng1FireAgt1Btn2D</object-name>
<object-name>Eng2FireAgt1Btn1S</object-name>
<object-name>Eng2FireAgt1Btn2D</object-name>
<object-name>Eng1FireAgt2Btn1S</object-name>
<object-name>Eng1FireAgt2Btn2D</object-name>
<object-name>Eng2FireAgt2Btn1S</object-name>
<object-name>Eng2FireAgt2Btn2D</object-name>
<condition> <condition>
<greater-than-equals> <greater-than-equals>
<property>systems/electrical/bus/ac-ess</property> <property>systems/electrical/bus/ac-ess</property>
<value>25</value> <value>5</value>
</greater-than-equals> </greater-than-equals>
</condition> </condition>
</animation> </animation>
@ -6484,6 +6484,18 @@
<command>property-assign</command> <command>property-assign</command>
<property>controls/engines/engine[0]/agent1-btn</property> <property>controls/engines/engine[0]/agent1-btn</property>
<value>1</value> <value>1</value>
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-2</property>
<value>25</value>
</greater-than-equals>
</or>
</condition>
</binding> </binding>
</action> </action>
</animation> </animation>
@ -6500,6 +6512,12 @@
<command>property-assign</command> <command>property-assign</command>
<property>controls/engines/engine[0]/agent2-btn</property> <property>controls/engines/engine[0]/agent2-btn</property>
<value>1</value> <value>1</value>
<condition>
<greater-than-equals>
<property>systems/electrical/bus/dc-2</property>
<value>25</value>
</greater-than-equals>
</condition>
</binding> </binding>
</action> </action>
</animation> </animation>
@ -6507,8 +6525,8 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>Eng1FireAgt1Btn1S</object-name> <object-name>Eng1FireAgt1Btn1S</object-name>
<object-name>Eng1FireAgt2Btn1S</object-name>
<condition> <condition>
<and>
<or> <or>
<equals> <equals>
<property>controls/engines/engine[0]/fire-btn</property> <property>controls/engines/engine[0]/fire-btn</property>
@ -6523,6 +6541,44 @@
<value>1</value> <value>1</value>
</equals> </equals>
</or> </or>
<or>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-2</property>
<value>25</value>
</greater-than-equals>
</or>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>Eng1FireAgt2Btn1S</object-name>
<condition>
<and>
<or>
<equals>
<property>controls/engines/engine[0]/fire-btn</property>
<value>1</value>
</equals>
<equals>
<property>/controls/fire/test-btn-1</property>
<value>1</value>
</equals>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
</or>
<greater-than-equals>
<property>systems/electrical/bus/dc-2</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</animation> </animation>
@ -6579,6 +6635,24 @@
<command>property-assign</command> <command>property-assign</command>
<property>controls/fire/test-btn-1</property> <property>controls/fire/test-btn-1</property>
<value>1</value> <value>1</value>
<condition>
<or>
<or>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-2</property>
<value>25</value>
</greater-than-equals>
</or>
<greater-than-equals>
<property>systems/electrical/bus/dc-2</property>
<value>25</value>
</greater-than-equals>
</or>
</condition>
</binding> </binding>
<mod-up> <mod-up>
<binding> <binding>
@ -6600,6 +6674,24 @@
<command>property-assign</command> <command>property-assign</command>
<property>controls/fire/test-btn-2</property> <property>controls/fire/test-btn-2</property>
<value>1</value> <value>1</value>
<condition>
<or>
<or>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-2</property>
<value>25</value>
</greater-than-equals>
</or>
<greater-than-equals>
<property>systems/electrical/bus/dc-2</property>
<value>25</value>
</greater-than-equals>
</or>
</condition>
</binding> </binding>
<mod-up> <mod-up>
<binding> <binding>
@ -6621,6 +6713,18 @@
<command>property-assign</command> <command>property-assign</command>
<property>controls/fire/apu-test-btn</property> <property>controls/fire/apu-test-btn</property>
<value>1</value> <value>1</value>
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-2</property>
<value>25</value>
</greater-than-equals>
</or>
</condition>
</binding> </binding>
<mod-up> <mod-up>
<binding> <binding>
@ -6733,6 +6837,22 @@
<command>property-assign</command> <command>property-assign</command>
<property>controls/APU/agent-btn</property> <property>controls/APU/agent-btn</property>
<value>1</value> <value>1</value>
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-2</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-bat</property>
<value>25</value>
</greater-than-equals>
</or>
</condition>
</binding> </binding>
</action> </action>
</animation> </animation>
@ -6880,6 +7000,18 @@
<command>property-assign</command> <command>property-assign</command>
<property>controls/engines/engine[1]/agent1-btn</property> <property>controls/engines/engine[1]/agent1-btn</property>
<value>1</value> <value>1</value>
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-2</property>
<value>25</value>
</greater-than-equals>
</or>
</condition>
</binding> </binding>
</action> </action>
</animation> </animation>
@ -6896,6 +7028,12 @@
<command>property-assign</command> <command>property-assign</command>
<property>controls/engines/engine[1]/agent2-btn</property> <property>controls/engines/engine[1]/agent2-btn</property>
<value>1</value> <value>1</value>
<condition>
<greater-than-equals>
<property>systems/electrical/bus/dc-2</property>
<value>25</value>
</greater-than-equals>
</condition>
</binding> </binding>
</action> </action>
</animation> </animation>
@ -6903,15 +7041,15 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>Eng2FireAgt1Btn1S</object-name> <object-name>Eng2FireAgt1Btn1S</object-name>
<object-name>Eng2FireAgt2Btn1S</object-name>
<condition> <condition>
<and>
<or> <or>
<equals> <equals>
<property>controls/engines/engine[1]/fire-btn</property> <property>controls/engines/engine[1]/fire-btn</property>
<value>1</value> <value>1</value>
</equals> </equals>
<equals> <equals>
<property>controls/fire/test-btn-2</property> <property>/controls/fire/test-btn-2</property>
<value>1</value> <value>1</value>
</equals> </equals>
<equals> <equals>
@ -6919,6 +7057,44 @@
<value>1</value> <value>1</value>
</equals> </equals>
</or> </or>
<or>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc-hot-2</property>
<value>25</value>
</greater-than-equals>
</or>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>Eng2FireAgt2Btn1S</object-name>
<condition>
<and>
<or>
<equals>
<property>controls/engines/engine[1]/fire-btn</property>
<value>1</value>
</equals>
<equals>
<property>/controls/fire/test-btn-2</property>
<value>1</value>
</equals>
<equals>
<property>controls/switches/annun-test</property>
<value>1</value>
</equals>
</or>
<greater-than-equals>
<property>systems/electrical/bus/dc-2</property>
<value>25</value>
</greater-than-equals>
</and>
</condition> </condition>
</animation> </animation>

2
Nasal/ECAM/ECAM-logic.nas
View file

@ -1363,7 +1363,7 @@ var messages_config_memo = func {
setprop("/ECAM/ldg-memo-2200-set", 0); setprop("/ECAM/ldg-memo-2200-set", 0);
} }
if (phaseVar >= 6 and phaseVar <= 8) { if (phaseVar != 6 and phaseVar != 7 and phaseVar != 8) {
setprop("/ECAM/ldg-memo-2200-reset", 1); setprop("/ECAM/ldg-memo-2200-reset", 1);
} else { } else {
setprop("/ECAM/ldg-memo-2200-reset", 0); setprop("/ECAM/ldg-memo-2200-reset", 0);

4
Nasal/Systems/fire.nas
View file

@ -521,8 +521,8 @@ cargoDetectorLoop.new(2, 1, "/systems/fire/cargo/fwd/temperature", "/systems/fai
]); ]);
# Create extinguisher bottles # Create extinguisher bottles
var extinguisherBottles = std.Vector.new([extinguisherBottle.new(0, "/systems/fire/engine1/disch1", "/systems/electrical/bus/dc-bat", "/systems/failures/engine-left-fire", "/systems/fire/engine1/warning-active"), extinguisherBottle.new(1, "/systems/fire/engine1/disch2", "/systems/electrical/bus/dc-2", "/systems/failures/engine-left-fire", "/systems/fire/engine1/warning-active"), var extinguisherBottles = std.Vector.new([extinguisherBottle.new(0, "/systems/fire/engine1/disch1", "/systems/electrical/bus/dc-hot-1", "/systems/failures/engine-left-fire", "/systems/fire/engine1/warning-active"), extinguisherBottle.new(1, "/systems/fire/engine1/disch2", "/systems/electrical/bus/dc-2", "/systems/failures/engine-left-fire", "/systems/fire/engine1/warning-active"),
extinguisherBottle.new(0, "/systems/fire/engine2/disch1", "/systems/electrical/bus/dc-bat", "/systems/failures/engine-right-fire", "/systems/fire/engine2/warning-active"), extinguisherBottle.new(1, "/systems/fire/engine2/disch2", "/systems/electrical/bus/dc-2", "/systems/failures/engine-right-fire", "/systems/fire/engine2/warning-active"), extinguisherBottle.new(0, "/systems/fire/engine2/disch1", "/systems/electrical/bus/dc-hot-2", "/systems/failures/engine-right-fire", "/systems/fire/engine2/warning-active"), extinguisherBottle.new(1, "/systems/fire/engine2/disch2", "/systems/electrical/bus/dc-2", "/systems/failures/engine-right-fire", "/systems/fire/engine2/warning-active"),
extinguisherBottle.new(9, "/systems/fire/apu/disch", "/systems/electrical/bus/dc-bat", "/systems/failures/apu-fire", "/systems/fire/apu/warning-active") ]); extinguisherBottle.new(9, "/systems/fire/apu/disch", "/systems/electrical/bus/dc-bat", "/systems/failures/apu-fire", "/systems/fire/apu/warning-active") ]);
# There is only one bottle but the system will think there are two, so other parts work # There is only one bottle but the system will think there are two, so other parts work