FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

mqtt2.template: bugfixes in z2m_light_cct and shelly_TRV

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26463 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Beta-User 2022-10-02 06:19:48 +00:00
parent b62482b2dc
commit c05e247506
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,7 @@ par:ICON;ICON as set, defaults to light_control;{ AttrVal('DEVICE','icon','light
attr DEVICE icon ICON attr DEVICE icon ICON
attr DEVICE webCmd toggle:on:off:brightness:ct attr DEVICE webCmd toggle:on:off:brightness:ct
attr DEVICE devicetopic BASE_TOPIC/DEV_ID attr DEVICE devicetopic BASE_TOPIC/DEV_ID
attr DEVICE readingList $\DEVICETOPIC:.* { my $ret=json2nameValue($EVENT); $ret->{state}=lc($ret->{state}) if defined $ret->{state}; return $ret } attr DEVICE readingList $\DEVICETOPIC:.* { my $ret=json2nameValue($EVENT,'',$JSONMAP); $ret->{state}=lc($ret->{state}) if defined $ret->{state}; return $ret }
attr DEVICE setList \ attr DEVICE setList \
on:noArg $\DEVICETOPIC/set {"state":"ON"}\ on:noArg $\DEVICETOPIC/set {"state":"ON"}\
off:noArg $\DEVICETOPIC/set {"state":"OFF"}\ off:noArg $\DEVICETOPIC/set {"state":"OFF"}\
@ -248,7 +248,7 @@ attr DEVICE setList \
attr DEVICE jsonMap color_temp:ct color_temp_startup:ct_startup attr DEVICE jsonMap color_temp:ct color_temp_startup:ct_startup
set DEVICE attrTemplate speechcontrol_type_light_255 set DEVICE attrTemplate speechcontrol_type_light_255
attr DEVICE model zigbee2mqtt_light_cct attr DEVICE model zigbee2mqtt_light_cct
setreading DEVICE attrTemplateVersion 20220909 setreading DEVICE attrTemplateVersion 20221002
#source post: https://forum.fhem.de/index.php/topic,97303.msg905935.html#msg905935 #source post: https://forum.fhem.de/index.php/topic,97303.msg905935.html#msg905935
name:zigbee2mqtt_light_rgb_hex name:zigbee2mqtt_light_rgb_hex
@ -3291,10 +3291,10 @@ setreading DEVICE attrTemplateVersion 20210108
# shellyTRV using original firmware # shellyTRV using original firmware
name:shelly_TRV name:shelly_TRV
filter:TYPE=MQTT2_DEVICE:FILTER=readingList=.*shellies.* filter:TYPE=MQTT2_DEVICE:FILTER=readingList=.*shellies.*,TYPE=MQTT2_DEVICE:FILTER=devicetopic=.*shellies.*
desc:shelly-TRV using original firmware <br>early version desc:shelly-TRV using original firmware <br>early version
order:A_16d order:A_16d
par:DEV_TPC;"shellies/" and Shelly name in the topic;{ AttrVal('DEVICE','devicetopic',AttrVal('DEVICE','readingList','')) =~ m<(shellies/[^/]+)/> ? $1 : undef } par:DEV_TPC;"shellies/" and Shelly name in the topic;{ AttrVal('DEVICE','devicetopic',AttrVal('DEVICE','readingList','')) =~ m<(shellies/[^/]+)> ? $1 : undef }
par:ICON;ICON as set, defaults to temp_control;{ AttrVal('DEVICE','icon','temp_control') } par:ICON;ICON as set, defaults to temp_control;{ AttrVal('DEVICE','icon','temp_control') }
attr DEVICE icon ICON attr DEVICE icon ICON
attr DEVICE devicetopic DEV_TPC attr DEVICE devicetopic DEV_TPC
@ -3312,7 +3312,7 @@ attr DEVICE setList \
valve:slider,0,1,100,1 $\DEVICETOPIC/thermostat/0/command/valve_pos $EVTPART1\ valve:slider,0,1,100,1 $\DEVICETOPIC/thermostat/0/command/valve_pos $EVTPART1\
valve_min_percent:slider,0,1,100,1 $\DEVICETOPIC/thermostat/0/command/valve_min_percent $EVTPART1\ valve_min_percent:slider,0,1,100,1 $\DEVICETOPIC/thermostat/0/command/valve_min_percent $EVTPART1\
boost_minutes $\DEVICETOPIC/thermostat/0/command/boost_minutes $EVTPART1\ boost_minutes $\DEVICETOPIC/thermostat/0/command/boost_minutes $EVTPART1\
set_boost_minutes $\DEVICETOPIC/thermostat/0/command/set_boost_minutes $EVTPART1\ set_boost_minutes $\DEVICETOPIC/thermostat/0/command/set_boost_minutes $EVTPART1
attr DEVICE jsonMap bat:0 bat_value:batteryPercent bat_voltage:batteryVoltage target_t_value:desired-temp thermostats_1_tmp_value:temperature thermostats_1_valve_min_percent:valve_min_percent attr DEVICE jsonMap bat:0 bat_value:batteryPercent bat_voltage:batteryVoltage target_t_value:desired-temp thermostats_1_tmp_value:temperature thermostats_1_valve_min_percent:valve_min_percent
attr DEVICE stateFormat Measured: temperature Battery: batteryPercent % attr DEVICE stateFormat Measured: temperature Battery: batteryPercent %
attr DEVICE webCmd desired-temp attr DEVICE webCmd desired-temp
@ -3321,7 +3321,7 @@ attr DEVICE setStateList on off
attr DEVICE model shelly_TRV attr DEVICE model shelly_TRV
set DEVICE attrTemplate speechcontrol_type_thermostat set DEVICE attrTemplate speechcontrol_type_thermostat
deletereading -q DEVICE (?!associatedWith|IODev).* deletereading -q DEVICE (?!associatedWith|IODev).*
setreading DEVICE attrTemplateVersion 20220929 setreading DEVICE attrTemplateVersion 20221001
#shelly2rgbw #shelly2rgbw
# contributed by dkreutz http://forum.fhem.de/index.php/topic,94060.msg944338.html#msg944338 # contributed by dkreutz http://forum.fhem.de/index.php/topic,94060.msg944338.html#msg944338