Skip to content

Implement isotp autopadding #92

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implement isotp autopadding #92

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea4ad94
IsoTp: implement Autopadding of formats
Jan 15, 2021
9bbff03
IsoTp: fix autopadding
May 26, 2021
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
13 changes: 13 additions & 0 deletions car/isotp_decoder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ def preprocess_fields(self):
new_fields.append(new_field)

self._log.debug("fmt(%s)", fmt)
cmd_data['autopad'] = cmd_data.get('autopad', False)
cmd_data['struct'] = struct.Struct(fmt)
cmd_data['fields'] = new_fields

Expand All @@ -124,6 +125,18 @@ def get_data(self):
raw = self._dongle.send_command_ex(cmd_data['cmd'],
canrx=cmd_data['canrx'],
cantx=cmd_data['cantx'])
# Learn how much to pad a block on first encounter if autopadding is active
if cmd_data['autopad']:
pad = len(raw) - cmd_data['struct'].size
if pad > 0:
fmt = cmd_data['struct'].format
fmt += str(pad) + 'x'
cmd_data['struct'] = struct.Struct(fmt)
self._log.info("canid(0x%x) cmd(%s) len(%i) pad(%i)",
cmd_data['cantx'], cmd_data['cmd'].hex(),
len(raw), pad)
cmd_data['autopad'] = False

raw_fields = cmd_data['struct'].unpack(raw)

for field in cmd_data['fields']:
Expand Down