Merge pull request #157 from andvikt/dev

Dev

.bumpversion.cfg

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

custom_components/mega/__init__.py

@@ -1,57 +1,25 @@
 """The mega integration."""
 import asyncio
 import logging
+import typing
 from functools import partial
 
 import voluptuous as vol
 
 from homeassistant.const import (
-    CONF_NAME,
+    CONF_NAME, CONF_DOMAIN,
-    CONF_DOMAIN,
+    CONF_UNIT_OF_MEASUREMENT, CONF_VALUE_TEMPLATE, CONF_DEVICE_CLASS, CONF_PORT
-    CONF_UNIT_OF_MEASUREMENT,
-    CONF_VALUE_TEMPLATE,
-    CONF_DEVICE_CLASS,
-    CONF_PORT,
 )
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers.service import bind_hass
 from homeassistant.helpers import config_validation as cv
 from homeassistant.config_entries import ConfigEntry
-from .const import (
+from .const import DOMAIN, CONF_INVERT, CONF_RELOAD, PLATFORMS, CONF_PORTS, CONF_CUSTOM, CONF_SKIP, CONF_PORT_TO_SCAN, \
-    DOMAIN,
+    CONF_MQTT_INPUTS, CONF_HTTP, CONF_RESPONSE_TEMPLATE, CONF_ACTION, CONF_GET_VALUE, CONF_ALLOW_HOSTS, \
-    CONF_INVERT,
+    CONF_CONV_TEMPLATE, CONF_ALL, CONF_FORCE_D, CONF_DEF_RESPONSE, CONF_FORCE_I2C_SCAN, CONF_HEX_TO_FLOAT, \
-    PLATFORMS,
+    RGB_COMBINATIONS, CONF_WS28XX, CONF_ORDER, CONF_SMOOTH, CONF_LED, CONF_WHITE_SEP, CONF_CHIP, CONF_RANGE, \
-    CONF_PORTS,
+    CONF_FILTER_VALUES, CONF_FILTER_SCALE, CONF_FILTER_LOW, CONF_FILTER_HIGH, CONF_FILL_NA, CONF_MEGA_ID, CONF_ADDR, \
-    CONF_CUSTOM,
+    CONF_1WBUS
-    CONF_SKIP,
-    CONF_HTTP,
-    CONF_RESPONSE_TEMPLATE,
-    CONF_ACTION,
-    CONF_GET_VALUE,
-    CONF_ALLOW_HOSTS,
-    CONF_CONV_TEMPLATE,
-    CONF_ALL,
-    CONF_FORCE_D,
-    CONF_DEF_RESPONSE,
-    CONF_FORCE_I2C_SCAN,
-    CONF_HEX_TO_FLOAT,
-    RGB_COMBINATIONS,
-    CONF_WS28XX,
-    CONF_ORDER,
-    CONF_SMOOTH,
-    CONF_LED,
-    CONF_WHITE_SEP,
-    CONF_CHIP,
-    CONF_RANGE,
-    CONF_FILTER_VALUES,
-    CONF_FILTER_SCALE,
-    CONF_FILTER_LOW,
-    CONF_FILTER_HIGH,
-    CONF_FILL_NA,
-    CONF_MEGA_ID,
-    CONF_ADDR,
-    CONF_1WBUS,
-)
 from .hub import MegaD
 from .config_flow import ConfigFlow
 from .http import MegaView
@@ -60,13 +28,14 @@ _LOGGER = logging.getLogger(__name__)
 
 _port_n = vol.Any(int, str)
 
-LED_LIGHT = {
+LED_LIGHT = \
+    {
         str: vol.Any(
             {
                 vol.Required(CONF_PORTS): vol.Any(
                     vol.ExactSequence([_port_n, _port_n, _port_n]),
                     vol.ExactSequence([_port_n, _port_n, _port_n, _port_n]),
-                msg="ports must be [R, G, B] or [R, G, B, W] of integers 0..255",
+                    msg='ports must be [R, G, B] or [R, G, B, W] of integers 0..255'
                 ),
                 vol.Optional(CONF_NAME): str,
                 vol.Optional(CONF_WHITE_SEP, default=True): bool,
@@ -76,36 +45,40 @@ LED_LIGHT = {
                 vol.Required(CONF_PORT): int,
                 vol.Required(CONF_WS28XX): True,
                 vol.Optional(CONF_CHIP, default=100): int,
-            vol.Optional(CONF_ORDER, default="rgb"): vol.Any(
+                vol.Optional(CONF_ORDER, default='rgb'): vol.Any(*RGB_COMBINATIONS, msg=f'order must be one of {RGB_COMBINATIONS}'),
-                *RGB_COMBINATIONS, msg=f"order must be one of {RGB_COMBINATIONS}"
-            ),
                 vol.Optional(CONF_SMOOTH, default=1): cv.time_period_seconds,
                 vol.Optional(CONF_NAME): str,
             },
         )
-}
+    }
 
 CUSTOMIZE_PORT = {
-    vol.Optional(
+    vol.Optional(CONF_SKIP, description='исключить порт из сканирования', default=False): bool,
-        CONF_SKIP, description="исключить порт из сканирования", default=False
+    vol.Optional(CONF_FILL_NA, default='last'): vol.Any(
-    ): bool,
+      'last',
-    vol.Optional(CONF_FILL_NA, default="last"): vol.Any("last", "none"),
+      'none'
-    vol.Optional(CONF_RANGE, description="диапазон диммирования"): [
+    ),
+    vol.Optional(CONF_RANGE, description='диапазон диммирования'): [
         vol.Range(0, 255),
         vol.Range(0, 255),
     ],
     vol.Optional(CONF_INVERT, default=False): bool,
-    vol.Optional(CONF_NAME): vol.Any(str, {vol.Required(str): str}),
+    vol.Optional(CONF_NAME): vol.Any(str, {
-    vol.Optional(CONF_DOMAIN): vol.Any("light", "switch"),
+        vol.Required(str): str
-    vol.Optional(
+    }),
-        CONF_UNIT_OF_MEASUREMENT,
+    vol.Optional(CONF_DOMAIN): vol.Any('light', 'switch'),
-        description="единицы измерений, либо строка либо мепинг",
+    vol.Optional(CONF_UNIT_OF_MEASUREMENT, description='единицы измерений, либо строка либо мепинг'):
-    ): vol.Any(str, {vol.Required(str): str}),
+        vol.Any(str, {
-    vol.Optional(CONF_DEVICE_CLASS): vol.Any(str, {vol.Required(str): str}),
+            vol.Required(str): str
+        }),
+    vol.Optional(CONF_DEVICE_CLASS):
+        vol.Any(str, {
+            vol.Required(str): str
+        }),
     vol.Optional(
         CONF_RESPONSE_TEMPLATE,
-        description="шаблон ответа когда на этот порт приходит" "сообщение из меги ",
+        description='шаблон ответа когда на этот порт приходит'
-    ): cv.template,
+                    'сообщение из меги '): cv.template,
     vol.Optional(CONF_ACTION): cv.script_action, # пока не реализовано
     vol.Optional(CONF_GET_VALUE, default=True): bool,
     vol.Optional(CONF_CONV_TEMPLATE): cv.template,
@@ -123,48 +96,43 @@ CUSTOMIZE_PORT = {
         vol.Optional(CONF_DEVICE_CLASS): str,
         vol.Optional(CONF_UNIT_OF_MEASUREMENT): str,
         vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
-    },
+    }
 }
 CUSTOMIZE_DS2413 = {
-    vol.Optional(str.lower, description="адрес и индекс устройства"): CUSTOMIZE_PORT
+    vol.Optional(str.lower, description='адрес и индекс устройства'): CUSTOMIZE_PORT
 }
 
 
 def extender(x):
-    if isinstance(x, str) and "e" in x:
+    if isinstance(x, str) and 'e' in x:
         return x
     else:
         raise ValueError('must has "e" in port name')
 
-
+OWBUS = vol.Schema({
-OWBUS = vol.Schema(
-    {
     vol.Required(CONF_PORT): vol.Any(vol.Coerce(int), vol.Coerce(str)),
     vol.Required(CONF_MEGA_ID): vol.Coerce(str),
     vol.Required(CONF_ADDR): [str],
-    }
+})
-)
 
 CONFIG_SCHEMA = vol.Schema(
     {
         DOMAIN: {
             vol.Optional(CONF_ALLOW_HOSTS): [str],
-            vol.Optional("entities"): {
+            vol.Optional('entities'): {
-                vol.Optional(str): vol.Any(CUSTOMIZE_PORT, CUSTOMIZE_DS2413)
+                vol.Optional(str): vol.Any(
-            },
+                CUSTOMIZE_PORT,
-            vol.Optional(vol.Any(str, int), description="id меги из веб-интерфейса"): {
+                CUSTOMIZE_DS2413
+            )},
+            vol.Optional(vol.Any(str, int), description='id меги из веб-интерфейса'): {
+                vol.Optional(CONF_FORCE_D, description='Принудительно слать d после срабатывания входа', default=False): bool,
                 vol.Optional(
-                    CONF_FORCE_D,
+                    CONF_DEF_RESPONSE,
-                    description="Принудительно слать d после срабатывания входа",
+                    description='Ответ по умолчанию',
-                    default=False,
+                    default=None
-                ): bool,
-                vol.Optional(
-                    CONF_DEF_RESPONSE, description="Ответ по умолчанию", default=None
                 ): vol.Any(cv.template, None),
                 vol.Optional(CONF_LED): LED_LIGHT,
-                vol.Optional(
+                vol.Optional(vol.Any(int, extender), description='номер порта'): vol.Any(
-                    vol.Any(int, extender), description="номер порта"
-                ): vol.Any(
                     CUSTOMIZE_PORT,
                     CUSTOMIZE_DS2413,
                 ),
@@ -173,14 +141,14 @@ CONFIG_SCHEMA = vol.Schema(
                 vol.Optional(CONF_FILTER_LOW): vol.Coerce(float),
                 vol.Optional(CONF_FILTER_HIGH): vol.Coerce(float),
             },
-            vol.Optional(CONF_1WBUS): [OWBUS],
+            vol.Optional(CONF_1WBUS): [OWBUS]
         }
     },
     extra=vol.ALLOW_EXTRA,
 )
 
-ALIVE_STATE = "alive"
+ALIVE_STATE = 'alive'
-DEF_ID = "def"
+DEF_ID = 'def'
 _POLL_TASKS = {}
 _hubs = {}
 _subs = {}
@@ -194,40 +162,29 @@ async def async_setup(hass: HomeAssistant, config: dict):
     view.allowed_hosts |= set(config.get(DOMAIN, {}).get(CONF_ALLOW_HOSTS, []))
     hass.http.register_view(view)
     hass.services.async_register(
-        DOMAIN,
+        DOMAIN, 'save', partial(_save_service, hass), schema=vol.Schema({
-        "save",
+            vol.Optional('mega_id'): str
-        partial(_save_service, hass),
+        })
-        schema=vol.Schema({vol.Optional("mega_id"): str}),
     )
     hass.services.async_register(
-        DOMAIN,
+        DOMAIN, 'get_port', partial(_get_port, hass), schema=vol.Schema({
-        "get_port",
+            vol.Optional('mega_id'): str,
-        partial(_get_port, hass),
+            vol.Optional('port'): vol.Any(int, [int]),
-        schema=vol.Schema(
+        })
-            {
-                vol.Optional("mega_id"): str,
-                vol.Optional("port"): vol.Any(int, [int]),
-            }
-        ),
     )
     hass.services.async_register(
-        DOMAIN,
+        DOMAIN, 'run_cmd', partial(_run_cmd, hass), schema=vol.Schema({
-        "run_cmd",
+            vol.Optional('port'): int,
-        partial(_run_cmd, hass),
+            vol.Required('cmd'): str,
-        schema=vol.Schema(
+            vol.Optional('mega_id'): str,
-            {
+        })
-                vol.Optional("port"): int,
-                vol.Required("cmd"): str,
-                vol.Optional("mega_id"): str,
-            }
-        ),
     )
 
     return True
 
 
 async def get_hub(hass, entry):
-    id = entry.data.get("id", entry.entry_id)
+    id = entry.data.get('id', entry.entry_id)
     data = dict(entry.data)
     data.update(entry.options or {})
     data.update(id=id)
@@ -237,7 +194,7 @@ async def get_hub(hass, entry):
 
 
 async def _add_mega(hass: HomeAssistant, entry: ConfigEntry):
-    id = entry.data.get("id", entry.entry_id)
+    id = entry.data.get('id', entry.entry_id)
     hub = await get_hub(hass, entry)
     hub.fw = await hub.get_fw()
     hass.data[DOMAIN][id] = hub
@@ -256,7 +213,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     await hub.start()
     for platform in PLATFORMS:
         hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(entry, platform)
+            hass.config_entries.async_forward_entry_setup(
+                entry, platform
+            )
         )
     await hub.updater.async_refresh()
     return True
@@ -278,11 +237,11 @@ async def updater(hass: HomeAssistant, entry: ConfigEntry):
 
 async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Handle removal of an entry."""
-    id = entry.data.get("id", entry.entry_id)
+    id = entry.data.get('id', entry.entry_id)
     hub: MegaD = hass.data[DOMAIN].get(id)
     if hub is None:
         return True
-    _LOGGER.debug(f"remove {id}")
+    _LOGGER.debug(f'remove {id}')
     _hubs.pop(id, None)
     hass.data[DOMAIN].pop(id, None)
     hass.data[DOMAIN][CONF_ALL].pop(id, None)
@@ -296,24 +255,19 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     await hub.stop()
     return True
 
-
 async_unload_entry = async_remove_entry
 
 
 async def async_migrate_entry(hass, config_entry: ConfigEntry):
     """Migrate old entry."""
-    _LOGGER.debug(
+    _LOGGER.debug("Migrating from version %s to version %s", config_entry.version, ConfigFlow.VERSION)
-        "Migrating from version %s to version %s",
-        config_entry.version,
-        ConfigFlow.VERSION,
-    )
     hub = await get_hub(hass, config_entry)
     new = dict(config_entry.data)
     await hub.start()
     cfg = await hub.get_config()
     await hub.stop()
     new.update(cfg)
-    _LOGGER.debug(f"new config: %s", new)
+    _LOGGER.debug(f'new config: %s', new)
     config_entry.data = new
     config_entry.version = ConfigFlow.VERSION
 
@@ -323,7 +277,7 @@ async def async_migrate_entry(hass, config_entry: ConfigEntry):
 
 
 async def _save_service(hass: HomeAssistant, call: ServiceCall):
-    mega_id = call.data.get("mega_id")
+    mega_id = call.data.get('mega_id')
     if mega_id:
         hub: MegaD = hass.data[DOMAIN][mega_id]
         await hub.save()
@@ -335,8 +289,8 @@ async def _save_service(hass: HomeAssistant, call: ServiceCall):
 
 @bind_hass
 async def _get_port(hass: HomeAssistant, call: ServiceCall):
-    port = call.data.get("port")
+    port = call.data.get('port')
-    mega_id = call.data.get("mega_id")
+    mega_id = call.data.get('mega_id')
     if mega_id:
         hub: MegaD = hass.data[DOMAIN][mega_id]
         if port is None:
@@ -346,7 +300,6 @@ async def _get_port(hass: HomeAssistant, call: ServiceCall):
         elif isinstance(port, list):
             for x in port:
                 await hub.get_port(x)
-        hub.updater.async_set_updated_data(hub.values)
     else:
         for hub in hass.data[DOMAIN][CONF_ALL].values():
             if not isinstance(hub, MegaD):
@@ -358,13 +311,12 @@ async def _get_port(hass: HomeAssistant, call: ServiceCall):
             elif isinstance(port, list):
                 for x in port:
                     await hub.get_port(x)
-            hub.updater.async_set_updated_data(hub.values)
 
 
 @bind_hass
 async def _run_cmd(hass: HomeAssistant, call: ServiceCall):
-    mega_id = call.data.get("mega_id")
+    mega_id = call.data.get('mega_id')
-    cmd = call.data.get("cmd")
+    cmd = call.data.get('cmd')
     if mega_id:
         hub: MegaD = hass.data[DOMAIN][mega_id]
         await hub.request(cmd=cmd)

custom_components/mega/hub.py

@@ -477,7 +477,7 @@ class MegaD:
             return
         ret = {}
         for i, x in enumerate(values.split(";")):
-            ret[f"{port}e{i}" if not self.new_naming else f"{port:02d}e{i:02d}"] = x
+            ret[f"{port}e{i}"] = x
         return ret
 
     async def _update_i2c(self, params):

custom_components/mega/light.py

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

custom_components/mega/manifest.json

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

docs/index.md

@@ -12,7 +12,7 @@
 Если вам понравилась интеграция, не забудьте поставить звезду на гитхабе - вам не сложно, а мне приятно ) А если
 интеграция очень понравилась - еще приятнее, если вы воспользуетесь кнопкой доната )
 
-Обновление прошивки MegaD можно делать прямо из HA с помощью [аддона](https://github.com/andvikt/mega_addon.git)
+Обновление прошивки MegaD можно делать из HA с помощью [аддона](https://github.com/andvikt/mega_addon.git)
 
 ## Основные особенности {: #mains }
 - Настройка в [веб-интерфейсе](settings.md) + [yaml](yaml.md)

readme.md

@@ -1,7 +1,7 @@
 
 
 # MegaD HomeAssistant integration
-[![hacs_badge](https://img.shields.io/badge/HACS-Custom-orange.svg)](https://github.com/custom-components/hacs)
+[![hacs_badge](https://img.shields.io/badge/HACS-Custom-orange.svg)](https://github.com/hacs/integration)
 [![Donate](https://img.shields.io/badge/donate-Yandex-red.svg)](https://yoomoney.ru/to/410013955329136)
 
 Интеграция с [MegaD-2561, MegaD-328](https://www.ab-log.ru/smart-house/ethernet/megad-2561)