Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

mqtt2template: sharpen bridgeRegexp for some bridge type intermediate devices in MQTT2_CLIENT_general_bridge

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@22258 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Beta-User 2020-06-25 06:13:05 +00:00
parent ce77955235
commit c52c8f4fa2
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
FHEM/lib/AttrTemplate/mqtt2.template
View File

@ -21,17 +21,13 @@ name:MQTT2_CLIENT_general_bridge
filter:TYPE=MQTT2_DEVICE filter:TYPE=MQTT2_DEVICE
desc:recommended to use this as general bridgeing device when using MQTT2_CLIENT as IO to get around missing CID info for distinguishing different popular devices<br>NOTE:<br>This might create a new MQTT2-device or change existing ones, especially destroy readingList attributes! desc:recommended to use this as general bridgeing device when using MQTT2_CLIENT as IO to get around missing CID info for distinguishing different popular devices<br>NOTE:<br>This might create a new MQTT2-device or change existing ones, especially destroy readingList attributes!
order:000001 order:000001
#par:IODEVNAME;Name of the IO-Device; { AttrVal("DEVICE","IODev",undef) }
#par:DEVTYPE;TYPE of the device; { InternalVal("DEVICE","TYPE",undef)}
#par:DEVCID;CID of the device as written in the DEF; { InternalVal(AttrVal("DEVICE","IODev",""),"clientId","mosquitto") eq InternalVal("DEVICE","DEF","mosquitto") ? "MQTT2_GeneralBridge" : InternalVal("DEVICE","DEF","mosquitto")} #par:DEVCID;CID of the device as written in the DEF; { InternalVal(AttrVal("DEVICE","IODev",""),"clientId","mosquitto") eq InternalVal("DEVICE","DEF","mosquitto") ? "MQTT2_GeneralBridge" : InternalVal("DEVICE","DEF","mosquitto")}
#par:NEWDEVROOM;Room of the calling device; {AttrVal("DEVCID","room","MQTT2_\DEVICE" )}
par:ICON;ICON as set, defaults to mqtt_bridge_2;{ AttrVal("DEVICE","icon","mqtt_bridge_2") } par:ICON;ICON as set, defaults to mqtt_bridge_2;{ AttrVal("DEVICE","icon","mqtt_bridge_2") }
attr DEVICE icon ICON attr DEVICE icon ICON
#defmod DEVCID MQTT2_\DEVICE DEVCID
attr DEVICE bridgeRegexp \ attr DEVICE bridgeRegexp \
(tele|stat)[/]([^/]+)[/].*:.* "$2"\ (tele|stat)[/]([^/]+)[/].*:.* "$2"\
shellies[/]([^/]+)[/].*:.* "$1"\ shellies[/]([^/]+)[/].*:.* "$1"\
(zigbee2mqtt)[/].*:.* "$1"\ (zigbee2mqtt)/bridge/.*:.* "$1"\
(ESPClient_[^/]+)[/].*:.* "$1"\ (ESPClient_[^/]+)[/].*:.* "$1"\
valetudo[/]([^/]+)[/].*:.* "$1"\ valetudo[/]([^/]+)[/].*:.* "$1"\
[^/]+[/](ems-esp[^/]+)[/].*:.* "$1"\ [^/]+[/](ems-esp[^/]+)[/].*:.* "$1"\
@ -41,23 +37,15 @@ attr DEVICE bridgeRegexp \
(owntracks)[/]([^/:]+)[/]([^/:]+).*:.* "$1_$2$3"\ (owntracks)[/]([^/:]+)[/]([^/:]+).*:.* "$1_$2$3"\
Advantech[/]([^/]+)[/].*:.* "$1"\ Advantech[/]([^/]+)[/].*:.* "$1"\
sonos[/](RINCON_[A-Z0-9]+):.* "$1"\ sonos[/](RINCON_[A-Z0-9]+):.* "$1"\
(sonos)[/][^/]+/.* "$1"\ (sonos)/connected.* "$1"\
(tvheadend)[/][^/:]+.* "$1"\ (tvheadend)[/][^/:]+.* "$1"\
homeassistant/.*/config:.* "" homeassistant/.*/config:.* ""
#attr DEVCID autocreate 1 attr DEVICE autocreate 1
attr DEVICE comment Do not use very open bridgeRegexp expressions! This might lead to irritating results... attr DEVICE comment Do not use very open bridgeRegexp expressions! This might lead to irritating results...
#attr DEVCID room NEWDEVROOM
#attr DEVICE icon mqtt_bridge_2
attr DEVICE setStateList on off attr DEVICE setStateList on off
#deleteattr DEVICE readingList
#deletereading -q DEVICE (?!associatedWith).*
#deleteattr DEVCID readingList
#deletereading -q DEVCID (?!associatedWith).*
#setreading DEVCID associatedWith DEVICE
#{ fhem "trigger $FW_wname JS:location.href='$FW_ME?detail=DEVCID'" if($cl && $cl->{TYPE} eq "FHEMWEB") }
farewell:template has been applied successfully. Be carefull when extending the brigeRegexp! farewell:template has been applied successfully. Be carefull when extending the brigeRegexp!
attr DEVICE model MQTT2_CLIENT_general_bridge attr DEVICE model MQTT2_CLIENT_general_bridge
setreading DEVICE attrTemplateVersion 20200624 setreading DEVICE attrTemplateVersion 20200625
############### ###############
#MQTT2 IO ignoreRegexp #MQTT2 IO ignoreRegexp