feedc0de/espasyncota
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add watchdog for esp_https_ota_finish() to avoid freezes

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-04-20 15:16:26 +02:00
parent 195f42b137
commit 1cc204f1af
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/espasyncota.cpp
View File

@ -1,5 +1,7 @@
#include "espasyncota.h" #include "espasyncota.h"
#include "sdkconfig.h"
// system includes // system includes
#include <cassert> #include <cassert>
@ -7,6 +9,10 @@
#include <esp_log.h> #include <esp_log.h>
#include <esp_http_client.h> #include <esp_http_client.h>
#include <esp_https_ota.h> #include <esp_https_ota.h>
#if defined(CONFIG_ESP_TASK_WDT_PANIC) || defined(CONFIG_ESP_TASK_WDT)
#include <freertos/task.h>
#include <esp_task_wdt.h>
#endif
// 3rdparty lib includes // 3rdparty lib includes
#include <fmt/core.h> #include <fmt/core.h>
@ -397,10 +403,31 @@ void EspAsyncOta::otaTask()
if (ota_perform_err == ESP_OK) if (ota_perform_err == ESP_OK)
m_eventGroup.setBits(REQUEST_VERIFYING_BIT); m_eventGroup.setBits(REQUEST_VERIFYING_BIT);
#if defined(CONFIG_ESP_TASK_WDT_PANIC) || defined(CONFIG_ESP_TASK_WDT)
const auto taskHandle = xTaskGetCurrentTaskHandle();
if (taskHandle)
{
if (const auto result = esp_task_wdt_add(taskHandle); result != ESP_OK)
ESP_LOGE(TAG, "esp_task_wdt_add() failed with %s", esp_err_to_name(result));
}
else
ESP_LOGE(TAG, "could not get handle to current ota task!");
#endif
ESP_LOGI(TAG, "esp_https_ota_finish()..."); ESP_LOGI(TAG, "esp_https_ota_finish()...");
const auto ota_finish_err = esp_https_ota_finish(https_ota_handle); const auto ota_finish_err = esp_https_ota_finish(https_ota_handle);
ESP_LOG_LEVEL_LOCAL((ota_finish_err == ESP_OK ? ESP_LOG_INFO : ESP_LOG_ERROR), TAG, "esp_https_ota_finish() returned: %s", esp_err_to_name(ota_finish_err)); ESP_LOG_LEVEL_LOCAL((ota_finish_err == ESP_OK ? ESP_LOG_INFO : ESP_LOG_ERROR), TAG, "esp_https_ota_finish() returned: %s", esp_err_to_name(ota_finish_err));
#if defined(CONFIG_ESP_TASK_WDT_PANIC) || defined(CONFIG_ESP_TASK_WDT)
if (taskHandle)
{
if (const auto result = esp_task_wdt_reset(); result != ESP_OK)
ESP_LOGE(TAG, "esp_task_wdt_reset() failed with %s", esp_err_to_name(result));
if (const auto result = esp_task_wdt_delete(taskHandle); result != ESP_OK)
ESP_LOGE(TAG, "esp_task_wdt_delete() failed with %s", esp_err_to_name(result));
}
#endif
if (!aborted) if (!aborted)
{ {