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

Migrate xiaomi_miio lights to use Kelvin (#132811)

pull/132822/head
epenet 2024-12-10 10:41:38 +01:00 committed by GitHub
parent d724488376
commit 611cef5cd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
homeassistant/components/xiaomi_miio/light.py
View File

@ -28,7 +28,7 @@ import voluptuous as vol
from homeassistant.components.light import ( from homeassistant.components.light import (
ATTR_BRIGHTNESS, ATTR_BRIGHTNESS,
ATTR_COLOR_TEMP, ATTR_COLOR_TEMP_KELVIN,
ATTR_HS_COLOR, ATTR_HS_COLOR,
ColorMode, ColorMode,
LightEntity, LightEntity,
@ -45,7 +45,7 @@ from homeassistant.core import HomeAssistant, ServiceCall
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.device_registry import DeviceInfo from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.util import color, dt as dt_util from homeassistant.util import color as color_util, dt as dt_util
from .const import ( from .const import (
CONF_FLOW_TYPE, CONF_FLOW_TYPE,
@ -430,33 +430,54 @@ class XiaomiPhilipsBulb(XiaomiPhilipsGenericLight):
self._color_temp = None self._color_temp = None
@property @property
def color_temp(self): def _current_mireds(self):
"""Return the color temperature.""" """Return the color temperature."""
return self._color_temp return self._color_temp
@property @property
def min_mireds(self): def _min_mireds(self):
"""Return the coldest color_temp that this light supports.""" """Return the coldest color_temp that this light supports."""
return 175 return 175
@property @property
def max_mireds(self): def _max_mireds(self):
"""Return the warmest color_temp that this light supports.""" """Return the warmest color_temp that this light supports."""
return 333 return 333
@property
def color_temp_kelvin(self) -> int | None:
"""Return the color temperature value in Kelvin."""
return (
color_util.color_temperature_mired_to_kelvin(self._color_temp)
if self._color_temp
else None
)
@property
def min_color_temp_kelvin(self) -> int:
"""Return the warmest color_temp_kelvin that this light supports."""
return color_util.color_temperature_mired_to_kelvin(self._max_mireds)
@property
def max_color_temp_kelvin(self) -> int:
"""Return the coldest color_temp_kelvin that this light supports."""
return color_util.color_temperature_mired_to_kelvin(self._min_mireds)
async def async_turn_on(self, **kwargs: Any) -> None: async def async_turn_on(self, **kwargs: Any) -> None:
"""Turn the light on.""" """Turn the light on."""
if ATTR_COLOR_TEMP in kwargs: if ATTR_COLOR_TEMP_KELVIN in kwargs:
color_temp = kwargs[ATTR_COLOR_TEMP] color_temp = color_util.color_temperature_kelvin_to_mired(
kwargs[ATTR_COLOR_TEMP_KELVIN]
)
percent_color_temp = self.translate( percent_color_temp = self.translate(
color_temp, self.max_mireds, self.min_mireds, CCT_MIN, CCT_MAX color_temp, self._max_mireds, self._min_mireds, CCT_MIN, CCT_MAX
) )
if ATTR_BRIGHTNESS in kwargs: if ATTR_BRIGHTNESS in kwargs:
brightness = kwargs[ATTR_BRIGHTNESS] brightness = kwargs[ATTR_BRIGHTNESS]
percent_brightness = ceil(100 * brightness / 255.0) percent_brightness = ceil(100 * brightness / 255.0)
if ATTR_BRIGHTNESS in kwargs and ATTR_COLOR_TEMP in kwargs: if ATTR_BRIGHTNESS in kwargs and ATTR_COLOR_TEMP_KELVIN in kwargs:
_LOGGER.debug( _LOGGER.debug(
"Setting brightness and color temperature: %s %s%%, %s mireds, %s%% cct", "Setting brightness and color temperature: %s %s%%, %s mireds, %s%% cct",
brightness, brightness,
@ -476,7 +497,7 @@ class XiaomiPhilipsBulb(XiaomiPhilipsGenericLight):
self._color_temp = color_temp self._color_temp = color_temp
self._brightness = brightness self._brightness = brightness
elif ATTR_COLOR_TEMP in kwargs: elif ATTR_COLOR_TEMP_KELVIN in kwargs:
_LOGGER.debug( _LOGGER.debug(
"Setting color temperature: %s mireds, %s%% cct", "Setting color temperature: %s mireds, %s%% cct",
color_temp, color_temp,
@ -526,7 +547,11 @@ class XiaomiPhilipsBulb(XiaomiPhilipsGenericLight):
self._state = state.is_on self._state = state.is_on
self._brightness = ceil((255 / 100.0) * state.brightness) self._brightness = ceil((255 / 100.0) * state.brightness)
self._color_temp = self.translate( self._color_temp = self.translate(
state.color_temperature, CCT_MIN, CCT_MAX, self.max_mireds, self.min_mireds state.color_temperature,
CCT_MIN,
CCT_MAX,
self._max_mireds,
self._min_mireds,
) )
delayed_turn_off = self.delayed_turn_off_timestamp( delayed_turn_off = self.delayed_turn_off_timestamp(
@ -560,12 +585,12 @@ class XiaomiPhilipsCeilingLamp(XiaomiPhilipsBulb):
) )
@property @property
def min_mireds(self): def _min_mireds(self):
"""Return the coldest color_temp that this light supports.""" """Return the coldest color_temp that this light supports."""
return 175 return 175
@property @property
def max_mireds(self): def _max_mireds(self):
"""Return the warmest color_temp that this light supports.""" """Return the warmest color_temp that this light supports."""
return 370 return 370
@ -585,7 +610,11 @@ class XiaomiPhilipsCeilingLamp(XiaomiPhilipsBulb):
self._state = state.is_on self._state = state.is_on
self._brightness = ceil((255 / 100.0) * state.brightness) self._brightness = ceil((255 / 100.0) * state.brightness)
self._color_temp = self.translate( self._color_temp = self.translate(
state.color_temperature, CCT_MIN, CCT_MAX, self.max_mireds, self.min_mireds state.color_temperature,
CCT_MIN,
CCT_MAX,
self._max_mireds,
self._min_mireds,
) )
delayed_turn_off = self.delayed_turn_off_timestamp( delayed_turn_off = self.delayed_turn_off_timestamp(
@ -797,12 +826,12 @@ class XiaomiPhilipsMoonlightLamp(XiaomiPhilipsBulb):
) )
@property @property
def min_mireds(self): def _min_mireds(self):
"""Return the coldest color_temp that this light supports.""" """Return the coldest color_temp that this light supports."""
return 153 return 153
@property @property
def max_mireds(self): def _max_mireds(self):
"""Return the warmest color_temp that this light supports.""" """Return the warmest color_temp that this light supports."""
return 588 return 588
@ -820,10 +849,12 @@ class XiaomiPhilipsMoonlightLamp(XiaomiPhilipsBulb):
async def async_turn_on(self, **kwargs: Any) -> None: async def async_turn_on(self, **kwargs: Any) -> None:
"""Turn the light on.""" """Turn the light on."""
if ATTR_COLOR_TEMP in kwargs: if ATTR_COLOR_TEMP_KELVIN in kwargs:
color_temp = kwargs[ATTR_COLOR_TEMP] color_temp = color_util.color_temperature_kelvin_to_mired(
kwargs[ATTR_COLOR_TEMP_KELVIN]
)
percent_color_temp = self.translate( percent_color_temp = self.translate(
color_temp, self.max_mireds, self.min_mireds, CCT_MIN, CCT_MAX color_temp, self._max_mireds, self._min_mireds, CCT_MIN, CCT_MAX
) )
if ATTR_BRIGHTNESS in kwargs: if ATTR_BRIGHTNESS in kwargs:
@ -832,7 +863,7 @@ class XiaomiPhilipsMoonlightLamp(XiaomiPhilipsBulb):
if ATTR_HS_COLOR in kwargs: if ATTR_HS_COLOR in kwargs:
hs_color = kwargs[ATTR_HS_COLOR] hs_color = kwargs[ATTR_HS_COLOR]
rgb = color.color_hs_to_RGB(*hs_color) rgb = color_util.color_hs_to_RGB(*hs_color)
if ATTR_BRIGHTNESS in kwargs and ATTR_HS_COLOR in kwargs: if ATTR_BRIGHTNESS in kwargs and ATTR_HS_COLOR in kwargs:
_LOGGER.debug( _LOGGER.debug(
@ -853,7 +884,7 @@ class XiaomiPhilipsMoonlightLamp(XiaomiPhilipsBulb):
self._hs_color = hs_color self._hs_color = hs_color
self._brightness = brightness self._brightness = brightness
elif ATTR_BRIGHTNESS in kwargs and ATTR_COLOR_TEMP in kwargs: elif ATTR_BRIGHTNESS in kwargs and ATTR_COLOR_TEMP_KELVIN in kwargs:
_LOGGER.debug( _LOGGER.debug(
( (
"Setting brightness and color temperature: " "Setting brightness and color temperature: "
@ -886,7 +917,7 @@ class XiaomiPhilipsMoonlightLamp(XiaomiPhilipsBulb):
if result: if result:
self._hs_color = hs_color self._hs_color = hs_color
elif ATTR_COLOR_TEMP in kwargs: elif ATTR_COLOR_TEMP_KELVIN in kwargs:
_LOGGER.debug( _LOGGER.debug(
"Setting color temperature: %s mireds, %s%% cct", "Setting color temperature: %s mireds, %s%% cct",
color_temp, color_temp,
@ -936,9 +967,13 @@ class XiaomiPhilipsMoonlightLamp(XiaomiPhilipsBulb):
self._state = state.is_on self._state = state.is_on
self._brightness = ceil((255 / 100.0) * state.brightness) self._brightness = ceil((255 / 100.0) * state.brightness)
self._color_temp = self.translate( self._color_temp = self.translate(
state.color_temperature, CCT_MIN, CCT_MAX, self.max_mireds, self.min_mireds state.color_temperature,
CCT_MIN,
CCT_MAX,
self._max_mireds,
self._min_mireds,
) )
self._hs_color = color.color_RGB_to_hs(*state.rgb) self._hs_color = color_util.color_RGB_to_hs(*state.rgb)
self._state_attrs.update( self._state_attrs.update(
{ {
@ -1014,7 +1049,7 @@ class XiaomiGatewayLight(LightEntity):
def turn_on(self, **kwargs: Any) -> None: def turn_on(self, **kwargs: Any) -> None:
"""Turn the light on.""" """Turn the light on."""
if ATTR_HS_COLOR in kwargs: if ATTR_HS_COLOR in kwargs:
rgb = color.color_hs_to_RGB(*kwargs[ATTR_HS_COLOR]) rgb = color_util.color_hs_to_RGB(*kwargs[ATTR_HS_COLOR])
else: else:
rgb = self._rgb rgb = self._rgb
@ -1052,7 +1087,7 @@ class XiaomiGatewayLight(LightEntity):
if self._is_on: if self._is_on:
self._brightness_pct = state_dict["brightness"] self._brightness_pct = state_dict["brightness"]
self._rgb = state_dict["rgb"] self._rgb = state_dict["rgb"]
self._hs = color.color_RGB_to_hs(*self._rgb) self._hs = color_util.color_RGB_to_hs(*self._rgb)
class XiaomiGatewayBulb(XiaomiGatewayDevice, LightEntity): class XiaomiGatewayBulb(XiaomiGatewayDevice, LightEntity):
@ -1067,7 +1102,7 @@ class XiaomiGatewayBulb(XiaomiGatewayDevice, LightEntity):
return round((self._sub_device.status["brightness"] * 255) / 100) return round((self._sub_device.status["brightness"] * 255) / 100)
@property @property
def color_temp(self): def _current_mireds(self):
"""Return current color temperature.""" """Return current color temperature."""
return self._sub_device.status["color_temp"] return self._sub_device.status["color_temp"]
@ -1077,12 +1112,12 @@ class XiaomiGatewayBulb(XiaomiGatewayDevice, LightEntity):
return self._sub_device.status["status"] == "on" return self._sub_device.status["status"] == "on"
@property @property
def min_mireds(self): def _min_mireds(self):
"""Return min cct.""" """Return min cct."""
return self._sub_device.status["cct_min"] return self._sub_device.status["cct_min"]
@property @property
def max_mireds(self): def _max_mireds(self):
"""Return max cct.""" """Return max cct."""
return self._sub_device.status["cct_max"] return self._sub_device.status["cct_max"]
@ -1090,8 +1125,10 @@ class XiaomiGatewayBulb(XiaomiGatewayDevice, LightEntity):
"""Instruct the light to turn on.""" """Instruct the light to turn on."""
await self.hass.async_add_executor_job(self._sub_device.on) await self.hass.async_add_executor_job(self._sub_device.on)
if ATTR_COLOR_TEMP in kwargs: if ATTR_COLOR_TEMP_KELVIN in kwargs:
color_temp = kwargs[ATTR_COLOR_TEMP] color_temp = color_util.color_temperature_kelvin_to_mired(
kwargs[ATTR_COLOR_TEMP_KELVIN]
)
await self.hass.async_add_executor_job( await self.hass.async_add_executor_job(
self._sub_device.set_color_temp, color_temp self._sub_device.set_color_temp, color_temp
) )