diff --git a/fhem/FHEM/lib/AttrTemplate/mqtt2.template b/fhem/FHEM/lib/AttrTemplate/mqtt2.template index ec0637144..f3e8fa58c 100644 --- a/fhem/FHEM/lib/AttrTemplate/mqtt2.template +++ b/fhem/FHEM/lib/AttrTemplate/mqtt2.template @@ -1641,6 +1641,9 @@ par:IO_DEV;Currently used IO;{ InternalVal("DEVICE","LASTInputDev",AttrVal("DEVI set IO_DEV publish CMNDTOPIC/Backlog StateText1 off; StateText2 on; StateText3 toggle; StateText4 hold; SetOption26 1; SetOption89 1; SetOption83 1; SaveData 1 par:ICON;ICON as set, defaults to MQTT;{ AttrVal("DEVICE","icon","mqtt") } attr DEVICE icon ICON +attr DEVICE getList\ + ZbStatus1:noArg ZbStatus1 CMNDTOPIC/ZbStatus1\ + ZbStatus2:textField ZbStatus2 CMNDTOPIC/ZbStatus2 $EVTPART1 attr DEVICE setList permit_join:0,1,99 CMNDTOPIC/ZbPermitJoin $EVTPART1\ x_ZbSend:textField CMNDTOPIC/ZbSend {"device":"0x$EVTPART1","send":{"$EVTPART2":"$EVTPART3"}}\ z_ZbBind_single:textField CMNDTOPIC/ZbBind {"Device":"$EVTPART1","ToDevice":"0x$EVTPART2","Endpoint":$EVTPART3,"ToEndpoint":$EVTPART4,"Cluster":$EVTPART5}\ @@ -1649,13 +1652,13 @@ attr DEVICE bridgeRegexp \ TELETOPIC/([^/]+)/SENSOR:.* "z2t_$1" attr DEVICE readingList \ TELETOPIC/LWT:.* LWT\ - STATTOPIC/RESULT:.* { json2nameValue($EVENT,'',$JSONMAP) }\ + STATTOPIC/RESULT:.* { $EVENT =~ m,(ZbStatus.), ? { $1=>$EVENT } : json2nameValue($EVENT,'',$JSONMAP) }\ TELETOPIC/INFO.:.* { json2nameValue($EVENT,'',$JSONMAP) }\ TELETOPIC/UPTIME:.* { json2nameValue($EVENT,'',$JSONMAP) } set IO_DEV publish CMNDTOPIC/restart 1 attr DEVICE model tasmota_zigbee2tasmota_bridge deletereading -q DEVICE (?!associatedWith).* -setreading DEVICE attrTemplateVersion 20200807 +setreading DEVICE attrTemplateVersion 20200807_1 { AttrTemplate_Initialize() } @@ -1780,11 +1783,11 @@ par:DEV_ID;ZigBee short ID, hex value without leading 0x;{ AttrVal("DEVICE","rea par:ICON;ICON as set, defaults to tradfri_remote;{ AttrVal("DEVICE","icon","tradfri_remote") } attr DEVICE icon ICON attr DEVICE readingList \ - TELETOPIC:.* { $EVENT =~ m,([0-9]{4}![0-9]{2}), ? { 'state'=>$1 } ? : $EVENT =~ m,^.*(..Device.+)..$, ? json2nameValue($1,'',$JSONMAP) : $EVENT =~ m,0xDEV_ID.:(.*).., ? json2nameValue($1,'',$JSONMAP) : undef } + TELETOPIC:.* { $EVENT =~ m,([0-9]{3}([0-9])![0-9]([0-9])), ? { 'state'=>"${2}00$3" } : $EVENT =~ m,^.*(..Device.+)..$, ? json2nameValue($1,'',$JSONMAP) : $EVENT =~ m,0xDEV_ID.:(.*).., ? json2nameValue($1,'',$JSONMAP) : undef } attr DEVICE jsonMap Battery:batteryPercent Device:0 BatteryPercentage:0 deletereading -q DEVICE (?!associatedWith).* attr DEVICE model tasmota_zigbee2tasmota_remote_control -setreading DEVICE attrTemplateVersion 20200807 +setreading DEVICE attrTemplateVersion 20200807_1 ###########################################