mirror of
https://github.com/home-assistant/core.git
synced 2025-07-13 16:27:08 +00:00
Trim CW from RGB when not supported in ozw (#39191)
* Trim the CW value if CW isn't supported * Trim CW from white level as well
This commit is contained in:
parent
2e8506de80
commit
7462d140af
@ -204,12 +204,17 @@ class ZwaveLight(ZWaveDeviceEntity, LightEntity):
|
|||||||
rgbw = "#"
|
rgbw = "#"
|
||||||
for colorval in color_util.color_hs_to_RGB(*hs_color):
|
for colorval in color_util.color_hs_to_RGB(*hs_color):
|
||||||
rgbw += f"{colorval:02x}"
|
rgbw += f"{colorval:02x}"
|
||||||
rgbw += "0000"
|
if self._color_channels and self._color_channels & COLOR_CHANNEL_COLD_WHITE:
|
||||||
|
rgbw += "0000"
|
||||||
|
else:
|
||||||
|
# trim the CW value or it will not work correctly
|
||||||
|
rgbw += "00"
|
||||||
# white LED must be off in order for color to work
|
# white LED must be off in order for color to work
|
||||||
|
|
||||||
elif white is not None:
|
elif white is not None:
|
||||||
if self._color_channels & COLOR_CHANNEL_WARM_WHITE:
|
if self._color_channels & COLOR_CHANNEL_WARM_WHITE:
|
||||||
rgbw = f"#000000{white:02x}00"
|
# trim the CW value or it will not work correctly
|
||||||
|
rgbw = f"#000000{white:02x}"
|
||||||
else:
|
else:
|
||||||
rgbw = f"#00000000{white:02x}"
|
rgbw = f"#00000000{white:02x}"
|
||||||
|
|
||||||
|
@ -377,11 +377,11 @@ async def test_pure_rgb_dimmer_light(
|
|||||||
|
|
||||||
msg = sent_messages[-2]
|
msg = sent_messages[-2]
|
||||||
assert msg["topic"] == "OpenZWave/1/command/setvalue/"
|
assert msg["topic"] == "OpenZWave/1/command/setvalue/"
|
||||||
assert msg["payload"] == {"Value": "#ff4cff0000", "ValueIDKey": 122470423}
|
assert msg["payload"] == {"Value": "#ff4cff00", "ValueIDKey": 122470423}
|
||||||
|
|
||||||
# Feedback on state
|
# Feedback on state
|
||||||
light_pure_rgb_msg.decode()
|
light_pure_rgb_msg.decode()
|
||||||
light_pure_rgb_msg.payload["Value"] = "#ff4cff0000"
|
light_pure_rgb_msg.payload["Value"] = "#ff4cff00"
|
||||||
light_pure_rgb_msg.encode()
|
light_pure_rgb_msg.encode()
|
||||||
receive_message(light_pure_rgb_msg)
|
receive_message(light_pure_rgb_msg)
|
||||||
await hass.async_block_till_done()
|
await hass.async_block_till_done()
|
||||||
@ -500,14 +500,14 @@ async def test_no_cw_light(
|
|||||||
assert len(sent_messages) == 2
|
assert len(sent_messages) == 2
|
||||||
msg = sent_messages[-2]
|
msg = sent_messages[-2]
|
||||||
assert msg["topic"] == "OpenZWave/1/command/setvalue/"
|
assert msg["topic"] == "OpenZWave/1/command/setvalue/"
|
||||||
assert msg["payload"] == {"Value": "#000000be00", "ValueIDKey": 659341335}
|
assert msg["payload"] == {"Value": "#000000be", "ValueIDKey": 659341335}
|
||||||
|
|
||||||
# Feedback on state
|
# Feedback on state
|
||||||
light_msg.decode()
|
light_msg.decode()
|
||||||
light_msg.payload["Value"] = byte_to_zwave_brightness(255)
|
light_msg.payload["Value"] = byte_to_zwave_brightness(255)
|
||||||
light_msg.encode()
|
light_msg.encode()
|
||||||
light_rgb_msg.decode()
|
light_rgb_msg.decode()
|
||||||
light_rgb_msg.payload["Value"] = "#000000be00"
|
light_rgb_msg.payload["Value"] = "#000000be"
|
||||||
light_rgb_msg.encode()
|
light_rgb_msg.encode()
|
||||||
receive_message(light_msg)
|
receive_message(light_msg)
|
||||||
receive_message(light_rgb_msg)
|
receive_message(light_rgb_msg)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user