move to nested opendbc/ (#1069)

* move to nested opendbc/ * get CI working / similar to msgq * move dbcs to dbc/ * run pre-commit outside docker * move generator to dbc/ * fix path in print
commaai · Aug 1, 2024 · a40652d · a40652d
1 parent cd61e17
commit a40652d
Show file tree

Hide file tree

Showing 173 changed files with 23 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,11 +8,11 @@
 .DS_Store
 .sconsign.dblite
 
-can/*.so
-can/*.a
-can/build/
-can/obj/
-can/packer_pyx.cpp
-can/parser_pyx.cpp
-can/packer_pyx.html
-can/parser_pyx.html
+opendbc/can/*.so
+opendbc/can/*.a
+opendbc/can/build/
+opendbc/can/obj/
+opendbc/can/packer_pyx.cpp
+opendbc/can/parser_pyx.cpp
+opendbc/can/packer_pyx.html
+opendbc/can/parser_pyx.html
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -56,6 +56,6 @@ repos:
     hooks:
     -   id: generator
         name: dbc generator
-        entry: generator/test_generator.py
+        entry: opendbc/dbc/generator/test_generator.py
         language: script
         pass_filenames: false
diff --git a/Dockerfile b/Dockerfile
@@ -40,12 +40,8 @@ RUN pip3 install --break-system-packages --no-cache-dir -r /tmp/requirements.txt
 RUN pip3 install --break-system-packages --no-cache-dir pre-commit==2.15.0 pylint==2.17.4
 
 WORKDIR /project/opendbc
-ENV PYTHONPATH=/project
+ENV PYTHONPATH=/project/opendbc
 
 COPY . .
-COPY SConstruct /project
-COPY ./site_scons /project/site_scons
-COPY .gitignore /project/.gitignore
-
-RUN ls && rm -rf .git && cd ../ && \
+RUN ls && rm -rf .git && \
     scons -c && scons -j$(nproc) \
diff --git a/__init__.py b/__init__.py
diff --git a/opendbc/__init__.py b/opendbc/__init__.py
@@ -0,0 +1,3 @@
+import os
+
+DBC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'dbc')
diff --git a/can/SConscript → opendbc/can/SConscript b/can/SConscript → opendbc/can/SConscript
@@ -3,7 +3,7 @@ Import('env', 'envCython', 'common', 'arch')
 import os
 
 envDBC = env.Clone()
-dbc_file_path = '-DDBC_FILE_PATH=\'"%s"\'' % (envDBC.Dir("..").abspath)
+dbc_file_path = '-DDBC_FILE_PATH=\'"%s"\'' % (envDBC.Dir("../dbc").abspath)
 envDBC['CXXFLAGS'] += [dbc_file_path]
 src = ["dbc.cc", "parser.cc", "packer.cc", "common.cc"]
 libs = [common, "zmq"]

diff --git a/can/__init__.py → opendbc/can/__init__.py b/can/__init__.py → opendbc/can/__init__.py
diff --git a/can/can_define.py → opendbc/can/can_define.py b/can/can_define.py → opendbc/can/can_define.py
diff --git a/can/common.cc → opendbc/can/common.cc b/can/common.cc → opendbc/can/common.cc
diff --git a/can/common.h → opendbc/can/common.h b/can/common.h → opendbc/can/common.h
diff --git a/can/common.pxd → opendbc/can/common.pxd b/can/common.pxd → opendbc/can/common.pxd
diff --git a/can/common_dbc.h → opendbc/can/common_dbc.h b/can/common_dbc.h → opendbc/can/common_dbc.h
diff --git a/can/dbc.cc → opendbc/can/dbc.cc b/can/dbc.cc → opendbc/can/dbc.cc
@@ -222,7 +222,7 @@ DBC* dbc_parse(const std::string& dbc_path) {
 const std::string get_dbc_root_path() {
   char *basedir = std::getenv("BASEDIR");
   if (basedir != NULL) {
-    return std::string(basedir) + "/opendbc";
+    return std::string(basedir) + "/opendbc/dbc";
   } else {
     return DBC_FILE_PATH;
   }

diff --git a/can/logger.h → opendbc/can/logger.h b/can/logger.h → opendbc/can/logger.h
diff --git a/can/packer.cc → opendbc/can/packer.cc b/can/packer.cc → opendbc/can/packer.cc
diff --git a/can/packer.py → opendbc/can/packer.py b/can/packer.py → opendbc/can/packer.py
diff --git a/can/packer_pyx.pyx → opendbc/can/packer_pyx.pyx b/can/packer_pyx.pyx → opendbc/can/packer_pyx.pyx
diff --git a/can/parser.cc → opendbc/can/parser.cc b/can/parser.cc → opendbc/can/parser.cc
diff --git a/can/parser.py → opendbc/can/parser.py b/can/parser.py → opendbc/can/parser.py
diff --git a/can/parser_pyx.pyx → opendbc/can/parser_pyx.pyx b/can/parser_pyx.pyx → opendbc/can/parser_pyx.pyx
diff --git a/can/tests/.gitignore → opendbc/can/tests/.gitignore b/can/tests/.gitignore → opendbc/can/tests/.gitignore
diff --git a/can/tests/__init__.py → opendbc/can/tests/__init__.py b/can/tests/__init__.py → opendbc/can/tests/__init__.py
diff --git a/can/tests/test.dbc → opendbc/can/tests/test.dbc b/can/tests/test.dbc → opendbc/can/tests/test.dbc
diff --git a/can/tests/test_checksums.py → opendbc/can/tests/test_checksums.py b/can/tests/test_checksums.py → opendbc/can/tests/test_checksums.py
diff --git a/can/tests/test_dbc_exceptions.py → opendbc/can/tests/test_dbc_exceptions.py b/can/tests/test_dbc_exceptions.py → opendbc/can/tests/test_dbc_exceptions.py
diff --git a/can/tests/test_dbc_parser.py → opendbc/can/tests/test_dbc_parser.py b/can/tests/test_dbc_parser.py → opendbc/can/tests/test_dbc_parser.py
diff --git a/can/tests/test_define.py → opendbc/can/tests/test_define.py b/can/tests/test_define.py → opendbc/can/tests/test_define.py
diff --git a/can/tests/test_packer_parser.py → opendbc/can/tests/test_packer_parser.py b/can/tests/test_packer_parser.py → opendbc/can/tests/test_packer_parser.py
diff --git a/can/tests/test_parser_performance.py → opendbc/can/tests/test_parser_performance.py b/can/tests/test_parser_performance.py → opendbc/can/tests/test_parser_performance.py
diff --git a/ESR.dbc → opendbc/dbc/ESR.dbc b/ESR.dbc → opendbc/dbc/ESR.dbc
diff --git a/FORD_CADS.dbc → opendbc/dbc/FORD_CADS.dbc b/FORD_CADS.dbc → opendbc/dbc/FORD_CADS.dbc
diff --git a/opendbc/dbc/__init__.py b/opendbc/dbc/__init__.py
diff --git a/acura_ilx_2016_can_generated.dbc → opendbc/dbc/acura_ilx_2016_can_generated.dbc b/acura_ilx_2016_can_generated.dbc → opendbc/dbc/acura_ilx_2016_can_generated.dbc
diff --git a/acura_ilx_2016_nidec.dbc → opendbc/dbc/acura_ilx_2016_nidec.dbc b/acura_ilx_2016_nidec.dbc → opendbc/dbc/acura_ilx_2016_nidec.dbc
diff --git a/acura_rdx_2018_can_generated.dbc → opendbc/dbc/acura_rdx_2018_can_generated.dbc b/acura_rdx_2018_can_generated.dbc → opendbc/dbc/acura_rdx_2018_can_generated.dbc
diff --git a/acura_rdx_2020_can_generated.dbc → opendbc/dbc/acura_rdx_2020_can_generated.dbc b/acura_rdx_2020_can_generated.dbc → opendbc/dbc/acura_rdx_2020_can_generated.dbc
diff --git a/bmw_e9x_e8x.dbc → opendbc/dbc/bmw_e9x_e8x.dbc b/bmw_e9x_e8x.dbc → opendbc/dbc/bmw_e9x_e8x.dbc
diff --git a/cadillac_ct6_chassis.dbc → opendbc/dbc/cadillac_ct6_chassis.dbc b/cadillac_ct6_chassis.dbc → opendbc/dbc/cadillac_ct6_chassis.dbc
diff --git a/cadillac_ct6_object.dbc → opendbc/dbc/cadillac_ct6_object.dbc b/cadillac_ct6_object.dbc → opendbc/dbc/cadillac_ct6_object.dbc
diff --git a/cadillac_ct6_powertrain.dbc → opendbc/dbc/cadillac_ct6_powertrain.dbc b/cadillac_ct6_powertrain.dbc → opendbc/dbc/cadillac_ct6_powertrain.dbc
diff --git a/chrysler_cusw.dbc → opendbc/dbc/chrysler_cusw.dbc b/chrysler_cusw.dbc → opendbc/dbc/chrysler_cusw.dbc
diff --git a/chrysler_pacifica_2017_hybrid_generated.dbc → ...rysler_pacifica_2017_hybrid_generated.dbc b/chrysler_pacifica_2017_hybrid_generated.dbc → ...rysler_pacifica_2017_hybrid_generated.dbc
diff --git a/...r_pacifica_2017_hybrid_private_fusion.dbc → ...r_pacifica_2017_hybrid_private_fusion.dbc b/...r_pacifica_2017_hybrid_private_fusion.dbc → ...r_pacifica_2017_hybrid_private_fusion.dbc
diff --git a/chrysler_ram_dt_generated.dbc → opendbc/dbc/chrysler_ram_dt_generated.dbc b/chrysler_ram_dt_generated.dbc → opendbc/dbc/chrysler_ram_dt_generated.dbc
diff --git a/chrysler_ram_hd_generated.dbc → opendbc/dbc/chrysler_ram_hd_generated.dbc b/chrysler_ram_hd_generated.dbc → opendbc/dbc/chrysler_ram_hd_generated.dbc
diff --git a/comma_body.dbc → opendbc/dbc/comma_body.dbc b/comma_body.dbc → opendbc/dbc/comma_body.dbc
diff --git a/ford_cgea1_2_bodycan_2011.dbc → opendbc/dbc/ford_cgea1_2_bodycan_2011.dbc b/ford_cgea1_2_bodycan_2011.dbc → opendbc/dbc/ford_cgea1_2_bodycan_2011.dbc
diff --git a/ford_cgea1_2_ptcan_2011.dbc → opendbc/dbc/ford_cgea1_2_ptcan_2011.dbc b/ford_cgea1_2_ptcan_2011.dbc → opendbc/dbc/ford_cgea1_2_ptcan_2011.dbc
diff --git a/ford_fusion_2018_adas.dbc → opendbc/dbc/ford_fusion_2018_adas.dbc b/ford_fusion_2018_adas.dbc → opendbc/dbc/ford_fusion_2018_adas.dbc
diff --git a/ford_fusion_2018_pt.dbc → opendbc/dbc/ford_fusion_2018_pt.dbc b/ford_fusion_2018_pt.dbc → opendbc/dbc/ford_fusion_2018_pt.dbc
diff --git a/ford_lincoln_base_pt.dbc → opendbc/dbc/ford_lincoln_base_pt.dbc b/ford_lincoln_base_pt.dbc → opendbc/dbc/ford_lincoln_base_pt.dbc
diff --git a/generator/chrysler/.gitignore → opendbc/dbc/generator/chrysler/.gitignore b/generator/chrysler/.gitignore → opendbc/dbc/generator/chrysler/.gitignore
diff --git a/generator/chrysler/_stellantis_common.dbc → ...generator/chrysler/_stellantis_common.dbc b/generator/chrysler/_stellantis_common.dbc → ...generator/chrysler/_stellantis_common.dbc
diff --git a/generator/chrysler/_stellantis_common_ram.py → ...erator/chrysler/_stellantis_common_ram.py b/generator/chrysler/_stellantis_common_ram.py → ...erator/chrysler/_stellantis_common_ram.py
diff --git a/...hrysler/chrysler_pacifica_2017_hybrid.dbc → ...hrysler/chrysler_pacifica_2017_hybrid.dbc b/...hrysler/chrysler_pacifica_2017_hybrid.dbc → ...hrysler/chrysler_pacifica_2017_hybrid.dbc
diff --git a/generator/chrysler/chrysler_ram_dt.dbc → ...bc/generator/chrysler/chrysler_ram_dt.dbc b/generator/chrysler/chrysler_ram_dt.dbc → ...bc/generator/chrysler/chrysler_ram_dt.dbc
diff --git a/generator/chrysler/chrysler_ram_hd.dbc → ...bc/generator/chrysler/chrysler_ram_hd.dbc b/generator/chrysler/chrysler_ram_hd.dbc → ...bc/generator/chrysler/chrysler_ram_hd.dbc
diff --git a/generator/generator.py → opendbc/dbc/generator/generator.py b/generator/generator.py → opendbc/dbc/generator/generator.py
diff --git a/generator/gm/_community.dbc → opendbc/dbc/generator/gm/_community.dbc b/generator/gm/_community.dbc → opendbc/dbc/generator/gm/_community.dbc
diff --git a/generator/gm/gm_global_a_powertrain.dbc → ...c/generator/gm/gm_global_a_powertrain.dbc b/generator/gm/gm_global_a_powertrain.dbc → ...c/generator/gm/gm_global_a_powertrain.dbc
diff --git a/generator/honda/_bosch_2018.dbc → opendbc/dbc/generator/honda/_bosch_2018.dbc b/generator/honda/_bosch_2018.dbc → opendbc/dbc/generator/honda/_bosch_2018.dbc
diff --git a/generator/honda/_bosch_adas_2018.dbc → .../dbc/generator/honda/_bosch_adas_2018.dbc b/generator/honda/_bosch_adas_2018.dbc → .../dbc/generator/honda/_bosch_adas_2018.dbc
diff --git a/generator/honda/_community.dbc → opendbc/dbc/generator/honda/_community.dbc b/generator/honda/_community.dbc → opendbc/dbc/generator/honda/_community.dbc
diff --git a/generator/honda/_honda_common.dbc → ...dbc/dbc/generator/honda/_honda_common.dbc b/generator/honda/_honda_common.dbc → ...dbc/dbc/generator/honda/_honda_common.dbc
diff --git a/generator/honda/_nidec_common.dbc → ...dbc/dbc/generator/honda/_nidec_common.dbc b/generator/honda/_nidec_common.dbc → ...dbc/dbc/generator/honda/_nidec_common.dbc
diff --git a/generator/honda/_steering_sensors_a.dbc → ...c/generator/honda/_steering_sensors_a.dbc b/generator/honda/_steering_sensors_a.dbc → ...c/generator/honda/_steering_sensors_a.dbc
diff --git a/generator/honda/_steering_sensors_b.dbc → ...c/generator/honda/_steering_sensors_b.dbc b/generator/honda/_steering_sensors_b.dbc → ...c/generator/honda/_steering_sensors_b.dbc
diff --git a/generator/honda/acura_ilx_2016_can.dbc → ...bc/generator/honda/acura_ilx_2016_can.dbc b/generator/honda/acura_ilx_2016_can.dbc → ...bc/generator/honda/acura_ilx_2016_can.dbc
diff --git a/generator/honda/acura_rdx_2018_can.dbc → ...bc/generator/honda/acura_rdx_2018_can.dbc b/generator/honda/acura_rdx_2018_can.dbc → ...bc/generator/honda/acura_rdx_2018_can.dbc
diff --git a/generator/honda/acura_rdx_2020_can.dbc → ...bc/generator/honda/acura_rdx_2020_can.dbc b/generator/honda/acura_rdx_2020_can.dbc → ...bc/generator/honda/acura_rdx_2020_can.dbc
diff --git a/generator/honda/honda_accord_2018_can.dbc → ...generator/honda/honda_accord_2018_can.dbc b/generator/honda/honda_accord_2018_can.dbc → ...generator/honda/honda_accord_2018_can.dbc
diff --git a/generator/honda/honda_civic_ex_2022_can.dbc → ...nerator/honda/honda_civic_ex_2022_can.dbc b/generator/honda/honda_civic_ex_2022_can.dbc → ...nerator/honda/honda_civic_ex_2022_can.dbc
diff --git a/...nda/honda_civic_hatchback_ex_2017_can.dbc → ...nda/honda_civic_hatchback_ex_2017_can.dbc b/...nda/honda_civic_hatchback_ex_2017_can.dbc → ...nda/honda_civic_hatchback_ex_2017_can.dbc
diff --git a/...or/honda/honda_civic_touring_2016_can.dbc → ...or/honda/honda_civic_touring_2016_can.dbc b/...or/honda/honda_civic_touring_2016_can.dbc → ...or/honda/honda_civic_touring_2016_can.dbc
diff --git a/...r/honda/honda_clarity_hybrid_2018_can.dbc → ...r/honda/honda_clarity_hybrid_2018_can.dbc b/...r/honda/honda_clarity_hybrid_2018_can.dbc → ...r/honda/honda_clarity_hybrid_2018_can.dbc
diff --git a/generator/honda/honda_crv_ex_2017_body.dbc → ...enerator/honda/honda_crv_ex_2017_body.dbc b/generator/honda/honda_crv_ex_2017_body.dbc → ...enerator/honda/honda_crv_ex_2017_body.dbc
diff --git a/generator/honda/honda_crv_ex_2017_can.dbc → ...generator/honda/honda_crv_ex_2017_can.dbc b/generator/honda/honda_crv_ex_2017_can.dbc → ...generator/honda/honda_crv_ex_2017_can.dbc
diff --git a/...or/honda/honda_crv_executive_2016_can.dbc → ...or/honda/honda_crv_executive_2016_can.dbc b/...or/honda/honda_crv_executive_2016_can.dbc → ...or/honda/honda_crv_executive_2016_can.dbc
diff --git a/...ator/honda/honda_crv_touring_2016_can.dbc → ...ator/honda/honda_crv_touring_2016_can.dbc b/...ator/honda/honda_crv_touring_2016_can.dbc → ...ator/honda/honda_crv_touring_2016_can.dbc
diff --git a/generator/honda/honda_fit_ex_2018_can.dbc → ...generator/honda/honda_fit_ex_2018_can.dbc b/generator/honda/honda_fit_ex_2018_can.dbc → ...generator/honda/honda_fit_ex_2018_can.dbc
diff --git a/...rator/honda/honda_fit_hybrid_2018_can.dbc → ...rator/honda/honda_fit_hybrid_2018_can.dbc b/...rator/honda/honda_fit_hybrid_2018_can.dbc → ...rator/honda/honda_fit_hybrid_2018_can.dbc
diff --git a/...rator/honda/honda_insight_ex_2019_can.dbc → ...rator/honda/honda_insight_ex_2019_can.dbc b/...rator/honda/honda_insight_ex_2019_can.dbc → ...rator/honda/honda_insight_ex_2019_can.dbc
diff --git a/generator/honda/honda_odyssey_exl_2018.dbc → ...enerator/honda/honda_odyssey_exl_2018.dbc b/generator/honda/honda_odyssey_exl_2018.dbc → ...enerator/honda/honda_odyssey_exl_2018.dbc
diff --git a/...dyssey_extreme_edition_2018_china_can.dbc → ...dyssey_extreme_edition_2018_china_can.dbc b/...dyssey_extreme_edition_2018_china_can.dbc → ...dyssey_extreme_edition_2018_china_can.dbc
diff --git a/generator/honda/honda_pilot_2023_can.dbc → .../generator/honda/honda_pilot_2023_can.dbc b/generator/honda/honda_pilot_2023_can.dbc → .../generator/honda/honda_pilot_2023_can.dbc
diff --git a/generator/hyundai/.gitignore → opendbc/dbc/generator/hyundai/.gitignore b/generator/hyundai/.gitignore → opendbc/dbc/generator/hyundai/.gitignore
diff --git a/...hyundai/hyundai_kia_mando_corner_radar.py → ...hyundai/hyundai_kia_mando_corner_radar.py b/...hyundai/hyundai_kia_mando_corner_radar.py → ...hyundai/hyundai_kia_mando_corner_radar.py
diff --git a/.../hyundai/hyundai_kia_mando_front_radar.py → .../hyundai/hyundai_kia_mando_front_radar.py b/.../hyundai/hyundai_kia_mando_front_radar.py → .../hyundai/hyundai_kia_mando_front_radar.py
diff --git a/generator/nissan/_nissan_common.dbc → ...c/dbc/generator/nissan/_nissan_common.dbc b/generator/nissan/_nissan_common.dbc → ...c/dbc/generator/nissan/_nissan_common.dbc
diff --git a/generator/nissan/nissan_leaf_2018.dbc → ...dbc/generator/nissan/nissan_leaf_2018.dbc b/generator/nissan/nissan_leaf_2018.dbc → ...dbc/generator/nissan/nissan_leaf_2018.dbc
diff --git a/generator/nissan/nissan_x_trail_2017.dbc → .../generator/nissan/nissan_x_trail_2017.dbc b/generator/nissan/nissan_x_trail_2017.dbc → .../generator/nissan/nissan_x_trail_2017.dbc
diff --git a/generator/subaru/_subaru_global.dbc → ...c/dbc/generator/subaru/_subaru_global.dbc b/generator/subaru/_subaru_global.dbc → ...c/dbc/generator/subaru/_subaru_global.dbc
diff --git a/generator/subaru/_subaru_preglobal_2015.dbc → ...nerator/subaru/_subaru_preglobal_2015.dbc b/generator/subaru/_subaru_preglobal_2015.dbc → ...nerator/subaru/_subaru_preglobal_2015.dbc
diff --git a/generator/subaru/subaru_forester_2017.dbc → ...generator/subaru/subaru_forester_2017.dbc b/generator/subaru/subaru_forester_2017.dbc → ...generator/subaru/subaru_forester_2017.dbc
diff --git a/generator/subaru/subaru_global_2017.dbc → ...c/generator/subaru/subaru_global_2017.dbc b/generator/subaru/subaru_global_2017.dbc → ...c/generator/subaru/subaru_global_2017.dbc
diff --git a/...ator/subaru/subaru_global_2020_hybrid.dbc → ...ator/subaru/subaru_global_2020_hybrid.dbc b/...ator/subaru/subaru_global_2020_hybrid.dbc → ...ator/subaru/subaru_global_2020_hybrid.dbc
diff --git a/generator/subaru/subaru_outback_2015.dbc → .../generator/subaru/subaru_outback_2015.dbc b/generator/subaru/subaru_outback_2015.dbc → .../generator/subaru/subaru_outback_2015.dbc
diff --git a/generator/subaru/subaru_outback_2019.dbc → .../generator/subaru/subaru_outback_2019.dbc b/generator/subaru/subaru_outback_2019.dbc → .../generator/subaru/subaru_outback_2019.dbc
diff --git a/generator/tesla/.gitignore → opendbc/dbc/generator/tesla/.gitignore b/generator/tesla/.gitignore → opendbc/dbc/generator/tesla/.gitignore
diff --git a/generator/tesla/radar_common.py → opendbc/dbc/generator/tesla/radar_common.py b/generator/tesla/radar_common.py → opendbc/dbc/generator/tesla/radar_common.py
diff --git a/generator/tesla/tesla_radar_bosch.py → .../dbc/generator/tesla/tesla_radar_bosch.py b/generator/tesla/tesla_radar_bosch.py → .../dbc/generator/tesla/tesla_radar_bosch.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import os
-from opendbc.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/generator/tesla/tesla_radar_continental.py → ...enerator/tesla/tesla_radar_continental.py b/generator/tesla/tesla_radar_continental.py → ...enerator/tesla/tesla_radar_continental.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 import os
-from opendbc.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/generator/test_generator.py → opendbc/dbc/generator/test_generator.py b/generator/test_generator.py → opendbc/dbc/generator/test_generator.py
@@ -2,7 +2,7 @@
 import os
 import filecmp
 import tempfile
-from opendbc.generator.generator import create_all, opendbc_root
+from opendbc.dbc.generator.generator import create_all, opendbc_root
 
 
 def test_generator():
@@ -14,7 +14,7 @@ def test_generator():
 
     err = "Generated DBC mismatch\n\n"
     err += f"Different files: {comp.diff_files}\n\n"
-    err += "Run opendbc/generator/generator.py to regenerate DBC files."
+    err += "Run opendbc/dbc/generator/generator.py to regenerate DBC files."
     assert len(comp.diff_files) == 0, err
 
 

diff --git a/generator/toyota/_community.dbc → opendbc/dbc/generator/toyota/_community.dbc b/generator/toyota/_community.dbc → opendbc/dbc/generator/toyota/_community.dbc
diff --git a/generator/toyota/_toyota_2017.dbc → ...dbc/dbc/generator/toyota/_toyota_2017.dbc b/generator/toyota/_toyota_2017.dbc → ...dbc/dbc/generator/toyota/_toyota_2017.dbc
diff --git a/generator/toyota/toyota_new_mc_pt.dbc → ...dbc/generator/toyota/toyota_new_mc_pt.dbc b/generator/toyota/toyota_new_mc_pt.dbc → ...dbc/generator/toyota/toyota_new_mc_pt.dbc
diff --git a/generator/toyota/toyota_nodsu_pt.dbc → .../dbc/generator/toyota/toyota_nodsu_pt.dbc b/generator/toyota/toyota_nodsu_pt.dbc → .../dbc/generator/toyota/toyota_nodsu_pt.dbc
diff --git a/generator/toyota/toyota_tnga_k_pt.dbc → ...dbc/generator/toyota/toyota_tnga_k_pt.dbc b/generator/toyota/toyota_tnga_k_pt.dbc → ...dbc/generator/toyota/toyota_tnga_k_pt.dbc
diff --git a/gm_global_a_chassis.dbc → opendbc/dbc/gm_global_a_chassis.dbc b/gm_global_a_chassis.dbc → opendbc/dbc/gm_global_a_chassis.dbc
diff --git a/gm_global_a_high_voltage_management.dbc → ...c/gm_global_a_high_voltage_management.dbc b/gm_global_a_high_voltage_management.dbc → ...c/gm_global_a_high_voltage_management.dbc
diff --git a/gm_global_a_lowspeed.dbc → opendbc/dbc/gm_global_a_lowspeed.dbc b/gm_global_a_lowspeed.dbc → opendbc/dbc/gm_global_a_lowspeed.dbc
diff --git a/gm_global_a_lowspeed_1818125.dbc → opendbc/dbc/gm_global_a_lowspeed_1818125.dbc b/gm_global_a_lowspeed_1818125.dbc → opendbc/dbc/gm_global_a_lowspeed_1818125.dbc
diff --git a/gm_global_a_object.dbc → opendbc/dbc/gm_global_a_object.dbc b/gm_global_a_object.dbc → opendbc/dbc/gm_global_a_object.dbc
diff --git a/gm_global_a_powertrain_expansion.dbc → .../dbc/gm_global_a_powertrain_expansion.dbc b/gm_global_a_powertrain_expansion.dbc → .../dbc/gm_global_a_powertrain_expansion.dbc
diff --git a/gm_global_a_powertrain_generated.dbc → .../dbc/gm_global_a_powertrain_generated.dbc b/gm_global_a_powertrain_generated.dbc → .../dbc/gm_global_a_powertrain_generated.dbc
diff --git a/honda_accord_2018_can_generated.dbc → ...c/dbc/honda_accord_2018_can_generated.dbc b/honda_accord_2018_can_generated.dbc → ...c/dbc/honda_accord_2018_can_generated.dbc
diff --git a/honda_civic_ex_2022_can_generated.dbc → ...dbc/honda_civic_ex_2022_can_generated.dbc b/honda_civic_ex_2022_can_generated.dbc → ...dbc/honda_civic_ex_2022_can_generated.dbc
diff --git a/...civic_hatchback_ex_2017_can_generated.dbc → ...civic_hatchback_ex_2017_can_generated.dbc b/...civic_hatchback_ex_2017_can_generated.dbc → ...civic_hatchback_ex_2017_can_generated.dbc
diff --git a/honda_civic_touring_2016_can_generated.dbc → ...onda_civic_touring_2016_can_generated.dbc b/honda_civic_touring_2016_can_generated.dbc → ...onda_civic_touring_2016_can_generated.dbc
diff --git a/honda_clarity_hybrid_2018_can_generated.dbc → ...nda_clarity_hybrid_2018_can_generated.dbc b/honda_clarity_hybrid_2018_can_generated.dbc → ...nda_clarity_hybrid_2018_can_generated.dbc
diff --git a/honda_crv_ex_2017_body_generated.dbc → .../dbc/honda_crv_ex_2017_body_generated.dbc b/honda_crv_ex_2017_body_generated.dbc → .../dbc/honda_crv_ex_2017_body_generated.dbc
diff --git a/honda_crv_ex_2017_can_generated.dbc → ...c/dbc/honda_crv_ex_2017_can_generated.dbc b/honda_crv_ex_2017_can_generated.dbc → ...c/dbc/honda_crv_ex_2017_can_generated.dbc
diff --git a/honda_crv_executive_2016_can_generated.dbc → ...onda_crv_executive_2016_can_generated.dbc b/honda_crv_executive_2016_can_generated.dbc → ...onda_crv_executive_2016_can_generated.dbc
diff --git a/honda_crv_touring_2016_can_generated.dbc → .../honda_crv_touring_2016_can_generated.dbc b/honda_crv_touring_2016_can_generated.dbc → .../honda_crv_touring_2016_can_generated.dbc
diff --git a/honda_fit_ex_2018_can_generated.dbc → ...c/dbc/honda_fit_ex_2018_can_generated.dbc b/honda_fit_ex_2018_can_generated.dbc → ...c/dbc/honda_fit_ex_2018_can_generated.dbc
diff --git a/honda_fit_hybrid_2018_can_generated.dbc → ...c/honda_fit_hybrid_2018_can_generated.dbc b/honda_fit_hybrid_2018_can_generated.dbc → ...c/honda_fit_hybrid_2018_can_generated.dbc
diff --git a/honda_insight_ex_2019_can_generated.dbc → ...c/honda_insight_ex_2019_can_generated.dbc b/honda_insight_ex_2019_can_generated.dbc → ...c/honda_insight_ex_2019_can_generated.dbc
diff --git a/honda_odyssey_exl_2018_generated.dbc → .../dbc/honda_odyssey_exl_2018_generated.dbc b/honda_odyssey_exl_2018_generated.dbc → .../dbc/honda_odyssey_exl_2018_generated.dbc
diff --git a/...reme_edition_2018_china_can_generated.dbc → ...reme_edition_2018_china_can_generated.dbc b/...reme_edition_2018_china_can_generated.dbc → ...reme_edition_2018_china_can_generated.dbc
diff --git a/honda_pilot_2023_can_generated.dbc → ...bc/dbc/honda_pilot_2023_can_generated.dbc b/honda_pilot_2023_can_generated.dbc → ...bc/dbc/honda_pilot_2023_can_generated.dbc
diff --git a/hyundai_2015_ccan.dbc → opendbc/dbc/hyundai_2015_ccan.dbc b/hyundai_2015_ccan.dbc → opendbc/dbc/hyundai_2015_ccan.dbc
diff --git a/hyundai_2015_mcan.dbc → opendbc/dbc/hyundai_2015_mcan.dbc b/hyundai_2015_mcan.dbc → opendbc/dbc/hyundai_2015_mcan.dbc
diff --git a/hyundai_canfd.dbc → opendbc/dbc/hyundai_canfd.dbc b/hyundai_canfd.dbc → opendbc/dbc/hyundai_canfd.dbc
diff --git a/hyundai_i30_2014.dbc → opendbc/dbc/hyundai_i30_2014.dbc b/hyundai_i30_2014.dbc → opendbc/dbc/hyundai_i30_2014.dbc
diff --git a/hyundai_kia_generic.dbc → opendbc/dbc/hyundai_kia_generic.dbc b/hyundai_kia_generic.dbc → opendbc/dbc/hyundai_kia_generic.dbc
diff --git a/hyundai_kia_mando_corner_radar_generated.dbc → ...ndai_kia_mando_corner_radar_generated.dbc b/hyundai_kia_mando_corner_radar_generated.dbc → ...ndai_kia_mando_corner_radar_generated.dbc
diff --git a/hyundai_kia_mando_front_radar_generated.dbc → ...undai_kia_mando_front_radar_generated.dbc b/hyundai_kia_mando_front_radar_generated.dbc → ...undai_kia_mando_front_radar_generated.dbc
diff --git a/hyundai_santafe_2007.dbc → opendbc/dbc/hyundai_santafe_2007.dbc b/hyundai_santafe_2007.dbc → opendbc/dbc/hyundai_santafe_2007.dbc
diff --git a/luxgen_s5_2015.dbc → opendbc/dbc/luxgen_s5_2015.dbc b/luxgen_s5_2015.dbc → opendbc/dbc/luxgen_s5_2015.dbc
diff --git a/mazda_2017.dbc → opendbc/dbc/mazda_2017.dbc b/mazda_2017.dbc → opendbc/dbc/mazda_2017.dbc
diff --git a/mazda_3_2019.dbc → opendbc/dbc/mazda_3_2019.dbc b/mazda_3_2019.dbc → opendbc/dbc/mazda_3_2019.dbc
diff --git a/mazda_radar.dbc → opendbc/dbc/mazda_radar.dbc b/mazda_radar.dbc → opendbc/dbc/mazda_radar.dbc
diff --git a/mazda_rx8.dbc → opendbc/dbc/mazda_rx8.dbc b/mazda_rx8.dbc → opendbc/dbc/mazda_rx8.dbc
diff --git a/mercedes_benz_e350_2010.dbc → opendbc/dbc/mercedes_benz_e350_2010.dbc b/mercedes_benz_e350_2010.dbc → opendbc/dbc/mercedes_benz_e350_2010.dbc
diff --git a/nissan_leaf_2018_generated.dbc → opendbc/dbc/nissan_leaf_2018_generated.dbc b/nissan_leaf_2018_generated.dbc → opendbc/dbc/nissan_leaf_2018_generated.dbc
diff --git a/nissan_x_trail_2017_generated.dbc → ...dbc/dbc/nissan_x_trail_2017_generated.dbc b/nissan_x_trail_2017_generated.dbc → ...dbc/dbc/nissan_x_trail_2017_generated.dbc
diff --git a/nissan_xterra_2011.dbc → opendbc/dbc/nissan_xterra_2011.dbc b/nissan_xterra_2011.dbc → opendbc/dbc/nissan_xterra_2011.dbc
diff --git a/opel_omega_2001.dbc → opendbc/dbc/opel_omega_2001.dbc b/opel_omega_2001.dbc → opendbc/dbc/opel_omega_2001.dbc
diff --git a/subaru_forester_2017_generated.dbc → ...bc/dbc/subaru_forester_2017_generated.dbc b/subaru_forester_2017_generated.dbc → ...bc/dbc/subaru_forester_2017_generated.dbc
diff --git a/subaru_global_2017_generated.dbc → opendbc/dbc/subaru_global_2017_generated.dbc b/subaru_global_2017_generated.dbc → opendbc/dbc/subaru_global_2017_generated.dbc
diff --git a/subaru_global_2020_hybrid_generated.dbc → ...c/subaru_global_2020_hybrid_generated.dbc b/subaru_global_2020_hybrid_generated.dbc → ...c/subaru_global_2020_hybrid_generated.dbc
diff --git a/subaru_outback_2015_generated.dbc → ...dbc/dbc/subaru_outback_2015_generated.dbc b/subaru_outback_2015_generated.dbc → ...dbc/dbc/subaru_outback_2015_generated.dbc
diff --git a/subaru_outback_2019_generated.dbc → ...dbc/dbc/subaru_outback_2019_generated.dbc b/subaru_outback_2019_generated.dbc → ...dbc/dbc/subaru_outback_2019_generated.dbc
diff --git a/tesla_can.dbc → opendbc/dbc/tesla_can.dbc b/tesla_can.dbc → opendbc/dbc/tesla_can.dbc
diff --git a/tesla_model3_party.dbc → opendbc/dbc/tesla_model3_party.dbc b/tesla_model3_party.dbc → opendbc/dbc/tesla_model3_party.dbc
diff --git a/tesla_model3_vehicle.dbc → opendbc/dbc/tesla_model3_vehicle.dbc b/tesla_model3_vehicle.dbc → opendbc/dbc/tesla_model3_vehicle.dbc
diff --git a/tesla_powertrain.dbc → opendbc/dbc/tesla_powertrain.dbc b/tesla_powertrain.dbc → opendbc/dbc/tesla_powertrain.dbc
diff --git a/tesla_radar_bosch_generated.dbc → opendbc/dbc/tesla_radar_bosch_generated.dbc b/tesla_radar_bosch_generated.dbc → opendbc/dbc/tesla_radar_bosch_generated.dbc
diff --git a/tesla_radar_continental_generated.dbc → ...dbc/tesla_radar_continental_generated.dbc b/tesla_radar_continental_generated.dbc → ...dbc/tesla_radar_continental_generated.dbc
diff --git a/toyota_2017_ref_pt.dbc → opendbc/dbc/toyota_2017_ref_pt.dbc b/toyota_2017_ref_pt.dbc → opendbc/dbc/toyota_2017_ref_pt.dbc
diff --git a/toyota_adas.dbc → opendbc/dbc/toyota_adas.dbc b/toyota_adas.dbc → opendbc/dbc/toyota_adas.dbc
diff --git a/toyota_iQ_2009_can.dbc → opendbc/dbc/toyota_iQ_2009_can.dbc b/toyota_iQ_2009_can.dbc → opendbc/dbc/toyota_iQ_2009_can.dbc
diff --git a/toyota_new_mc_pt_generated.dbc → opendbc/dbc/toyota_new_mc_pt_generated.dbc b/toyota_new_mc_pt_generated.dbc → opendbc/dbc/toyota_new_mc_pt_generated.dbc
diff --git a/toyota_nodsu_pt_generated.dbc → opendbc/dbc/toyota_nodsu_pt_generated.dbc b/toyota_nodsu_pt_generated.dbc → opendbc/dbc/toyota_nodsu_pt_generated.dbc
diff --git a/toyota_prius_2010_pt.dbc → opendbc/dbc/toyota_prius_2010_pt.dbc b/toyota_prius_2010_pt.dbc → opendbc/dbc/toyota_prius_2010_pt.dbc
diff --git a/toyota_radar_dsu_tssp.dbc → opendbc/dbc/toyota_radar_dsu_tssp.dbc b/toyota_radar_dsu_tssp.dbc → opendbc/dbc/toyota_radar_dsu_tssp.dbc
diff --git a/toyota_tnga_k_pt_generated.dbc → opendbc/dbc/toyota_tnga_k_pt_generated.dbc b/toyota_tnga_k_pt_generated.dbc → opendbc/dbc/toyota_tnga_k_pt_generated.dbc
diff --git a/toyota_tss2_adas.dbc → opendbc/dbc/toyota_tss2_adas.dbc b/toyota_tss2_adas.dbc → opendbc/dbc/toyota_tss2_adas.dbc
diff --git a/volvo_v40_2017_pt.dbc → opendbc/dbc/volvo_v40_2017_pt.dbc b/volvo_v40_2017_pt.dbc → opendbc/dbc/volvo_v40_2017_pt.dbc
diff --git a/volvo_v60_2015_pt.dbc → opendbc/dbc/volvo_v60_2015_pt.dbc b/volvo_v60_2015_pt.dbc → opendbc/dbc/volvo_v60_2015_pt.dbc
diff --git a/vw_golf_mk4.dbc → opendbc/dbc/vw_golf_mk4.dbc b/vw_golf_mk4.dbc → opendbc/dbc/vw_golf_mk4.dbc
diff --git a/vw_mqb_2010.dbc → opendbc/dbc/vw_mqb_2010.dbc b/vw_mqb_2010.dbc → opendbc/dbc/vw_mqb_2010.dbc
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,6 +11,9 @@ repository = "https://github.com/commaai/opendbc"
 max-line-length = 120
 ignore = ["E111", "E114"]
 
+[tool.mypy]
+explicit_package_bases=true
+
 # https://beta.ruff.rs/docs/configuration/#using-pyprojecttoml
 [tool.ruff]
 select = ["E", "F", "W", "PIE", "C4", "ISC", "RUF100", "A"]