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

Eufy colour bulb updates (#13895)

Browse Source 
* Fix up Eufy handling of colour lights

The Eufy colour lights have separate colour and temperature modes, and give
much less light output when in colour mode. Brightness is also handled in
a slightly confusing way, which means that state must be maintained in
order to avoid switching the light between modes by accident. Add some
additional handling for that.

* Bump the lakeside version

This version has important bugfixes for colour bulbs.

* Hound fixes
This commit is contained in:
Matthew Garrett 2018-04-15 00:54:02 -07:00 committed by Pascal Vizeli
parent c018071218
commit 390086bb7e
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/eufy.py
View File

@ -15,7 +15,7 @@ from homeassistant.helpers import discovery
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
REQUIREMENTS = ['lakeside==0.4'] REQUIREMENTS = ['lakeside==0.5']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)

16
homeassistant/components/light/eufy.py
View File

@ -48,12 +48,14 @@ class EufyLight(Light):
self._code = device['code'] self._code = device['code']
self._type = device['type'] self._type = device['type']
self._bulb = lakeside.bulb(self._address, self._code, self._type) self._bulb = lakeside.bulb(self._address, self._code, self._type)
self._colormode = False
if self._type == "T1011": if self._type == "T1011":
self._features = SUPPORT_BRIGHTNESS self._features = SUPPORT_BRIGHTNESS
elif self._type == "T1012": elif self._type == "T1012":
self._features = SUPPORT_BRIGHTNESS | SUPPORT_COLOR_TEMP self._features = SUPPORT_BRIGHTNESS | SUPPORT_COLOR_TEMP
elif self._type == "T1013": elif self._type == "T1013":
self._features = SUPPORT_BRIGHTNESS | SUPPORT_COLOR self._features = SUPPORT_BRIGHTNESS | SUPPORT_COLOR_TEMP | \
SUPPORT_COLOR
self._bulb.connect() self._bulb.connect()
def update(self): def update(self):
@ -62,9 +64,10 @@ class EufyLight(Light):
self._brightness = self._bulb.brightness self._brightness = self._bulb.brightness
self._temp = self._bulb.temperature self._temp = self._bulb.temperature
if self._bulb.colors: if self._bulb.colors:
self._hs = color_util.color_RGB_to_hsv(*self._bulb.colors) self._colormode = True
self._hs = color_util.color_RGB_to_hs(*self._bulb.colors)
else: else:
self._hs = None self._colormode = False
self._state = self._bulb.power self._state = self._bulb.power
@property @property
@ -108,6 +111,8 @@ class EufyLight(Light):
@property @property
def hs_color(self): def hs_color(self):
"""Return the color of this light.""" """Return the color of this light."""
if not self._colormode:
return None
return self._hs return self._hs
@property @property
@ -128,6 +133,7 @@ class EufyLight(Light):
brightness = max(1, self._brightness) brightness = max(1, self._brightness)
if colortemp is not None: if colortemp is not None:
self._colormode = False
temp_in_k = mired_to_kelvin(colortemp) temp_in_k = mired_to_kelvin(colortemp)
relative_temp = temp_in_k - EUFY_MIN_KELVIN relative_temp = temp_in_k - EUFY_MIN_KELVIN
temp = int(relative_temp * 100 / temp = int(relative_temp * 100 /
@ -138,6 +144,10 @@ class EufyLight(Light):
if hs is not None: if hs is not None:
rgb = color_util.color_hsv_to_RGB( rgb = color_util.color_hsv_to_RGB(
hs[0], hs[1], brightness / 255 * 100) hs[0], hs[1], brightness / 255 * 100)
self._colormode = True
elif self._colormode:
rgb = color_util.color_hsv_to_RGB(
self._hs[0], self._hs[1], brightness / 255 * 100)
else: else:
rgb = None rgb = None

2
requirements_all.txt
View File

@ -458,7 +458,7 @@ keyring==12.0.0
keyrings.alt==3.0 keyrings.alt==3.0
# homeassistant.components.eufy # homeassistant.components.eufy
lakeside==0.4 lakeside==0.5
# homeassistant.components.device_tracker.owntracks # homeassistant.components.device_tracker.owntracks
# homeassistant.components.device_tracker.owntracks_http # homeassistant.components.device_tracker.owntracks_http