#389 Support passing all serial port parameters to asynchronous server

CHANGELOG.rst

@@ -7,6 +7,7 @@ from pymodbus.client.asynchronous import ModbusTcpClient
 
 * Support Python 3.7
 * Fix to task cancellations and CRC errors for async serial clients.
+* Fix passing serial settings to asynchronous serial server.
 * Fix `AttributeError` when setting `interCharTimeout` for serial clients.
 * Provide an option to disable inter char timeouts with Modbus RTU.
 * Add support to register custom requests in clients and server instances.

pymodbus/server/asynchronous.py

@@ -317,6 +317,12 @@ def StartSerialServer(context, identity=None, framer=ModbusAsciiFramer,
     port = kwargs.get('port', '/dev/ttyS0')
     baudrate = kwargs.get('baudrate', Defaults.Baudrate)
     console = kwargs.get('console', False)
+    bytesize = kwargs.get("bytesize", Defaults.Bytesize)
+    stopbits = kwargs.get("stopbits", Defaults.Stopbits)
+    parity = kwargs.get("parity", Defaults.Parity)
+    timeout = kwargs.get("timeout", 0)
+    xonxoff = kwargs.get("xonxoff", 0)
+    rtscts = kwargs.get("rtscts", 0)
 
     _logger.info("Starting Modbus Serial Server on %s" % port)
     factory = ModbusServerFactory(context, framer, identity, **kwargs)
@@ -329,7 +335,9 @@ def StartSerialServer(context, identity=None, framer=ModbusAsciiFramer,
 
     protocol = factory.buildProtocol(None)
     SerialPort.getHost = lambda self: port  # hack for logging
-    SerialPort(protocol, port, reactor, baudrate)
+    SerialPort(protocol, port, reactor, baudrate=baudrate, parity=parity,
+               stopbits=stopbits, timeout=timeout, xonxoff=xonxoff,
+               rtscts=rtscts, bytesize=bytesize)
     if not defer_reactor_run:
         reactor.run(installSignalHandlers=_is_main_thread())
 

pymodbus/version.py

@@ -41,7 +41,7 @@ def __str__(self):
         return '[%s, version %s]' % (self.package, self.short())
 
 
-version = Version('pymodbus', 2, 2, 0, "rc4")
+version = Version('pymodbus', 2, 2, 0, "rc5")
 
 
 version.__name__ = 'pymodbus'  # fix epydoc error

test/test_server_async.py

@@ -119,9 +119,7 @@ def testTcpExecuteFailure(self):
 
         # CASE-1: test NoSuchSlaveException exceptions
         request.execute.side_effect = NoSuchSlaveException()
-        self.assertRaises(
-            NoSuchSlaveException, protocol._execute(request)
-        )
+        protocol._execute(request)
         self.assertTrue(request.doException.called)
 
         # CASE-2: NoSuchSlaveException with ignore_missing_slaves = true
@@ -131,9 +129,7 @@ def testTcpExecuteFailure(self):
 
         # test other exceptions
         request.execute.side_effect = ModbusIOException()
-        self.assertRaises(
-            ModbusIOException, protocol._execute(request)
-        )
+        protocol._execute(request)
         self.assertTrue(protocol._send.called)
 
     def testSendTcp(self):
@@ -273,9 +269,7 @@ def testUdpExecuteFailure(self):
 
         # CASE-1: test NoSuchSlaveException exceptions
         request.execute.side_effect = NoSuchSlaveException()
-        self.assertRaises(
-            NoSuchSlaveException, protocol._execute(request, mock_addr)
-        )
+        protocol._execute(request, mock_addr)
         self.assertTrue(request.doException.called)
 
         # CASE-2: NoSuchSlaveException with ignore_missing_slaves = true
@@ -285,9 +279,7 @@ def testUdpExecuteFailure(self):
 
         # test other exceptions
         request.execute.side_effect = ModbusIOException()
-        self.assertRaises(
-            ModbusIOException, protocol._execute(request, mock_addr)
-        )
+        protocol._execute(request, mock_addr)
         self.assertTrue(protocol._send.called)
 
     def testStopServer(self):