Merge pull request #898 from WillCodeForCats/896-modbus-exception-when-detecting-meters

Update ExceptionResponse import for pymodbus 3.11

Author: WillCodeForCats

custom_components/solaredge_modbus_multi/hub.py

@@ -14,7 +14,13 @@
 from pymodbus.client import AsyncModbusTcpClient
 from pymodbus.client.mixin import ModbusClientMixin
 from pymodbus.exceptions import ConnectionException, ModbusIOException
-from pymodbus.pdu import ExceptionResponse
+
+try:
+    # for pymodbus 3.11.1 and newer
+    from pymodbus.pdu.pdu import ExceptionResponse
+except ImportError:
+    # or backwards compatibility
+    from pymodbus.pdu import ExceptionResponse
 
 from .const import (
     BATTERY_REG_BASE,
@@ -528,6 +534,11 @@ async def modbus_read_holding_registers(self, unit, address, rcount):
 
         sig = inspect.signature(self._client.read_holding_registers)
 
+        _LOGGER.debug(
+            f"I{self._rr_unit}: modbus_read_holding_registers "
+            f"address={self._rr_address} count={self._rr_count}"
+        )
+
         if "device_id" in sig.parameters:
             result = await self._client.read_holding_registers(
                 address=self._rr_address, count=self._rr_count, device_id=self._rr_unit
@@ -537,7 +548,11 @@ async def modbus_read_holding_registers(self, unit, address, rcount):
                 address=self._rr_address, count=self._rr_count, slave=self._rr_unit
             )
 
+        _LOGGER.debug(f"I{self._rr_unit}: result is error: {result.isError()} ")
+
         if result.isError():
+            _LOGGER.debug(f"I{self._rr_unit}: error result: {type(result)} ")
+
             if type(result) is ModbusIOException:
                 raise ModbusIOError(result)
 

custom_components/solaredge_modbus_multi/manifest.json

@@ -10,5 +10,5 @@
   "issue_tracker": "https://github.com/WillCodeForCats/solaredge-modbus-multi/issues",
   "loggers": ["custom_components.solaredge_modbus_multi"],
   "requirements": ["pymodbus>=3.8.3"],
-  "version": "3.1.6"
+  "version": "3.1.7-pre.1"
 }