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

Merge pull request #14619 from alexasf/development

Browse Source 
Added %timer1% to %timer16% variables to rules
This commit is contained in:
Theo Arends 2022-02-04 15:57:38 +01:00 committed by GitHub
commit c113a2a4b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tasmota/xdrv_10_rules.ino
View File

@ -48,6 +48,7 @@
* on switch1#state do power2 %value% endon * on switch1#state do power2 %value% endon
* on analog#a0div10 do publish cmnd/ring2/dimmer %value% endon * on analog#a0div10 do publish cmnd/ring2/dimmer %value% endon
* on loadavg<50 do power 2 endon * on loadavg<50 do power 2 endon
* on Time#Initialized do Backlog var1 0;event checktime=%time% endon on event#checktime>%timer1% do var1 1 endon on event#checktime>=%timer2% do var1 0 endon * on event#checktime do Power1 %var1% endon
* *
* Notes: * Notes:
* Spaces after <on>, around <do> and before <endon> are mandatory * Spaces after <on>, around <do> and before <endon> are mandatory
@ -471,6 +472,15 @@ bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule, bool stop_all
rule_param = String(SunMinutes(1)); rule_param = String(SunMinutes(1));
} }
#endif // USE_TIMERS and USE_SUNRISE #endif // USE_TIMERS and USE_SUNRISE
#if defined(USE_TIMERS)
for (uint32_t i = 0; i < MAX_TIMERS; i++) {
snprintf_P(stemp, sizeof(stemp), PSTR("%%TIMER%d%%"), i +1);
if (rule_param.startsWith(stemp)) {
rule_param = String(Settings->timer[i].time);
break;
}
}
#endif // USE_TIMERS
#if defined(USE_LIGHT) #if defined(USE_LIGHT)
char scolor[LIGHT_COLOR_SIZE]; char scolor[LIGHT_COLOR_SIZE];
if (rule_param.startsWith(F("%COLOR%"))) { if (rule_param.startsWith(F("%COLOR%"))) {
@ -778,6 +788,12 @@ bool RuleSetProcess(uint8_t rule_set, String &event_saved)
RulesVarReplace(commands, F("%SUNRISE%"), String(SunMinutes(0))); RulesVarReplace(commands, F("%SUNRISE%"), String(SunMinutes(0)));
RulesVarReplace(commands, F("%SUNSET%"), String(SunMinutes(1))); RulesVarReplace(commands, F("%SUNSET%"), String(SunMinutes(1)));
#endif // USE_TIMERS and USE_SUNRISE #endif // USE_TIMERS and USE_SUNRISE
#if defined(USE_TIMERS)
for (uint32_t i = 0; i < MAX_TIMERS; i++) {
snprintf_P(stemp, sizeof(stemp), PSTR("%%TIMER%d%%"), i +1);
RulesVarReplace(commands, stemp, String(Settings->timer[i].time));
}
#endif // USE_TIMERS
#if defined(USE_LIGHT) #if defined(USE_LIGHT)
char scolor[LIGHT_COLOR_SIZE]; char scolor[LIGHT_COLOR_SIZE];
RulesVarReplace(commands, F("%COLOR%"), LightGetColor(scolor)); RulesVarReplace(commands, F("%COLOR%"), LightGetColor(scolor));
@ -1410,6 +1426,13 @@ bool findNextVariableValue(char * &pVarname, float &value)
} else if (sVarName.equals(F("SUNSET"))) { } else if (sVarName.equals(F("SUNSET"))) {
value = SunMinutes(1); value = SunMinutes(1);
#endif #endif
#if defined(USE_TIMERS)
} else if (sVarName.startsWith(F("TIMER"))) {
int index = sVarName.substring(5).toInt();
if (index > 0 && index <= MAX_TIMERS) {
value = Settings->timer[index-1].time;
}
#endif // USE_TIMERS
// #ifdef USE_ZIGBEE // #ifdef USE_ZIGBEE
// // } else if (sVarName.equals(F("ZBDEVICE"))) { // // } else if (sVarName.equals(F("ZBDEVICE"))) {
// // value = Z_GetLastDevice(); // // value = Z_GetLastDevice();