Skip to content

Fix canmatrix export #287

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

Merged
acolomb merged 2 commits into from
Dec 21, 2021
Merged

Fix canmatrix export #287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b518624
Fix canmatrix export
walmis Dec 9, 2021
4c3d55b
Change db.frames.append(frame) to add_frame
walmis Dec 10, 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: 6 additions & 7 deletions canopen/pdo/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ def export(self, filename):
if pdo_map.cob_id is None:
continue
frame = canmatrix.Frame(pdo_map.name,
Id=pdo_map.cob_id,
extended=0)
arbitration_id=pdo_map.cob_id)
for var in pdo_map.map:
is_signed = var.od.data_type in objectdictionary.SIGNED_TYPES
is_float = var.od.data_type in objectdictionary.FLOAT_TYPES
Expand All @@ -103,8 +102,8 @@ def export(self, filename):
name = name.replace(" ", "_")
name = name.replace(".", "_")
signal = canmatrix.Signal(name,
startBit=var.offset,
signalSize=var.length,
start_bit=var.offset,
size=var.length,
is_signed=is_signed,
is_float=is_float,
factor=var.od.factor,
Expand All @@ -113,9 +112,9 @@ def export(self, filename):
unit=var.od.unit)
for value, desc in var.od.value_descriptions.items():
signal.addValues(value, desc)
frame.addSignal(signal)
frame.calcDLC()
db.frames.addFrame(frame)
frame.add_signal(signal)
frame.calc_dlc()
db.add_frame(frame)
formats.dumpp({"": db}, filename)
return db

Expand Down