* Support changing the bulb color for tplink smartbulbs, related to #8766 * existence of ATTR_RGB_COLOR in kwargs, not just its existence... * return modified supported features * rgb-hsv conversion utils from hass return bogus values (at least for this device), so doing conversions directly with colorsys * add typing & documentation for color model conversions * make linters happy * cast hsv to integer before passing it to the backend library * make sure the bulb is on before adjusting the other settings * allow floats as inputs for conversions, return always integers * use typing hint in the parameter list instead of at assignment * do not assign local color state inside turn_on, but let update handle doing it * use forward declaration for typing, fixes travis requirements build hopefully * rename hsv and rgb * remove type-checking check, forward declarations should work just fine without it * disable (broken) pylint warnings, these can be removed after astroid is updated from 1.4.9 to 1.5
This commit is contained in:
parent
cb59b3fee1
commit
90fb33f610
1 changed files with 40 additions and 7 deletions
|
@ -5,14 +5,17 @@ For more details about this component, please refer to the documentation at
|
||||||
https://home-assistant.io/components/light.tplink/
|
https://home-assistant.io/components/light.tplink/
|
||||||
"""
|
"""
|
||||||
import logging
|
import logging
|
||||||
|
import colorsys
|
||||||
from homeassistant.const import (CONF_HOST, CONF_NAME)
|
from homeassistant.const import (CONF_HOST, CONF_NAME)
|
||||||
from homeassistant.components.light import (
|
from homeassistant.components.light import (
|
||||||
Light, ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_KELVIN,
|
Light, ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_KELVIN, ATTR_RGB_COLOR,
|
||||||
SUPPORT_BRIGHTNESS, SUPPORT_COLOR_TEMP)
|
SUPPORT_BRIGHTNESS, SUPPORT_COLOR_TEMP, SUPPORT_RGB_COLOR)
|
||||||
from homeassistant.util.color import \
|
from homeassistant.util.color import \
|
||||||
color_temperature_mired_to_kelvin as mired_to_kelvin
|
color_temperature_mired_to_kelvin as mired_to_kelvin
|
||||||
from homeassistant.util.color import \
|
from homeassistant.util.color import (
|
||||||
color_temperature_kelvin_to_mired as kelvin_to_mired
|
color_temperature_kelvin_to_mired as kelvin_to_mired)
|
||||||
|
|
||||||
|
from typing import Tuple
|
||||||
|
|
||||||
REQUIREMENTS = ['pyHS100==0.2.4.2']
|
REQUIREMENTS = ['pyHS100==0.2.4.2']
|
||||||
|
|
||||||
|
@ -39,10 +42,26 @@ def brightness_from_percentage(percent):
|
||||||
return (percent*255.0)/100.0
|
return (percent*255.0)/100.0
|
||||||
|
|
||||||
|
|
||||||
|
# Travis-CI runs too old astroid https://github.com/PyCQA/pylint/issues/1212
|
||||||
|
# pylint: disable=invalid-sequence-index
|
||||||
|
def rgb_to_hsv(rgb: Tuple[float, float, float]) -> Tuple[int, int, int]:
|
||||||
|
"""Convert RGB tuple (values 0-255) to HSV (degrees, %, %)."""
|
||||||
|
hue, sat, value = colorsys.rgb_to_hsv(rgb[0]/255, rgb[1]/255, rgb[2]/255)
|
||||||
|
return int(hue * 360), int(sat * 100), int(value * 100)
|
||||||
|
|
||||||
|
|
||||||
|
# Travis-CI runs too old astroid https://github.com/PyCQA/pylint/issues/1212
|
||||||
|
# pylint: disable=invalid-sequence-index
|
||||||
|
def hsv_to_rgb(hsv: Tuple[float, float, float]) -> Tuple[int, int, int]:
|
||||||
|
"""Convert HSV tuple (degrees, %, %) to RGB (values 0-255)."""
|
||||||
|
red, green, blue = colorsys.hsv_to_rgb(hsv[0]/360, hsv[1]/100, hsv[2]/100)
|
||||||
|
return int(red * 255), int(green * 255), int(blue * 255)
|
||||||
|
|
||||||
|
|
||||||
class TPLinkSmartBulb(Light):
|
class TPLinkSmartBulb(Light):
|
||||||
"""Representation of a TPLink Smart Bulb."""
|
"""Representation of a TPLink Smart Bulb."""
|
||||||
|
|
||||||
def __init__(self, smartbulb, name):
|
def __init__(self, smartbulb: 'SmartBulb', name):
|
||||||
"""Initialize the bulb."""
|
"""Initialize the bulb."""
|
||||||
self.smartbulb = smartbulb
|
self.smartbulb = smartbulb
|
||||||
|
|
||||||
|
@ -55,6 +74,7 @@ class TPLinkSmartBulb(Light):
|
||||||
self._state = None
|
self._state = None
|
||||||
self._color_temp = None
|
self._color_temp = None
|
||||||
self._brightness = None
|
self._brightness = None
|
||||||
|
self._rgb = None
|
||||||
_LOGGER.debug("Setting up TP-Link Smart Bulb")
|
_LOGGER.debug("Setting up TP-Link Smart Bulb")
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -64,6 +84,8 @@ class TPLinkSmartBulb(Light):
|
||||||
|
|
||||||
def turn_on(self, **kwargs):
|
def turn_on(self, **kwargs):
|
||||||
"""Turn the light on."""
|
"""Turn the light on."""
|
||||||
|
self.smartbulb.state = self.smartbulb.BULB_STATE_ON
|
||||||
|
|
||||||
if ATTR_COLOR_TEMP in kwargs:
|
if ATTR_COLOR_TEMP in kwargs:
|
||||||
self.smartbulb.color_temp = \
|
self.smartbulb.color_temp = \
|
||||||
mired_to_kelvin(kwargs[ATTR_COLOR_TEMP])
|
mired_to_kelvin(kwargs[ATTR_COLOR_TEMP])
|
||||||
|
@ -72,7 +94,9 @@ class TPLinkSmartBulb(Light):
|
||||||
if ATTR_BRIGHTNESS in kwargs:
|
if ATTR_BRIGHTNESS in kwargs:
|
||||||
brightness = kwargs.get(ATTR_BRIGHTNESS, self.brightness or 255)
|
brightness = kwargs.get(ATTR_BRIGHTNESS, self.brightness or 255)
|
||||||
self.smartbulb.brightness = brightness_to_percentage(brightness)
|
self.smartbulb.brightness = brightness_to_percentage(brightness)
|
||||||
self.smartbulb.state = self.smartbulb.BULB_STATE_ON
|
if ATTR_RGB_COLOR in kwargs:
|
||||||
|
rgb = kwargs.get(ATTR_RGB_COLOR)
|
||||||
|
self.smartbulb.hsv = rgb_to_hsv(rgb)
|
||||||
|
|
||||||
def turn_off(self):
|
def turn_off(self):
|
||||||
"""Turn the light off."""
|
"""Turn the light off."""
|
||||||
|
@ -88,6 +112,11 @@ class TPLinkSmartBulb(Light):
|
||||||
"""Return the brightness of this light between 0..255."""
|
"""Return the brightness of this light between 0..255."""
|
||||||
return self._brightness
|
return self._brightness
|
||||||
|
|
||||||
|
@property
|
||||||
|
def rgb_color(self):
|
||||||
|
"""Return the color in RGB."""
|
||||||
|
return self._rgb
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def is_on(self):
|
def is_on(self):
|
||||||
"""True if device is on."""
|
"""True if device is on."""
|
||||||
|
@ -106,10 +135,14 @@ class TPLinkSmartBulb(Light):
|
||||||
self.smartbulb.color_temp != 0):
|
self.smartbulb.color_temp != 0):
|
||||||
self._color_temp = kelvin_to_mired(
|
self._color_temp = kelvin_to_mired(
|
||||||
self.smartbulb.color_temp)
|
self.smartbulb.color_temp)
|
||||||
|
self._rgb = hsv_to_rgb(self.smartbulb.hsv)
|
||||||
except (SmartPlugException, OSError) as ex:
|
except (SmartPlugException, OSError) as ex:
|
||||||
_LOGGER.warning('Could not read state for %s: %s', self.name, ex)
|
_LOGGER.warning('Could not read state for %s: %s', self.name, ex)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def supported_features(self):
|
def supported_features(self):
|
||||||
"""Flag supported features."""
|
"""Flag supported features."""
|
||||||
return SUPPORT_TPLINK
|
supported_features = SUPPORT_TPLINK
|
||||||
|
if self.smartbulb.is_color:
|
||||||
|
supported_features += SUPPORT_RGB_COLOR
|
||||||
|
return supported_features
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue