jeka/mega_hacs
1
0
Fork 0
mirror of https://github.com/andvikt/mega_hacs.git synced 2025-12-11 17:14:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #158 from andvikt/dev

Browse Source 
Dev
This commit is contained in:
andvikt
2023-10-10 23:03:24 +03:00
committed by GitHub
parent 58a4680311 082c647110
commit 5bb2425918
3 changed files with 66 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.bumpversion.cfg
View File

@@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 1.1.8b0 current_version = 1.1.8b1
parse = (?P<major>\d+)(\.(?P<minor>\d+))(\.(?P<patch>\d+))(?P<release>[bf]*)(?P<build>\d*) parse = (?P<major>\d+)(\.(?P<minor>\d+))(\.(?P<patch>\d+))(?P<release>[bf]*)(?P<build>\d*)
commit = True commit = True
tag = True tag = True

114
custom_components/mega/light.py
View File

@@ -16,7 +16,9 @@ from homeassistant.components.light import (
SUPPORT_BRIGHTNESS, SUPPORT_BRIGHTNESS,
LightEntity, LightEntity,
SUPPORT_TRANSITION, SUPPORT_TRANSITION,
SUPPORT_COLOR, ColorMode, LightEntityFeature, SUPPORT_COLOR,
ColorMode,
LightEntityFeature,
# SUPPORT_WHITE_VALUE # SUPPORT_WHITE_VALUE
) )
from homeassistant.config_entries import ConfigEntry from homeassistant.config_entries import ConfigEntry
@@ -36,7 +38,15 @@ from .const import (
CONF_SWITCH, CONF_SWITCH,
DOMAIN, DOMAIN,
CONF_CUSTOM, CONF_CUSTOM,
CONF_SKIP, CONF_LED, CONF_WS28XX, CONF_PORTS, CONF_WHITE_SEP, CONF_SMOOTH, CONF_ORDER, CONF_CHIP, RGB, CONF_SKIP,
CONF_LED,
CONF_WS28XX,
CONF_PORTS,
CONF_WHITE_SEP,
CONF_SMOOTH,
CONF_ORDER,
CONF_CHIP,
RGB,
) )
from .tools import int_ignore, map_reorder_rgb from .tools import int_ignore, map_reorder_rgb
@@ -64,13 +74,17 @@ PLATFORM_SCHEMA = LIGHT_SCHEMA.extend(
async def async_setup_platform(hass, config, add_entities, discovery_info=None): async def async_setup_platform(hass, config, add_entities, discovery_info=None):
lg.warning('mega integration does not support yaml for lights, please use UI configuration') lg.warning(
"mega integration does not support yaml for lights, please use UI configuration"
)
return True return True
async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, async_add_devices): async def async_setup_entry(
hass: HomeAssistant, config_entry: ConfigEntry, async_add_devices
):
mid = config_entry.data[CONF_ID] mid = config_entry.data[CONF_ID]
hub: MegaD = hass.data['mega'][mid] hub: MegaD = hass.data["mega"][mid]
devices = [] devices = []
customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {}).get(mid, {}) customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {}).get(mid, {})
skip = [] skip = []
@@ -78,23 +92,29 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
for entity_id, conf in customize[CONF_LED].items(): for entity_id, conf in customize[CONF_LED].items():
ports = conf.get(CONF_PORTS) or [conf.get(CONF_PORT)] ports = conf.get(CONF_PORTS) or [conf.get(CONF_PORT)]
skip.extend(ports) skip.extend(ports)
devices.append(MegaRGBW( devices.append(
mega=hub, MegaRGBW(
port=ports, mega=hub,
name=entity_id, port=ports,
customize=conf, name=entity_id,
id_suffix=entity_id, customize=conf,
config_entry=config_entry id_suffix=entity_id,
)) config_entry=config_entry,
for port, cfg in config_entry.data.get('light', {}).items(): )
)
for port, cfg in config_entry.data.get("light", {}).items():
port = int_ignore(port) port = int_ignore(port)
c = customize.get(port, {}) c = customize.get(port, {})
if c.get(CONF_SKIP, False) or port in skip or c.get(CONF_DOMAIN, 'light') != 'light': if (
c.get(CONF_SKIP, False)
or port in skip
or c.get(CONF_DOMAIN, "light") != "light"
):
continue continue
for data in cfg: for data in cfg:
hub.lg.debug(f'add light on port %s with data %s', port, data) hub.lg.debug(f"add light on port %s with data %s", port, data)
light = MegaLight(mega=hub, port=port, config_entry=config_entry, **data) light = MegaLight(mega=hub, port=port, config_entry=config_entry, **data)
if '<' in light.name: if "<" in light.name:
continue continue
devices.append(light) devices.append(light)
@@ -102,17 +122,14 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
class MegaLight(MegaOutPort, LightEntity): class MegaLight(MegaOutPort, LightEntity):
@property @property
def supported_features(self): def supported_features(self):
return ( return (SUPPORT_BRIGHTNESS if self.dimmer else 0) | (
(SUPPORT_BRIGHTNESS if self.dimmer else 0) | SUPPORT_TRANSITION if self.dimmer else 0
(SUPPORT_TRANSITION if self.dimmer else 0)
) )
class MegaRGBW(LightEntity, BaseMegaEntity): class MegaRGBW(LightEntity, BaseMegaEntity):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self._is_on = None self._is_on = None
@@ -123,7 +140,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
self._task: asyncio.Task = None self._task: asyncio.Task = None
self._restore = None self._restore = None
self.smooth: timedelta = self.customize[CONF_SMOOTH] self.smooth: timedelta = self.customize[CONF_SMOOTH]
self._color_order = self.customize.get(CONF_ORDER, 'rgb') self._color_order = self.customize.get(CONF_ORDER, "rgb")
self._last_called: float = 0 self._last_called: float = 0
self._max_values = None self._max_values = None
@@ -146,12 +163,11 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
def is_ws(self): def is_ws(self):
return self.customize.get(CONF_WS28XX) return self.customize.get(CONF_WS28XX)
@property @property
def supported_color_modes(self) -> set[ColorMode] | set[str] | None: def supported_color_modes(self) -> set[ColorMode] | set[str] | None:
return { return {
ColorMode.BRIGHTNESS, ColorMode.BRIGHTNESS,
ColorMode.RGB if len(self.port) != 4 else ColorMode.RGBW ColorMode.RGB if len(self.port) != 4 else ColorMode.RGBW,
} }
@property @property
@@ -164,7 +180,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
@property @property
def white_value(self): def white_value(self):
# if self.supported_features & SUPPORT_WHITE_VALUE: # if self.supported_features & SUPPORT_WHITE_VALUE:
return float(self.get_attribute('white_value', 0)) return float(self.get_attribute("white_value", 0))
@property @property
def rgb_color(self) -> tuple[int, int, int] | None: def rgb_color(self) -> tuple[int, int, int] | None:
@@ -177,15 +193,15 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
@property @property
def brightness(self): def brightness(self):
return float(self.get_attribute('brightness', 0)) return float(self.get_attribute("brightness", 0))
@property @property
def hs_color(self): def hs_color(self):
return self.get_attribute('hs_color', [0, 0]) return self.get_attribute("hs_color", [0, 0])
@property @property
def is_on(self): def is_on(self):
return self.get_attribute('is_on', False) return self.get_attribute("is_on", False)
@property @property
def supported_features(self): def supported_features(self):
@@ -195,7 +211,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
if not self.is_on: if not self.is_on:
return [0 for x in range(len(self.port))] if not self.is_ws else [0] * 3 return [0 for x in range(len(self.port))] if not self.is_ws else [0] * 3
rgb = colorsys.hsv_to_rgb( rgb = colorsys.hsv_to_rgb(
self.hs_color[0]/360, self.hs_color[1]/100, self.brightness / 255 self.hs_color[0] / 360, self.hs_color[1] / 100, self.brightness / 255
) )
rgb = [x for x in rgb] rgb = [x for x in rgb]
if self.white_value is not None: if self.white_value is not None:
@@ -203,9 +219,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
if not self.customize.get(CONF_WHITE_SEP): if not self.customize.get(CONF_WHITE_SEP):
white = white * (self.brightness / 255) white = white * (self.brightness / 255)
rgb.append(white / 255) rgb.append(white / 255)
rgb = [ rgb = [round(x * self.max_values[i]) for i, x in enumerate(rgb)]
round(x * self.max_values[i]) for i, x in enumerate(rgb)
]
if self.is_ws: if self.is_ws:
# восстанавливаем мэпинг # восстанавливаем мэпинг
rgb = map_reorder_rgb(rgb, RGB, self._color_order) rgb = map_reorder_rgb(rgb, RGB, self._color_order)
@@ -215,7 +229,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
if (time.time() - self._last_called) < 0.1: if (time.time() - self._last_called) < 0.1:
return return
self._last_called = time.time() self._last_called = time.time()
self.lg.debug(f'turn on %s with kwargs %s', self.entity_id, kwargs) self.lg.debug(f"turn on %s with kwargs %s", self.entity_id, kwargs)
if self._restore is not None: if self._restore is not None:
self._restore.update(kwargs) self._restore.update(kwargs)
kwargs = self._restore kwargs = self._restore
@@ -231,9 +245,9 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
return return
self._last_called = time.time() self._last_called = time.time()
self._restore = { self._restore = {
'hs_color': self.hs_color, "hs_color": self.hs_color,
'brightness': self.brightness, "brightness": self.brightness,
'white_value': self.white_value, "white_value": self.white_value,
} }
_before = self.get_rgbw() _before = self.get_rgbw()
self._is_on = False self._is_on = False
@@ -242,13 +256,13 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
self._task = asyncio.create_task(self.set_color(_before, **kwargs)) self._task = asyncio.create_task(self.set_color(_before, **kwargs))
async def set_color(self, _before, **kwargs): async def set_color(self, _before, **kwargs):
transition = kwargs.get('transition') transition = kwargs.get("transition")
update_state = transition is not None and transition > 3 update_state = transition is not None and transition > 3
_after = None _after = None
for item, value in kwargs.items(): for item, value in kwargs.items():
setattr(self, f'_{item}', value) setattr(self, f"_{item}", value)
if item == 'rgb_color': if item == "rgb_color":
_after = value _after = map_reorder_rgb(value, RGB, self._color_order)
_after = _after or self.get_rgbw() _after = _after or self.get_rgbw()
self._rgb_color = tuple(_after[:3]) self._rgb_color = tuple(_after[:3])
if transition is None: if transition is None:
@@ -256,7 +270,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
ratio = self.calc_speed_ratio(_before, _after) ratio = self.calc_speed_ratio(_before, _after)
transition = transition * ratio transition = transition * ratio
self.async_write_ha_state() self.async_write_ha_state()
ports = self.port if not self.is_ws else self.port*3 ports = self.port if not self.is_ws else self.port * 3
config = [(port, _before[i], _after[i]) for i, port in enumerate(ports)] config = [(port, _before[i], _after[i]) for i, port in enumerate(ports)]
try: try:
await self.mega.smooth_dim( await self.mega.smooth_dim(
@@ -272,7 +286,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
except asyncio.CancelledError: except asyncio.CancelledError:
return return
except: except:
self.lg.exception('while dimming') self.lg.exception("while dimming")
async def async_will_remove_from_hass(self) -> None: async def async_will_remove_from_hass(self) -> None:
await super().async_will_remove_from_hass() await super().async_will_remove_from_hass()
@@ -287,10 +301,10 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
w = None w = None
rgb = rgbw rgb = rgbw
if self.is_ws: if self.is_ws:
rgb = map_reorder_rgb( rgb = map_reorder_rgb(rgb, self._color_order, RGB)
rgb, self._color_order, RGB h, s, v = colorsys.rgb_to_hsv(
) *[x / self.max_values[i] for i, x in enumerate(rgb)]
h, s, v = colorsys.rgb_to_hsv(*[x/self.max_values[i] for i, x in enumerate(rgb)]) )
h *= 360 h *= 360
s *= 100 s *= 100
v *= 255 v *= 255
@@ -299,7 +313,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
self._brightness = v self._brightness = v
if w is not None: if w is not None:
if not self.customize.get(CONF_WHITE_SEP): if not self.customize.get(CONF_WHITE_SEP):
w = w/(self._brightness / 255) w = w / (self._brightness / 255)
else: else:
w = w w = w
w = w / (self.max_values[-1] / 255) w = w / (self.max_values[-1] / 255)
@@ -324,7 +338,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
return return
data = data.get(x, None) data = data.get(x, None)
if isinstance(data, dict): if isinstance(data, dict):
data = data.get('value') data = data.get("value")
data = safe_int(data) data = safe_int(data)
if data is None: if data is None:
return return
@@ -341,4 +355,4 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
ret = r ret = r
else: else:
ret = max([r, ret]) ret = max([r, ret])
return ret return ret

2
custom_components/mega/manifest.json
View File

@@ -15,5 +15,5 @@
"@andvikt" "@andvikt"
], ],
"issue_tracker": "https://github.com/andvikt/mega_hacs/issues", "issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
"version": "v1.1.8b0" "version": "v1.1.8b1"
} }