update function call according to pymodbus API changes, tested with p…

…ymodbus v3.2.2
gavinying · Mar 27, 2023 · 184ab3a · 184ab3a
1 parent 0217fa8
commit 184ab3a
Show file tree

Hide file tree

Showing 4 changed files with 338 additions and 253 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 ARG PYTHON_TAG="3.8-slim"
 FROM python:$PYTHON_TAG
-ARG APP_TAG="0.5.1"
+ARG APP_TAG="0.5.2"
 WORKDIR /app
 
 RUN pip3 install modpoll==$APP_TAG

diff --git a/modpoll/modbus_task.py b/modpoll/modbus_task.py
@@ -86,28 +86,28 @@ def poll(self):
             if "BE_BE" == self.endian.upper():
                 if self.fc == 1 or self.fc == 2:
                     decoder = BinaryPayloadDecoder.fromCoils(
-                        data, byteorder=Endian.Big, wordorder=Endian.Big)
+                        data, byteorder=Endian.Big)
                 else:
                     decoder = BinaryPayloadDecoder.fromRegisters(
                         data, byteorder=Endian.Big, wordorder=Endian.Big)
             elif "LE_BE" == self.endian.upper():
                 if self.fc == 1 or self.fc == 2:
                     decoder = BinaryPayloadDecoder.fromCoils(
-                        data, byteorder=Endian.Little, wordorder=Endian.Big)
+                        data, byteorder=Endian.Little)
                 else:
                     decoder = BinaryPayloadDecoder.fromRegisters(
                         data, byteorder=Endian.Little, wordorder=Endian.Big)
             elif "LE_LE" == self.endian.upper():
                 if self.fc == 1 or self.fc == 2:
                     decoder = BinaryPayloadDecoder.fromCoils(
-                        data, byteorder=Endian.Little, wordorder=Endian.Little)
+                        data, byteorder=Endian.Little)
                 else:
                     decoder = BinaryPayloadDecoder.fromRegisters(
                         data, byteorder=Endian.Little, wordorder=Endian.Little)
             else:
                 if self.fc == 1 or self.fc == 2:
                     decoder = BinaryPayloadDecoder.fromCoils(
-                        data, byteorder=Endian.Big, wordorder=Endian.Little)
+                        data, byteorder=Endian.Big)
                 else:
                     decoder = BinaryPayloadDecoder.fromRegisters(
                         data, byteorder=Endian.Big, wordorder=Endian.Little)