fix validation error

add DEVICE_CLASS_CO2

custom_components/mega/__init__.py

@@ -99,7 +99,7 @@ CONFIG_SCHEMA = vol.Schema(
     {
         DOMAIN: {
             vol.Optional(CONF_ALLOW_HOSTS): [str],
-            vol.Required(str, description='id меги из веб-интерфейса'): {
+            vol.Optional(vol.Any(str, int), description='id меги из веб-интерфейса'): {
                 vol.Optional(CONF_FORCE_D, description='Принудительно слать d после срабатывания входа', default=False): bool,
                 vol.Optional(
                     CONF_DEF_RESPONSE,

custom_components/mega/const.py

@@ -64,7 +64,7 @@ LUX = 'lux'
 SINGLE_CLICK = 'single'
 DOUBLE_CLICK = 'double'
 
-PATT_FW = re.compile(r'fw:\s(.+)\)')
+PATT_FW = re.compile(r'fw:\s(.+)\b')
 
 REMOVE_CONFIG = [
     'extenders',

custom_components/mega/hub.py

@@ -91,6 +91,7 @@ class MegaD:
             **kwargs,
     ):
         """Initialize."""
+        self.skip_ports = set()
         if config is not None:
             lg.debug(f'load config: %s', config.data)
         self.config = config
@@ -157,11 +158,10 @@ class MegaD:
         if force_d is not None:
             self.customize[CONF_FORCE_D] = force_d
         try:
-            if allow_hosts is not None:
+            if allow_hosts is not None and DOMAIN in hass.data:
                 allow_hosts = set(allow_hosts.split(';'))
                 hass.data[DOMAIN][CONF_HTTP].allowed_hosts |= allow_hosts
             hass.data[DOMAIN][CONF_HTTP].protected = protected
-
         except Exception:
             self.lg.exception('while setting allowed hosts')
 
@@ -186,7 +186,10 @@ class MegaD:
                 continue
             if x.port in ports:
                 continue
-            await self.get_port(x.port, force_http=True, http_cmd=x.http_cmd)
+            try:
+                await self.get_port(x.port, force_http=True, http_cmd=x.http_cmd)
+            except asyncio.TimeoutError:
+                continue
             ports.append(x.port)
 
     @property
@@ -233,12 +236,15 @@ class MegaD:
         """
         for x in self.ds2413_ports:
             self.lg.debug(f'poll ds2413 for %s', x)
-            await self.get_port(
-                port=x,
-                force_http=True,
-                http_cmd='list',
-                conv=False
-            )
+            try:
+                await self.get_port(
+                    port=x,
+                    force_http=True,
+                    http_cmd='list',
+                    conv=False
+                )
+            except asyncio.TimeoutError:
+                continue
 
     async def poll(self):
         """
@@ -253,6 +259,7 @@ class MegaD:
             ret = await self._update_i2c(x)
             if isinstance(ret, dict):
                 self.values.update(ret)
+
         for x in self.extenders:
             ret = await self._update_extender(x)
             if not isinstance(ret, dict):
@@ -290,14 +297,21 @@ class MegaD:
             url = f"{url}/?{cmd}"
         self.lg.debug('request: %s', url)
         async with self._http_lck(priority):
-            async with aiohttp.request("get", url=url) as req:
-                if req.status != 200:
-                    self.lg.warning('%s returned %s (%s)', url, req.status, await req.text())
-                    return None
-                else:
-                    ret = await req.text()
-                    self.lg.debug('response %s', ret)
-                    return ret
+            for _ntry in range(3):
+                try:
+                    async with aiohttp.request("get", url=url, timeout=aiohttp.ClientTimeout(total=5)) as req:
+                        if req.status != 200:
+                            self.lg.warning('%s returned %s (%s)', url, req.status, await req.text())
+                            return None
+                        else:
+                            ret = await req.text()
+                            self.lg.debug('response %s', ret)
+                            return ret
+                except asyncio.TimeoutError:
+                    self.lg.warning(f'timeout while requesting {url}')
+                    raise
+                    # await asyncio.sleep(1)
+            raise asyncio.TimeoutError('after 3 tries')
 
     async def save(self):
         await self.send_command(cmd='s')
@@ -350,7 +364,10 @@ class MegaD:
         return {e.port for e in self.entities}
 
     async def get_all_ports(self, only_out=False, check_skip=False):
-        ret = await self.request(cmd='all')
+        try:
+            ret = await self.request(cmd='all')
+        except asyncio.TimeoutError:
+            return
         for port, x in enumerate(ret.split(';')):
             if port in self.ds2413_ports:
                 continue
@@ -446,7 +463,10 @@ class MegaD:
         :param port:
         :return:
         """
-        values = await self.request(pt=port, cmd='get')
+        try:
+            values = await self.request(pt=port, cmd='get')
+        except asyncio.TimeoutError:
+            return
         ret = {}
         for i, x in enumerate(values.split(';')):
             ret[f'{port}e{i}'] = x
@@ -458,13 +478,21 @@ class MegaD:
         :param params: параметры url
         :return:
         """
+        pt = params.get('pt')
+        if pt in self.skip_ports:
+            return
+        if pt is not None:
+            pass
         _params = tuple(params.items())
         delay = None
         if 'delay' in params:
             delay = params.pop('delay')
-        ret = {
-            _params: await self.request(**params)
-        }
+        try:
+            ret = {
+                _params: await self.request(**params)
+            }
+        except asyncio.TimeoutError:
+            return
         self.lg.debug('i2c response: %s', ret)
         if delay:
             self.lg.debug('delay %s', delay)
@@ -673,7 +701,7 @@ class MegaD:
                 cmd = dict(
                     pt=config[0][0],
                     chip=chip,
-                    ws=''.join([hex(x).split('x')[1].ljust(2, '0').upper() for x in _next_val])
+                    ws=''.join([hex(x).split('x')[1].rjust(2, '0').upper() for x in _next_val])
                 )
                 await self.request(**cmd)
 

custom_components/mega/i2c.py

@@ -6,6 +6,7 @@ from homeassistant.const import (
     DEVICE_CLASS_TEMPERATURE,
     DEVICE_CLASS_ILLUMINANCE,
     DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_CO2,
     PERCENTAGE,
     LIGHT_LUX,
     TEMP_CELSIUS,
@@ -103,6 +104,10 @@ i2c_classes = {
         DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
         DeviceType(DEVICE_CLASS_HUMIDITY, PERCENTAGE, None)
     ],
+    'dps368': [
+        DeviceType(DEVICE_CLASS_PRESSURE, PRESSURE_BAR, None),
+        DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
+    ],
     'mlx90614': [
         Skip,
         DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, 'temp'),
@@ -119,9 +124,21 @@ i2c_classes = {
         DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),  # сенсор встроенный в микросхему
     ],
     't67xx': [
-        DeviceType(None, CONCENTRATION_PARTS_PER_MILLION, None)  # для co2 нет класса в HA
+        DeviceType(DEVICE_CLASS_CO2, CONCENTRATION_PARTS_PER_MILLION, None)
     ],
     'tmp117': [
         DeviceType(DEVICE_CLASS_TEMPERATURE, TEMP_CELSIUS, None),
-    ]
+    ],
+    'ads1115': [
+        DeviceType(None, None, 'ch0'),
+        DeviceType(None, None, 'ch1'),
+        DeviceType(None, None, 'ch2'),
+        DeviceType(None, None, 'ch3'),
+    ],
+    'ads1015': [
+        DeviceType(None, None, 'ch0'),
+        DeviceType(None, None, 'ch1'),
+        DeviceType(None, None, 'ch2'),
+        DeviceType(None, None, 'ch3'),
+    ],
 }

custom_components/mega/manifest.json

@@ -2,7 +2,7 @@
   "domain": "mega",
   "name": "mega",
   "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/mega_hacs",
+  "documentation": "https://github.com/andvikt/mega_hacs",
   "requirements": [
     "beautifulsoup4",
     "lxml"
@@ -15,5 +15,5 @@
     "@andvikt"
   ],
   "issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
-  "version": "v1.0.1"
+  "version": "v1.0.6b4"
 }

custom_components/mega/sensor.py

@@ -20,7 +20,7 @@ from homeassistant.const import (
 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
+from .const import CONF_KEY, TEMP, HUM, W1, W1BUS, CONF_CONV_TEMPLATE, CONF_HEX_TO_FLOAT, DOMAIN, CONF_CUSTOM, CONF_SKIP
 from .hub import MegaD
 import re
 
@@ -84,9 +84,14 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
     mid = config_entry.data[CONF_ID]
     hub: MegaD = hass.data['mega'][mid]
     devices = []
+    customize = hass.data.get(DOMAIN, {}).get(CONF_CUSTOM, {}).get(mid, {})
     for tp in ['sensor', 'i2c']:
         for port, cfg in config_entry.data.get(tp, {}).items():
             port = int_ignore(port)
+            c = customize.get(port, {})
+            if c.get(CONF_SKIP):
+                hub.skip_ports |= {port}
+                continue
             for data in cfg:
                 hub.lg.debug(f'add sensor on port %s with data %s', port, data)
                 sensor = _constructors[tp](
@@ -146,7 +151,7 @@ class MegaI2C(MegaPushEntity):
                 ret = tmpl.async_render({'value': ret})
         except:
             ret = ret
-        return ret
+        return str(ret)
 
     @property
     def device_class(self):
@@ -241,7 +246,8 @@ class Mega1WSensor(MegaPushEntity):
                 tmpl.hass = self.hass
                 ret = tmpl.async_render({'value': ret})
         except:
-            return ret
+            pass
+        return str(ret)
 
     @property
     def name(self):
@@ -255,4 +261,4 @@ class Mega1WSensor(MegaPushEntity):
 _constructors = {
     'sensor': Mega1WSensor,
     'i2c': MegaI2C,
-}
+}

readme.md

@@ -25,8 +25,7 @@
 - Плавное диммирование для любых диммируемых объектов (в том числе с аппаратной поддержкой и без),
   [подробнее про smooth](https://github.com/andvikt/mega_hacs/wiki/smooth)
 - Возможность работы с несколькими megad
-- Обратная связь по [http](https://github.com/andvikt/mega_hacs/wiki/http) 
-  будет выключена в версиях >= 1.0.0, тк в нем нет необходимости)
+- Обратная связь по [http](https://github.com/andvikt/mega_hacs/wiki/http)
 - Автоматическое восстановление состояний выходов после перезагрузки контроллера
 - Автоматическое добавление/изменение объектов после перезагрузки контроллера
 - [События](https://github.com/andvikt/mega_hacs/wiki/События) на двойные/долгие нажатия