From c4f0f146967fad674e9d02a1991a9cce5c9ab58b Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Mon, 6 Oct 2025 14:33:10 -0500
Subject: [PATCH 1/4] [esp32] Fix clang-tidy error for Arduino watchdog
 function declarations

---
 esphome/components/esp32/core.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/esp32/core.cpp b/esphome/components/esp32/core.cpp
index f3bdfea2a0..e54c07e304 100644
--- a/esphome/components/esp32/core.cpp
+++ b/esphome/components/esp32/core.cpp
@@ -14,6 +14,7 @@
 
 #ifdef USE_ARDUINO
 #include <Esp.h>
+#include <esp32-hal.h>
 #else
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
 #include <esp_clk_tree.h>

From 3dbdcab7e5dc6b40550e510512a774e3dd20ac67 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Mon, 6 Oct 2025 15:06:26 -0500
Subject: [PATCH 2/4] try a forward dec

---
 esphome/components/esp32/core.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/esp32/core.cpp b/esphome/components/esp32/core.cpp
index e54c07e304..f67706ca5d 100644
--- a/esphome/components/esp32/core.cpp
+++ b/esphome/components/esp32/core.cpp
@@ -15,6 +15,10 @@
 #ifdef USE_ARDUINO
 #include <Esp.h>
 #include <esp32-hal.h>
+// Forward declarations for Arduino watchdog functions (implemented in esp32-hal-misc.c)
+extern "C" void enableLoopWDT();
+extern "C" void disableCore0WDT();
+extern "C" void disableCore1WDT();
 #else
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
 #include <esp_clk_tree.h>

From b0e15cdabd0b97d064bc8c58b368dc84d4137715 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Mon, 6 Oct 2025 15:24:57 -0500
Subject: [PATCH 3/4] oops they are bool

---
 esphome/components/esp32/core.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/esphome/components/esp32/core.cpp b/esphome/components/esp32/core.cpp
index f67706ca5d..77beda0e82 100644
--- a/esphome/components/esp32/core.cpp
+++ b/esphome/components/esp32/core.cpp
@@ -16,9 +16,10 @@
 #include <Esp.h>
 #include <esp32-hal.h>
 // Forward declarations for Arduino watchdog functions (implemented in esp32-hal-misc.c)
-extern "C" void enableLoopWDT();
-extern "C" void disableCore0WDT();
-extern "C" void disableCore1WDT();
+// These are behind preprocessor guards in esp32-hal.h that static analysis tools may not see
+void enableLoopWDT();
+bool disableCore0WDT();
+bool disableCore1WDT();
 #else
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
 #include <esp_clk_tree.h>

From 514830b372bf6334fc0957780dbeb137f23c45d5 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Mon, 6 Oct 2025 15:41:48 -0500
Subject: [PATCH 4/4] sdkconfig instead

---
 esphome/components/esp32/core.cpp | 6 ------
 sdkconfig.defaults                | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/esphome/components/esp32/core.cpp b/esphome/components/esp32/core.cpp
index 77beda0e82..f3bdfea2a0 100644
--- a/esphome/components/esp32/core.cpp
+++ b/esphome/components/esp32/core.cpp
@@ -14,12 +14,6 @@
 
 #ifdef USE_ARDUINO
 #include <Esp.h>
-#include <esp32-hal.h>
-// Forward declarations for Arduino watchdog functions (implemented in esp32-hal-misc.c)
-// These are behind preprocessor guards in esp32-hal.h that static analysis tools may not see
-void enableLoopWDT();
-bool disableCore0WDT();
-bool disableCore1WDT();
 #else
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
 #include <esp_clk_tree.h>
diff --git a/sdkconfig.defaults b/sdkconfig.defaults
index 72ca3f6e9c..322efb701a 100644
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@@ -13,6 +13,7 @@ CONFIG_ESP_TASK_WDT=y
 CONFIG_ESP_TASK_WDT_PANIC=y
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=n
+CONFIG_AUTOSTART_ARDUINO=y
 
 # esp32_ble
 CONFIG_BT_ENABLED=y