Refactor rules MACADDR

This commit is contained in:
Theo Arends 2020-09-22 12:09:16 +02:00
parent 2bf98839e8
commit 7605ec388c
1 changed files with 1 additions and 3 deletions

View File

@ -758,11 +758,9 @@ bool RuleSetProcess(uint8_t rule_set, String &event_saved)
RulesVarReplace(commands, F("%TOPIC%"), mqtt_topic);
snprintf_P(stemp, sizeof(stemp), PSTR("%06X"), ESP_getChipId());
RulesVarReplace(commands, F("%DEVICEID%"), stemp);
char macaddr[13];
String mac_address = WiFi.macAddress();
mac_address.replace(":", "");
snprintf_P(macaddr, sizeof(macaddr), PSTR("%s"), mac_address.c_str());
RulesVarReplace(commands, F("%MACADDR%"), macaddr);
RulesVarReplace(commands, F("%MACADDR%"), mac_address);
#if defined(USE_TIMERS) && defined(USE_SUNRISE)
RulesVarReplace(commands, F("%SUNRISE%"), String(SunMinutes(0)));
RulesVarReplace(commands, F("%SUNSET%"), String(SunMinutes(1)));