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

Merge pull request #9986 from pcdiem/pwm1 

Support rules that override button holds
This commit is contained in:
Theo Arends 2020-11-26 17:55:59 +01:00 committed by GitHub
parent 3b0cfab8ae b0fb9090bc
commit 44710e7af4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/xdrv_10_rules.ino
View File

@ -171,6 +171,7 @@ struct RULES {
uint16_t mems_event = 0; // Bitmask supporting MAX_RULE_MEMS bits uint16_t mems_event = 0; // Bitmask supporting MAX_RULE_MEMS bits
bool teleperiod = false; bool teleperiod = false;
bool busy = false; bool busy = false;
bool no_execute = false; // Don't actually execute rule commands
char event_data[100]; char event_data[100];
} Rules; } Rules;
@ -708,6 +709,7 @@ bool RuleSetProcess(uint8_t rule_set, String &event_saved)
#endif #endif
if (RulesRuleMatch(rule_set, event, event_trigger, stop_all_rules)) { if (RulesRuleMatch(rule_set, event, event_trigger, stop_all_rules)) {
if (Rules.no_execute) return true;
if (plen == plen2) { stop_all_rules = true; } // If BREAK was used on a triggered rule, Stop execution of this rule set 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;

15
tasmota/xdrv_35_pwm_dimmer.ino
View File

@ -767,10 +767,19 @@ bool Xdrv35(uint8_t function)
#endif // USE_PWM_DIMMER_REMOTE #endif // USE_PWM_DIMMER_REMOTE
} }
// If hold time has arrived, handle it. // If hold time has arrived and a rule is enabled that handles the button hold, handle it.
else if (button_hold_time[button_index] <= now) { else if (button_hold_time[button_index] <= now) {
PWMDimmerHandleButton(button_index, true); #ifdef USE_RULES
button_held[button_index] = true; sprintf(TasmotaGlobal.mqtt_data, PSTR("{\"Button%u\":{\"State\":3}}"), button_index + 1);
Rules.no_execute = true;
if (!XdrvRulesProcess()) {
#endif // USE_RULES
PWMDimmerHandleButton(button_index, true);
button_held[button_index] = true;
#ifdef USE_RULES
}
Rules.no_execute = false;
#endif // USE_RULES
} }
} }