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

Re-map light brightness range

Browse Source 
Home Assistant uses brightness range 0-255 whilst Tuya somewhere around
29-1092. This commit maps brightness between these two ranges.
This commit is contained in:
Pierre Ståhl
2020-10-13 22:17:41 +02:00
parent 47d2900a2c
commit 15a79ec690
3 changed files with 65 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
custom_components/localtuya/light.py
View File

@@ -19,18 +19,36 @@ from homeassistant.components.light import (
)
from .common import LocalTuyaEntity, async_setup_entry
from .const import CONF_BRIGHTNESS_LOWER, CONF_BRIGHTNESS_UPPER
_LOGGER = logging.getLogger(__name__)
MIN_MIRED = 153
MAX_MIRED = 370
DEFAULT_LOWER_BRIGHTNESS = 29
DEFAULT_UPPER_BRIGHTNESS = 1000
def map_range(value, from_lower, from_upper, to_lower, to_upper):
"""Map a value in one range to another."""
mapped = (value - from_lower) * (to_upper - to_lower) / (
from_upper - from_lower
) + to_lower
return int(min(max(mapped, to_lower), to_upper))
def flow_schema(dps):
"""Return schema used in config flow."""
return {
vol.Optional(CONF_BRIGHTNESS): vol.In(dps),
vol.Optional(CONF_COLOR_TEMP): vol.In(dps),
vol.Optional(CONF_BRIGHTNESS_LOWER, default=DEFAULT_LOWER_BRIGHTNESS): vol.All(
vol.Coerce(int), vol.Range(min=0, max=10000)
),
vol.Optional(CONF_BRIGHTNESS_UPPER, default=DEFAULT_UPPER_BRIGHTNESS): vol.All(
vol.Coerce(int), vol.Range(min=0, max=10000)
),
}
@@ -47,8 +65,14 @@ class LocaltuyaLight(LocalTuyaEntity, LightEntity):
"""Initialize the Tuya light."""
super().__init__(device, config_entry, lightid, **kwargs)
self._state = False
self._brightness = 127
self._color_temp = 127
self._brightness = None
self._color_temp = None
self._lower_brightness = self._config.get(
CONF_BRIGHTNESS_LOWER, DEFAULT_LOWER_BRIGHTNESS
)
self._upper_brightness = self._config.get(
CONF_BRIGHTNESS_UPPER, DEFAULT_UPPER_BRIGHTNESS
)
@property
def is_on(self):
@@ -63,10 +87,8 @@ class LocaltuyaLight(LocalTuyaEntity, LightEntity):
@property
def color_temp(self):
"""Return the color_temp of the light."""
try:
if self.has_config(CONF_COLOR_TEMP):
return int(MAX_MIRED - (((MAX_MIRED - MIN_MIRED) / 255) * self._color_temp))
except TypeError:
pass
@property
def min_mireds(self):
@@ -81,24 +103,32 @@ class LocaltuyaLight(LocalTuyaEntity, LightEntity):
@property
def supported_features(self):
"""Flag supported features."""
supports = SUPPORT_BRIGHTNESS
if self._color_temp is not None:
supports = supports | SUPPORT_COLOR_TEMP
supports = 0
if self.has_config(CONF_BRIGHTNESS):
supports |= SUPPORT_BRIGHTNESS
if self.has_config(CONF_COLOR_TEMP):
supports |= SUPPORT_COLOR_TEMP
return supports
async def async_turn_on(self, **kwargs):
"""Turn on or control the light."""
await self._device.set_dp(True, self._dp_id)
self._device.set_dp(True, self._dp_id)
features = self.supported_features
if ATTR_BRIGHTNESS in kwargs:
await self._device.set_dp(
max(int(kwargs[ATTR_BRIGHTNESS]), 25), self._config.get(CONF_BRIGHTNESS)
if ATTR_BRIGHTNESS in kwargs and (features & SUPPORT_BRIGHTNESS):
brightness = map_range(
int(kwargs[ATTR_BRIGHTNESS]),
0,
255,
self._lower_brightness,
self._upper_brightness,
)
self._device.set_dp(brightness, self._config.get(CONF_BRIGHTNESS))
if ATTR_HS_COLOR in kwargs:
raise ValueError(" TODO implement RGB from HS")
if ATTR_COLOR_TEMP in kwargs:
if ATTR_COLOR_TEMP in kwargs and (features & SUPPORT_COLOR_TEMP):
color_temp = int(
255
- (255 / (MAX_MIRED - MIN_MIRED))
@@ -113,14 +143,22 @@ class LocaltuyaLight(LocalTuyaEntity, LightEntity):
def status_updated(self):
"""Device status was updated."""
self._state = self.dps(self._dp_id)
supported = self.supported_features
brightness = self.dps_conf(CONF_BRIGHTNESS)
if brightness is not None:
brightness = min(brightness, 255)
brightness = max(brightness, 25)
self._brightness = brightness
if supported & SUPPORT_BRIGHTNESS:
brightness = self.dps_conf(CONF_BRIGHTNESS)
if brightness is not None:
brightness = map_range(
brightness,
self._lower_brightness,
self._upper_brightness,
0,
255,
)
self._brightness = brightness
self._color_temp = self.dps_conf(CONF_COLOR_TEMP)
if supported & SUPPORT_COLOR_TEMP:
self._color_temp = self.dps_conf(CONF_COLOR_TEMP)
async_setup_entry = partial(async_setup_entry, DOMAIN, LocaltuyaLight, flow_schema)