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

A3XX: Fix ESS bus logic wrong, and ESS switch wrong label (thanks merspieler)

Browse source
This commit is contained in:
Joshua Davidson 2017-12-30 12:54:52 -05:00
parent 3b16796fb1
commit 60b0624f04
12 changed files with 33 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>ACESSFeedBtn1F</object-name> <object-name>ACESSFeedBtn1F</object-name>
<object-name>ACESSFeedBtn2O</object-name> <object-name>ACESSFeedBtn2A</object-name>
<object-name>ACPack1Btn1F</object-name> <object-name>ACPack1Btn1F</object-name>
<object-name>ACPack1Btn2O</object-name> <object-name>ACPack1Btn2O</object-name>
<object-name>ACPack2Btn1F</object-name> <object-name>ACPack2Btn1F</object-name>
@ -2939,11 +2939,11 @@
</animation> </animation>
<animation> <animation>
<name>AC ESS pick</name> <name>AC ESS FEED pick</name>
<type>pick</type> <type>pick</type>
<object-name>ACESSFeedBtn</object-name> <object-name>ACESSFeedBtn</object-name>
<object-name>ACESSFeedBtn1F</object-name> <object-name>ACESSFeedBtn1F</object-name>
<object-name>ACESSFeedBtn2O</object-name> <object-name>ACESSFeedBtn2A</object-name>
<action> <action>
<button>0</button> <button>0</button>
<repeatable>false</repeatable> <repeatable>false</repeatable>
@ -2979,16 +2979,10 @@
<object-name>ACESSFeedBtn1F</object-name> <object-name>ACESSFeedBtn1F</object-name>
<condition> <condition>
<or> <or>
<and>
<equals> <equals>
<property>systems/electrical/ac-ess-feed-fault</property> <property>systems/electrical/ac-ess-feed-fault</property>
<value>1</value> <value>1</value>
</equals> </equals>
<equals>
<property>controls/electrical/switches/ac-ess-feed</property>
<value>1</value>
</equals>
</and>
<equals> <equals>
<property>controls/switches/annun-test</property> <property>controls/switches/annun-test</property>
<value>1</value> <value>1</value>
@ -2999,12 +2993,12 @@
<animation> <animation>
<type>select</type> <type>select</type>
<object-name>ACESSFeedBtn2O</object-name> <object-name>ACESSFeedBtn2A</object-name>
<condition> <condition>
<or> <or>
<equals> <equals>
<property>controls/electrical/switches/ac-ess-feed</property> <property>controls/electrical/switches/ac-ess-feed</property>
<value>0</value> <value>1</value>
</equals> </equals>
<equals> <equals>
<property>controls/switches/annun-test</property> <property>controls/switches/annun-test</property>

BIN
Models/Instruments/OHpanel/res/buttons-grid.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 817 B

BIN
Models/Instruments/OHpanel/res/buttons2-grid.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6 KiB

BIN
Models/Instruments/OHpanel/res/buttons3-grid.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.2 KiB

BIN
Models/Instruments/OHpanel/res/buttons4-grid.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 6.3 KiB

BIN
Models/Instruments/OHpanel/res/buttons5-grid.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.5 KiB

BIN
Models/Instruments/OHpanel/res/buttons6-grid.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8.9 KiB

BIN
Models/Instruments/OHpanel/res/buttons7-grid.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.2 KiB

BIN
Models/Instruments/OHpanel/res/buttons7.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

4
Models/Instruments/OHpanel/res/ohpanel.ac
View file

@ -36994,11 +36994,11 @@ refs 4
2 9.31321e-008 0.5 2 9.31321e-008 0.5
kids 0 kids 0
OBJECT poly OBJECT poly
name "ACESSFeedBtn2O" name "ACESSFeedBtn2A"
loc 0.000175806 0.0480501 -0.11075 loc 0.000175806 0.0480501 -0.11075
data 8 data 8
Cube.062 Cube.062
texture "buttons2.png" texture "buttons7.png"
crease 30.000000 crease 30.000000
numvert 8 numvert 8
-0.01 -0.0464 0.0314 -0.01 -0.0464 0.0314

88
Nasal/electrical.nas
View file

@ -145,7 +145,7 @@ var ELEC = {
setprop("/controls/electrical/switches/gen-apu", 1); setprop("/controls/electrical/switches/gen-apu", 1);
setprop("/controls/electrical/switches/gen-ext", 0); setprop("/controls/electrical/switches/gen-ext", 0);
setprop("/controls/electrical/switches/apu-ext-crosstie", 1); setprop("/controls/electrical/switches/apu-ext-crosstie", 1);
setprop("/controls/electrical/switches/ac-ess-feed", 1); setprop("/controls/electrical/switches/ac-ess-feed", 0);
setprop("/controls/electrical/switches/battery1", 0); setprop("/controls/electrical/switches/battery1", 0);
setprop("/controls/electrical/switches/battery2", 0); setprop("/controls/electrical/switches/battery2", 0);
setprop("/systems/electrical/battery1-volts", 25.9); setprop("/systems/electrical/battery1-volts", 25.9);
@ -419,116 +419,70 @@ var ELEC = {
# Left AC bus yes? # Left AC bus yes?
if (stateL == 3 and gen1_sw and !gen1_fail) { if (stateL == 3 and gen1_sw and !gen1_fail) {
setprop("/systems/electrical/bus/ac1", ac_volt_std); setprop("/systems/electrical/bus/ac1", ac_volt_std);
if (!ac_ess_fail) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac1_src = "GEN"; ac1_src = "GEN";
} else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) { } else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std); setprop("/systems/electrical/bus/ac1", ac_volt_std);
if (!ac_ess_fail) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac1_src = "EXT"; ac1_src = "EXT";
} else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) { } else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) {
setprop("/systems/electrical/bus/ac1", ac_volt_std); setprop("/systems/electrical/bus/ac1", ac_volt_std);
if (!ac_ess_fail) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac1_src = "APU"; ac1_src = "APU";
} else if (apu_ext_crosstie_sw == 1 and xtieL) { } else if (apu_ext_crosstie_sw == 1 and xtieL) {
setprop("/systems/electrical/bus/ac1", ac_volt_std); setprop("/systems/electrical/bus/ac1", ac_volt_std);
if (!ac_ess_fail) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac1_src = "XTIE"; ac1_src = "XTIE";
} else if (emergen) { } else if (emergen) {
setprop("/systems/electrical/bus/ac1", 0); setprop("/systems/electrical/bus/ac1", 0);
if (!ac_ess_fail) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac1_src = "ESSRAT"; ac1_src = "ESSRAT";
} else if (dcbat and ias >= 50) { } else if (dcbat and ias >= 50) {
setprop("/systems/electrical/bus/ac1", 0); setprop("/systems/electrical/bus/ac1", 0);
if (!ac_ess_fail) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac1_src = "ESSBAT"; ac1_src = "ESSBAT";
} else { } else {
setprop("/systems/electrical/bus/ac1", 0); setprop("/systems/electrical/bus/ac1", 0);
if (getprop("/systems/electrical/bus/ac2") == 0) {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac1_src = "XX"; ac1_src = "XX";
} }
# Right AC bus yes? # Right AC bus yes?
if (stateR == 3 and gen2_sw and !gen2_fail) { if (stateR == 3 and gen2_sw and !gen2_fail) {
setprop("/systems/electrical/bus/ac2", ac_volt_std); setprop("/systems/electrical/bus/ac2", ac_volt_std);
if (!ac_ess_fail) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac2_src = "GEN"; ac2_src = "GEN";
} else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) { } else if (extpwr_on and gen_ext_sw and apu_ext_crosstie_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std); setprop("/systems/electrical/bus/ac2", ac_volt_std);
if (!ac_ess_fail) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac2_src = "EXT"; ac2_src = "EXT";
} else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) { } else if (gen_apu and !genapu_fail and apu_ext_crosstie_sw) {
setprop("/systems/electrical/bus/ac2", ac_volt_std); setprop("/systems/electrical/bus/ac2", ac_volt_std);
if (!ac_ess_fail) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac2_src = "APU"; ac2_src = "APU";
} else if (apu_ext_crosstie_sw == 1 and xtieR) { } else if (apu_ext_crosstie_sw == 1 and xtieR) {
setprop("/systems/electrical/bus/ac2", ac_volt_std); setprop("/systems/electrical/bus/ac2", ac_volt_std);
if (!ac_ess_fail) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac2_src = "XTIE"; ac2_src = "XTIE";
} else if (emergen) { } else if (emergen) {
setprop("/systems/electrical/bus/ac2", 0); setprop("/systems/electrical/bus/ac2", 0);
if (!ac_ess_fail) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else {
setprop("/systems/electrical/bus/ac-ess", 0);
}
ac2_src = "ESSRAT"; ac2_src = "ESSRAT";
} else if (dcbat and ias >= 50) { } else if (dcbat and ias >= 50) {
setprop("/systems/electrical/bus/ac2", 0); setprop("/systems/electrical/bus/ac2", 0);
ac2_src = "ESSBAT";
} else {
setprop("/systems/electrical/bus/ac2", 0);
ac2_src = "XX";
}
ac1 = getprop("/systems/electrical/bus/ac1");
ac2 = getprop("/systems/electrical/bus/ac2");
# AC ESS bus yes?
if (!ac_ess_fail) { if (!ac_ess_fail) {
if (ac1 >= 110 and !ac_ess_feed_sw) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else if (ac2 >= 110 and ac_ess_feed_sw) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else if (emergen or (dcbat and ias >= 50)) {
setprop("/systems/electrical/bus/ac-ess", ac_volt_std); setprop("/systems/electrical/bus/ac-ess", ac_volt_std);
} else { } else {
setprop("/systems/electrical/bus/ac-ess", 0); setprop("/systems/electrical/bus/ac-ess", 0);
} }
ac2_src = "ESSBAT";
} else { } else {
setprop("/systems/electrical/bus/ac2", 0);
if (getprop("/systems/electrical/bus/ac1") == 0) {
setprop("/systems/electrical/bus/ac-ess", 0); setprop("/systems/electrical/bus/ac-ess", 0);
} }
ac2_src = "XX";
} ac_ess = getprop("/systems/electrical/bus/ac-ess");
# HZ/Volts yes? # HZ/Volts yes?
if (stateL == 3 and gen1_sw and !gen1_fail) { if (stateL == 3 and gen1_sw and !gen1_fail) {
@ -563,10 +517,6 @@ var ELEC = {
setprop("/systems/electrical/extra/apu-hz", 0); setprop("/systems/electrical/extra/apu-hz", 0);
} }
ac1 = getprop("/systems/electrical/bus/ac1");
ac2 = getprop("/systems/electrical/bus/ac2");
ac_ess = getprop("/systems/electrical/bus/ac-ess");
if (ac1 == 0 and ac2 == 0 and emergen == 0) { if (ac1 == 0 and ac2 == 0 and emergen == 0) {
setprop("/systems/electrical/bus/ac-ess-shed", 0); setprop("/systems/electrical/bus/ac-ess-shed", 0);
} else { } else {
@ -738,7 +688,7 @@ var ELEC = {
setprop("/systems/electrical/gen1-fault", 0); setprop("/systems/electrical/gen1-fault", 0);
} }
if (ac_ess_fail and ac_ess_feed_sw) { if (ac_ess_fail) {
setprop("/systems/electrical/ac-ess-feed-fault", 1); setprop("/systems/electrical/ac-ess-feed-fault", 1);
} else { } else {
setprop("/systems/electrical/ac-ess-feed-fault", 0); setprop("/systems/electrical/ac-ess-feed-fault", 0);

2
revision.txt
View file

@ -1 +1 @@
4210 4211