HA dev 20250815.

Author: janiversen

custom_components/modbus/binary_sensor.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import logging
 from typing import Any
 
 from homeassistant.components.binary_sensor import BinarySensorEntity
@@ -24,6 +23,7 @@
 
 from . import get_hub
 from .const import (
+    _LOGGER,
     CALL_TYPE_COIL,
     CALL_TYPE_DISCRETE,
     CONF_SLAVE_COUNT,
@@ -32,8 +32,6 @@
 from .entity import BasePlatform
 from .modbus import ModbusHub
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 1
 
 

custom_components/modbus/climate.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import logging
 import struct
 from typing import Any, cast
 
@@ -44,6 +43,7 @@
 
 from . import get_hub
 from .const import (
+    _LOGGER,
     CALL_TYPE_COIL,
     CALL_TYPE_REGISTER_HOLDING,
     CALL_TYPE_WRITE_COIL,
@@ -104,8 +104,6 @@
 from .entity import BaseStructPlatform
 from .modbus import ModbusHub
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 1
 
 HVACMODE_TO_TARG_TEMP_REG_INDEX_ARRAY = {
@@ -469,9 +467,6 @@ async def async_set_temperature(self, **kwargs: Any) -> None:
 
     async def _async_update(self) -> None:
         """Update Target & Current Temperature."""
-        # remark "now" is a dummy parameter to avoid problems with
-        # async_track_time_interval
-
         self._attr_target_temperature = await self._async_read_register(
             CALL_TYPE_REGISTER_HOLDING,
             self._target_temperature_register[

custom_components/modbus/const.py

@@ -1,6 +1,7 @@
 """Constants used in modbus integration."""
 
 from enum import Enum
+import logging
 
 from homeassistant.const import (
     CONF_ADDRESS,
@@ -96,6 +97,7 @@
 CONF_WRITE_TYPE = "write_type"
 CONF_ZERO_SUPPRESS = "zero_suppress"
 
+DEVICE_ID = "device_id"
 RTUOVERTCP = "rtuovertcp"
 SERIAL = "serial"
 TCP = "tcp"
@@ -177,3 +179,5 @@ class DataType(str, Enum):
 LIGHT_MODBUS_SCALE_MIN = 0
 LIGHT_MODBUS_SCALE_MAX = 100
 LIGHT_MODBUS_INVALID_VALUE = 0xFFFF
+
+_LOGGER = logging.getLogger(__package__)

custom_components/modbus/cover.py

@@ -123,8 +123,6 @@ async def async_close_cover(self, **kwargs: Any) -> None:
 
     async def _async_update(self) -> None:
         """Update the state of the cover."""
-        # remark "now" is a dummy parameter to avoid problems with
-        # async_track_time_interval
         result = await self._hub.async_pb_call(
             self._slave, self._address, 1, self._input_type
         )

custom_components/modbus/entity.py

@@ -6,7 +6,6 @@
 import asyncio
 from collections.abc import Callable
 from datetime import datetime, timedelta
-import logging
 import struct
 from typing import Any, cast
 
@@ -33,6 +32,7 @@
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from .const import (
+    _LOGGER,
     CALL_TYPE_COIL,
     CALL_TYPE_DISCRETE,
     CALL_TYPE_REGISTER_HOLDING,
@@ -68,8 +68,6 @@
 )
 from .modbus import ModbusHub
 
-_LOGGER = logging.getLogger(__name__)
-
 
 class BasePlatform(Entity):
     """Base for readonly platforms."""
@@ -382,8 +380,6 @@ async def async_turn_off(self, **kwargs: Any) -> None:
 
     async def _async_update(self) -> None:
         """Update the entity state."""
-        # remark "now" is a dummy parameter to avoid problems with
-        # async_track_time_interval
         if not self._verify_active:
             self._attr_available = True
             return

custom_components/modbus/light.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import logging
 from typing import Any
 
 from homeassistant.components.light import (
@@ -35,7 +34,6 @@
 from .modbus import ModbusHub
 
 PARALLEL_UPDATES = 1
-_LOGGER = logging.getLogger(__name__)
 
 
 async def async_setup_platform(

custom_components/modbus/manifest.json

@@ -5,6 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/modbus",
   "iot_class": "local_polling",
   "loggers": ["pymodbus"],
-  "requirements": ["pymodbus==3.9.2"],
-  "version": "1.0.0"
+  "requirements": ["pymodbus==3.11.1"]
 }

custom_components/modbus/modbus.py

@@ -5,7 +5,6 @@
 import asyncio
 from collections import namedtuple
 from collections.abc import Callable
-import logging
 from typing import Any
 
 from pymodbus.client import (
@@ -38,6 +37,7 @@
 from homeassistant.util.hass_dict import HassKey
 
 from .const import (
+    _LOGGER,
     ATTR_ADDRESS,
     ATTR_HUB,
     ATTR_SLAVE,
@@ -57,6 +57,7 @@
     CONF_PARITY,
     CONF_STOPBITS,
     DEFAULT_HUB,
+    DEVICE_ID,
     MODBUS_DOMAIN as DOMAIN,
     PLATFORMS,
     RTUOVERTCP,
@@ -70,7 +71,6 @@
 )
 from .validators import check_config
 
-_LOGGER = logging.getLogger(__name__)
 DATA_MODBUS_HUBS: HassKey[dict[str, ModbusHub]] = HassKey(DOMAIN)
 
 
@@ -262,6 +262,8 @@ def __init__(self, hass: HomeAssistant, client_config: dict[str, Any]) -> None:
         self._config_type = client_config[CONF_TYPE]
         self._config_delay = client_config[CONF_DELAY]
         self._pb_request: dict[str, RunEntry] = {}
+        self._connect_task: asyncio.Task
+        self._last_log_error: str = ""
         self._pb_class = {
             SERIAL: AsyncModbusSerialClient,
             TCP: AsyncModbusTcpClient,
@@ -302,13 +304,12 @@ def __init__(self, hass: HomeAssistant, client_config: dict[str, Any]) -> None:
         else:
             self._msg_wait = 0
 
-    def _log_error(self, text: str, error_state: bool = True) -> None:
+    def _log_error(self, text: str) -> None:
+        if text == self._last_log_error:
+            return
+        self._last_log_error = text
         log_text = f"Pymodbus: {self.name}: {text}"
-        if self._in_error:
-            _LOGGER.debug(log_text)
-        else:
-            _LOGGER.error(log_text)
-            self._in_error = error_state
+        _LOGGER.error(log_text)
 
     async def async_pb_connect(self) -> None:
         """Connect to device, async."""
@@ -317,7 +318,7 @@ async def async_pb_connect(self) -> None:
                 await self._client.connect()  # type: ignore[union-attr]
             except ModbusException as exception_error:
                 err = f"{self.name} connect failed, retry in pymodbus  ({exception_error!s})"
-                self._log_error(err, error_state=False)
+                self._log_error(err)
                 return
             message = f"modbus {self.name} communication open"
             _LOGGER.info(message)
@@ -327,7 +328,7 @@ async def async_setup(self) -> bool:
         try:
             self._client = self._pb_class[self._config_type](**self._pb_params)
         except ModbusException as exception_error:
-            self._log_error(str(exception_error), error_state=False)
+            self._log_error(str(exception_error))
             return False
 
         for entry in PB_CALL:
@@ -336,7 +337,7 @@ async def async_setup(self) -> bool:
                 entry.attr, func, entry.value_attr_name
             )
 
-        self.hass.async_create_background_task(
+        self._connect_task = self.hass.async_create_background_task(
             self.async_pb_connect(), "modbus-connect"
         )
 
@@ -365,6 +366,9 @@ async def async_close(self) -> None:
         if self._async_cancel_listener:
             self._async_cancel_listener()
             self._async_cancel_listener = None
+        if not self._connect_task.done():
+            self._connect_task.cancel()
+
         async with self._lock:
             if self._client:
                 try:
@@ -381,7 +385,7 @@ async def low_level_pb_call(
     ) -> ModbusPDU | None:
         """Call sync. pymodbus."""
         kwargs: dict[str, Any] = (
-            {ATTR_SLAVE: slave} if slave is not None else {ATTR_SLAVE: 1}
+            {DEVICE_ID: slave} if slave is not None else {DEVICE_ID: 1}
         )
         entry = self._pb_request[use_call]
 

custom_components/modbus/sensor.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import logging
 from typing import Any
 
 from homeassistant.components.sensor import (
@@ -26,12 +25,10 @@
 )
 
 from . import get_hub
-from .const import CONF_SLAVE_COUNT, CONF_VIRTUAL_COUNT
+from .const import _LOGGER, CONF_SLAVE_COUNT, CONF_VIRTUAL_COUNT
 from .entity import BaseStructPlatform
 from .modbus import ModbusHub
 
-_LOGGER = logging.getLogger(__name__)
-
 PARALLEL_UPDATES = 1
 
 
@@ -109,8 +106,6 @@ async def async_added_to_hass(self) -> None:
 
     async def _async_update(self) -> None:
         """Update the state of the sensor."""
-        # remark "now" is a dummy parameter to avoid problems with
-        # async_track_time_interval
         self._cancel_call = None
         raw_result = await self._hub.async_pb_call(
             self._slave, self._address, self._count, self._input_type