Bump version: 1.1.0 → 1.1.1b0

fix filters positive float

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.11b0
+current_version = 1.1.1b0
 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,7 @@ 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
 from .hub import MegaD
 from .config_flow import ConfigFlow
 from .http import MegaView
@@ -52,6 +53,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 +84,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): {
@@ -104,10 +113,11 @@ CONFIG_SCHEMA = vol.Schema(
     {
         DOMAIN: {
             vol.Optional(CONF_ALLOW_HOSTS): [str],
-            vol.Optional('entities'): vol.Any(
+            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(

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,6 +45,7 @@ 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'

custom_components/mega/entities.py

@@ -12,7 +12,7 @@ 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 +54,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 +84,8 @@ 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,10 +127,13 @@ 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(self.entity_id, {})
+            c_entity_id = self.hass.data.get(DOMAIN, {}).get(CONF_CUSTOM).get('entities', {}).get(self.entity_id, {})
+            self.lg.debug(
+                'customize %s with %s', self.entity_id, c_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 {}
@@ -168,9 +172,9 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
 
     @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
+        # if self._lg is None:
+        #     self._lg = self.mega.lg.getChild(self._name or self.unique_id)
+        return _LOGGER
 
     @property
     def available(self) -> bool:
@@ -303,35 +307,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:
@@ -417,6 +429,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
@@ -426,6 +460,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:
@@ -469,7 +504,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"
@@ -505,12 +540,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/hub.py

@@ -310,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):
@@ -427,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 %s', port, str(callback)
         )
         self.http.callbacks[self.id][port].append(callback)
 

custom_components/mega/i2c.py

@@ -1,4 +1,5 @@
-from dataclasses import dataclass, field
+import typing
+from dataclasses import dataclass, field, astuple
 from urllib.parse import parse_qsl, urlparse
 from bs4 import BeautifulSoup
 from homeassistant.const import (
@@ -15,7 +16,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):
@@ -44,7 +53,9 @@ def parse_scan_page(page: str):
                 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
@@ -83,7 +94,7 @@ i2c_classes = {
         DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
     ],
     'sht31': [
-        DeviceType(DEVICE_CLASS_HUMIDITY, PERCENTAGE, None),
+        DeviceType(DEVICE_CLASS_HUMIDITY, PERCENTAGE, None, delay=0.5),
         DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
     ],
     'max44009': [

custom_components/mega/light.py

@@ -1,6 +1,7 @@
 """Platform for light integration."""
 import asyncio
 import logging
+import typing
 from datetime import timedelta, datetime
 from functools import partial
 

custom_components/mega/manifest.json

@@ -15,5 +15,5 @@
     "@andvikt"
   ],
   "issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
-  "version": "v1.0.11b0"
+  "version": "v1.1.1b0"
 }

custom_components/mega/sensor.py

@@ -21,7 +21,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
 
@@ -94,7 +94,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,
@@ -111,21 +111,25 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
 class FilterBadValues(MegaPushEntity):
 
     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 \
+        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
+                    abs(value - self._prev_value) / self._prev_value > self.filter_scale
                 )
             ):
-            value = self._prev_value
+            if self.fill_na == 'last':
+                value = self._prev_value
+            else:
+                value = None
         self._prev_value = value
         return value
 
@@ -145,6 +149,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,7 +171,12 @@ 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):
@@ -183,7 +196,6 @@ class MegaI2C(FilterBadValues):
 
     @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:
@@ -199,7 +211,8 @@ class MegaI2C(FilterBadValues):
         except:
             ret = ret
         ret = self.filter_value(ret)
-        return str(ret)
+        if ret is not None:
+            return str(ret)
 
     @property
     def device_class(self):
@@ -223,8 +236,8 @@ 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)
@@ -247,7 +260,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):
@@ -264,6 +277,8 @@ class Mega1WSensor(FilterBadValues):
     @property
     def state(self):
         ret = None
+        if not hasattr(self, 'key'):
+            return None
         if self.key:
             try:
                 ret = self.mega.values.get(self.port, {})
@@ -276,13 +291,15 @@ class Mega1WSensor(FilterBadValues):
                 return
         else:
             ret = self.mega.values.get(self.port, {}).get('value')
-        if ret is None and self._state is not None:
+        if ret is None and self.fill_na == 'fill_na' and self.prev_value is not None:
+            ret = self.prev_value
+        elif ret is None and self.fill_na == 'fill_na' and self._state is not None:
             ret = self._state.state
         try:
             ret = float(ret)
             ret = str(ret)
         except:
-            self.lg.warning(f'could not convert to float "{ret}"')
+            self.lg.debug(f'could not convert to float "{ret}"')
             ret = self.prev_value
         if self.customize.get(CONF_HEX_TO_FLOAT):
             try:
@@ -299,14 +316,18 @@ class Mega1WSensor(FilterBadValues):
             pass
         ret = self.filter_value(ret)
         self.prev_value = ret
-        return str(ret)
+        if ret is not None:
+            return str(ret)
 
     @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
 
 

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:

mkdocs.yml

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