fly/IDG-A32X
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

A33X: Finish Cargo Smoke OH, add Cargo Fire to failures

Browse source
This commit is contained in:
Joshua Davidson 2017-09-21 15:07:54 -04:00
parent d9b8b14570
commit f81d33bf35
6 changed files with 175 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
A320-main.xml
View file

@ -613,8 +613,8 @@
<cones type="bool">true</cones> <cones type="bool">true</cones>
<dome-norm type="double">0</dome-norm> <dome-norm type="double">0</dome-norm>
<landing-lights n="0" type="bool">0</landing-lights> <landing-lights n="0" type="bool">0</landing-lights>
<landing-lights n="1" type="bool">0</landing-lights> <landing-lights n="1" type="double">0</landing-lights>
<landing-lights n="2" type="bool">0</landing-lights> <landing-lights n="2" type="double">0</landing-lights>
<nav-lights-switch type="int">0</nav-lights-switch> <nav-lights-switch type="int">0</nav-lights-switch>
<overhead-panel-norm type="double">0.0</overhead-panel-norm> <overhead-panel-norm type="double">0.0</overhead-panel-norm>
<main-panel-pedestal-norm type="double">0.8</main-panel-pedestal-norm> <main-panel-pedestal-norm type="double">0.8</main-panel-pedestal-norm>

2
AircraftConfig/acconfig.nas
View file

@ -73,6 +73,8 @@ var failReset = func {
setprop("/systems/failures/tank4pump1", 0); setprop("/systems/failures/tank4pump1", 0);
setprop("/systems/failures/tank4pump2", 0); setprop("/systems/failures/tank4pump2", 0);
setprop("/systems/failures/fuelmode", 0); setprop("/systems/failures/fuelmode", 0);
setprop("/systems/failures/cargo-aft-fire", 0);
setprop("/systems/failures/cargo-fwd-fire", 0);
} }
failReset(); failReset();

8
AircraftConfig/fail.xml
View file

@ -474,9 +474,9 @@
</group> </group>
<checkbox> <checkbox>
<label>FWD</label> <label>AFT</label>
<halign>left</halign> <halign>left</halign>
<property>/systems/fire/cargo/fwddet</property> <property>/systems/failures/cargo-aft-fire</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
@ -484,9 +484,9 @@
</checkbox> </checkbox>
<checkbox> <checkbox>
<label>AFT</label> <label>FWD</label>
<halign>left</halign> <halign>left</halign>
<property>/systems/fire/cargo/aftdet</property> <property>/systems/failures/cargo-fwd-fire</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>

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

@ -248,7 +248,7 @@
</diffuse> </diffuse>
</animation> </animation>
<!-- cargo smoke --> <!-- Cargo Smoke -->
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>FwdCargoSmkBtn1S</object-name> <object-name>FwdCargoSmkBtn1S</object-name>
@ -317,7 +317,6 @@
</condition> </condition>
</animation> </animation>
<animation> <animation>
<name>Cargo Smoke Test</name> <name>Cargo Smoke Test</name>
<type>pick</type> <type>pick</type>
@ -326,6 +325,18 @@
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<condition>
<or>
<greater-than-equals>
<property>systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
</condition>
<command>property-assign</command> <command>property-assign</command>
<property>controls/fire/cargo/test</property> <property>controls/fire/cargo/test</property>
<value>1</value> <value>1</value>
@ -337,47 +348,85 @@
</action> </action>
</animation> </animation>
<!--<animation> <animation>
<type>rotate</type> <type>pick</type>
<object-name>AftCargoDischGuard</object-name> <object-name>FwdCargoDischBtn</object-name>
<property>controls/OH/protectors/aftdisch</property> <action>
<factor>-145</factor> <button>0</button>
<axis> <binding>
<condition>
</axis> <and>
</animation>--> <equals>
<property>controls/OH/protectors/fwddisch</property>
<!--<animation> <value>1</value>
<type>rotate</type> </equals>
<object-name>FwdCargoDischGuard</object-name> <or>
<property>controls/OH/protectors/fwddisch</property> <greater-than-equals>
<factor>-145</factor> <property>systems/electrical/bus/dc1</property>
<axis> <value>25</value>
</greater-than-equals>
</axis> <greater-than-equals>
</animation>--> <property>systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
</and>
</condition>
<command>property-assign</command>
<property>controls/fire/cargo/fwddisch</property>
<value>1</value>
</binding>
<binding>
<condition>
<equals>
<property>controls/OH/protectors/aftdisch</property>
<value>1</value>
</equals>
</condition>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding>
</action>
</animation>
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>AftCargoDischGuard</object-name> <object-name>AftCargoDischBtn</object-name>
<action> <action>
<button>1</button> <button>0</button>
<binding> <binding>
<condition>
<and>
<equals>
<property>controls/OH/protectors/aftdisch</property>
<value>1</value>
</equals>
<or>
<greater-than-equals>
<property>systems/electrical/bus/dc1</property>
<value>25</value>
</greater-than-equals>
<greater-than-equals>
<property>systems/electrical/bus/dc2</property>
<value>25</value>
</greater-than-equals>
</or>
</and>
</condition>
<command>property-assign</command> <command>property-assign</command>
<property>controls/OH/protectors/aftdisch</property> <property>controls/fire/cargo/aftdisch</property>
<value>1</value> <value>1</value>
</binding> </binding>
<mod-up> <binding>
<binding> <condition>
<command>property-assign</command> <equals>
<property>controls/OH/protectors/aftdisch</property> <property>controls/OH/protectors/aftdisch</property>
<value>0</value> <value>1</value>
</binding> </equals>
<binding> </condition>
<command>nasal</command> <command>nasal</command>
<script>setprop("/sim/sounde/oh-cover", 1);</script> <script>setprop("/sim/sounde/oh-btn", 1);</script>
</binding> </binding>
</mod-up>
</action> </action>
</animation> </animation>
@ -407,41 +456,56 @@
<animation> <animation>
<type>pick</type> <type>pick</type>
<object-name>FwdCargoDischBtn</object-name> <object-name>AftCargoDischGuard</object-name>
<action> <action>
<button>0</button> <button>1</button>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>controls/fire/cargo/fwddisch</property> <property>controls/OH/protectors/aftdisch</property>
<value>1</value> <value>1</value>
</binding> </binding>
<binding> <mod-up>
<command>nasal</command> <binding>
<script>setprop("/sim/sounde/oh-btn", 1);</script> <command>property-assign</command>
</binding> <property>controls/OH/protectors/aftdisch</property>
<value>0</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/oh-cover", 1);</script>
</binding>
</mod-up>
</action> </action>
</animation> </animation>
<animation> <animation>
<type>pick</type> <type>rotate</type>
<object-name>AftCargoDischBtn</object-name> <object-name>FwdCargoDischGuard</object-name>
<action> <property>controls/OH/protectors/fwddisch</property>
<button>0</button> <factor>-145</factor>
<binding> <axis>
<command>property-assign</command> <x1-m>-0.0067</x1-m>
<property>controls/fire/cargo/aftdisch</property> <y1-m>0.19051</y1-m>
<value>1</value> <z1-m>-0.11153</z1-m>
</binding> <x2-m>-0.00524</x2-m>
<binding> <y2-m>0.20242</y2-m>
<command>nasal</command> <z2-m>-0.11153</z2-m>
<script>setprop("/sim/sounde/oh-btn", 1);</script> </axis>
</binding>
</action>
</animation> </animation>
<animation> <animation>
<type>pick</type> <type>rotate</type>
<object-name>AftCargoDischBtn</object-name> <object-name>AftCargoDischGuard</object-name>
<property>controls/OH/protectors/aftdisch</property>
<factor>-145</factor>
<axis>
<x1-m>0.00633</x1-m>
<y1-m>0.29475</y1-m>
<z1-m>-0.11153</z1-m>
<x2-m>0.00779</x2-m>
<y2-m>0.30666</y2-m>
<z2-m>-0.11153</z2-m>
</axis>
</animation> </animation>
<!-- IRS 1 --> <!-- IRS 1 -->
@ -4836,8 +4900,26 @@
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-toggle</command> <command>property-cycle</command>
<property>controls/lighting/landing-lights[1]</property> <property>controls/lighting/landing-lights[1]</property>
<value>0</value>
<value>0.5</value>
<value>1</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/switch1", 1);</script>
</binding>
</action>
<action>
<button>1</button>
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
<property>controls/lighting/landing-lights[1]</property>
<value>1</value>
<value>0.5</value>
<value>0</value>
</binding> </binding>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -4854,8 +4936,26 @@
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>false</repeatable>
<binding> <binding>
<command>property-toggle</command> <command>property-cycle</command>
<property>controls/lighting/landing-lights[2]</property> <property>controls/lighting/landing-lights[2]</property>
<value>0</value>
<value>0.5</value>
<value>1</value>
</binding>
<binding>
<command>nasal</command>
<script>setprop("/sim/sounde/switch1", 1);</script>
</binding>
</action>
<action>
<button>1</button>
<repeatable>false</repeatable>
<binding>
<command>property-cycle</command>
<property>controls/lighting/landing-lights[2]</property>
<value>1</value>
<value>0.5</value>
<value>0</value>
</binding> </binding>
<binding> <binding>
<command>nasal</command> <command>nasal</command>

12
Nasal/fire.nas
View file

@ -13,8 +13,8 @@ setlistener("/sim/signals/fdm-initialized", func {
var level = getprop("/systems/fire/cargo/bottlelevel"); var level = getprop("/systems/fire/cargo/bottlelevel");
var fwdsquib = getprop("/systems/fire/cargo/fwdsquib"); var fwdsquib = getprop("/systems/fire/cargo/fwdsquib");
var aftsquib = getprop("/systems/fire/cargo/aftsquib"); var aftsquib = getprop("/systems/fire/cargo/aftsquib");
var fwddet = getprop("/systems/fire/cargo/fwddet"); var fwddet = getprop("/systems/failures/cargo-fwd-fire");
var aftdet = getprop("/systems/fire/cargo/aftdet"); var aftdet = getprop("/systems/failures/cargo-aft-fire");
var test = getprop("/controls/fire/cargo/test"); var test = getprop("/controls/fire/cargo/test");
var guard1 = getprop("/controls/fire/cargo/fwdguard"); var guard1 = getprop("/controls/fire/cargo/fwdguard");
var guard2 = getprop("/controls/fire/cargo/aftguard"); var guard2 = getprop("/controls/fire/cargo/aftguard");
@ -35,8 +35,8 @@ setlistener("/sim/signals/fdm-initialized", func {
var fire_init = func { var fire_init = func {
setprop("/controls/OH/protectors/fwddisch", 0); setprop("/controls/OH/protectors/fwddisch", 0);
setprop("/controls/OH/protectors/aftdisch", 0); setprop("/controls/OH/protectors/aftdisch", 0);
setprop("/systems/fire/cargo/fwddet", 0); setprop("/systems/failures/cargo-fwd-fire", 0);
setprop("/systems/fire/cargo/aftdet", 0); setprop("/systems/failures/cargo-aft-fire", 0);
setprop("/systems/fire/cargo/fwdsquib", 0); setprop("/systems/fire/cargo/fwdsquib", 0);
setprop("/systems/fire/cargo/aftsquib", 0); setprop("/systems/fire/cargo/aftsquib", 0);
setprop("/systems/fire/cargo/bottlelevel", 100); setprop("/systems/fire/cargo/bottlelevel", 100);
@ -67,8 +67,8 @@ var master_fire = func {
level = getprop("/systems/fire/cargo/bottlelevel"); level = getprop("/systems/fire/cargo/bottlelevel");
fwdsquib = getprop("/systems/fire/cargo/fwdsquib"); fwdsquib = getprop("/systems/fire/cargo/fwdsquib");
aftsquib = getprop("/systems/fire/cargo/aftsquib"); aftsquib = getprop("/systems/fire/cargo/aftsquib");
fwddet = getprop("/systems/fire/cargo/fwddet"); fwddet = getprop("/systems/failures/cargo-fwd-fire");
aftdet = getprop("/systems/fire/cargo/aftdet"); aftdet = getprop("/systems/failures/cargo-aft-fire");
test = getprop("/controls/fire/cargo/test"); test = getprop("/controls/fire/cargo/test");
guard1 = getprop("/controls/fire/cargo/fwdguard"); guard1 = getprop("/controls/fire/cargo/fwdguard");
guard2 = getprop("/controls/fire/cargo/aftguard"); guard2 = getprop("/controls/fire/cargo/aftguard");

2
revision.txt
View file

@ -1 +1 @@
1519 1520