Merge pull request #157 from andvikt/dev

Dev

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.8b7
+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/config_flow.py

@@ -8,19 +8,9 @@ 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 (
+from .const import DOMAIN, CONF_RELOAD, \
-    DOMAIN,
+    CONF_NPORTS, CONF_UPDATE_ALL, CONF_POLL_OUTS, CONF_FAKE_RESPONSE, CONF_FORCE_D, \
-    CONF_RELOAD,
+    CONF_ALLOW_HOSTS, CONF_PROTECTED, CONF_RESTORE_ON_RESTART, CONF_UPDATE_TIME
-    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
 
@@ -28,7 +18,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,
@@ -41,7 +31,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,
     },
 )
@@ -51,7 +41,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
@@ -64,7 +54,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
@@ -73,7 +63,7 @@ async def validate_input(hass: core.HomeAssistant, data):
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for mega."""
 
-    VERSION = 27
+    VERSION = 26
     CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
 
     async def async_step_user(self, user_input=None):
@@ -88,12 +78,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,
@@ -119,66 +109,48 @@ 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
             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(
+                vol.Optional(CONF_POLL_OUTS, default=e.get(CONF_POLL_OUTS, False)): bool,
-                        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(CONF_PORT_TO_SCAN, default=e.get(CONF_PORT_TO_SCAN, 0)): int,
                 # vol.Optional(CONF_MQTT_INPUTS, default=e.get(CONF_MQTT_INPUTS, True)): bool,
                 vol.Optional(CONF_NPORTS, default=e.get(CONF_NPORTS, 37)): int,
                 vol.Optional(CONF_RELOAD, default=False): bool,
-                    vol.Optional(
+                vol.Optional(CONF_UPDATE_ALL, default=e.get(CONF_UPDATE_ALL, True)): bool,
-                        CONF_UPDATE_ALL, default=e.get(CONF_UPDATE_ALL, True)
+                vol.Optional(CONF_FAKE_RESPONSE, default=e.get(CONF_FAKE_RESPONSE, True)): bool,
-                    ): bool,
+                vol.Optional(CONF_FORCE_D, default=e.get(CONF_FORCE_D, False)): bool,
-                    vol.Optional(
+                vol.Optional(CONF_RESTORE_ON_RESTART, default=e.get(CONF_RESTORE_ON_RESTART, False)): bool,
-                        CONF_FAKE_RESPONSE, default=e.get(CONF_FAKE_RESPONSE, True)
+                vol.Optional(CONF_PROTECTED, default=e.get(CONF_PROTECTED, True)): bool,
-                    ): 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_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

custom_components/mega/entities.py

@@ -12,21 +12,8 @@ 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 (
+from .const import DOMAIN, CONF_CUSTOM, CONF_INVERT, EVENT_BINARY_SENSOR, LONG, \
-    DOMAIN,
+    LONG_RELEASE, RELEASE, PRESS, SINGLE_CLICK, DOUBLE_CLICK, EVENT_BINARY, CONF_SMOOTH, CONF_RANGE
-    CONF_CUSTOM,
-    CONF_INVERT,
-    EVENT_BINARY_SENSOR,
-    LONG,
-    LONG_RELEASE,
-    RELEASE,
-    PRESS,
-    SINGLE_CLICK,
-    DOUBLE_CLICK,
-    EVENT_BINARY,
-    CONF_SMOOTH,
-    CONF_RANGE,
-)
 
 _events_on = False
 _LOGGER = logging.getLogger(__name__)
@@ -35,7 +22,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
 
 
@@ -44,7 +31,6 @@ def set_events_off():
     _events_on = False
     _task_set_ev_on = None
 
-
 _task_set_ev_on = None
 
 
@@ -54,17 +40,16 @@ 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,
-        mega: "h.MegaD",
+            mega: 'h.MegaD',
             port: typing.Union[int, str, typing.List[int]],
             config_entry: ConfigEntry = None,
             id_suffix=None,
             name=None,
             unique_id=None,
-        http_cmd="get",
+            http_cmd='get',
-        addr: str = None,
+            addr: str=None,
             index=None,
             customize=None,
             smooth=None,
@@ -80,19 +65,11 @@ 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
-            _pt = (
+            self._name = name or f"{mega.id}_{_pt}" + \
-                port
+                         (f"_{id_suffix}" if id_suffix else "")
-                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
@@ -106,7 +83,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)
 
@@ -115,12 +92,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
@@ -141,7 +118,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
 
     @property
     def enabled(self):
-        if "<" in self.name:
+        if '<' in self.name:
             return False
         else:
             return super().enabled
@@ -153,17 +130,12 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         if self.hass is None or self.entity_id is None:
             return {}
         if self._customize is None:
-            c_entity_id = (
+            c_entity_id = self.hass.data.get(DOMAIN, {}).get(CONF_CUSTOM).get('entities', {}).get(self.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
@@ -175,24 +147,18 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         if isinstance(self.port, list):
             pt_idx = self.id_suffix
         else:
-            _pt = (
+            _pt = self.port if not self.mega.new_naming else f'{self.port:02}' if isinstance(self.port, int) else self.port
-                self.port
+            if isinstance(_pt, str) and 'e' in _pt:
-                if not self.mega.new_naming
+                pt_idx, _ = _pt.split('e')
-                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),
         )
@@ -210,13 +176,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         c = self.customize.get(CONF_NAME)
         if not isinstance(c, str):
             if not isinstance(self.port, list):
-                _pt = (
+                _pt = self.port if not self.mega.new_naming else f'{self.port:02}' if isinstance(self.port, int) else self.port
-                    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
@@ -232,7 +192,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()
 
 
@@ -252,42 +212,51 @@ 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={"entity_id": self.entity_id, "type": SINGLE_CLICK},
+                event_data={
+                    '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={"entity_id": self.entity_id, "type": DOUBLE_CLICK},
+                event_data={
+                    '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={"entity_id": self.entity_id, "type": LONG},
+                event_data={
+                    '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
@@ -297,13 +266,21 @@ class MegaPushEntity(BaseMegaEntity):
 
 
 class MegaOutPort(MegaPushEntity):
-    def __init__(self, dimmer=False, dimmer_scale=1, *args, **kwargs):
+
-        super().__init__(*args, **kwargs)
+    def __init__(
+            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
@@ -336,14 +313,9 @@ 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(
+            ret = safe_int(self._state.attributes.get("brightness"), def_on=self.max_dim, def_off=0, def_val=0)
-                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:
@@ -368,68 +340,46 @@ 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 hasattr(self, "dimmer") and self.dimmer:
+            if 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 (
+            if not isinstance(val, str) and self.index is not None and self.addr is not None:
-                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(
+                _val = val.get(self.addr, val.get(self.addr.lower(), val.get(self.addr.upper())))
-                    self.addr, val.get(self.addr.lower(), val.get(self.addr.upper()))
-                )
                 if not isinstance(_val, str):
-                    self.mega.lg.warning(
+                    self.mega.lg.warning(f'{self.entity_id}: can not get {self.addr} from {val}, recieved {_val}')
-                        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(
+                    self.mega.lg.debug('%s parsed values: %s[%s]="%s"', self.entity_id, _val, self.index, _val)
-                        '%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 (
+                return val == 'ON' or str(val) == '1' or (safe_int(val) is not None and safe_int(val) > 0)
-                    val == "ON"
-                    or str(val) == "1"
-                    or (safe_int(val) is not None and safe_int(val) > 0)
-                )
             else:
-                return (
+                return val == 'OFF' or str(val) == '0' or (safe_int(val) is not None and safe_int(val) == 0)
-                    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
 
@@ -450,7 +400,9 @@ class MegaOutPort(MegaPushEntity):
         if isinstance(self.port, str):
             self.mega.values[self.port] = value[0]
         else:
-            self.mega.values[self.port] = {"value": value[0]}
+            self.mega.values[self.port] = {
+                'value': value[0]
+            }
         if update_state:
             self.async_write_ha_state()
 
@@ -460,15 +412,13 @@ 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.task = asyncio.create_task(self.mega.smooth_dim(
-            self.mega.smooth_dim(
             (self.cmd_port, from_, to_),
             time=tm,
             can_smooth_hardware=self.can_smooth_hardware,
             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:
@@ -504,9 +454,9 @@ class MegaOutPort(MegaPushEntity):
         brightness = self._calc_brightness(brightness)
         _prev = safe_int(self.brightness) or 0
         self._brightness = brightness
-        if hasattr(self, "dimmer") and self.dimmer and brightness == 0:
+        if self.dimmer and brightness == 0:
             cmd = self.max_dim
-        elif hasattr(self, "dimmer") and self.dimmer:
+        elif 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)
@@ -521,7 +471,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:
@@ -530,31 +480,29 @@ 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(
+        self._restore_brightness = self._cal_reverse_brightness(safe_int(self._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:
@@ -569,12 +517,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:
@@ -582,19 +530,13 @@ 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
-
-
-def safe_float(v):
-    try:
-        return float(v)
-    except:
-        return None

custom_components/mega/http.py

@@ -13,42 +13,40 @@ from homeassistant.core import HomeAssistant
 from .const import EVENT_BINARY_SENSOR, DOMAIN, 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"
+
-    name = "mega"
+    url = '/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
+        _LOGGER.debug('templates: %s', self.templates)
-            if isinstance(cfg[mid], dict)
-        }
-        _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:
@@ -56,39 +54,33 @@ class MegaView(HomeAssistantView):
                     auth = True
                     break
             if not auth:
-                msg = (
+                msg = f"Non-authorised request from {request.remote} to `/mega`. "\
-                    f"Non-authorised request from {request.remote} to `/mega`. "
+                      f"If you want to accept requests from this host "\
-                    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(
+                _LOGGER.warning(f'can not find mdid={request.query["mdid"]} in {list(self.hubs)}')
-                    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']:
-                )
-        if hub is None and request.remote in ["::1", "127.0.0.1"]:
             try:
                 hub = list(self.hubs.values())[0]
             except IndexError:
-                _LOGGER.warning(
+                _LOGGER.warning(f'can not find mdid={request.query["mdid"]} in {list(self.hubs)}')
-                    f'can not find mdid={request.query["mdid"]} in {list(self.hubs)}'
-                )
                 return Response(status=400)
         elif hub is None:
             return Response(status=400)
@@ -99,17 +91,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 = ''  # пока ответ всегда пустой, неясно какая будет реакция на непустой ответ
@@ -118,70 +110,49 @@ 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(
+                    hub.lg.warning(f'can not find extender for int port {port}, '
-                        f"can not find extender for int port {port}, "
+                                   f'have ext_int: {hub.ext_in}, ext: {hub.extenders}')
-                        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 = (
+                        pt = f'{pt_orig}e{idx}' if not hub.new_naming else f'{int(pt_orig):02d}e{int(idx):02d}'
-                            f"{pt_orig}e{idx}"
+                        _data['pt_orig'] = pt_orig
-                            if not hub.new_naming
+                        _data['value'] = 'ON' if v == '1' else 'OFF'
-                            else f"{int(pt_orig):02d}e{int(idx):02d}"
+                        _data['m'] = 1 if _data[e] == '0' else 0  # имитация поведения обычного входа, чтобы события обрабатывались аналогично
-                        )
-                        _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(
+                        hub.lg.debug(f'act on port {pt}: {act}, all acts are: {hub.ext_act}')
-                            f"act on port {pt}: {act}, all acts are: {hub.ext_act}"
+                        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)
-                        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:
                 hub.values[port] = data
                 for cb in self.callbacks[hub.id][port]:
                     cb(data)
-                template: Template = self.templates.get(hub.id, {}).get(
+                template: Template = self.templates.get(hub.id, {}).get(port, hub.def_response)
-                    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 (
+        if hub.fake_response and 'value' not in data and 'pt' in data and port in hub.binary_sensors:
-            hub.fake_response
+            if 'd' in ret:
-            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):
@@ -198,5 +169,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()

custom_components/mega/hub.py

@@ -32,7 +32,7 @@ from .const import (
     CONF_FORCE_I2C_SCAN,
     REMOVE_CONFIG,
 )
-from .entities import set_events_off, BaseMegaEntity, MegaOutPort, safe_int, safe_float
+from .entities import set_events_off, BaseMegaEntity, MegaOutPort, safe_int
 from .exceptions import CannotConnect, NoPort
 from .i2c import parse_scan_page
 from .tools import make_ints, int_ignore, PriorityLock
@@ -168,9 +168,6 @@ class MegaD:
         except Exception:
             self.lg.exception("while setting allowed hosts")
         self.binary_sensors = []
-        self.sht31inited = (
-            set()
-        )  # список портов sht31 которые уже успешно проинициализированы были
 
     async def start(self):
         pass
@@ -480,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):
@@ -490,39 +487,16 @@ class MegaD:
         :return:
         """
         pt = params.get("pt")
-        i2c_dev = params.get("i2c_dev", None)
-
         if pt in self.skip_ports:
             return
-        if pt is None:
+        if pt is not None:
-            return
+            pass
-
         _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(i2c_dev=i2c_dev, **__params)
-            await asyncio.sleep(0.1)
-            self.sht31inited |= pt
         delay = None
-        idx: int = params.pop("idx", None)
-        pt: int = params.get("pt", None)
         if "delay" in params:
             delay = params.pop("delay")
         try:
-            if idx is None or idx == 0:
+            ret = {_params: await self.request(**params)}
-                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:
-                v = safe_float(v.split("/")[idx])
-            ret = {_params: v}
-        except Exception:
-            self.lg.exception(f"while getting i2c {params=}")
         except asyncio.TimeoutError:
             return
         self.lg.debug("i2c response: %s", ret)

custom_components/mega/i2c.py

@@ -16,33 +16,27 @@ 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:
@@ -52,39 +46,31 @@ 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, i2c_par, idx = astuple(c)
+                c, m, suffix, delay = 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 and i2c_par is None:
+            if i > 0:
-                _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,
-                    "id_suffix": _dev,
+                'device_class': c,
-                    "device_class": c,
+                'params': _params,
-                    "params": _params,
+                'unit_of_measurement': m,
-                    "unit_of_measurement": m,
+            })
-                }
-            )
             req.append(_params)
     return req, ret
 
@@ -99,85 +85,67 @@ class Request:
 
 
 i2c_classes = {
-    "htu21d": [
+    'htu21d': [
         DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None),
         DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
     ],
-    "sht31": [
+    'sht31': [
-        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None, delay=0.1),
+        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None, delay=1.5),
         DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
     ],
-    "max44009": [DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)],
+    'max44009': [
-    "bh1750": [DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)],
+        DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
-    "tsl2591": [DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)],
+    ],
-    "bmp180": [
+    'bh1750': [
+        DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
+    ],
+    'tsl2591': [
+        DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
+    ],
+    'bmp180': [
         DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
         DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
     ],
-    "bmx280": [
+    'bmx280': [
         DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
         DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
-        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None),
+        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None)
     ],
-    "dps368": [
+    'dps368': [
         DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
         DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
     ],
-    "mlx90614": [
+    'mlx90614': [
         Skip,
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, "temp"),
+        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, 'temp'),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, "object"),
+        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, 'object'),
     ],
-    "ptsensor": [
+    'ptsensor': [
         Skip,
         Request(delay=3),  # запрос на измерение
         DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
         DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
     ],
-    "mcp9600": [
+    'mcp9600': [
         DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),  # термопара
-        DeviceType(
+        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),  # сенсор встроенный в микросхему
-            SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None
-        ),  # сенсор встроенный в микросхему
     ],
-    "t67xx": [DeviceType(SensorDeviceClass.CO2, CONCENTRATION_PARTS_PER_MILLION, None)],
+    't67xx': [
-    "tmp117": [
+        DeviceType(SensorDeviceClass.CO2, CONCENTRATION_PARTS_PER_MILLION, None)
+    ],
+    'tmp117': [
         DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
     ],
-    "ads1115": [
+    'ads1115': [
-        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": [
+    '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'),
-    ],
-    "opt3001": [
-        DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None),
-    ],
-    "scd4x": [
-        DeviceType(SensorDeviceClass.CO2, CONCENTRATION_PARTS_PER_MILLION, None),
-        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
-    ],
-    "ina226": [
-        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, TEMP_CELSIUS, None, i2c_par=0, idx=1),
-        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None, i2c_par=0, idx=2),
     ],
 }

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.8b7"
+  "version": "v1.1.8b0"
 }

custom_components/mega/sensor.py

@@ -4,9 +4,7 @@ import voluptuous as vol
 import struct
 
 from homeassistant.components.sensor import (
-    PLATFORM_SCHEMA as SENSOR_SCHEMA,
+    PLATFORM_SCHEMA as SENSOR_SCHEMA, SensorEntity, SensorDeviceClass
-    SensorEntity,
-    SensorDeviceClass,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -14,46 +12,35 @@ from homeassistant.const import (
     CONF_PORT,
     CONF_UNIQUE_ID,
     CONF_ID,
-    CONF_TYPE,
+    CONF_TYPE, CONF_UNIT_OF_MEASUREMENT, CONF_VALUE_TEMPLATE,
-    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 (
+from .const import CONF_KEY, TEMP, HUM, W1, W1BUS, CONF_CONV_TEMPLATE, CONF_HEX_TO_FLOAT, DOMAIN, CONF_CUSTOM, \
-    CONF_KEY,
+    CONF_SKIP, CONF_FILTER_VALUES, CONF_FILTER_SCALE, CONF_FILTER_LOW, CONF_FILTER_HIGH, CONF_FILL_NA
-    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 = {TEMP: "°C", HUM: "%"}
+UNITS = {
-CLASSES = {TEMP: SensorDeviceClass.TEMPERATURE, HUM: SensorDeviceClass.HUMIDITY}
+    TEMP: '°C',
+    HUM: '%'
+}
+CLASSES = {
+    TEMP: SensorDeviceClass.TEMPERATURE,
+    HUM: SensorDeviceClass.HUMIDITY
+}
 # Validation of the user's configuration
 _ITEM = {
     vol.Required(CONF_PORT): int,
@@ -63,18 +50,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(
+    lg.warning('mega integration does not support yaml for sensors, please use UI configuration')
-        "mega integration does not support yaml for sensors, please use UI configuration"
-    )
     return True
 
 
@@ -85,23 +72,19 @@ 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(
+        unit_of_measurement=UNITS.get(key, UNITS[TEMP]),  # TODO: make other units, make options in config flow
-            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(
+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, {})
-    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, {})
@@ -109,19 +92,14 @@ async def async_setup_entry(
                 hub.skip_ports |= {port}
                 continue
             for data in cfg:
-                hub.lg.debug(
+                hub.lg.debug(f'add sensor on port %s with data %s, constructor: %s', port, data, _constructors[tp])
-                    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)
 
@@ -129,76 +107,64 @@ async def async_setup_entry(
 
 
 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 (
+            if value \
-                value in self.filter_values
+                    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 (
                     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)
+                            abs(value - self._prev_value) / self._prev_value > self.filter_scale
-                        > 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(
+        return self.customize.get(CONF_FILTER_VALUES, self.mega.customize.get(CONF_FILTER_VALUES, []))
-            CONF_FILTER_VALUES, self.mega.customize.get(CONF_FILTER_VALUES, [])
-        )
 
     @property
     def filter_scale(self):
-        return self.customize.get(
+        return self.customize.get(CONF_FILTER_SCALE, self.mega.customize.get(CONF_FILTER_SCALE, None))
-            CONF_FILTER_SCALE, self.mega.customize.get(CONF_FILTER_SCALE, None)
-        )
 
     @property
     def filter_low(self):
-        return self.customize.get(
+        return self.customize.get(CONF_FILTER_LOW, self.mega.customize.get(CONF_FILTER_LOW, None))
-            CONF_FILTER_LOW, self.mega.customize.get(CONF_FILTER_LOW, None)
-        )
 
     @property
     def filter_high(self):
-        return self.customize.get(
+        return self.customize.get(CONF_FILTER_HIGH, self.mega.customize.get(CONF_FILTER_HIGH, None))
-            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,
             *args,
             device_class: str,
             params: dict,
             unit_of_measurement: str = None,
-        **kwargs,
+            **kwargs
     ):
         self._device_class = device_class
         self._params = tuple(params.items())
@@ -217,11 +183,9 @@ 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
@@ -238,24 +202,22 @@ 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(
+            tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
-                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
@@ -264,8 +226,14 @@ class MegaI2C(FilterBadValues):
 
 
 class Mega1WSensor(FilterBadValues):
+
     def __init__(
-        self, unit_of_measurement=None, device_class=None, key=None, *args, **kwargs
+            self,
+            unit_of_measurement=None,
+            device_class=None,
+            key=None,
+            *args,
+            **kwargs
     ):
         """
         1-wire sensor entity
@@ -296,7 +264,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
 
@@ -316,27 +284,23 @@ 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 (
+            if ret is None and self.fill_na == 'fill_na' and self.prev_value is not None:
-                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)
@@ -346,17 +310,15 @@ 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(
+            tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
-                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)
@@ -364,7 +326,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
@@ -380,6 +342,6 @@ class Mega1WSensor(FilterBadValues):
 
 
 _constructors = {
-    "sensor": Mega1WSensor,
+    'sensor': Mega1WSensor,
-    "i2c": MegaI2C,
+    'i2c': MegaI2C,
 }

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)