williamp/localtuya-modded
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #182 from rospogrigio/white_point

Browse Source 
Use color picker white point to switch to white mode.
This commit is contained in:
ultratoto14
2020-11-23 20:50:13 +01:00
committed by GitHub
parent 52c62c5596 3ecae049bb
commit 095f64954d
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
custom_components/localtuya/light.py
View File

@@ -325,24 +325,28 @@ class LocaltuyaLight(LocalTuyaEntity, LightEntity):
if brightness is None: if brightness is None:
brightness = self._brightness brightness = self._brightness
hs = kwargs[ATTR_HS_COLOR] hs = kwargs[ATTR_HS_COLOR]
if self.__is_color_rgb_encoded(): if hs[1] == 0 and self.has_config(CONF_BRIGHTNESS):
rgb = color_util.color_hsv_to_RGB( states[self._config.get(CONF_BRIGHTNESS)] = brightness
hs[0], hs[1], int(brightness * 100 / self._upper_brightness) states[self._config.get(CONF_COLOR_MODE)] = MODE_WHITE
)
color = "{:02x}{:02x}{:02x}{:04x}{:02x}{:02x}".format(
round(rgb[0]),
round(rgb[1]),
round(rgb[2]),
round(hs[0]),
round(hs[1] * 255 / 100),
brightness,
)
else: else:
color = "{:04x}{:04x}{:04x}".format( if self.__is_color_rgb_encoded():
round(hs[0]), round(hs[1] * 10.0), brightness rgb = color_util.color_hsv_to_RGB(
) hs[0], hs[1], int(brightness * 100 / self._upper_brightness)
states[self._config.get(CONF_COLOR)] = color )
states[self._config.get(CONF_COLOR_MODE)] = MODE_COLOR color = "{:02x}{:02x}{:02x}{:04x}{:02x}{:02x}".format(
round(rgb[0]),
round(rgb[1]),
round(rgb[2]),
round(hs[0]),
round(hs[1] * 255 / 100),
brightness,
)
else:
color = "{:04x}{:04x}{:04x}".format(
round(hs[0]), round(hs[1] * 10.0), brightness
)
states[self._config.get(CONF_COLOR)] = color
states[self._config.get(CONF_COLOR_MODE)] = MODE_COLOR
if ATTR_COLOR_TEMP in kwargs and (features & SUPPORT_COLOR_TEMP): if ATTR_COLOR_TEMP in kwargs and (features & SUPPORT_COLOR_TEMP):
if brightness is None: if brightness is None:
@@ -366,7 +370,7 @@ class LocaltuyaLight(LocalTuyaEntity, LightEntity):
self._state = self.dps(self._dp_id) self._state = self.dps(self._dp_id)
supported = self.supported_features supported = self.supported_features
self._effect = None self._effect = None
if supported & SUPPORT_BRIGHTNESS: if supported & SUPPORT_BRIGHTNESS and self.has_config(CONF_BRIGHTNESS):
self._brightness = self.dps_conf(CONF_BRIGHTNESS) self._brightness = self.dps_conf(CONF_BRIGHTNESS)
if supported & SUPPORT_COLOR: if supported & SUPPORT_COLOR: