Merge branch 'dev'

Author: janiversen

AUTHORS.rst

@@ -16,6 +16,7 @@ Thanks to
 - Alex Ruddick
 - Alexander Lanin
 - Alexandre CUER
+- alexis-care
 - Alois Hockenschlohe
 - Andy Walker
 - Arjan
@@ -30,6 +31,7 @@ Thanks to
 - Chris Hung
 - Christian Krause
 - Christian Pfisterer
+- daanwtb
 - Daniel Rauber
 - dhoomakethu
 - doelki
@@ -74,6 +76,7 @@ Thanks to
 - Pavel Kostromitinov
 - peufeu2
 - Philip Couling
+- Philip Jones
 - Qi Li
 - Sebastian Machuca
 - Sefa Keleş

CHANGELOG.rst

@@ -7,6 +7,17 @@ helps make pymodbus a better product.
 
 :ref:`Authors`: contains a complete list of volunteers have contributed to each major version.
 
+Version 3.8.1
+-------------
+* Convert endianness (#2506)
+* Fix sync serial client, loop. (#2510)
+* Correct future. (#2507)
+* Correct #2501 (#2504)
+* Raise exception on no response in async client. (#2502)
+* re-instatiate Future on reconnect (#2501)
+* Remove all trailing zeroes during string decoding (#2493)
+* Fix too many sync client log messages. (#2491)
+
 Version 3.8.0
 -------------
 * slave_id -> dev_id (internally). (#2486)

README.rst

@@ -26,7 +26,7 @@ Upgrade examples:
 - 3.6.1 -> 3.7.0: Smaller changes to the pymodbus calls might be needed
 - 2.5.4 -> 3.0.0: Major changes in the application might be needed
 
-Current release is `3.8.0 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.8.0>`_.
+Current release is `3.8.1 <https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.8.1>`_.
 
 Bleeding edge (not released) is `dev <https://github.com/pymodbus-dev/pymodbus/tree/dev>`_.
 

doc/source/_static/examples.tgz

@@ -15,9 +15,10 @@ It is the community that decides how pymodbus evolves NOT the maintainers !
 
 The following bullet points are what the maintainers focus on:
 
-- 3.8.1, bug fix release, with:
+- 3.8.2, bug fix release, with:
     - Currently not planned
 - 3.9.0, with:
+    - All of branch wait_next_api
     - ModbusControlBlock pr slave
     - New custom PDU (function codes)
     - Remove remote_datastore

doc/source/_static/examples.zip

@@ -146,6 +146,14 @@ async def async_handle_holding_registers(client):
     assert not rr.isError()  # test that call was OK
     assert rr.registers == [10]
 
+    value_int32 = 13211
+    registers = client.convert_to_registers(value_int32, client.DATATYPE.INT32)
+    await client.write_registers(1, registers, slave=SLAVE)
+    rr = await client.read_holding_registers(1, count=len(registers), slave=SLAVE)
+    assert not rr.isError()  # test that call was OK
+    value = client.convert_from_registers(rr.registers, client.DATATYPE.INT32)
+    assert value_int32 == value
+
     _logger.info("### write read holding registers")
     arguments = {
         "read_address": 1,

doc/source/roadmap.rst

@@ -135,10 +135,13 @@ def handle_holding_registers(client):
     assert not rr.isError()  # test that call was OK
     assert rr.registers[0] == 10
 
-    client.write_registers(1, [10] * 8, slave=SLAVE)
-    rr = client.read_holding_registers(1, count=8, slave=SLAVE)
+    value_int32 = 13211
+    registers = client.convert_to_registers(value_int32, client.DATATYPE.INT32)
+    client.write_registers(1, registers, slave=SLAVE)
+    rr = client.read_holding_registers(1, count=len(registers), slave=SLAVE)
     assert not rr.isError()  # test that call was OK
-    assert rr.registers == [10] * 8
+    value = client.convert_from_registers(rr.registers, client.DATATYPE.INT32)
+    assert value_int32 == value
 
     _logger.info("### write read holding registers")
     arguments = {

examples/client_async_calls.py

@@ -15,6 +15,7 @@
 
 from pymodbus import FramerType
 from pymodbus.client import AsyncModbusTcpClient as ModbusClient
+from pymodbus.exceptions import ModbusIOException
 from pymodbus.pdu import ExceptionResponse, ModbusPDU
 from pymodbus.pdu.bit_message import ReadCoilsRequest
 
@@ -128,8 +129,12 @@ async def main(host="localhost", port=5020):
         client.register(CustomModbusPDU)
         slave=1
         request1 = CustomRequest(32, slave=slave)
-        result = await client.execute(False, request1)
-        print(result)
+        try:
+            result = await client.execute(False, request1)
+        except ModbusIOException:
+            print("Server do not support CustomRequest.")
+        else:
+            print(result)
 
         # inherited request
         request2 = Read16CoilsRequest(32, slave)

examples/client_calls.py

@@ -18,5 +18,5 @@
 from pymodbus.pdu import ExceptionResponse
 
 
-__version__ = "3.8.0"
+__version__ = "3.8.1"
 __version_full__ = f"[pymodbus, version {__version__}]"