From 0a31337334fa7aec6b976b51e2ad9b7f84aa0b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C3=96ster?= Date: Sun, 12 Jan 2025 12:06:02 +0200 Subject: [PATCH] Move Battery2 power calculation outside SOC scaling function --- Software/Software.ino | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Software/Software.ino b/Software/Software.ino index 25787800..d981dacd 100644 --- a/Software/Software.ino +++ b/Software/Software.ino @@ -355,6 +355,12 @@ void update_calculated_values() { datalayer.battery.status.active_power_W = (datalayer.battery.status.current_dA * (datalayer.battery.status.voltage_dV / 100)); +#ifdef DOUBLE_BATTERY + /* Calculate active power based on voltage and current for battery 2*/ + datalayer.battery2.status.active_power_W = + (datalayer.battery2.status.current_dA * (datalayer.battery2.status.voltage_dV / 100)); +#endif // DOUBLE_BATTERY + if (datalayer.battery.settings.soc_scaling_active) { /** SOC Scaling * @@ -404,10 +410,6 @@ void update_calculated_values() { } #ifdef DOUBLE_BATTERY - /* Calculate active power based on voltage and current*/ - datalayer.battery2.status.active_power_W = - (datalayer.battery2.status.current_dA * (datalayer.battery2.status.voltage_dV / 100)); - // Calculate the scaled remaining capacity in Wh if (datalayer.battery2.info.total_capacity_Wh > 0 && datalayer.battery2.status.real_soc > 0) { calc_max_capacity =