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

Initial commit

Browse source
This commit is contained in:
Cabooman 2024-02-12 20:16:39 +01:00
parent 8f61883a7e
commit db1e679044
3 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Software/src/devboard/utils/events.cpp
View file

@ -131,6 +131,7 @@ void init_events(void) {
events.entries[EVENT_SERIAL_RX_FAILURE].level = EVENT_LEVEL_ERROR; events.entries[EVENT_SERIAL_RX_FAILURE].level = EVENT_LEVEL_ERROR;
events.entries[EVENT_SERIAL_TX_FAILURE].level = EVENT_LEVEL_ERROR; events.entries[EVENT_SERIAL_TX_FAILURE].level = EVENT_LEVEL_ERROR;
events.entries[EVENT_SERIAL_TRANSMITTER_FAILURE].level = EVENT_LEVEL_ERROR; events.entries[EVENT_SERIAL_TRANSMITTER_FAILURE].level = EVENT_LEVEL_ERROR;
events.entries[EVENT_OTA_UPDATE_TIMEOUT].level = EVENT_LEVEL_INFO;
events.entries[EVENT_DUMMY_INFO].log = true; events.entries[EVENT_DUMMY_INFO].log = true;
events.entries[EVENT_DUMMY_DEBUG].log = true; events.entries[EVENT_DUMMY_DEBUG].log = true;
@ -213,6 +214,8 @@ const char* get_event_message_string(EVENTS_ENUM_TYPE event) {
return "Error in serial function: Some ERROR level fault in transmitter, received by receiver"; return "Error in serial function: Some ERROR level fault in transmitter, received by receiver";
case EVENT_OTA_UPDATE: case EVENT_OTA_UPDATE:
return "OTA update started!"; return "OTA update started!";
case EVENT_OTA_UPDATE_TIMEOUT:
return "OTA update timed out!";
default: default:
return ""; return "";
} }

1
Software/src/devboard/utils/events.h
View file

@ -39,6 +39,7 @@
XX(EVENT_CELL_DEVIATION_HIGH) \ XX(EVENT_CELL_DEVIATION_HIGH) \
XX(EVENT_UNKNOWN_EVENT_SET) \ XX(EVENT_UNKNOWN_EVENT_SET) \
XX(EVENT_OTA_UPDATE) \ XX(EVENT_OTA_UPDATE) \
XX(EVENT_OTA_UPDATE_TIMEOUT) \
XX(EVENT_DUMMY_INFO) \ XX(EVENT_DUMMY_INFO) \
XX(EVENT_DUMMY_DEBUG) \ XX(EVENT_DUMMY_DEBUG) \
XX(EVENT_DUMMY_WARNING) \ XX(EVENT_DUMMY_WARNING) \

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

@ -1,6 +1,7 @@
#include "webserver.h" #include "webserver.h"
#include <Preferences.h> #include <Preferences.h>
#include "../utils/events.h" #include "../utils/events.h"
#include "../utils/timer.h"
// Create AsyncWebServer object on port 80 // Create AsyncWebServer object on port 80
AsyncWebServer server(80); AsyncWebServer server(80);
@ -21,6 +22,9 @@ enum WifiState {
WifiState wifi_state = INIT; WifiState wifi_state = INIT;
MyTimer ota_timeout_timer = MyTimer(5000);
bool ota_active = false;
unsigned const long WIFI_MONITOR_INTERVAL_TIME = 15000; unsigned const long WIFI_MONITOR_INTERVAL_TIME = 15000;
unsigned const long INIT_WIFI_CONNECT_TIMEOUT = 8000; // Timeout for initial WiFi connect in milliseconds unsigned const long INIT_WIFI_CONNECT_TIMEOUT = 8000; // Timeout for initial WiFi connect in milliseconds
unsigned const long DEFAULT_WIFI_RECONNECT_INTERVAL = 1000; // Default WiFi reconnect interval in ms unsigned const long DEFAULT_WIFI_RECONNECT_INTERVAL = 1000; // Default WiFi reconnect interval in ms
@ -299,6 +303,13 @@ void wifi_monitor() {
Serial.println(" Hostname: " + String(WiFi.getHostname())); Serial.println(" Hostname: " + String(WiFi.getHostname()));
} }
} }
if (ota_active && ota_timeout_timer.elapsed()) {
// OTA timeout, try to restore can and clear the update event
ESP32Can.CANInit();
clear_event(EVENT_OTA_UPDATE);
set_event(EVENT_OTA_UPDATE_TIMEOUT, 0);
}
} }
void init_WiFi_STA(const char* ssid, const char* password, const uint8_t wifi_channel) { void init_WiFi_STA(const char* ssid, const char* password, const uint8_t wifi_channel) {
@ -635,6 +646,11 @@ void onOTAStart() {
// Log when OTA has started // Log when OTA has started
ESP32Can.CANStop(); ESP32Can.CANStop();
set_event(EVENT_OTA_UPDATE, 0); set_event(EVENT_OTA_UPDATE, 0);
// If already set, make a new attempt
clear_event(EVENT_OTA_UPDATE_TIMEOUT);
ota_active = true;
ota_timeout_timer.reset();
} }
void onOTAProgress(size_t current, size_t final) { void onOTAProgress(size_t current, size_t final) {
@ -642,6 +658,9 @@ void onOTAProgress(size_t current, size_t final) {
if (millis() - ota_progress_millis > 1000) { if (millis() - ota_progress_millis > 1000) {
ota_progress_millis = millis(); ota_progress_millis = millis();
Serial.printf("OTA Progress Current: %u bytes, Final: %u bytes\n", current, final); Serial.printf("OTA Progress Current: %u bytes, Final: %u bytes\n", current, final);
// Reset the "watchdog"
ota_timeout_timer.reset();
} }
} }
@ -651,7 +670,11 @@ void onOTAEnd(bool success) {
Serial.println("OTA update finished successfully!"); Serial.println("OTA update finished successfully!");
} else { } else {
Serial.println("There was an error during OTA update!"); Serial.println("There was an error during OTA update!");
// If we fail without a timeout, try to restore CAN
ESP32Can.CANInit();
} }
ota_active = false;
clear_event(EVENT_OTA_UPDATE); clear_event(EVENT_OTA_UPDATE);
} }