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

Add (dis)charged_energy_Wh to datalayer and mqtt. (#1003)

Browse source 
- Add (dis)charged_energy_Wh to datalayer and mqtt.
- MEB: report (dis)charged_energy_Wh
- MEB: Fix SOH calculation.
- TESLA: also use the total_(dis)charged_battery_Wh in generic datalayer.
This commit is contained in:
Marijn van Galen 2025-03-25 19:18:20 +01:00 • committed by GitHub
parent 02d2e518ba
commit 07a4ad7abc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Software/src/devboard/webserver/advanced_battery_html.cpp
View file

@ -506,8 +506,8 @@ String advanced_battery_processor(const String& var) {
float energy_buffer_m1 = static_cast<float>(datalayer_extended.tesla.battery_energy_buffer_m1) * 0.01;
float expected_energy_remaining_m1 =
static_cast<float>(datalayer_extended.tesla.battery_expected_energy_remaining_m1) * 0.02;
float total_discharge = static_cast<float>(datalayer_extended.tesla.battery_total_discharge);
float total_charge = static_cast<float>(datalayer_extended.tesla.battery_total_charge);
float total_discharge = static_cast<float>(datalayer.battery.status.total_discharged_battery_Wh) * 0.001;
float total_charge = static_cast<float>(datalayer.battery.status.total_charged_battery_Wh) * 0.001;
float packMass = static_cast<float>(datalayer_extended.tesla.battery_packMass);
float platformMaxBusVoltage =
static_cast<float>(datalayer_extended.tesla.battery_platformMaxBusVoltage) * 0.1 + 375;
@ -1186,6 +1186,10 @@ String advanced_battery_processor(const String& var) {
}
content += " &deg;C</h4>";
}
content +=
"<h4>Total charged: " + String(datalayer.battery.status.total_charged_battery_Wh / 1000.0, 1) + " kWh</h4>";
content += "<h4>Total discharged: " + String(datalayer.battery.status.total_discharged_battery_Wh / 1000.0, 1) +
" kWh</h4>";
#endif //MEB_BATTERY
#ifdef RENAULT_ZOE_GEN2_BATTERY