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

insure ruletimers always stops at 0

Browse Source
This commit is contained in:
Barbudor 2021-01-02 18:47:03 +01:00
parent ca09594c24
commit 5bb682b7e7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tasmota/xdrv_10_rules.ino
View File

@ -974,9 +974,8 @@ void RulesEvery100ms(void)
void RulesEverySecond(void) void RulesEverySecond(void)
{ {
char json_event[120];
if (Settings.rule_enabled && !Rules.busy) { // Any rule enabled if (Settings.rule_enabled && !Rules.busy) { // Any rule enabled
char json_event[120];
if (RtcTime.valid) { if (RtcTime.valid) {
if ((TasmotaGlobal.uptime > 60) && (RtcTime.minute != Rules.last_minute)) { // Execute from one minute after restart every minute only once if ((TasmotaGlobal.uptime > 60) && (RtcTime.minute != Rules.last_minute)) { // Execute from one minute after restart every minute only once
Rules.last_minute = RtcTime.minute; Rules.last_minute = RtcTime.minute;
@ -984,10 +983,12 @@ void RulesEverySecond(void)
RulesProcessEvent(json_event); RulesProcessEvent(json_event);
} }
} }
for (uint32_t i = 0; i < MAX_RULE_TIMERS; i++) { }
if (Rules.timer[i] != 0L) { // Timer active? for (uint32_t i = 0; i < MAX_RULE_TIMERS; i++) {
if (TimeReached(Rules.timer[i])) { // Timer finished? if (Rules.timer[i] != 0L) { // Timer active?
Rules.timer[i] = 0L; // Turn off this timer if (TimeReached(Rules.timer[i])) { // Timer finished?
Rules.timer[i] = 0L; // Turn off this timer
if (Settings.rule_enabled && !Rules.busy) { // Any rule enabled
snprintf_P(json_event, sizeof(json_event), PSTR("{\"Rules\":{\"Timer\":%d}}"), i +1); snprintf_P(json_event, sizeof(json_event), PSTR("{\"Rules\":{\"Timer\":%d}}"), i +1);
RulesProcessEvent(json_event); RulesProcessEvent(json_event);
} }