evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve zwave_js light targetvalue vs currentValue selection (#45477)

Browse source
This commit is contained in:
Marcel van der Veldt 2021-01-25 22:09:12 +01:00 • committed by GitHub
parent 094844f834
commit 11009b99bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 822 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
homeassistant/components/zwave_js/light.py
View file

@ -105,7 +105,13 @@ class ZwaveLight(ZWaveBaseEntity, LightEntity):
Z-Wave multilevel switches use a range of [0, 99] to control brightness.
"""
if self._target_value is not None and self._target_value.value is not None:
# prefer targetValue only if CC Version >= 4
# otherwise use currentValue (pre V4 dimmers)
if (
self._target_value
and self._target_value.value is not None
and self._target_value.cc_version >= 4
):
return round((self._target_value.value / 99) * 255)
if self.info.primary_value.value is not None:
return round((self.info.primary_value.value / 99) * 255)
@ -237,7 +243,7 @@ class ZwaveLight(ZWaveBaseEntity, LightEntity):
if self.info.primary_value.value == zwave_brightness:
# no point in setting same brightness
return
# set transition value before seinding new brightness
# set transition value before sending new brightness
await self._async_set_transition_duration(transition)
# setting a value requires setting targetValue
await self.info.node.async_set_value(self._target_value, zwave_brightness)
@ -324,7 +330,11 @@ class ZwaveLight(ZWaveBaseEntity, LightEntity):
)
else:
self._color_temp = None
elif ww_val or cw_val:
# only one white channel
elif ww_val:
# only one white channel (warm white)
self._supports_white_value = True
# FIXME: Update self._white_value
self._white_value = ww_val.value
elif cw_val:
# only one white channel (cool white)
self._supports_white_value = True
self._white_value = cw_val.value