Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix hue lights for Philips and non-philips lights (#8905)

pull/8890/merge
groth-its 2017-08-12 17:38:12 +02:00 committed by Paulus Schoutsen
parent c4550d02c5
commit 489a02b2c2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/light/hue.py
View File

@ -384,7 +384,6 @@ class HueLight(Light):
hue, sat = color_util.color_xy_to_hs(*kwargs[ATTR_XY_COLOR]) hue, sat = color_util.color_xy_to_hs(*kwargs[ATTR_XY_COLOR])
command['hue'] = hue command['hue'] = hue
command['sat'] = sat command['sat'] = sat
command['bri'] = self.info['bri']
else: else:
command['xy'] = kwargs[ATTR_XY_COLOR] command['xy'] = kwargs[ATTR_XY_COLOR]
elif ATTR_RGB_COLOR in kwargs: elif ATTR_RGB_COLOR in kwargs:
@ -399,14 +398,13 @@ class HueLight(Light):
*(int(val) for val in kwargs[ATTR_RGB_COLOR])) *(int(val) for val in kwargs[ATTR_RGB_COLOR]))
command['xy'] = xyb[0], xyb[1] command['xy'] = xyb[0], xyb[1]
command['bri'] = xyb[2] command['bri'] = xyb[2]
elif ATTR_COLOR_TEMP in kwargs:
temp = kwargs[ATTR_COLOR_TEMP]
command['ct'] = max(self.min_mireds, min(temp, self.max_mireds))
if ATTR_BRIGHTNESS in kwargs: if ATTR_BRIGHTNESS in kwargs:
command['bri'] = kwargs[ATTR_BRIGHTNESS] command['bri'] = kwargs[ATTR_BRIGHTNESS]
if ATTR_COLOR_TEMP in kwargs:
temp = kwargs[ATTR_COLOR_TEMP]
command['ct'] = max(self.min_mireds, min(temp, self.max_mireds))
flash = kwargs.get(ATTR_FLASH) flash = kwargs.get(ATTR_FLASH)
if flash == FLASH_LONG: if flash == FLASH_LONG:
@ -425,9 +423,9 @@ class HueLight(Light):
elif effect == EFFECT_RANDOM: elif effect == EFFECT_RANDOM:
command['hue'] = random.randrange(0, 65535) command['hue'] = random.randrange(0, 65535)
command['sat'] = random.randrange(150, 254) command['sat'] = random.randrange(150, 254)
elif self.bridge_type == 'hue': elif (self.bridge_type == 'hue' and
if self.info.get('manufacturername') != "OSRAM": self.info.get('manufacturername') == 'Philips'):
command['effect'] = 'none' command['effect'] = 'none'
self._command_func(self.light_id, command) self._command_func(self.light_id, command)