tune restore

add auto config reload on megad restart
fix reloading issues

.experiment.py

@@ -1,61 +1,3 @@
-import asyncio
+import struct
-from urllib.parse import urlparse, parse_qsl
-from asyncio import Event, FIRST_COMPLETED
-import signal
-import typing
-from logging import getLogger, DEBUG
 
-
+print(struct.unpack('!f', bytes.fromhex('435c028f'))[0])
-stop = Event()
-loop = asyncio.get_event_loop()
-lg = getLogger(__name__)
-lg.setLevel(DEBUG)
-
-
-def make_handler(get_ans: typing.Callable[[dict], str]):
-
-    async def handler(
-            reader: asyncio.StreamReader,
-            writer: asyncio.StreamWriter,
-    ):
-        data = await reader.read(200)
-        print(data)
-        message = data.decode()
-        addr = writer.get_extra_info('peername')
-        lg.debug('process msg "%s" from %s', message, addr)
-        try:
-            (_, p, *_) = message.split(' ')
-            p = dict(parse_qsl(urlparse(p).query))
-            lg.debug('query %s', p)
-            ans = get_ans(p)
-            ans = f'''HTTP/1.1 200 OK\nContent-Length: {len(ans)}\n\n{ans}'''.encode()  # \nContent-Length: 6
-            ans = b'HTTP/1.1 200 OK\r\n\r\n7:2'
-            print(ans)
-        except Exception as exc:
-            print(exc)
-            lg.exception('process msg "%s" from %s', message, addr)
-            ans = '''HTTP/1.1 500\n\n'''.encode()
-        writer.write(ans)
-        await writer.drain()
-        # writer.transport.close()
-        writer.close()
-        await writer.wait_closed()
-    return handler
-
-
-async def serve():
-    server = await asyncio.start_server(
-        make_handler(lambda x: '7:2'),
-        host='0.0.0.0',
-        port=1111,
-    )
-    addr = server.sockets[0].getsockname()
-    print(f'Serving on {addr}')
-    async with server:
-        await asyncio.wait((server.serve_forever(), stop.wait()), return_when=FIRST_COMPLETED)
-
-if __name__ == '__main__':
-    loop.add_signal_handler(
-        signal.SIGINT, stop.set
-    )
-    loop.run_until_complete(serve())

custom_components/mega/__init__.py

@@ -7,17 +7,16 @@ import voluptuous as vol
 
 from homeassistant.const import (
     CONF_SCAN_INTERVAL, CONF_ID, CONF_NAME, CONF_DOMAIN,
-    CONF_UNIT_OF_MEASUREMENT, CONF_HOST
+    CONF_UNIT_OF_MEASUREMENT, CONF_HOST, CONF_VALUE_TEMPLATE, CONF_DEVICE_CLASS
 )
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers.service import bind_hass
-from homeassistant.helpers.template import Template
 from homeassistant.helpers import config_validation as cv
 from homeassistant.components import mqtt
 from homeassistant.config_entries import ConfigEntry
 from .const import DOMAIN, CONF_INVERT, CONF_RELOAD, PLATFORMS, CONF_PORTS, CONF_CUSTOM, CONF_SKIP, CONF_PORT_TO_SCAN, \
     CONF_MQTT_INPUTS, CONF_HTTP, CONF_RESPONSE_TEMPLATE, CONF_ACTION, CONF_GET_VALUE, CONF_ALLOW_HOSTS, \
-    CONF_CONV_TEMPLATE, CONF_ALL, CONF_FORCE_D
+    CONF_CONV_TEMPLATE, CONF_ALL, CONF_FORCE_D, CONF_DEF_RESPONSE, CONF_FORCE_I2C_SCAN, CONF_HEX_TO_FLOAT
 from .hub import MegaD
 from .config_flow import ConfigFlow
 from .http import MegaView
@@ -35,25 +34,45 @@ CUSTOMIZE_PORT = {
         vol.Any(str, {
             vol.Required(str): str
         }),
+    vol.Optional(CONF_DEVICE_CLASS):
+        vol.Any(str, {
+            vol.Required(str): str
+        }),
     vol.Optional(
         CONF_RESPONSE_TEMPLATE,
         description='шаблон ответа когда на этот порт приходит'
                     'сообщение из меги '): cv.template,
     vol.Optional(CONF_ACTION): cv.script_action, # пока не реализовано
     vol.Optional(CONF_GET_VALUE, default=True): bool,
-    vol.Optional(CONF_CONV_TEMPLATE): cv.template
+    vol.Optional(CONF_CONV_TEMPLATE): cv.template,
+    vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+    vol.Optional(CONF_FORCE_I2C_SCAN): bool,
+    vol.Optional(CONF_HEX_TO_FLOAT): bool,
 }
 CUSTOMIZE_DS2413 = {
     vol.Optional(str.lower, description='адрес и индекс устройства'): CUSTOMIZE_PORT
 }
 
+
+def extender(x):
+    if isinstance(x, str) and 'e' in x:
+        return x
+    else:
+        raise ValueError('must has "e" in port name')
+
+
 CONFIG_SCHEMA = vol.Schema(
     {
         DOMAIN: {
             vol.Optional(CONF_ALLOW_HOSTS): [str],
             vol.Required(str, description='id меги из веб-интерфейса'): {
                 vol.Optional(CONF_FORCE_D, description='Принудительно слать d после срабатывания входа', default=False): bool,
-                vol.Optional(int, description='номер порта'): vol.Any(
+                vol.Optional(
+                    CONF_DEF_RESPONSE,
+                    description='Ответ по умолчанию',
+                    default=None
+                ): vol.Any(cv.template, None),
+                vol.Optional(vol.Any(int, extender), description='номер порта'): vol.Any(
                     CUSTOMIZE_PORT,
                     CUSTOMIZE_DS2413,
                 )
@@ -115,7 +134,7 @@ async def get_hub(hass, entry):
                 break
         if _mqtt is None:
             raise Exception('mqtt not configured, please configure mqtt first')
-    hub = MegaD(hass, **data, mqtt=_mqtt, lg=_LOGGER, loop=asyncio.get_event_loop())
+    hub = MegaD(hass, config=entry, **data, mqtt=_mqtt, lg=_LOGGER, loop=asyncio.get_event_loop())
     hub.mqtt_id = await hub.get_mqtt_id()
     return hub
 
@@ -123,8 +142,8 @@ async def get_hub(hass, entry):
 async def _add_mega(hass: HomeAssistant, entry: ConfigEntry):
     id = entry.data.get('id', entry.entry_id)
     hub = await get_hub(hass, entry)
-    hass.data[DOMAIN][id] = hass.data[DOMAIN]['__def'] = hub
+    hub.fw = await hub.get_fw()
-    hass.data[DOMAIN][entry.data.get(CONF_HOST)] = hub
+    hass.data[DOMAIN][id] = hub
     hass.data[DOMAIN][CONF_ALL][id] = hub
     if not await hub.authenticate():
         raise Exception("not authentificated")
@@ -155,33 +174,34 @@ async def updater(hass: HomeAssistant, entry: ConfigEntry):
     :param entry:
     :return:
     """
-    hub: MegaD = hass.data[DOMAIN][entry.data[CONF_ID]]
+    # hub: MegaD = hass.data[DOMAIN][entry.data[CONF_ID]]
-    hub.poll_interval = entry.options[CONF_SCAN_INTERVAL]
+    # hub.poll_interval = entry.options[CONF_SCAN_INTERVAL]
-    hub.port_to_scan = entry.options.get(CONF_PORT_TO_SCAN, 0)
+    # hub.port_to_scan = entry.options.get(CONF_PORT_TO_SCAN, 0)
-    entry.data = entry.options
+    await hass.config_entries.async_reload(entry.entry_id)
-    for platform in PLATFORMS:
-        await hass.config_entries.async_forward_entry_unload(entry, platform)
-    await async_remove_entry(hass, entry)
-    await async_setup_entry(hass, entry)
     return True
 
 
-async def async_remove_entry(hass, entry) -> None:
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Handle removal of an entry."""
     id = entry.data.get('id', entry.entry_id)
-    hub: MegaD = hass.data[DOMAIN][id]
+    hub: MegaD = hass.data[DOMAIN].get(id)
     if hub is None:
         return
     _LOGGER.debug(f'remove {id}')
     _hubs.pop(id, None)
     hass.data[DOMAIN].pop(id, None)
     hass.data[DOMAIN][CONF_ALL].pop(id, None)
+    for platform in PLATFORMS:
+        await hass.config_entries.async_forward_entry_unload(entry, platform)
     task: asyncio.Task = _POLL_TASKS.pop(id, None)
     if task is not None:
         task.cancel()
     if hub is None:
         return
     await hub.stop()
+    return True
+
+async_unload_entry = async_remove_entry
 
 
 async def async_migrate_entry(hass, config_entry: ConfigEntry):

custom_components/mega/binary_sensor.py

@@ -20,7 +20,7 @@ from homeassistant.helpers.template import Template
 from .const import EVENT_BINARY_SENSOR, DOMAIN, CONF_CUSTOM, CONF_SKIP, CONF_INVERT, CONF_RESPONSE_TEMPLATE
 from .entities import  MegaPushEntity
 from .hub import MegaD
-
+from .tools import int_ignore
 
 lg = logging.getLogger(__name__)
 
@@ -51,12 +51,14 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
     devices = []
     customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {})
     for port, cfg in config_entry.data.get('binary_sensor', {}).items():
-        port = int(port)
+        port = int_ignore(port)
         c = customize.get(mid, {}).get(port, {})
         if c.get(CONF_SKIP, False):
             continue
         hub.lg.debug(f'add binary_sensor on port %s', port)
         sensor = MegaBinarySensor(mega=hub, port=port, config_entry=config_entry)
+        if '<' in sensor.name:
+            continue
         devices.append(sensor)
     async_add_devices(devices)
 
@@ -67,6 +69,10 @@ class MegaBinarySensor(BinarySensorEntity, MegaPushEntity):
         super().__init__(*args, **kwargs)
         self._is_on = None
         self._attrs = None
+        self._click_task = None
+
+    async def _click(self):
+        await self.customize.get
 
     @property
     def state_attributes(self):
@@ -78,14 +84,15 @@ class MegaBinarySensor(BinarySensorEntity, MegaPushEntity):
 
     @property
     def is_on(self) -> bool:
-        val = self.mega.values.get(self.port, {}).get("value") \
+        val = self.mega.values.get(self.port, {})
-              or self.mega.values.get(self.port, {}).get('m')
+        if isinstance(val, dict):
+            val = val.get("value", val.get('m'))
         if val is None and self._state is not None:
             return self._state == 'ON'
         elif val is not None:
-            if val in ['ON', 'OFF']:
+            if val in ['ON', 'OFF', '1', '0']:
-                return val == 'ON' if not self.invert else val == 'OFF'
+                return val in ['ON', '1'] if not self.invert else val in ['OFF', '0']
-            else:
+            elif isinstance(val, int):
                 return val != 1 if not self.invert else val == 1
 
     def _update(self, payload: dict):

custom_components/mega/config_flow.py

@@ -10,7 +10,9 @@ 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_PORT_TO_SCAN, CONF_RELOAD, PLATFORMS, CONF_MQTT_INPUTS, \
-    CONF_NPORTS, CONF_UPDATE_ALL, CONF_POLL_OUTS  # pylint:disable=unused-import
+    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, \
+    REMOVE_CONFIG  # pylint:disable=unused-import
 from .hub import MegaD
 from . import exceptions
 
@@ -23,10 +25,16 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
         vol.Required(CONF_PASSWORD, default="sec"): str,
         vol.Optional(CONF_SCAN_INTERVAL, default=0): int,
         vol.Optional(CONF_POLL_OUTS, default=False): bool,
-        vol.Optional(CONF_PORT_TO_SCAN, default=0): int,
+        # vol.Optional(CONF_PORT_TO_SCAN, default=0): int,
-        vol.Optional(CONF_MQTT_INPUTS, default=True): bool,
+        vol.Optional(CONF_MQTT_INPUTS, default=False): bool,
         vol.Optional(CONF_NPORTS, default=37): int,
         vol.Optional(CONF_UPDATE_ALL, default=True): bool,
+        vol.Optional(CONF_FAKE_RESPONSE, default=True): bool,
+        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_UPDATE_TIME, default=True): bool,
     },
 )
 
@@ -57,7 +65,7 @@ async def validate_input(hass: core.HomeAssistant, data):
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for mega."""
 
-    VERSION = 6
+    VERSION = 23
     CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
 
     async def async_step_user(self, user_input=None):
@@ -76,6 +84,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             await hub.stop()
             hub.lg.debug(f'config loaded: %s', config)
             config.update(user_input)
+            config['new_naming'] = True
             return self.async_create_entry(
                 title=user_input.get(CONF_ID, user_input[CONF_HOST]),
                 data=config,
@@ -107,22 +116,20 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
 
     async def async_step_init(self, user_input=None):
         """Manage the options."""
-
+        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)
-            hub = await get_hub(self.hass, self.config_entry.data)
+            cfg['new_naming'] = new_naming
-            if reload:
+            self.config_entry.data = cfg
-                await hub.start()
+            await get_hub(self.hass, cfg)
-                new = await hub.get_config(nports=user_input.get(CONF_NPORTS, 37))
+
-                await hub.stop()
+            if reload:
+                id = self.config_entry.data.get('id', self.config_entry.entry_id)
+                hub: MegaD = self.hass.data[DOMAIN].get(id)
+                await hub.reload(reload_entry=False)
 
-                _LOGGER.debug(f'new config: %s', new)
-                cfg = dict(self.config_entry.data)
-                for x in PLATFORMS:
-                    cfg.pop(x, None)
-                cfg.update(new)
             return self.async_create_entry(
                 title='',
                 data=cfg,
@@ -133,11 +140,17 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
             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(CONF_PORT_TO_SCAN, default=e.get(CONF_PORT_TO_SCAN, 0)): int,
+                # 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(CONF_UPDATE_ALL, default=e.get(CONF_UPDATE_ALL, True)): 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,
             }),
         )

custom_components/mega/config_parser.py

@@ -0,0 +1,59 @@
+from dataclasses import dataclass, field
+from bs4 import BeautifulSoup
+
+inputs = [
+    'eact',
+    'inta',
+    'misc',
+]
+selectors = [
+    'pty',
+    'm',
+    'gr',
+    'd',
+    'ety',
+]
+
+
+@dataclass(frozen=True, eq=True)
+class Config:
+    pty: str = None
+    m: str = None
+    gr: str = None
+    d: str = None
+    ety: str = None
+    inta: str = field(compare=False, hash=False, default=None)
+    misc: str = field(compare=False, hash=False, default=None)
+    eact: str = field(compare=False, hash=False, default=None)
+    src: BeautifulSoup = field(compare=False, hash=False, default=None)
+
+
+def parse_config(page: str):
+    page = BeautifulSoup(page, features="lxml")
+    ret = {}
+    for x in selectors:
+        v = page.find('select', attrs={'name': x})
+        if v is None:
+            continue
+        else:
+            v = v.find(selected=True)
+            if v:
+                v = v['value']
+                ret[x] = v
+    for x in inputs:
+        v = page.find('input', attrs={'name': x})
+        if v:
+            ret[x] = v['value']
+    return Config(**ret, src=page)
+
+
+DIGITAL_IN = Config(pty="0")
+RELAY_OUT = Config(pty="1", m="0")
+PWM_OUT = Config(pty="1", m="1")
+DS2413 = Config(pty="1", m="2")
+MCP230 = Config(pty="4", m="1", gr="3", d="20")
+MCP230_OUT = Config(ety="1")
+MCP230_IN = Config(ety="0")
+PCA9685 = Config(pty="4", m="1", gr="3", d="21")
+OWIRE_BUS = Config(pty="3", d="5")
+

custom_components/mega/const.py

@@ -23,11 +23,20 @@ CONF_NPORTS = 'nports'
 CONF_RESPONSE_TEMPLATE = 'response_template'
 CONF_ACTION = 'action'
 CONF_UPDATE_ALL = 'update_all'
+CONF_FAKE_RESPONSE = 'fake_response'
 CONF_GET_VALUE = 'get_value'
 CONF_ALLOW_HOSTS = 'allow_hosts'
+CONF_PROTECTED = 'protected'
 CONF_CONV_TEMPLATE = 'conv_template'
 CONF_POLL_OUTS = 'poll_outs'
 CONF_FORCE_D = 'force_d'
+CONF_DEF_RESPONSE = 'def_response'
+CONF_RESTORE_ON_RESTART = 'restore_on_restart'
+CONF_CLICK_TIME = 'click_time'
+CONF_LONG_TIME = 'long_time'
+CONF_FORCE_I2C_SCAN = 'force_i2c_scan'
+CONF_UPDATE_TIME = 'update_time'
+CONF_HEX_TO_FLOAT = 'hex_to_float'
 PLATFORMS = [
     "light",
     "switch",
@@ -46,3 +55,16 @@ PRESS = 'press'
 LUX = 'lux'
 SINGLE_CLICK = 'single'
 DOUBLE_CLICK = 'double'
+
+PATT_FW = re.compile(r'fw:\s(.+)\)')
+
+REMOVE_CONFIG = [
+    'extenders',
+    'ext_in',
+    'ext_acts',
+    'i2c_sensors',
+    'binary_sensor',
+    'light',
+    'i2c',
+    'sensor',
+]

custom_components/mega/entities.py

@@ -60,7 +60,8 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         self._lg = None
         self._unique_id = unique_id or f"mega_{mega.id}_{port}" + \
                                        (f"_{id_suffix}" if id_suffix else "")
-        self._name = name or f"{mega.id}_{port}" + \
+        _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}" + \
                             (f"_{id_suffix}" if id_suffix else "")
         self._customize: dict = None
         self.index = index
@@ -68,6 +69,13 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         if self.http_cmd == 'ds2413':
             self.mega.ds2413_ports |= {self.port}
 
+    @property
+    def enabled(self):
+        if '<' in self.name:
+            return False
+        else:
+            return super().enabled
+
     @property
     def customize(self):
         if self.hass is None:
@@ -85,6 +93,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
 
     @property
     def device_info(self):
+        _pt = self.port if not self.mega.new_naming else f'{self.port:02}' if isinstance(self.port, int) else self.port
         return {
             "identifiers": {
                 # Serial numbers are unique identifiers within a specific domain
@@ -93,10 +102,10 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
             "config_entries": [
                 self.config_entry,
             ],
-            "name": f'{self._mega_id} port {self.port}',
+            "name": f'{self._mega_id} port {_pt}',
             "manufacturer": 'ab-log.ru',
             # "model": self.light.productname,
-            # "sw_version": self.light.swversion,
+            "sw_version": self.mega.fw,
             "via_device": (DOMAIN, self._mega_id),
         }
 
@@ -114,7 +123,8 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
     def name(self):
         c = self.customize.get(CONF_NAME)
         if not isinstance(c, str):
-            c = self._name or f"{self.mega.id}_p{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}"
         return c
 
     @property
@@ -147,6 +157,8 @@ class MegaPushEntity(BaseMegaEntity):
 
     def __update(self, value: dict):
         self._update(value)
+        if self.hass is None:
+            return
         self.async_write_ha_state()
         self.lg.debug(f'state after update %s', self.state)
         if self.mega.mqtt_inputs and not _events_on:
@@ -214,6 +226,7 @@ class MegaOutPort(MegaPushEntity):
     def __init__(
             self,
             dimmer=False,
+            dimmer_scale=1,
             *args, **kwargs
     ):
         super().__init__(
@@ -222,6 +235,7 @@ class MegaOutPort(MegaPushEntity):
         self._brightness = None
         self._is_on = None
         self.dimmer = dimmer
+        self.dimmer_scale = dimmer_scale
 
     # @property
     # def assumed_state(self) -> bool:
@@ -235,10 +249,22 @@ class MegaOutPort(MegaPushEntity):
     def brightness(self):
         if not self.dimmer:
             return
-        val = self.mega.values.get(self.port, {}).get("value")
+        val = self.mega.values.get(self.port, {})
-        if val is None and self._state is not None:
+        if isinstance(val, dict) and len(val) == 0 and self._state is not None:
             return self._state.attributes.get("brightness")
+        elif isinstance(self.port, str) and 'e' in self.port:
+            if isinstance(val, str):
+                val = safe_int(val)
+            else:
+                val = 0
+            if val == 0:
+                return self._brightness
+            elif isinstance(val, (int, float)):
+                return int(val / self.dimmer_scale)
         elif val is not None:
+            val = val.get("value")
+            if val is None:
+                return
             try:
                 val = int(val)
                 return val
@@ -248,12 +274,20 @@ class MegaOutPort(MegaPushEntity):
     @property
     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:
-        if val is None and self._state is not None:
             return self._state == 'ON'
+        elif isinstance(self.port, str) and 'e' in self.port and val:
+            if val is None:
+                return
+            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'
         elif val is not None:
             val = val.get("value")
-            if self.index and self.addr:
+            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')
                     return
@@ -268,7 +302,7 @@ class MegaOutPort(MegaPushEntity):
                 else:
                     self.mega.lg.warning(f'{self.entity_id}: {_val} has wrong length')
                     return
-            elif self.index and self.addr is None:
+            elif self.index is not None and self.addr is None:
                 self.mega.lg.warning(f'{self.entity_id} does not has addr')
                 return
             self.mega.lg.debug('%s.state = %s', self.entity_id, val)
@@ -286,17 +320,17 @@ class MegaOutPort(MegaPushEntity):
 
     async def async_turn_on(self, brightness=None, **kwargs) -> None:
         brightness = brightness or self.brightness or 255
-
+        self._brightness = brightness
         if self.dimmer and brightness == 0:
-            cmd = 255
+            cmd = 255 * self.dimmer_scale
         elif self.dimmer:
-            cmd = brightness
+            cmd = brightness * self.dimmer_scale
         else:
             cmd = 1 if not self.invert else 0
         _cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
         if self.addr:
             _cmd['addr'] = self.addr
-        await self.mega.request(**_cmd)
+        await self.mega.request(**_cmd, priority=-1)
         if self.index is not None:
             # обновление текущего стейта для ds2413
             await self.mega.get_port(
@@ -305,6 +339,11 @@ class MegaOutPort(MegaPushEntity):
                 conv=False,
                 http_cmd='list',
             )
+        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'
+            else:
+                self.mega.values[self.port] = cmd
         else:
             self.mega.values[self.port] = {'value': cmd}
         await self.get_state()
@@ -315,7 +354,7 @@ class MegaOutPort(MegaPushEntity):
         _cmd = {"cmd": f"{self.cmd_port}:{cmd}"}
         if self.addr:
             _cmd['addr'] = self.addr
-        await self.mega.request(**_cmd)
+        await self.mega.request(**_cmd, priority=-1)
         if self.index is not None:
             # обновление текущего стейта для ds2413
             await self.mega.get_port(
@@ -324,14 +363,18 @@ class MegaOutPort(MegaPushEntity):
                 conv=False,
                 http_cmd='list',
             )
+        elif isinstance(self.port, str) and 'e' in self.port:
+            self.mega.values[self.port] = 'OFF' if not self.invert else 'ON'
         else:
             self.mega.values[self.port] = {'value': cmd}
         await self.get_state()
 
 
 def safe_int(v):
-    if v in ['ON', 'OFF']:
+    if v == 'ON':
-        return None
+        return 1
+    elif v == 'OFF':
+        return 0
     try:
         return int(v)
     except (ValueError, TypeError):

custom_components/mega/http.py

@@ -16,6 +16,12 @@ from . import hub as h
 _LOGGER = logging.getLogger(__name__).getChild('http')
 
 
+def is_ext(data: typing.Dict[str, typing.Any]):
+    for x in data:
+        if x.startswith('ext'):
+            return True
+
+
 class MegaView(HomeAssistantView):
 
     url = '/mega'
@@ -24,7 +30,9 @@ class MegaView(HomeAssistantView):
 
     def __init__(self, cfg: dict):
         self._try = 0
-        self.allowed_hosts = {'::1'}
+        self.protected = True
+        self.allowed_hosts = {'::1', '127.0.0.1'}
+        self.notified_attempts = defaultdict(lambda : False)
         self.callbacks = defaultdict(lambda: defaultdict(list))
         self.templates: typing.Dict[str, typing.Dict[str, Template]] = {
             mid: {
@@ -34,23 +42,47 @@ class MegaView(HomeAssistantView):
             } for mid in cfg 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)
-        auth = False
-        for x in self.allowed_hosts:
-            if request.remote.startswith(x):
-                auth = True
-                break
-        if not auth:
-            _LOGGER.warning(f'unauthorised attempt to connect from {request.remote}')
-            return Response(status=401)
-
         hass: HomeAssistant = request.app['hass']
-        hub: 'h.MegaD' = hass.data.get(DOMAIN).get(request.remote)  # TODO: проверить какой remote
+        if self.protected:
-        if hub is None and request.remote == '::1':
+            auth = False
-            hub = hass.data.get(DOMAIN).get('__def')
+            for x in self.allowed_hosts:
-        if hub is None:
+                if request.remote.startswith(x):
+                    auth = True
+                    break
+            if not auth:
+                msg = f"Non-authorised request from {request.remote} to `/mega`. "\
+                      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',
+                        'create',
+                        {
+                            "notification_id": request.remote,
+                            "title": "Non-authorised request",
+                            "message": msg
+                        }
+                    )
+                _LOGGER.warning(msg)
+                return Response(status=401)
+
+        remote = request.headers.get('X-Real-IP', request.remote)
+        hub: 'h.MegaD' = self.hubs.get(remote)
+        if hub is None and 'mdid' in request.query:
+            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)}')
+        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)}')
+                return Response(status=400)
+        elif hub is None:
             return Response(status=400)
         data = dict(request.query)
         hass.bus.async_fire(
@@ -59,6 +91,9 @@ class MegaView(HomeAssistantView):
         )
         _LOGGER.debug(f"Request: %s from '%s'", data, request.remote)
         make_ints(data)
+        if data.get('st') == '1':
+            hass.async_create_task(self.later_restore(hub))
+            return Response(status=200)
         port = data.get('pt')
         data = data.copy()
         update_all = True
@@ -66,24 +101,72 @@ class MegaView(HomeAssistantView):
             update_all = False
             data['value'] = data.pop('v')
         data['mega_id'] = hub.id
-        ret = 'd'
+        ret = 'd' if hub.force_d else ''
         if port is not None:
-            hub.values[port] = data
+            if is_ext(data):
-            for cb in self.callbacks[hub.id][port]:
+                # ret = ''  # пока ответ всегда пустой, неясно какая будет реакция на непустой ответ
-                cb(data)
+                if port in hub.extenders:
-            template: Template = self.templates.get(hub.id, {}).get(port)
+                    pt_orig = port
+                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}, '
+                                   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'):
+                        idx = e[3:]
+                        pt = f'{pt_orig}e{idx}'
+                        _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}')
+                        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}')
+                        if ret == 'd' and act:
+                            await hub.request(cmd=act.replace(':3', f':{v}'))
+                        ret = 'd' if hub.force_d else ''
+            else:
+                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)
+                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))
-            if template is not None:
-                template.hass = hass
-                ret = template.async_render(data)
         _LOGGER.debug('response %s', ret)
-        ret = Response(body='', content_type='text/plain', headers={'Server': 's', 'Date': 'n'})
+        Response(body='' if hub.fake_response else ret, content_type='text/plain')
-        await hub.request(cmd=ret)
+
+        if hub.fake_response and 'value' not in data and 'pt' in data:
+            if 'd' in ret:
+                await hub.request(pt=port, cmd=ret)
+            else:
+                await hub.request(cmd=ret)
         return ret
 
-    async def later_update(self, hub):
+    async def later_restore(self, hub):
-        _LOGGER.debug('force update')
+        """
-        await asyncio.sleep(1)
+        Восстановление всех выходов с небольшой задержкой. Задержка нужна чтобы ответ прошел успешно
-        await hub.updater.async_refresh()
 
+        :param hub:
+        :return:
+        """
+        await asyncio.sleep(0.2)
+        if hub.restore_on_restart:
+            await hub.restore_states()
+        await hub.reload()
+
+    async def later_update(self, hub):
+        await asyncio.sleep(1)
+        _LOGGER.debug('force update')
+        await hub.updater.async_refresh()

custom_components/mega/hub.py

@@ -10,20 +10,24 @@ import json
 
 from bs4 import BeautifulSoup
 from homeassistant.components import mqtt
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_PRESSURE,
     DEVICE_CLASS_ILLUMINANCE, TEMP_CELSIUS, PERCENTAGE, LIGHT_LUX
 )
 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 .const import (
     TEMP, HUM, PRESS,
     LUX, PATT_SPLIT, DOMAIN,
-    CONF_HTTP, EVENT_BINARY_SENSOR, CONF_CUSTOM, CONF_FORCE_D
+    CONF_HTTP, EVENT_BINARY_SENSOR, CONF_CUSTOM, CONF_FORCE_D, CONF_DEF_RESPONSE, PATT_FW, CONF_FORCE_I2C_SCAN,
+    REMOVE_CONFIG
 )
-from .entities import set_events_off, BaseMegaEntity
+from .entities import set_events_off, BaseMegaEntity, MegaOutPort
 from .exceptions import CannotConnect, NoPort
-from .tools import make_ints
+from .i2c import parse_scan_page
+from .tools import make_ints, int_ignore, PriorityLock
 
 TEMP_PATT = re.compile(r'temp:([01234567890\.]+)')
 HUM_PATT = re.compile(r'hum:([01234567890\.]+)')
@@ -67,26 +71,50 @@ class MegaD:
             mqtt: mqtt.MQTT,
             lg: logging.Logger,
             id: str,
+            config: ConfigEntry = None,
             mqtt_inputs: bool = True,
             mqtt_id: str = None,
             scan_interval=60,
             port_to_scan=0,
             nports=38,
-            inverted: typing.List[int] = None,
+            update_all: bool=True,
-            update_all=True,
+            poll_outs: bool=False,
-            poll_outs=False,
+            fake_response: bool=True,
+            force_d: bool=None,
+            allow_hosts: str=None,
+            protected=True,
+            restore_on_restart=False,
+            extenders=None,
+            ext_in=None,
+            ext_acts=None,
+            i2c_sensors=None,
+            new_naming=False,
+            update_time=False,
             **kwargs,
     ):
         """Initialize."""
+        self.config = config
         if mqtt_inputs is None or mqtt_inputs == 'None' or mqtt_inputs is False:
             self.http = hass.data.get(DOMAIN, {}).get(CONF_HTTP)
             if not self.http is None:
                 self.http.allowed_hosts |= {host}
+                self.http.hubs[host] = self
+                if len(self.http.hubs) == 1:
+                    self.http.hubs['__def'] = self
+                if mqtt_id:
+                    self.http.hubs[mqtt_id] = self
         else:
             self.http = None
+        self.new_naming = new_naming
+        self.extenders = extenders or []
+        self.ext_in = ext_in or {}
+        self.ext_act = ext_acts or {}
+        self.i2c_sensors = i2c_sensors or []
+        self._update_time = update_time
         self.poll_outs = poll_outs
         self.update_all = update_all if update_all is not None else True
         self.nports = nports
+        self.fake_response = fake_response
         self.mqtt_inputs = mqtt_inputs
         self.loop: asyncio.AbstractEventLoop = None
         self.hass = hass
@@ -96,7 +124,7 @@ class MegaD:
         self.id = id
         self.lck = asyncio.Lock()
         self.last_long = {}
-        self._http_lck = asyncio.Lock()
+        self._http_lck = PriorityLock()
         self._notif_lck = asyncio.Lock()
         self.cnd = asyncio.Condition()
         self.online = True
@@ -117,16 +145,29 @@ class MegaD:
         self.updater = DataUpdateCoordinator(
             hass,
             self.lg,
-            name="sensors",
+            name="megad",
             update_method=self.poll,
             update_interval=timedelta(seconds=self.poll_interval) if self.poll_interval else None,
         )
+        self.updaters = []
+        self.fw = ''
         self.notifiers = defaultdict(asyncio.Condition)
         if not mqtt_id:
             _id = host.split(".")[-1]
             self.mqtt_id = f"megad/{_id}"
         else:
             self.mqtt_id = mqtt_id
+        self.restore_on_restart = restore_on_restart
+        if force_d is not None:
+            self.customize[CONF_FORCE_D] = force_d
+        try:
+            if allow_hosts is not None:
+                allow_hosts = set(allow_hosts.split(';'))
+                hass.data[DOMAIN][CONF_HTTP].allowed_hosts |= allow_hosts
+            hass.data[DOMAIN][CONF_HTTP].protected = protected
+
+        except Exception:
+            self.lg.exception('while setting allowed hosts')
 
     async def start(self):
         self.loop = asyncio.get_event_loop()
@@ -171,6 +212,10 @@ class MegaD:
     def force_d(self):
         return self.customize.get(CONF_FORCE_D, False)
 
+    @property
+    def def_response(self):
+        return self.customize.get(CONF_DEF_RESPONSE, None)
+
     @property
     def is_online(self):
         return (datetime.now() - self.last_update).total_seconds() < (self.poll_interval + 10)
@@ -211,6 +256,20 @@ class MegaD:
         Polling ports
         """
         self.lg.debug('poll')
+        if self._update_time:
+            await self.update_time()
+        for x in self.i2c_sensors:
+            if not isinstance(x, dict):
+                continue
+            ret = await self._update_i2c(x)
+            if isinstance(ret, dict):
+                self.values.update(ret)
+        for x in self.extenders:
+            ret = await self._update_extender(x)
+            if not isinstance(ret, dict):
+                self.lg.warning(f'wrong updater result: {ret} from extender {x}')
+                continue
+            self.values.update(ret)
         if self.mqtt is None:
             await self.get_all_ports()
             await self.get_sensors(only_list=True)
@@ -218,8 +277,8 @@ class MegaD:
             await self.get_all_ports(check_skip=True)
         elif len(self.sensors) > 0:
             await self.get_sensors()
-        else:
+        # else:
-            await self.get_port(self.port_to_scan)
+        #     await self.get_port(self.port_to_scan)
         await self._get_ds2413()
         return self.values
 
@@ -234,14 +293,20 @@ class MegaD:
                 _id = _id['value']
             return _id or 'megad/' + self.host.split('.')[-1]
 
+    async def get_fw(self):
+        data = await self.request()
+        return PATT_FW.search(data).groups()[0]
+
     async def send_command(self, port=None, cmd=None):
         return await self.request(pt=port, cmd=cmd)
 
-    async def request(self, **kwargs):
+    async def request(self, priority=0, **kwargs):
         cmd = '&'.join([f'{k}={v}' for k, v in kwargs.items() if v is not None])
-        url = f"http://{self.host}/{self.sec}/?{cmd}"
+        url = f"http://{self.host}/{self.sec}"
+        if cmd:
+            url = f"{url}/?{cmd}"
         self.lg.debug('request: %s', url)
-        async with self._http_lck:
+        async with self._http_lck(priority):
             async with aiohttp.request("get", url=url) as req:
                 if req.status != 200:
                     self.lg.warning('%s returned %s (%s)', url, req.status, await req.text())
@@ -254,13 +319,18 @@ class MegaD:
     async def save(self):
         await self.send_command(cmd='s')
 
-    def parse_response(self, ret):
+    def parse_response(self, ret, cmd='get'):
         if ret is None:
             raise NoPort()
         if 'busy' in ret:
             return None
         if ':' in ret:
-            ret = ret.split(';')
+            if ';' in ret:
+                ret = ret.split(';')
+            elif '/' in ret and not cmd == 'list':
+                ret = ret.split('/')
+            else:
+                ret = [ret]
             ret = {'value': dict([
                 x.split(':') for x in ret if x.count(':') == 1
             ])}
@@ -282,7 +352,7 @@ class MegaD:
             if http_cmd == 'list' and conv:
                 await self.request(pt=port, cmd='conv')
                 await asyncio.sleep(1)
-            ret = self.parse_response(await self.request(pt=port, cmd=http_cmd))
+            ret = self.parse_response(await self.request(pt=port, cmd=http_cmd), cmd=http_cmd)
             ntry = 0
             while http_cmd == 'list' and ret is None and ntry < 3:
                 await asyncio.sleep(1)
@@ -347,7 +417,7 @@ class MegaD:
         if port == 'cmd':
             return
         try:
-            port = int(port)
+            port = int_ignore(port)
         except:
             self.lg.warning('can not process %s', msg)
             return
@@ -376,7 +446,7 @@ class MegaD:
             asyncio.run_coroutine_threadsafe(self._notify(port, value), self.loop)
 
     def subscribe(self, port, callback):
-        port = int(port)
+        port = int_ignore(port)
         self.lg.debug(
             f'subscribe %s %s', port, callback
         )
@@ -402,61 +472,63 @@ class MegaD:
             return await req.text()
 
     async def scan_port(self, port):
-        async with self.lck:
+        data = await self.request(pt=port)
-            if port in self._scanned:
+        return parse_config(data)
-                return self._scanned[port]
-            url = f'http://{self.host}/{self.sec}/?pt={port}'
-            self.lg.debug(
-                f'scan port %s: %s', port, url
-            )
-            async with aiohttp.request('get', url) as req:
-                html = await req.text()
-                if req.status != 200:
-                    return
-            tree = BeautifulSoup(html, features="lxml")
-            pty = tree.find('select', attrs={'name': 'pty'})
-            if pty is None:
-                return
-            else:
-                pty = pty.find(selected=True)
-                if pty:
-                    pty = pty['value']
-                else:
-                    return
-            if pty in ['0', '1']:
-                m = tree.find('select', attrs={'name': 'm'})
-                if m:
-                    m = m.find(selected=True)['value']
-                self._scanned[port] = (pty, m)
-                return pty, m
-            elif pty == '3':
-                m = tree.find('select', attrs={'name': 'd'})
-                if m:
-                    m = m.find(selected=True)['value']
-                self._scanned[port] = (pty, m)
-                return pty, m
-            elif pty in ('2', '4'):  # эта часть не очень проработана, тут есть i2c который может работать неправильно
-                m = tree.find('select', attrs={'name': 'd'})
-                if m:
-                    m = m.find(selected=True)['value']
-                self._scanned[port] = (pty, m or '0')
-                return pty, m or '0'
 
     async def scan_ports(self, nports=37):
         for x in range(0, nports+1):
             ret = await self.scan_port(x)
             if ret:
-                yield [x, *ret]
+                yield x, ret
         self.nports = nports+1
 
+    async def _update_extender(self, port):
+        """
+        Обновление mcp230, так же подходит для PCA9685
+        :param port:
+        :return:
+        """
+        values = await self.request(pt=port, cmd='get')
+        ret = {}
+        for i, x in enumerate(values.split(';')):
+            ret[f'{port}e{i}'] = x
+        return ret
+
+    async def _update_i2c(self, params):
+        """
+        Обновление портов i2c
+        :param params: параметры url
+        :return:
+        """
+        _params = tuple(params.items())
+        delay = None
+        if 'delay' in params:
+            delay = params.pop('delay')
+        ret = {
+            _params: await self.request(**params)
+        }
+        self.lg.debug('i2c response: %s', ret)
+        if delay:
+            self.lg.debug('delay %s', delay)
+            await asyncio.sleep(delay)
+        return ret
+
     async def get_config(self, nports=37):
         ret = defaultdict(lambda: defaultdict(list))
-        async for port, pty, m in self.scan_ports(nports):
+        ret['mqtt_id'] = await self.get_mqtt_id()
-            if pty == "0":
+        ret['extenders'] = extenders = []
+        ret['ext_in'] = ext_int = {}
+        ret['ext_acts'] = ext_acts = {}
+        ret['i2c_sensors'] = i2c_sensors = []
+        async for port, cfg in self.scan_ports(nports):
+            _cust = self.customize.get(port)
+            if not isinstance(_cust, dict):
+                _cust = {}
+            if cfg.pty == "0":
                 ret['binary_sensor'][port].append({})
-            elif pty == "1" and (m in ['0', '1', '3'] or m is None):
+            elif cfg.pty == "1" and (cfg.m in ['0', '1', '3'] or cfg.m is None):
-                ret['light'][port].append({'dimmer': m == '1'})
+                ret['light'][port].append({'dimmer': cfg.m == '1'})
-            elif pty == "1" and m == "2":
+            elif cfg == DS2413:
                 # ds2413
                 _data = await self.get_port(port=port, force_http=True, http_cmd='list', conv=False)
                 data = _data.get('value', {})
@@ -468,16 +540,53 @@ class MegaD:
                         {"index": 0, "addr": addr, "id_suffix": f'{addr}_a', "http_cmd": 'ds2413'},
                         {"index": 1, "addr": addr, "id_suffix": f'{addr}_b', "http_cmd": 'ds2413'},
                     ])
-            elif pty in ('3', '2', '4'):
+            elif cfg == MCP230:
-                try:
+                extenders.append(port)
-                    http_cmd = 'get'
+                if cfg.inta:
+                    ext_int[int_ignore(cfg.inta)] = port
+                values = await self.request(pt=port, cmd='get')
+                values = values.split(';')
+                for n in range(len(values)):
+                    ext_page = await self.request(pt=port, ext=n)
+                    ext_cfg = parse_config(ext_page)
+                    pt = f'{port}e{n}' if not self.new_naming else f'{port:02}e{n:02}'
+                    if ext_cfg.ety == '1':
+                        ret['light'][pt].append({})
+                    elif ext_cfg.ety == '0':
+                        if ext_cfg.eact:
+                            ext_acts[pt] = ext_cfg.eact
+                        ret['binary_sensor'][pt].append({})
+            elif cfg == PCA9685:
+                extenders.append(port)
+                values = await self.request(pt=port, cmd='get')
+                values = values.split(';')
+                for n in range(len(values)):
+                    pt = f'{port}e{n}' if not self.new_naming else f'{port:02}e{n:02}'
+                    ret['light'][pt].append({'dimmer': True, 'dimmer_scale': 16})
+            elif cfg.pty == '4' and (cfg.gr == '0' or _cust.get(CONF_FORCE_I2C_SCAN)):
+                # i2c в режиме ANY
+                scan = cfg.src.find('a', text='I2C Scan')
+                self.lg.debug(f'find scan link: %s', scan)
+                if scan is not None:
+                    page = await self.request(pt=port, cmd='scan')
+                    req, parsed = parse_scan_page(page)
+                    self.lg.debug(f'scan results: %s', (req, parsed))
+                    ret['i2c'][port].extend(parsed)
+                    i2c_sensors.extend(req)
+            elif cfg.pty == '4' and cfg.m == '2':
+                # scl исключаем из сканирования
+                continue
+            elif cfg.pty in ('3', '2', '4'):
+                http_cmd = 'get'
+                if cfg.d == '5' and cfg.pty == '3':
+                    # 1-wire bus
+                    values = await self.get_port(port, force_http=True, http_cmd='list')
+                    http_cmd = 'list'
+                else:
                     values = await self.get_port(port, force_http=True)
                     if values is None or (isinstance(values, dict) and str(values.get('value')) in ('', 'None')):
                         values = await self.get_port(port, force_http=True, http_cmd='list')
                         http_cmd = 'list'
-                except asyncio.TimeoutError:
-                    self.lg.warning(f'timout on port {port}')
-                    continue
                 self.lg.debug(f'values: %s', values)
                 if values is None:
                     self.lg.warning(f'port {port} is of type sensor but response is None, skipping it')
@@ -487,8 +596,8 @@ class MegaD:
                 if isinstance(values, str) and TEMP_PATT.search(values):
                     values = {TEMP: values}
                 elif not isinstance(values, dict):
-                    if pty == '4' and m in I2C_DEVICE_TYPES:
+                    if cfg.pty == '4' and cfg.d in I2C_DEVICE_TYPES:
-                        values = {I2C_DEVICE_TYPES[m]: values}
+                        values = {I2C_DEVICE_TYPES.get(cfg.m): values}
                     else:
                         values = {None: values}
                 for key in values:
@@ -502,4 +611,27 @@ class MegaD:
                     ))
         return ret
 
+    async def restore_states(self):
+        for x in self.entities:
+            if isinstance(x, MegaOutPort):
+                if x.is_on:
+                    await x.async_turn_on(brightness=x.brightness)
+                else:
+                    await x.async_turn_off()
 
+    async def update_time(self):
+        await self.request(
+            cf=7,
+            stime=datetime.now().strftime('%H:%M:%S')
+        )
+
+    async def reload(self, reload_entry=True):
+        new = await self.get_config(nports=self.nports)
+        self.lg.debug(f'new config: %s', new)
+        cfg = dict(self.config.data)
+        for x in REMOVE_CONFIG:
+            cfg.pop(x, None)
+        cfg.update(new)
+        self.config.data = cfg
+        if reload_entry:
+            await self.hass.config_entries.async_reload(self.config.entry_id)

custom_components/mega/i2c.py

@@ -0,0 +1,118 @@
+from dataclasses import dataclass, field
+from urllib.parse import parse_qsl, urlparse
+from bs4 import BeautifulSoup
+from homeassistant.const import (
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_PRESSURE,
+)
+
+
+def parse_scan_page(page: str):
+    ret = []
+    req = []
+    page = BeautifulSoup(page, features="lxml")
+    for x in page.find_all('a'):
+        params = x.get('href')
+        if params is None:
+            continue
+        params = dict(parse_qsl(urlparse(params).query))
+        dev = params.get('i2c_dev')
+        if dev is None:
+            continue
+        classes = i2c_classes.get(dev, [])
+        for i, c in enumerate(classes):
+            if c is Skip:
+                continue
+            elif c is Request:
+                req.append(params)
+                continue
+            elif isinstance(c, Request):
+                if c.delay:
+                    params = params.copy()
+                    params['delay'] = c.delay
+                req.append(params)
+                continue
+            elif isinstance(c, tuple):
+                suffix, c = c
+            elif isinstance(c, str):
+                suffix = c
+            else:
+                suffix = ''
+            if 'addr' in params:
+                suffix += f"_{params['addr']}" if suffix else str(params['addr'])
+            if suffix:
+                _dev = f'{dev}_{suffix}'
+            else:
+                _dev = dev
+            params = params.copy()
+            if i > 0:
+                params['i2c_par'] = i
+            ret.append({
+                'id_suffix': _dev,
+                'device_class': c,
+                'params': params,
+            })
+            req.append(params)
+    return req, ret
+
+
+class Skip:
+    pass
+
+
+@dataclass
+class Request:
+    delay: float = None
+
+
+i2c_classes = {
+    'htu21d': [
+        DEVICE_CLASS_HUMIDITY,
+        DEVICE_CLASS_TEMPERATURE,
+    ],
+    'sht31': [
+        DEVICE_CLASS_HUMIDITY,
+        DEVICE_CLASS_TEMPERATURE,
+    ],
+    'max44009': [
+        DEVICE_CLASS_ILLUMINANCE
+    ],
+    'bh1750': [
+        DEVICE_CLASS_ILLUMINANCE
+    ],
+    'tsl2591': [
+        DEVICE_CLASS_ILLUMINANCE
+    ],
+    'bmp180': [
+        DEVICE_CLASS_PRESSURE,
+        DEVICE_CLASS_TEMPERATURE,
+    ],
+    'bmx280': [
+        DEVICE_CLASS_PRESSURE,
+        DEVICE_CLASS_TEMPERATURE,
+        DEVICE_CLASS_HUMIDITY
+    ],
+    'mlx90614': [
+        Skip,
+        ('temp', DEVICE_CLASS_TEMPERATURE),
+        ('object', DEVICE_CLASS_TEMPERATURE),
+    ],
+    'ptsensor': [
+        Skip,
+        Request(delay=1),  # запрос на измерение
+        DEVICE_CLASS_PRESSURE,
+        DEVICE_CLASS_TEMPERATURE,
+    ],
+    'mcp9600': [
+        DEVICE_CLASS_TEMPERATURE,  # термопара
+        DEVICE_CLASS_TEMPERATURE,  # сенсор встроенный в микросхему
+    ],
+    't67xx': [
+        None  # для co2 нет класса в HA
+    ],
+    'tmp117': [
+        DEVICE_CLASS_TEMPERATURE,
+    ]
+}

custom_components/mega/light.py

@@ -26,6 +26,7 @@ from .const import (
     CONF_CUSTOM,
     CONF_SKIP,
 )
+from .tools import int_ignore
 
 lg = logging.getLogger(__name__)
 
@@ -61,13 +62,15 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
     devices = []
     customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {})
     for port, cfg in config_entry.data.get('light', {}).items():
-        port = int(port)
+        port = int_ignore(port)
         c = customize.get(mid, {}).get(port, {})
         if c.get(CONF_SKIP, False) 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)
             light = MegaLight(mega=hub, port=port, config_entry=config_entry, **data)
+            if '<' in light.name:
+                continue
             devices.append(light)
     async_add_devices(devices)
 

custom_components/mega/manifest.json

@@ -15,5 +15,5 @@
     "@andvikt"
   ],
   "issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
-  "version": "v0.4.1b7"
+  "version": "v0.6.3b1"
 }

custom_components/mega/sensor.py

@@ -1,6 +1,7 @@
 """Platform for light integration."""
 import logging
 import voluptuous as vol
+import struct
 
 from homeassistant.components.sensor import (
     PLATFORM_SCHEMA as SENSOR_SCHEMA,
@@ -13,15 +14,18 @@ from homeassistant.const import (
     CONF_PORT,
     CONF_UNIQUE_ID,
     CONF_ID,
-    CONF_TYPE, CONF_UNIT_OF_MEASUREMENT,
+    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
+from .const import CONF_KEY, TEMP, HUM, W1, W1BUS, CONF_CONV_TEMPLATE, CONF_HEX_TO_FLOAT
 from .hub import MegaD
 import re
 
+from .tools import int_ignore
+
 lg = logging.getLogger(__name__)
 TEMP_PATT = re.compile(r'temp:([01234567890\.]+)')
 HUM_PATT = re.compile(r'hum:([01234567890\.]+)')
@@ -80,21 +84,54 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
     mid = config_entry.data[CONF_ID]
     hub: MegaD = hass.data['mega'][mid]
     devices = []
-    for port, cfg in config_entry.data.get('sensor', {}).items():
+    for tp in ['sensor', 'i2c']:
-        port = int(port)
+        for port, cfg in config_entry.data.get(tp, {}).items():
-        for data in cfg:
+            port = int_ignore(port)
-            hub.lg.debug(f'add sensor on port %s with data %s', port, data)
+            for data in cfg:
-            sensor = Mega1WSensor(
+                hub.lg.debug(f'add sensor on port %s with data %s', port, data)
-                mega=hub,
+                sensor = _constructors[tp](
-                port=port,
+                    mega=hub,
-                config_entry=config_entry,
+                    port=port,
-                **data,
+                    config_entry=config_entry,
-            )
+                    **data,
-            devices.append(sensor)
+                )
+                if '<' in sensor.name:
+                    continue
+                devices.append(sensor)
 
     async_add_devices(devices)
 
 
+class MegaI2C(MegaPushEntity):
+
+    def __init__(self, *args, device_class: str, params: dict, **kwargs):
+        self._device_class = device_class
+        self._params = tuple(params.items())
+        super().__init__(*args, **kwargs)
+
+    def device_class(self):
+        return self._device_class
+
+    @property
+    def state(self):
+        # self.lg.debug(f'get % all states: %', self._params, self.mega.values)
+        ret = self.mega.values.get(self._params)
+        if self.customize.get(CONF_HEX_TO_FLOAT):
+            try:
+                ret = struct.unpack('!f', bytes.fromhex('41973333'))[0]
+            except:
+                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))
+        if tmpl is not None and self.hass is not None:
+            tmpl.hass = self.hass
+            ret = tmpl.async_render({'value': ret})
+        return ret
+
+    @property
+    def device_class(self):
+        return self._device_class
+
+
 class Mega1WSensor(MegaPushEntity):
 
     def __init__(
@@ -139,7 +176,15 @@ class Mega1WSensor(MegaPushEntity):
 
     @property
     def device_class(self):
-        return self._device_class
+        _u = self.customize.get(CONF_DEVICE_CLASS, None)
+        if _u is None:
+            return self._device_class
+        elif isinstance(_u, str):
+            return _u
+        elif isinstance(_u, dict) and self.key in _u:
+            return _u[self.key]
+        else:
+            return self._device_class
 
     @property
     def state(self):
@@ -163,7 +208,12 @@ class Mega1WSensor(MegaPushEntity):
             ret = str(ret)
         except:
             ret = None
-        tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE)
+        if self.customize.get(CONF_HEX_TO_FLOAT):
+            try:
+                ret = struct.unpack('!f', bytes.fromhex(ret))[0]
+            except:
+                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))
         if tmpl is not None and self.hass is not None:
             tmpl.hass = self.hass
             ret = tmpl.async_render({'value': ret})
@@ -175,4 +225,10 @@ class Mega1WSensor(MegaPushEntity):
         c = self.customize.get(CONF_NAME, {})
         if isinstance(c, dict):
             c = c.get(self.key)
-        return c or n
+        return c or n
+
+
+_constructors = {
+    'sensor': Mega1WSensor,
+    'i2c': MegaI2C,
+}

custom_components/mega/strings.json

@@ -15,7 +15,14 @@
           "mqtt_inputs": "[%key:common::config_flow::data::mqtt_inputs%]",
           "nports": "[%key:common::config_flow::data::nports%]",
           "update_all": "[%key:common::config_flow::data::update_all%]",
-          "poll_outs": "[%key:common::config_flow::data::poll_outs%]"
+          "fake_response": "[%key:common::config_flow::data::fake_response%]",
+          "force_d": "[%key:common::config_flow::data::force_d%]",
+          "protected": "[%key:common::config_flow::data::protected%]",
+          "allow_hosts": "[%key:common::config_flow::data::allow_hosts%]",
+          "restore_on_restart": "[%key:common::config_flow::data::restore_on_restart%]",
+          "poll_outs": "[%key:common::config_flow::data::poll_outs%]",
+          "update_time": "[%key:common::config_flow::data::update_time%]"
+
         }
       }
     },

custom_components/mega/switch.py

@@ -18,6 +18,7 @@ from homeassistant.core import HomeAssistant
 from . import hub as h
 from .entities import MegaOutPort
 from .const import CONF_DIMMER, CONF_SWITCH, DOMAIN, CONF_CUSTOM, CONF_SKIP
+from .tools import int_ignore
 
 _LOGGER = lg = logging.getLogger(__name__)
 
@@ -50,13 +51,15 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
 
     customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {})
     for port, cfg in config_entry.data.get('light', {}).items():
-        port = int(port)
+        port = int_ignore(port)
         c = customize.get(mid, {}).get(port, {})
         if c.get(CONF_SKIP, False) or c.get(CONF_DOMAIN, 'light') != 'switch':
             continue
         for data in cfg:
             hub.lg.debug(f'add switch on port %s with data %s', port, data)
             light = MegaSwitch(mega=hub, port=port, config_entry=config_entry, **data)
+            if '<' in light.name:
+                continue
             devices.append(light)
     async_add_devices(devices)
 

custom_components/mega/tools.py

@@ -1,5 +1,12 @@
+import asyncio
+import itertools
+from heapq import heappush
+from contextlib import asynccontextmanager
+
+
 _params = ['m', 'click', 'cnt', 'pt']
 
+
 def make_ints(d: dict):
     for x in _params:
         try:
@@ -9,4 +16,102 @@ def make_ints(d: dict):
     if 'm' not in d:
         d['m'] = 0
     if 'click' not in d:
-        d['click'] = 0
+        d['click'] = 0
+
+
+def int_ignore(x):
+    try:
+        return int(x)
+    except (TypeError, ValueError):
+        return x
+
+
+class PriorityLock(asyncio.Lock):
+    """
+    You can acquire lock with some kind of priority in mind, so that locks with higher priority will be released first.
+    priority can be set with lck.acquire(1)
+    or by using context manager:
+    >>> lck = PriorityLock()
+    ... async with lck(1):
+    ...     # do something
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._cnt = itertools.count()
+
+    def __call__(self, priority=0):
+        return self._with_priority(priority)
+
+    @asynccontextmanager
+    async def _with_priority(self, p):
+        await self.acquire(p)
+        try:
+            yield
+        finally:
+            self.release()
+
+    async def acquire(self, priority=0) -> bool:
+        """Acquire a lock.
+
+                This method blocks until the lock is unlocked, then sets it to
+                locked and returns True.
+                """
+        if (not self._locked and (self._waiters is None or
+                                  all(w.cancelled() for _, _, w in self._waiters))):
+            self._locked = True
+            return True
+
+        if self._waiters is None:
+            self._waiters = []
+
+        fut = self._loop.create_future()
+        cnt = next(self._cnt)
+        heappush(self._waiters, (priority, cnt, fut))
+
+        # Finally block should be called before the CancelledError
+        # handling as we don't want CancelledError to call
+        # _wake_up_first() and attempt to wake up itself.
+        try:
+            try:
+                await fut
+            finally:
+                self._waiters.remove((priority, cnt, fut))
+        except asyncio.exceptions.CancelledError:
+            if not self._locked:
+                self._wake_up_first()
+            raise
+
+        self._locked = True
+        return True
+
+    def release(self):
+        """Release a lock.
+
+        When the lock is locked, reset it to unlocked, and return.
+        If any other coroutines are blocked waiting for the lock to become
+        unlocked, allow exactly one of them to proceed.
+
+        When invoked on an unlocked lock, a RuntimeError is raised.
+
+        There is no return value.
+        """
+        if self._locked:
+            self._locked = False
+            self._wake_up_first()
+        else:
+            raise RuntimeError('Lock is not acquired.')
+
+    def _wake_up_first(self):
+        """Wake up the first waiter if it isn't done."""
+        if not self._waiters:
+            return
+        try:
+            _, _, fut = self._waiters[0]
+        except IndexError:
+            return
+
+        # .done() necessarily means that a waiter will wake up later on and
+        # either take the lock, or, if it was cancelled and lock wasn't
+        # taken already, will hit this again and wake up a new waiter.
+        if not fut.done():
+            fut.set_result(True)

custom_components/mega/translations/en.json

@@ -22,8 +22,14 @@
                     "port_to_scan": "Port to poll aliveness (needed only if no sensors used)",
                     "nports": "Number of ports",
                     "update_all": "Update all outs when input",
-                    "mqtt_inputs": "Use MQTT",
+                    "mqtt_inputs": "Use MQTT (Deprecated)",
-                    "poll_outs": "Poll outs"
+                    "fake_response": "Fake response",
+                    "force_d": "Force 'd' response",
+                    "protected": "Protected",
+                    "allow_hosts": "Allowed hosts",
+                    "restore_on_restart": "Restore outs on restart",
+                    "poll_outs": "Poll outs",
+                    "update_time": "Sync time"
                 }
             }
         }
@@ -35,9 +41,15 @@
                   "scan_interval": "Scan interval (sec), 0 - don't update",
                   "port_to_scan": "Port to poll aliveness (needed only if no sensors used)",
                   "reload": "Reload objects",
-                  "mqtt_inputs": "Use MQTT",
+                  "mqtt_inputs": "Use MQTT (Deprecated)",
                   "update_all": "Update all outs when input",
-                  "poll_outs": "Poll outs"
+                  "fake_response": "Fake response",
+                  "force_d": "Force 'd' response",
+                  "protected": "Protected",
+                  "allow_hosts": "Allowed hosts",
+                  "restore_on_restart": "Restore outs on restart",
+                  "poll_outs": "Poll outs",
+                  "update_time": "Sync time"
                 }
             }
         }

custom_components/mega/translations/ru.json

@@ -19,10 +19,16 @@
                     "mqtt_id": "MQTT id",
                     "scan_interval": "Периодичность обновлений (сек.), 0 - не обновлять",
                     "port_to_scan": "Порт, который сканируется когда нет датчиков",
-                    "mqtt_inputs": "Использовать MQTT",
+                    "mqtt_inputs": "Использовать MQTT (Не рекомендуется)",
                     "nports": "Кол-во портов",
                     "update_all": "Обновить все выходы когда срабатывает вход",
-                    "poll_outs": "Обновлять выходы (регулярно)"
+                    "fake_response": "Имитация http-ответа",
+                    "force_d": "Ответ 'd' по умолчанию",
+                    "protected": "Блокировать неразрешенные соединения",
+                    "restore_on_restart": "Восстанавливать выходы при перезагрузке",
+                    "allow_hosts": "Разрешенные ip (через ;)",
+                    "poll_outs": "Обновлять выходы (регулярно)",
+                    "update_time": "Синхронизировать время"
                 }
             }
         }
@@ -35,10 +41,16 @@
                   "port_to_scan": "Порт, который сканируется когда нет датчиков",
                   "reload": "Обновить объекты",
                   "invert": "Список портов (через ,) с инвертированной логикой",
-                  "mqtt_inputs": "Использовать MQTT",
+                  "mqtt_inputs": "Использовать MQTT (Не рекомендуется)",
-                    "nports": "Кол-во портов",
+                  "fake_response": "Имитация http-ответа",
-                    "update_all": "Обновить все выходы когда срабатывает вход",
+                  "force_d": "Ответ 'd' по умолчанию",
-                    "poll_outs": "Обновлять выходы (регулярно)"
+                  "nports": "Кол-во портов",
+                  "update_all": "Обновить все выходы когда срабатывает вход",
+                  "protected": "Блокировать неразрешенные соединения",
+                  "allow_hosts": "Разрешенные ip (через ;)",
+                  "restore_on_restart": "Восстанавливать выходы при перезагрузке",
+                  "poll_outs": "Обновлять выходы (регулярно)",
+                  "update_time": "Синхронизировать время"
                 }
             }
         }

custom_components/mega/translations/uk.json

@@ -19,10 +19,16 @@
                     "mqtt_id": "MQTT id",
                     "scan_interval": "Період оновлення (сек.), 0 - не оновлювати",
                     "port_to_scan": "Порт для сканування при відсутності датчиків",
-                    "mqtt_inputs": "Використовувати MQTT",
+                    "mqtt_inputs": "Використовувати MQTT (Deprecated)",
                     "nports": "Кількість портів",
                     "update_all": "Оновити всі виходи коли спрацьовує вхід",
-                    "poll_outs": "Оновити виходи"
+                    "fake_response": "Імітація http-відповіді",
+                    "force_d": "Неявно відповідати 'd'",
+                    "protected": "Блокувати недозволені з'єднання",
+                    "allow_hosts": "Дозволені ip (через ;)",
+                    "restore_on_restart": "Відновлювати виходи при перезавантаженні",
+                    "poll_outs": "Оновити виходи",
+                    "update_time": "Осинхронізувати час"
                 }
             }
         }
@@ -31,13 +37,18 @@
         "step": {
             "init": {
                 "data": {
-                  "scan_interval": "Період оновлення (сек.)",
+                    "scan_interval": "Період оновлення (сек.)",
-                  "port_to_scan": "Порт для сканування при відсутності датчиків",
+                    "port_to_scan": "Порт для сканування при відсутності датчиків",
-                  "reload": "Оновити об'єкти",
+                    "reload": "Оновити об'єкти",
-                  "invert": "Список портів з інвертованою логікою (через ,)",
+                    "invert": "Список портів з інвертованою логікою (через ,)",
-                  "mqtt_inputs": "Використовувати MQTT",
+                    "mqtt_inputs": "Використовувати MQTT (Deprecated)",
-                  "nports": "Кількість портів",
+                    "nports": "Кількість портів",
-                  "update_all": "Оновити всі виходи коли спрацьовує вхід",
+                    "fake_response": "Імітація http-відповіді",
+                    "force_d": "Неявно відповідати 'd'",
+                    "update_all": "Оновити всі виходи коли спрацьовує вхід",
+                    "protected": "Блокувати недозволені з'єднання",
+                    "allow_hosts": "Дозволені ip (через ;)",
+                    "restore_on_restart": "Відновлювати виходи при перезавантаженні",
                     "poll_outs": "Оновити виходи"
                 }
             }

readme.md

@@ -12,18 +12,27 @@
 Обновление прошивки MegaD можно делать прямо из HA с помощью [аддона](https://github.com/andvikt/mega_addon.git)
 
 Подробная документация по [ссылке](https://github.com/andvikt/mega_hacs/wiki)
+
+Предложения по доработкам просьба писать в [discussions](https://github.com/andvikt/mega_hacs/discussions), о проблемах
+создавать [issue](https://github.com/andvikt/mega_hacs/issues/new/choose)
 ## Основные особенности:
-- Настройка в веб-интерфейсе + yaml
+- Настройка в веб-интерфейсе + [yaml](https://github.com/andvikt/mega_hacs/wiki/Кастомизация)
 - Все порты автоматически добавляются как устройства (для обычных релейных выходов создается 
   `light`, для шим - `light` с поддержкой яркости, для цифровых входов `binary_sensor`, для датчиков
   `sensor`)
 - Возможность работы с несколькими megad
-- Обратная связь по mqtt или http (на выбор)
+- Обратная связь по [http](https://github.com/andvikt/mega_hacs/wiki/http) или mqtt (`deprecated`, поддержка mqtt 
-- События на двойные/долгие нажатия
+  будет выключена в версиях >= 1.0.0, тк в нем нет необходимости)
+- Автоматическое восстановление состояний выходов после перезагрузки контроллера
+- Автоматическое добавление/изменение объектов после перезагрузки контроллера
+- [События](https://github.com/andvikt/mega_hacs/wiki/События) на двойные/долгие нажатия
 - Команды выполняются друг за другом без конкурентного доступа к ресурсам megad, это дает гарантии надежного исполнения
   большого кол-ва команд (например в сценах). Каждая следующая команда отправляется только после получения ответа о
   выполнении предыдущей.
-- поддержка ds2413 (начиная с версии 0.4.1)
+- поддержка [ds2413](https://www.ab-log.ru/smart-house/ethernet/megad-2w) (начиная с версии 0.4.1)
+- поддержка MCP23008/MCP23017/PCA9685 (начиная с версии 0.5.1)
+- поддержка всех возможных датчиков в режиме I2C-ANY, полный список поддерживаемых датчиков 
+  [по ссылке](https://github.com/andvikt/mega_hacs/wiki/i2c) (начиная с версии 0.6.1)
 
 ## Установка
 Рекомендованный способ с поддержкой обновлений - [HACS](https://hacs.xyz/docs/installation/installation):
@@ -49,7 +58,23 @@ wget -q -O - https://raw.githubusercontent.com/andvikt/mega_hacs/master/install.
 
 Все имеющиеся у вас порты будут настроены автоматически. Вы можете менять названия, иконки и entity_id так же из интерфейса.
 
+В самой меге необходимо прописать настройки:
+```yaml
+srv: "192.168.1.4:8123" # ip:port вашего HA
+script: "mega" # это api интеграции, к которому будет обращаться контроллер
+```
+Так же необходимо настроить Mega-ID в настройках контроллера, для каждой меги id должен быть разным.
+
+При любых изменениях настроек контроллера (типы входов, id и тд) необходимо в настройках интеграции нажать `Обновить 
+объекты`
+
 ## Зависимости
-Для совместимости c mqtt необходимо настроить интеграцию [mqtt](https://www.home-assistant.io/integrations/mqtt/) 
+Для максимальной скорости реакции на команды сервера, рекомендуется выключить `имитацию http-ответа` в 
-в HomeAssistant, а так же обновить ваш контроллер до последней версии, обновление прошивки MegaD можно делать прямо 
+настройках интеграции и настроить proxy_pass к HA, самый простой способ сделать это - воспользоваться 
+[специальным аддоном](https://github.com/andvikt/mega_addon/tree/master/mega-proxy)
+
+Обновить ваш контроллер до последней версии, обновление прошивки MegaD можно делать 
 из HA с помощью [аддона](https://github.com/andvikt/mega_addon.git)
+
+
+Подробная документация по [ссылке](https://github.com/andvikt/mega_hacs/wiki)