mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove BlockedLoop detection from ESP32

This commit is contained in:
Theo Arends 2021-12-04 17:39:04 +01:00
parent 1d3a3ee415
commit 4d05fb153c
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tasmota/support.ino
View File

@ -21,10 +21,15 @@ extern "C" {
extern struct rst_info resetInfo; extern struct rst_info resetInfo;
} }
#ifdef USE_KNX
bool knx_started = false;
#endif // USE_KNX
/*********************************************************************************************\ /*********************************************************************************************\
* Watchdog extension (https://github.com/esp8266/Arduino/issues/1532) * Watchdog extension (https://github.com/esp8266/Arduino/issues/1532)
\*********************************************************************************************/ \*********************************************************************************************/
#ifdef ESP8266
#include <Ticker.h> #include <Ticker.h>
Ticker tickerOSWatch; Ticker tickerOSWatch;
@ -38,12 +43,7 @@ uint8_t oswatch_blocked_loop = 0;
//void OsWatchTicker() IRAM_ATTR; //void OsWatchTicker() IRAM_ATTR;
#endif // USE_WS2812_DMA #endif // USE_WS2812_DMA
#ifdef USE_KNX void OsWatchTicker(void) {
bool knx_started = false;
#endif // USE_KNX
void OsWatchTicker(void)
{
uint32_t t = millis(); uint32_t t = millis();
uint32_t last_run = t - oswatch_last_loop_time; uint32_t last_run = t - oswatch_last_loop_time;
@ -66,27 +66,33 @@ void OsWatchTicker(void)
} }
} }
void OsWatchInit(void) void OsWatchInit(void) {
{
oswatch_blocked_loop = RtcSettings.oswatch_blocked_loop; oswatch_blocked_loop = RtcSettings.oswatch_blocked_loop;
RtcSettings.oswatch_blocked_loop = 0; RtcSettings.oswatch_blocked_loop = 0;
oswatch_last_loop_time = millis(); oswatch_last_loop_time = millis();
tickerOSWatch.attach_ms(((OSWATCH_RESET_TIME / 3) * 1000), OsWatchTicker); tickerOSWatch.attach_ms(((OSWATCH_RESET_TIME / 3) * 1000), OsWatchTicker);
} }
void OsWatchLoop(void) void OsWatchLoop(void) {
{
oswatch_last_loop_time = millis(); oswatch_last_loop_time = millis();
// while(1) delay(1000); // this will trigger the os watch // while(1) delay(1000); // this will trigger the os watch
} }
bool OsWatchBlockedLoop(void) bool OsWatchBlockedLoop(void) {
{
return oswatch_blocked_loop; return oswatch_blocked_loop;
} }
uint32_t ResetReason(void) #else // Anything except ESP8266
{
void OsWatchInit(void) {}
void OsWatchLoop(void) {}
bool OsWatchBlockedLoop(void) {
return false;
}
#endif // ESP8266
uint32_t ResetReason(void) {
/* /*
user_interface.h user_interface.h
REASON_DEFAULT_RST = 0, // "Power on" normal startup by power on REASON_DEFAULT_RST = 0, // "Power on" normal startup by power on
@ -100,9 +106,8 @@ uint32_t ResetReason(void)
return ESP_ResetInfoReason(); return ESP_ResetInfoReason();
} }
String GetResetReason(void) String GetResetReason(void) {
{ if (OsWatchBlockedLoop()) {
if (oswatch_blocked_loop) {
char buff[32]; char buff[32];
strncpy_P(buff, PSTR(D_JSON_BLOCKED_LOOP), sizeof(buff)); strncpy_P(buff, PSTR(D_JSON_BLOCKED_LOOP), sizeof(buff));
return String(buff); return String(buff);