FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 20:06:18 +00:00
Code Issues Releases Wiki Activity

mqtt2.template: add zigbee-w-2buttons; httpmod.template: DWD template: delete outdated readings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20885 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Beta-User 2020-01-05 05:33:34 +00:00
parent 4f1031f546
commit 56e04f6963
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/lib/AttrTemplate/httpmod.template
View File

@ -9,7 +9,7 @@
# If undef, the user has to specify them (the comment is shown to the user) # If undef, the user has to specify them (the comment is shown to the user)
########################################### ###########################################
name:General_Info name:General_Info_httpmod.template
filter:TYPE=HTTPMOD filter:TYPE=HTTPMOD
desc: Forum <a href="https://forum.fhem.de/index.php/topic,97694.0.html">link</a> for suggestions or bug reports on httpmod-template.<br>For changes and updates on this file, see <a href="https://svn.fhem.de/trac/log/trunk/fhem/FHEM/lib/AttrTemplate/httpmod.template">svn changelog</a>. In most cases, major changes will be mentionned there. desc: Forum <a href="https://forum.fhem.de/index.php/topic,97694.0.html">link</a> for suggestions or bug reports on httpmod-template.<br>For changes and updates on this file, see <a href="https://svn.fhem.de/trac/log/trunk/fhem/FHEM/lib/AttrTemplate/httpmod.template">svn changelog</a>. In most cases, major changes will be mentionned there.
order:00000000 order:00000000
@ -78,6 +78,8 @@ attr DEVICE extractAllJSONFilter REGIONCODE
attr DEVICE readingEncode UTF-8 attr DEVICE readingEncode UTF-8
attr DEVICE preProcessRegex s/warnWetter..............|\);|\t|\n|\r//g attr DEVICE preProcessRegex s/warnWetter..............|\);|\t|\n|\r//g
attr DEVICE room WHICHROOM attr DEVICE room WHICHROOM
attr DEVICE readingMaxAge 10
attr DEVICE readingMaxAgeReplacementMode delete
attr DEVICE model DWD_weather_warnings attr DEVICE model DWD_weather_warnings
#German river water levels, Wiki: https://wiki.fhem.de/wiki/Flusspegel #German river water levels, Wiki: https://wiki.fhem.de/wiki/Flusspegel

19
fhem/FHEM/lib/AttrTemplate/mqtt2.template
View File

@ -363,6 +363,25 @@ deletereading -q DEVICE_CH2 (?!associatedWith).*
attr DEVICE_CH2 jsonMap state_l1:0 state_l2:state state:0 consumption:0 linkquality:0 power:0 temperature:0 attr DEVICE_CH2 jsonMap state_l1:0 state_l2:state state:0 consumption:0 linkquality:0 power:0 temperature:0
attr DEVICE_CH2 model zigbee2mqtt_2channel_split attr DEVICE_CH2 model zigbee2mqtt_2channel_split
# zigbee2mqtt 2 channel device with buttons, forum #102866
name:zigbee2mqtt_2channel_split_w_buttons
filter:TYPE=MQTT2_DEVICE:FILTER=CID=zigbee.*
desc:For zigbee2mqtt 2 channel device with 2 buttons. <br>NOTE: a second device will be created for the second channel<br>NOTE: Untested version, should work with Xiaomi QBKG12LM
order:L_05d
par:BASE_TOPIC;base topic set in configuration.yaml of the zigbee2mqtt bridge;{ AttrVal("DEVICE","readingList","") =~ m,[\b]?([^/:]+)[/].*:, ? $1 : undef }
par:DEV_ID;name of the device in the zigbee2mqtt bridge;{ AttrVal("DEVICE","readingList","") =~ m,[^/]+[/]([^/]+).*:, ? $1 : undef }
par:ICON;ICON as set, defaults to message_socket;{ AttrVal("DEVICE","icon","message_socket") }
set DEVICE attrTemplate zigbee2mqtt_2channel_split
attr DEVICE setList \
on:noArg BASE_TOPIC/DEV_ID/left/set {"state":"ON"}\
off:noArg BASE_TOPIC/DEV_ID/left/set {"state":"OFF"}
attr DEVICE jsonMap state:availability state_left:state state_right:0
attr DEVICE_CH2 setList \
on:noArg BASE_TOPIC/DEV_ID/right/set {"state":"ON"}\
off:noArg BASE_TOPIC/DEV_ID/right/set {"state":"OFF"}
attr DEVICE_CH2 jsonMap state_left:0 state_right:state state:0 consumption:0 linkquality:0 power:0 temperature:0
attr DEVICE,DEVICE_CH2 model zigbee2mqtt_2channel_split_w_buttons
name:zigbee2mqtt_ContactSensor name:zigbee2mqtt_ContactSensor
desc: Contact sensor via zigbee2mqtt <br>Tested with: Xiaomi models Aqara and Mijia desc: Contact sensor via zigbee2mqtt <br>Tested with: Xiaomi models Aqara and Mijia
filter:TYPE=MQTT2_DEVICE:FILTER=CID=zigbee.* filter:TYPE=MQTT2_DEVICE:FILTER=CID=zigbee.*