From 6e22a0e4d91b3b8d5f07263f61029357a7c33b46 Mon Sep 17 00:00:00 2001
From: Jason Antman <jason@jasonantman.com>
Date: Fri, 13 Jul 2018 18:54:15 -0400
Subject: [PATCH] Fix ZWave RGBW lights not producing color without explicit
white_value (#15412)
* Fix ZWave RGBW lights not producing color without explicit white_value (#13930)
* simplify conditional in previous commit (#13930)
* ZwaveColorLight - only zero _white if white_value not specified in call (#13930)
---
homeassistant/components/light/zwave.py | 4 +++-
tests/components/light/test_zwave.py | 26 +++++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/homeassistant/components/light/zwave.py b/homeassistant/components/light/zwave.py
index 3bfa167f8ec..f468e8c25ef 100644
--- a/homeassistant/components/light/zwave.py
+++ b/homeassistant/components/light/zwave.py
@@ -324,9 +324,11 @@ class ZwaveColorLight(ZwaveDimmer):
else:
self._ct = TEMP_COLD_HASS
rgbw = '#00000000ff'
-
elif ATTR_HS_COLOR in kwargs:
self._hs = kwargs[ATTR_HS_COLOR]
+ if ATTR_WHITE_VALUE not in kwargs:
+ # white LED must be off in order for color to work
+ self._white = 0
if ATTR_WHITE_VALUE in kwargs or ATTR_HS_COLOR in kwargs:
rgbw = '#'
diff --git a/tests/components/light/test_zwave.py b/tests/components/light/test_zwave.py
index 4966b161360..62bcf834b98 100644
--- a/tests/components/light/test_zwave.py
+++ b/tests/components/light/test_zwave.py
@@ -255,6 +255,32 @@ def test_set_white_value(mock_openzwave):
assert color.data == '#ffffffc800'
+def test_disable_white_if_set_color(mock_openzwave):
+ """
+ Test that _white is set to 0 if turn_on with ATTR_HS_COLOR.
+
+ See Issue #13930 - many RGBW ZWave bulbs will only activate the RGB LED to
+ produce color if _white is set to zero.
+ """
+ node = MockNode(command_classes=[const.COMMAND_CLASS_SWITCH_COLOR])
+ value = MockValue(data=0, node=node)
+ color = MockValue(data='#0000000000', node=node)
+ # Supports RGB only
+ color_channels = MockValue(data=0x1c, node=node)
+ values = MockLightValues(primary=value, color=color,
+ color_channels=color_channels)
+ device = zwave.get_device(node=node, values=values, node_config={})
+ device._white = 234
+
+ assert color.data == '#0000000000'
+ assert device.white_value == 234
+
+ device.turn_on(**{ATTR_HS_COLOR: (30, 50)})
+
+ assert device.white_value == 0
+ assert color.data == '#ffbf7f0000'
+
+
def test_zw098_set_color_temp(mock_openzwave):
"""Test setting zwave light color."""
node = MockNode(manufacturer_id='0086', product_id='0062',
--
GitLab