All parameters in class parameter. (#1070)

Author: janiversen

doc/source/library/pymodbus.client.rst

@@ -59,31 +59,31 @@ Client setup.
 Serial RS-485 transport.
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. autoclass:: pymodbus.client.async_serial.AsyncModbusSerialClient
+.. autoclass:: pymodbus.client.serial.AsyncModbusSerialClient
 
-.. autoclass:: pymodbus.client.sync_serial.ModbusSerialClient
+.. autoclass:: pymodbus.client.serial.ModbusSerialClient
 
 TCP transport.
 ~~~~~~~~~~~~~~
 
-.. autoclass:: pymodbus.client.async_tcp.AsyncModbusTcpClient
+.. autoclass:: pymodbus.client.tcp.AsyncModbusTcpClient
 
-.. autoclass:: pymodbus.client.sync_tcp.ModbusTcpClient
+.. autoclass:: pymodbus.client.tcp.ModbusTcpClient
 
 TLS transport.
 ~~~~~~~~~~~~~~
 
-.. autoclass:: pymodbus.client.async_tls.AsyncModbusTlsClient
+.. autoclass:: pymodbus.client.tls.AsyncModbusTlsClient
 
-.. autoclass:: pymodbus.client.sync_tls.ModbusTlsClient
+.. autoclass:: pymodbus.client.tls.ModbusTlsClient
 
 UDP transport.
 ~~~~~~~~~~~~~~
 
-.. autoclass:: pymodbus.client.async_udp.AsyncModbusUdpClient
+.. autoclass:: pymodbus.client.udp.AsyncModbusUdpClient
     :members:
 
-.. autoclass:: pymodbus.client.sync_udp.ModbusUdpClient
+.. autoclass:: pymodbus.client.udp.ModbusUdpClient
     :members:
 
 

pymodbus/client/__init__.py

@@ -2,15 +2,11 @@
 
 import external classes, to make them easier to use:
 """
-from pymodbus.client.async_serial import AsyncModbusSerialClient
-from pymodbus.client.async_tcp import AsyncModbusTcpClient
-from pymodbus.client.async_tls import AsyncModbusTlsClient
-from pymodbus.client.async_udp import AsyncModbusUdpClient
+from pymodbus.client.serial import AsyncModbusSerialClient, ModbusSerialClient
+from pymodbus.client.tcp import AsyncModbusTcpClient, ModbusTcpClient
+from pymodbus.client.tls import AsyncModbusTlsClient, ModbusTlsClient
+from pymodbus.client.udp import AsyncModbusUdpClient, ModbusUdpClient
 from pymodbus.client.base import ModbusBaseClient
-from pymodbus.client.sync_serial import ModbusSerialClient
-from pymodbus.client.sync_tcp import ModbusTcpClient
-from pymodbus.client.sync_tls import ModbusTlsClient
-from pymodbus.client.sync_udp import ModbusUdpClient
 
 
 # ---------------------------------------------------------------------------#

pymodbus/client/async_serial.py

@@ -80,6 +80,20 @@ class _params:  # pylint: disable=too-many-instance-attributes
         kwargs: dict = None
         reconnect_delay: int = None
 
+        baudrate: int = None
+        bytesize: int = None
+        parity: str = None
+        stopbits: int = None
+        handle_local_echo: bool = None
+
+        source_address: str = None
+
+        sslctx: str = None
+        certfile: str = None
+        keyfile: str = None
+        password: str = None
+        server_hostname: str = None
+
     def __init__(
         self,
         framer: str = None,