Merge pull request #880 from SabrineBH/support_can_fd_protocol_bug_fixing

Fix regression in DBC files with no attribute "BusType"

Author: ebroecker

src/canmatrix/formats/dbc.py

@@ -866,7 +866,7 @@ def add_frame_by_id(new_frame):  # type: (canmatrix.Frame) -> None
                         temp.group(2)).add_attribute(
                         temp.group(1),
                         temp.group(3))
-                elif decoded.find('"BusType"') != -1:
+                elif '"BusType"' in decoded:
                     regexp = re.compile(r"^BA_ +\"BusType\" +\"(.+?)\" *; *")
                     temp = regexp.match(decoded)
                     if temp:

src/canmatrix/formats/fibex.py

@@ -473,8 +473,7 @@ 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")
-    attribute = db.attributes["BusType"]
-    if attribute is not None and attribute == "CAN FD":
+    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: