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

Fix panic Issue on OTA and change pause terminology

Browse source
This commit is contained in:
amarofarinha 2024-09-29 09:16:34 +01:00
parent 0cd0b384c3
commit 7614c0473d
2 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Software/src/devboard/webserver/webserver.cpp
View file

@ -620,8 +620,15 @@ String processor(const String& var) {
content += formatPowerValue("Power", powerFloat, "", 1); content += formatPowerValue("Power", powerFloat, "", 1);
content += formatPowerValue("Total capacity", datalayer.battery.info.total_capacity_Wh, "h", 0); content += formatPowerValue("Total capacity", datalayer.battery.info.total_capacity_Wh, "h", 0);
content += formatPowerValue("Remaining capacity", datalayer.battery.status.remaining_capacity_Wh, "h", 1); content += formatPowerValue("Remaining capacity", datalayer.battery.status.remaining_capacity_Wh, "h", 1);
content += formatPowerValue("Max discharge power", datalayer.battery.status.max_discharge_power_W, "", 1);
content += formatPowerValue("Max charge power", datalayer.battery.status.max_charge_power_W, "", 1); if (emulator_pause_status == NORMAL) {
content += formatPowerValue("Max discharge power", datalayer.battery.status.max_discharge_power_W, "", 1);
content += formatPowerValue("Max charge power", datalayer.battery.status.max_charge_power_W, "", 1);
} else {
content += formatPowerValue("Max discharge power", datalayer.battery.status.max_discharge_power_W, "", 1, "red");
content += formatPowerValue("Max charge power", datalayer.battery.status.max_charge_power_W, "", 1, "red");
}
content += "<h4>Cell max: " + String(datalayer.battery.status.cell_max_voltage_mV) + " mV</h4>"; content += "<h4>Cell max: " + String(datalayer.battery.status.cell_max_voltage_mV) + " mV</h4>";
content += "<h4>Cell min: " + String(datalayer.battery.status.cell_min_voltage_mV) + " mV</h4>"; content += "<h4>Cell min: " + String(datalayer.battery.status.cell_min_voltage_mV) + " mV</h4>";
content += "<h4>Temperature max: " + String(tempMaxFloat, 1) + " C</h4>"; content += "<h4>Temperature max: " + String(tempMaxFloat, 1) + " C</h4>";
@ -656,9 +663,9 @@ String processor(const String& var) {
content += "<span style='color: red;'>&#10005;</span></h4>"; content += "<span style='color: red;'>&#10005;</span></h4>";
} }
if (emulator_pause_status == NORMAL) if (emulator_pause_status == NORMAL)
content += "<h4>Pause status: " + String(get_emulator_pause_status().c_str()) + " </h4>"; content += "<h4>Power status: " + String(get_emulator_pause_status().c_str()) + " </h4>";
else else
content += "<h4 style='color: red;'>Pause status: " + String(get_emulator_pause_status().c_str()) + " </h4>"; content += "<h4 style='color: red;'>Power status: " + String(get_emulator_pause_status().c_str()) + " </h4>";
#ifdef CONTACTOR_CONTROL #ifdef CONTACTOR_CONTROL
content += "<h4>Contactors controlled by Battery-Emulator: "; content += "<h4>Contactors controlled by Battery-Emulator: ";
@ -822,9 +829,9 @@ String processor(const String& var) {
#endif // defined CHEVYVOLT_CHARGER || defined NISSANLEAF_CHARGER #endif // defined CHEVYVOLT_CHARGER || defined NISSANLEAF_CHARGER
if (emulator_pause_request_ON) if (emulator_pause_request_ON)
content += "<button onclick='PauseBattery(false)'>Resume Battery</button>"; content += "<button onclick='PauseBattery(false)'>Resume charge/discharge</button>";
else else
content += "<button onclick='PauseBattery(true)'>Pause Battery</button>"; content += "<button onclick='PauseBattery(true)'>Pause charge/discharge</button>";
content += " "; content += " ";
content += "<button onclick='OTA()'>Perform OTA update</button>"; content += "<button onclick='OTA()'>Perform OTA update</button>";
content += " "; content += " ";
@ -888,6 +895,10 @@ void onOTAStart() {
// If already set, make a new attempt // If already set, make a new attempt
clear_event(EVENT_OTA_UPDATE_TIMEOUT); clear_event(EVENT_OTA_UPDATE_TIMEOUT);
ota_active = true; ota_active = true;
//completely force stop the CAN communication
ESP32Can.CANStop();
ota_timeout_timer.reset(); ota_timeout_timer.reset();
} }
@ -920,12 +931,15 @@ void onOTAEnd(bool success) {
#endif // DEBUG_VIA_USB #endif // DEBUG_VIA_USB
//try to Resume the battery pause and CAN communication //try to Resume the battery pause and CAN communication
setBatteryPause(false, false); setBatteryPause(false, false);
//resume CAN communication
ESP32Can.CANInit();
} }
} }
template <typename T> // This function makes power values appear as W when under 1000, and kW when over template <typename T> // This function makes power values appear as W when under 1000, and kW when over
String formatPowerValue(String label, T value, String unit, int precision) { String formatPowerValue(String label, T value, String unit, int precision, String color) {
String result = "<h4 style='color: white;'>" + label + ": "; String result = "<h4 style='color: " + color + ";'>" + label + ": ";
if (std::is_same<T, float>::value || std::is_same<T, uint16_t>::value || std::is_same<T, uint32_t>::value) { if (std::is_same<T, float>::value || std::is_same<T, uint16_t>::value || std::is_same<T, uint32_t>::value) {
float convertedValue = static_cast<float>(value); float convertedValue = static_cast<float>(value);

2
Software/src/devboard/webserver/webserver.h
View file

@ -102,7 +102,7 @@ void onOTAEnd(bool success);
* @return string: values * @return string: values
*/ */
template <typename T> template <typename T>
String formatPowerValue(String label, T value, String unit, int precision); String formatPowerValue(String label, T value, String unit, int precision, String color = "white");
extern void storeSettings(); extern void storeSettings();