From 14333b260d13bd612ebfc83ca06cb1c1c0f379f9 Mon Sep 17 00:00:00 2001
From: ultratoto14 <ultratoto14@yahoo.fr>
Date: Mon, 23 Nov 2020 13:36:50 +0100
Subject: [PATCH] Use color picker white point.

---
 custom_components/localtuya/light.py | 42 +++++++++++++++-------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/custom_components/localtuya/light.py b/custom_components/localtuya/light.py
index 3eca674..9e63a8f 100644
--- a/custom_components/localtuya/light.py
+++ b/custom_components/localtuya/light.py
@@ -325,24 +325,28 @@ class LocaltuyaLight(LocalTuyaEntity, LightEntity):
             if brightness is None:
                 brightness = self._brightness
             hs = kwargs[ATTR_HS_COLOR]
-            if self.__is_color_rgb_encoded():
-                rgb = color_util.color_hsv_to_RGB(
-                    hs[0], hs[1], int(brightness * 100 / self._upper_brightness)
-                )
-                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,
-                )
+            if hs[1] == 0 and self.has_config(CONF_BRIGHTNESS):
+                states[self._config.get(CONF_BRIGHTNESS)] = brightness
+                states[self._config.get(CONF_COLOR_MODE)] = MODE_WHITE
             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 self.__is_color_rgb_encoded():
+                    rgb = color_util.color_hsv_to_RGB(
+                        hs[0], hs[1], int(brightness * 100 / self._upper_brightness)
+                    )
+                    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 brightness is None:
@@ -366,10 +370,10 @@ class LocaltuyaLight(LocalTuyaEntity, LightEntity):
         self._state = self.dps(self._dp_id)
         supported = self.supported_features
         self._effect = None
-        if supported & SUPPORT_BRIGHTNESS:
+        if supported & SUPPORT_BRIGHTNESS and self.has_config(CONF_BRIGHTNESS):
             self._brightness = self.dps_conf(CONF_BRIGHTNESS)
 
-        if supported & SUPPORT_COLOR:
+        if supported & SUPPORT_COLOR and self.has_config(CONF_COLOR):
             color = self.dps_conf(CONF_COLOR)
             if color is not None and not self.is_white_mode:
                 if self.__is_color_rgb_encoded():