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

Do not allow command Reset in backlog

Browse Source
This commit is contained in:
Theo Arends 2021-05-03 11:00:48 +02:00
parent 49201b6acd
commit f96934a38c
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tasmota/support_command.ino
View File

@ -345,13 +345,14 @@ void CmndBacklog(void) {
// Skip unnecessary command Backlog at start of blcommand // Skip unnecessary command Backlog at start of blcommand
while(true) { while(true) {
blcommand = Trim(blcommand); blcommand = Trim(blcommand);
if (!strncasecmp_P(blcommand, PSTR(D_CMND_BACKLOG), strlen(D_CMND_BACKLOG))) { if (0 == strncasecmp_P(blcommand, PSTR(D_CMND_BACKLOG), strlen(D_CMND_BACKLOG))) {
blcommand += strlen(D_CMND_BACKLOG); blcommand += strlen(D_CMND_BACKLOG);
} else { } else {
break; break;
} }
} }
if (*blcommand != '\0') { // Do not allow command Reset in backlog
if ((*blcommand != '\0') && (strncasecmp_P(blcommand, PSTR(D_CMND_RESET), strlen(D_CMND_RESET)) != 0)) {
#ifdef SUPPORT_IF_STATEMENT #ifdef SUPPORT_IF_STATEMENT
if (backlog.size() < MAX_BACKLOG) { if (backlog.size() < MAX_BACKLOG) {
backlog.add(blcommand); backlog.add(blcommand);
@ -747,8 +748,8 @@ void CmndSeriallog(void)
Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.seriallog_level, TasmotaGlobal.seriallog_level); Response_P(S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE, XdrvMailbox.command, Settings.seriallog_level, TasmotaGlobal.seriallog_level);
} }
void CmndRestart(void) { void CmndRestart(void)
if (TasmotaGlobal.restart_flag) { return; } {
switch (XdrvMailbox.payload) { switch (XdrvMailbox.payload) {
case 1: case 1:
TasmotaGlobal.restart_flag = 2; TasmotaGlobal.restart_flag = 2;
@ -760,19 +761,15 @@ void CmndRestart(void) {
ResponseCmndChar(PSTR(D_JSON_HALTING)); ResponseCmndChar(PSTR(D_JSON_HALTING));
break; break;
case -1: case -1:
TasmotaGlobal.restart_flag = 255;
CmndCrash(); // force a crash CmndCrash(); // force a crash
break; break;
case -2: case -2:
TasmotaGlobal.restart_flag = 255;
CmndWDT(); CmndWDT();
break; break;
case -3: case -3:
TasmotaGlobal.restart_flag = 255;
CmndBlockedLoop(); CmndBlockedLoop();
break; break;
case 99: case 99:
TasmotaGlobal.restart_flag = 255;
AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING)); AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_APPLICATION D_RESTARTING));
EspRestart(); EspRestart();
break; break;
@ -1867,8 +1864,8 @@ void CmndTeleperiod(void)
ResponseCmndNumber(Settings.tele_period); ResponseCmndNumber(Settings.tele_period);
} }
void CmndReset(void) { void CmndReset(void)
if (TasmotaGlobal.restart_flag) { return; } {
switch (XdrvMailbox.payload) { switch (XdrvMailbox.payload) {
case 1: case 1:
TasmotaGlobal.restart_flag = 211; TasmotaGlobal.restart_flag = 211;