yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 17:59:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Move Battery2 power calculation outside SOC scaling function

Browse source
This commit is contained in:
Daniel Öster 2025-01-12 12:06:02 +02:00
parent 9afa16c7ae
commit 0a31337334
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Software/Software.ino
View file

@ -355,6 +355,12 @@ void update_calculated_values() {
datalayer.battery.status.active_power_W = datalayer.battery.status.active_power_W =
(datalayer.battery.status.current_dA * (datalayer.battery.status.voltage_dV / 100)); (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) { if (datalayer.battery.settings.soc_scaling_active) {
/** SOC Scaling /** SOC Scaling
* *
@ -404,10 +410,6 @@ void update_calculated_values() {
} }
#ifdef DOUBLE_BATTERY #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 // Calculate the scaled remaining capacity in Wh
if (datalayer.battery2.info.total_capacity_Wh > 0 && datalayer.battery2.status.real_soc > 0) { if (datalayer.battery2.info.total_capacity_Wh > 0 && datalayer.battery2.status.real_soc > 0) {
calc_max_capacity = calc_max_capacity =