Bump version: 1.1.4 → 1.1.5b0

fix filters positive float

.bumpversion.cfg

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

custom_components/mega/__init__.py

@@ -1,6 +1,7 @@
 """The mega integration."""
 import asyncio
 import logging
+import typing
 from functools import partial
 
 import voluptuous as vol
@@ -17,7 +18,8 @@ from .const import DOMAIN, CONF_INVERT, CONF_RELOAD, PLATFORMS, CONF_PORTS, CONF
     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_FILTER_VALUES, CONF_FILTER_SCALE, CONF_FILTER_LOW, CONF_FILTER_HIGH, CONF_FILL_NA, CONF_MEGA_ID, CONF_ADDR, \
+    CONF_1WBUS
 from .hub import MegaD
 from .config_flow import ConfigFlow
 from .http import MegaView
@@ -52,6 +54,14 @@ LED_LIGHT = \
 
 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
@@ -75,10 +85,10 @@ 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): [cv.positive_float],
-    vol.Optional(CONF_FILTER_SCALE): cv.positive_float,
-    vol.Optional(CONF_FILTER_LOW): cv.positive_float,
-    vol.Optional(CONF_FILTER_HIGH): cv.positive_float,
+    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): {
@@ -99,11 +109,21 @@ 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(
@@ -116,11 +136,12 @@ CONFIG_SCHEMA = vol.Schema(
                     CUSTOMIZE_PORT,
                     CUSTOMIZE_DS2413,
                 ),
-                vol.Optional(CONF_FILTER_VALUES): [cv.positive_float],
-                vol.Optional(CONF_FILTER_SCALE): cv.positive_float,
-                vol.Optional(CONF_FILTER_LOW): cv.positive_float,
-                vol.Optional(CONF_FILTER_HIGH): cv.positive_float,
-            }
+                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]
         }
     },
     extra=vol.ALLOW_EXTRA,

custom_components/mega/binary_sensor.py

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

custom_components/mega/const.py

@@ -45,10 +45,13 @@ 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,11 +8,12 @@ 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
+    LONG_RELEASE, RELEASE, PRESS, SINGLE_CLICK, DOUBLE_CLICK, EVENT_BINARY, CONF_SMOOTH, CONF_RANGE
 
 _events_on = False
 _LOGGER = logging.getLogger(__name__)
@@ -54,7 +55,6 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
             smooth=None,
             **kwargs,
     ):
-        super().__init__(mega.updater)
         self._smooth = smooth
         self.http_cmd = http_cmd
         self._state: State = None
@@ -85,6 +85,7 @@ 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):
@@ -126,21 +127,23 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
     def customize(self):
         if self._customize is not None:
             return self._customize
-        if self.hass is None:
+        if self.hass is None or self.entity_id is None:
             return {}
         if self._customize is None:
+            c_entity_id = self.hass.data.get(DOMAIN, {}).get(CONF_CUSTOM).get('entities', {}).get(self.entity_id, {})
             c = 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):
+    def device_info(self) -> DeviceInfo:
         if isinstance(self.port, list):
             pt_idx = self.id_suffix
         else:
@@ -149,26 +152,20 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
                 pt_idx, _ = _pt.split('e')
             else:
                 pt_idx = _pt
-        return {
-            "identifiers": {
+        return DeviceInfo(
+            identifiers={
                 # Serial numbers are unique identifiers within a specific domain
-                (DOMAIN, f'{self._mega_id}', pt_idx),
+                (DOMAIN, f'{self._mega_id}'), #pt_idx
             },
-            "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),
-        }
+            name=self.name,
+            manufacturer='ab-log.ru',
+            sw_version=self.mega.fw,
+            via_device=(DOMAIN, self._mega_id),
+        )
 
     @property
     def lg(self) -> logging.Logger:
-        if self._lg is None:
-            self._lg = self.mega.lg.getChild(self._name or self.unique_id)
-        return self._lg
+        return _LOGGER
 
     @property
     def available(self) -> bool:
@@ -301,35 +298,43 @@ 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:
-            return self._state.attributes.get("brightness")
+            ret = safe_int(self._state.attributes.get("brightness"), def_on=self.max_dim, def_off=0, def_val=0)
+            ret = self._calc_brightness(ret)
         elif isinstance(self.port, str) and 'e' in self.port:
             if isinstance(val, str):
-                val = safe_int(val)
+                val = safe_int(val, def_on=self.max_dim, def_off=0, def_val=0)
             else:
                 val = 0
             if val == 0:
-                return self._brightness
+                ret = self._brightness
             elif isinstance(val, (int, float)):
-                return int(val / self.dimmer_scale)
+                ret = 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
+                ret = val
             except Exception:
                 pass
+        ret = self._cal_reverse_brightness(ret)
+        return ret
 
     @property
     def is_on(self) -> bool:
@@ -415,6 +420,28 @@ 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
@@ -424,6 +451,7 @@ 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:
@@ -467,7 +495,7 @@ class MegaOutPort(MegaPushEntity):
         if (time.time() - self._last_called) < 0.1:
             return
         self._last_called = time.time()
-        self._restore_brightness = safe_int(self._brightness)
+        self._restore_brightness = self._cal_reverse_brightness(safe_int(self._brightness))
         if not self.dimmer:
             transition = None
         cmd = "0" if not self.invert else "1"
@@ -503,12 +531,12 @@ class MegaOutPort(MegaPushEntity):
 
 
 
-def safe_int(v):
+def safe_int(v, def_on=1, def_off=0, def_val=None):
     if v == 'ON':
-        return 1
+        return def_on
     elif v == 'OFF':
-        return 0
+        return def_off
     try:
         return int(v)
     except (ValueError, TypeError):
-        return None
+        return def_val

custom_components/mega/http.py

@@ -135,6 +135,7 @@ 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)
@@ -147,7 +148,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:
+        if hub.fake_response and 'value' not in data and 'pt' in data and port in hub.binary_sensors:
             if 'd' in ret:
                 await hub.request(pt=port, cmd=ret)
             else:

custom_components/mega/hub.py

@@ -9,10 +9,10 @@ import re
 import json
 
 from bs4 import BeautifulSoup
+
+from homeassistant.components.sensor import SensorDeviceClass
 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.const import ( TEMP_CELSIUS, PERCENTAGE, LIGHT_LUX
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
@@ -45,10 +45,10 @@ UNITS = {
     LUX: LIGHT_LUX
 }
 CLASSES = {
-    TEMP: DEVICE_CLASS_TEMPERATURE,
-    HUM: DEVICE_CLASS_HUMIDITY,
-    PRESS: DEVICE_CLASS_PRESSURE,
-    LUX: DEVICE_CLASS_ILLUMINANCE
+    TEMP: SensorDeviceClass.TEMPERATURE,
+    HUM: SensorDeviceClass.HUMIDITY,
+    PRESS: SensorDeviceClass.PRESSURE,
+    LUX: SensorDeviceClass.ILLUMINANCE
 }
 I2C_DEVICE_TYPES = {
     "2":  LUX,  # BH1750
@@ -164,6 +164,7 @@ class MegaD:
             hass.data[DOMAIN][CONF_HTTP].protected = protected
         except Exception:
             self.lg.exception('while setting allowed hosts')
+        self.binary_sensors = []
 
     async def start(self):
         pass
@@ -309,8 +310,8 @@ class MegaD:
                             return ret
                 except asyncio.TimeoutError:
                     self.lg.warning(f'timeout while requesting {url}')
-                    raise
-                    # await asyncio.sleep(1)
+                    # raise
+                    await asyncio.sleep(1)
             raise asyncio.TimeoutError('after 3 tries')
 
     async def save(self):
@@ -426,7 +427,7 @@ class MegaD:
     def subscribe(self, port, callback):
         port = int_ignore(port)
         self.lg.debug(
-            f'subscribe %s %s', port, callback
+            f'subscribe %s', port,
         )
         self.http.callbacks[self.id][port].append(callback)
 

custom_components/mega/i2c.py

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

custom_components/mega/light.py

@@ -1,6 +1,9 @@
 """Platform for light integration."""
+from __future__ import annotations
+
 import asyncio
 import logging
+import typing
 from datetime import timedelta, datetime
 from functools import partial
 
@@ -13,8 +16,8 @@ from homeassistant.components.light import (
     SUPPORT_BRIGHTNESS,
     LightEntity,
     SUPPORT_TRANSITION,
-    SUPPORT_COLOR,
-    SUPPORT_WHITE_VALUE
+    SUPPORT_COLOR, ColorMode, LightEntityFeature,
+    # SUPPORT_WHITE_VALUE
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -115,6 +118,7 @@ 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
@@ -127,7 +131,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
     def max_values(self) -> list:
         if self._max_values is None:
             if self.is_ws:
-                self._max_values = [255] * 3
+                self._max_values = [255] * 4
             else:
                 self._max_values = [
                     255 if isinstance(x, int) else 4095 for x in self.port
@@ -142,10 +146,34 @@ 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))
+        # 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)
 
     @property
     def brightness(self):
@@ -161,12 +189,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
 
     @property
     def supported_features(self):
-        return (
-            SUPPORT_BRIGHTNESS |
-            SUPPORT_TRANSITION |
-            SUPPORT_COLOR |
-            (SUPPORT_WHITE_VALUE if len(self.port) == 4 else 0)
-        )
+        return LightEntityFeature.TRANSITION
 
     def get_rgbw(self):
         if not self.is_on:
@@ -224,6 +247,7 @@ 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.0.10b5"
+  "version": "v1.1.5b0"
 }

custom_components/mega/sensor.py

@@ -4,9 +4,7 @@ import voluptuous as vol
 import struct
 
 from homeassistant.components.sensor import (
-    PLATFORM_SCHEMA as SENSOR_SCHEMA,
-    DEVICE_CLASS_TEMPERATURE,
-    DEVICE_CLASS_HUMIDITY
+    PLATFORM_SCHEMA as SENSOR_SCHEMA, SensorEntity, SensorDeviceClass
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -21,7 +19,7 @@ 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_SKIP, CONF_FILTER_VALUES, CONF_FILTER_SCALE, CONF_FILTER_LOW, CONF_FILTER_HIGH, CONF_FILL_NA
 from .hub import MegaD
 import re
 
@@ -40,8 +38,8 @@ UNITS = {
     HUM: '%'
 }
 CLASSES = {
-    TEMP: DEVICE_CLASS_TEMPERATURE,
-    HUM: DEVICE_CLASS_HUMIDITY
+    TEMP: SensorDeviceClass.TEMPERATURE,
+    HUM: SensorDeviceClass.HUMIDITY
 }
 # Validation of the user's configuration
 _ITEM = {
@@ -94,7 +92,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', port, data)
+                hub.lg.debug(f'add sensor on port %s with data %s, constructor: %s', port, data, _constructors[tp])
                 sensor = _constructors[tp](
                     mega=hub,
                     port=port,
@@ -108,26 +106,34 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
     async_add_devices(devices)
 
 
-class FilterBadValues(MegaPushEntity):
+class FilterBadValues(MegaPushEntity, SensorEntity):
 
     def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
         self._prev_value = None
+        super().__init__(*args, **kwargs)
 
     def filter_value(self, value):
-        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
-                )
+        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
+                    )
             ):
-            value = self._prev_value
-        self._prev_value = value
-        return value
+                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):
@@ -145,6 +151,10 @@ class FilterBadValues(MegaPushEntity):
     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):
 
@@ -163,35 +173,52 @@ class MegaI2C(FilterBadValues):
 
     @property
     def customize(self):
-        return super().customize.get(self.id_suffix, {}) or {}
+        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
 
     @property
     def device_class(self):
         return self._device_class
 
     @property
-    def unit_of_measurement(self):
+    def native_unit_of_measurement(self):
         return self._unit_of_measurement
 
     @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))
+    def native_value(self):
         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
-        ret = self.filter_value(ret)
-        return str(ret)
+            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))
+            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
+            ret = self.filter_value(ret)
+            if ret is not None:
+                return str(ret)
+        except Exception:
+            lg.exception('while getting value')
+            return None
 
     @property
     def device_class(self):
@@ -202,8 +229,8 @@ class Mega1WSensor(FilterBadValues):
 
     def __init__(
             self,
-            unit_of_measurement,
-            device_class,
+            unit_of_measurement=None,
+            device_class=None,
             key=None,
             *args,
             **kwargs
@@ -215,14 +242,15 @@ 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._value = None
         self.key = key
+        self._value = None
         self._device_class = device_class
         self._unit_of_measurement = unit_of_measurement
         self.mega.sensors.append(self)
+        self.prev_value = None
 
     @property
-    def unit_of_measurement(self):
+    def native_unit_of_measurement(self):
         _u = self.customize.get(CONF_UNIT_OF_MEASUREMENT, None)
         if _u is None:
             return self._unit_of_measurement
@@ -238,7 +266,7 @@ class Mega1WSensor(FilterBadValues):
         if self.key:
             return super().unique_id + f'_{self.key}'
         else:
-            return super(Mega1WSensor, self).unique_id
+            return super().unique_id
 
     @property
     def device_class(self):
@@ -253,49 +281,63 @@ class Mega1WSensor(FilterBadValues):
             return self._device_class
 
     @property
-    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(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._state is not None:
-            ret = self._state.state
+    def native_value(self):
         try:
-            ret = float(ret)
-            ret = str(ret)
-        except:
             ret = None
-        if self.customize.get(CONF_HEX_TO_FLOAT):
+            if not hasattr(self, 'key'):
+                return None
+            if self.key:
+                try:
+                    ret = self.mega.values.get(self.port, {})
+                    if isinstance(ret, dict):
+                        ret = ret.get('value', {})
+                        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 = struct.unpack('!f', bytes.fromhex(ret))[0]
+                ret = float(ret)
+                ret = str(ret)
             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))
-        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
-        ret = self.filter_value(ret)
-        return str(ret)
+                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))
+            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
+            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
 
     @property
     def name(self):
         n = super().name
         c = self.customize.get(CONF_NAME, {})
         if isinstance(c, dict):
-            c = c.get(self.key)
+            try:
+                c = c.get(self.key)
+            except:
+                pass
         return c or n
 
 

custom_components/mega/tools.py

@@ -50,6 +50,10 @@ 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/yaml.md

@@ -1,6 +1,25 @@
 С помощью 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"
@@ -62,8 +81,11 @@ mega:
 !!! note ""
     - **smooth** (float, 0): программное плавное диммирование. Это поле отвечает за кол-во секунд, за которое яркость
     диммера набирает от 0 до 100%
-    - **limits** (list[int, int], [0, 255]), *начиная с версии 1.1.0*: границы диммирования в абсолютных единицах контроллера. При диммировании 1%
+    - **range** (list[int, int], [0, 255]), *начиная с версии 1.1.0*: границы диммирования в абсолютных единицах 0..255. При диммировании 1%
     будет равен левой границе, 100% - правой.
+    ```yaml
+    range: [20, 200]
+    ```
 [Подробнее про плавное диммирование](smooth.md)
 ### MegaD-16R-XT, MegaD-16PWM
 Порты расширителей MegaD-16R-XT, MegaD-16PWM конфигурируются аналогично обычным реле и диммерам, но адресация порта 
@@ -165,6 +187,8 @@ some_led2:
     - **filter_scale** (float, none): значение отклонения от текущего значения, которое будет считаться выбросом и отфильтруется, например если
     установить 1, то это означает, что при росте показателя сенсора на 100% и больше или падении на 100% и больше, такое значение не будет отображаться.
     [Доступно так же глобальное значение](#filter_scale)
+    - **fill_na** (str, last): чем заполнять пропуски, по-умолчанию last, что означает последнее значение, можно так же поставить none-тогда будут пропуски (разрывы на графике).
+
 При этом есть так же особенности адресации, так для сенсора на одном порте с одним значением:
 ```yaml
 36:
@@ -189,10 +213,10 @@ some_led2:
     # конфиг
 ```
 #### i2c {: #i2c}
-Для сенсоров i2c адресация конфига такая:
+Для сенсоров i2c нужно так же указать id сенсора, который можно посмотреть в атрибутах объекта на [странице разработчика](https://my.home-assistant.io/redirect/developer_states/).
 ```yaml
 36:
-  htu21d_humidity:  # entity_id сенсора без приставки sensor., видно в интерфейсе HA
+  htu21d_humidity:  # i2c_id
     # конфиг
 ```
 [Подробнее про i2c](i2c.md)

mkdocs.yml

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