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

Merge pull request #6562 from ljakob/development 

process Backlog commands without minimum delay
This commit is contained in:
Theo Arends 2019-10-09 17:17:19 +02:00 committed by GitHub
parent 11048137ef 10babaf061
commit cfe301474a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sonoff/sonoff.ino
View File

@ -870,21 +870,6 @@ void Every100mSeconds(void)
}
}
}
// Backlog
if (TimeReached(backlog_delay)) {
if (!BACKLOG_EMPTY && !backlog_mutex) {
backlog_mutex = true;
#ifdef SUPPORT_IF_STATEMENT
ExecuteCommand((char*)backlog.shift().c_str(), SRC_BACKLOG);
#else
ExecuteCommand((char*)backlog[backlog_pointer].c_str(), SRC_BACKLOG);
backlog_pointer++;
if (backlog_pointer >= MAX_BACKLOG) { backlog_pointer = 0; }
#endif
backlog_mutex = false;
}
}
}
/*-------------------------------------------------------------------------------------------*\
@ -1629,6 +1614,23 @@ void setup(void)
XsnsCall(FUNC_INIT);
}
static void BacklogLoop()
{
if (TimeReached(backlog_delay)) {
if (!BACKLOG_EMPTY && !backlog_mutex) {
backlog_mutex = true;
#ifdef SUPPORT_IF_STATEMENT
ExecuteCommand((char*)backlog.shift().c_str(), SRC_BACKLOG);
#else
ExecuteCommand((char*)backlog[backlog_pointer].c_str(), SRC_BACKLOG);
backlog_pointer++;
if (backlog_pointer >= MAX_BACKLOG) { backlog_pointer = 0; }
#endif
backlog_mutex = false;
}
}
}
void loop(void)
{
uint32_t my_sleep = millis();
@ -1640,6 +1642,7 @@ void loop(void)
ButtonLoop();
SwitchLoop();
BacklogLoop();
#ifdef ROTARY_V1
RotaryLoop();
#endif