fly/A320-family
1
0
Fork 0
Code Activity

Merge pull request #17 from legoboyvdlp/fire-fix

Browse source 
Fixed Fire indications
This commit is contained in:
Jonathan Redpath 2019-10-25 19:05:59 +01:00 committed by GitHub
commit 1b95e72ac6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 551 additions and 557 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Models/FlightDeck/a320.flightdeck.xml
View file

@ -477,8 +477,6 @@
<object-name>ecam_sts_led</object-name> <object-name>ecam_sts_led</object-name>
<object-name>engine_fault_1</object-name> <object-name>engine_fault_1</object-name>
<object-name>engine_fault_2</object-name> <object-name>engine_fault_2</object-name>
<object-name>engine_fire_1</object-name>
<object-name>engine_fire_2</object-name>
<object-name>exped_led</object-name> <object-name>exped_led</object-name>
<object-name>hdg-text-test</object-name> <object-name>hdg-text-test</object-name>
<object-name>qnh-test</object-name> <object-name>qnh-test</object-name>

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

@ -6375,6 +6375,8 @@
<!-- Fire Buttons --> <!-- Fire Buttons -->
<!-- Engine 1 --> <!-- Engine 1 -->
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>Eng1FireBtn</object-name> <object-name>Eng1FireBtn</object-name>
@ -6449,12 +6451,17 @@
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>firebtn1</object-name> <object-name>Eng1FireBtn</object-name>
<condition>
<or>
<property>systems/fire/engine1/warning-active</property>
<property>controls/switches/annun-test</property>
</or>
</condition>
<emission> <emission>
<red>1.0</red> <red>1.0</red>
<green>1.0</green> <green>1.0</green>
<blue>1.0</blue> <blue>1.0</blue>
<factor-prop>systems/fire/engine1/warning-active</factor-prop>
</emission> </emission>
</animation> </animation>
@ -6693,12 +6700,17 @@
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>firebtnapu</object-name> <object-name>APUFireBtn</object-name>
<condition>
<or>
<property>/systems/fire/apu/warning-active</property>
<property>/controls/switches/annun-test</property>
</or>
</condition>
<emission> <emission>
<red>1.0</red> <red>1.0</red>
<green>1.0</green> <green>1.0</green>
<blue>1.0</blue> <blue>1.0</blue>
<factor-prop>systems/fire/apu/warning-active</factor-prop>
</emission> </emission>
</animation> </animation>
@ -6835,12 +6847,17 @@
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>firebtn2</object-name> <object-name>Eng2FireBtn</object-name>
<condition>
<or>
<property>systems/fire/engine2/warning-active</property>
<property>controls/switches/annun-test</property>
</or>
</condition>
<emission> <emission>
<red>1.0</red> <red>1.0</red>
<green>1.0</green> <green>1.0</green>
<blue>1.0</blue> <blue>1.0</blue>
<factor-prop>systems/fire/engine2/warning-active</factor-prop>
</emission> </emission>
</animation> </animation>

37
Models/Instruments/Pedestal_up/Pedestal_up.xml
View file

@ -122,27 +122,6 @@
<object-name>vu112_dfdr</object-name> <object-name>vu112_dfdr</object-name>
</effect> </effect>
<animation>
<type>select</type>
<object-name>engine_fire_1</object-name>
<condition>
<property>systems/fire/engine1/warning-active</property>
</condition>
</animation>
<animation>
<type>material</type>
<object-name>engine_fire_1</object-name>
<condition>
<property>systems/fire/engine1/warning-active</property>
</condition>
<emission>
<red>1.0</red>
<green>1.0</green>
<blue>1.0</blue>
</emission>
</animation>
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>engine_fault_1</object-name> <object-name>engine_fault_1</object-name>
@ -155,16 +134,16 @@
<type>select</type> <type>select</type>
<object-name>engine_fire_1</object-name> <object-name>engine_fire_1</object-name>
<condition> <condition>
<property>systems/fire/engine1/warning-active</property> <or>
<property>/systems/fire/engine1/warning-active</property>
<property>/controls/switches/annun-test</property>
</or>
</condition> </condition>
</animation> </animation>
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>engine_fire_1</object-name> <object-name>engine_fire_1</object-name>
<condition>
<property>systems/fire/engine1/warning-active</property>
</condition>
<emission> <emission>
<red>1.0</red> <red>1.0</red>
<green>1.0</green> <green>1.0</green>
@ -184,16 +163,16 @@
<type>select</type> <type>select</type>
<object-name>engine_fire_2</object-name> <object-name>engine_fire_2</object-name>
<condition> <condition>
<property>systems/fire/engine2/warning-active</property> <or>
<property>/systems/fire/engine2/warning-active</property>
<property>/controls/switches/annun-test</property>
</or>
</condition> </condition>
</animation> </animation>
<animation> <animation>
<type>material</type> <type>material</type>
<object-name>engine_fire_2</object-name> <object-name>engine_fire_2</object-name>
<condition>
<property>systems/fire/engine2/warning-active</property>
</condition>
<emission> <emission>
<red>1.0</red> <red>1.0</red>
<green>1.0</green> <green>1.0</green>