Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-05-30 23:54:04 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Use WatchdogManager for OTA on ESP32

Browse Source
This commit is contained in:
Mat931
2026-04-29 18:19:07 +02:00
parent bae6b51652
commit ddc445ea71
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/ota/__init__.py
+2
View File
@@ -24,6 +24,8 @@ def AUTO_LOAD() -> list[str]:
components = ["safe_mode"] components = ["safe_mode"]
if not CORE.using_zephyr: if not CORE.using_zephyr:
components.extend(["md5"]) components.extend(["md5"])
if CORE.is_esp32:
components.extend(["watchdog"])
return components return components
esphome/components/ota/ota_backend_esp_idf.cpp
+2 -21
View File
@@ -2,6 +2,7 @@
#include "ota_backend_esp_idf.h" #include "ota_backend_esp_idf.h"
#include "esphome/components/md5/md5.h" #include "esphome/components/md5/md5.h"
#include "esphome/components/watchdog/watchdog.h"
#include "esphome/core/defines.h" #include "esphome/core/defines.h"
#include "esphome/core/log.h" #include "esphome/core/log.h"
@@ -28,29 +29,9 @@ OTAResponseTypes IDFOTABackend::begin(size_t image_size) {
return OTA_RESPONSE_ERROR_NO_UPDATE_PARTITION; return OTA_RESPONSE_ERROR_NO_UPDATE_PARTITION;
} }
#if CONFIG_ESP_TASK_WDT_TIMEOUT_S < 15 watchdog::WatchdogManager watchdog(15000);
// The following function takes longer than the 5 seconds timeout of WDT
esp_task_wdt_config_t wdtc;
wdtc.idle_core_mask = 0;
#if CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0
wdtc.idle_core_mask |= (1 << 0);
#endif
#if CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1
wdtc.idle_core_mask |= (1 << 1);
#endif
wdtc.timeout_ms = 15000;
wdtc.trigger_panic = false;
esp_task_wdt_reconfigure(&wdtc);
#endif
esp_err_t err = esp_ota_begin(this->partition_, image_size, &this->update_handle_); esp_err_t err = esp_ota_begin(this->partition_, image_size, &this->update_handle_);
#if CONFIG_ESP_TASK_WDT_TIMEOUT_S < 15
// Set the WDT back to the configured timeout
wdtc.timeout_ms = CONFIG_ESP_TASK_WDT_TIMEOUT_S * 1000;
esp_task_wdt_reconfigure(&wdtc);
#endif
if (err != ESP_OK) { if (err != ESP_OK) {
esp_ota_abort(this->update_handle_); esp_ota_abort(this->update_handle_);
this->update_handle_ = 0; this->update_handle_ = 0;