diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py index 6025451a..bb1597d8 100644 --- a/apps/nspanel-lovelace-ui/luibackend/controller.py +++ b/apps/nspanel-lovelace-ui/luibackend/controller.py @@ -258,7 +258,7 @@ class LuiController(object): if button_type == "colorWheel": self._ha_api.log(value) value = value.split('|') - color = pos_to_color(int(value[0]), int(value[1])) + color = pos_to_color(int(value[0]), int(value[1]), int(value[2])) self._ha_api.log(color) self._ha_api.get_entity(entity_id).call_service("turn_on", rgb_color=color) diff --git a/apps/nspanel-lovelace-ui/luibackend/helper.py b/apps/nspanel-lovelace-ui/luibackend/helper.py index 035851e3..16e75d6f 100644 --- a/apps/nspanel-lovelace-ui/luibackend/helper.py +++ b/apps/nspanel-lovelace-ui/luibackend/helper.py @@ -11,8 +11,9 @@ def hsv2rgb(h, s, v): hsv = colorsys.hsv_to_rgb(h,s,v) return tuple(round(i * 255) for i in hsv) -def pos_to_color(x, y): - r = 160/2 +def pos_to_color(x, y, wh): + #r = 160/2 + r = wh/2 x = round((x - r) / r * 100) / 100 y = round((r - y) / r * 100) / 100