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

Always show estimated SOC on More info page regardless of SOC method (#1246)

Browse source
This commit is contained in:
freddanastrom 2025-06-18 14:35:36 +02:00 • committed by GitHub
parent e49ccbc5d8
commit 0886b0993d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Software/src/battery/BYD-ATTO-3-BATTERY.cpp
View file

@ -151,6 +151,13 @@ void BydAttoBattery::
datalayer_battery->status.voltage_dV = BMS_voltage * 10; datalayer_battery->status.voltage_dV = BMS_voltage * 10;
} }
if (battery_type == EXTENDED_RANGE) {
battery_estimated_SOC = estimateSOCextended(datalayer_battery->status.voltage_dV);
}
if (battery_type == STANDARD_RANGE) {
battery_estimated_SOC = estimateSOCstandard(datalayer_battery->status.voltage_dV);
}
if (SOC_method == MEASURED) { if (SOC_method == MEASURED) {
// Pack is not crashed, we can use periodically transmitted SOC // Pack is not crashed, we can use periodically transmitted SOC
datalayer_battery->status.real_soc = battery_highprecision_SOC * 10; datalayer_battery->status.real_soc = battery_highprecision_SOC * 10;
@ -158,12 +165,7 @@ void BydAttoBattery::
// When the battery is crashed hard, it locks itself and SOC becomes unavailable. // When the battery is crashed hard, it locks itself and SOC becomes unavailable.
// We instead estimate the SOC% based on the battery voltage. // We instead estimate the SOC% based on the battery voltage.
// This is a bad solution, you wont be able to use 100% of the battery // This is a bad solution, you wont be able to use 100% of the battery
if (battery_type == EXTENDED_RANGE) { datalayer_battery->status.real_soc = battery_estimated_SOC;
datalayer_battery->status.real_soc = estimateSOCextended(datalayer_battery->status.voltage_dV);
}
if (battery_type == STANDARD_RANGE) {
datalayer_battery->status.real_soc = estimateSOCstandard(datalayer_battery->status.voltage_dV);
}
} }
datalayer_battery->status.current_dA = -BMS_current; datalayer_battery->status.current_dA = -BMS_current;
@ -255,8 +257,7 @@ void BydAttoBattery::
// Update webserver datalayer // Update webserver datalayer
if (datalayer_bydatto) { if (datalayer_bydatto) {
datalayer_bydatto->SOC_method = SOC_method; datalayer_bydatto->SOC_method = SOC_method;
datalayer_bydatto->SOC_estimated = datalayer_battery->status.real_soc; datalayer_bydatto->SOC_estimated = battery_estimated_SOC;
//Once we implement switching logic, remember to change from where the estimated is taken
datalayer_bydatto->SOC_highprec = battery_highprecision_SOC; datalayer_bydatto->SOC_highprec = battery_highprecision_SOC;
datalayer_bydatto->SOC_polled = BMS_SOC; datalayer_bydatto->SOC_polled = BMS_SOC;
datalayer_bydatto->voltage_periodic = battery_voltage; datalayer_bydatto->voltage_periodic = battery_voltage;

1
Software/src/battery/BYD-ATTO-3-BATTERY.h
View file

@ -100,6 +100,7 @@ class BydAttoBattery : public CanBattery {
int16_t battery_calc_min_temperature = 0; int16_t battery_calc_min_temperature = 0;
int16_t battery_calc_max_temperature = 0; int16_t battery_calc_max_temperature = 0;
uint16_t battery_highprecision_SOC = 0; uint16_t battery_highprecision_SOC = 0;
uint16_t battery_estimated_SOC = 0;
uint16_t BMS_SOC = 0; uint16_t BMS_SOC = 0;
uint16_t BMS_voltage = 0; uint16_t BMS_voltage = 0;
int16_t BMS_current = 0; int16_t BMS_current = 0;