fix ptsensor

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

custom_components/mega/hub.py

@@ -530,9 +530,17 @@ class MegaD:
         :return:
         """
         _params = tuple(params.items())
-        return {
+        delay = None
+        if 'delay' in params:
+            delay = params.pop('delay')
+        ret = {
             _params: await self.request(**params)
         }
+        self.lg.debug('i2c response: %s', ret)
+        if 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))
@@ -588,8 +596,11 @@ class MegaD:
                     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].append(parsed)
+                    ret['i2c'][port].extend(parsed)
                     i2c_sensors.extend(req)
+            elif cfg.pty == '4' and cfg.m == '2':
+                # scl исключаем из сканирования
+                continue
             elif cfg.pty in ('3', '2', '4'):
                 http_cmd = 'get'
                 if cfg.d == '5' and cfg.pty == '3':

custom_components/mega/i2c.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass, field
 from urllib.parse import parse_qsl, urlparse
 from bs4 import BeautifulSoup
 from homeassistant.const import (
@@ -17,36 +18,43 @@ def parse_scan_page(page: str):
         if params is None:
             continue
         params = dict(parse_qsl(urlparse(params).query))
-        if 'i2c_dev' in params:
-            dev = params['i2c_dev']
-            classes = i2c_classes.get(dev, [])
-            for i, c in enumerate(classes):
-                if c is Skip:
-                    continue
-                elif c is Request:
-                    req.append(params)
-                    continue
-                elif isinstance(c, tuple):
-                    suffix, c = c
-                elif isinstance(c, str):
-                    suffix = c
-                else:
-                    suffix = ''
-                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
-                ret.append({
-                    'id_suffix': _dev,
-                    'device_class': c,
-                    'params': params,
-                })
+        dev = params.get('i2c_dev')
+        if dev is None:
+            continue
+        classes = i2c_classes.get(dev, [])
+        for i, c in enumerate(classes):
+            if c is Skip:
+                continue
+            elif c is Request:
                 req.append(params)
+                continue
+            elif isinstance(c, Request):
+                if c.delay:
+                    params = params.copy()
+                    params['delay'] = c.delay
+                req.append(params)
+                continue
+            elif isinstance(c, tuple):
+                suffix, c = c
+            elif isinstance(c, str):
+                suffix = c
+            else:
+                suffix = ''
+            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
+            ret.append({
+                'id_suffix': _dev,
+                'device_class': c,
+                'params': params,
+            })
+            req.append(params)
     return req, ret
 
 
@@ -54,8 +62,9 @@ class Skip:
     pass
 
 
+@dataclass
 class Request:
-    pass
+    delay: float = None
 
 
 i2c_classes = {
@@ -91,7 +100,8 @@ i2c_classes = {
         ('object', DEVICE_CLASS_TEMPERATURE),
     ],
     'ptsensor': [
-        Request,  # запрос на измерение
+        Skip,
+        Request(delay=1),  # запрос на измерение
         DEVICE_CLASS_PRESSURE,
         DEVICE_CLASS_TEMPERATURE,
     ],

custom_components/mega/sensor.py

@@ -109,8 +109,10 @@ class MegaI2C(MegaPushEntity):
     def device_class(self):
         return self._device_class
 
+    @property
     def state(self):
-        return self.mega.values[self._params]
+        # self.lg.debug(f'get % all states: %', self._params, self.mega.values)
+        return self.mega.values.get(self._params)
 
     @property
     def device_class(self):

custom_components/mega/tools.py

@@ -57,7 +57,7 @@ class PriorityLock(asyncio.Lock):
                 locked and returns True.
                 """
         if (not self._locked and (self._waiters is None or
-                                  all(w.cancelled() for _, w in self._waiters))):
+                                  all(w.cancelled() for _, _, w in self._waiters))):
             self._locked = True
             return True
 

readme.md

@@ -30,8 +30,8 @@
   выполнении предыдущей.
 - поддержка [ds2413](https://www.ab-log.ru/smart-house/ethernet/megad-2w) (начиная с версии 0.4.1)
 - поддержка MCP23008/MCP23017/PCA9685 (начиная с версии 0.5.1)
-- поддержка всех возможных датчиков в режиме I2C-ANY, полный список поддерживаемых датчиков датчиков 
-  [по ссылке](https://github.com/andvikt/mega_hacs/wiki/ш2с)
+- поддержка всех возможных датчиков в режиме I2C-ANY, полный список поддерживаемых датчиков 
+  [по ссылке](https://github.com/andvikt/mega_hacs/wiki/i2c) (начиная с версии 0.6.1)
 
 ## Установка
 Рекомендованный способ с поддержкой обновлений - [HACS](https://hacs.xyz/docs/installation/installation):