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

Add root level triggers as discussed on Discord

Browse Source 
- Add rule trigger ``root#`` to trigger on any root value like ``on root#loadavg<50 do power 2 endon`` after ``state`` command
This commit is contained in:
Theo Arends 2020-05-09 19:22:12 +02:00
parent 2c4b8d7d3f
commit 92c05faa8b
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASENOTES.md
View File

@ -103,3 +103,5 @@ The following binary downloads have been compiled with ESP8266/Arduino library c
- Add support for OpenTherm by Yuriy Sannikov (#8373) - Add support for OpenTherm by Yuriy Sannikov (#8373)
- Add support for Thermostat control by arijav (#8212) - Add support for Thermostat control by arijav (#8212)
- Add experimental basic support for Tasmota on ESP32 based on work by Jörg Schüler-Maroldt - Add experimental basic support for Tasmota on ESP32 based on work by Jörg Schüler-Maroldt
- Add automatic compression of Rules to achieve ~60% compression, added ``SetOption93 1`` to control caching of rules
- Add rule trigger ``root#`` to trigger on any root value like ``on root#loadavg<50 do power 2 endon`` after ``state`` command

3
tasmota/CHANGELOG.md
View File

@ -6,12 +6,13 @@
- Add support for analog anemometer by Matteo Albinola (#8283) - Add support for analog anemometer by Matteo Albinola (#8283)
- Add support for OpenTherm by Yuriy Sannikov (#8373) - Add support for OpenTherm by Yuriy Sannikov (#8373)
- Add support for Thermostat control by arijav (#8212) - Add support for Thermostat control by arijav (#8212)
- Add automatic compression of Rules to achieve ~60% compression, added ``SetOption93 1`` to control caching of rules
- Add rule trigger ``root#`` to trigger on any root value like ``on root#loadavg<50 do power 2 endon`` after ``state`` command
- Change flash access removing support for any Core before 2.6.3 - Change flash access removing support for any Core before 2.6.3
- Change HAss discovery by Federico Leoni (#8370) - Change HAss discovery by Federico Leoni (#8370)
- Change default PWM Frequency to 977 Hz from 223 Hz - Change default PWM Frequency to 977 Hz from 223 Hz
- Change minimum PWM Frequency from 100 Hz to 40 Hz - Change minimum PWM Frequency from 100 Hz to 40 Hz
- Change PWM updated to the latest version of Arduino PR #7231 - Change PWM updated to the latest version of Arduino PR #7231
- Add automatic compression of Rules to achieve ~60% compression, added ``SetOption93 1`` to control caching of rules
### 8.2.0.5 20200425 ### 8.2.0.5 20200425

15
tasmota/xdrv_10_rules.ino
View File

@ -47,6 +47,7 @@
* on button1#state do publish cmnd/ring2/power %value% endon on button2#state do publish cmnd/strip1/power %value% endon * on button1#state do publish cmnd/ring2/power %value% endon on button2#state do publish cmnd/strip1/power %value% endon
* 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 root#loadavg<50 do power 2 endon
* *
* Notes: * Notes:
* Spaces after <on>, around <do> and before <endon> are mandatory * Spaces after <on>, around <do> and before <endon> are mandatory
@ -490,13 +491,21 @@ bool RulesRuleMatch(uint8_t rule_set, String &event, String &rule)
rule_name = rule_name.substring(0, pos); // "SUBTYPE1#CURRENT" rule_name = rule_name.substring(0, pos); // "SUBTYPE1#CURRENT"
} }
//AddLog_P2(LOG_LEVEL_DEBUG, PSTR("RUL: Find Task %s, Name %s"), rule_task.c_str(), rule_name.c_str());
StaticJsonBuffer<1024> jsonBuf; StaticJsonBuffer<1024> jsonBuf;
JsonObject &root = jsonBuf.parseObject(event); JsonObject &root = jsonBuf.parseObject(event);
if (!root.success()) { return false; } // No valid JSON data if (!root.success()) { return false; } // No valid JSON data
if (!root[rule_task].success()) { return false; } // No rule_task in JSON data
JsonObject &obj1 = root[rule_task]; JsonObject *obj;
JsonObject *obj = &obj1; if (rule_task.startsWith("ROOT")) { // Support root level
obj = &root;
} else {
if (!root[rule_task].success()) { return false; } // No rule_task in JSON data
JsonObject &obj1 = root[rule_task];
obj = &obj1;
}
String subtype; String subtype;
uint32_t i = 0; uint32_t i = 0;
while ((pos = rule_name.indexOf("#")) > 0) { // "SUBTYPE1#SUBTYPE2#CURRENT" while ((pos = rule_name.indexOf("#")) > 0) { // "SUBTYPE1#SUBTYPE2#CURRENT"