bump version

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.8b5
+current_version = 1.1.8b14
 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

@@ -254,10 +254,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry):
     _hubs[entry.entry_id] = hub
     _subs[entry.entry_id] = entry.add_update_listener(updater)
     await hub.start()
-    for platform in PLATFORMS:
+    # for platform in PLATFORMS:
-        hass.async_create_task(
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-            hass.config_entries.async_forward_entry_setup(entry, platform)
-        )
     await hub.updater.async_refresh()
     return True
 
@@ -314,8 +312,7 @@ async def async_migrate_entry(hass, config_entry: ConfigEntry):
     await hub.stop()
     new.update(cfg)
     _LOGGER.debug(f"new config: %s", new)
-    config_entry.data = new
+    hass.config_entries.async_update_entry(config_entry, data=new, version=ConfigFlow.VERSION)
-    config_entry.version = ConfigFlow.VERSION
 
     _LOGGER.info("Migration to version %s successful", config_entry.version)
 

custom_components/mega/binary_sensor.py

@@ -17,7 +17,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.template import Template
-from .const import EVENT_BINARY_SENSOR, DOMAIN, CONF_CUSTOM, CONF_SKIP, CONF_INVERT, CONF_RESPONSE_TEMPLATE
+from .const import DOMAIN, CONF_CUSTOM, CONF_SKIP, CONF_INVERT
 from .entities import  MegaPushEntity
 from .hub import MegaD
 from .tools import int_ignore

custom_components/mega/config_flow.py

@@ -8,9 +8,19 @@ from homeassistant import config_entries, core
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_ID, CONF_PASSWORD, CONF_SCAN_INTERVAL
 from homeassistant.core import callback, HomeAssistant
-from .const import DOMAIN, CONF_RELOAD, \
+from .const import (
-    CONF_NPORTS, CONF_UPDATE_ALL, CONF_POLL_OUTS, CONF_FAKE_RESPONSE, CONF_FORCE_D, \
+    DOMAIN,
-    CONF_ALLOW_HOSTS, CONF_PROTECTED, CONF_RESTORE_ON_RESTART, CONF_UPDATE_TIME
+    CONF_RELOAD,
+    CONF_NPORTS,
+    CONF_UPDATE_ALL,
+    CONF_POLL_OUTS,
+    CONF_FAKE_RESPONSE,
+    CONF_FORCE_D,
+    CONF_ALLOW_HOSTS,
+    CONF_PROTECTED,
+    CONF_RESTORE_ON_RESTART,
+    CONF_UPDATE_TIME,
+)
 from .hub import MegaD
 from . import exceptions
 
@@ -18,7 +28,7 @@ _LOGGER = logging.getLogger(__name__)
 
 STEP_USER_DATA_SCHEMA = vol.Schema(
     {
-        vol.Required(CONF_ID, default='mega'): str,
+        vol.Required(CONF_ID, default="mega"): str,
         vol.Required(CONF_HOST, default="192.168.0.14"): str,
         vol.Required(CONF_PASSWORD, default="sec"): str,
         vol.Optional(CONF_SCAN_INTERVAL, default=30): int,
@@ -31,7 +41,7 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
         vol.Optional(CONF_FORCE_D, default=True): bool,
         vol.Optional(CONF_RESTORE_ON_RESTART, default=True): bool,
         vol.Optional(CONF_PROTECTED, default=True): bool,
-        vol.Optional(CONF_ALLOW_HOSTS, default='::1;127.0.0.1'): str,
+        vol.Optional(CONF_ALLOW_HOSTS, default="::1;127.0.0.1"): str,
         vol.Optional(CONF_UPDATE_TIME, default=True): bool,
     },
 )
@@ -41,7 +51,7 @@ async def get_hub(hass: HomeAssistant, data):
     # _mqtt = hass.data.get(mqtt.DOMAIN)
     # if not isinstance(_mqtt, mqtt.MQTT):
     #     raise exceptions.MqttNotConfigured("mqtt must be configured first")
-    hub = MegaD(hass, **data, lg=_LOGGER, loop=asyncio.get_event_loop()) #mqtt=_mqtt,
+    hub = MegaD(hass, **data, lg=_LOGGER, loop=asyncio.get_event_loop())  # mqtt=_mqtt,
     hub.mqtt_id = await hub.get_mqtt_id()
     if not await hub.authenticate():
         raise exceptions.InvalidAuth
@@ -54,7 +64,7 @@ async def validate_input(hass: core.HomeAssistant, data):
     Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
     """
     if data[CONF_ID] in hass.data.get(DOMAIN, []):
-        raise exceptions.DuplicateId('duplicate_id')
+        raise exceptions.DuplicateId("duplicate_id")
     hub = await get_hub(hass, data)
 
     return hub
@@ -63,7 +73,7 @@ async def validate_input(hass: core.HomeAssistant, data):
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for mega."""
 
-    VERSION = 26
+    VERSION = 27
     CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
 
     async def async_step_user(self, user_input=None):
@@ -78,12 +88,12 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         try:
             hub = await validate_input(self.hass, user_input)
             await hub.start()
-            hub.new_naming=True
+            hub.new_naming = True
             config = await hub.get_config(nports=user_input.get(CONF_NPORTS, 37))
             await hub.stop()
-            hub.lg.debug(f'config loaded: %s', config)
+            hub.lg.debug(f"config loaded: %s", config)
             config.update(user_input)
-            config['new_naming'] = True
+            config["new_naming"] = True
             return self.async_create_entry(
                 title=user_input.get(CONF_ID, user_input[CONF_HOST]),
                 data=config,
@@ -109,48 +119,66 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
 
 class OptionsFlowHandler(config_entries.OptionsFlow):
-
     def __init__(self, config_entry: ConfigEntry):
         self.config_entry = config_entry
 
     async def async_step_init(self, user_input=None):
         """Manage the options."""
-        new_naming = self.config_entry.data.get('new_naming', False)
+        new_naming = self.config_entry.data.get("new_naming", False)
         if user_input is not None:
             reload = user_input.pop(CONF_RELOAD)
             cfg = dict(self.config_entry.data)
             cfg.update(user_input)
-            cfg['new_naming'] = new_naming
+            cfg["new_naming"] = new_naming
-            self.config_entry.data = cfg
+            self.hass.config_entries.async_update_entry(entry=self.config_entry, data=cfg)
             await get_hub(self.hass, cfg)
 
             if reload:
-                id = self.config_entry.data.get('id', self.config_entry.entry_id)
+                id = self.config_entry.data.get("id", self.config_entry.entry_id)
                 hub: MegaD = self.hass.data[DOMAIN].get(id)
                 cfg = await hub.reload(reload_entry=False)
 
             return self.async_create_entry(
-                title='',
+                title="",
                 data=cfg,
             )
         e = self.config_entry.data
         ret = self.async_show_form(
             step_id="init",
-            data_schema=vol.Schema({
+            data_schema=vol.Schema(
-                vol.Optional(CONF_SCAN_INTERVAL, default=e.get(CONF_SCAN_INTERVAL, 0)): int,
+                {
-                vol.Optional(CONF_POLL_OUTS, default=e.get(CONF_POLL_OUTS, False)): bool,
+                    vol.Optional(
-                # vol.Optional(CONF_PORT_TO_SCAN, default=e.get(CONF_PORT_TO_SCAN, 0)): int,
+                        CONF_SCAN_INTERVAL, default=e.get(CONF_SCAN_INTERVAL, 0)
-                # vol.Optional(CONF_MQTT_INPUTS, default=e.get(CONF_MQTT_INPUTS, True)): bool,
+                    ): int,
-                vol.Optional(CONF_NPORTS, default=e.get(CONF_NPORTS, 37)): int,
+                    vol.Optional(
-                vol.Optional(CONF_RELOAD, default=False): bool,
+                        CONF_POLL_OUTS, default=e.get(CONF_POLL_OUTS, False)
-                vol.Optional(CONF_UPDATE_ALL, default=e.get(CONF_UPDATE_ALL, True)): bool,
+                    ): bool,
-                vol.Optional(CONF_FAKE_RESPONSE, default=e.get(CONF_FAKE_RESPONSE, True)): bool,
+                    # vol.Optional(CONF_PORT_TO_SCAN, default=e.get(CONF_PORT_TO_SCAN, 0)): int,
-                vol.Optional(CONF_FORCE_D, default=e.get(CONF_FORCE_D, False)): bool,
+                    # vol.Optional(CONF_MQTT_INPUTS, default=e.get(CONF_MQTT_INPUTS, True)): bool,
-                vol.Optional(CONF_RESTORE_ON_RESTART, default=e.get(CONF_RESTORE_ON_RESTART, False)): bool,
+                    vol.Optional(CONF_NPORTS, default=e.get(CONF_NPORTS, 37)): int,
-                vol.Optional(CONF_PROTECTED, default=e.get(CONF_PROTECTED, True)): bool,
+                    vol.Optional(CONF_RELOAD, default=False): bool,
-                vol.Optional(CONF_ALLOW_HOSTS, default='::1;127.0.0.1'): str,
+                    vol.Optional(
-                vol.Optional(CONF_UPDATE_TIME, default=e.get(CONF_UPDATE_TIME, False)): bool,
+                        CONF_UPDATE_ALL, default=e.get(CONF_UPDATE_ALL, True)
-                # vol.Optional(CONF_INVERT, default=''): str,
+                    ): bool,
-            }),
+                    vol.Optional(
+                        CONF_FAKE_RESPONSE, default=e.get(CONF_FAKE_RESPONSE, True)
+                    ): bool,
+                    vol.Optional(
+                        CONF_FORCE_D, default=e.get(CONF_FORCE_D, False)
+                    ): bool,
+                    vol.Optional(
+                        CONF_RESTORE_ON_RESTART,
+                        default=e.get(CONF_RESTORE_ON_RESTART, False),
+                    ): bool,
+                    vol.Optional(
+                        CONF_PROTECTED, default=e.get(CONF_PROTECTED, True)
+                    ): bool,
+                    vol.Optional(CONF_ALLOW_HOSTS, default="::1;127.0.0.1"): str,
+                    vol.Optional(
+                        CONF_UPDATE_TIME, default=e.get(CONF_UPDATE_TIME, False)
+                    ): bool,
+                    # vol.Optional(CONF_INVERT, default=''): str,
+                }
+            ),
         )
-        return ret
+        return ret

custom_components/mega/const.py

@@ -1,6 +1,7 @@
 """Constants for the mega integration."""
 import re
 from itertools import permutations
+from homeassistant.const import Platform
 
 DOMAIN = "mega"
 CONF_MEGA_ID = "mega_id"
@@ -53,10 +54,10 @@ CONF_FILTER_HIGH = 'filter_high'
 CONF_1WBUS = '1wbus'
 CONF_ADDR = 'addr'
 PLATFORMS = [
-    "light",
+    Platform.LIGHT,
-    "switch",
+    Platform.SWITCH,
-    "binary_sensor",
+    Platform.BINARY_SENSOR,
-    "sensor",
+    Platform.SENSOR,
 ]
 EVENT_BINARY_SENSOR = f'{DOMAIN}.sensor'
 EVENT_BINARY = f'{DOMAIN}.binary'

custom_components/mega/entities.py

@@ -12,8 +12,20 @@ from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.helpers.restore_state import RestoreEntity
 from . import hub as h
-from .const import DOMAIN, CONF_CUSTOM, CONF_INVERT, EVENT_BINARY_SENSOR, LONG, \
+from .const import (
-    LONG_RELEASE, RELEASE, PRESS, SINGLE_CLICK, DOUBLE_CLICK, EVENT_BINARY, CONF_SMOOTH, CONF_RANGE
+    DOMAIN,
+    CONF_CUSTOM,
+    CONF_INVERT,
+    LONG,
+    LONG_RELEASE,
+    RELEASE,
+    PRESS,
+    SINGLE_CLICK,
+    DOUBLE_CLICK,
+    EVENT_BINARY,
+    CONF_SMOOTH,
+    CONF_RANGE,
+)
 
 _events_on = False
 _LOGGER = logging.getLogger(__name__)
@@ -22,7 +34,7 @@ _LOGGER = logging.getLogger(__name__)
 async def _set_events_on():
     global _events_on, _task_set_ev_on
     await asyncio.sleep(10)
-    _LOGGER.debug('events on')
+    _LOGGER.debug("events on")
     _events_on = True
 
 
@@ -31,6 +43,7 @@ def set_events_off():
     _events_on = False
     _task_set_ev_on = None
 
+
 _task_set_ev_on = None
 
 
@@ -40,20 +53,21 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
     Also provides some basic entity information: unique_id, name, availiability
     All base entities are polled in order to be online or offline
     """
+
     def __init__(
-            self,
+        self,
-            mega: 'h.MegaD',
+        mega: "h.MegaD",
-            port: typing.Union[int, str, typing.List[int]],
+        port: typing.Union[int, str, typing.List[int]],
-            config_entry: ConfigEntry = None,
+        config_entry: ConfigEntry = None,
-            id_suffix=None,
+        id_suffix=None,
-            name=None,
+        name=None,
-            unique_id=None,
+        unique_id=None,
-            http_cmd='get',
+        http_cmd="get",
-            addr: str=None,
+        addr: str = None,
-            index=None,
+        index=None,
-            customize=None,
+        customize=None,
-            smooth=None,
+        smooth=None,
-            **kwargs,
+        **kwargs,
     ):
         self._smooth = smooth
         self.http_cmd = http_cmd
@@ -65,11 +79,19 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         self._mega_id = mega.id
         self._lg = None
         if not isinstance(port, list):
-            self._unique_id = unique_id or f"mega_{mega.id}_{port}" + \
+            self._unique_id = unique_id or f"mega_{mega.id}_{port}" + (
-                                           (f"_{id_suffix}" if id_suffix else "")
+                f"_{id_suffix}" if id_suffix else ""
-            _pt = port if not mega.new_naming else f'{port:02}' if isinstance(port, int) else port
+            )
-            self._name = name or f"{mega.id}_{_pt}" + \
+            _pt = (
-                         (f"_{id_suffix}" if id_suffix else "")
+                port
+                if not mega.new_naming
+                else f"{port:02}"
+                if isinstance(port, int)
+                else port
+            )
+            self._name = name or f"{mega.id}_{_pt}" + (
+                f"_{id_suffix}" if id_suffix else ""
+            )
             self._customize: dict = None
         else:
             assert id_suffix is not None
@@ -83,7 +105,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         self.addr = addr
         self.id_suffix = id_suffix
         self._can_smooth_hard = None
-        if self.http_cmd == 'ds2413':
+        if self.http_cmd == "ds2413":
             self.mega.ds2413_ports |= {self.port}
         super().__init__(coordinator=mega.updater)
 
@@ -92,12 +114,12 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         return False
 
     def get_attribute(self, name, default=None):
-        attr = getattr(self, f'_{name}', None)
+        attr = getattr(self, f"_{name}", None)
         if attr is None and self._state is not None:
-            if name == 'is_on':
+            if name == "is_on":
                 attr = self._state.state
             else:
-                attr = self._state.attributes.get(f'{name}', default)
+                attr = self._state.attributes.get(f"{name}", default)
         return attr if attr is not None else default
 
     @property
@@ -118,7 +140,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
 
     @property
     def enabled(self):
-        if '<' in self.name:
+        if "<" in self.name:
             return False
         else:
             return super().enabled
@@ -130,12 +152,17 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         if self.hass is None or self.entity_id is None:
             return {}
         if self._customize is None:
-            c_entity_id = self.hass.data.get(DOMAIN, {}).get(CONF_CUSTOM).get('entities', {}).get(self.entity_id, {})
+            c_entity_id = (
+                self.hass.data.get(DOMAIN, {})
+                .get(CONF_CUSTOM)
+                .get("entities", {})
+                .get(self.entity_id, {})
+            )
             c = self.hass.data.get(DOMAIN, {}).get(CONF_CUSTOM) or {}
             c = c.get(self._mega_id) or {}
             c = c.get(self.port) or {}
             if self.addr is not None and self.index is not None and isinstance(c, dict):
-                idx = self.addr.lower() + f'_a' if self.index == 0 else '_b'
+                idx = self.addr.lower() + f"_a" if self.index == 0 else "_b"
                 c = c.get(idx, {})
             c.update(c_entity_id)
             self._customize = c
@@ -147,18 +174,24 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         if isinstance(self.port, list):
             pt_idx = self.id_suffix
         else:
-            _pt = self.port if not self.mega.new_naming else f'{self.port:02}' if isinstance(self.port, int) else self.port
+            _pt = (
-            if isinstance(_pt, str) and 'e' in _pt:
+                self.port
-                pt_idx, _ = _pt.split('e')
+                if not self.mega.new_naming
+                else f"{self.port:02}"
+                if isinstance(self.port, int)
+                else self.port
+            )
+            if isinstance(_pt, str) and "e" in _pt:
+                pt_idx, _ = _pt.split("e")
             else:
                 pt_idx = _pt
         return DeviceInfo(
             identifiers={
                 # Serial numbers are unique identifiers within a specific domain
-                (DOMAIN, f'{self._mega_id}', pt_idx)
+                (DOMAIN, f"{self._mega_id}", pt_idx)
             },
             name=self.name,
-            manufacturer='ab-log.ru',
+            manufacturer="ab-log.ru",
             sw_version=self.mega.fw,
             via_device=(DOMAIN, self._mega_id),
         )
@@ -176,7 +209,13 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         c = self.customize.get(CONF_NAME)
         if not isinstance(c, str):
             if not isinstance(self.port, list):
-                _pt = self.port if not self.mega.new_naming else f'{self.port:02}' if isinstance(self.port, int) else self.port
+                _pt = (
+                    self.port
+                    if not self.mega.new_naming
+                    else f"{self.port:02}"
+                    if isinstance(self.port, int)
+                    else self.port
+                )
                 c = self._name or f"{self.mega.id}_p{_pt}"
             else:
                 c = self.id_suffix
@@ -192,7 +231,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         self._state = await self.async_get_last_state()
 
     async def get_state(self):
-        self.lg.debug(f'state is %s', self.state)
+        self.lg.debug(f"state is %s", self.state)
         self.async_write_ha_state()
 
 
@@ -212,51 +251,42 @@ class MegaPushEntity(BaseMegaEntity):
         if self.hass is None:
             return
         self.async_write_ha_state()
-        self.lg.debug(f'state after update %s', self.state)
+        self.lg.debug(f"state after update %s", self.state)
-        if not self.entity_id.startswith('binary_sensor'):
+        if not self.entity_id.startswith("binary_sensor"):
-            _LOGGER.debug('skip event because not a bnary sens')
+            _LOGGER.debug("skip event because not a bnary sens")
             return
         ll: bool = self.mega.last_long.get(self.port, False)
-        if safe_int(value.get('click', 0)) == 1:
+        if safe_int(value.get("click", 0)) == 1:
             self.hass.bus.async_fire(
                 event_type=EVENT_BINARY,
-                event_data={
+                event_data={"entity_id": self.entity_id, "type": SINGLE_CLICK},
-                    'entity_id': self.entity_id,
-                    'type': SINGLE_CLICK
-                }
             )
-        elif safe_int(value.get('click', 0)) == 2:
+        elif safe_int(value.get("click", 0)) == 2:
             self.hass.bus.async_fire(
                 event_type=EVENT_BINARY,
-                event_data={
+                event_data={"entity_id": self.entity_id, "type": DOUBLE_CLICK},
-                    'entity_id': self.entity_id,
-                    'type': DOUBLE_CLICK
-                }
             )
-        elif safe_int(value.get('m', 0)) == 2:
+        elif safe_int(value.get("m", 0)) == 2:
             self.mega.last_long[self.port] = True
             self.hass.bus.async_fire(
                 event_type=EVENT_BINARY,
-                event_data={
+                event_data={"entity_id": self.entity_id, "type": LONG},
-                    'entity_id': self.entity_id,
-                    'type': LONG
-                }
             )
-        elif safe_int(value.get('m', 0)) == 1:
+        elif safe_int(value.get("m", 0)) == 1:
             self.hass.bus.async_fire(
                 event_type=EVENT_BINARY,
                 event_data={
-                    'entity_id': self.entity_id,
+                    "entity_id": self.entity_id,
-                    'type': LONG_RELEASE if ll else RELEASE,
+                    "type": LONG_RELEASE if ll else RELEASE,
-                }
+                },
             )
-        elif safe_int(value.get('m', None)) == 0:
+        elif safe_int(value.get("m", None)) == 0:
             self.hass.bus.async_fire(
                 event_type=EVENT_BINARY,
                 event_data={
-                    'entity_id': self.entity_id,
+                    "entity_id": self.entity_id,
-                    'type': PRESS,
+                    "type": PRESS,
-                }
+                },
             )
             self.mega.last_long[self.port] = False
         return
@@ -266,21 +296,13 @@ class MegaPushEntity(BaseMegaEntity):
 
 
 class MegaOutPort(MegaPushEntity):
-
+    def __init__(self, dimmer=False, dimmer_scale=1, *args, **kwargs):
-    def __init__(
+        super().__init__(*args, **kwargs)
-            self,
-            dimmer=False,
-            dimmer_scale=1,
-            *args, **kwargs
-    ):
-        super().__init__(
-            *args, **kwargs
-        )
         self._brightness = None
         self._is_on = None
         self.dimmer = dimmer
         self.dimmer_scale = dimmer_scale
-        self.is_extender = isinstance(self.port, str) and 'e' in self.port
+        self.is_extender = isinstance(self.port, str) and "e" in self.port
         self.task: asyncio.Task = None
         self._restore_brightness = None
         self._last_called: float = 0
@@ -313,9 +335,14 @@ class MegaOutPort(MegaPushEntity):
             return
         val = self.mega.values.get(self.port, {})
         if isinstance(val, dict) and len(val) == 0 and self._state is not None:
-            ret = safe_int(self._state.attributes.get("brightness"), def_on=self.max_dim, def_off=0, def_val=0)
+            ret = safe_int(
+                self._state.attributes.get("brightness"),
+                def_on=self.max_dim,
+                def_off=0,
+                def_val=0,
+            )
             ret = self._calc_brightness(ret)
-        elif isinstance(self.port, str) and 'e' in self.port:
+        elif isinstance(self.port, str) and "e" in self.port:
             if isinstance(val, str):
                 val = safe_int(val, def_on=self.max_dim, def_off=0, def_val=0)
             else:
@@ -340,46 +367,68 @@ class MegaOutPort(MegaPushEntity):
     def is_on(self) -> bool:
         val = self.mega.values.get(self.port, {})
         if isinstance(val, dict) and len(val) == 0 and self._state is not None:
-            return self._state == 'ON'
+            return self._state == "ON"
-        elif isinstance(self.port, str) and 'e' in self.port and val:
+        elif isinstance(self.port, str) and "e" in self.port and val:
             if val is None:
                 return
-            if self.dimmer:
+            if hasattr(self, "dimmer") and self.dimmer:
                 val = safe_int(val)
                 if val is not None:
                     return val > 0 if not self.invert else val == 0
             else:
-                return val == 'ON' if not self.invert else val == 'OFF'
+                return val == "ON" if not self.invert else val == "OFF"
         elif val is not None:
             val = val.get("value")
-            if not isinstance(val, str) and self.index is not None and self.addr is not None:
+            if (
+                not isinstance(val, str)
+                and self.index is not None
+                and self.addr is not None
+            ):
                 if not isinstance(val, dict):
-                    self.mega.lg.warning(f'{self.entity_id}: {val} is not a dict')
+                    self.mega.lg.warning(f"{self.entity_id}: {val} is not a dict")
                     return
-                _val = val.get(self.addr, val.get(self.addr.lower(), val.get(self.addr.upper())))
+                _val = val.get(
+                    self.addr, val.get(self.addr.lower(), val.get(self.addr.upper()))
+                )
                 if not isinstance(_val, str):
-                    self.mega.lg.warning(f'{self.entity_id}: can not get {self.addr} from {val}, recieved {_val}')
+                    self.mega.lg.warning(
+                        f"{self.entity_id}: can not get {self.addr} from {val}, recieved {_val}"
+                    )
                     return
-                _val = _val.split('/')
+                _val = _val.split("/")
                 if len(_val) >= 2:
-                    self.mega.lg.debug('%s parsed values: %s[%s]="%s"', self.entity_id, _val, self.index, _val)
+                    self.mega.lg.debug(
+                        '%s parsed values: %s[%s]="%s"',
+                        self.entity_id,
+                        _val,
+                        self.index,
+                        _val,
+                    )
                     val = _val[self.index]
                 else:
-                    self.mega.lg.warning(f'{self.entity_id}: {_val} has wrong length')
+                    self.mega.lg.warning(f"{self.entity_id}: {_val} has wrong length")
                     return
             elif self.index is not None and self.addr is None:
-                self.mega.lg.warning(f'{self.entity_id} does not has addr')
+                self.mega.lg.warning(f"{self.entity_id} does not has addr")
                 return
-            self.mega.lg.debug('%s.state = %s', self.entity_id, val)
+            self.mega.lg.debug("%s.state = %s", self.entity_id, val)
             if not self.invert:
-                return val == 'ON' or str(val) == '1' or (safe_int(val) is not None and safe_int(val) > 0)
+                return (
+                    val == "ON"
+                    or str(val) == "1"
+                    or (safe_int(val) is not None and safe_int(val) > 0)
+                )
             else:
-                return val == 'OFF' or str(val) == '0' or (safe_int(val) is not None and safe_int(val) == 0)
+                return (
+                    val == "OFF"
+                    or str(val) == "0"
+                    or (safe_int(val) is not None and safe_int(val) == 0)
+                )
 
     @property
     def cmd_port(self):
         if self.index is not None:
-            return f'{self.port}A' if self.index == 0 else f'{self.port}B'
+            return f"{self.port}A" if self.index == 0 else f"{self.port}B"
         else:
             return self.port
 
@@ -400,9 +449,7 @@ class MegaOutPort(MegaPushEntity):
         if isinstance(self.port, str):
             self.mega.values[self.port] = value[0]
         else:
-            self.mega.values[self.port] = {
+            self.mega.values[self.port] = {"value": value[0]}
-                'value': value[0]
-            }
         if update_state:
             self.async_write_ha_state()
 
@@ -412,13 +459,15 @@ class MegaOutPort(MegaPushEntity):
         tm = (self.smooth.total_seconds() * pct) if transition is None else transition
         if self.task is not None:
             self.task.cancel()
-        self.task = asyncio.create_task(self.mega.smooth_dim(
+        self.task = asyncio.create_task(
-            (self.cmd_port, from_, to_),
+            self.mega.smooth_dim(
-            time=tm,
+                (self.cmd_port, from_, to_),
-            can_smooth_hardware=self.can_smooth_hardware,
+                time=tm,
-            max_values=[255 if self.dimmer_scale == 1 else 4095],
+                can_smooth_hardware=self.can_smooth_hardware,
-            updater=partial(self.update_from_smooth, update_state=update_state),
+                max_values=[255 if self.dimmer_scale == 1 else 4095],
-        ))
+                updater=partial(self.update_from_smooth, update_state=update_state),
+            )
+        )
 
     def _calc_brightness(self, brightness):
         if brightness is None:
@@ -454,9 +503,9 @@ class MegaOutPort(MegaPushEntity):
         brightness = self._calc_brightness(brightness)
         _prev = safe_int(self.brightness) or 0
         self._brightness = brightness
-        if self.dimmer and brightness == 0:
+        if hasattr(self, "dimmer") and self.dimmer and brightness == 0:
             cmd = self.max_dim
-        elif self.dimmer:
+        elif hasattr(self, "dimmer") and self.dimmer:
             cmd = min((brightness * self.dimmer_scale, self.max_dim))
             if self.smooth_dim or transition:
                 self._set_dim_brightness(from_=_prev, to_=cmd, transition=transition)
@@ -471,7 +520,7 @@ class MegaOutPort(MegaPushEntity):
                 "cnt": round(transition / (abs(_prev - brightness) / 255)),
             }
         if self.addr:
-            _cmd['addr'] = self.addr
+            _cmd["addr"] = self.addr
         if not (self.smooth_dim or transition):
             await self.mega.request(**_cmd, priority=-1)
         if self.index is not None:
@@ -480,29 +529,31 @@ class MegaOutPort(MegaPushEntity):
                 port=self.port,
                 force_http=True,
                 conv=False,
-                http_cmd='list',
+                http_cmd="list",
             )
-        elif isinstance(self.port, str) and 'e' in self.port:
+        elif isinstance(self.port, str) and "e" in self.port:
             if not self.dimmer:
-                self.mega.values[self.port] = 'ON' if not self.invert else 'OFF'
+                self.mega.values[self.port] = "ON" if not self.invert else "OFF"
             else:
                 self.mega.values[self.port] = cmd
         else:
-            self.mega.values[self.port] = {'value': cmd}
+            self.mega.values[self.port] = {"value": cmd}
         await self.get_state()
 
     async def async_turn_off(self, transition=None, **kwargs) -> None:
         if (time.time() - self._last_called) < 0.1:
             return
         self._last_called = time.time()
-        self._restore_brightness = self._cal_reverse_brightness(safe_int(self._brightness))
+        self._restore_brightness = self._cal_reverse_brightness(
+            safe_int(self._brightness)
+        )
         if not self.dimmer:
             transition = None
         cmd = "0" if not self.invert else "1"
         _cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
         _prev = safe_int(self.brightness) or 0
         if self.addr:
-            _cmd['addr'] = self.addr
+            _cmd["addr"] = self.addr
         if not (self.smooth_dim or transition):
             await self.mega.request(**_cmd, priority=-1)
         else:
@@ -517,12 +568,12 @@ class MegaOutPort(MegaPushEntity):
                 port=self.port,
                 force_http=True,
                 conv=False,
-                http_cmd='list',
+                http_cmd="list",
             )
-        elif isinstance(self.port, str) and 'e' in self.port:
+        elif isinstance(self.port, str) and "e" in self.port:
-            self.mega.values[self.port] = 'OFF' if not self.invert else 'ON'
+            self.mega.values[self.port] = "OFF" if not self.invert else "ON"
         else:
-            self.mega.values[self.port] = {'value': cmd}
+            self.mega.values[self.port] = {"value": cmd}
         await self.get_state()
 
     async def async_will_remove_from_hass(self) -> None:
@@ -530,13 +581,19 @@ class MegaOutPort(MegaPushEntity):
             self.task.cancel()
 
 
-
 def safe_int(v, def_on=1, def_off=0, def_val=None):
-    if v == 'ON':
+    if v == "ON":
         return def_on
-    elif v == 'OFF':
+    elif v == "OFF":
         return def_off
     try:
         return int(v)
     except (ValueError, TypeError):
-        return def_val
+        return def_val
+
+
+def safe_float(v):
+    try:
+        return float(v)
+    except:
+        return None

custom_components/mega/http.py

@@ -10,43 +10,45 @@ from aiohttp.web_response import Response
 from homeassistant.helpers.template import Template
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.core import HomeAssistant
-from .const import EVENT_BINARY_SENSOR, DOMAIN, CONF_RESPONSE_TEMPLATE
+from .const import EVENT_BINARY_SENSOR, CONF_RESPONSE_TEMPLATE
 from .tools import make_ints
 from . import hub as h
-_LOGGER = logging.getLogger(__name__).getChild('http')
+
+_LOGGER = logging.getLogger(__name__).getChild("http")
 
 
 def is_ext(data: typing.Dict[str, typing.Any]):
     for x in data:
-        if x.startswith('ext'):
+        if x.startswith("ext"):
             return True
 
 
 class MegaView(HomeAssistantView):
-
+    url = "/mega"
-    url = '/mega'
+    name = "mega"
-    name = 'mega'
     requires_auth = False
 
     def __init__(self, cfg: dict):
         self._try = 0
         self.protected = True
-        self.allowed_hosts = {'::1', '127.0.0.1'}
+        self.allowed_hosts = {"::1", "127.0.0.1"}
-        self.notified_attempts = defaultdict(lambda : False)
+        self.notified_attempts = defaultdict(lambda: False)
         self.callbacks = defaultdict(lambda: defaultdict(list))
         self.templates: typing.Dict[str, typing.Dict[str, Template]] = {
             mid: {
                 pt: cfg[mid][pt][CONF_RESPONSE_TEMPLATE]
                 for pt in cfg[mid]
                 if isinstance(pt, int) and CONF_RESPONSE_TEMPLATE in cfg[mid][pt]
-            } for mid in cfg if isinstance(cfg[mid], dict)
+            }
+            for mid in cfg
+            if isinstance(cfg[mid], dict)
         }
-        _LOGGER.debug('templates: %s', self.templates)
+        _LOGGER.debug("templates: %s", self.templates)
         self.hubs = {}
 
     async def get(self, request: Request) -> Response:
-        _LOGGER.debug('request from %s %s', request.remote, request.headers)
+        _LOGGER.debug("request from %s %s", request.remote, request.headers)
-        hass: HomeAssistant = request.app['hass']
+        hass: HomeAssistant = request.app["hass"]
         if self.protected:
             auth = False
             for x in self.allowed_hosts:
@@ -54,33 +56,39 @@ class MegaView(HomeAssistantView):
                     auth = True
                     break
             if not auth:
-                msg = f"Non-authorised request from {request.remote} to `/mega`. "\
+                msg = (
-                      f"If you want to accept requests from this host "\
+                    f"Non-authorised request from {request.remote} to `/mega`. "
-                      f"please add it to allowed hosts in `mega` UI-configuration"
+                    f"If you want to accept requests from this host "
+                    f"please add it to allowed hosts in `mega` UI-configuration"
+                )
                 if not self.notified_attempts[request.remote]:
                     await hass.services.async_call(
-                        'persistent_notification',
+                        "persistent_notification",
-                        'create',
+                        "create",
                         {
                             "notification_id": request.remote,
                             "title": "Non-authorised request",
-                            "message": msg
+                            "message": msg,
-                        }
+                        },
                     )
                 _LOGGER.warning(msg)
                 return Response(status=401)
 
-        remote = request.headers.get('X-Real-IP', request.remote)
+        remote = request.headers.get("X-Real-IP", request.remote)
-        hub: 'h.MegaD' = self.hubs.get(remote)
+        hub: "h.MegaD" = self.hubs.get(remote)
-        if hub is None and 'mdid' in request.query:
+        if hub is None and "mdid" in request.query:
-            hub = self.hubs.get(request.query['mdid'])
+            hub = self.hubs.get(request.query["mdid"])
             if hub is None:
-                _LOGGER.warning(f'can not find mdid={request.query["mdid"]} in {list(self.hubs)}')
+                _LOGGER.warning(
-        if hub is None and request.remote in ['::1', '127.0.0.1']:
+                    f'can not find mdid={request.query["mdid"]} in {list(self.hubs)}'
+                )
+        if hub is None and request.remote in ["::1", "127.0.0.1"]:
             try:
                 hub = list(self.hubs.values())[0]
             except IndexError:
-                _LOGGER.warning(f'can not find mdid={request.query["mdid"]} in {list(self.hubs)}')
+                _LOGGER.warning(
+                    f'can not find mdid={request.query["mdid"]} in {list(self.hubs)}'
+                )
                 return Response(status=400)
         elif hub is None:
             return Response(status=400)
@@ -91,17 +99,17 @@ class MegaView(HomeAssistantView):
         )
         _LOGGER.debug(f"Request: %s from '%s'", data, request.remote)
         make_ints(data)
-        if data.get('st') == '1':
+        if data.get("st") == "1":
             hass.async_create_task(self.later_restore(hub))
             return Response(status=200)
-        port = data.get('pt')
+        port = data.get("pt")
         data = data.copy()
         update_all = True
-        if 'v' in data:
+        if "v" in data:
             update_all = False
-            data['value'] = data.pop('v')
+            data["value"] = data.pop("v")
-        data['mega_id'] = hub.id
+        data["mega_id"] = hub.id
-        ret = 'd' if hub.force_d else ''
+        ret = "d" if hub.force_d else ""
         if port is not None:
             if is_ext(data):
                 # ret = ''  # пока ответ всегда пустой, неясно какая будет реакция на непустой ответ
@@ -110,49 +118,70 @@ class MegaView(HomeAssistantView):
                 else:
                     pt_orig = hub.ext_in.get(port, hub.ext_in.get(str(port)))
                 if pt_orig is None:
-                    hub.lg.warning(f'can not find extender for int port {port}, '
+                    hub.lg.warning(
-                                   f'have ext_int: {hub.ext_in}, ext: {hub.extenders}')
+                        f"can not find extender for int port {port}, "
+                        f"have ext_int: {hub.ext_in}, ext: {hub.extenders}"
+                    )
                     return Response(status=200)
                 for e, v in data.items():
                     _data = data.copy()
-                    if e.startswith('ext'):
+                    if e.startswith("ext"):
                         idx = e[3:]
-                        pt = f'{pt_orig}e{idx}' if not hub.new_naming else f'{int(pt_orig):02d}e{int(idx):02d}'
+                        pt = (
-                        _data['pt_orig'] = pt_orig
+                            f"{pt_orig}e{idx}"
-                        _data['value'] = 'ON' if v == '1' else 'OFF'
+                            if not hub.new_naming
-                        _data['m'] = 1 if _data[e] == '0' else 0  # имитация поведения обычного входа, чтобы события обрабатывались аналогично
+                            else f"{int(pt_orig):02d}e{int(idx):02d}"
+                        )
+                        _data["pt_orig"] = pt_orig
+                        _data["value"] = "ON" if v == "1" else "OFF"
+                        _data["m"] = (
+                            1 if _data[e] == "0" else 0
+                        )  # имитация поведения обычного входа, чтобы события обрабатывались аналогично
                         hub.values[pt] = _data
                         for cb in self.callbacks[hub.id][pt]:
                             cb(_data)
                         act = hub.ext_act.get(pt)
-                        hub.lg.debug(f'act on port {pt}: {act}, all acts are: {hub.ext_act}')
+                        hub.lg.debug(
-                        template: Template = self.templates.get(hub.id, {}).get(port, hub.def_response)
+                            f"act on port {pt}: {act}, all acts are: {hub.ext_act}"
+                        )
+                        template: Template = self.templates.get(hub.id, {}).get(
+                            port, hub.def_response
+                        )
                         if template is not None:
                             template.hass = hass
                             ret = template.async_render(_data)
-                        hub.lg.debug(f'response={ret}, template={template}')
+                        hub.lg.debug(f"response={ret}, template={template}")
-                        if ret == 'd' and act:
+                        if ret == "d" and act:
-                            await hub.request(cmd=act.replace(':3', f':{v}'))
+                            await hub.request(cmd=act.replace(":3", f":{v}"))
-                        ret = 'd' if hub.force_d else ''
+                        ret = "d" if hub.force_d else ""
             else:
-            # elif port in hub.binary_sensors:
+                # elif port in hub.binary_sensors:
                 hub.values[port] = data
                 for cb in self.callbacks[hub.id][port]:
                     cb(data)
-                template: Template = self.templates.get(hub.id, {}).get(port, hub.def_response)
+                template: Template = self.templates.get(hub.id, {}).get(
+                    port, hub.def_response
+                )
                 if template is not None:
                     template.hass = hass
                     ret = template.async_render(data)
             if hub.update_all and update_all:
                 asyncio.create_task(self.later_update(hub))
-        _LOGGER.debug('response %s', ret)
+        _LOGGER.debug("response %s", ret)
-        Response(body='' if hub.fake_response else ret, content_type='text/plain')
+        Response(body="" if hub.fake_response else ret, content_type="text/plain")
 
-        if hub.fake_response and 'value' not in data and 'pt' in data and port in hub.binary_sensors:
+        if (
-            if 'd' in ret:
+            hub.fake_response
+            and "value" not in data
+            and "pt" in data
+            and port in hub.binary_sensors
+        ):
+            if "d" in ret:
                 await hub.request(pt=port, cmd=ret)
             else:
                 await hub.request(cmd=ret)
+        if not isinstance(ret, str):
+            return ""
         return ret
 
     async def later_restore(self, hub):
@@ -169,5 +198,5 @@ class MegaView(HomeAssistantView):
 
     async def later_update(self, hub):
         await asyncio.sleep(1)
-        _LOGGER.debug('force update')
+        _LOGGER.debug("force update")
-        await hub.updater.async_refresh()
+        await hub.updater.async_refresh()

custom_components/mega/hub.py

@@ -12,16 +12,15 @@ from bs4 import BeautifulSoup
 
 from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import TEMP_CELSIUS, PERCENTAGE, LIGHT_LUX
+from homeassistant.const import PERCENTAGE, LIGHT_LUX, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-from .config_parser import parse_config, DS2413, MCP230, MCP230_OUT, MCP230_IN, PCA9685
+from .config_parser import parse_config, DS2413, MCP230, PCA9685
 from .const import (
     TEMP,
     HUM,
     PRESS,
     LUX,
-    PATT_SPLIT,
     DOMAIN,
     CONF_HTTP,
     EVENT_BINARY_SENSOR,
@@ -29,10 +28,9 @@ from .const import (
     CONF_FORCE_D,
     CONF_DEF_RESPONSE,
     PATT_FW,
-    CONF_FORCE_I2C_SCAN,
     REMOVE_CONFIG,
 )
-from .entities import set_events_off, BaseMegaEntity, MegaOutPort, safe_int
+from .entities import set_events_off, BaseMegaEntity, MegaOutPort, safe_int, safe_float
 from .exceptions import CannotConnect, NoPort
 from .i2c import parse_scan_page
 from .tools import make_ints, int_ignore, PriorityLock
@@ -42,7 +40,7 @@ HUM_PATT = re.compile(r"hum:([01234567890\.]+)")
 PRESS_PATT = re.compile(r"press:([01234567890\.]+)")
 LUX_PATT = re.compile(r"lux:([01234567890\.]+)")
 PATTERNS = {TEMP: TEMP_PATT, HUM: HUM_PATT, PRESS: PRESS_PATT, LUX: LUX_PATT}
-UNITS = {TEMP: TEMP_CELSIUS, HUM: PERCENTAGE, PRESS: "mmHg", LUX: LIGHT_LUX}
+UNITS = {TEMP: UnitOfTemperature.CELSIUS, HUM: PERCENTAGE, PRESS: "mmHg", LUX: LIGHT_LUX}
 CLASSES = {
     TEMP: SensorDeviceClass.TEMPERATURE,
     HUM: SensorDeviceClass.HUMIDITY,
@@ -164,10 +162,13 @@ class MegaD:
             if allow_hosts is not None and DOMAIN in hass.data:
                 allow_hosts = set(allow_hosts.split(";"))
                 hass.data[DOMAIN][CONF_HTTP].allowed_hosts |= allow_hosts
-            hass.data[DOMAIN][CONF_HTTP].protected = protected
+                hass.data[DOMAIN][CONF_HTTP].protected = protected
         except Exception:
             self.lg.exception("while setting allowed hosts")
         self.binary_sensors = []
+        self.sht31inited = (
+            set()
+        )  # список портов sht31 которые уже успешно проинициализированы были
 
     async def start(self):
         pass
@@ -486,18 +487,45 @@ class MegaD:
         :param params: параметры url
         :return:
         """
+        params = params.copy()
         pt = params.get("pt")
+        i2c_dev = params.get("i2c_dev", None)
+
         if pt in self.skip_ports:
             return
-        if pt is not None:
+        if pt is None:
-            pass
+            return
+
         _params = tuple(params.items())
+        if i2c_dev is not None and i2c_dev == "sht31" and pt not in self.sht31inited:
+            __params = params.copy()
+            __params["i2c_par"] = 9
+            # инициализация сенсора
+            await self.request(**__params)
+            await asyncio.sleep(0.1)
+            self.sht31inited.add(pt)
         delay = None
+        idx: int = params.pop("idx", None)
+        pt: int = params.get("pt", None)
         if "delay" in params:
             delay = params.pop("delay")
         try:
-            ret = {_params: await self.request(**params)}
+            if idx is None or idx == 0:
-        except asyncio.TimeoutError:
+                v: str = await self.request(**params)
+                # scd4x фактически отдает сразу 3 датчика на одном запросе, не ложится
+                # в общую архитектуру, поэтому используется такой костыль с кешем
+                self.values[f"chache_{pt}"] = v
+            elif idx is not None and idx > 0:
+                v: str = self.values.get(f"chache_{pt}")
+            if idx is not None:
+                vv = v.split("/")
+                if len(vv) == 3:
+                    v = vv[idx]
+                else:
+                    v: None
+            ret = {_params: safe_float(v)}
+        except Exception:
+            self.lg.exception(f"while getting i2c {params=}")
             return
         self.lg.debug("i2c response: %s", ret)
         if delay:
@@ -661,7 +689,7 @@ class MegaD:
             cfg.pop(x, None)
         cfg.update(new)
         self.lg.debug(f"new config: %s", cfg)
-        self.config.data = cfg
+        self.hass.config_entries.async_update_entry(self.config, data=cfg)
         if reload_entry:
             await self.hass.config_entries.async_reload(self.config.entry_id)
         return cfg

custom_components/mega/i2c.py

@@ -7,36 +7,42 @@ from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
     PERCENTAGE,
     LIGHT_LUX,
-    TEMP_CELSIUS,
     CONCENTRATION_PARTS_PER_MILLION,
-    PRESSURE_BAR,
+    UnitOfTemperature,
+    UnitOfPressure
 )
 from collections import namedtuple
 
 
 # DeviceType = namedtuple('DeviceType', 'device_class,unit_of_measurement,suffix')
 
+
 @dataclass
 class DeviceType:
     device_class: typing.Optional[str] = None
     unit_of_measurement: typing.Optional[str] = None
     suffix: typing.Optional[str] = None
     delay: typing.Optional[float] = None
+    i2c_par: typing.Optional[int] = None
+    idx: typing.Optional[
+        int
+    ] = None  # на случай если все значения представлены одной строчкой (как с scd4x)
 
 
 def parse_scan_page(page: str):
     ret = []
     req = []
     page = BeautifulSoup(page, features="lxml")
-    for x in page.find_all('a'):
+    for x in page.find_all("a"):
-        params = x.get('href')
+        params = x.get("href")
         if params is None:
             continue
         params = dict(parse_qsl(urlparse(params).query))
-        dev = params.get('i2c_dev')
+        dev = params.get("i2c_dev")
         if dev is None:
             continue
         classes = i2c_classes.get(dev, [])
+        i2c_par, idx = (None, None)
         for i, c in enumerate(classes):
             _params = params.copy()
             if c is Skip:
@@ -46,31 +52,39 @@ def parse_scan_page(page: str):
                 continue
             elif isinstance(c, Request):
                 if c.delay:
-                    _params['delay'] = c.delay
+                    _params["delay"] = c.delay
                 req.append(_params)
                 continue
             elif isinstance(c, DeviceType):
-                c, m, suffix, delay = astuple(c)
+                c, m, suffix, delay, i2c_par, idx = astuple(c)
                 if delay is not None:
-                    _params['delay'] = delay
+                    _params["delay"] = delay
             else:
                 continue
             suffix = suffix or c
-            if 'addr' in _params:
+            if "addr" in _params:
-                suffix += f"_{_params['addr']}" if suffix else str(_params['addr'])
+                suffix += f"_{_params['addr']}" if suffix else str(_params["addr"])
             if suffix:
-                _dev = f'{dev}_{suffix}'
+                _dev = f"{dev}_{suffix}"
             else:
                 _dev = dev
-            if i > 0:
+            if i > 0 and i2c_par is None:
-                _params['i2c_par'] = i
+                _params["i2c_par"] = i
+            # i2c_par может быть явно указан в DeviceType
+            elif i2c_par is not None and i2c_par > 0:
+                _params["i2c_par"] = i2c_par
+            # idx - тема фактически только для scd4x, означает номер внутри текстового значения разделенного знаком "/"
+            if idx is not None:
+                _params["idx"] = idx
 
-            ret.append({
+            ret.append(
-                'id_suffix': _dev,
+                {
-                'device_class': c,
+                    "id_suffix": _dev,
-                'params': _params,
+                    "device_class": c,
-                'unit_of_measurement': m,
+                    "params": _params,
-            })
+                    "unit_of_measurement": m,
+                }
+            )
             req.append(_params)
     return req, ret
 
@@ -85,67 +99,80 @@ class Request:
 
 
 i2c_classes = {
-    'htu21d': [
+    "htu21d": [
         DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
+        DeviceType(SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, None),
     ],
-    'sht31': [
+    "sht31": [
-        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None, delay=1.5),
+        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None, delay=0.1),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
+        DeviceType(SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, None),
     ],
-    'max44009': [
+    "max44009": [DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)],
-        DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
+    "bh1750": [DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)],
+    "tsl2591": [DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)],
+    "bmp180": [
+        DeviceType(SensorDeviceClass.PRESSURE, UnitOfPressure.BAR, None),
+        DeviceType(SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, None),
     ],
-    'bh1750': [
+    "bmx280": [
-        DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
+        DeviceType(SensorDeviceClass.PRESSURE, UnitOfPressure.BAR, None),
+        DeviceType(SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, None),
+        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None),
     ],
-    'tsl2591': [
+    "dps368": [
-        DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
+        DeviceType(SensorDeviceClass.PRESSURE, UnitOfPressure.BAR, None),
+        DeviceType(SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, None),
     ],
-    'bmp180': [
+    "mlx90614": [
-        DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
-    ],
-    'bmx280': [
-        DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
-        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None)
-    ],
-    'dps368': [
-        DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
-    ],
-    'mlx90614': [
         Skip,
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, 'temp'),
+        DeviceType(SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, "temp"),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, 'object'),
+        DeviceType(SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, "object"),
     ],
-    'ptsensor': [
+    "ptsensor": [
         Skip,
         Request(delay=3),  # запрос на измерение
-        DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
+        DeviceType(SensorDeviceClass.PRESSURE, UnitOfPressure.BAR, None),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
+        DeviceType(SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, None),
     ],
-    'mcp9600': [
+    "mcp9600": [
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),  # термопара
+        DeviceType(SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, None),  # термопара
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),  # сенсор встроенный в микросхему
+        DeviceType(
+            SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, None
+        ),  # сенсор встроенный в микросхему
     ],
-    't67xx': [
+    "t67xx": [DeviceType(SensorDeviceClass.CO2, CONCENTRATION_PARTS_PER_MILLION, None)],
-        DeviceType(SensorDeviceClass.CO2, CONCENTRATION_PARTS_PER_MILLION, None)
+    "tmp117": [
+        DeviceType(SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, None),
     ],
-    'tmp117': [
+    "ads1115": [
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
+        DeviceType(None, None, "ch0"),
+        DeviceType(None, None, "ch1"),
+        DeviceType(None, None, "ch2"),
+        DeviceType(None, None, "ch3"),
     ],
-    'ads1115': [
+    "ads1015": [
-        DeviceType(None, None, 'ch0'),
+        DeviceType(None, None, "ch0"),
-        DeviceType(None, None, 'ch1'),
+        DeviceType(None, None, "ch1"),
-        DeviceType(None, None, 'ch2'),
+        DeviceType(None, None, "ch2"),
-        DeviceType(None, None, 'ch3'),
+        DeviceType(None, None, "ch3"),
     ],
-    'ads1015': [
+    "opt3001": [
-        DeviceType(None, None, 'ch0'),
+        DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None),
-        DeviceType(None, None, 'ch1'),
+    ],
-        DeviceType(None, None, 'ch2'),
+    "ina226": [
-        DeviceType(None, None, 'ch3'),
+        Skip,
+        DeviceType(SensorDeviceClass.CURRENT, "A", None),
+        DeviceType(SensorDeviceClass.VOLTAGE, "V", None),
+    ],
+    "scd4x": [
+        DeviceType(
+            SensorDeviceClass.CO2,
+            CONCENTRATION_PARTS_PER_MILLION,
+            None,
+            i2c_par=0,
+            idx=0,
+        ),
+        DeviceType(SensorDeviceClass.TEMPERATURE, UnitOfTemperature.CELSIUS, None, i2c_par=0, idx=1),
+        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None, i2c_par=0, idx=2),
     ],
 }

custom_components/mega/light.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 
 import asyncio
 import logging
-import typing
 from datetime import timedelta, datetime
 from functools import partial
 
@@ -13,13 +12,9 @@ import time
 
 from homeassistant.components.light import (
     PLATFORM_SCHEMA as LIGHT_SCHEMA,
-    SUPPORT_BRIGHTNESS,
     LightEntity,
-    SUPPORT_TRANSITION,
-    SUPPORT_COLOR,
     ColorMode,
-    LightEntityFeature,
+    LightEntityFeature
-    # SUPPORT_WHITE_VALUE
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -124,10 +119,21 @@ async def async_setup_entry(
 class MegaLight(MegaOutPort, LightEntity):
     @property
     def supported_features(self):
-        return (SUPPORT_BRIGHTNESS if self.dimmer else 0) | (
+        return LightEntityFeature.TRANSITION if self.dimmer else LightEntityFeature(0)
-            SUPPORT_TRANSITION if self.dimmer else 0
-        )
 
+    @property
+    def supported_color_modes(self):
+        if self.dimmer:
+            return {ColorMode.BRIGHTNESS}
+        else:
+            return {ColorMode.ONOFF}
+
+    @property
+    def color_mode(self):
+        if self.dimmer:
+            return ColorMode.BRIGHTNESS
+        else:
+            return ColorMode.ONOFF
 
 class MegaRGBW(LightEntity, BaseMegaEntity):
     def __init__(self, *args, **kwargs):

custom_components/mega/manifest.json

@@ -12,8 +12,9 @@
   "homekit": {},
   "after_dependencies": ["mqtt"],
   "codeowners": [
-    "@andvikt"
+    "@andvikt",
+    "@den-dmitriev"
   ],
   "issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
-  "version": "v1.1.8b5"
+  "version": "v1.1.8b14"
 }

custom_components/mega/sensor.py

@@ -4,7 +4,9 @@ import voluptuous as vol
 import struct
 
 from homeassistant.components.sensor import (
-    PLATFORM_SCHEMA as SENSOR_SCHEMA, SensorEntity, SensorDeviceClass
+    PLATFORM_SCHEMA as SENSOR_SCHEMA,
+    SensorEntity,
+    SensorDeviceClass,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -12,35 +14,46 @@ from homeassistant.const import (
     CONF_PORT,
     CONF_UNIQUE_ID,
     CONF_ID,
-    CONF_TYPE, CONF_UNIT_OF_MEASUREMENT, CONF_VALUE_TEMPLATE,
+    CONF_TYPE,
+    CONF_UNIT_OF_MEASUREMENT,
+    CONF_VALUE_TEMPLATE,
     CONF_DEVICE_CLASS,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.template import Template
 from .entities import MegaPushEntity
-from .const import CONF_KEY, TEMP, HUM, W1, W1BUS, CONF_CONV_TEMPLATE, CONF_HEX_TO_FLOAT, DOMAIN, CONF_CUSTOM, \
+from .const import (
-    CONF_SKIP, CONF_FILTER_VALUES, CONF_FILTER_SCALE, CONF_FILTER_LOW, CONF_FILTER_HIGH, CONF_FILL_NA
+    CONF_KEY,
+    TEMP,
+    HUM,
+    W1,
+    W1BUS,
+    CONF_CONV_TEMPLATE,
+    CONF_HEX_TO_FLOAT,
+    DOMAIN,
+    CONF_CUSTOM,
+    CONF_SKIP,
+    CONF_FILTER_VALUES,
+    CONF_FILTER_SCALE,
+    CONF_FILTER_LOW,
+    CONF_FILTER_HIGH,
+    CONF_FILL_NA,
+)
 from .hub import MegaD
 import re
 
 from .tools import int_ignore
 
 lg = logging.getLogger(__name__)
-TEMP_PATT = re.compile(r'temp:([01234567890\.]+)')
+TEMP_PATT = re.compile(r"temp:([01234567890\.]+)")
-HUM_PATT = re.compile(r'hum:([01234567890\.]+)')
+HUM_PATT = re.compile(r"hum:([01234567890\.]+)")
 PATTERNS = {
     TEMP: TEMP_PATT,
     HUM: HUM_PATT,
 }
 
-UNITS = {
+UNITS = {TEMP: "°C", HUM: "%"}
-    TEMP: '°C',
+CLASSES = {TEMP: SensorDeviceClass.TEMPERATURE, HUM: SensorDeviceClass.HUMIDITY}
-    HUM: '%'
-}
-CLASSES = {
-    TEMP: SensorDeviceClass.TEMPERATURE,
-    HUM: SensorDeviceClass.HUMIDITY
-}
 # Validation of the user's configuration
 _ITEM = {
     vol.Required(CONF_PORT): int,
@@ -50,18 +63,18 @@ _ITEM = {
         W1,
         W1BUS,
     ),
-    vol.Optional(CONF_KEY, default=''): str,
+    vol.Optional(CONF_KEY, default=""): str,
 }
 PLATFORM_SCHEMA = SENSOR_SCHEMA.extend(
-    {
+    {vol.Optional(str, description="mega id"): [_ITEM]},
-        vol.Optional(str, description="mega id"): [_ITEM]
-    },
     extra=vol.ALLOW_EXTRA,
 )
 
 
 async def async_setup_platform(hass, config, add_entities, discovery_info=None):
-    lg.warning('mega integration does not support yaml for sensors, please use UI configuration')
+    lg.warning(
+        "mega integration does not support yaml for sensors, please use UI configuration"
+    )
     return True
 
 
@@ -72,19 +85,23 @@ def _make_entity(config_entry, mid: str, port: int, conf: dict):
         mega_id=mid,
         port=port,
         patt=PATTERNS.get(key),
-        unit_of_measurement=UNITS.get(key, UNITS[TEMP]),  # TODO: make other units, make options in config flow
+        unit_of_measurement=UNITS.get(
+            key, UNITS[TEMP]
+        ),  # TODO: make other units, make options in config flow
         device_class=CLASSES.get(key, CLASSES[TEMP]),
         id_suffix=key,
-        config_entry=config_entry
+        config_entry=config_entry,
     )
 
 
-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]
-    hub: MegaD = hass.data['mega'][mid]
+    hub: MegaD = hass.data["mega"][mid]
     devices = []
     customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {}).get(mid, {})
-    for tp in ['sensor', 'i2c']:
+    for tp in ["sensor", "i2c"]:
         for port, cfg in config_entry.data.get(tp, {}).items():
             port = int_ignore(port)
             c = customize.get(port, {})
@@ -92,14 +109,19 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
                 hub.skip_ports |= {port}
                 continue
             for data in cfg:
-                hub.lg.debug(f'add sensor on port %s with data %s, constructor: %s', port, data, _constructors[tp])
+                hub.lg.debug(
+                    f"add sensor on port %s with data %s, constructor: %s",
+                    port,
+                    data,
+                    _constructors[tp],
+                )
                 sensor = _constructors[tp](
                     mega=hub,
                     port=port,
                     config_entry=config_entry,
                     **data,
                 )
-                if '<' in sensor.name:
+                if "<" in sensor.name:
                     continue
                 devices.append(sensor)
 
@@ -107,64 +129,76 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
 
 
 class FilterBadValues(MegaPushEntity, SensorEntity):
-
     def __init__(self, *args, **kwargs):
         self._prev_value = None
         super().__init__(*args, **kwargs)
 
     def filter_value(self, value):
+        if value is None:
+            return
         try:
-            if value \
+            if (
-                    in self.filter_values \
+                value in self.filter_values
-                    or (self.filter_low is not None and value < self.filter_low) \
+                or (self.filter_low is not None and value < self.filter_low)
-                    or (self.filter_high is not None and value > self.filter_high) \
+                or (self.filter_high is not None and value > self.filter_high)
-                    or (
+                or (
                     self._prev_value is not None
                     and self.filter_scale is not None
+                    and abs(value)
+                    > 2  # при переходе через 0 каждое небольшое изменение будет иметь слишком большой эффект
                     and (
-                            abs(value - self._prev_value) / self._prev_value > self.filter_scale
+                        abs((value - self._prev_value) / self._prev_value)
+                        > self.filter_scale
                     )
+                )
             ):
-                if self.fill_na == 'last':
+                if self.fill_na == "last":
                     value = self._prev_value
                 else:
                     value = None
             self._prev_value = value
             return value
         except Exception as exc:
-            lg.exception(f'while parsing value')
+            lg.exception(f"while parsing value")
             return None
 
     @property
     def filter_values(self):
-        return self.customize.get(CONF_FILTER_VALUES, self.mega.customize.get(CONF_FILTER_VALUES, []))
+        return self.customize.get(
+            CONF_FILTER_VALUES, self.mega.customize.get(CONF_FILTER_VALUES, [])
+        )
 
     @property
     def filter_scale(self):
-        return self.customize.get(CONF_FILTER_SCALE, self.mega.customize.get(CONF_FILTER_SCALE, None))
+        return self.customize.get(
+            CONF_FILTER_SCALE, self.mega.customize.get(CONF_FILTER_SCALE, None)
+        )
 
     @property
     def filter_low(self):
-        return self.customize.get(CONF_FILTER_LOW, self.mega.customize.get(CONF_FILTER_LOW, None))
+        return self.customize.get(
+            CONF_FILTER_LOW, self.mega.customize.get(CONF_FILTER_LOW, None)
+        )
 
     @property
     def filter_high(self):
-        return self.customize.get(CONF_FILTER_HIGH, self.mega.customize.get(CONF_FILTER_HIGH, None))
+        return self.customize.get(
+            CONF_FILTER_HIGH, self.mega.customize.get(CONF_FILTER_HIGH, None)
+        )
 
     @property
     def fill_na(self):
-        return self.customize.get(CONF_FILL_NA, 'last')
+        return self.customize.get(CONF_FILL_NA, "last")
 
 
 class MegaI2C(FilterBadValues):
-
     def __init__(
-            self,
+        self,
-            *args,
+        *args,
-            device_class: str,
+        device_class: str,
-            params: dict,
+        params: dict,
-            unit_of_measurement: str = None,
+        unit_of_measurement: str = None,
-            **kwargs
+        **kwargs,
     ):
         self._device_class = device_class
         self._params = tuple(params.items())
@@ -183,9 +217,11 @@ class MegaI2C(FilterBadValues):
     @property
     def extra_state_attributes(self):
         attrs = super().extra_state_attributes or {}
-        attrs.update({
+        attrs.update(
-            'i2c_id': self.id_suffix,
+            {
-        })
+                "i2c_id": self.id_suffix,
+            }
+        )
         return attrs
 
     @property
@@ -202,22 +238,24 @@ class MegaI2C(FilterBadValues):
             ret = self.mega.values.get(self._params)
             if self.customize.get(CONF_HEX_TO_FLOAT):
                 try:
-                    ret = struct.unpack('!f', bytes.fromhex(ret))[0]
+                    ret = struct.unpack("!f", bytes.fromhex(ret))[0]
                 except:
-                    self.lg.warning(f'could not convert {ret} form hex to float')
+                    self.lg.warning(f"could not convert {ret} form hex to float")
-            tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
+            tmpl: Template = self.customize.get(
+                CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE)
+            )
             try:
                 ret = float(ret)
                 if tmpl is not None and self.hass is not None:
                     tmpl.hass = self.hass
-                    ret = tmpl.async_render({'value': ret})
+                    ret = tmpl.async_render({"value": ret})
             except:
                 ret = ret
             ret = self.filter_value(ret)
             if ret is not None:
                 return str(ret)
         except Exception:
-            lg.exception('while getting value')
+            lg.exception("while getting value")
             return None
 
     @property
@@ -226,14 +264,8 @@ class MegaI2C(FilterBadValues):
 
 
 class Mega1WSensor(FilterBadValues):
-
     def __init__(
-            self,
+        self, unit_of_measurement=None, device_class=None, key=None, *args, **kwargs
-            unit_of_measurement=None,
-            device_class=None,
-            key=None,
-            *args,
-            **kwargs
     ):
         """
         1-wire sensor entity
@@ -264,7 +296,7 @@ class Mega1WSensor(FilterBadValues):
     @property
     def unique_id(self):
         if self.key:
-            return super().unique_id + f'_{self.key}'
+            return super().unique_id + f"_{self.key}"
         else:
             return super().unique_id
 
@@ -284,23 +316,27 @@ class Mega1WSensor(FilterBadValues):
     def native_value(self):
         try:
             ret = None
-            if not hasattr(self, 'key'):
+            if not hasattr(self, "key"):
                 return None
             if self.key:
                 try:
                     ret = self.mega.values.get(self.port, {})
                     if isinstance(ret, dict):
-                        ret = ret.get('value', {})
+                        ret = ret.get("value", {})
                         if isinstance(ret, dict):
                             ret = ret.get(self.key)
                 except:
-                    self.lg.error(self.mega.values.get(self.port, {}).get('value', {}))
+                    self.lg.error(self.mega.values.get(self.port, {}).get("value", {}))
                     return
             else:
-                ret = self.mega.values.get(self.port, {}).get('value')
+                ret = self.mega.values.get(self.port, {}).get("value")
-            if ret is None and self.fill_na == 'fill_na' and self.prev_value is not None:
+            if (
+                ret is None
+                and self.fill_na == "fill_na"
+                and self.prev_value is not None
+            ):
                 ret = self.prev_value
-            elif ret is None and self.fill_na == 'fill_na' and self._state is not None:
+            elif ret is None and self.fill_na == "fill_na" and self._state is not None:
                 ret = self._state.state
             try:
                 ret = float(ret)
@@ -310,15 +346,17 @@ class Mega1WSensor(FilterBadValues):
                 ret = self.prev_value
             if self.customize.get(CONF_HEX_TO_FLOAT):
                 try:
-                    ret = struct.unpack('!f', bytes.fromhex(ret))[0]
+                    ret = struct.unpack("!f", bytes.fromhex(ret))[0]
                 except:
-                    self.lg.warning(f'could not convert {ret} form hex to float')
+                    self.lg.warning(f"could not convert {ret} form hex to float")
-            tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
+            tmpl: Template = self.customize.get(
+                CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE)
+            )
             try:
                 ret = float(ret)
                 if tmpl is not None and self.hass is not None:
                     tmpl.hass = self.hass
-                    ret = tmpl.async_render({'value': ret})
+                    ret = tmpl.async_render({"value": ret})
             except:
                 pass
             ret = self.filter_value(ret)
@@ -326,7 +364,7 @@ class Mega1WSensor(FilterBadValues):
             if ret is not None:
                 return str(ret)
         except Exception:
-            lg.exception('while parsing state')
+            lg.exception("while parsing state")
             return None
 
     @property
@@ -342,6 +380,6 @@ class Mega1WSensor(FilterBadValues):
 
 
 _constructors = {
-    'sensor': Mega1WSensor,
+    "sensor": Mega1WSensor,
-    'i2c': MegaI2C,
+    "i2c": MegaI2C,
 }

install.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-git clone https://github.com/andvikt/mega_hacs.git
+git clone https://github.com/den-dmitriev/mega_hacs.git
 mkdir custom_components
 cp mega_hacs/custom_components/mega custom_components/mega
 rm -fR mega_hacs