Skip to content

All parameters in class parameter #1070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janiversen merged 1 commit into from
Aug 28, 2022
Merged

All parameters in class parameter #1070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions doc/source/library/pymodbus.client.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:


Expand Down
12 changes: 4 additions & 8 deletions pymodbus/client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


# ---------------------------------------------------------------------------#
Expand Down
129 changes: 0 additions & 129 deletions pymodbus/client/async_serial.py
View file
Open in desktop

This file was deleted.

123 changes: 0 additions & 123 deletions pymodbus/client/async_tcp.py
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions pymodbus/client/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading