do not update all if "v" parametr

custom_components/mega/__init__.py

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

custom_components/mega/exceptions.py

@@ -15,3 +15,7 @@ class DuplicateId(exceptions.HomeAssistantError):
 
 class InvalidAuth(exceptions.HomeAssistantError):
     """Error to indicate there is invalid auth."""
+
+
+class NoPort(Exception):
+    pass

custom_components/mega/http.py

@@ -8,16 +8,15 @@ from aiohttp.web_request import Request
 from aiohttp.web_response import Response
 
 from homeassistant.helpers.template import Template
-from .const import EVENT_BINARY_SENSOR, DOMAIN, CONF_RESPONSE_TEMPLATE
 from homeassistant.components.http import HomeAssistantView
 from homeassistant.core import HomeAssistant
+from .const import EVENT_BINARY_SENSOR, DOMAIN, CONF_RESPONSE_TEMPLATE
 from .tools import make_ints
 from . import hub as h
 _LOGGER = logging.getLogger(__name__).getChild('http')
 
 
 class MegaView(HomeAssistantView):
-    """Handle Yandex Smart Home unauthorized requests."""
 
     url = '/mega'
     name = 'mega'
@@ -31,7 +30,7 @@ class MegaView(HomeAssistantView):
             mid: {
                 pt: cfg[mid][pt][CONF_RESPONSE_TEMPLATE]
                 for pt in cfg[mid]
-                if CONF_RESPONSE_TEMPLATE in cfg[mid][pt]
+                if isinstance(pt, int) and CONF_RESPONSE_TEMPLATE in cfg[mid][pt]
             } for mid in cfg if isinstance(cfg[mid], dict)
         }
         _LOGGER.debug('templates: %s', self.templates)
@@ -62,6 +61,10 @@ class MegaView(HomeAssistantView):
         make_ints(data)
         port = data.get('pt')
         data = data.copy()
+        update_all = True
+        if 'v' in data:
+            update_all = False
+            data['value'] = data.pop('v')
         data['mega_id'] = hub.id
         ret = 'd'
         if port is not None:
@@ -69,7 +72,7 @@ class MegaView(HomeAssistantView):
             for cb in self.callbacks[hub.id][port]:
                 cb(data)
             template: Template = self.templates.get(hub.id, {}).get(port)
-            if hub.update_all:
+            if hub.update_all and update_all:
                 asyncio.create_task(self.later_update(hub))
             if template is not None:
                 template.hass = hass

custom_components/mega/hub.py

@@ -10,15 +10,19 @@ import json
 
 from bs4 import BeautifulSoup
 from homeassistant.components import mqtt
-from homeassistant.const import (DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_PRESSURE, 
-        DEVICE_CLASS_ILLUMINANCE, TEMP_CELSIUS, PERCENTAGE, LIGHT_LUX)
+from homeassistant.const import (
+    DEVICE_CLASS_TEMPERATURE, DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_ILLUMINANCE, TEMP_CELSIUS, PERCENTAGE, LIGHT_LUX
+)
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-from .const import TEMP, HUM, PRESS, LUX, PATT_SPLIT, DOMAIN, CONF_HTTP, EVENT_BINARY_SENSOR, CONF_CUSTOM, CONF_SKIP, \
-    CONF_FORCE_D
+from .const import (
+    TEMP, HUM, PRESS,
+    LUX, PATT_SPLIT, DOMAIN,
+    CONF_HTTP, EVENT_BINARY_SENSOR, CONF_CUSTOM, CONF_FORCE_D
+)
 from .entities import set_events_off, BaseMegaEntity
-from .exceptions import CannotConnect
+from .exceptions import CannotConnect, NoPort
 from .tools import make_ints
 
 TEMP_PATT = re.compile(r'temp:([01234567890\.]+)')
@@ -44,13 +48,11 @@ CLASSES = {
     LUX: DEVICE_CLASS_ILLUMINANCE
 }
 I2C_DEVICE_TYPES = {
-    "2":  LUX, # BH1750
-    "3":  LUX, # TSL2591
-    "7":  LUX, # MAX44009
-    "70": LUX, # OPT3001
+    "2":  LUX,  # BH1750
+    "3":  LUX,  # TSL2591
+    "7":  LUX,  # MAX44009
+    "70": LUX,  # OPT3001
 }
-class NoPort(Exception):
-    pass
 
 
 class MegaD:
@@ -191,8 +193,7 @@ class MegaD:
 
     async def poll(self):
         """
-        Send get port 0 every poll_interval. When answer is received, mega.<id> becomes online else mega.<id> becomes
-        offline
+        Polling ports
         """
         self.lg.debug('poll')
         if self.mqtt is None:

custom_components/mega/manifest.json

@@ -15,5 +15,5 @@
     "@andvikt"
   ],
   "issue_tracker": "https://github.com/andvikt/mega_hacs/issues",
-  "version": "v0.3.17"
+  "version": "v0.3.19"
 }

readme.md

@@ -4,7 +4,7 @@
 [![hacs_badge](https://img.shields.io/badge/HACS-Custom-orange.svg)](https://github.com/custom-components/hacs)
 [![Donate](https://img.shields.io/badge/donate-Yandex-red.svg)](https://yoomoney.ru/to/410013955329136)
 
-Интеграция с [MegaD-2561](https://www.ab-log.ru/smart-house/ethernet/megad-2561)
+Интеграция с [MegaD-2561, MegaD-328](https://www.ab-log.ru/smart-house/ethernet/megad-2561)
 
 ## Основные особенности:
 - Настройка в веб-интерфейсе + yaml
@@ -110,7 +110,6 @@ mega:
       # эти параметры можно использовать в условиях или непосредственно в шаблоне в виде {{pt}}
       response_template: >-
         {% if m==2 %}1:0{% else %}d{% endif %}
-    
 ```
 
 Начиная с версии v0.3.17 ответ можно слать так же и в режиме MQTT. Аналогично, темплейт должен возвращать готовую команду