oddstr13/srne-mqtt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle CRC too short in readMemory

Browse source
This commit is contained in:
Odd Stråbø 2022-01-26 21:01:55 +01:00
parent 00fb5f1dee
commit efddfd60cb
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
solar_ble.py
View file

@ -305,7 +305,11 @@ def readMemory(fh: RawIOBase, address: int, words: int = 1) -> Optional[bytes]:
data = fh.read(size) data = fh.read(size)
_crc = fh.read(2) _crc = fh.read(2)
if data and _crc: if data and _crc:
crc = struct.unpack_from("<H", _crc)[0] try:
crc = struct.unpack_from("<H", _crc)[0]
except struct.error:
log(f"readMemory: CRC error; read {len(_crc)} bytes (2 expected)")
return None
calculated_crc = modbus(bytes([tag, operation, size, *data])) calculated_crc = modbus(bytes([tag, operation, size, *data]))
if crc == calculated_crc: if crc == calculated_crc:
return data return data