Revert "fix DCBAT / DC1 / DC2 logic"

This reverts commit c300665c79.
This commit is contained in:
Joshua Davidson 2018-01-25 14:18:05 -05:00
parent ca31edb351
commit 8002e49797

View file

@ -302,7 +302,7 @@ var ELEC = {
setprop("/systems/electrical/battery2-amps", 0);
}
if (getprop("/systems/electrical/dc1") > 25 or or getprop("/systems/electrical/dc2") > 25) {
if (getprop("/systems/electrical/battery1-amps") > 120 or getprop("/systems/electrical/battery2-amps") > 120) {
setprop("/systems/electrical/bus/dcbat", dc_volt_std);
} else {
setprop("/systems/electrical/bus/dcbat", 0);
@ -367,10 +367,6 @@ var ELEC = {
setprop("/systems/electrical/bus/dc1", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc1-amps", dc_amps_std);
} else if (dc2 > 25 and dcbat > 25) {
setprop("/systems/electrical/bus/dc1", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc1-amps", dc_amps_std);
} else if (emergen) {
setprop("/systems/electrical/bus/dc1", 0);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
@ -398,10 +394,6 @@ var ELEC = {
} else if (apu_ext_crosstie_sw == 1 and xtieR) {
setprop("/systems/electrical/bus/dc2", dc_volt_std);
setprop("/systems/electrical/bus/dc2-amps", dc_amps_std);
} else if (dc1 > 25 and dcbat > 25) {
setprop("/systems/electrical/bus/dc1", dc_volt_std);
setprop("/systems/electrical/bus/dc-ess", dc_volt_std);
setprop("/systems/electrical/bus/dc1-amps", dc_amps_std);
} else if (emergen) {
setprop("/systems/electrical/bus/dc2", 0);
setprop("/systems/electrical/bus/dc2-amps", 0);