From dc3604f144dcd7604bd63970e5efccec158bab62 Mon Sep 17 00:00:00 2001 From: jomjol <30766535+jomjol@users.noreply.github.com> Date: Sun, 27 Nov 2022 18:39:31 +0100 Subject: [PATCH] v13.0.0 --- Changelog.md | 1 + .../jomjol_fileserver_ota/server_ota.cpp | 80 ++++++++++++++++++- .../jomjol_fileserver_ota/server_ota.h | 6 +- code/main/main.cpp | 3 + 4 files changed, 87 insertions(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index 01e72a33..701690ea 100644 --- a/Changelog.md +++ b/Changelog.md @@ -29,6 +29,7 @@ If anything breaks you can try to enforce manual update as following: - Implementation of [Home Assistant MQTT Discovery](https://www.home-assistant.io/integrations/mqtt/#mqtt-discovery) - Improved ROIs configuration: locked ROI geometry, equidistant delta x +- Improved OTA Update mechanism (only working after installation for next update) - Added data logging in `/log/data` - One day per file and each measurement is on one line - Format: csv - comma separated - Content: `time`, `name-of-number`, `raw-value`, `return-value`, `pre-value`, `change-rate`, `change-absolute`, `error-text`, `cnn-digital`, `cnn-analog` diff --git a/code/components/jomjol_fileserver_ota/server_ota.cpp b/code/components/jomjol_fileserver_ota/server_ota.cpp index 30e4449b..2ebd8fd0 100644 --- a/code/components/jomjol_fileserver_ota/server_ota.cpp +++ b/code/components/jomjol_fileserver_ota/server_ota.cpp @@ -52,6 +52,68 @@ static const char *TAG = "OTA"; esp_err_t handler_reboot(httpd_req_t *req); +std::string _file_name_update; + + +void task_do_Update_ZIP(void *pvParameter) +{ + std::string filetype = toUpper(getFileType(_file_name_update)); + + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "File: " + _file_name_update + " Filetype: " + filetype); + + + if (filetype == "ZIP") + { + std::string in, out, outbin, zw, retfirmware; + + out = "/sdcard/html"; + outbin = "/sdcard/firmware"; + + retfirmware = unzip_new(_file_name_update, out+"/", outbin+"/"); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Files unzipped."); + + if (retfirmware.length() > 0) + { + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Found firmware.bin"); + ota_update_task(retfirmware); + } + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Trigger reboot due to firmware update."); + doReboot(); + } + else + { + LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Only ZIP-Files support for update during startup!"); + } +} + + +void CheckUpdate() +{ + FILE *pfile; + if ((pfile = fopen("/sdcard/update.txt", "r")) == NULL) + { + LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "No update triggered."); + return; + } + + char zw[1024] = ""; + fgets(zw, 1024, pfile); + _file_name_update = std::string(zw); + fclose(pfile); + DeleteFile("/sdcard/update.txt"); // Prevent Boot Loop!!! + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Update during boot triggered - Update File: " + _file_name_update); + + + BaseType_t xReturned; + int _i = configMINIMAL_STACK_SIZE; + xReturned = xTaskCreate(&task_do_Update_ZIP, "task_do_Update_ZIP", configMINIMAL_STACK_SIZE * 35, NULL, tskIDLE_PRIORITY+1, NULL); + TickType_t xDelay; + xDelay = 2000000 / portTICK_PERIOD_MS; + ESP_LOGD(TAG, "Wait for Update to be finished: sleep for: %ldms", (long) xDelay); + vTaskDelay( xDelay ); +} + + static void infinite_loop(void) { @@ -373,6 +435,21 @@ esp_err_t handler_ota_update(httpd_req_t *req) if (filetype == "ZIP") { + FILE *pfile; + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Update for reboot."); + pfile = fopen("/sdcard/update.txt", "w"); + fwrite(fn.c_str(), fn.length(), 1, pfile); + fclose(pfile); + + std::string zw = "reboot\n"; + httpd_resp_sendstr_chunk(req, zw.c_str()); + httpd_resp_sendstr_chunk(req, NULL); + ESP_LOGD(TAG, "Send reboot"); + return ESP_OK; + + + +/* std::string in, out, outbin, zw, retfirmware; out = "/sdcard/html"; @@ -392,6 +469,7 @@ esp_err_t handler_ota_update(httpd_req_t *req) httpd_resp_sendstr_chunk(req, NULL); return ESP_OK; } +*/ } @@ -537,7 +615,7 @@ esp_err_t handler_reboot(httpd_req_t *req) LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "handler_reboot"); ESP_LOGI(TAG, "!!! System will restart within 5 sec!!!"); - const char* resp_str = "

"; + const char* resp_str = "

"; httpd_resp_send(req, resp_str, strlen(resp_str)); doReboot(); diff --git a/code/components/jomjol_fileserver_ota/server_ota.h b/code/components/jomjol_fileserver_ota/server_ota.h index 415e5fd9..db9093e6 100644 --- a/code/components/jomjol_fileserver_ota/server_ota.h +++ b/code/components/jomjol_fileserver_ota/server_ota.h @@ -2,10 +2,12 @@ #include -//#include "ClassControllCamera.h" +#include + void register_server_ota_sdcard_uri(httpd_handle_t server); void CheckOTAUpdate(); void doReboot(); void hard_restart(); - +void CheckUpdate(); +static bool ota_update_task(std::string fn); \ No newline at end of file diff --git a/code/main/main.cpp b/code/main/main.cpp index f1665a2e..1ca173ae 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -174,9 +174,12 @@ extern "C" void app_main(void) ESP_LOGD(TAG, "============================================================================================="); ESP_LOGD(TAG, "Reset reason: %s", getResetReason().c_str()); + + CheckOTAUpdate(); LogFile.CreateLogDirectories(); + CheckUpdate(); /* int mk_ret = mkdir("/sdcard/new_fd_mkdir", 0775); ESP_LOGI(TAG, "mkdir ret %d", mk_ret);