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

Remove TWDT remnants

This commit is contained in:
Theo Arends 2021-11-04 17:41:03 +01:00
parent 128f7723d1
commit aa79f73aa9
5 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tasmota/my_user_config.h
View File

@ -348,7 +348,6 @@
#define ZIGBEE_DISTINCT_TOPICS false // [SetOption89] Enable unique device topic based on Zigbee device ShortAddr #define ZIGBEE_DISTINCT_TOPICS false // [SetOption89] Enable unique device topic based on Zigbee device ShortAddr
#define ZIGBEE_RMV_ZBRECEIVED false // [SetOption100] Remove ZbReceived form JSON message #define ZIGBEE_RMV_ZBRECEIVED false // [SetOption100] Remove ZbReceived form JSON message
#define ZIGBEE_INDEX_EP false // [SetOption101] Add the source endpoint as suffix to attributes, ex `Power3` instead of `Power` if sent from endpoint 3 #define ZIGBEE_INDEX_EP false // [SetOption101] Add the source endpoint as suffix to attributes, ex `Power3` instead of `Power` if sent from endpoint 3
#define WATCHDOG_TASK_SECONDS 10 // [ESP32 only] Task Watchdog Timer (TWDT) time in seconds - detecting Tasmota running for a prolonged period of time without yielding with `esp_task_wdt_reset()`
/*********************************************************************************************\ /*********************************************************************************************\
* END OF SECTION 1 * END OF SECTION 1

29
tasmota/support.ino
View File

@ -66,35 +66,6 @@ void OsWatchTicker(void)
} }
} }
#ifdef ESP32
#include "esp_task_wdt.h"
void TWDTInit(void) {
// enable Task Watchdog Timer
esp_task_wdt_init(WATCHDOG_TASK_SECONDS, true);
// if (ret != ESP_OK) { AddLog(LOG_LEVEL_ERROR, "HDW: cannot init Task WDT %i", ret); }
esp_task_wdt_add(nullptr);
// if (ret != ESP_OK) { AddLog(LOG_LEVEL_ERROR, "HDW: cannot start Task WDT %i", ret); }
}
void TWDTRestore(void) {
// restore default WDT values
esp_task_wdt_init(WATCHDOG_TASK_SECONDS, false);
}
void TWDTLoop(void) {
esp_task_wdt_reset();
}
// custom handler
extern "C" {
void __attribute__((weak)) esp_task_wdt_isr_user_handler(void)
{
Serial.printf(">>>>>----------\n");
}
}
#endif
void OsWatchInit(void) void OsWatchInit(void)
{ {
oswatch_blocked_loop = RtcSettings.oswatch_blocked_loop; oswatch_blocked_loop = RtcSettings.oswatch_blocked_loop;

6
tasmota/tasmota.ino
View File

@ -319,9 +319,6 @@ void setup(void) {
SettingsLoad(); SettingsLoad();
SettingsDelta(); SettingsDelta();
#ifdef ESP32
// TWDTInit(); // Start Task WDT for ESP32 - FreeRTOS only
#endif
OsWatchInit(); OsWatchInit();
TasmotaGlobal.seriallog_level = Settings->seriallog_level; TasmotaGlobal.seriallog_level = Settings->seriallog_level;
@ -516,9 +513,6 @@ void Scheduler(void) {
#endif // USE_DISCOVERY #endif // USE_DISCOVERY
#endif // ESP8266 #endif // ESP8266
#ifdef ESP32
// TWDTLoop();
#endif
OsWatchLoop(); OsWatchLoop();
ButtonLoop(); ButtonLoop();
SwitchLoop(); SwitchLoop();

3
tasmota/xdrv_01_webserver.ino
View File

@ -2794,9 +2794,6 @@ void HandleUploadLoop(void) {
Web.upload_error = 2; // Not enough space Web.upload_error = 2; // Not enough space
return; return;
} }
#ifdef ESP32
// TWDTLoop();
#endif
if (upload.totalSize && !(upload.totalSize % 102400)) { if (upload.totalSize && !(upload.totalSize % 102400)) {
AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "Progress %d kB"), upload.totalSize / 1024); AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_UPLOAD "Progress %d kB"), upload.totalSize / 1024);
} }

3
tasmota/xdrv_52_3_berry_tasmota.ino
View File

@ -308,7 +308,6 @@ extern "C" {
// ESP object // ESP object
int32_t l_yield(bvm *vm); int32_t l_yield(bvm *vm);
int32_t l_yield(bvm *vm) { int32_t l_yield(bvm *vm) {
// TWDTLoop(); // reset watchdog
BrTimeoutYield(); // reset timeout BrTimeoutYield(); // reset timeout
be_return_nil(vm); be_return_nil(vm);
} }
@ -546,8 +545,6 @@ void berry_log(const char * berry_buf) {
if (berry.log.log.length() >= BERRY_MAX_LOGS) { if (berry.log.log.length() >= BERRY_MAX_LOGS) {
berry.log.log.remove(berry.log.log.head()); berry.log.log.remove(berry.log.log.head());
} }
} else {
// TWDTLoop(); // if REPL, printing resets the WDT
} }
// AddLog(LOG_LEVEL_INFO, PSTR("[Add to log] %s"), berry_buf); // AddLog(LOG_LEVEL_INFO, PSTR("[Add to log] %s"), berry_buf);
berry.log.addString(berry_buf, pre_delimiter, "\n"); berry.log.addString(berry_buf, pre_delimiter, "\n");