Skip to content

Commit 2adff1f

Browse files
authored
Client documentation amended and updated. (#1820)
1 parent 3a919d7 commit 2adff1f

File tree

8 files changed

+456
-138
lines changed

8 files changed

+456
-138
lines changed

README.rst

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
PyModbus - A Python Modbus Stack
22
================================
3-
43
.. image:: https://github.com/pymodbus-dev/pymodbus/actions/workflows/ci.yml/badge.svg?branch=dev
54
:target: https://github.com/pymodbus-dev/pymodbus/actions/workflows/ci.yml
65
.. image:: https://readthedocs.org/projects/pymodbus/badge/?version=latest
@@ -12,11 +11,11 @@ PyModbus - A Python Modbus Stack
1211

1312
Pymodbus is a full Modbus protocol implementation offering client/server with synchronous/asynchronous API a well as simulators.
1413

15-
Supported versions
16-
------------------
17-
1814
Current release is `3.5.4 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.5.4>`_.
19-
All changes are `detailed <https://pymodbus.readthedocs.io/en/latest/source/channgelog.html>`_
15+
16+
Bleeding edge (not released) is `dev <https://github.com/pymodbus-dev/pymodbus/tree/dev>`_.
17+
18+
All changes are described in `release notes <https://pymodbus.readthedocs.io/en/latest/source/channgelog.html>`_
2019
and all API changes are `documented <https://pymodbus.readthedocs.io/en/latest/source/api_changes.html>`_
2120

2221
A big thanks to all the `volunteers <https://pymodbus.readthedocs.io/en/latest/source/authors.html>`_ that helps make pymodbus a great project.
@@ -25,7 +24,6 @@ Source code on `github <https://pymodbus.readthedocs.io/en/latest/source/authors
2524

2625
Pymodbus in a nutshell
2726
----------------------
28-
2927
Pymodbus consist of 5 parts:
3028

3129
- **client**, connect to your favorite device(s)
@@ -36,7 +34,6 @@ Pymodbus consist of 5 parts:
3634

3735
Common features
3836
^^^^^^^^^^^^^^^
39-
4037
* Full :download:`modbus standard protocol <_static/Modbus_Application_Protocol_V1_1b3.pdf>` implementation
4138
* Support for custom function codes
4239
* support serial (rs-485), tcp, tls and udp communication
@@ -51,7 +48,6 @@ Common features
5148

5249
Client Features
5350
^^^^^^^^^^^^^^^
54-
5551
* asynchronous API and synchronous API for applications
5652
* very simple setup and call sequence (just 6 lines of code)
5753
* utilities to convert int/float to/from multiple registers
@@ -62,7 +58,6 @@ Client Features
6258

6359
Server Features
6460
^^^^^^^^^^^^^^^
65-
6661
* asynchronous implementation for high performance
6762
* synchronous API classes for convenience
6863
* simulate real life devices
@@ -76,24 +71,26 @@ Server Features
7671

7772
REPL Features
7873
^^^^^^^^^^^^^
79-
8074
- server/client commandline emulator
8175
- easy test of real device (client)
8276
- easy test of client app (server)
8377
- simulation of broken requests/responses
8478
- simulation of error responses (hard to provoke in real devices)
8579

80+
`REPL documentation <https://https://pymodbus.readthedocs.io/en/dev/source/REPL.html>`_
81+
8682

8783
Simulator Features
8884
^^^^^^^^^^^^^^^^^^
89-
9085
- server simulator with WEB interface
9186
- configure the structure of a real device
9287
- monitor traffic online
9388
- allow distributed team members to work on a virtual device using internet
9489
- simulation of broken requests/responses
9590
- simulation of error responses (hard to provoke in real devices)
9691

92+
`Simulator documentation <https://pymodbus.readthedocs.io/en/dev/source/simulator.html>`_
93+
9794
Use Cases
9895
---------
9996
The client is the most typically used. It is embedded into applications,
@@ -118,13 +115,12 @@ https://readthedocs.org/docs/pymodbus/en/latest/index.html
118115

119116

120117

121-
Installation
122-
------------
123-
118+
Install
119+
-------
124120
The library is available on pypi.org and github.com to install with
125121

126-
- **`pip`** for those who just want to use the library
127-
- **`git clone`** for those who wants to help or just are curious
122+
- :code:`pip` for those who just want to use the library
123+
- :code:`git clone` for those who wants to help or just are curious
128124

129125
Be aware that there are a number of project, who have forked pymodbus and
130126

@@ -141,9 +137,8 @@ A growing number of Linux distributions include pymodbus in their standard insta
141137

142138
You need to have python3 installed, preferable 3.11.
143139

144-
Installing with pip
145-
^^^^^^^^^^^^^^^^^^^
146-
140+
Install with pip
141+
^^^^^^^^^^^^^^^^
147142
You can install using pip by issuing the following
148143
commands in a terminal window::
149144

@@ -158,15 +153,10 @@ This will install pymodbus with the pyserial dependency.
158153
Pymodbus offers a number of extra options:
159154

160155
- **repl**, needed by pymodbus.repl
161-
162156
- **serial**, needed for serial communication
163-
164157
- **simulator**, needed by pymodbus.simulator
165-
166158
- **documentation**, needed to generate documentation
167-
168159
- **development**, needed for development
169-
170160
- **all**, installs all of the above
171161

172162
which can be installed as::
@@ -178,9 +168,8 @@ It is possible to install old releases if needed::
178168
pip install pymodbus==3.5.4
179169

180170

181-
Installing with github
182-
^^^^^^^^^^^^^^^^^^^^^^
183-
171+
Install with github
172+
^^^^^^^^^^^^^^^^^^^
184173
On github, fork https://github.com/pymodbus-dev/pymodbus.git
185174

186175
Clone the source, and make a virtual environment::
@@ -217,7 +206,7 @@ This installs dependencies in your virtual environment
217206
with pointers directly to the pymodbus directory,
218207
so any change you make is immediately available as if installed.
219208

220-
It will also install `pre-commit` git hooks, ensuring your commit are verified.
209+
It will also install :code:`pre-commit` git hooks, ensuring your commit are verified.
221210

222211
The repository contains a number of important branches and tags.
223212
* **dev** is where all development happens, this branch is not always stable.
@@ -253,10 +242,12 @@ so that others can benefit from the results.
253242
If you think, that something in the code is broken/not running well, please `open an issue <https://github.com/pymodbus-dev/pymodbus/issues/new>`_,
254243
read the Template-text first and then post your issue with your setup information.
255244

245+
`Example documentation <https://pymodbus.readthedocs.io/en/dev/source/examples.html>`_
246+
256247

257248
Contributing
258249
------------
259-
Just fork the repo and raise your Pull Request against `dev` branch.
250+
Just fork the repo and raise your Pull Request against :code:`dev` branch.
260251

261252
We always have more work than time, so feel free to open a discussion / issue on a theme you want to solve.
262253

@@ -305,6 +296,15 @@ Test your changes::
305296
pytest
306297

307298

299+
Architecture
300+
^^^^^^^^^^^^
301+
302+
There are no documentation of the architecture (help is welcome), but most classes and
303+
methods are documented:
304+
305+
`Pymodbus internals <https://pymodbus.readthedocs.io/en/dev/source/internals.html>`_
306+
307+
308308
Generate documentation
309309
^^^^^^^^^^^^^^^^^^^^^^
310310

@@ -323,4 +323,4 @@ The documentation is available in <root>/build/html
323323
License Information
324324
-------------------
325325

326-
Released under the `BSD License <LICENSE>`_
326+
Released under the `BSD License <https://github.com/pymodbus-dev/pymodbus/blob/dev/LICENSE>`_

doc/index.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
Welcome to PyModbus's documentation!
22
====================================
33

4+
Please select a topic in the left hand column.
5+
46
.. toctree::
57
:maxdepth: 8
68
:caption: Contents:
9+
:hidden:
710

811
source/readme
912
source/client

0 commit comments

Comments
 (0)