A3XX: Bugfix to Overhead, Pneumatic, Electrical

This commit is contained in:
Joshua Davidson 2017-06-10 09:53:57 -04:00
parent 97150596d0
commit 99d9933ea2
6 changed files with 85 additions and 63 deletions

View file

@ -443,7 +443,7 @@
<slats>0</slats>
</flight>
<gear>
<brake-parking type="bool">true</brake-parking>
<brake-parking type="bool">0</brake-parking>
<tiller-cmd-norm type="double">0</tiller-cmd-norm>
<tiller-enabled type="bool">0</tiller-enabled>
</gear>
@ -460,7 +460,7 @@
<overhead-panel-norm type="double">0.0</overhead-panel-norm>
<main-panel-pedestal-norm type="double">0.8</main-panel-pedestal-norm>
<strobe type="bool">0</strobe>
<taxi-light-switch type="bool">0</taxi-light-switch>
<taxi-light-switch type="float">0</taxi-light-switch>
</lighting>
<switches>
<!-- Smoking is bad :P -->

View file

@ -13,10 +13,19 @@
<object-name>ACPack1Btn2O</object-name>
<object-name>ACPack2Btn1F</object-name>
<object-name>ACPack2Btn2O</object-name>
<object-name>APUBleedBtn1F</object-name>
<object-name>APUBleedBtn2O</object-name>
<object-name>APUGenBtn1F</object-name>
<object-name>APUGenBtn2O</object-name>
<object-name>APUMasterBtn1F</object-name>
<object-name>APUMasterBtn2O</object-name>
<object-name>APUStartBtn1A</object-name>
<object-name>APUStartBtn2O</object-name>
<object-name>BatteryBtn11F</object-name>
<object-name>BatteryBtn12O</object-name>
<object-name>BatteryBtn21F</object-name>
<object-name>BatteryBtn22O</object-name>
<object-name>ExtPwrBtn2O</object-name>
<object-name>Gen1Btn1F</object-name>
<object-name>Gen1Btn2O</object-name>
<object-name>Gen2Btn1F</object-name>
@ -47,14 +56,6 @@
<type>select</type>
<object-name>ACESSFeedBtn1F</object-name>
<object-name>ACESSFeedBtn2O</object-name>
<object-name>APUBleedBtn1F</object-name>
<object-name>APUBleedBtn2O</object-name>
<object-name>APUGenBtn1F</object-name>
<object-name>APUGenBtn2O</object-name>
<object-name>APUMasterBtn1F</object-name>
<object-name>APUMasterBtn2O</object-name>
<object-name>APUStartBtn1A</object-name>
<object-name>APUStartBtn2O</object-name>
<object-name>ADR1Btn1F</object-name>
<object-name>ADR1Btn2O</object-name>
<object-name>ADR2Btn1F</object-name>
@ -72,7 +73,6 @@
<object-name>Eng1BleedBtn2O</object-name>
<object-name>Eng2BleedBtn1F</object-name>
<object-name>Eng2BleedBtn2O</object-name>
<object-name>ExtPwrBtn2O</object-name>
<object-name>FuelModeBtn1F</object-name>
<object-name>FuelModeBtn2O</object-name>
<object-name>FuelXfeedBtn2O</object-name>
@ -2354,6 +2354,16 @@
<property>/systems/failures/pack1</property>
<value>1</value>
</equals>
<and>
<equals>
<property>/controls/pneumatic/switches/pack1</property>
<value>1</value>
</equals>
<less-than-equals>
<property>/systems/pneumatic/pack1</property>
<value>5</value>
</less-than-equals>
</and>
<equals>
<property>/controls/switches/annun-test</property>
<value>1</value>
@ -2628,6 +2638,16 @@
<property>/systems/failures/pack2</property>
<value>1</value>
</equals>
<and>
<equals>
<property>/controls/pneumatic/switches/pack2</property>
<value>1</value>
</equals>
<less-than-equals>
<property>/systems/pneumatic/pack2</property>
<value>5</value>
</less-than-equals>
</and>
<equals>
<property>/controls/switches/annun-test</property>
<value>1</value>

View file

@ -13,13 +13,13 @@ var ac_hz_std = 400;
var elec_init = func {
setprop("/controls/switches/annun-test", 0);
setprop("/controls/electrical/switches/galley", 0);
setprop("/controls/electrical/switches/galley", 1);
setprop("/controls/electrical/switches/idg1", 0);
setprop("/controls/electrical/switches/idg2", 0);
setprop("/controls/electrical/switches/gen1", 0);
setprop("/controls/electrical/switches/gen2", 0);
setprop("/controls/electrical/switches/gen1", 1);
setprop("/controls/electrical/switches/gen2", 1);
setprop("/controls/electrical/switches/emer-gen", 0);
setprop("/controls/electrical/switches/gen-apu", 0);
setprop("/controls/electrical/switches/gen-apu", 1);
setprop("/controls/electrical/switches/gen-ext", 0);
setprop("/controls/electrical/switches/apu-ext-crosstie", 1);
setprop("/controls/electrical/switches/ac-ess-feed", 1);

View file

@ -6,9 +6,9 @@
#############
var hyd_init = func {
setprop("/controls/hydraulic/eng1-pump", 0);
setprop("/controls/hydraulic/eng2-pump", 0);
setprop("/controls/hydraulic/elec-pump-blue", 0);
setprop("/controls/hydraulic/eng1-pump", 1);
setprop("/controls/hydraulic/eng2-pump", 1);
setprop("/controls/hydraulic/elec-pump-blue", 1);
setprop("/controls/hydraulic/elec-pump-yellow", 0);
setprop("/controls/hydraulic/ptu", 1);
setprop("/controls/hydraulic/rat-man", 0);
@ -18,6 +18,7 @@ var hyd_init = func {
setprop("/systems/hydraulic/blue-psi", 0);
setprop("/systems/hydraulic/green-psi", 0);
setprop("/systems/hydraulic/yellow-psi", 0);
setprop("/controls/gear/brake-parking", 0);
hyd_timer.start();
}

View file

@ -6,13 +6,13 @@
#############
var pneu_init = func {
setprop("/controls/pneumatic/switches/bleed1", 0);
setprop("/controls/pneumatic/switches/bleed2", 0);
setprop("/controls/pneumatic/switches/bleed1", 1);
setprop("/controls/pneumatic/switches/bleed2", 1);
setprop("/controls/pneumatic/switches/bleedapu", 0);
setprop("/controls/pneumatic/switches/groundair", 0);
setprop("/controls/pneumatic/switches/pack1", 0);
setprop("/controls/pneumatic/switches/pack2", 0);
setprop("/controls/pneumatic/switches/hot-air", 0);
setprop("/controls/pneumatic/switches/pack1", 1);
setprop("/controls/pneumatic/switches/pack2", 1);
setprop("/controls/pneumatic/switches/hot-air", 1);
setprop("/controls/pneumatic/switches/ram-air", 0);
setprop("/controls/pneumatic/switches/pack-flo", 9); # LO: 7, NORM: 9, HI: 11.
setprop("/controls/pneumatic/switches/xbleed", 1); # SHUT: 0, AUTO: 1, OPEN: 2. # I will simulate later, once I get the knob animated. -JD
@ -156,7 +156,7 @@ var master_pneu = func {
setprop("/systems/pneumatic/pack1", 0);
}
if (pack2_sw == 1 and (bleed2 >= 20 or bleedapu >= 20 or ground >= 20) and eng1_starter == 0 and eng2_starter == 0 and !pack2_fail) {
if (pack2_sw == 1 and (bleed2 >= 20 or bleedapu >= 20) and eng1_starter == 0 and eng2_starter == 0 and !pack2_fail) {
setprop("/systems/pneumatic/pack2", pack_flo_sw);
} else {
setprop("/systems/pneumatic/pack2", 0);

View file

@ -209,16 +209,16 @@
<update-interval-secs type="double">0.1</update-interval-secs>
<input>
<expression>
<table>
<table>
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
<entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind> 0</ind><dep> 0</dep></entry>
<entry><ind> 1000</ind><dep> 500</dep></entry>
<entry><ind> 5000</ind><dep> 1100</dep></entry>
<entry><ind> 20000</ind><dep> 5200</dep></entry>
<entry><ind> 30000</ind><dep> 6700</dep></entry>
<entry><ind> 30000</ind><dep> 7900</dep></entry>
<entry><ind> 40500</ind><dep> 8000</dep></entry>
</table>
<entry><ind> 5000</ind><dep>1100</dep></entry>
<entry><ind>20000</ind><dep>5200</dep></entry>
<entry><ind>30000</ind><dep>6700</dep></entry>
<entry><ind>30000</ind><dep>7900</dep></entry>
<entry><ind>40500</ind><dep>8000</dep></entry>
</table>
</expression>
</input>
<output>/systems/pressurization/targetalt</output>
@ -233,14 +233,14 @@
<expression>
<table>
<property>/systems/pressurization/cabinalt-norm</property>
<entry><ind> -1000</ind><dep> 16.5</dep></entry>
<entry><ind> 0</ind><dep> 14.7</dep></entry>
<entry><ind>-1000</ind><dep> 16.5</dep></entry>
<entry><ind> 0</ind><dep> 14.7</dep></entry>
<entry><ind> 1000</ind><dep> 14.6</dep></entry>
<entry><ind> 5000</ind><dep> 14.4</dep></entry>
<entry><ind> 20000</ind><dep> 12.1</dep></entry>
<entry><ind> 30000</ind><dep> 11.4</dep></entry>
<entry><ind> 30000</ind><dep> 11.0</dep></entry>
<entry><ind> 40500</ind><dep> 10.9</dep></entry>
<entry><ind>20000</ind><dep> 12.1</dep></entry>
<entry><ind>30000</ind><dep> 11.4</dep></entry>
<entry><ind>30000</ind><dep> 11.0</dep></entry>
<entry><ind>40500</ind><dep> 10.9</dep></entry>
</table>
</expression>
</input>
@ -256,8 +256,8 @@
<expression>
<table>
<property>/instrumentation/altimeter/indicated-altitude-ft</property>
<entry><ind> -1000</ind><dep> 16.5</dep></entry>
<entry><ind> 0</ind><dep> 14.7</dep></entry>
<entry><ind>-1000</ind><dep> 16.5</dep></entry>
<entry><ind> 0</ind><dep> 14.7</dep></entry>
<entry><ind> 1000</ind><dep> 14.2</dep></entry>
<entry><ind> 2000</ind><dep> 13.6</dep></entry>
<entry><ind> 3000</ind><dep> 13.2</dep></entry>
@ -267,29 +267,30 @@
<entry><ind> 7000</ind><dep> 11.3</dep></entry>
<entry><ind> 8000</ind><dep> 10.9</dep></entry>
<entry><ind> 9000</ind><dep> 10.5</dep></entry>
<entry><ind> 10000</ind><dep> 10.1</dep></entry>
<entry><ind> 11000</ind><dep> 9.7</dep></entry>
<entry><ind> 12000</ind><dep> 9.3</dep></entry>
<entry><ind> 13000</ind><dep> 9</dep></entry>
<entry><ind> 14000</ind><dep> 8.6</dep></entry>
<entry><ind> 15000</ind><dep> 8.3</dep></entry>
<entry><ind> 16000</ind><dep> 8.0</dep></entry>
<entry><ind> 17000</ind><dep> 7.6</dep></entry>
<entry><ind> 18000</ind><dep> 7.3</dep></entry>
<entry><ind> 19000</ind><dep> 7.0</dep></entry>
<entry><ind> 20000</ind><dep> 6.8</dep></entry>
<entry><ind> 22000</ind><dep> 6.2</dep></entry>
<entry><ind> 24000</ind><dep> 5.7</dep></entry>
<entry><ind> 26000</ind><dep> 5.2</dep></entry>
<entry><ind> 28000</ind><dep> 4.7</dep></entry>
<entry><ind> 30000</ind><dep> 4.4</dep></entry>
<entry><ind> 32000</ind><dep> 4.0</dep></entry>
<entry><ind> 34000</ind><dep> 3.6</dep></entry>
<entry><ind> 36000</ind><dep> 3.3</dep></entry>
<entry><ind> 38000</ind><dep> 3.0</dep></entry>
<entry><ind> 39000</ind><dep> 2.9</dep></entry>
<entry><ind> 40000</ind><dep> 2.7</dep></entry>
<entry><ind> 41000</ind><dep> 2.6</dep></entry>
<entry><ind>10000</ind><dep> 10.1</dep></entry>
<entry><ind>11000</ind><dep> 9.7</dep></entry>
<entry><ind>12000</ind><dep> 9.3</dep></entry>
<entry><ind>13000</ind><dep> 9.0</dep></entry>
<entry><ind>14000</ind><dep> 8.6</dep></entry>
<entry><ind>15000</ind><dep> 8.3</dep></entry>
<entry><ind>16000</ind><dep> 8.0</dep></entry>
<entry><ind>17000</ind><dep> 7.6</dep></entry>
<entry><ind>18000</ind><dep> 7.3</dep></entry>
<entry><ind>19000</ind><dep> 7.0</dep></entry>
<entry><ind>20000</ind><dep> 6.8</dep></entry>
<entry><ind>22000</ind><dep> 6.2</dep></entry>
<entry><ind>24000</ind><dep> 5.7</dep></entry>
<entry><ind>26000</ind><dep> 5.2</dep></entry>
<entry><ind>28000</ind><dep> 4.7</dep></entry>
<entry><ind>30000</ind><dep> 4.4</dep></entry>
<entry><ind>32000</ind><dep> 4.0</dep></entry>
<entry><ind>34000</ind><dep> 3.6</dep></entry>
<entry><ind>36000</ind><dep> 3.3</dep></entry>
<entry><ind>38000</ind><dep> 3.0</dep></entry>
<entry><ind>39000</ind><dep> 2.9</dep></entry>
<entry><ind>40000</ind><dep> 2.7</dep></entry>
<entry><ind>41000</ind><dep> 2.6</dep></entry>
<entry><ind>42000</ind><dep> 2.5</dep></entry>
</table>
</expression>
</input>