From b518624fc580da2683076bc4ca608eb0b8e8aa50 Mon Sep 17 00:00:00 2001 From: Valmantas Paliksa Date: Thu, 9 Dec 2021 18:54:50 +0200 Subject: [PATCH 1/2] Fix canmatrix export --- canopen/pdo/base.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/canopen/pdo/base.py b/canopen/pdo/base.py index c11eeaae..96b55dc0 100644 --- a/canopen/pdo/base.py +++ b/canopen/pdo/base.py @@ -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 @@ -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, @@ -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.frames.append(frame) formats.dumpp({"": db}, filename) return db From 4c3d55b1ed3b20549f96ca7397e34b3a6c81a1a3 Mon Sep 17 00:00:00 2001 From: Valmantas Paliksa Date: Fri, 10 Dec 2021 14:39:33 +0200 Subject: [PATCH 2/2] Change db.frames.append(frame) to add_frame --- canopen/pdo/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/canopen/pdo/base.py b/canopen/pdo/base.py index 96b55dc0..1685de62 100644 --- a/canopen/pdo/base.py +++ b/canopen/pdo/base.py @@ -114,7 +114,7 @@ def export(self, filename): signal.addValues(value, desc) frame.add_signal(signal) frame.calc_dlc() - db.frames.append(frame) + db.add_frame(frame) formats.dumpp({"": db}, filename) return db