Merge pull request home-assistant#4373 from home-assistant/flux_led_c…

…olor_bright support color and brightness in flux_led light
Dudu67 · Nov 13, 2016 · c5fdd43 · c5fdd43
2 parents 2109b7a + 895454b
commit c5fdd43
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/homeassistant/components/light/flux_led.py b/homeassistant/components/light/flux_led.py
@@ -135,7 +135,9 @@ def turn_on(self, **kwargs):
         rgb = kwargs.get(ATTR_RGB_COLOR)
         brightness = kwargs.get(ATTR_BRIGHTNESS)
         effect = kwargs.get(ATTR_EFFECT)
-        if rgb:
+        if rgb and brightness:
+            self._bulb.setRgb(*tuple(rgb), brightness=brightness)
+        elif rgb:
             self._bulb.setRgb(*tuple(rgb))
         elif brightness:
             if self._mode == 'rgbw':