Fix DBC scons build (#1523)

* fix * clean up
commaai · Nov 23, 2024 · 8e349c3 · 8e349c3
1 parent 3c6e530
commit 8e349c3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/opendbc/dbc/SConscript b/opendbc/dbc/SConscript
@@ -16,8 +16,15 @@ output_files = [
   if not f.name.startswith("_")
 ]
 
+# include DBCs generated by python scripts
+output_files += [
+  f.name.replace(".py", "_generated.dbc")
+  for f in Path("generator").rglob("*.py")
+  if not f.name.startswith(("_", "test_")) and f.name != "generator.py"
+]
+
 generated = env.Command(
   target=output_files,
   source=[generator] + source_files,
   action="python3 ${SOURCES[0]}",
-)
+)
diff --git a/opendbc/dbc/generator/tesla/radar_common.py → opendbc/dbc/generator/tesla/_radar_common.py b/opendbc/dbc/generator/tesla/radar_common.py → opendbc/dbc/generator/tesla/_radar_common.py
diff --git a/opendbc/dbc/generator/tesla/tesla_radar_bosch.py b/opendbc/dbc/generator/tesla/tesla_radar_bosch.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import os
-from opendbc.dbc.generator.tesla.radar_common import get_radar_point_definition, get_val_definition
+from opendbc.dbc.generator.tesla._radar_common import get_radar_point_definition, get_val_definition
 
 if __name__ == "__main__":
   dbc_name = os.path.basename(__file__).replace(".py", ".dbc")

diff --git a/opendbc/dbc/generator/tesla/tesla_radar_continental.py b/opendbc/dbc/generator/tesla/tesla_radar_continental.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import os
-from opendbc.dbc.generator.tesla.radar_common import get_radar_point_definition, get_val_definition
+from opendbc.dbc.generator.tesla._radar_common import get_radar_point_definition, get_val_definition
 
 if __name__ == "__main__":
   dbc_name = os.path.basename(__file__).replace(".py", ".dbc")