sv/tsun-gen3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve parse()

Browse Source
This commit is contained in:
Stefan Allius
2024-04-14 14:24:32 +02:00
parent f6af744864
commit 0e63c45302
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/gen3plus/infos_g3p.py
View File

@@ -96,17 +96,18 @@ class InfosG3P(Infos):
mtype = (idx >> 24) & 0xff mtype = (idx >> 24) & 0xff
if ftype != rcv_ftype or mtype != msg_type: if ftype != rcv_ftype or mtype != msg_type:
continue continue
if isinstance(row, dict): if not isinstance(row, dict):
info_id = row['reg'] continue
fmt = row['fmt'] info_id = row['reg']
res = struct.unpack_from(fmt, buf, addr) fmt = row['fmt']
result = res[0] res = struct.unpack_from(fmt, buf, addr)
if isinstance(result, (bytearray, bytes)): result = res[0]
result = result.decode('utf-8') if isinstance(result, (bytearray, bytes)):
if 'eval' in row: result = result.decode('utf-8')
result = eval(row['eval']) if 'eval' in row:
if 'ratio' in row: result = eval(row['eval'])
result = round(result * row['ratio'], 2) if 'ratio' in row:
result = round(result * row['ratio'], 2)
keys, level, unit, must_incr = self._key_obj(info_id) keys, level, unit, must_incr = self._key_obj(info_id)