ammend

Author: LKuemmel

packages/modules/common/modbus.py

@@ -14,6 +14,7 @@
 from pymodbus.client.sync import ModbusTcpClient, ModbusSerialClient
 from pymodbus.constants import Endian
 from pymodbus.payload import BinaryPayloadDecoder
+from pymodbus.transaction import ModbusSocketFramer
 from urllib3.util import parse_url
 
 log = logging.getLogger(__name__)
@@ -197,12 +198,13 @@ def __init__(self,
                  address: str,
                  port: int = 502,
                  sleep_after_connect: Optional[int] = 0,
+                 framer: type[ModbusSocketFramer] = ModbusSocketFramer,
                  **kwargs):
         parsed_url = parse_url(address)
         host = parsed_url.host
         if parsed_url.port is not None:
             port = parsed_url.port
-        super().__init__(ModbusTcpClient(host, port, **kwargs), address, port, sleep_after_connect)
+        super().__init__(ModbusTcpClient(host, port, framer, **kwargs), address, port, sleep_after_connect)
 
 
 class ModbusSerialClient_(ModbusClient):

packages/modules/conftest.py

@@ -35,6 +35,10 @@
 module.BinaryPayloadDecoder = Mock()
 sys.modules['pymodbus.payload'] = module
 
+module = type(sys)('pymodbus.transaction')
+module.ModbusSocketFramer = Mock()
+sys.modules['pymodbus.transaction'] = module
+
 module = type(sys)('socketserver')
 module.TCPServer = Mock()
 sys.modules['socketserver'] = module