Skip to content

Issue 2675 correctly reverse fixed size datatypes #2678

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
merged 8 commits into from
Jun 3, 2025
Merged

Issue 2675 correctly reverse fixed size datatypes #2678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a7c3f5d
Make convert_to_registers reverse little endian words properly when c…
igorbga Jun 2, 2025
aee788f
Simplify method complexity
igorbga Jun 2, 2025
11c9fd9
style change suggested by ci
igorbga Jun 2, 2025
8adffd2
Use walrus operator instead of assigment followed by condition
igorbga Jun 3, 2025
117f18d
Type hint improvement
igorbga Jun 3, 2025
e4586ba
Remove trailing whitespaces
igorbga Jun 3, 2025
bc32e33
Tests for convert_to_registers with support for multiple values at once
igorbga Jun 3, 2025
df69199
Remove unnecessary whitespaces
igorbga Jun 3, 2025
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: 15 additions & 1 deletion pymodbus/client/mixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,5 +771,19 @@ def convert_to_registers(
for x in range(0, len(byte_list), 2)
]
if word_order == "little":
regs.reverse()
return cls._get_reversed_registers(regs, data_type)

return regs

@classmethod
def _get_reversed_registers(cls, regs: list[int], data_type: DATATYPE) -> list[int]:
if not (data_type_len := data_type.value[1]):
regs.reverse()
return regs

reversed_regs: list[int] = []
for x in range(0, len(regs), data_type_len):
single_value_regs = regs[x: x + data_type_len]
single_value_regs.reverse()
reversed_regs = reversed_regs + single_value_regs
return reversed_regs
47 changes: 45 additions & 2 deletions test/client/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,22 @@ def fake_execute(_self, _no_response_expected, request):
(ModbusClientMixin.DATATYPE.STRING, "a", [0x6100], None),
(ModbusClientMixin.DATATYPE.UINT16, 27123, [0x69F3], None),
(ModbusClientMixin.DATATYPE.INT16, -27123, [0x960D], None),
(ModbusClientMixin.DATATYPE.INT16, [-27123, 27123], [0x960D, 0x69F3], None),
(ModbusClientMixin.DATATYPE.UINT32, 27123, [0x0000, 0x69F3], None),
(ModbusClientMixin.DATATYPE.UINT32, 32145678, [0x01EA, 0x810E], None),
(
ModbusClientMixin.DATATYPE.UINT32,
[27123, 32145678],
[0x0000, 0x69F3, 0x01EA, 0x810E],
None
),
(ModbusClientMixin.DATATYPE.INT32, -32145678, [0xFE15, 0x7EF2], None),
(
ModbusClientMixin.DATATYPE.INT32,
[32145678, -32145678],
[0x01EA, 0x810E, 0xFE15, 0x7EF2],
None
),
(
ModbusClientMixin.DATATYPE.UINT64,
1234567890123456789,
Expand All @@ -120,9 +133,21 @@ def fake_execute(_self, _no_response_expected, request):
[0xEEDD, 0xEF0B, 0x8216, 0x7EEB],
None,
),
(
ModbusClientMixin.DATATYPE.INT64,
[1234567890123456789, -1234567890123456789],
[0x1122, 0x10F4, 0x7DE9, 0x8115, 0xEEDD, 0xEF0B, 0x8216, 0x7EEB],
None,
),
(ModbusClientMixin.DATATYPE.FLOAT32, 27123.5, [0x46D3, 0xE700], None),
(ModbusClientMixin.DATATYPE.FLOAT32, 3.141592, [0x4049, 0x0FD8], None),
(ModbusClientMixin.DATATYPE.FLOAT32, -3.141592, [0xC049, 0x0FD8], None),
(
ModbusClientMixin.DATATYPE.FLOAT32,
[27123.5, 3.141592, -3.141592],
[0x46D3, 0xE700, 0x4049, 0x0FD8, 0xC049, 0x0FD8],
None
),
(ModbusClientMixin.DATATYPE.FLOAT64, 27123.5, [0x40DA, 0x7CE0, 0x0000, 0x0000], None),
(
ModbusClientMixin.DATATYPE.FLOAT64,
Expand All @@ -136,6 +161,12 @@ def fake_execute(_self, _no_response_expected, request):
[0xC009, 0x21FB, 0x5444, 0x2D11],
None,
),
(
ModbusClientMixin.DATATYPE.FLOAT64,
[3.14159265358979, -3.14159265358979],
[0x4009, 0x21FB, 0x5444, 0x2D11, 0xC009, 0x21FB, 0x5444, 0x2D11],
None,
),
(
ModbusClientMixin.DATATYPE.BITS,
[True],
Expand Down Expand Up @@ -195,7 +226,16 @@ def fake_execute(_self, _no_response_expected, request):
def test_client_mixin_convert(self, datatype, word_order, registers, value, string_encoding):
"""Test converter methods."""
if word_order == "little":
registers = list(reversed(registers))
if not (datatype_len := datatype.value[1]):
registers = list(reversed(registers))
else:
reversed_regs: list[int] = []
for x in range(0, len(registers), datatype_len):
single_value_regs = registers[x: x + datatype_len]
single_value_regs.reverse()
reversed_regs = reversed_regs + single_value_regs
registers = reversed_regs


kwargs = {**({"word_order": word_order} if word_order else {}),
**({"string_encoding": string_encoding} if string_encoding else {})}
Expand All @@ -207,7 +247,10 @@ def test_client_mixin_convert(self, datatype, word_order, registers, value, stri
if (missing := len(value) % 16):
value = value + [False] * (16 - missing)
if datatype == ModbusClientMixin.DATATYPE.FLOAT32:
result = round(result, 6)
if isinstance(result, list):
result = [round(v, 6) for v in result]
else:
result = round(result, 6)
assert result == value

@pytest.mark.parametrize(
Expand Down