From 7f2f9636f5bb058f1f7ae8f84e75f5034867c09f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 30 Jun 2025 09:46:33 -0500
Subject: [PATCH] make sure ota still works without ota loaded

---
 .../web_server_base/web_server_base.cpp       | 38 ++++---------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/esphome/components/web_server_base/web_server_base.cpp b/esphome/components/web_server_base/web_server_base.cpp
index 868496a2fe..5116fd7e7c 100644
--- a/esphome/components/web_server_base/web_server_base.cpp
+++ b/esphome/components/web_server_base/web_server_base.cpp
@@ -16,7 +16,6 @@
 
 #if defined(USE_ESP_IDF) && defined(USE_WEBSERVER_OTA)
 #include <esp_ota_ops.h>
-#include <esp_task_wdt.h>
 #endif
 
 namespace esphome {
@@ -36,37 +35,7 @@ class IDFWebServerOTABackend {
       return false;
     }
 
-#if CONFIG_ESP_TASK_WDT_TIMEOUT_S < 15
-    // The following function takes longer than the 5 seconds timeout of WDT
-#if ESP_IDF_VERSION_MAJOR >= 5
-    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);
-#else
-    esp_task_wdt_init(15, false);
-#endif
-#endif
-
     esp_err_t err = esp_ota_begin(this->partition_, 0, &this->update_handle_);
-
-#if CONFIG_ESP_TASK_WDT_TIMEOUT_S < 15
-    // Set the WDT back to the configured timeout
-#if ESP_IDF_VERSION_MAJOR >= 5
-    wdtc.timeout_ms = CONFIG_ESP_TASK_WDT_TIMEOUT_S * 1000;
-    esp_task_wdt_reconfigure(&wdtc);
-#else
-    esp_task_wdt_init(CONFIG_ESP_TASK_WDT_TIMEOUT_S, false);
-#endif
-#endif
-
     if (err != ESP_OK) {
       esp_ota_abort(this->update_handle_);
       this->update_handle_ = 0;
@@ -102,6 +71,13 @@ class IDFWebServerOTABackend {
     return true;
   }
 
+  void abort() {
+    if (this->update_handle_ != 0) {
+      esp_ota_abort(this->update_handle_);
+      this->update_handle_ = 0;
+    }
+  }
+
  private:
   esp_ota_handle_t update_handle_{0};
   const esp_partition_t *partition_{nullptr};