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

Merge pull request #6916 from ascillato/patch-1 

Fix Rules Evaluation when using break and several triggers are true
This commit is contained in:
Theo Arends 2019-11-12 20:41:56 +01:00 committed by GitHub
parent a1616b48ce 6f614369c1
commit 584a25de6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/xdrv_10_rules.ino
View File

@ -425,16 +425,15 @@ bool RuleSetProcess(uint8_t rule_set, String &event_saved)
if (plen == -1) { plen = 9999; } if (plen == -1) { plen = 9999; }
if (plen2 == -1) { plen2 = 9999; } if (plen2 == -1) { plen2 = 9999; }
plen = tmin(plen, plen2); plen = tmin(plen, plen2);
if (plen == plen2) { stop_all_rules = true; } // If BREAK was used, Stop execution of this rule set
String commands = rules.substring(pevt +4, plen); // "Backlog Dimmer 10;Color 100000" String commands = rules.substring(pevt +4, plen); // "Backlog Dimmer 10;Color 100000"
plen += 6;
Rules.event_value = ""; Rules.event_value = "";
String event = event_saved; String event = event_saved;
//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Event |%s|, Rule |%s|, Command(s) |%s|"), event.c_str(), event_trigger.c_str(), commands.c_str()); //AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Event |%s|, Rule |%s|, Command(s) |%s|"), event.c_str(), event_trigger.c_str(), commands.c_str());
if (RulesRuleMatch(rule_set, event, event_trigger)) { if (RulesRuleMatch(rule_set, event, event_trigger)) {
if (plen == plen2) { stop_all_rules = true; } // If BREAK was used on a triggered rule, Stop execution of this rule set
commands.trim(); commands.trim();
String ucommand = commands; String ucommand = commands;
ucommand.toUpperCase(); ucommand.toUpperCase();
@ -473,6 +472,7 @@ bool RuleSetProcess(uint8_t rule_set, String &event_saved)
serviced = true; serviced = true;
if (stop_all_rules) { return serviced; } // If BREAK was used, Stop execution of this rule set if (stop_all_rules) { return serviced; } // If BREAK was used, Stop execution of this rule set
} }
plen += 6;
Rules.trigger_count[rule_set]++; Rules.trigger_count[rule_set]++;
} }
return serviced; return serviced;