bump pymodbus to 3.3.6

frodef · Mar 22, 2024 · 9520d74 · 9520d74
1 parent 8971e90
commit 9520d74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/custom_components/nilan_cts600/manifest.json b/custom_components/nilan_cts600/manifest.json
@@ -9,8 +9,6 @@
     "documentation": "https://github.com/frodef/nilan-cts600-homeassistant",
     "homekit": {},
     "iot_class": "local_push",
-    "requirements": [
-	"pymodbus==3.3.1"
-    ],
+    "requirements": ["pymodbus==3.3.6"],
     "version": "2023.08.08"
 }
diff --git a/custom_components/nilan_cts600/nilan_cts600.py b/custom_components/nilan_cts600/nilan_cts600.py
@@ -2,7 +2,7 @@
 import codecs, struct, time, os, re
 from enum import Enum
 from pymodbus.client import ModbusSerialClient
-from pymodbus.utilities import computeCRC
+from pymodbus.message.rtu import MessageRTU
 
 class NilanCTS600Exception (Exception):
     pass
@@ -140,7 +140,7 @@ def nilanCelsiusToAD (celsius, x=56.25):
     return round ((x - celsius) / ((34 - 12) / (328 - 168)))
 
 def appendCRC (frame):
-    crc = computeCRC (frame)
+    crc = MessageRTU.compute_CRC (frame)
     return frame + [(crc>>0)&0xff, (crc>>8)&0xff]
 
 default_slave_id_format = (
@@ -214,7 +214,7 @@ def recv (n):
         raise Exception(f"Unknown response op {op}")
 
     data = recv(data_size)
-    computedCRC = computeCRC(bytes(frame))
+    computedCRC = MessageRTU.compute_CRC(bytes(frame))
     gotCRC = word16b(recv)
     # print(f'ACK: {op} : {parameters} : {data} : {gotCRC:04x} : {computedCRC:04x}')
     return op.name, parameters, data, gotCRC == computedCRC