mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-06 11:36:51 +03:00
* Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md * Update Changelog.md * Rearange task to CPU (http, camera, mqtt) (#1557) * Streamlined MQTT interlock when not activated & interlock MQTT when WIFI is not connected (#1556) * streamlined mqtt interlock when disabled * Disconnect mqtt client before reboot * Interlock MQTT with WIFI * Update * loglevel to DEBUG * Update * mqtt msg id incremental * new ENABLE_MQTT includes * Loglevel to DEBUG * Loglevel * Update interface_mqtt.cpp * show uptime on overview page, moved labels from firmware to Web UI (#1543) * show uptime on overview page, moved labels from firmware to Web UI * show uptime on info page * also use formated time in log Co-authored-by: CaCO3 <caco@ruinelli.ch> * Continue boot on bad PSRAM (#1558) * add sensor status, show special index/setup page in case of a critical error * continue booting on PSRAM error * Update main.cpp added log messages * init PSRAM and add more log messages * cleanup of init checks * . * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * add sensor status, show special index/setup page in case of a critical error (#1560) * add sensor status, show special index/setup page in case of a critical error * Added Reboot * . * added more buttons Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Update Webinstaller to v13.0.7 * remove html-from-11.3.1 in release (#1565) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota Co-authored-by: github-actions <github-actions@github.com> * make the sidebar on the overviw page wider and show the round counter (#1570) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Create reply-bot.yml * Update ClassFlowPostProcessing.cpp * Add bot (#1581) * Update reply-bot.yml * Create label-commenter-config.yml * added missing html change * extended instructions (#1583) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix Rate Problem * removed redundant "Status:" * Bugfix Double Extract ZIP-Files * Update FeatureRequest.md (#1591) in case of position change between the measurments set this state to true, if there is no change set it back to false. In a defined time window this movement can lead into an alarm state / water leak.. haveing this state in the mqtt broker can trigger functions like closing the ater pipe walve and so on... * Update manifest.json * Delete .gitignore * Delete .gitmodules * Delete firmware.bin * Add files via upload * Block REST API calls till resource is ready (#1609) * Block REST API call till ressource is ready * Update * Update * Update * replace relative include of gethost.js with absolute one. This is needed as that file gets incuded on dynamically generated content which can be on different path levels (#1610) Co-authored-by: CaCO3 <caco@ruinelli.ch> * esp_spiram.h has been replaced by esp32/spiram.h (#1605) * esp_spiram.h has been replaced by esp32/spiram.h * Preparations for next Bugfix Release (#1615) * Merge branch 'rolling' (#1559) * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * fix frozen time in datafile on error (#1534) Co-authored-by: CaCO3 <caco@ruinelli.ch> * log NTP server name (#1497) * log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> * Renamed variables and added debug log (#1537) * add debug logs * renamed variables * renamed TAGs, added flow status logging * . * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * replaced printf usage in LogFile.WriteToFile() * ENABLE_MQTT c++ macro definition (#1546) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition (#1547) * macro * 2 * 2 * delete jomjol_mqtt from CMakeLists * mqtt macro * final * ENABLE_INFLUXDB c++ macro definition * Update Changelog.md Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * Update Changelog.md for release Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> * new model version (#1619) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 * only initial_esp32_setup and update.zip as artefacts * remove unneeded cache * rename step ota-v2 to ota * rename ota-v2 to ota * new models - ana-class100 v1.5.4 - ana-cont-11.0.4 - dig-class100 v1.5.0 Co-authored-by: github-actions <github-actions@github.com> * Update Changelog.md (#1630) * Correct RenameNumber * Update Changelog.md * Fix reloading of data file (#1635) * Update data.html * fixed * show link to graph Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: Nicolas Liaudat <nliaudat@users.noreply.github.com> Co-authored-by: Slider0007 <115730895+Slider0007@users.noreply.github.com> Co-authored-by: smartboart <38385805+smartboart@users.noreply.github.com>
654 lines
21 KiB
C++
654 lines
21 KiB
C++
#include "server_ota.h"
|
|
|
|
#include <string>
|
|
#include "string.h"
|
|
|
|
#include <esp_int_wdt.h>
|
|
#include <esp_task_wdt.h>
|
|
|
|
|
|
#include <string.h>
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/task.h"
|
|
#include "esp_system.h"
|
|
#include "esp_event.h"
|
|
#include "esp_event.h"
|
|
#include "esp_log.h"
|
|
#include <esp_ota_ops.h>
|
|
#include "esp_http_client.h"
|
|
#include "esp_flash_partitions.h"
|
|
#include "esp_partition.h"
|
|
#include <nvs.h>
|
|
#include "nvs_flash.h"
|
|
#include "driver/gpio.h"
|
|
// #include "protocol_examples_common.h"
|
|
#include "errno.h"
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include "server_tflite.h"
|
|
#include "server_file.h"
|
|
#include "server_GPIO.h"
|
|
#ifdef ENABLE_MQTT
|
|
#include "interface_mqtt.h"
|
|
#endif //ENABLE_MQTT
|
|
|
|
|
|
#include "ClassLogFile.h"
|
|
|
|
#include "Helper.h"
|
|
|
|
|
|
// #define DEBUG_DETAIL_ON
|
|
|
|
|
|
#define BUFFSIZE 1024
|
|
#define HASH_LEN 32 /* SHA-256 digest length */
|
|
|
|
|
|
/*an ota data write buffer ready to write to the flash*/
|
|
static char ota_write_data[BUFFSIZE + 1] = { 0 };
|
|
|
|
|
|
#define OTA_URL_SIZE 256
|
|
static const char *TAG = "OTA";
|
|
|
|
esp_err_t handler_reboot(httpd_req_t *req);
|
|
|
|
std::string _file_name_update;
|
|
|
|
|
|
|
|
static void infinite_loop(void)
|
|
{
|
|
int i = 0;
|
|
ESP_LOGI(TAG, "When a new firmware is available on the server, press the reset button to download it");
|
|
while(1) {
|
|
ESP_LOGI(TAG, "Waiting for a new firmware... %d", ++i);
|
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
|
}
|
|
}
|
|
|
|
|
|
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);
|
|
while(1) { // wait until reboot within task_do_Update_ZIP
|
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool ota_update_task(std::string fn)
|
|
{
|
|
esp_err_t err;
|
|
/* update handle : set by esp_ota_begin(), must be freed via esp_ota_end() */
|
|
esp_ota_handle_t update_handle = 0 ;
|
|
const esp_partition_t *update_partition = NULL;
|
|
|
|
ESP_LOGI(TAG, "Starting OTA update");
|
|
|
|
const esp_partition_t *configured = esp_ota_get_boot_partition();
|
|
const esp_partition_t *running = esp_ota_get_running_partition();
|
|
|
|
if (configured != running) {
|
|
ESP_LOGW(TAG, "Configured OTA boot partition at offset 0x%08x, but running from offset 0x%08x",
|
|
configured->address, running->address);
|
|
ESP_LOGW(TAG, "(This can happen if either the OTA boot data or preferred boot image become somehow corrupted.)");
|
|
}
|
|
ESP_LOGI(TAG, "Running partition type %d subtype %d (offset 0x%08x)",
|
|
running->type, running->subtype, running->address);
|
|
|
|
|
|
update_partition = esp_ota_get_next_update_partition(NULL);
|
|
ESP_LOGI(TAG, "Writing to partition subtype %d at offset 0x%x",
|
|
update_partition->subtype, update_partition->address);
|
|
// assert(update_partition != NULL);
|
|
|
|
int binary_file_length = 0;
|
|
|
|
// deal with all receive packet
|
|
bool image_header_was_checked = false;
|
|
|
|
int data_read;
|
|
|
|
FILE* f = OpenFileAndWait(fn.c_str(), "rb"); // vorher nur "r"
|
|
|
|
if (f == NULL) { // File does not exist
|
|
return false;
|
|
}
|
|
|
|
data_read = fread(ota_write_data, 1, BUFFSIZE, f);
|
|
|
|
while (data_read > 0) {
|
|
if (data_read < 0) {
|
|
ESP_LOGE(TAG, "Error: SSL data read error");
|
|
return false;
|
|
} else if (data_read > 0) {
|
|
if (image_header_was_checked == false) {
|
|
esp_app_desc_t new_app_info;
|
|
if (data_read > sizeof(esp_image_header_t) + sizeof(esp_image_segment_header_t) + sizeof(esp_app_desc_t)) {
|
|
// check current version with downloading
|
|
memcpy(&new_app_info, &ota_write_data[sizeof(esp_image_header_t) + sizeof(esp_image_segment_header_t)], sizeof(esp_app_desc_t));
|
|
ESP_LOGI(TAG, "New firmware version: %s", new_app_info.version);
|
|
|
|
esp_app_desc_t running_app_info;
|
|
if (esp_ota_get_partition_description(running, &running_app_info) == ESP_OK) {
|
|
ESP_LOGI(TAG, "Running firmware version: %s", running_app_info.version);
|
|
}
|
|
|
|
const esp_partition_t* last_invalid_app = esp_ota_get_last_invalid_partition();
|
|
esp_app_desc_t invalid_app_info;
|
|
if (esp_ota_get_partition_description(last_invalid_app, &invalid_app_info) == ESP_OK) {
|
|
ESP_LOGI(TAG, "Last invalid firmware version: %s", invalid_app_info.version);
|
|
}
|
|
|
|
// check current version with last invalid partition
|
|
if (last_invalid_app != NULL) {
|
|
if (memcmp(invalid_app_info.version, new_app_info.version, sizeof(new_app_info.version)) == 0) {
|
|
ESP_LOGW(TAG, "New version is the same as invalid version.");
|
|
ESP_LOGW(TAG, "Previously, there was an attempt to launch the firmware with %s version, but it failed.", invalid_app_info.version);
|
|
ESP_LOGW(TAG, "The firmware has been rolled back to the previous version.");
|
|
infinite_loop();
|
|
}
|
|
}
|
|
|
|
/*
|
|
if (memcmp(new_app_info.version, running_app_info.version, sizeof(new_app_info.version)) == 0) {
|
|
ESP_LOGW(TAG, "Current running version is the same as a new. We will not continue the update.");
|
|
infinite_loop();
|
|
}
|
|
*/
|
|
image_header_was_checked = true;
|
|
|
|
err = esp_ota_begin(update_partition, OTA_SIZE_UNKNOWN, &update_handle);
|
|
if (err != ESP_OK) {
|
|
ESP_LOGE(TAG, "esp_ota_begin failed (%s)", esp_err_to_name(err));
|
|
return false;
|
|
}
|
|
ESP_LOGI(TAG, "esp_ota_begin succeeded");
|
|
} else {
|
|
ESP_LOGE(TAG, "received package is not fit len");
|
|
return false;
|
|
}
|
|
}
|
|
err = esp_ota_write( update_handle, (const void *)ota_write_data, data_read);
|
|
if (err != ESP_OK) {
|
|
return false;
|
|
}
|
|
binary_file_length += data_read;
|
|
ESP_LOGD(TAG, "Written image length %d", binary_file_length);
|
|
} else if (data_read == 0) {
|
|
//
|
|
// * As esp_http_client_read never returns negative error code, we rely on
|
|
// * `errno` to check for underlying transport connectivity closure if any
|
|
//
|
|
if (errno == ECONNRESET || errno == ENOTCONN) {
|
|
ESP_LOGE(TAG, "Connection closed, errno = %d", errno);
|
|
break;
|
|
}
|
|
}
|
|
data_read = fread(ota_write_data, 1, BUFFSIZE, f);
|
|
}
|
|
fclose(f);
|
|
|
|
ESP_LOGI(TAG, "Total Write binary data length: %d", binary_file_length);
|
|
|
|
err = esp_ota_end(update_handle);
|
|
if (err != ESP_OK) {
|
|
if (err == ESP_ERR_OTA_VALIDATE_FAILED) {
|
|
ESP_LOGE(TAG, "Image validation failed, image is corrupted");
|
|
}
|
|
ESP_LOGE(TAG, "esp_ota_end failed (%s)!", esp_err_to_name(err));
|
|
return false;
|
|
}
|
|
|
|
err = esp_ota_set_boot_partition(update_partition);
|
|
if (err != ESP_OK) {
|
|
ESP_LOGE(TAG, "esp_ota_set_boot_partition failed (%s)!", esp_err_to_name(err));
|
|
|
|
}
|
|
// ESP_LOGI(TAG, "Prepare to restart system!");
|
|
// esp_restart();
|
|
|
|
return true ;
|
|
}
|
|
|
|
|
|
static void print_sha256 (const uint8_t *image_hash, const char *label)
|
|
{
|
|
char hash_print[HASH_LEN * 2 + 1];
|
|
hash_print[HASH_LEN * 2] = 0;
|
|
for (int i = 0; i < HASH_LEN; ++i) {
|
|
sprintf(&hash_print[i * 2], "%02x", image_hash[i]);
|
|
}
|
|
ESP_LOGI(TAG, "%s: %s", label, hash_print);
|
|
}
|
|
|
|
|
|
static bool diagnostic(void)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
void CheckOTAUpdate(void)
|
|
{
|
|
ESP_LOGI(TAG, "Start CheckOTAUpdateCheck...");
|
|
|
|
uint8_t sha_256[HASH_LEN] = { 0 };
|
|
esp_partition_t partition;
|
|
|
|
// get sha256 digest for the partition table
|
|
partition.address = ESP_PARTITION_TABLE_OFFSET;
|
|
partition.size = ESP_PARTITION_TABLE_MAX_LEN;
|
|
partition.type = ESP_PARTITION_TYPE_DATA;
|
|
esp_partition_get_sha256(&partition, sha_256);
|
|
print_sha256(sha_256, "SHA-256 for the partition table: ");
|
|
|
|
// get sha256 digest for bootloader
|
|
partition.address = ESP_BOOTLOADER_OFFSET;
|
|
partition.size = ESP_PARTITION_TABLE_OFFSET;
|
|
partition.type = ESP_PARTITION_TYPE_APP;
|
|
esp_partition_get_sha256(&partition, sha_256);
|
|
print_sha256(sha_256, "SHA-256 for bootloader: ");
|
|
|
|
// get sha256 digest for running partition
|
|
esp_partition_get_sha256(esp_ota_get_running_partition(), sha_256);
|
|
print_sha256(sha_256, "SHA-256 for current firmware: ");
|
|
|
|
const esp_partition_t *running = esp_ota_get_running_partition();
|
|
esp_ota_img_states_t ota_state;
|
|
esp_err_t res_stat_partition = esp_ota_get_state_partition(running, &ota_state);
|
|
switch (res_stat_partition)
|
|
{
|
|
case ESP_OK:
|
|
ESP_LOGD(TAG, "CheckOTAUpdate Partition: ESP_OK");
|
|
if (esp_ota_get_state_partition(running, &ota_state) == ESP_OK) {
|
|
if (ota_state == ESP_OTA_IMG_PENDING_VERIFY) {
|
|
// run diagnostic function ...
|
|
bool diagnostic_is_ok = diagnostic();
|
|
if (diagnostic_is_ok) {
|
|
ESP_LOGI(TAG, "Diagnostics completed successfully! Continuing execution...");
|
|
esp_ota_mark_app_valid_cancel_rollback();
|
|
} else {
|
|
ESP_LOGE(TAG, "Diagnostics failed! Start rollback to the previous version...");
|
|
esp_ota_mark_app_invalid_rollback_and_reboot();
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
case ESP_ERR_INVALID_ARG:
|
|
ESP_LOGD(TAG, "CheckOTAUpdate Partition: ESP_ERR_INVALID_ARG");
|
|
break;
|
|
case ESP_ERR_NOT_SUPPORTED:
|
|
ESP_LOGD(TAG, "CheckOTAUpdate Partition: ESP_ERR_NOT_SUPPORTED");
|
|
break;
|
|
case ESP_ERR_NOT_FOUND:
|
|
ESP_LOGD(TAG, "CheckOTAUpdate Partition: ESP_ERR_NOT_FOUND");
|
|
break;
|
|
}
|
|
if (esp_ota_get_state_partition(running, &ota_state) == ESP_OK) {
|
|
if (ota_state == ESP_OTA_IMG_PENDING_VERIFY) {
|
|
// run diagnostic function ...
|
|
bool diagnostic_is_ok = diagnostic();
|
|
if (diagnostic_is_ok) {
|
|
ESP_LOGI(TAG, "Diagnostics completed successfully! Continuing execution...");
|
|
esp_ota_mark_app_valid_cancel_rollback();
|
|
} else {
|
|
ESP_LOGE(TAG, "Diagnostics failed! Start rollback to the previous version...");
|
|
esp_ota_mark_app_invalid_rollback_and_reboot();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
esp_err_t handler_ota_update(httpd_req_t *req)
|
|
{
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("handler_ota_update - Start");
|
|
#endif
|
|
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "handler_ota_update");
|
|
char _query[200];
|
|
char _filename[100];
|
|
char _valuechar[30];
|
|
std::string fn = "/sdcard/firmware/";
|
|
bool _file_del = false;
|
|
std::string _task = "";
|
|
|
|
if (httpd_req_get_url_query_str(req, _query, 200) == ESP_OK)
|
|
{
|
|
ESP_LOGD(TAG, "Query: %s", _query);
|
|
|
|
if (httpd_query_key_value(_query, "task", _valuechar, 30) == ESP_OK)
|
|
{
|
|
ESP_LOGD(TAG, "task is found: %s", _valuechar);
|
|
_task = std::string(_valuechar);
|
|
}
|
|
|
|
if (httpd_query_key_value(_query, "file", _filename, 100) == ESP_OK)
|
|
{
|
|
fn.append(_filename);
|
|
ESP_LOGD(TAG, "File: %s", fn.c_str());
|
|
}
|
|
if (httpd_query_key_value(_query, "delete", _filename, 100) == ESP_OK)
|
|
{
|
|
fn.append(_filename);
|
|
_file_del = true;
|
|
ESP_LOGD(TAG, "Delete Default File: %s", fn.c_str());
|
|
}
|
|
|
|
};
|
|
|
|
if (_task.compare("emptyfirmwaredir") == 0)
|
|
{
|
|
ESP_LOGD(TAG, "Start empty directory /firmware");
|
|
delete_all_in_directory("/sdcard/firmware");
|
|
std::string zw = "firmware directory deleted - v2\n";
|
|
ESP_LOGD(TAG, "%s", zw.c_str());
|
|
printf("Ausgabe: %s\n", zw.c_str());
|
|
|
|
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
|
|
httpd_resp_send(req, zw.c_str(), strlen(zw.c_str()));
|
|
/* Respond with an empty chunk to signal HTTP response completion */
|
|
httpd_resp_send_chunk(req, NULL, 0);
|
|
|
|
ESP_LOGD(TAG, "Done empty directory /firmware");
|
|
return ESP_OK;
|
|
}
|
|
|
|
if (_task.compare("update") == 0)
|
|
{
|
|
std::string filetype = toUpper(getFileType(fn));
|
|
if (filetype.length() == 0)
|
|
{
|
|
std::string zw = "Update failed - no file specified (zip, bin, tfl, tlite)";
|
|
httpd_resp_sendstr_chunk(req, zw.c_str());
|
|
httpd_resp_sendstr_chunk(req, NULL);
|
|
return ESP_OK;
|
|
}
|
|
|
|
|
|
if ((filetype == "TFLITE") || (filetype == "TFL"))
|
|
{
|
|
std::string out = "/sdcard/config/" + getFileFullFileName(fn);
|
|
DeleteFile(out);
|
|
CopyFile(fn, out);
|
|
DeleteFile(fn);
|
|
|
|
const char* resp_str = "Neural Network File copied.";
|
|
httpd_resp_sendstr_chunk(req, resp_str);
|
|
httpd_resp_sendstr_chunk(req, NULL);
|
|
return ESP_OK;
|
|
}
|
|
|
|
|
|
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";
|
|
outbin = "/sdcard/firmware";
|
|
|
|
retfirmware = unzip_new(fn, out+"/", outbin+"/");
|
|
|
|
if (retfirmware.length() > 0)
|
|
{
|
|
filetype = "BIN";
|
|
fn = retfirmware;
|
|
}
|
|
else
|
|
{
|
|
zw = "Web Interface Update Successfull!\nNo reboot necessary.\n";
|
|
httpd_resp_sendstr_chunk(req, zw.c_str());
|
|
httpd_resp_sendstr_chunk(req, NULL);
|
|
return ESP_OK;
|
|
}
|
|
*/
|
|
}
|
|
|
|
|
|
if (filetype == "BIN")
|
|
{
|
|
const char* resp_str;
|
|
|
|
KillTFliteTasks();
|
|
gpio_handler_deinit();
|
|
if (ota_update_task(fn))
|
|
{
|
|
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;
|
|
}
|
|
|
|
resp_str = "Error during Firmware Update!!!\nPlease check output of console.";
|
|
httpd_resp_send(req, resp_str, strlen(resp_str));
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("handler_ota_update - Done");
|
|
#endif
|
|
|
|
return ESP_OK;
|
|
}
|
|
|
|
|
|
std::string zw = "Update failed - no valid file specified (zip, bin, tfl, tlite)!";
|
|
httpd_resp_sendstr_chunk(req, zw.c_str());
|
|
httpd_resp_sendstr_chunk(req, NULL);
|
|
return ESP_OK;
|
|
}
|
|
|
|
|
|
if (_task.compare("unziphtml") == 0)
|
|
{
|
|
ESP_LOGD(TAG, "Task unziphtml");
|
|
std::string in, out, zw;
|
|
|
|
in = "/sdcard/firmware/html.zip";
|
|
out = "/sdcard/html";
|
|
|
|
delete_all_in_directory(out);
|
|
|
|
unzip(in, out+"/");
|
|
zw = "Web Interface Update Successfull!\nNo reboot necessary";
|
|
httpd_resp_send(req, zw.c_str(), strlen(zw.c_str()));
|
|
httpd_resp_sendstr_chunk(req, NULL);
|
|
return ESP_OK;
|
|
}
|
|
|
|
if (_file_del)
|
|
{
|
|
ESP_LOGD(TAG, "Delete !! _file_del: %s", fn.c_str());
|
|
struct stat file_stat;
|
|
int _result = stat(fn.c_str(), &file_stat);
|
|
ESP_LOGD(TAG, "Ergebnis %d\n", _result);
|
|
if (_result == 0) {
|
|
ESP_LOGD(TAG, "Deleting file: %s", fn.c_str());
|
|
/* Delete file */
|
|
unlink(fn.c_str());
|
|
}
|
|
else
|
|
{
|
|
ESP_LOGD(TAG, "File does not exist: %s", fn.c_str());
|
|
}
|
|
/* Respond with an empty chunk to signal HTTP response completion */
|
|
std::string zw = "file deleted\n";
|
|
ESP_LOGD(TAG, "%s", zw.c_str());
|
|
httpd_resp_send(req, zw.c_str(), strlen(zw.c_str()));
|
|
httpd_resp_send_chunk(req, NULL, 0);
|
|
return ESP_OK;
|
|
}
|
|
|
|
string zw = "ota without parameter - should not be the case!";
|
|
httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
|
|
httpd_resp_send(req, zw.c_str(), strlen(zw.c_str()));
|
|
httpd_resp_send_chunk(req, NULL, 0);
|
|
|
|
ESP_LOGE(TAG, "ota without parameter - should not be the case!");
|
|
|
|
/*
|
|
const char* resp_str;
|
|
|
|
KillTFliteTasks();
|
|
gpio_handler_deinit();
|
|
if (ota_update_task(fn))
|
|
{
|
|
resp_str = "Firmware Update Successfull! You can restart now.";
|
|
}
|
|
else
|
|
{
|
|
resp_str = "Error during Firmware Update!!! Please check console output.";
|
|
}
|
|
|
|
httpd_resp_send(req, resp_str, strlen(resp_str));
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("handler_ota_update - Done");
|
|
#endif
|
|
*/
|
|
|
|
return ESP_OK;
|
|
};
|
|
|
|
void hard_restart() {
|
|
esp_task_wdt_init(1,true);
|
|
esp_task_wdt_add(NULL);
|
|
while(true);
|
|
}
|
|
|
|
void task_reboot(void *pvParameter)
|
|
{
|
|
while(1)
|
|
{
|
|
vTaskDelay(5000 / portTICK_PERIOD_MS);
|
|
esp_restart();
|
|
hard_restart();
|
|
}
|
|
|
|
vTaskDelete(NULL); //Delete this task if it exits from the loop above
|
|
}
|
|
|
|
void doReboot(){
|
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Reboot triggered by Software (5s).");
|
|
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Reboot in 5sec");
|
|
xTaskCreate(&task_reboot, "reboot", configMINIMAL_STACK_SIZE * 64, NULL, 10, NULL);
|
|
// KillTFliteTasks(); // kills itself
|
|
gpio_handler_destroy();
|
|
#ifdef ENABLE_MQTT
|
|
MQTTdestroy_client();
|
|
#endif //ENABLE_MQTT
|
|
vTaskDelay(5000 / portTICK_PERIOD_MS);
|
|
esp_restart();
|
|
hard_restart();
|
|
}
|
|
|
|
|
|
esp_err_t handler_reboot(httpd_req_t *req)
|
|
{
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("handler_reboot - Start");
|
|
#endif
|
|
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "handler_reboot");
|
|
ESP_LOGI(TAG, "!!! System will restart within 5 sec!!!");
|
|
const char* resp_str = "<body style='font-family: arial'> <h3 id=t></h3></body><script>var h='Rebooting!<br>The page will automatically reload in around 25..60s<br>(in case of a firmware update it can take up to 180s).<br>'; document.getElementById('t').innerHTML=h; setInterval(function (){h +='.'; document.getElementById('t').innerHTML=h; fetch(window.location.hostname,{mode: 'no-cors'}).then(r=>{parent.location.href=('/index.html');})}, 1000);</script>";
|
|
httpd_resp_send(req, resp_str, strlen(resp_str));
|
|
|
|
doReboot();
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("handler_reboot - Done");
|
|
#endif
|
|
|
|
return ESP_OK;
|
|
}
|
|
|
|
void register_server_ota_sdcard_uri(httpd_handle_t server)
|
|
{
|
|
ESP_LOGI(TAG, "Registering URI handlers");
|
|
|
|
httpd_uri_t camuri = { };
|
|
camuri.method = HTTP_GET;
|
|
camuri.uri = "/ota";
|
|
camuri.handler = handler_ota_update;
|
|
camuri.user_ctx = (void*) "Do OTA";
|
|
httpd_register_uri_handler(server, &camuri);
|
|
|
|
camuri.method = HTTP_GET;
|
|
camuri.uri = "/reboot";
|
|
camuri.handler = handler_reboot;
|
|
camuri.user_ctx = (void*) "Reboot";
|
|
httpd_register_uri_handler(server, &camuri);
|
|
|
|
}
|