From d68a4b52f12fc1027ea6564bcaa5dab5334e6414 Mon Sep 17 00:00:00 2001 From: Nolan Gilley Date: Fri, 13 Nov 2015 14:32:47 -0500 Subject: [PATCH 1/2] Remove rgb color if it's not an rgb bulb. --- homeassistant/components/light/mqtt.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/light/mqtt.py b/homeassistant/components/light/mqtt.py index f65c99e43e3..a2bae742b6a 100644 --- a/homeassistant/components/light/mqtt.py +++ b/homeassistant/components/light/mqtt.py @@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None): config.get('brightness_command_topic'), "rgb_state_topic": config.get('rgb_state_topic'), "rgb_command_topic": config.get('rgb_command_topic')}, - config.get('rgb', [255, 255, 255]), + config.get('rgb', [-1, -1, -1]), config.get('qos', DEFAULT_QOS), {"on": config.get('payload_on', DEFAULT_PAYLOAD_ON), "off": config.get('payload_off', DEFAULT_PAYLOAD_OFF)}, @@ -67,7 +67,10 @@ class MqttLight(Light): self._hass = hass self._name = name self._topic = topic - self._rgb = rgb + if rgb != [-1, -1, -1]: + self._rgb = rgb + else: + self._rgb = None self._qos = qos self._payload = payload self._brightness = brightness From 776324807ee364452c5c79b040324939807b3b01 Mon Sep 17 00:00:00 2001 From: Nolan Gilley Date: Fri, 13 Nov 2015 14:58:49 -0500 Subject: [PATCH 2/2] last PR was dumb. this fix is better. --- homeassistant/components/light/mqtt.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/light/mqtt.py b/homeassistant/components/light/mqtt.py index a2bae742b6a..13537859a0d 100644 --- a/homeassistant/components/light/mqtt.py +++ b/homeassistant/components/light/mqtt.py @@ -44,7 +44,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None): config.get('brightness_command_topic'), "rgb_state_topic": config.get('rgb_state_topic'), "rgb_command_topic": config.get('rgb_command_topic')}, - config.get('rgb', [-1, -1, -1]), + config.get('rgb', None), config.get('qos', DEFAULT_QOS), {"on": config.get('payload_on', DEFAULT_PAYLOAD_ON), "off": config.get('payload_off', DEFAULT_PAYLOAD_OFF)}, @@ -67,10 +67,7 @@ class MqttLight(Light): self._hass = hass self._name = name self._topic = topic - if rgb != [-1, -1, -1]: - self._rgb = rgb - else: - self._rgb = None + self._rgb = rgb self._qos = qos self._payload = payload self._brightness = brightness