mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-02-01 19:30:31 +00:00
mqtt2.template: bugfix in zigbee stateFormat, standardize shelly-commands
git-svn-id: https://svn.fhem.de/fhem/trunk@19472 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Beta-User
parent
e781ee29ec
commit
d13f72c8cf
@ -147,7 +147,7 @@ desc: A dimmable rgb light connected via zigbee2mqtt <br>rgb value is encoded as
|
||||
par:BASE_TOPIC;base topic as set in configuration.yaml of the zigbee2mqtt bridge in the topics;{ AttrVal("DEVICE","readingList","") =~ m,([^/]+)[/].*:, ? $1 : undef }
|
||||
par:DEV_ID;name of the device in the zigbee2mqtt bridge;{ AttrVal("DEVICE","readingList","") =~ m,[^/]+[/]([^/]+).*:, ? $1 : undef }
|
||||
attr DEVICE icon hue_filled_white_and_color_e27_b22
|
||||
attr DEVICE stateFormat {lc ReadingsVal("$name","state",0)}
|
||||
attr DEVICE stateFormat {lc ReadingsVal($name,"state",0)}
|
||||
attr DEVICE devStateIcon {zigbee2mqtt_devStateIcon255($name)}
|
||||
attr DEVICE webCmd toggle:on:off:brightness:hex
|
||||
attr DEVICE readingList BASE_TOPIC/DEV_ID:.* { json2nameValue($EVENT) }
|
||||
@ -165,7 +165,7 @@ desc: A dimmable rgb light connected via zigbee2mqtt <br>rgb values will be sent
|
||||
par:BASE_TOPIC;base topic as set in configuration.yaml of the zigbee2mqtt bridge in the topics;{ AttrVal("DEVICE","readingList","") =~ m,([^/]+)[/].*:, ? $1 : undef }
|
||||
par:DEV_ID;name of the device in the zigbee2mqtt bridge;{ AttrVal("DEVICE","readingList","") =~ m,[^/]+[/]([^/]+).*:, ? $1 : undef }
|
||||
attr DEVICE icon hue_filled_white_and_color_e27_b22
|
||||
attr DEVICE stateFormat {lc ReadingsVal("$name","state",0)}
|
||||
attr DEVICE stateFormat {lc ReadingsVal($name,"state",0)}
|
||||
attr DEVICE devStateIcon {zigbee2mqtt_devStateIcon255($name)}
|
||||
attr DEVICE webCmd toggle:on:off:brightness:color
|
||||
attr DEVICE readingList BASE_TOPIC/DEV_ID:.* { json2nameValue($EVENT) }
|
||||
@ -183,7 +183,7 @@ desc: A dimmable rgbw light connected via zigbee2mqtt <br>rgb value is encoded a
|
||||
par:BASE_TOPIC;base topic as set in configuration.yaml of the zigbee2mqtt bridge in the topics;{ AttrVal("DEVICE","readingList","") =~ m,([^/]+)[/].*:, ? $1 : undef }
|
||||
par:DEV_ID;name of the device in the zigbee2mqtt bridge;{ AttrVal("DEVICE","readingList","") =~ m,[^/]+[/]([^/]+).*:, ? $1 : undef }
|
||||
attr DEVICE icon hue_filled_white_and_color_e27_b22
|
||||
attr DEVICE stateFormat {lc ReadingsVal("$name","state",0)}
|
||||
attr DEVICE stateFormat {lc ReadingsVal($name,"state",0)}
|
||||
attr DEVICE devStateIcon {zigbee2mqtt_devStateIcon255($name)}
|
||||
attr DEVICE webCmd toggle:on:off:brightness:color_temp:warm:white:hex
|
||||
attr DEVICE readingList BASE_TOPIC/DEV_ID:.* { json2nameValue($EVENT) }
|
||||
@ -205,7 +205,7 @@ desc: A dimmable rgbw light connected via zigbee2mqtt <br>rgb values will be sen
|
||||
par:BASE_TOPIC;base topic as set in configuration.yaml of the zigbee2mqtt bridge in the topics;{ AttrVal("DEVICE","readingList","") =~ m,([^/]+)[/].*:, ? $1 : undef }
|
||||
par:DEV_ID;name of the device in the zigbee2mqtt bridge;{ AttrVal("DEVICE","readingList","") =~ m,[^/]+[/]([^/]+).*:, ? $1 : undef }
|
||||
attr DEVICE icon hue_filled_white_and_color_e27_b22
|
||||
attr DEVICE stateFormat {lc ReadingsVal("$name","state",0)}
|
||||
attr DEVICE stateFormat {lc ReadingsVal($name,"state",0)}
|
||||
attr DEVICE devStateIcon {zigbee2mqtt_devStateIcon255($name)}
|
||||
attr DEVICE webCmd toggle:on:off:brightness:color:white
|
||||
attr DEVICE readingList BASE_TOPIC/DEV_ID:.* { json2nameValue($EVENT) }
|
||||
@ -224,7 +224,7 @@ filter:TYPE=MQTT2_DEVICE:FILTER=CID=zigbee.*
|
||||
par:BASE_TOPIC;base topic as set in configuration.yaml of the zigbee2mqtt bridge in the topics;{ AttrVal("DEVICE","readingList","") =~ m,([^/]+)[/].*:, ? $1 : undef }
|
||||
par:DEV_ID;name of the device in the zigbee2mqtt bridge;{ AttrVal("DEVICE","readingList","") =~ m,[^/]+[/]([^/]+).*:, ? $1 : undef }
|
||||
attr DEVICE icon hue_filled_white_and_color_e27_b22
|
||||
attr DEVICE stateFormat {lc ReadingsVal("$name","state",0)}
|
||||
attr DEVICE stateFormat {lc ReadingsVal($name,"state",0)}
|
||||
attr DEVICE devStateIcon {zigbee2mqtt_devStateIcon255($name)}
|
||||
attr DEVICE webCmd toggle:on:off:brightness:color_temp:hex
|
||||
attr DEVICE readingList BASE_TOPIC/DEV_ID:.* { json2nameValue($EVENT) }
|
||||
@ -243,7 +243,7 @@ desc: A dimmable rgb-cct light connected via zigbee2mqtt <br>rgb values will be
|
||||
par:BASE_TOPIC;base topic as set in configuration.yaml of the zigbee2mqtt bridge in the topics;{ AttrVal("DEVICE","readingList","") =~ m,([^/]+)[/].*:, ? $1 : undef }
|
||||
par:DEV_ID;name of the device in the zigbee2mqtt bridge;{ AttrVal("DEVICE","readingList","") =~ m,[^/]+[/]([^/]+).*:, ? $1 : undef }
|
||||
attr DEVICE icon hue_filled_white_and_color_e27_b22
|
||||
attr DEVICE stateFormat {lc ReadingsVal("$name","state",0)}
|
||||
attr DEVICE stateFormat {lc ReadingsVal($name,"state",0)}
|
||||
attr DEVICE devStateIcon {zigbee2mqtt_devStateIcon255($name)}
|
||||
attr DEVICE webCmd toggle:on:off:brightness:color_temp:color
|
||||
attr DEVICE readingList BASE_TOPIC/DEV_ID:.* { json2nameValue($EVENT) }
|
||||
@ -777,7 +777,8 @@ par:DEVNAME;Shelly1 name in the topic;{ AttrVal("DEVICE","readingList","") =~ m,
|
||||
attr DEVICE setList\
|
||||
off:noArg shellies/DEVNAME/relay/0/command off\
|
||||
on:noArg shellies/DEVNAME/relay/0/command on\
|
||||
update:noArg shellies/DEVNAME/command update_fw
|
||||
x_update:noArg shellies/DEVNAME/command update_fw\
|
||||
x_mqttcom shellies/DEVNAME/command $EVTPART1
|
||||
attr DEVICE readingList \
|
||||
shellies/DEVNAME/relay/0:.* state\
|
||||
shellies/DEVNAME/relay/0:.* relay0\
|
||||
@ -805,7 +806,8 @@ attr DEVICE setList\
|
||||
relay0:on,off,toggle shellies/DEVNAME/relay/0/command $EVTPART1\
|
||||
off:noArg shellies/DEVNAME/relay/0/command off\
|
||||
on:noArg shellies/DEVNAME/relay/0/command on\
|
||||
update:noArg shellies/DEVNAME/command update_fw
|
||||
x_update:noArg shellies/DEVNAME/command update_fw\
|
||||
x_mqttcom shellies/DEVNAME/command $EVTPART1
|
||||
attr DEVICE readingList \
|
||||
shellies/DEVNAME/relay/0:.* state\
|
||||
shellies/DEVNAME/relay/0:.* relay0\
|
||||
@ -834,8 +836,9 @@ attr DEVICE setList \
|
||||
close:noArg shellies/DEVNAME/roller/0/command close\
|
||||
stop:noArg shellies/DEVNAME/roller/0/command stop\
|
||||
pct:slider,0,1,100 shellies/DEVNAME/roller/0/command/pos $EVTPART1\
|
||||
DoRecalibration:noArg shellies/DEVNAME/roller/0/command rc\
|
||||
update:noArg shellies/DEVNAME/command update_fw
|
||||
x_recalibration:noArg shellies/DEVNAME/roller/0/command rc\
|
||||
x_update:noArg shellies/DEVNAME/command update_fw\
|
||||
x_mqttcom shellies/DEVNAME/command $EVTPART1
|
||||
attr DEVICE readingList \
|
||||
shellies/DEVNAME/roller/0/pos:.* pct\
|
||||
shellies/DEVNAME/status/0/rollers:.* power\
|
||||
@ -881,7 +884,7 @@ attr DEVICE readingList \
|
||||
shellies/DEVNAME/relay/energy:.* energy\
|
||||
shellies/DEVNAME/temperature:.* temperature\
|
||||
shellies/DEVNAME/overtemperature:.* overtemperature
|
||||
attr DEVICE devStateIcon opening:fts_shutter_up@red closing:fts_shutter_down@red true:10px-kreis-gruen false:10px-kreis-rot 0:fts_shutter_100 100:fts_shutter_10 9\d:fts_shutter_10 8\d:fts_shutter_20 7\d:fts_shutter_30 6\d:fts_shutter_40 5\d:fts_shutter_50 4\d:fts_shutter_60 3\d:fts_shutter_70 2\d:fts_shutter_80 1\d:fts_shutter_90 0\d:fts_shutter_100 set_.*:fts_shutter_updown
|
||||
attr DEVICE devStateIcon opening:fts_shutter_up@red closing:fts_shutter_down@red true:10px-kreis-gruen false:10px-kreis-rot 0:fts_shutter_100 100:fts_shutter_10 9\d:fts_shutter_10 8\d:fts_shutter_20 7\d:fts_shutter_30 6\d:fts_shutter_40 5\d:fts_shutter_50 4\d:fts_shutter_60 3\d:fts_shutter_70 2\d:fts_shutter_80 1\d:fts_shutter_90 0\d:fts_shutter_100 set_.*:fts_shutter_updown
|
||||
attr DEVICE cmdIcon open:fts_shutter_up close:fts_shutter_down stop:fts_shutter_manual half:fts_shutter_50
|
||||
attr DEVICE webCmd :open:close:half:stop:pct
|
||||
attr DEVICE stateFormat <a href="http://ip" target="_blank">\
|
||||
@ -1035,8 +1038,9 @@ attr DEVICE setList \
|
||||
relay0:iconSwitch,on,li_wht_off,off,li_wht_on shellies/DEVNAME/relay/0/command $EVTPART1\
|
||||
relay1:iconSwitch,on,li_wht_off,off,li_wht_on shellies/DEVNAME/relay/1/command $EVTPART1\
|
||||
relay2:iconSwitch,on,li_wht_off,off,li_wht_on shellies/DEVNAME/relay/2/command $EVTPART1\
|
||||
relay3:iconSwitch,on,li_wht_off,off,li_wht_on shellies/DEVNAME/relay/3/command $EVTPART1 \
|
||||
update:noArg shellies/DEVNAME/command update_fw
|
||||
relay3:iconSwitch,on,li_wht_off,off,li_wht_on shellies/DEVNAME/relay/3/command $EVTPART1\
|
||||
x_update:noArg shellies/DEVNAME/command update_fw\
|
||||
x_mqttcom shellies/DEVNAME/command $EVTPART1
|
||||
attr DEVICE webCmd relay0:relay1:relay2:relay3
|
||||
attr DEVICE stateFormat R0: relay0 R1: relay1 R2: relay2 R3: relay3
|
||||
attr DEVICE model A_14b_shelly4pro_unified
|
||||
@ -1052,7 +1056,8 @@ attr DEVICE setList\
|
||||
pct:colorpicker,BRI,0,1,100 shellies/DEVNAME/color/0/set {"turn":"on","gain":"$EVTPART1","brightness":"$EVTPART1"}\
|
||||
ct:colorpicker,CT,3000,10,6500 {$EVTPART1=3000 if ($EVTPART1<3000);"shellies/DEVNAME/color/0/set {\"turn\":\"on\",\"mode\":\"white\",\"temp\":\"$EVTPART1\"}"}\
|
||||
rgb:colorpicker,RGB {$EVTPART1=~/(..)(..)(..)/;if($1 ne $2 || $2 ne $3){"shellies/DEVNAME/color/0/set {\"turn\":\"on\",\"mode\":\"color\",\"gain\":\"100\",\"red\":".hex($1).",\"green\":".hex($2).",\"blue\":".hex($3)."}"}else{"shellies/shellybulb-3CC533/color/0/set {\"turn\":\"on\",\"mode\":\"white\",\"brightness\":".int(hex($1)/2.55)."}"}}\
|
||||
update:noArg shellies/DEVNAME/command update_fw
|
||||
x_update:noArg shellies/DEVNAME/command update_fw\
|
||||
x_mqttcom shellies/DEVNAME/command $EVTPART1
|
||||
deletereading -q DEVICE status_.*
|
||||
attr DEVICE readingList shellies/DEVNAME/color/0/status:.* {json2nameValue($EVENT)}
|
||||
attr DEVICE userReadings ct:temp.* {ReadingsVal($name,"temp",3000)}, rgb:red.* {if(ReadingsVal($name,"mode","") eq "color"){sprintf("%02X%02X%02X", ReadingsVal($name,"red",99), ReadingsVal($name,"green",99), ReadingsVal($name,"blue",99))}else{my $a=sprintf("%02X",ReadingsVal($name,"brightness",0)*2.555);"$a$a$a"}}
|
||||
@ -1066,7 +1071,9 @@ attr DEVICE model A_15_shellybulb
|
||||
name:A_16_shellyht
|
||||
filter:TYPE=MQTT2_DEVICE:FILTER=readingList=.*shellies.*
|
||||
desc:shellyht using original firmware <br>Just adds stateFormat and icon
|
||||
attr DEVICE setList update:noArg shellies/DEVNAME/command update_fw
|
||||
attr DEVICE setList \
|
||||
x_update:noArg shellies/DEVNAME/command update_fw\
|
||||
x_mqttcom shellies/DEVNAME/command $EVTPART1
|
||||
attr DEVICE icon temperature_humidity
|
||||
attr DEVICE stateFormat T: temperature °C H: humidity % B: battery %
|
||||
attr DEVICE model A_16_shellyht
|
||||
@ -1084,7 +1091,8 @@ attr DEVICE readingList shellies/DEVNAME/white/0/status:.* {json2nameValue($EVEN
|
||||
attr DEVICE setList off:noArg shellies/DEVNAME/white/0/command off\
|
||||
on:noArg shellies/DEVNAME/white/0/command on\
|
||||
brightness:colorpicker,BRI,0,1,100 shellies/DEVNAME/white/0/set {"ison":"true","mode":"white","brightness":"$EVTPART1"}\
|
||||
update:noArg shellies/DEVNAME/command update_fw
|
||||
x_update:noArg shellies/DEVNAME/command update_fw\
|
||||
x_mqttcom shellies/DEVNAME/command $EVTPART1
|
||||
deletereading -q DEVICE (?!associatedWith).*
|
||||
setreading DEVICE associatedWith DEVICE_CH1,DEVICE_CH2,DEVICE_CH4
|
||||
attr DEVICE webCmd on:off:brightness
|
||||
@ -1197,7 +1205,6 @@ attr DEVICE setList\
|
||||
brightness:colorpicker,BRI,0,15,255 BASE_ID/REMOTE_ID/BULB_TYPE/GROUP_ID {"$EVTPART0":"$EVTPART1"}\
|
||||
hue:colorpicker,HUE,0,1,359 BASE_ID/REMOTE_ID/BULB_TYPE/GROUP_ID {"$EVTPART0":"$EVTPART1"}\
|
||||
command:uzsuSelectRadio,Weiss,Nacht BASE_ID/REMOTE_ID/BULB_TYPE/GROUP_ID {"$EVTPART0":"$EVTPART1"}
|
||||
attr DEVICE setStateList on off
|
||||
attr DEVICE userReadings hex:color_r.* {Color::rgb2hex(ReadingsVal($name,"color_r",255),ReadingsVal($name,"color_g",255),ReadingsVal($name,"color_b",255))}, hue:bulb_mode.*white {"0"}
|
||||
attr DEVICE setStateList on off
|
||||
attr DEVICE setExtensionsEvent 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user