Fix

Fix

Author: SabrineBH

src/canmatrix/formats/dbc.py

@@ -860,6 +860,11 @@ def add_frame_by_id(new_frame):  # type: (canmatrix.Frame) -> None
                         temp.group(2)).add_attribute(
                         temp.group(1),
                         temp.group(3))
+                elif '"BusType"' in decoded:
+                    regexp = re.compile(r"^BA_ +\"BusType\" +\"(.+?)\" *; *")
+                    temp = regexp.match(decoded)
+                    if temp:
+                        db.add_attribute("BusType", f'"{temp.group(1)}"')
                 else:
                     regexp = re.compile(
                         r"^BA_ +\"([A-Za-z0-9\-_]+)\" +([\"\S\-\.]+) *; *")

src/canmatrix/formats/fibex.py

@@ -467,7 +467,11 @@ def dump(db, f, **options):
     create_sub_element_fx(cluster, "SPEED", "500")
     create_sub_element_fx(cluster, "IS-HIGH-LOW-BIT-ORDER", "true")
     create_sub_element_fx(cluster, "BIT-COUNTING-POLICY", "MONOTONE")
-    protocol = create_sub_element_fx(cluster, "PROTOCOL", "CAN")
+    if 'BusType' in db.attributes and db.attributes['BusType'] == "CAN FD":
+        protocol = create_sub_element_fx(cluster, "PROTOCOL", "CAN-FD")
+        create_sub_element_fx(cluster, "CAN-FD-SPEED", "2000000")
+    else:
+        protocol = create_sub_element_fx(cluster, "PROTOCOL", "CAN")
     protocol.attrib['{{{pre}}}type'.format(pre=xsi)] = "can:PROTOCOL-TYPE"
     create_sub_element_fx(cluster, "PROTOCOL-VERSION", "20")
     channel_refs = create_sub_element_fx(cluster, "CHANNEL-REFS")