check if "timing" already exists

Author: zariiii9003

can/util.py

@@ -238,23 +238,24 @@ def _create_bus_config(config: Dict[str, Any]) -> typechecking.BusConfig:
         if not 0 < port < 65535:
             raise ValueError("Port config must be inside 0-65535 range!")
 
-    try:
-        if set(typechecking.BitTimingFdDict.__annotations__).issubset(set(config)):
-            config["timing"] = can.BitTimingFd(
-                **{
-                    key: int(config[key])
-                    for key in typechecking.BitTimingFdDict.__annotations__
-                }
-            )
-        elif set(typechecking.BitTimingDict.__annotations__).issubset(set(config)):
-            config["timing"] = can.BitTiming(
-                **{
-                    key: int(config[key])
-                    for key in typechecking.BitTimingDict.__annotations__
-                }
-            )
-    except (ValueError, TypeError):
-        pass
+    if config.get("timing", None) is None:
+        try:
+            if set(typechecking.BitTimingFdDict.__annotations__).issubset(config):
+                config["timing"] = can.BitTimingFd(
+                    **{
+                        key: int(config[key])
+                        for key in typechecking.BitTimingFdDict.__annotations__
+                    }
+                )
+            elif set(typechecking.BitTimingDict.__annotations__).issubset(config):
+                config["timing"] = can.BitTiming(
+                    **{
+                        key: int(config[key])
+                        for key in typechecking.BitTimingDict.__annotations__
+                    }
+                )
+        except (ValueError, TypeError):
+            pass
 
     if "bitrate" in config:
         config["bitrate"] = int(config["bitrate"])