jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set min transition time for Sengled lights in ZHA groups (#75644)

Browse Source 
* Set min transition time for Sengled lights in ZHA groups

* Change test to expect correct min transition time for group with Sengled light

* Fix turn_off with transition 0 for Sengled lights
This commit is contained in:
TheJulianJES 2022-07-25 14:13:01 +02:00 committed by GitHub
parent de46243ce5
commit b8ae883f18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/components/zha/light.py
View File

@ -74,6 +74,7 @@ STRICT_MATCH = functools.partial(ZHA_ENTITIES.strict_match, Platform.LIGHT)
GROUP_MATCH = functools.partial(ZHA_ENTITIES.group_match, Platform.LIGHT)
PARALLEL_UPDATES = 0
SIGNAL_LIGHT_GROUP_STATE_CHANGED = "zha_light_group_state_changed"
DEFAULT_MIN_TRANSITION_MANUFACTURERS = {"Sengled"}
COLOR_MODES_GROUP_LIGHT = {ColorMode.COLOR_TEMP, ColorMode.XY}
SUPPORT_GROUP_LIGHT = (
@ -379,7 +380,7 @@ class BaseLight(LogMixin, light.LightEntity):
# is not none looks odd here but it will override built in bulb transition times if we pass 0 in here
if transition is not None and supports_level:
result = await self._level_channel.move_to_level_with_on_off(
0, transition * 10
0, transition * 10 or self._DEFAULT_MIN_TRANSITION_TIME
)
else:
result = await self._on_off_channel.off()
@ -670,10 +671,10 @@ class ForceOnLight(Light):
@STRICT_MATCH(
channel_names=CHANNEL_ON_OFF,
aux_channels={CHANNEL_COLOR, CHANNEL_LEVEL},
manufacturers={"Sengled"},
manufacturers=DEFAULT_MIN_TRANSITION_MANUFACTURERS,
)
class SengledLight(Light):
"""Representation of a Sengled light which does not react to move_to_color_temp with 0 as a transition."""
class MinTransitionLight(Light):
"""Representation of a light which does not react to any "move to" calls with 0 as a transition."""
_DEFAULT_MIN_TRANSITION_TIME = 1
@ -688,6 +689,10 @@ class LightGroup(BaseLight, ZhaGroupEntity):
"""Initialize a light group."""
super().__init__(entity_ids, unique_id, group_id, zha_device, **kwargs)
group = self.zha_device.gateway.get_group(self._group_id)
self._DEFAULT_MIN_TRANSITION_TIME = any( # pylint: disable=invalid-name
member.device.manufacturer in DEFAULT_MIN_TRANSITION_MANUFACTURERS
for member in group.members
)
self._on_off_channel = group.endpoint[OnOff.cluster_id]
self._level_channel = group.endpoint[LevelControl.cluster_id]
self._color_channel = group.endpoint[Color.cluster_id]

10
tests/components/zha/test_light.py
View File

@ -1184,7 +1184,7 @@ async def async_test_off_from_hass(hass, cluster, entity_id):
async def async_test_level_on_off_from_hass(
hass, on_off_cluster, level_cluster, entity_id
hass, on_off_cluster, level_cluster, entity_id, expected_default_transition: int = 0
):
"""Test on off functionality from hass."""
@ -1259,7 +1259,7 @@ async def async_test_level_on_off_from_hass(
4,
level_cluster.commands_by_name["move_to_level_with_on_off"].schema,
10,
0,
expected_default_transition,
expect_reply=True,
manufacturer=None,
tries=1,
@ -1417,7 +1417,11 @@ async def test_zha_group_light_entity(
# test turning the lights on and off from the HA
await async_test_level_on_off_from_hass(
hass, group_cluster_on_off, group_cluster_level, group_entity_id
hass,
group_cluster_on_off,
group_cluster_level,
group_entity_id,
expected_default_transition=1, # a Sengled light is in that group and needs a minimum 0.1s transition
)
# test getting a brightness change from the network