Skip to content

Commit

Permalink
Fix tradfri lights (#7212)
Browse files Browse the repository at this point in the history
* Remove leftover use of slugify

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

* Fix bitwise addition of supported features
  • Loading branch information
MartinHjelmare authored and balloob committed Apr 22, 2017
1 parent 40f480c commit 3f47bf6
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions homeassistant/components/light/tradfri.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA
from homeassistant.components.tradfri import KEY_GATEWAY
from homeassistant.util import color as color_util
from homeassistant.util import slugify

_LOGGER = logging.getLogger(__name__)

Expand Down Expand Up @@ -48,12 +47,12 @@ def __init__(self, light):

if self._light_data.hex_color is not None:
if self._light.device_info.manufacturer == IKEA:
self._features &= SUPPORT_COLOR_TEMP
self._features |= SUPPORT_COLOR_TEMP
else:
self._features &= SUPPORT_RGB_COLOR
self._features |= SUPPORT_RGB_COLOR

self._ok_temps = ALLOWED_TEMPERATURES.get(
slugify(self._light.device_info.manufacturer))
self._light.device_info.manufacturer)

@property
def supported_features(self):
Expand Down Expand Up @@ -123,7 +122,7 @@ def turn_on(self, **kwargs):
kelvin = color_util.color_temperature_mired_to_kelvin(
kwargs[ATTR_COLOR_TEMP])
# 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])

def update(self):
Expand Down

0 comments on commit 3f47bf6

Please sign in to comment.