From 8002e49797714da10c1e456a4e02b3d8495c091e Mon Sep 17 00:00:00 2001 From: Joshua Davidson Date: Thu, 25 Jan 2018 14:18:05 -0500 Subject: [PATCH] Revert "fix DCBAT / DC1 / DC2 logic" This reverts commit c300665c796becfb511e60a38e1853e38471c050. --- Nasal/electrical.nas | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Nasal/electrical.nas b/Nasal/electrical.nas index 0fc8d2d2..7415a233 100644 --- a/Nasal/electrical.nas +++ b/Nasal/electrical.nas @@ -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);