Modify DBC file placement to project specific paths (#191)

* Modify DBC file placement to be project specific * Address pull request feedback
macformula · Sep 26, 2024 · 4cb1f38 · 4cb1f38
1 parent 1971ecc
commit 4cb1f38
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 71 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 .DS_STORE
-.vscode
+.vscode
diff --git a/firmware/dbcs/VEH_TEST_CAN.dbc b/firmware/dbcs/VEH_TEST_CAN.dbc
diff --git a/firmware/projects/Demo/CAN/Bar/config.yaml b/firmware/projects/Demo/CAN/Bar/config.yaml
@@ -3,4 +3,4 @@ canGen:
   busses:
     - busName: veh
       dbcFiles:
-        - "demo.dbc"
+        - "../demo.dbc"
diff --git a/firmware/projects/Demo/CAN/Foo/config.yaml b/firmware/projects/Demo/CAN/Foo/config.yaml
@@ -3,4 +3,4 @@ canGen:
   busses:
     - busName: veh
       dbcFiles:
-        - "demo.dbc"
+        - "../demo.dbc"
diff --git a/firmware/dbcs/demo.dbc → firmware/projects/Demo/CAN/demo.dbc b/firmware/dbcs/demo.dbc → firmware/projects/Demo/CAN/demo.dbc
diff --git a/firmware/projects/EV5/FrontController/config.yaml b/firmware/projects/EV5/FrontController/config.yaml
@@ -3,7 +3,7 @@ canGen:
   busses:
     - busName: veh
       dbcFiles:
-        - "veh.dbc"
+        - "../veh.dbc"
     - busName: pt
       dbcFiles:
-        - "pt.dbc"
+        - "../pt.dbc"
diff --git a/firmware/projects/EV5/LVController/config.yaml b/firmware/projects/EV5/LVController/config.yaml
@@ -3,4 +3,4 @@ canGen:
   busses:
     - busName: veh
       dbcFiles:
-        - "veh.dbc"
+        - "../veh.dbc"
diff --git a/firmware/projects/EV5/TMS/config.yaml b/firmware/projects/EV5/TMS/config.yaml
@@ -3,4 +3,4 @@ canGen:
   busses:
     - busName: veh
       dbcFiles:
-        - "veh.dbc"
+        - "../veh.dbc"
diff --git a/firmware/projects/EV5/debug/FrontControllerSimple/config.yaml b/firmware/projects/EV5/debug/FrontControllerSimple/config.yaml
@@ -3,7 +3,7 @@ canGen:
   busses:
     - busName: veh
       dbcFiles:
-        - "veh.dbc"
+        - "../../veh.dbc"
     - busName: pt
       dbcFiles:
-        - "pt.dbc"
+        - "../../pt.dbc"
diff --git a/firmware/dbcs/io.dbc → ...re/projects/EV5/debug/IoCheckoutFc/io.dbc b/firmware/dbcs/io.dbc → ...re/projects/EV5/debug/IoCheckoutFc/io.dbc
diff --git a/firmware/dbcs/pedal.dbc → ...e/projects/EV5/debug/MotorDebug/pedal.dbc b/firmware/dbcs/pedal.dbc → ...e/projects/EV5/debug/MotorDebug/pedal.dbc
diff --git a/firmware/dbcs/pt.dbc → firmware/projects/EV5/pt.dbc b/firmware/dbcs/pt.dbc → firmware/projects/EV5/pt.dbc
diff --git a/firmware/dbcs/veh.dbc → firmware/projects/EV5/veh.dbc b/firmware/dbcs/veh.dbc → firmware/projects/EV5/veh.dbc
diff --git a/scripts/cangen/main.py b/scripts/cangen/main.py
@@ -15,7 +15,6 @@
 
 DIR_FIRMWARE = os.path.join(DIR_THIS_FILE, os.pardir, os.pardir, "firmware")
 DIR_PROJECTS = os.path.join(DIR_FIRMWARE, "projects")
-DIR_DBCS = os.path.join(DIR_FIRMWARE, "dbcs")
 
 CONFIG_FILE_NAME = "config.yaml"
 DEFAULT_OUTPUT_DIR = "generated/can"
@@ -63,6 +62,8 @@ def parse():
     with open(CONFIG_FILE_NAME, "r") as file:
         config = yaml.safe_load(file)
 
+    config_file_path = os.path.abspath(CONFIG_FILE_NAME)
+
     our_node = config["canGen"]["ourNode"].upper()
     bus_list = config["canGen"]["busses"]
     output_path = config["canGen"].get("outputPath", DEFAULT_OUTPUT_DIR)
@@ -74,7 +75,7 @@ def parse():
         bus_name = bus['busName'].capitalize()
         dbc_files = bus['dbcFiles']
 
-        dbc_file_paths = [os.path.join(DIR_DBCS, dbc) for dbc in dbc_files]
+        dbc_file_paths = [os.path.normpath(os.path.join(os.path.dirname(config_file_path), dbc)) for dbc in dbc_files]
 
         can_messages_template_path = os.path.join(
             DIR_TEMPLATES, CAN_MESSAGES_TEMPLATE_FILENAME