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

add json value for rules (#20718)

Browse Source
This commit is contained in:
Barbudor 2024-02-13 13:52:48 +01:00 committed by GitHub
parent 71ae3fb231
commit 04cd8950a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasmota/tasmota_xdrv_driver/xdrv_10_rules.ino
View File

@ -709,7 +709,7 @@ void RulesVarReplace(String &commands, const String &sfind, const String &replac
/*******************************************************************************************/
bool RuleSetProcess(uint8_t rule_set, String &event_saved)
bool RuleSetProcess(uint8_t rule_set, String &event_saved, const char *json_event)
{
bool serviced = false;
char stemp[10];
@ -798,6 +798,7 @@ bool RuleSetProcess(uint8_t rule_set, String &event_saved)
snprintf_P(stemp, sizeof(stemp), PSTR("%06X"), ESP_getChipId());
RulesVarReplace(commands, F("%DEVICEID%"), stemp);
RulesVarReplace(commands, F("%MACADDR%"), NetworkUniqueId());
RulesVarReplace(commands, F("%JSON%"), json_event);
#if defined(USE_TIMERS)
for (uint32_t i = 0; i < MAX_TIMERS; i++) {
snprintf_P(stemp, sizeof(stemp), PSTR("%%TIMER%d%%"), i +1);
@ -908,7 +909,7 @@ bool RulesProcessEvent(const char *json_event)
for (uint32_t i = 0; i < MAX_RULE_SETS; i++) {
if (GetRuleLen(i) && bitRead(Settings->rule_enabled, i)) {
if (RuleSetProcess(i, event_saved)) { serviced = true; }
if (RuleSetProcess(i, event_saved, json_event)) { serviced = true; }
}
}