Bump version: 1.1.0b0 → 1.1.0b1

.bumpversion.cfg

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

.gitignore

@@ -1,18 +0,0 @@
-*sync-conflict*
-*.db
-*.log*
-*.yaml
-**/__pycache__
-test_*
-temp_*
-tr.py
-experiment_*
-example*
-.HA_VERSION
-.idea
-.storage
-site
-.DS_Store
-.venv
-pyproject.toml
-poetry.lock

custom_components/mega/__init__.py

@@ -1,14 +1,13 @@
 """The mega integration."""
 import asyncio
 import logging
-import typing
 from functools import partial
 
 import voluptuous as vol
 
 from homeassistant.const import (
     CONF_NAME, 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, CONF_UNIQUE_ID
 )
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers.service import bind_hass
@@ -17,9 +16,7 @@ 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_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
+    RGB_COMBINATIONS, CONF_WS28XX, CONF_ORDER, CONF_SMOOTH, CONF_LED, CONF_WHITE_SEP, CONF_CHIP, CONF_RANGE
 from .hub import MegaD
 from .config_flow import ConfigFlow
 from .http import MegaView
@@ -52,16 +49,15 @@ LED_LIGHT = \
         )
     }
 
+ENCODER = \
+    {
+        vol.Optional('int', description='int порт'): int,
+        vol.Required('scl', description='scl порт'): int,
+        vol.Optional('sync_to', description='entity_id с которым синхронизироваться'): str,
+    }
+
 CUSTOMIZE_PORT = {
     vol.Optional(CONF_SKIP, description='исключить порт из сканирования', default=False): bool,
-    vol.Optional(CONF_FILL_NA, default='last'): vol.Any(
-      'last',
-      'none'
-    ),
-    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
@@ -85,10 +81,6 @@ CUSTOMIZE_PORT = {
     vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
     vol.Optional(CONF_FORCE_I2C_SCAN): bool,
     vol.Optional(CONF_HEX_TO_FLOAT): bool,
-    vol.Optional(CONF_FILTER_VALUES): [vol.Coerce(float)],
-    vol.Optional(CONF_FILTER_SCALE): vol.Coerce(float),
-    vol.Optional(CONF_FILTER_LOW): vol.Coerce(float),
-    vol.Optional(CONF_FILTER_HIGH): vol.Coerce(float),
     vol.Optional(CONF_SMOOTH): cv.time_period_seconds,
     # vol.Optional(CONF_RANGE): vol.ExactSequence([int, int]), TODO: сделать отбрасывание "плохих" значений
     vol.Optional(str): {
@@ -109,21 +101,11 @@ def extender(x):
     else:
         raise ValueError('must has "e" in port name')
 
-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(str): vol.Any(
-                CUSTOMIZE_PORT,
-                CUSTOMIZE_DS2413
-            )},
             vol.Optional(vol.Any(str, int), description='id меги из веб-интерфейса'): {
                 vol.Optional(CONF_FORCE_D, description='Принудительно слать d после срабатывания входа', default=False): bool,
                 vol.Optional(
@@ -136,12 +118,8 @@ CONFIG_SCHEMA = vol.Schema(
                     CUSTOMIZE_PORT,
                     CUSTOMIZE_DS2413,
                 ),
-                vol.Optional(CONF_FILTER_VALUES): [vol.Coerce(float)],
-                vol.Optional(CONF_FILTER_SCALE): vol.Coerce(float),
-                vol.Optional(CONF_FILTER_LOW): vol.Coerce(float),
-                vol.Optional(CONF_FILTER_HIGH): vol.Coerce(float),
-            },
-            vol.Optional(CONF_1WBUS): [OWBUS]
+                vol.Optional('encoders'): {str: ENCODER}
+            }
         }
     },
     extra=vol.ALLOW_EXTRA,
@@ -240,7 +218,7 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     id = entry.data.get('id', entry.entry_id)
     hub: MegaD = hass.data[DOMAIN].get(id)
     if hub is None:
-        return True
+        return
     _LOGGER.debug(f'remove {id}')
     _hubs.pop(id, None)
     hass.data[DOMAIN].pop(id, None)
@@ -251,7 +229,7 @@ async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
     if task is not None:
         task.cancel()
     if hub is None:
-        return True
+        return
     await hub.stop()
     return True
 

custom_components/mega/binary_sensor.py

@@ -67,7 +67,6 @@ class MegaBinarySensor(BinarySensorEntity, MegaPushEntity):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.mega.binary_sensors.append(self.port)
         self._is_on = None
         self._attrs = None
         self._click_task = None

custom_components/mega/config_flow.py

@@ -63,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 = 26
+    VERSION = 24
     CONNECTION_CLASS = config_entries.CONN_CLASS_ASSUMED
 
     async def async_step_user(self, user_input=None):

custom_components/mega/const.py

@@ -45,13 +45,6 @@ CONF_SMOOTH = 'smooth'
 CONF_WHITE_SEP = 'white_sep'
 CONF_CHIP = 'chip'
 CONF_RANGE = 'range'
-CONF_FILL_NA = 'fill_na'
-CONF_FILTER_VALUES = 'filter_values'
-CONF_FILTER_SCALE = 'filter_scale'
-CONF_FILTER_LOW = 'filter_low'
-CONF_FILTER_HIGH = 'filter_high'
-CONF_1WBUS = '1wbus'
-CONF_ADDR = 'addr'
 PLATFORMS = [
     "light",
     "switch",

custom_components/mega/entities.py

@@ -8,12 +8,11 @@ from functools import partial
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME
 from homeassistant.core import State
-from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.helpers.restore_state import RestoreEntity
 from . import hub as h
 from .const import DOMAIN, CONF_CUSTOM, CONF_INVERT, EVENT_BINARY_SENSOR, LONG, \
-    LONG_RELEASE, RELEASE, PRESS, SINGLE_CLICK, DOUBLE_CLICK, EVENT_BINARY, CONF_SMOOTH, CONF_RANGE
+    LONG_RELEASE, RELEASE, PRESS, SINGLE_CLICK, DOUBLE_CLICK, EVENT_BINARY, CONF_SMOOTH
 
 _events_on = False
 _LOGGER = logging.getLogger(__name__)
@@ -55,6 +54,7 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
             smooth=None,
             **kwargs,
     ):
+        super().__init__(mega.updater)
         self._smooth = smooth
         self.http_cmd = http_cmd
         self._state: State = None
@@ -85,7 +85,6 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
         self._can_smooth_hard = None
         if self.http_cmd == 'ds2413':
             self.mega.ds2413_ports |= {self.port}
-        super().__init__(coordinator=mega.updater)
 
     @property
     def is_ws(self):
@@ -127,23 +126,21 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
     def customize(self):
         if self._customize is not None:
             return self._customize
-        if self.hass is None or self.entity_id is None:
+        if self.hass is None:
             return {}
         if self._customize is None:
-            c_entity_id = self.hass.data.get(DOMAIN, {}).get(CONF_CUSTOM).get('entities', {}).get(self.entity_id, {})
             c = 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'
                 c = c.get(idx, {})
-            c.update(c_entity_id)
             self._customize = c
 
         return self._customize
 
     @property
-    def device_info(self) -> DeviceInfo:
+    def device_info(self):
         if isinstance(self.port, list):
             pt_idx = self.id_suffix
         else:
@@ -152,20 +149,26 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
                 pt_idx, _ = _pt.split('e')
             else:
                 pt_idx = _pt
-        return DeviceInfo(
-            identifiers={
+        return {
+            "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',
-            sw_version=self.mega.fw,
-            via_device=(DOMAIN, self._mega_id),
-        )
+            "config_entries": [
+                self.config_entry,
+            ],
+            "name": f'{self._mega_id} port {pt_idx}' if not isinstance(self.port, list) else f'{self._mega_id} {pt_idx}',
+            "manufacturer": 'ab-log.ru',
+            # "model": self.light.productname,
+            "sw_version": self.mega.fw,
+            "via_device": (DOMAIN, self._mega_id),
+        }
 
     @property
     def lg(self) -> logging.Logger:
-        return _LOGGER
+        if self._lg is None:
+            self._lg = self.mega.lg.getChild(self._name or self.unique_id)
+        return self._lg
 
     @property
     def available(self) -> bool:
@@ -298,43 +301,35 @@ class MegaOutPort(MegaPushEntity):
         else:
             return 255
 
-    @property
-    def range(self) -> typing.List[int]:
-        return self.customize.get(CONF_RANGE, [0, 255])
-
     @property
     def invert(self):
         return self.customize.get(CONF_INVERT, False)
 
     @property
     def brightness(self):
-        ret = None
         if not self.dimmer:
             return
         val = self.mega.values.get(self.port, {})
         if isinstance(val, dict) and len(val) == 0 and self._state is not None:
-            ret = safe_int(self._state.attributes.get("brightness"), def_on=self.max_dim, def_off=0, def_val=0)
-            ret = self._calc_brightness(ret)
+            return self._state.attributes.get("brightness")
         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)
+                val = safe_int(val)
             else:
                 val = 0
             if val == 0:
-                ret = self._brightness
+                return self._brightness
             elif isinstance(val, (int, float)):
-                ret = int(val / self.dimmer_scale)
+                return int(val / self.dimmer_scale)
         elif val is not None:
             val = val.get("value")
             if val is None:
                 return
             try:
                 val = int(val)
-                ret = val
+                return val
             except Exception:
                 pass
-        ret = self._cal_reverse_brightness(ret)
-        return ret
 
     @property
     def is_on(self) -> bool:
@@ -420,28 +415,6 @@ class MegaOutPort(MegaPushEntity):
             updater=partial(self.update_from_smooth, update_state=update_state),
         ))
 
-    def _calc_brightness(self, brightness):
-        if brightness is None:
-            brightness = 0
-        pct = brightness / 255
-        pct = max((0, pct))
-        pct = min((pct, 1))
-        l, h = self.range
-        d = h - l
-        brightness = round(pct * d + l)
-        return brightness
-
-    def _cal_reverse_brightness(self, brightness):
-        if brightness is None:
-            brightness = 0
-        l, h = self.range
-        d = h - l
-        pct = (brightness - l) / d
-        pct = max((0, pct))
-        pct = min((pct, 1))
-        brightness = round(pct * 255)
-        return brightness
-
     async def async_turn_on(self, brightness=None, transition=None, **kwargs):
         if (time.time() - self._last_called) < 0.1:
             return
@@ -451,7 +424,6 @@ class MegaOutPort(MegaPushEntity):
         if not self.is_on and (brightness is None or brightness == 0):
             brightness = self._restore_brightness
         brightness = brightness or self.brightness or 255
-        brightness = self._calc_brightness(brightness)
         _prev = safe_int(self.brightness) or 0
         self._brightness = brightness
         if self.dimmer and brightness == 0:
@@ -495,7 +467,7 @@ class MegaOutPort(MegaPushEntity):
         if (time.time() - self._last_called) < 0.1:
             return
         self._last_called = time.time()
-        self._restore_brightness = self._cal_reverse_brightness(safe_int(self._brightness))
+        self._restore_brightness = safe_int(self._brightness)
         if not self.dimmer:
             transition = None
         cmd = "0" if not self.invert else "1"
@@ -531,12 +503,12 @@ class MegaOutPort(MegaPushEntity):
 
 
 
-def safe_int(v, def_on=1, def_off=0, def_val=None):
+def safe_int(v):
     if v == 'ON':
-        return def_on
+        return 1
     elif v == 'OFF':
-        return def_off
+        return 0
     try:
         return int(v)
     except (ValueError, TypeError):
-        return def_val
+        return None

custom_components/mega/http.py

@@ -135,7 +135,6 @@ class MegaView(HomeAssistantView):
                             await hub.request(cmd=act.replace(':3', f':{v}'))
                         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)
@@ -148,7 +147,7 @@ class MegaView(HomeAssistantView):
         _LOGGER.debug('response %s', ret)
         Response(body='' if hub.fake_response else ret, content_type='text/plain')
 
-        if hub.fake_response and 'value' not in data and 'pt' in data and port in hub.binary_sensors:
+        if hub.fake_response and 'value' not in data and 'pt' in data:
             if 'd' in ret:
                 await hub.request(pt=port, cmd=ret)
             else:

custom_components/mega/hub.py

@@ -9,50 +9,51 @@ import re
 import json
 
 from bs4 import BeautifulSoup
-
-from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import TEMP_CELSIUS, PERCENTAGE, LIGHT_LUX
+from homeassistant.const import (
+    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_DEF_RESPONSE,
-    PATT_FW,
-    CONF_FORCE_I2C_SCAN,
-    REMOVE_CONFIG,
+    TEMP, HUM, PRESS,
+    LUX, PATT_SPLIT, DOMAIN,
+    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, MegaOutPort, safe_int
 from .exceptions import CannotConnect, NoPort
 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\.]+)")
-PRESS_PATT = re.compile(r"press:([01234567890\.]+)")
-LUX_PATT = re.compile(r"lux:([01234567890\.]+)")
-PATTERNS = {TEMP: TEMP_PATT, HUM: HUM_PATT, PRESS: PRESS_PATT, LUX: LUX_PATT}
-UNITS = {TEMP: TEMP_CELSIUS, HUM: PERCENTAGE, PRESS: "mmHg", LUX: LIGHT_LUX}
+TEMP_PATT = re.compile(r'temp:([01234567890\.]+)')
+HUM_PATT = re.compile(r'hum:([01234567890\.]+)')
+PRESS_PATT = re.compile(r'press:([01234567890\.]+)')
+LUX_PATT = re.compile(r'lux:([01234567890\.]+)')
+PATTERNS = {
+    TEMP: TEMP_PATT,
+    HUM: HUM_PATT,
+    PRESS: PRESS_PATT,
+    LUX: LUX_PATT
+}
+UNITS = {
+    TEMP: TEMP_CELSIUS, 
+    HUM: PERCENTAGE,
+    PRESS: 'mmHg',
+    LUX: LIGHT_LUX
+}
 CLASSES = {
-    TEMP: SensorDeviceClass.TEMPERATURE,
-    HUM: SensorDeviceClass.HUMIDITY,
-    PRESS: SensorDeviceClass.PRESSURE,
-    LUX: SensorDeviceClass.ILLUMINANCE,
+    TEMP: DEVICE_CLASS_TEMPERATURE,
+    HUM: DEVICE_CLASS_HUMIDITY,
+    PRESS: DEVICE_CLASS_PRESSURE,
+    LUX: DEVICE_CLASS_ILLUMINANCE
 }
 I2C_DEVICE_TYPES = {
-    "2": LUX,  # BH1750
-    "3": LUX,  # TSL2591
-    "7": LUX,  # MAX44009
+    "2":  LUX,  # BH1750
+    "3":  LUX,  # TSL2591
+    "7":  LUX,  # MAX44009
     "70": LUX,  # OPT3001
 }
 
@@ -61,45 +62,45 @@ class MegaD:
     """MegaD Hub"""
 
     def __init__(
-        self,
-        hass: HomeAssistant,
-        loop: asyncio.AbstractEventLoop,
-        host: str,
-        password: str,
-        lg: logging.Logger,
-        id: str,
-        config: ConfigEntry = None,
-        mqtt_id: str = None,
-        scan_interval=60,
-        port_to_scan=0,
-        nports=38,
-        update_all: bool = True,
-        poll_outs: bool = 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,
-        smooth: list = None,
-        **kwargs,
+            self,
+            hass: HomeAssistant,
+            loop: asyncio.AbstractEventLoop,
+            host: str,
+            password: str,
+            lg: logging.Logger,
+            id: str,
+            config: ConfigEntry = None,
+            mqtt_id: str = None,
+            scan_interval=60,
+            port_to_scan=0,
+            nports=38,
+            update_all: bool=True,
+            poll_outs: bool=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,
+            smooth: list=None,
+            **kwargs,
     ):
         """Initialize."""
         self.skip_ports = set()
         if config is not None:
-            lg.debug(f"load config: %s", config.data)
+            lg.debug(f'load config: %s', config.data)
         self.config = config
         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
+                self.http.hubs['__def'] = self
             if mqtt_id:
                 self.http.hubs[mqtt_id] = self
         self.smooth = smooth or []
@@ -133,9 +134,7 @@ class MegaD:
         self.sensors = []
         self.port_to_scan = port_to_scan
         self.last_update = datetime.now()
-        self._callbacks: typing.DefaultDict[
-            int, typing.List[typing.Callable[[dict], typing.Coroutine]]
-        ] = defaultdict(list)
+        self._callbacks: typing.DefaultDict[int, typing.List[typing.Callable[[dict], typing.Coroutine]]] = defaultdict(list)
         self._loop = loop
         self._customize = None
         self.values = {}
@@ -145,12 +144,10 @@ class MegaD:
             self.lg,
             name="megad",
             update_method=self.poll,
-            update_interval=timedelta(seconds=self.poll_interval)
-            if self.poll_interval
-            else None,
+            update_interval=timedelta(seconds=self.poll_interval) if self.poll_interval else None,
         )
         self.updaters = []
-        self.fw = ""
+        self.fw = ''
         self.notifiers = defaultdict(asyncio.Condition)
         if not mqtt_id:
             _id = host.split(".")[-1]
@@ -162,12 +159,11 @@ class MegaD:
             self.customize[CONF_FORCE_D] = force_d
         try:
             if allow_hosts is not None and DOMAIN in hass.data:
-                allow_hosts = set(allow_hosts.split(";"))
+                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")
-        self.binary_sensors = []
+            self.lg.exception('while setting allowed hosts')
 
     async def start(self):
         pass
@@ -186,7 +182,7 @@ class MegaD:
         self.lg.debug(self.sensors)
         ports = []
         for x in self.sensors:
-            if only_list and x.http_cmd != "list":
+            if only_list and x.http_cmd != 'list':
                 continue
             if x.port in ports:
                 continue
@@ -214,24 +210,22 @@ class MegaD:
 
     @property
     def is_online(self):
-        return (datetime.now() - self.last_update).total_seconds() < (
-            self.poll_interval + 10
-        )
+        return (datetime.now() - self.last_update).total_seconds() < (self.poll_interval + 10)
 
     def _warn_offline(self):
         if self.online:
-            self.lg.warning("mega is offline")
+            self.lg.warning('mega is offline')
             self.hass.states.async_set(
-                f"mega.{self.id}",
-                "offline",
+                f'mega.{self.id}',
+                'offline',
             )
             self.online = False
 
     def _notify_online(self):
         if not self.online:
             self.hass.states.async_set(
-                f"mega.{self.id}",
-                "online",
+                f'mega.{self.id}',
+                'online',
             )
             self.online = True
 
@@ -241,10 +235,13 @@ class MegaD:
         :return:
         """
         for x in self.ds2413_ports:
-            self.lg.debug(f"poll ds2413 for %s", x)
+            self.lg.debug(f'poll ds2413 for %s', x)
             try:
                 await self.get_port(
-                    port=x, force_http=True, http_cmd="list", conv=False
+                    port=x,
+                    force_http=True,
+                    http_cmd='list',
+                    conv=False
                 )
             except asyncio.TimeoutError:
                 continue
@@ -253,7 +250,7 @@ class MegaD:
         """
         Polling ports
         """
-        self.lg.debug("poll")
+        self.lg.debug('poll')
         if self._update_time:
             await self.update_time()
         for x in self.i2c_sensors:
@@ -266,7 +263,7 @@ class MegaD:
         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}")
+                self.lg.warning(f'wrong updater result: {ret} from extender {x}')
                 continue
             self.values.update(ret)
 
@@ -277,14 +274,14 @@ class MegaD:
 
     async def get_mqtt_id(self):
         async with aiohttp.request(
-            "get", f"http://{self.host}/{self.sec}/?cf=2"
+            'get', f'http://{self.host}/{self.sec}/?cf=2'
         ) as req:
-            data = await req.text(encoding="iso-8859-5")
+            data = await req.text()
             data = BeautifulSoup(data, features="lxml")
-            _id = data.find(attrs={"name": "mdid"})
+            _id = data.find(attrs={'name': 'mdid'})
             if _id:
-                _id = _id["value"]
-            return _id or "megad/" + self.host.split(".")[-1]
+                _id = _id['value']
+            return _id or 'megad/' + self.host.split('.')[-1]
 
     async def get_fw(self):
         data = await self.request()
@@ -294,90 +291,84 @@ class MegaD:
         return await self.request(pt=port, cmd=cmd)
 
     async def request(self, priority=0, **kwargs):
-        cmd = "&".join([f"{k}={v}" for k, v in kwargs.items() if v is not None])
+        cmd = '&'.join([f'{k}={v}' for k, v in kwargs.items() if v is not None])
         url = f"http://{self.host}/{self.sec}"
         if cmd:
             url = f"{url}/?{cmd}"
-        self.lg.debug("request: %s", url)
+        self.lg.debug('request: %s', url)
         async with self._http_lck(priority):
             for _ntry in range(3):
                 try:
-                    async with aiohttp.request(
-                        "get", url=url, timeout=aiohttp.ClientTimeout(total=5)
-                    ) as req:
+                    async with aiohttp.request("get", url=url, timeout=aiohttp.ClientTimeout(total=5)) as req:
                         if req.status != 200:
-                            self.lg.warning(
-                                "%s returned %s (%s)",
-                                url,
-                                req.status,
-                                await req.text(encoding="iso-8859-5"),
-                            )
+                            self.lg.warning('%s returned %s (%s)', url, req.status, await req.text())
                             return None
                         else:
-                            ret = await req.text(encoding="iso-8859-5")
-                            self.lg.debug("response %s", ret)
+                            ret = await req.text()
+                            self.lg.debug('response %s', ret)
                             return ret
                 except asyncio.TimeoutError:
-                    self.lg.warning(f"timeout while requesting {url}")
-                    # raise
-                    await asyncio.sleep(1)
-            raise asyncio.TimeoutError("after 3 tries")
+                    self.lg.warning(f'timeout while requesting {url}')
+                    raise
+                    # await asyncio.sleep(1)
+            raise asyncio.TimeoutError('after 3 tries')
 
     async def save(self):
-        await self.send_command(cmd="s")
+        await self.send_command(cmd='s')
 
-    def parse_response(self, ret, cmd="get"):
+    def parse_response(self, ret, cmd='get'):
         if ret is None:
             raise NoPort()
-        if "busy" in ret:
+        if 'busy' in ret:
             return None
-        if ":" in ret:
-            if ";" in ret:
-                ret = ret.split(";")
-            elif "/" in ret and not cmd == "list":
-                ret = ret.split("/")
+        if ':' in ret:
+            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])}
-        elif "ON" in ret:
-            ret = {"value": "ON"}
-        elif "OFF" in ret:
-            ret = {"value": "OFF"}
+            ret = {'value': dict([
+                x.split(':') for x in ret if x.count(':') == 1
+            ])}
+        elif 'ON' in ret:
+            ret = {'value': 'ON'}
+        elif 'OFF' in ret:
+            ret = {'value': 'OFF'}
         else:
-            ret = {"value": ret}
+            ret = {'value': ret}
         return ret
 
-    async def get_port(self, port, force_http=False, http_cmd="get", conv=True):
+    async def get_port(self, port, force_http=False, http_cmd='get', conv=True):
         """
         Запрос состояния порта. Состояние всегда возвращается в виде объекта, всегда сохраняется в центральное
         хранилище values
         """
-        self.lg.debug(f"get port %s", port)
-        if http_cmd == "list" and conv:
-            await self.request(pt=port, cmd="conv")
+        self.lg.debug(f'get port %s', port)
+        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), 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:
+        while http_cmd == 'list' and ret is None and ntry < 3:
             await asyncio.sleep(1)
             ret = self.parse_response(await self.request(pt=port, cmd=http_cmd))
             ntry += 1
-        self.lg.debug("parsed: %s", ret)
+        self.lg.debug('parsed: %s', ret)
         self.values[port] = ret
         return ret
 
+
     @property
     def ports(self):
         return {e.port for e in self.entities}
 
     async def get_all_ports(self, only_out=False, check_skip=False):
         try:
-            ret = await self.request(cmd="all")
+            ret = await self.request(cmd='all')
         except asyncio.TimeoutError:
             return
-        for port, x in enumerate(ret.split(";")):
+        for port, x in enumerate(ret.split(';')):
             if port in self.ds2413_ports:
                 continue
             if check_skip and not port in self.ports:
@@ -395,20 +386,22 @@ class MegaD:
 
     def _process_msg(self, msg):
         try:
-            d = msg.topic.split("/")
+            d = msg.topic.split('/')
             port = d[-1]
         except ValueError:
-            self.lg.warning("can not process %s", msg)
+            self.lg.warning('can not process %s', msg)
             return
 
-        if port == "cmd":
+        if port == 'cmd':
             return
         try:
             port = int_ignore(port)
         except:
-            self.lg.warning("can not process %s", msg)
+            self.lg.warning('can not process %s', msg)
             return
-        self.lg.debug("process incomming message: %s", msg)
+        self.lg.debug(
+            'process incomming message: %s', msg
+        )
         value = None
         try:
             value = json.loads(msg.payload)
@@ -419,13 +412,13 @@ class MegaD:
                 cb(value)
             if isinstance(value, dict):
                 value = value.copy()
-                value["mega_id"] = self.id
+                value['mega_id'] = self.id
                 self.hass.bus.async_fire(
                     EVENT_BINARY_SENSOR,
                     value,
                 )
         except Exception as exc:
-            self.lg.warning(f"could not parse json ({msg.payload}): {exc}")
+            self.lg.warning(f'could not parse json ({msg.payload}): {exc}')
             return
         finally:
             asyncio.run_coroutine_threadsafe(self._notify(port, value), self.loop)
@@ -433,15 +426,14 @@ class MegaD:
     def subscribe(self, port, callback):
         port = int_ignore(port)
         self.lg.debug(
-            f"subscribe %s",
-            port,
+            f'subscribe %s %s', port, callback
         )
         self.http.callbacks[self.id][port].append(callback)
 
     async def authenticate(self) -> bool:
         """Test if we can authenticate with the host."""
         async with aiohttp.request("get", url=f"http://{self.host}/{self.sec}") as req:
-            if "Unauthorized" in await req.text(encoding="iso-8859-5"):
+            if "Unauthorized" in await req.text():
                 return False
             else:
                 if req.status != 200:
@@ -449,21 +441,21 @@ class MegaD:
                 return True
 
     async def get_port_page(self, port):
-        url = f"http://{self.host}/{self.sec}/?pt={port}"
-        self.lg.debug(f"get page for port {port} {url}")
-        async with aiohttp.request("get", url) as req:
-            return await req.text(encoding="iso-8859-5")
+        url = f'http://{self.host}/{self.sec}/?pt={port}'
+        self.lg.debug(f'get page for port {port} {url}')
+        async with aiohttp.request('get', url) as req:
+            return await req.text()
 
     async def scan_port(self, port):
         data = await self.request(pt=port)
         return parse_config(data)
 
     async def scan_ports(self, nports=37):
-        for x in range(0, nports + 1):
+        for x in range(0, nports+1):
             ret = await self.scan_port(x)
             if ret:
                 yield x, ret
-        self.nports = nports + 1
+        self.nports = nports+1
 
     async def _update_extender(self, port):
         """
@@ -472,12 +464,12 @@ class MegaD:
         :return:
         """
         try:
-            values = await self.request(pt=port, cmd="get")
+            values = await self.request(pt=port, cmd='get')
         except asyncio.TimeoutError:
             return
         ret = {}
-        for i, x in enumerate(values.split(";")):
-            ret[f"{port}e{i}"] = x
+        for i, x in enumerate(values.split(';')):
+            ret[f'{port}e{i}'] = x
         return ret
 
     async def _update_i2c(self, params):
@@ -486,161 +478,127 @@ class MegaD:
         :param params: параметры url
         :return:
         """
-        pt = params.get("pt")
+        pt = params.get('pt')
         if pt in self.skip_ports:
             return
         if pt is not None:
             pass
         _params = tuple(params.items())
         delay = None
-        if "delay" in params:
-            delay = params.pop("delay")
+        if 'delay' in params:
+            delay = params.pop('delay')
         try:
-            ret = {_params: await self.request(**params)}
+            ret = {
+                _params: await self.request(**params)
+            }
         except asyncio.TimeoutError:
             return
-        self.lg.debug("i2c response: %s", ret)
+        self.lg.debug('i2c response: %s', ret)
         if delay:
-            self.lg.debug("delay %s", 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))
-        ret["mqtt_id"] = await self.get_mqtt_id()
-        ret["extenders"] = extenders = []
-        ret["ext_in"] = ext_int = {}
-        ret["ext_acts"] = ext_acts = {}
-        ret["i2c_sensors"] = i2c_sensors = []
-        ret["smooth"] = smooth = []
+        ret['mqtt_id'] = await self.get_mqtt_id()
+        ret['extenders'] = extenders = []
+        ret['ext_in'] = ext_int = {}
+        ret['ext_acts'] = ext_acts = {}
+        ret['i2c_sensors'] = i2c_sensors = []
+        ret['smooth'] = smooth = []
         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 cfg.pty == "1" and (cfg.m in ["0", "1", "3"] or cfg.m is None):
+                ret['binary_sensor'][port].append({})
+            elif cfg.pty == "1" and (cfg.m in ['0', '1', '3'] or cfg.m is None):
                 if cfg.misc is not None:
                     smooth.append(port)
-                ret["light"][port].append(
-                    {"dimmer": cfg.m == "1", "smooth": safe_int(cfg.misc)}
-                )
+                ret['light'][port].append({'dimmer': cfg.m == '1', 'smooth': safe_int(cfg.misc)})
             elif cfg == DS2413:
                 # ds2413
-                _data = await self.get_port(
-                    port=port, force_http=True, http_cmd="list", conv=False
-                )
-                data = _data.get("value", {})
+                _data = await self.get_port(port=port, force_http=True, http_cmd='list', conv=False)
+                data = _data.get('value', {})
                 if not isinstance(data, dict):
-                    self.lg.warning(
-                        f"can not add ds2413 on port {port}, it has wrong data: {_data}"
-                    )
+                    self.lg.warning(f'can not add ds2413 on port {port}, it has wrong data: {_data}')
                     continue
                 for addr, state in data.items():
-                    ret["light"][port].extend(
-                        [
-                            {
-                                "index": 0,
-                                "addr": addr,
-                                "id_suffix": f"{addr}_a",
-                                "http_cmd": "ds2413",
-                            },
-                            {
-                                "index": 1,
-                                "addr": addr,
-                                "id_suffix": f"{addr}_b",
-                                "http_cmd": "ds2413",
-                            },
-                        ]
-                    )
+                    ret['light'][port].extend([
+                        {"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 cfg == MCP230:
                 extenders.append(port)
                 if cfg.inta:
                     ext_int[int_ignore(cfg.inta)] = port
-                values = await self.request(pt=port, cmd="get")
-                values = values.split(";")
+                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:02d}e{n:02d}"
-                    if ext_cfg.ety == "1":
-                        ret["light"][pt].append({})
-                    elif ext_cfg.ety == "0":
+                    pt = f'{port}e{n}' if not self.new_naming else f'{port:02d}e{n:02d}'
+                    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({})
+                        ret['binary_sensor'][pt].append({})
             elif cfg == PCA9685:
                 extenders.append(port)
-                values = await self.request(pt=port, cmd="get")
-                values = values.split(";")
+                values = await self.request(pt=port, cmd='get')
+                values = values.split(';')
                 for n in range(len(values)):
-                    pt = f"{port}e{n}"
-                    name = pt if not self.new_naming else f"{port:02}e{n:02}"
-                    ret["light"][pt].append(
-                        {
-                            "dimmer": True,
-                            "dimmer_scale": 16,
-                            "name": f"{self.id}_{name}",
-                        }
-                    )
-            if cfg.pty == "4":  # and (cfg.gr == '0' or _cust.get(CONF_FORCE_I2C_SCAN))
+                    pt = f'{port}e{n}'
+                    name = pt if not self.new_naming else f'{port:02}e{n:02}'
+                    ret['light'][pt].append({'dimmer': True, 'dimmer_scale': 16, 'name': f'{self.id}_{name}'})
+            if 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)
+                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")
+                    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)
+                    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":
+            elif cfg.pty == '4' and cfg.m == '2':
                 # scl исключаем из сканирования
                 continue
-            elif cfg.pty is None and nports < 30:
-                # вроде как это ADC на 328 меге
-                ret["sensor"][port].append(dict())
-            elif cfg.pty in ("3", "2", "4"):
-                http_cmd = "get"
-                if cfg.d == "5" and cfg.pty == "3":
+            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"
+                    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"
-                self.lg.debug(f"values: %s", values)
+                    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'
+                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"
-                    )
+                    self.lg.warning(f'port {port} is of type sensor but response is None, skipping it')
                     continue
-                if isinstance(values, dict) and "value" in values:
-                    values = values["value"]
+                if isinstance(values, dict) and 'value' in values:
+                    values = values['value']
                 if isinstance(values, str) and TEMP_PATT.search(values):
                     values = {TEMP: values}
                 elif not isinstance(values, dict):
-                    if cfg.pty == "4" and cfg.d in I2C_DEVICE_TYPES:
+                    if cfg.pty == '4' and cfg.d in I2C_DEVICE_TYPES:
                         values = {I2C_DEVICE_TYPES.get(cfg.m): values}
                     else:
                         values = {None: values}
                 for key in values:
-                    self.lg.debug(f"add sensor {key}")
-                    ret["sensor"][port].append(
-                        dict(
-                            key=key,
-                            unit_of_measurement=UNITS.get(key, UNITS[TEMP]),
-                            device_class=CLASSES.get(key, CLASSES[TEMP]),
-                            id_suffix=key,
-                            http_cmd=http_cmd,
-                        )
-                    )
+                    self.lg.debug(f'add sensor {key}')
+                    ret['sensor'][port].append(dict(
+                        key=key,
+                        unit_of_measurement=UNITS.get(key, UNITS[TEMP]),
+                        device_class=CLASSES.get(key, CLASSES[TEMP]),
+                        id_suffix=key,
+                        http_cmd=http_cmd,
+                    ))
         return ret
 
     async def restore_states(self):
@@ -652,7 +610,10 @@ class MegaD:
                     await x.async_turn_off()
 
     async def update_time(self):
-        await self.request(cf=7, stime=datetime.now().strftime("%H:%M:%S"))
+        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)
@@ -660,14 +621,14 @@ class MegaD:
         for x in REMOVE_CONFIG:
             cfg.pop(x, None)
         cfg.update(new)
-        self.lg.debug(f"new config: %s", cfg)
+        self.lg.debug(f'new config: %s', cfg)
         self.config.data = cfg
         if reload_entry:
             await self.hass.config_entries.async_reload(self.config.entry_id)
         return cfg
 
     def _wrap_port_smooth(self, from_, to_, time):
-        self.lg.debug("dim from %s to %s for %s seconds", from_, to_, time)
+        self.lg.debug('dim from %s to %s for %s seconds', from_, to_, time)
         if time <= 0:
             return
         beg = datetime.now()
@@ -680,15 +641,15 @@ class MegaD:
             yield val
 
     async def smooth_dim(
-        self,
-        *config: typing.Tuple[typing.Any, int, int],
-        time: float,
-        jitter: int = 50,
-        ws=False,
-        updater=None,
-        can_smooth_hardware=False,
-        max_values=None,
-        chip=None,
+            self,
+            *config: typing.Tuple[typing.Any, int, int],
+            time: float,
+            jitter: int = 50,
+            ws=False,
+            updater=None,
+            can_smooth_hardware=False,
+            max_values=None,
+            chip=None,
     ):
         """
         Плавное диммирование силами сервера, сразу нескольких портов (одной командой)
@@ -732,9 +693,7 @@ class MegaD:
                 continue
             if not ws:
                 cmd = dict(
-                    cmd=";".join(
-                        [f"{pt}:{_next_val[i]}" for i, (pt, _, _) in enumerate(config)]
-                    )
+                    cmd=';'.join([f'{pt}:{_next_val[i]}' for i, (pt, _, _) in enumerate(config)])
                 )
                 await self.request(**cmd)
             else:
@@ -742,9 +701,7 @@ class MegaD:
                 cmd = dict(
                     pt=config[0][0],
                     chip=chip,
-                    ws="".join(
-                        [hex(x).split("x")[1].rjust(2, "0").upper() for x in _next_val]
-                    ),
+                    ws=''.join([hex(x).split('x')[1].rjust(2, '0').upper() for x in _next_val])
                 )
                 await self.request(**cmd)
 

custom_components/mega/i2c.py

@@ -1,10 +1,12 @@
-import typing
-from dataclasses import dataclass, astuple
+from dataclasses import dataclass, field
 from urllib.parse import parse_qsl, urlparse
 from bs4 import BeautifulSoup
-
-from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.const import (
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_ILLUMINANCE,
+    DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_CO2,
     PERCENTAGE,
     LIGHT_LUX,
     TEMP_CELSIUS,
@@ -13,15 +15,7 @@ from homeassistant.const import (
 )
 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
+DeviceType = namedtuple('DeviceType', 'device_class,unit_of_measurement,suffix')
 
 
 def parse_scan_page(page: str):
@@ -38,40 +32,39 @@ def parse_scan_page(page: str):
             continue
         classes = i2c_classes.get(dev, [])
         for i, c in enumerate(classes):
-            _params = params.copy()
             if c is Skip:
                 continue
             elif c is Request:
-                req.append(_params)
+                req.append(params)
                 continue
             elif isinstance(c, Request):
                 if c.delay:
-                    _params['delay'] = c.delay
-                req.append(_params)
+                    params = params.copy()
+                    params['delay'] = c.delay
+                req.append(params)
                 continue
             elif isinstance(c, DeviceType):
-                c, m, suffix, delay = astuple(c)
-                if delay is not None:
-                    _params['delay'] = delay
+                c, m, suffix = c
             else:
                 continue
             suffix = suffix or c
-            if 'addr' in _params:
-                suffix += f"_{_params['addr']}" if suffix else str(_params['addr'])
+            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
+                params['i2c_par'] = i
 
             ret.append({
                 'id_suffix': _dev,
                 'device_class': c,
-                'params': _params,
+                'params': params,
                 'unit_of_measurement': m,
             })
-            req.append(_params)
+            req.append(params)
     return req, ret
 
 
@@ -86,55 +79,55 @@ class Request:
 
 i2c_classes = {
     'htu21d': [
-        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
+        DeviceType(DEVICE_CLASS_HUMIDITY, PERCENTAGE, None),
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
     ],
     'sht31': [
-        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None, delay=1.5),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
+        DeviceType(DEVICE_CLASS_HUMIDITY, PERCENTAGE, None),
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
     ],
     'max44009': [
-        DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
+        DeviceType(DEVICE_CLASS_ILLUMINANCE, LIGHT_LUX, None)
     ],
     'bh1750': [
-        DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
+        DeviceType(DEVICE_CLASS_ILLUMINANCE, LIGHT_LUX, None)
     ],
     'tsl2591': [
-        DeviceType(SensorDeviceClass.ILLUMINANCE, LIGHT_LUX, None)
+        DeviceType(DEVICE_CLASS_ILLUMINANCE, LIGHT_LUX, None)
     ],
     'bmp180': [
-        DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
+        DeviceType(DEVICE_CLASS_PRESSURE, PRESSURE_BAR, None),
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
     ],
     'bmx280': [
-        DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
-        DeviceType(SensorDeviceClass.HUMIDITY, PERCENTAGE, None)
+        DeviceType(DEVICE_CLASS_PRESSURE, PRESSURE_BAR, None),
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
+        DeviceType(DEVICE_CLASS_HUMIDITY, PERCENTAGE, None)
     ],
     'dps368': [
-        DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
+        DeviceType(DEVICE_CLASS_PRESSURE, PRESSURE_BAR, None),
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
     ],
     'mlx90614': [
         Skip,
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, 'temp'),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, 'object'),
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, 'temp'),
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, 'object'),
     ],
     'ptsensor': [
         Skip,
-        Request(delay=3),  # запрос на измерение
-        DeviceType(SensorDeviceClass.PRESSURE, PRESSURE_BAR, None),
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
+        Request(delay=1),  # запрос на измерение
+        DeviceType(DEVICE_CLASS_PRESSURE, PRESSURE_BAR, None),
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
     ],
     'mcp9600': [
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),  # термопара
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),  # сенсор встроенный в микросхему
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),  # термопара
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),  # сенсор встроенный в микросхему
     ],
     't67xx': [
-        DeviceType(SensorDeviceClass.CO2, CONCENTRATION_PARTS_PER_MILLION, None)
+        DeviceType(DEVICE_CLASS_CO2, CONCENTRATION_PARTS_PER_MILLION, None)
     ],
     'tmp117': [
-        DeviceType(SensorDeviceClass.TEMPERATURE, TEMP_CELSIUS, None),
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
     ],
     'ads1115': [
         DeviceType(None, None, 'ch0'),

custom_components/mega/light.py

@@ -1,9 +1,6 @@
 """Platform for light integration."""
-from __future__ import annotations
-
 import asyncio
 import logging
-import typing
 from datetime import timedelta, datetime
 from functools import partial
 
@@ -16,8 +13,8 @@ from homeassistant.components.light import (
     SUPPORT_BRIGHTNESS,
     LightEntity,
     SUPPORT_TRANSITION,
-    SUPPORT_COLOR, ColorMode, LightEntityFeature,
-    # SUPPORT_WHITE_VALUE
+    SUPPORT_COLOR,
+    SUPPORT_WHITE_VALUE
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -118,7 +115,6 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
         self._is_on = None
         self._brightness = None
         self._hs_color = None
-        self._rgb_color: tuple[int, int, int] | None = None
         self._white_value = None
         self._task: asyncio.Task = None
         self._restore = None
@@ -131,7 +127,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
     def max_values(self) -> list:
         if self._max_values is None:
             if self.is_ws:
-                self._max_values = [255] * 4
+                self._max_values = [255] * 3
             else:
                 self._max_values = [
                     255 if isinstance(x, int) else 4095 for x in self.port
@@ -146,34 +142,10 @@ 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
-        }
-
-    @property
-    def color_mode(self) -> ColorMode | str | None:
-        if len(self.port) == 4:
-            return ColorMode.RGBW
-        else:
-            return ColorMode.RGB
-
     @property
     def white_value(self):
-        # if self.supported_features & SUPPORT_WHITE_VALUE:
-        return float(self.get_attribute('white_value', 0))
-
-    @property
-    def rgb_color(self) -> tuple[int, int, int] | None:
-        return self._rgb_color
-
-    @property
-    def rgbw_color(self) -> tuple[int, int, int, int] | None:
-        if self._white_value is not None and self._rgb_color is not None:
-            return (*self._rgb_color, self._white_value)
+        if self.supported_features & SUPPORT_WHITE_VALUE:
+            return float(self.get_attribute('white_value', 0))
 
     @property
     def brightness(self):
@@ -189,7 +161,12 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
 
     @property
     def supported_features(self):
-        return LightEntityFeature.TRANSITION
+        return (
+            SUPPORT_BRIGHTNESS |
+            SUPPORT_TRANSITION |
+            SUPPORT_COLOR |
+            (SUPPORT_WHITE_VALUE if len(self.port) == 4 else 0)
+        )
 
     def get_rgbw(self):
         if not self.is_on:
@@ -247,7 +224,6 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
         for item, value in kwargs.items():
             setattr(self, f'_{item}', value)
         _after = self.get_rgbw()
-        self._rgb_color = tuple(_after[:3])
         if transition is None:
             transition = self.smooth.total_seconds()
             ratio = self.calc_speed_ratio(_before, _after)

custom_components/mega/manifest.json

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

custom_components/mega/sensor.py

@@ -4,7 +4,9 @@ import voluptuous as vol
 import struct
 
 from homeassistant.components.sensor import (
-    PLATFORM_SCHEMA as SENSOR_SCHEMA, SensorEntity, SensorDeviceClass
+    PLATFORM_SCHEMA as SENSOR_SCHEMA,
+    DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_HUMIDITY
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -18,8 +20,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.template import Template
 from .entities import MegaPushEntity
-from .const import CONF_KEY, TEMP, HUM, W1, W1BUS, CONF_CONV_TEMPLATE, CONF_HEX_TO_FLOAT, DOMAIN, CONF_CUSTOM, \
-    CONF_SKIP, CONF_FILTER_VALUES, CONF_FILTER_SCALE, CONF_FILTER_LOW, CONF_FILTER_HIGH, CONF_FILL_NA
+from .const import CONF_KEY, TEMP, HUM, W1, W1BUS, CONF_CONV_TEMPLATE, CONF_HEX_TO_FLOAT, DOMAIN, CONF_CUSTOM, CONF_SKIP
 from .hub import MegaD
 import re
 
@@ -38,8 +39,8 @@ UNITS = {
     HUM: '%'
 }
 CLASSES = {
-    TEMP: SensorDeviceClass.TEMPERATURE,
-    HUM: SensorDeviceClass.HUMIDITY
+    TEMP: DEVICE_CLASS_TEMPERATURE,
+    HUM: DEVICE_CLASS_HUMIDITY
 }
 # Validation of the user's configuration
 _ITEM = {
@@ -92,7 +93,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
                 hub.skip_ports |= {port}
                 continue
             for data in cfg:
-                hub.lg.debug(f'add sensor on port %s with data %s, constructor: %s', port, data, _constructors[tp])
+                hub.lg.debug(f'add sensor on port %s with data %s', port, data)
                 sensor = _constructors[tp](
                     mega=hub,
                     port=port,
@@ -106,57 +107,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
     async_add_devices(devices)
 
 
-class FilterBadValues(MegaPushEntity, SensorEntity):
-
-    def __init__(self, *args, **kwargs):
-        self._prev_value = None
-        super().__init__(*args, **kwargs)
-
-    def filter_value(self, value):
-        try:
-            if value \
-                    in self.filter_values \
-                    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._prev_value is not None
-                    and self.filter_scale is not None
-                    and (
-                            abs(value - self._prev_value) / self._prev_value > self.filter_scale
-                    )
-            ):
-                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')
-            return None
-
-    @property
-    def filter_values(self):
-        return self.customize.get(CONF_FILTER_VALUES, self.mega.customize.get(CONF_FILTER_VALUES, []))
-
-    @property
-    def filter_scale(self):
-        return self.customize.get(CONF_FILTER_SCALE, self.mega.customize.get(CONF_FILTER_SCALE, None))
-
-    @property
-    def filter_low(self):
-        return self.customize.get(CONF_FILTER_LOW, self.mega.customize.get(CONF_FILTER_LOW, None))
-
-    @property
-    def filter_high(self):
-        return self.customize.get(CONF_FILTER_HIGH, self.mega.customize.get(CONF_FILTER_HIGH, None))
-
-    @property
-    def fill_na(self):
-        return self.customize.get(CONF_FILL_NA, 'last')
-
-
-class MegaI2C(FilterBadValues):
+class MegaI2C(MegaPushEntity):
 
     def __init__(
             self,
@@ -173,64 +124,46 @@ class MegaI2C(FilterBadValues):
 
     @property
     def customize(self):
-        ret = super().customize
-        _old = ret.get(self.id_suffix)
-        if _old is not None:
-            ret = ret.copy()
-            ret.update(_old)
-        return ret
-
-    @property
-    def extra_state_attributes(self):
-        attrs = super().extra_state_attributes or {}
-        attrs.update({
-            'i2c_id': self.id_suffix,
-        })
-        return attrs
+        return super().customize.get(self.id_suffix, {}) or {}
 
     @property
     def device_class(self):
         return self._device_class
 
     @property
-    def native_unit_of_measurement(self):
+    def unit_of_measurement(self):
         return self._unit_of_measurement
 
     @property
-    def native_value(self):
-        try:
-            ret = self.mega.values.get(self._params)
-            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))
+    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 = float(ret)
-                if tmpl is not None and self.hass is not None:
-                    tmpl.hass = self.hass
-                    ret = tmpl.async_render({'value': ret})
+                ret = struct.unpack('!f', bytes.fromhex('41973333'))[0]
             except:
-                ret = ret
-            ret = self.filter_value(ret)
-            if ret is not None:
-                return str(ret)
-        except Exception:
-            lg.exception('while getting value')
-            return None
+                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))
+        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})
+        except:
+            ret = ret
+        return str(ret)
 
     @property
     def device_class(self):
         return self._device_class
 
 
-class Mega1WSensor(FilterBadValues):
+class Mega1WSensor(MegaPushEntity):
 
     def __init__(
             self,
-            unit_of_measurement=None,
-            device_class=None,
+            unit_of_measurement,
+            device_class,
             key=None,
             *args,
             **kwargs
@@ -242,15 +175,14 @@ class Mega1WSensor(FilterBadValues):
         :param patt: pattern to extract value, must have at least one group that will contain parsed value
         """
         super().__init__(*args, **kwargs)
-        self.key = key
         self._value = None
+        self.key = key
         self._device_class = device_class
         self._unit_of_measurement = unit_of_measurement
         self.mega.sensors.append(self)
-        self.prev_value = None
 
     @property
-    def native_unit_of_measurement(self):
+    def unit_of_measurement(self):
         _u = self.customize.get(CONF_UNIT_OF_MEASUREMENT, None)
         if _u is None:
             return self._unit_of_measurement
@@ -266,7 +198,7 @@ class Mega1WSensor(FilterBadValues):
         if self.key:
             return super().unique_id + f'_{self.key}'
         else:
-            return super().unique_id
+            return super(Mega1WSensor, self).unique_id
 
     @property
     def device_class(self):
@@ -281,63 +213,48 @@ class Mega1WSensor(FilterBadValues):
             return self._device_class
 
     @property
-    def native_value(self):
-        try:
-            ret = None
-            if not hasattr(self, 'key'):
-                return None
-            if self.key:
-                try:
-                    ret = self.mega.values.get(self.port, {})
+    def state(self):
+        ret = None
+        if self.key:
+            try:
+                ret = self.mega.values.get(self.port, {})
+                if isinstance(ret, dict):
+                    ret = ret.get('value', {})
                     if isinstance(ret, dict):
-                        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', {}))
-                    return
-            else:
-                ret = self.mega.values.get(self.port, {}).get('value')
-            if ret is None and self.fill_na == 'fill_na' and self.prev_value is not None:
-                ret = self.prev_value
-            elif ret is None and self.fill_na == 'fill_na' and self._state is not None:
-                ret = self._state.state
-            try:
-                ret = float(ret)
-                ret = str(ret)
+                        ret = ret.get(self.key)
             except:
-                self.lg.debug(f'could not convert to float "{ret}"')
-                ret = self.prev_value
-            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))
+                self.lg.error(self.mega.values.get(self.port, {}).get('value', {}))
+                return
+        else:
+            ret = self.mega.values.get(self.port, {}).get('value')
+        if ret is None and self._state is not None:
+            ret = self._state.state
+        try:
+            ret = float(ret)
+            ret = str(ret)
+        except:
+            ret = None
+        if self.customize.get(CONF_HEX_TO_FLOAT):
             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 = struct.unpack('!f', bytes.fromhex(ret))[0]
             except:
-                pass
-            ret = self.filter_value(ret)
-            self.prev_value = ret
-            if ret is not None:
-                return str(ret)
-        except Exception:
-            lg.exception('while parsing state')
-            return None
+                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))
+        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})
+        except:
+            pass
+        return str(ret)
 
     @property
     def name(self):
         n = super().name
         c = self.customize.get(CONF_NAME, {})
         if isinstance(c, dict):
-            try:
-                c = c.get(self.key)
-            except:
-                pass
+            c = c.get(self.key)
         return c or n
 
 

custom_components/mega/tools.py

@@ -50,10 +50,6 @@ class PriorityLock(asyncio.Lock):
         finally:
             self.release()
 
-    @property
-    def _loop(self):
-        return asyncio.get_event_loop()
-
     async def acquire(self, priority=0) -> bool:
         """Acquire a lock.
 

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)
@@ -57,9 +57,7 @@
 Информация об обновлениях приходит с некоторым интервалом, чтобы вручную проверить наличие обновлений
 нажмите три точки возле интеграции в меню HACS и нажмите `обновить информацию`
 
-## Беты {: #beta }
-Иногда я буду выпускать бета-версии, в стабильности которых пока не уверен и не готов раскатывать на всех, поэтому в целях тестирвоания
-нужно принудительно включать поддержку бет, для этого зайдите в HACS, найдите интеграцию MegaD, нажмите три точки, 
+Чтобы включить возможность использования бета-версий, зайдите в HACS, найдите интеграцию MegaD, нажмите три точки, 
 там кнопка "переустановить" или reinstall, дальше нужно нажать галку "показывать бета-версии"
 
 ## Зависимости {: #deps }

docs/yaml.md

@@ -1,25 +1,6 @@
 С помощью yaml-конфигурации можно кастомизировать ваши устройства.
 
 ## Основное
-
-!!! note "Альтернативная адресация" 
-    Начиная с v1.1.0 большинство параметров объектов можно записывать в более простой и понятной форме:
-    ```yaml
-    mega: # название интеграции
-      entities:
-        sensor.some_sensor: #entity_id как в интерфейсе HA
-          filter_low: 20
-          filter_high: 40
-    ```
-    Рекомендуется пользоваться именно этим способом, тк он более логичный и простой.
-    
-    Некоторые параметры по своей логике (влияют на entity_id) не могут быть записаны таким образом, среди них:
-    - domain
-    - skip
-    - name
-    
-    Остальные параметры можно записывать используя новый entities
-
 Конфиг записывается стандартным образом в файл `configuration.yaml`, начинаем с 
 указания названия интеграции:
 ```yaml hl_lines="1"
@@ -81,11 +62,8 @@ mega:
 !!! note ""
     - **smooth** (float, 0): программное плавное диммирование. Это поле отвечает за кол-во секунд, за которое яркость
     диммера набирает от 0 до 100%
-    - **range** (list[int, int], [0, 255]), *начиная с версии 1.1.0*: границы диммирования в абсолютных единицах 0..255. При диммировании 1%
+    - **limits** (list[int, int], [0, 255]), *начиная с версии 1.1.0*: границы диммирования в абсолютных единицах контроллера. При диммировании 1%
     будет равен левой границе, 100% - правой.
-    ```yaml
-    range: [20, 200]
-    ```
 [Подробнее про плавное диммирование](smooth.md)
 ### MegaD-16R-XT, MegaD-16PWM
 Порты расширителей MegaD-16R-XT, MegaD-16PWM конфигурируются аналогично обычным реле и диммерам, но адресация порта 
@@ -181,14 +159,6 @@ some_led2:
     - **value_template** (str): шаблон для конвертации, например `{{(value|float)/100}}`
     - **device_class** (str): класс устройства, [список доступных](https://developers.home-assistant.io/docs/core/entity/sensor#available-device-classes)
     - **hex_to_float** (bool, false): если ваш датчик возвращает float запакованный в HEX, интеграция его распакует (перед применением темплейта)
-    - **filter_high** (float, none): верхняя граница значений, выше нее значения будут считаться ошибочными и отбрасываться. [Доступно так же глобальное значение](#filter_high)
-    - **filter_low** (float, none): нижняя граница значений, ниже нее значения будут считаться ошибочными и отбрасываться. [Доступно так же глобальное значение](#filter_low)
-    - **filter_values** ([float], none): список значений, которые считаются ошибочными. [Доступно так же глобальное значение](#filter_values)
-    - **filter_scale** (float, none): значение отклонения от текущего значения, которое будет считаться выбросом и отфильтруется, например если
-    установить 1, то это означает, что при росте показателя сенсора на 100% и больше или падении на 100% и больше, такое значение не будет отображаться.
-    [Доступно так же глобальное значение](#filter_scale)
-    - **fill_na** (str, last): чем заполнять пропуски, по-умолчанию last, что означает последнее значение, можно так же поставить none-тогда будут пропуски (разрывы на графике).
-
 При этом есть так же особенности адресации, так для сенсора на одном порте с одним значением:
 ```yaml
 36:
@@ -213,10 +183,10 @@ some_led2:
     # конфиг
 ```
 #### i2c {: #i2c}
-Для сенсоров i2c нужно так же указать id сенсора, который можно посмотреть в атрибутах объекта на [странице разработчика](https://my.home-assistant.io/redirect/developer_states/).
+Для сенсоров i2c адресация конфига такая:
 ```yaml
 36:
-  htu21d_humidity:  # i2c_id
+  htu21d_humidity:  # entity_id сенсора без приставки sensor., видно в интерфейсе HA
     # конфиг
 ```
 [Подробнее про i2c](i2c.md)
@@ -234,6 +204,33 @@ mega:
       {% if m in [0, 1] %}d{% endif %}
 ```
 
+### encoders
+Настройки енкодеров. Енкодер состоит из нескольких портов, поэтому энкодеры настраиваются в отдельном блоке. Настроенный
+енкодер создает в вашем интерфейсе несколько объектов:
+    
+- **light.<encoder_id>**: это rgb-свет, отвечает за светодиод енкодера
+- **sensor.<encoder_id>**: это текущее значение енкодера [0..255]
+
+Пример:
+```yaml
+mega:
+  megaid1:
+    encoders:
+      some_encoder_id: # придумывайте любой
+        int: 6
+        scl: 30
+        sync_to: light.some_light
+```
+
+!!! note ""
+    - **int** (integer): номер порта-прерывания. Если не указать, сервер не будет реагировать на изменения.
+    - **scl** (integer): номер scl-порта, используется для управления подсветкой и синхронизации состояния
+    - **sync_to** (str): entity_id, с которым синхронизирвоать состояние. Синхронизация работает только в
+    одну сторону: а именно, когда вы меняете яркость объекта в интерфейсе, соответсвующая настройка "пробрасывается" на 
+    контроллер. Обычно этого достаточно, тк управление самим светом лучше реализовать штатными средствами контроллера,
+    но в случае, если вы хотите так же управлять яркостью света с помощью енкодера+HA, то нужно использовать автоматизацию,
+    для вашего удобства есть шаблон, который можно установить по кнопке ниже:
+
 ## Параметры интеграции
 ### allow_hosts {: #allow_hosts }
 Отвечает за список хостов, с которых интеграция "слушает" сообщения. По умолчанию, в этот список
@@ -243,27 +240,5 @@ mega:
 ```yaml
 mega:
   allow_hosts:
-    - 192.168.1.20
+    - 192.168.1.20 
 ```
-
-### filter_high {: #filter_high}
-Верхняя граница значений датчиков по-умолчанию, выше нее значения будут считаться ошибочными и отбрасываться
-
-### filter_low {: #filter_low}
-Нижняя граница значений датчиков по-умолчанию, ниже нее значения будут считаться ошибочными и отбрасываться
-
-### filter_values {: #filter_values }
-Список значений, которые считаются ошибочными, настройка по-умолчанию для всех датчиков. Удобно, если у вас много 
-  однотипных датчиков
-
-```yaml
-mega:
-  filter_values: [-82, - 150]
-```
-### filter_scale {: #filter_scale }
-Значение отклонения от текущего значения, которое будет считаться выбросом и отфильтруется, например если
-установить 1, то это означает, что при росте показателя сенсора на 100% и больше или падении на 100% и больше, такое значение не будет отображаться.
-```yaml
-mega:
-  filter_scale: 1  # 100%
-```

mkdocs.yml

@@ -22,7 +22,7 @@ nav:
   - Конфигурация:
     - В интерфейсе: settings.md
     - Настройка обратной связи: http.md
-    - Кастомизация: yaml.md
+    - YAML-конфиг: yaml.md
     - i2c: i2c.md
     - Плавные переходы: smooth.md
   - Автоматизация:

readme.md

@@ -1,7 +1,7 @@
 
 
 # MegaD HomeAssistant integration
-[![hacs_badge](https://img.shields.io/badge/HACS-Custom-orange.svg)](https://github.com/hacs/integration)
+[![hacs_badge](https://img.shields.io/badge/HACS-Custom-orange.svg)](https://github.com/custom-components/hacs)
 [![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)