wartana/WLED
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add IDF V3 support for bootloop detection

Browse Source
This commit is contained in:
Damian Schneider
2025-08-16 08:45:41 +02:00
parent c9c442a933
commit f4d89c4196
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wled00/util.cpp
View File

@@ -3,9 +3,13 @@
#include "const.h" #include "const.h"
#ifdef ESP8266 #ifdef ESP8266
#include "user_interface.h" // for bootloop detection #include "user_interface.h" // for bootloop detection
#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0) #else
#include "esp32/rtc.h" // for bootloop detection
#include <Update.h> #include <Update.h>
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)
#include "esp32/rtc.h" // for bootloop detection
#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(3, 3, 0)
#include "soc/rtc.h"
#endif
#endif #endif
@@ -739,7 +743,12 @@ void bootloopCheckOTA() { bl_actiontracker = BOOTLOOP_ACTION_OTA; } // swap boot
static bool detectBootLoop() { static bool detectBootLoop() {
#if !defined(ESP8266) #if !defined(ESP8266)
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0) #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)
uint32_t rtctime = esp_rtc_get_time_us() / 1000; // convert to milliseconds uint32_t rtctime = esp_rtc_get_time_us() / 1000; // convert to milliseconds
#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(3, 3, 0)
uint64_t rtc_ticks = rtc_time_get();
uint32_t rtctime = rtc_time_slowclk_to_us(rtc_ticks, rtc_clk_slow_freq_get_hz()) / 1000; // convert to milliseconds
#endif
esp_reset_reason_t reason = esp_reset_reason(); esp_reset_reason_t reason = esp_reset_reason();
if (!(reason == ESP_RST_PANIC || reason == ESP_RST_WDT || reason == ESP_RST_INT_WDT || reason == ESP_RST_TASK_WDT)) { if (!(reason == ESP_RST_PANIC || reason == ESP_RST_WDT || reason == ESP_RST_INT_WDT || reason == ESP_RST_TASK_WDT)) {
@@ -765,7 +774,6 @@ static bool detectBootLoop() {
} }
} }
} }
#endif
#else // ESP8266 #else // ESP8266
rst_info* resetreason = system_get_rst_info(); rst_info* resetreason = system_get_rst_info();
uint32_t bl_last_boottime; uint32_t bl_last_boottime;