Merge branch 'ard_debug_no_heap' into integration

esphome/components/debug/debug_esp8266.cpp

@@ -3,21 +3,81 @@
 #include "esphome/core/log.h"
 #include <Esp.h>
 
+extern "C" {
+#include <user_interface.h>
+
+// Global reset info struct populated by SDK at boot
+extern struct rst_info resetInfo;
+
+// Core version - either a string pointer or a version number to format as hex
+extern uint32_t core_version;
+extern const char *core_release;
+}
+
 namespace esphome {
 namespace debug {
 
 static const char *const TAG = "debug";
 
+// Get reset reason string from reason code (no heap allocation)
+// Returns LogString* pointing to flash (PROGMEM) on ESP8266
+static const LogString *get_reset_reason_str(uint32_t reason) {
+  switch (reason) {
+    case REASON_DEFAULT_RST:
+      return LOG_STR("Power On");
+    case REASON_WDT_RST:
+      return LOG_STR("Hardware Watchdog");
+    case REASON_EXCEPTION_RST:
+      return LOG_STR("Exception");
+    case REASON_SOFT_WDT_RST:
+      return LOG_STR("Software Watchdog");
+    case REASON_SOFT_RESTART:
+      return LOG_STR("Software/System restart");
+    case REASON_DEEP_SLEEP_AWAKE:
+      return LOG_STR("Deep-Sleep Wake");
+    case REASON_EXT_SYS_RST:
+      return LOG_STR("External System");
+    default:
+      return LOG_STR("Unknown");
+  }
+}
+
+// Buffer for core version hex string (static to avoid stack/heap allocation each call)
+static char core_version_hex_[12];
+
+// Get core version string (no heap allocation)
+// Returns either core_release directly or formats core_version as hex
+static const char *get_core_version_str() {
+  if (core_release != nullptr) {
+    return core_release;
+  }
+  snprintf_P(core_version_hex_, sizeof(core_version_hex_), PSTR("%08x"), core_version);
+  return core_version_hex_;
+}
+
+// Buffer for reset info string (static to avoid stack/heap allocation each call)
+static char reset_info_buf_[200];
+
+// Get detailed reset info string (no heap allocation)
+// For watchdog/exception resets, includes detailed exception info
+// Returns LogString* for simple cases, or pointer to static buffer for detailed info
+static const char *get_reset_info_str() {
+  if (resetInfo.reason >= REASON_WDT_RST && resetInfo.reason <= REASON_SOFT_WDT_RST) {
+    snprintf_P(reset_info_buf_, sizeof(reset_info_buf_),
+               PSTR("Fatal exception:%d flag:%d (%s) epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x"),
+               static_cast<int>(resetInfo.exccause), static_cast<int>(resetInfo.reason),
+               LOG_STR_ARG(get_reset_reason_str(resetInfo.reason)), resetInfo.epc1, resetInfo.epc2, resetInfo.epc3,
+               resetInfo.excvaddr, resetInfo.depc);
+    return reset_info_buf_;
+  }
+  return LOG_STR_ARG(get_reset_reason_str(resetInfo.reason));
+}
+
 const char *DebugComponent::get_reset_reason_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) {
-  char *buf = buffer.data();
-#if !defined(CLANG_TIDY)
-  String reason = ESP.getResetReason();  // NOLINT
-  snprintf_P(buf, RESET_REASON_BUFFER_SIZE, PSTR("%s"), reason.c_str());
-  return buf;
-#else
-  buf[0] = '\0';
-  return buf;
-#endif
+  // Copy from flash to provided buffer
+  strncpy_P(buffer.data(), (PGM_P) get_reset_reason_str(resetInfo.reason), RESET_REASON_BUFFER_SIZE - 1);
+  buffer.data()[RESET_REASON_BUFFER_SIZE - 1] = '\0';
+  return buffer.data();
 }
 
 const char *DebugComponent::get_wakeup_cause_(std::span<char, RESET_REASON_BUFFER_SIZE> buffer) {
@@ -74,18 +134,18 @@ size_t DebugComponent::get_device_info_(std::span<char, DEVICE_INFO_BUFFER_SIZE>
            "Flash Chip ID=0x%08" PRIX32 "\n"
            "Reset Reason: %s\n"
            "Reset Info: %s",
-           chip_id, ESP.getSdkVersion(), ESP.getCoreVersion().c_str(), boot_version, boot_mode, cpu_freq, flash_chip_id,
-           reset_reason, ESP.getResetInfo().c_str());
+           chip_id, ESP.getSdkVersion(), get_core_version_str(), boot_version, boot_mode, cpu_freq, flash_chip_id,
+           reset_reason, get_reset_info_str());
 
   pos = buf_append_printf(buf, size, pos, "|Chip: 0x%08" PRIX32, chip_id);
   pos = buf_append_printf(buf, size, pos, "|SDK: %s", ESP.getSdkVersion());
-  pos = buf_append_printf(buf, size, pos, "|Core: %s", ESP.getCoreVersion().c_str());
+  pos = buf_append_printf(buf, size, pos, "|Core: %s", get_core_version_str());
   pos = buf_append_printf(buf, size, pos, "|Boot: %u", boot_version);
   pos = buf_append_printf(buf, size, pos, "|Mode: %u", boot_mode);
   pos = buf_append_printf(buf, size, pos, "|CPU: %u", cpu_freq);
   pos = buf_append_printf(buf, size, pos, "|Flash: 0x%08" PRIX32, flash_chip_id);
   pos = buf_append_printf(buf, size, pos, "|Reset: %s", reset_reason);
-  pos = buf_append_printf(buf, size, pos, "|%s", ESP.getResetInfo().c_str());
+  pos = buf_append_printf(buf, size, pos, "|%s", get_reset_info_str());
 #endif
 
   return pos;