From be54ff765322cb724c5d0d4e611b7ed5bb97e21b Mon Sep 17 00:00:00 2001 From: Beta-User Date: Sat, 18 Jul 2020 14:37:12 +0000 Subject: [PATCH] mqtt2.template: Changes#2 to sonos, tasmota2zigbee git-svn-id: https://svn.fhem.de/fhem/trunk@22425 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/lib/AttrTemplate/mqtt2.template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/lib/AttrTemplate/mqtt2.template b/fhem/FHEM/lib/AttrTemplate/mqtt2.template index c5c2163fd..d8b2cb3ad 100644 --- a/fhem/FHEM/lib/AttrTemplate/mqtt2.template +++ b/fhem/FHEM/lib/AttrTemplate/mqtt2.template @@ -1615,7 +1615,7 @@ attr DEVICE readingList STATTOPIC/RESULT:.* { json2nameValue($EVENT,'',$JSONMAP) } set IO_DEV publish CMNDTOPIC/restart 1 attr DEVICE model tasmota_zigbee2tasmota_bridge -setreading DEVICE attrTemplateVersion 20200718 +setreading DEVICE attrTemplateVersion 20200718_1 name:tasmota_zigbee2tasmota_light_dimmer @@ -1631,12 +1631,14 @@ attr DEVICE readingList TELETOPIC/SENSOR:.* { $EVENT =~ m,0xDEV_ID.:(.[^}]+.), ? json2nameValue($1,'',$JSONMAP) : undef } attr DEVICE setList on CMNDTOPIC/ZbSend {"device":"0xDEV_ID","send":{"Power":"On"}}\ off CMNDTOPIC/ZbSend {"device":"0xDEV_ID","send":{"Power":"Off"}}\ - brightness:colorpicker,BRI,0,5,254 CMNDTOPIC/ZbSend { "device":"0xDEV_ID", "send":{"Dimmer":$EVTPART1} } + brightness:colorpicker,BRI,0,5,254 CMNDTOPIC/ZbSend { "device":"0xDEV_ID", "send":{"Dimmer":$EVTPART1} }\ + dimup:noArg CMNDTOPIC/ZbSend { "device":"0xDEV_ID", "send":{"DimmerUp"} }\ + dimdown:noArg CMNDTOPIC/ZbSend { "device":"0xDEV_ID", "send":{"DimmerDown"} } attr DEVICE setStateList on off -attr DEVICE jsonMap Dimmer:brightness Power:state +attr DEVICE jsonMap Dimmer:brightness Power:state Battery:batteryPercent set DEVICE attrTemplate speechcontrol_type_light_255 attr DEVICE model tasmota_zigbee2tasmota_light_dimmer -setreading DEVICE attrTemplateVersion 20200718 +setreading DEVICE attrTemplateVersion 20200718_1 @@ -3603,8 +3605,8 @@ attr DEVICE setList\ play:noArg BASE_TOPIC/DEV_ID/control { "command": "play" }\ pause:noArg BASE_TOPIC/DEV_ID/control { "command": "pause" }\ toggle:noArg BASE_TOPIC/DEV_ID/control { "command": "toggle" }\ - volumeup:noArg BASE_TOPIC/DEV_ID/control { "command": "volumeup" }\ - volumedown:noArg BASE_TOPIC/DEV_ID/control { "command": "volumedown" }\ + volumeUp:noArg BASE_TOPIC/DEV_ID/control { "command": "volumeup" }\ + volumeDown:noArg BASE_TOPIC/DEV_ID/control { "command": "volumedown" }\ volume:slider,0,1,100 BASE_TOPIC/DEV_ID/control { "command": "volume", "input": $EVTPART1 }\ mute:on,off { my $value = $EVTPART1 eq "on" ? "mute" : "unmute"; qq(BASE_TOPIC/DEV_ID/control { "command": "$value" } ) }\ next:noArg BASE_TOPIC/DEV_ID/control { "command": "next" }\ @@ -3618,7 +3620,7 @@ attr DEVICE setList\ x_raw_payload:textField { my $payload = $EVENT;$payload =~ s/$EVTPART0 //g; qq(BASE_TOPIC/DEV_ID/control $payload)} attr DEVICE model sonos2mqtt_speaker attr DEVICE alias ALIAS -setreading DEVICE attrTemplateVersion 20200717 +setreading DEVICE attrTemplateVersion 20200718 ###########################################