Refactor Modbus communication to use safe method for reading and writing registers

Author: TypQxQ

custom_components/sigen/config_flow.py

@@ -28,7 +28,7 @@
     async_get as async_get_entity_registry,
     async_entries_for_device,
 )
-from .modbus import _suppress_pymodbus_logging
+from .modbus import _suppress_pymodbus_logging, _call_modbus_method_safe
 from .const import (
     DOMAIN,
     DEFAULT_PORT,
@@ -538,10 +538,11 @@ async def _async_try_read_register(self, client: AsyncModbusTcpClient, slave_id:
 
                 _LOGGER.debug("Modbus connected to %s:%s. Checking device type...", host, port)
 
-                result = await client.read_input_registers(
+                result = await _call_modbus_method_safe(
+                    client.read_input_registers,
                     address=register_address,
                     count=1,
-                    slave=slave_id
+                    slave=slave_id,
                 )
                 if result and not result.isError():
                     _LOGGER.debug("Modbus read successful for register %s on %s:%s, slave %s.",

custom_components/sigen/modbus.py

@@ -749,8 +749,11 @@ async def async_write_registers(
                         "Trying write_registers at original address %s with values %s for slave %s",
                         address, values, slave_id
                     )
-                    result = await client.write_registers(
-                        address=address, values=values, slave=slave_id
+                    result = await _call_modbus_method_safe(
+                        client.write_registers,
+                        address=address,
+                        values=values,
+                        slave=slave_id,
                     )
                     if result.isError():
                         _LOGGER.warning("Modbus write_registers error for %s:%s@%s (address %s): %s. Marking connection as closed.", key[0], key[1], slave_id, address, result)