jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into release

Browse Source
This commit is contained in:
Theo Arends 2020-03-14 17:58:06 +01:00
commit d9b2d03017
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/support.ino
View File

@ -1669,6 +1669,8 @@ void AddLog(uint32_t loglevel)
if (!global_state.wifi_down && if (!global_state.wifi_down &&
(loglevel <= syslog_level)) { Syslog(); } (loglevel <= syslog_level)) { Syslog(); }
prepped_loglevel = 0;
} }
void AddLog_P(uint32_t loglevel, const char *formatP) void AddLog_P(uint32_t loglevel, const char *formatP)

1
tasmota/support_tasmota.ino
View File

@ -809,7 +809,6 @@ void Every100mSeconds(void)
if (prepped_loglevel) { if (prepped_loglevel) {
AddLog(prepped_loglevel); AddLog(prepped_loglevel);
prepped_loglevel = 0;
} }
if (latching_relay_pulse) { if (latching_relay_pulse) {

13
tasmota/xdrv_01_webserver.ino
View File

@ -1952,17 +1952,26 @@ void OtherSaveSettings(void)
} }
AddLog_P(LOG_LEVEL_INFO, message); AddLog_P(LOG_LEVEL_INFO, message);
/*
// This sometimes provides intermittent watchdog
bool template_activate = WebServer->hasArg("t2"); // Try this to tackle intermittent watchdog after execution of Template command
WebGetArg("t1", tmp, sizeof(tmp)); WebGetArg("t1", tmp, sizeof(tmp));
if (strlen(tmp)) { // {"NAME":"12345678901234","GPIO":[255,255,255,255,255,255,255,255,255,255,255,255,255],"FLAG":255,"BASE":255} if (strlen(tmp)) { // {"NAME":"12345678901234","GPIO":[255,255,255,255,255,255,255,255,255,255,255,255,255],"FLAG":255,"BASE":255}
char svalue[128]; char svalue[128];
snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_TEMPLATE " %s"), tmp); snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_TEMPLATE " %s"), tmp);
ExecuteWebCommand(svalue, SRC_WEBGUI); ExecuteWebCommand(svalue, SRC_WEBGUI);
if (WebServer->hasArg("t2")) { if (template_activate) {
snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_MODULE " 0")); snprintf_P(svalue, sizeof(svalue), PSTR(D_CMND_MODULE " 0"));
ExecuteWebCommand(svalue, SRC_WEBGUI); ExecuteWebCommand(svalue, SRC_WEBGUI);
} }
}
// Try async execution of commands
*/
WebGetArg("t1", tmp, sizeof(tmp));
if (strlen(tmp)) { // {"NAME":"12345678901234","GPIO":[255,255,255,255,255,255,255,255,255,255,255,255,255],"FLAG":255,"BASE":255}
snprintf_P(message, sizeof(message), PSTR(D_CMND_BACKLOG " " D_CMND_TEMPLATE " %s%s"), tmp, (WebServer->hasArg("t2")) ? "; " D_CMND_MODULE " 0" : "");
ExecuteWebCommand(message, SRC_WEBGUI);
} }
} }