From 1ff1101566426b42accdd511b2c844cf0eed0328 Mon Sep 17 00:00:00 2001 From: amarofarinha <151563493+amarofarinha@users.noreply.github.com> Date: Sun, 29 Sep 2024 16:24:14 +0100 Subject: [PATCH 1/2] Improve OTA Update by Removing Delay and Immediate CAN Control --- Software/src/devboard/safety/safety.cpp | 3 +++ .../src/lib/ayushsharma82-ElegantOTA/src/ElegantOTA.cpp | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Software/src/devboard/safety/safety.cpp b/Software/src/devboard/safety/safety.cpp index 36bacb53..7e269883 100644 --- a/Software/src/devboard/safety/safety.cpp +++ b/Software/src/devboard/safety/safety.cpp @@ -218,6 +218,9 @@ void setBatteryPause(bool pause_battery, bool pause_CAN) { emulator_pause_status = RESUMING; clear_event(EVENT_PAUSE_END); } + + //immidiate check if we can send CAN messages + emulator_pause_state_send_CAN_battery(); } /// @brief handle emulator pause status diff --git a/Software/src/lib/ayushsharma82-ElegantOTA/src/ElegantOTA.cpp b/Software/src/lib/ayushsharma82-ElegantOTA/src/ElegantOTA.cpp index a414f349..ec1b2a37 100644 --- a/Software/src/lib/ayushsharma82-ElegantOTA/src/ElegantOTA.cpp +++ b/Software/src/lib/ayushsharma82-ElegantOTA/src/ElegantOTA.cpp @@ -45,12 +45,6 @@ void ElegantOTAClass::begin(ELEGANTOTA_WEBSERVER *server, const char * username, // Pre-OTA update callback if (preUpdateCallback != NULL) preUpdateCallback(); - - // Sleep for 3 seconds to allow asynchronous preUpdateCallback tasks to complete - unsigned long sleepStart = millis(); - while (millis() - sleepStart < 3000) { // Sleep for 3 second - delay(1); // Yield to other tasks - } // Get header x-ota-mode value, if present OTA_Mode mode = OTA_MODE_FIRMWARE; From 239371c314e014d6ca2a36f16e51af36f1896ddf Mon Sep 17 00:00:00 2001 From: amarofarinha <151563493+amarofarinha@users.noreply.github.com> Date: Sun, 29 Sep 2024 16:28:46 +0100 Subject: [PATCH 2/2] comment correction --- Software/src/devboard/safety/safety.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Software/src/devboard/safety/safety.cpp b/Software/src/devboard/safety/safety.cpp index 7e269883..90719a99 100644 --- a/Software/src/devboard/safety/safety.cpp +++ b/Software/src/devboard/safety/safety.cpp @@ -219,7 +219,7 @@ void setBatteryPause(bool pause_battery, bool pause_CAN) { clear_event(EVENT_PAUSE_END); } - //immidiate check if we can send CAN messages + //immediate check if we can send CAN messages emulator_pause_state_send_CAN_battery(); }