Bump version: 1.1.4b0 → 1.1.4

fix filters positive float

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.10b19
+current_version = 1.1.4
 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_FILL_NA
+    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
@@ -83,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_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): {
@@ -107,6 +109,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(
     {
@@ -133,7 +140,8 @@ CONFIG_SCHEMA = vol.Schema(
                 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_1WBUS): [OWBUS]
         }
     },
     extra=vol.ALLOW_EXTRA,

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

@@ -50,6 +50,8 @@ 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

@@ -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 {}
@@ -165,15 +161,12 @@ class BaseMegaEntity(CoordinatorEntity, RestoreEntity):
             ],
             "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:
-        # if self._lg is None:
-        #     self._lg = self.mega.lg.getChild(self._name or self.unique_id)
         return _LOGGER
 
     @property
@@ -430,6 +423,8 @@ class MegaOutPort(MegaPushEntity):
         ))
 
     def _calc_brightness(self, brightness):
+        if brightness is None:
+            brightness = 0
         pct = brightness / 255
         pct = max((0, pct))
         pct = min((pct, 1))
@@ -439,6 +434,8 @@ class MegaOutPort(MegaPushEntity):
         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

custom_components/mega/http.py

@@ -134,7 +134,8 @@ class MegaView(HomeAssistantView):
                         if ret == 'd' and act:
                             await hub.request(cmd=act.replace(':3', f':{v}'))
                         ret = 'd' if hub.force_d else ''
-            elif port in hub.binary_sensors:
+            else:
+            # elif port in hub.binary_sensors:
                 hub.values[port] = data
                 for cb in self.callbacks[hub.id][port]:
                     cb(data)

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=1.5),
         DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
     ],
     'max44009': [
@@ -115,7 +125,7 @@ i2c_classes = {
     ],
     'ptsensor': [
         Skip,
-        Request(delay=1),  # запрос на измерение
+        Request(delay=3),  # запрос на измерение
         DeviceType(DEVICE_CLASS_PRESSURE, PRESSURE_BAR, None),
         DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
     ],

custom_components/mega/light.py

@@ -1,4 +1,6 @@
 """Platform for light integration."""
+from __future__ import annotations
+
 import asyncio
 import logging
 import typing
@@ -14,8 +16,8 @@ from homeassistant.components.light import (
     SUPPORT_BRIGHTNESS,
     LightEntity,
     SUPPORT_TRANSITION,
-    SUPPORT_COLOR,
+    SUPPORT_COLOR, ColorMode, LightEntityFeature,
-    SUPPORT_WHITE_VALUE
+    # SUPPORT_WHITE_VALUE
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -116,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
@@ -143,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:
+        # if self.supported_features & SUPPORT_WHITE_VALUE:
-            return float(self.get_attribute('white_value', 0))
+        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):
@@ -162,12 +189,7 @@ class MegaRGBW(LightEntity, BaseMegaEntity):
 
     @property
     def supported_features(self):
-        return (
+        return LightEntityFeature.TRANSITION
-            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:
@@ -225,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.10b19"
+  "version": "v1.1.4"
 }

custom_components/mega/sensor.py

@@ -6,7 +6,7 @@ import struct
 from homeassistant.components.sensor import (
     PLATFORM_SCHEMA as SENSOR_SCHEMA,
     DEVICE_CLASS_TEMPERATURE,
-    DEVICE_CLASS_HUMIDITY
+    DEVICE_CLASS_HUMIDITY, SensorEntity
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -108,30 +108,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):
         self._prev_value = None
         super().__init__(*args, **kwargs)
 
     def filter_value(self, value):
-        if value \
+        try:
-                in self.filter_values \
+            if value \
-           or (self.filter_low is not None and value < self.filter_low) \
+                    in self.filter_values \
-           or (self.filter_high is not None and value > self.filter_high) \
+               or (self.filter_low is not None and value < self.filter_low) \
-           or (
+               or (self.filter_high is not None and value > self.filter_high) \
-                self._prev_value is not None
+               or (
-                and self.filter_scale is not None
+                    self._prev_value is not None
-                and (
+                    and self.filter_scale is not None
-                    abs(value - self._prev_value) / self._prev_value > self.filter_scale
+                    and (
-                )
+                        abs(value - self._prev_value) / self._prev_value > self.filter_scale
-            ):
+                    )
-            if self.fill_na == 'last':
+                ):
-                value = self._prev_value
+                if self.fill_na == 'last':
-            else:
+                    value = self._prev_value
-                value = None
+                else:
-        self._prev_value = value
+                    value = None
-        return value
+            self._prev_value = value
+            return value
+        except Exception as exc:
+            lg.exception(f'while parsing value')
+            return None
 
     @property
     def filter_values(self):
@@ -191,28 +195,32 @@ class MegaI2C(FilterBadValues):
         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):
+    def native_value(self):
-        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)
+            ret = self.mega.values.get(self._params)
-            if tmpl is not None and self.hass is not None:
+            if self.customize.get(CONF_HEX_TO_FLOAT):
-                tmpl.hass = self.hass
+                try:
-                ret = tmpl.async_render({'value': ret})
+                    ret = struct.unpack('!f', bytes.fromhex(ret))[0]
-        except:
+                except:
-            ret = ret
+                    self.lg.warning(f'could not convert {ret} form hex to float')
-        ret = self.filter_value(ret)
+            tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
-        if ret is not None:
+            try:
-            return str(ret)
+                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):
@@ -244,7 +252,7 @@ class Mega1WSensor(FilterBadValues):
         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
@@ -275,49 +283,53 @@ class Mega1WSensor(FilterBadValues):
             return self._device_class
 
     @property
-    def state(self):
+    def native_value(self):
-        ret = None
+        try:
-        if not hasattr(self, 'key'):
+            ret = None
-            return None
+            if not hasattr(self, 'key'):
-        if self.key:
+                return None
-            try:
+            if self.key:
-                ret = self.mega.values.get(self.port, {})
+                try:
-                if isinstance(ret, dict):
+                    ret = self.mega.values.get(self.port, {})
-                    ret = ret.get('value', {})
                     if isinstance(ret, dict):
-                        ret = ret.get(self.key)
+                        ret = ret.get('value', {})
-            except:
+                        if isinstance(ret, dict):
-                self.lg.error(self.mega.values.get(self.port, {}).get('value', {}))
+                            ret = ret.get(self.key)
-                return
+                except:
-        else:
+                    self.lg.error(self.mega.values.get(self.port, {}).get('value', {}))
-            ret = self.mega.values.get(self.port, {}).get('value')
+                    return
-        if ret is None and self.fill_na == 'fill_na' and self.prev_value is not None:
+            else:
-            ret = self.prev_value
+                ret = self.mega.values.get(self.port, {}).get('value')
-        elif ret is None and self.fill_na == 'fill_na' 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._state.state
+                ret = self.prev_value
-        try:
+            elif ret is None and self.fill_na == 'fill_na' and self._state is not None:
-            ret = float(ret)
+                ret = self._state.state
-            ret = str(ret)
-        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]
+                ret = float(ret)
+                ret = str(ret)
             except:
-                self.lg.warning(f'could not convert {ret} form hex to float')
+                self.lg.debug(f'could not convert to float "{ret}"')
-        tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
+                ret = self.prev_value
-        try:
+            if self.customize.get(CONF_HEX_TO_FLOAT):
-            ret = float(ret)
+                try:
-            if tmpl is not None and self.hass is not None:
+                    ret = struct.unpack('!f', bytes.fromhex(ret))[0]
-                tmpl.hass = self.hass
+                except:
-                ret = tmpl.async_render({'value': ret})
+                    self.lg.warning(f'could not convert {ret} form hex to float')
-        except:
+            tmpl: Template = self.customize.get(CONF_CONV_TEMPLATE, self.customize.get(CONF_VALUE_TEMPLATE))
-            pass
+            try:
-        ret = self.filter_value(ret)
+                ret = float(ret)
-        self.prev_value = ret
+                if tmpl is not None and self.hass is not None:
-        if ret is not None:
+                    tmpl.hass = self.hass
-            return str(ret)
+                    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):

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"
@@ -64,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 конфигурируются аналогично обычным реле и диммерам, но адресация порта 

mkdocs.yml

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