Bump version: 1.1.1b0 → 1.1.1b1

fix filters positive float

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.0
+current_version = 1.1.1b1
 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
@@ -83,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_VALUES): [vol.Coerce(float)],
-    vol.Optional(CONF_FILTER_SCALE): cv.positive_float,
+    vol.Optional(CONF_FILTER_SCALE): vol.Coerce(float),
-    vol.Optional(CONF_FILTER_LOW): cv.positive_float,
+    vol.Optional(CONF_FILTER_LOW): vol.Coerce(float),
-    vol.Optional(CONF_FILTER_HIGH): cv.positive_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): {

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/entities.py

@@ -86,7 +86,6 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
             self.mega.ds2413_ports |= {self.port}
         super().__init__(coordinator=mega.updater)
 
-
     @property
     def is_ws(self):
         return False
@@ -131,9 +130,6 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
             return {}
         if self._customize is None:
             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 {}

custom_components/mega/hub.py

@@ -427,7 +427,7 @@ class MegaD:
     def subscribe(self, port, callback):
         port = int_ignore(port)
         self.lg.debug(
-            f'subscribe %s %s', port, str(callback)
+            f'subscribe %s', port,
         )
         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):
@@ -32,39 +41,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
-                    params['delay'] = c.delay
+                req.append(_params)
-                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:
+            if 'addr' in _params:
-                suffix += f"_{params['addr']}" if suffix else str(params['addr'])
+                suffix += f"_{_params['addr']}" if suffix else str(_params['addr'])
             if suffix:
                 _dev = f'{dev}_{suffix}'
             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
 
 
@@ -83,7 +93,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/manifest.json

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

docs/yaml.md

@@ -83,6 +83,9 @@ mega:
     диммера набирает от 0 до 100%
     - **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 конфигурируются аналогично обычным реле и диммерам, но адресация порта