jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-18 18:57:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tradfri lights (#7212)

Browse Source 
* Remove leftover use of slugify

* The IKEA manufacturer key is now exactly as found in device info.

* Fix bitwise addition of supported features
This commit is contained in:
Martin Hjelmare 2017-04-22 09:31:23 +02:00 committed by Paulus Schoutsen
parent 40f480c24e
commit 3f47bf6b77
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
homeassistant/components/light/tradfri.py
View File

@ -8,7 +8,6 @@ from homeassistant.components.light import \
PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA
from homeassistant.components.tradfri import KEY_GATEWAY from homeassistant.components.tradfri import KEY_GATEWAY
from homeassistant.util import color as color_util from homeassistant.util import color as color_util
from homeassistant.util import slugify
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -48,12 +47,12 @@ class Tradfri(Light):
if self._light_data.hex_color is not None: if self._light_data.hex_color is not None:
if self._light.device_info.manufacturer == IKEA: if self._light.device_info.manufacturer == IKEA:
self._features &= SUPPORT_COLOR_TEMP self._features |= SUPPORT_COLOR_TEMP
else: else:
self._features &= SUPPORT_RGB_COLOR self._features |= SUPPORT_RGB_COLOR
self._ok_temps = ALLOWED_TEMPERATURES.get( self._ok_temps = ALLOWED_TEMPERATURES.get(
slugify(self._light.device_info.manufacturer)) self._light.device_info.manufacturer)
@property @property
def supported_features(self): def supported_features(self):
@ -123,7 +122,7 @@ class Tradfri(Light):
kelvin = color_util.color_temperature_mired_to_kelvin( kelvin = color_util.color_temperature_mired_to_kelvin(
kwargs[ATTR_COLOR_TEMP]) kwargs[ATTR_COLOR_TEMP])
# find closest allowed kelvin temp from user input # find closest allowed kelvin temp from user input
kelvin = min(self._ok_temps.keys(), key=lambda x: abs(x-kelvin)) kelvin = min(self._ok_temps.keys(), key=lambda x: abs(x - kelvin))
self._light_control.set_hex_color(self._ok_temps[kelvin]) self._light_control.set_hex_color(self._ok_temps[kelvin])
def update(self): def update(self):