From a40652d341ea3161a6a10001fa74284d9d650f8c Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 31 Jul 2024 22:46:43 -0700 Subject: [PATCH] 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 --- .gitignore | 16 ++++++++-------- .pre-commit-config.yaml | 2 +- Dockerfile | 8 ++------ __init__.py | 2 -- opendbc/__init__.py | 3 +++ {can => opendbc/can}/SConscript | 2 +- {can => opendbc/can}/__init__.py | 0 {can => opendbc/can}/can_define.py | 0 {can => opendbc/can}/common.cc | 0 {can => opendbc/can}/common.h | 0 {can => opendbc/can}/common.pxd | 0 {can => opendbc/can}/common_dbc.h | 0 {can => opendbc/can}/dbc.cc | 2 +- {can => opendbc/can}/logger.h | 0 {can => opendbc/can}/packer.cc | 0 {can => opendbc/can}/packer.py | 0 {can => opendbc/can}/packer_pyx.pyx | 0 {can => opendbc/can}/parser.cc | 0 {can => opendbc/can}/parser.py | 0 {can => opendbc/can}/parser_pyx.pyx | 0 {can => opendbc/can}/tests/.gitignore | 0 {can => opendbc/can}/tests/__init__.py | 0 {can => opendbc/can}/tests/test.dbc | 0 {can => opendbc/can}/tests/test_checksums.py | 0 .../can}/tests/test_dbc_exceptions.py | 0 {can => opendbc/can}/tests/test_dbc_parser.py | 0 {can => opendbc/can}/tests/test_define.py | 0 {can => opendbc/can}/tests/test_packer_parser.py | 0 .../can}/tests/test_parser_performance.py | 0 ESR.dbc => opendbc/dbc/ESR.dbc | 0 FORD_CADS.dbc => opendbc/dbc/FORD_CADS.dbc | 0 opendbc/dbc/__init__.py | 0 .../dbc/acura_ilx_2016_can_generated.dbc | 0 .../dbc/acura_ilx_2016_nidec.dbc | 0 .../dbc/acura_rdx_2018_can_generated.dbc | 0 .../dbc/acura_rdx_2020_can_generated.dbc | 0 bmw_e9x_e8x.dbc => opendbc/dbc/bmw_e9x_e8x.dbc | 0 .../dbc/cadillac_ct6_chassis.dbc | 0 .../dbc/cadillac_ct6_object.dbc | 0 .../dbc/cadillac_ct6_powertrain.dbc | 0 .../dbc/chrysler_cusw.dbc | 0 .../chrysler_pacifica_2017_hybrid_generated.dbc | 0 ...ysler_pacifica_2017_hybrid_private_fusion.dbc | 0 .../dbc/chrysler_ram_dt_generated.dbc | 0 .../dbc/chrysler_ram_hd_generated.dbc | 0 comma_body.dbc => opendbc/dbc/comma_body.dbc | 0 .../dbc/ford_cgea1_2_bodycan_2011.dbc | 0 .../dbc/ford_cgea1_2_ptcan_2011.dbc | 0 .../dbc/ford_fusion_2018_adas.dbc | 0 .../dbc/ford_fusion_2018_pt.dbc | 0 .../dbc/ford_lincoln_base_pt.dbc | 0 .../dbc/generator}/chrysler/.gitignore | 0 .../generator}/chrysler/_stellantis_common.dbc | 0 .../chrysler/_stellantis_common_ram.py | 0 .../chrysler/chrysler_pacifica_2017_hybrid.dbc | 0 .../dbc/generator}/chrysler/chrysler_ram_dt.dbc | 0 .../dbc/generator}/chrysler/chrysler_ram_hd.dbc | 0 .../dbc/generator}/generator.py | 0 .../dbc/generator}/gm/_community.dbc | 0 .../dbc/generator}/gm/gm_global_a_powertrain.dbc | 0 .../dbc/generator}/honda/_bosch_2018.dbc | 0 .../dbc/generator}/honda/_bosch_adas_2018.dbc | 0 .../dbc/generator}/honda/_community.dbc | 0 .../dbc/generator}/honda/_honda_common.dbc | 0 .../dbc/generator}/honda/_nidec_common.dbc | 0 .../dbc/generator}/honda/_steering_sensors_a.dbc | 0 .../dbc/generator}/honda/_steering_sensors_b.dbc | 0 .../dbc/generator}/honda/acura_ilx_2016_can.dbc | 0 .../dbc/generator}/honda/acura_rdx_2018_can.dbc | 0 .../dbc/generator}/honda/acura_rdx_2020_can.dbc | 0 .../generator}/honda/honda_accord_2018_can.dbc | 0 .../generator}/honda/honda_civic_ex_2022_can.dbc | 0 .../honda/honda_civic_hatchback_ex_2017_can.dbc | 0 .../honda/honda_civic_touring_2016_can.dbc | 0 .../honda/honda_clarity_hybrid_2018_can.dbc | 0 .../generator}/honda/honda_crv_ex_2017_body.dbc | 0 .../generator}/honda/honda_crv_ex_2017_can.dbc | 0 .../honda/honda_crv_executive_2016_can.dbc | 0 .../honda/honda_crv_touring_2016_can.dbc | 0 .../generator}/honda/honda_fit_ex_2018_can.dbc | 0 .../honda/honda_fit_hybrid_2018_can.dbc | 0 .../honda/honda_insight_ex_2019_can.dbc | 0 .../generator}/honda/honda_odyssey_exl_2018.dbc | 0 ...da_odyssey_extreme_edition_2018_china_can.dbc | 0 .../generator}/honda/honda_pilot_2023_can.dbc | 0 .../dbc/generator}/hyundai/.gitignore | 0 .../hyundai/hyundai_kia_mando_corner_radar.py | 0 .../hyundai/hyundai_kia_mando_front_radar.py | 0 .../dbc/generator}/nissan/_nissan_common.dbc | 0 .../dbc/generator}/nissan/nissan_leaf_2018.dbc | 0 .../generator}/nissan/nissan_x_trail_2017.dbc | 0 .../dbc/generator}/subaru/_subaru_global.dbc | 0 .../generator}/subaru/_subaru_preglobal_2015.dbc | 0 .../generator}/subaru/subaru_forester_2017.dbc | 0 .../dbc/generator}/subaru/subaru_global_2017.dbc | 0 .../subaru/subaru_global_2020_hybrid.dbc | 0 .../generator}/subaru/subaru_outback_2015.dbc | 0 .../generator}/subaru/subaru_outback_2019.dbc | 0 .../dbc/generator}/tesla/.gitignore | 0 .../dbc/generator}/tesla/radar_common.py | 0 .../dbc/generator}/tesla/tesla_radar_bosch.py | 2 +- .../generator}/tesla/tesla_radar_continental.py | 2 +- .../dbc/generator}/test_generator.py | 4 ++-- .../dbc/generator}/toyota/_community.dbc | 0 .../dbc/generator}/toyota/_toyota_2017.dbc | 0 .../dbc/generator}/toyota/toyota_new_mc_pt.dbc | 0 .../dbc/generator}/toyota/toyota_nodsu_pt.dbc | 0 .../dbc/generator}/toyota/toyota_tnga_k_pt.dbc | 0 .../dbc/gm_global_a_chassis.dbc | 0 .../dbc/gm_global_a_high_voltage_management.dbc | 0 .../dbc/gm_global_a_lowspeed.dbc | 0 .../dbc/gm_global_a_lowspeed_1818125.dbc | 0 .../dbc/gm_global_a_object.dbc | 0 .../dbc/gm_global_a_powertrain_expansion.dbc | 0 .../dbc/gm_global_a_powertrain_generated.dbc | 0 .../dbc/honda_accord_2018_can_generated.dbc | 0 .../dbc/honda_civic_ex_2022_can_generated.dbc | 0 ...nda_civic_hatchback_ex_2017_can_generated.dbc | 0 .../honda_civic_touring_2016_can_generated.dbc | 0 .../honda_clarity_hybrid_2018_can_generated.dbc | 0 .../dbc/honda_crv_ex_2017_body_generated.dbc | 0 .../dbc/honda_crv_ex_2017_can_generated.dbc | 0 .../honda_crv_executive_2016_can_generated.dbc | 0 .../dbc/honda_crv_touring_2016_can_generated.dbc | 0 .../dbc/honda_fit_ex_2018_can_generated.dbc | 0 .../dbc/honda_fit_hybrid_2018_can_generated.dbc | 0 .../dbc/honda_insight_ex_2019_can_generated.dbc | 0 .../dbc/honda_odyssey_exl_2018_generated.dbc | 0 ..._extreme_edition_2018_china_can_generated.dbc | 0 .../dbc/honda_pilot_2023_can_generated.dbc | 0 .../dbc/hyundai_2015_ccan.dbc | 0 .../dbc/hyundai_2015_mcan.dbc | 0 .../dbc/hyundai_canfd.dbc | 0 .../dbc/hyundai_i30_2014.dbc | 0 .../dbc/hyundai_kia_generic.dbc | 0 .../hyundai_kia_mando_corner_radar_generated.dbc | 0 .../hyundai_kia_mando_front_radar_generated.dbc | 0 .../dbc/hyundai_santafe_2007.dbc | 0 .../dbc/luxgen_s5_2015.dbc | 0 mazda_2017.dbc => opendbc/dbc/mazda_2017.dbc | 0 mazda_3_2019.dbc => opendbc/dbc/mazda_3_2019.dbc | 0 mazda_radar.dbc => opendbc/dbc/mazda_radar.dbc | 0 mazda_rx8.dbc => opendbc/dbc/mazda_rx8.dbc | 0 .../dbc/mercedes_benz_e350_2010.dbc | 0 .../dbc/nissan_leaf_2018_generated.dbc | 0 .../dbc/nissan_x_trail_2017_generated.dbc | 0 .../dbc/nissan_xterra_2011.dbc | 0 .../dbc/opel_omega_2001.dbc | 0 .../dbc/subaru_forester_2017_generated.dbc | 0 .../dbc/subaru_global_2017_generated.dbc | 0 .../dbc/subaru_global_2020_hybrid_generated.dbc | 0 .../dbc/subaru_outback_2015_generated.dbc | 0 .../dbc/subaru_outback_2019_generated.dbc | 0 tesla_can.dbc => opendbc/dbc/tesla_can.dbc | 0 .../dbc/tesla_model3_party.dbc | 0 .../dbc/tesla_model3_vehicle.dbc | 0 .../dbc/tesla_powertrain.dbc | 0 .../dbc/tesla_radar_bosch_generated.dbc | 0 .../dbc/tesla_radar_continental_generated.dbc | 0 .../dbc/toyota_2017_ref_pt.dbc | 0 toyota_adas.dbc => opendbc/dbc/toyota_adas.dbc | 0 .../dbc/toyota_iQ_2009_can.dbc | 0 .../dbc/toyota_new_mc_pt_generated.dbc | 0 .../dbc/toyota_nodsu_pt_generated.dbc | 0 .../dbc/toyota_prius_2010_pt.dbc | 0 .../dbc/toyota_radar_dsu_tssp.dbc | 0 .../dbc/toyota_tnga_k_pt_generated.dbc | 0 .../dbc/toyota_tss2_adas.dbc | 0 .../dbc/volvo_v40_2017_pt.dbc | 0 .../dbc/volvo_v60_2015_pt.dbc | 0 vw_golf_mk4.dbc => opendbc/dbc/vw_golf_mk4.dbc | 0 vw_mqb_2010.dbc => opendbc/dbc/vw_mqb_2010.dbc | 0 pyproject.toml | 3 +++ 173 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 __init__.py create mode 100644 opendbc/__init__.py rename {can => opendbc/can}/SConscript (91%) rename {can => opendbc/can}/__init__.py (100%) rename {can => opendbc/can}/can_define.py (100%) rename {can => opendbc/can}/common.cc (100%) rename {can => opendbc/can}/common.h (100%) rename {can => opendbc/can}/common.pxd (100%) rename {can => opendbc/can}/common_dbc.h (100%) rename {can => opendbc/can}/dbc.cc (99%) rename {can => opendbc/can}/logger.h (100%) rename {can => opendbc/can}/packer.cc (100%) rename {can => opendbc/can}/packer.py (100%) rename {can => opendbc/can}/packer_pyx.pyx (100%) rename {can => opendbc/can}/parser.cc (100%) rename {can => opendbc/can}/parser.py (100%) rename {can => opendbc/can}/parser_pyx.pyx (100%) rename {can => opendbc/can}/tests/.gitignore (100%) rename {can => opendbc/can}/tests/__init__.py (100%) rename {can => opendbc/can}/tests/test.dbc (100%) rename {can => opendbc/can}/tests/test_checksums.py (100%) rename {can => opendbc/can}/tests/test_dbc_exceptions.py (100%) rename {can => opendbc/can}/tests/test_dbc_parser.py (100%) rename {can => opendbc/can}/tests/test_define.py (100%) rename {can => opendbc/can}/tests/test_packer_parser.py (100%) rename {can => opendbc/can}/tests/test_parser_performance.py (100%) rename ESR.dbc => opendbc/dbc/ESR.dbc (100%) rename FORD_CADS.dbc => opendbc/dbc/FORD_CADS.dbc (100%) create mode 100644 opendbc/dbc/__init__.py rename acura_ilx_2016_can_generated.dbc => opendbc/dbc/acura_ilx_2016_can_generated.dbc (100%) rename acura_ilx_2016_nidec.dbc => opendbc/dbc/acura_ilx_2016_nidec.dbc (100%) rename acura_rdx_2018_can_generated.dbc => opendbc/dbc/acura_rdx_2018_can_generated.dbc (100%) rename acura_rdx_2020_can_generated.dbc => opendbc/dbc/acura_rdx_2020_can_generated.dbc (100%) rename bmw_e9x_e8x.dbc => opendbc/dbc/bmw_e9x_e8x.dbc (100%) rename cadillac_ct6_chassis.dbc => opendbc/dbc/cadillac_ct6_chassis.dbc (100%) rename cadillac_ct6_object.dbc => opendbc/dbc/cadillac_ct6_object.dbc (100%) rename cadillac_ct6_powertrain.dbc => opendbc/dbc/cadillac_ct6_powertrain.dbc (100%) rename chrysler_cusw.dbc => opendbc/dbc/chrysler_cusw.dbc (100%) rename chrysler_pacifica_2017_hybrid_generated.dbc => opendbc/dbc/chrysler_pacifica_2017_hybrid_generated.dbc (100%) rename chrysler_pacifica_2017_hybrid_private_fusion.dbc => opendbc/dbc/chrysler_pacifica_2017_hybrid_private_fusion.dbc (100%) rename chrysler_ram_dt_generated.dbc => opendbc/dbc/chrysler_ram_dt_generated.dbc (100%) rename chrysler_ram_hd_generated.dbc => opendbc/dbc/chrysler_ram_hd_generated.dbc (100%) rename comma_body.dbc => opendbc/dbc/comma_body.dbc (100%) rename ford_cgea1_2_bodycan_2011.dbc => opendbc/dbc/ford_cgea1_2_bodycan_2011.dbc (100%) rename ford_cgea1_2_ptcan_2011.dbc => opendbc/dbc/ford_cgea1_2_ptcan_2011.dbc (100%) rename ford_fusion_2018_adas.dbc => opendbc/dbc/ford_fusion_2018_adas.dbc (100%) rename ford_fusion_2018_pt.dbc => opendbc/dbc/ford_fusion_2018_pt.dbc (100%) rename ford_lincoln_base_pt.dbc => opendbc/dbc/ford_lincoln_base_pt.dbc (100%) rename {generator => opendbc/dbc/generator}/chrysler/.gitignore (100%) rename {generator => opendbc/dbc/generator}/chrysler/_stellantis_common.dbc (100%) rename {generator => opendbc/dbc/generator}/chrysler/_stellantis_common_ram.py (100%) rename {generator => opendbc/dbc/generator}/chrysler/chrysler_pacifica_2017_hybrid.dbc (100%) rename {generator => opendbc/dbc/generator}/chrysler/chrysler_ram_dt.dbc (100%) rename {generator => opendbc/dbc/generator}/chrysler/chrysler_ram_hd.dbc (100%) rename {generator => opendbc/dbc/generator}/generator.py (100%) rename {generator => opendbc/dbc/generator}/gm/_community.dbc (100%) rename {generator => opendbc/dbc/generator}/gm/gm_global_a_powertrain.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/_bosch_2018.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/_bosch_adas_2018.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/_community.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/_honda_common.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/_nidec_common.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/_steering_sensors_a.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/_steering_sensors_b.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/acura_ilx_2016_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/acura_rdx_2018_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/acura_rdx_2020_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_accord_2018_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_civic_ex_2022_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_civic_hatchback_ex_2017_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_civic_touring_2016_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_clarity_hybrid_2018_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_crv_ex_2017_body.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_crv_ex_2017_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_crv_executive_2016_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_crv_touring_2016_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_fit_ex_2018_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_fit_hybrid_2018_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_insight_ex_2019_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_odyssey_exl_2018.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_odyssey_extreme_edition_2018_china_can.dbc (100%) rename {generator => opendbc/dbc/generator}/honda/honda_pilot_2023_can.dbc (100%) rename {generator => opendbc/dbc/generator}/hyundai/.gitignore (100%) rename {generator => opendbc/dbc/generator}/hyundai/hyundai_kia_mando_corner_radar.py (100%) rename {generator => opendbc/dbc/generator}/hyundai/hyundai_kia_mando_front_radar.py (100%) rename {generator => opendbc/dbc/generator}/nissan/_nissan_common.dbc (100%) rename {generator => opendbc/dbc/generator}/nissan/nissan_leaf_2018.dbc (100%) rename {generator => opendbc/dbc/generator}/nissan/nissan_x_trail_2017.dbc (100%) rename {generator => opendbc/dbc/generator}/subaru/_subaru_global.dbc (100%) rename {generator => opendbc/dbc/generator}/subaru/_subaru_preglobal_2015.dbc (100%) rename {generator => opendbc/dbc/generator}/subaru/subaru_forester_2017.dbc (100%) rename {generator => opendbc/dbc/generator}/subaru/subaru_global_2017.dbc (100%) rename {generator => opendbc/dbc/generator}/subaru/subaru_global_2020_hybrid.dbc (100%) rename {generator => opendbc/dbc/generator}/subaru/subaru_outback_2015.dbc (100%) rename {generator => opendbc/dbc/generator}/subaru/subaru_outback_2019.dbc (100%) rename {generator => opendbc/dbc/generator}/tesla/.gitignore (100%) rename {generator => opendbc/dbc/generator}/tesla/radar_common.py (100%) rename {generator => opendbc/dbc/generator}/tesla/tesla_radar_bosch.py (99%) rename {generator => opendbc/dbc/generator}/tesla/tesla_radar_continental.py (95%) rename {generator => opendbc/dbc/generator}/test_generator.py (76%) rename {generator => opendbc/dbc/generator}/toyota/_community.dbc (100%) rename {generator => opendbc/dbc/generator}/toyota/_toyota_2017.dbc (100%) rename {generator => opendbc/dbc/generator}/toyota/toyota_new_mc_pt.dbc (100%) rename {generator => opendbc/dbc/generator}/toyota/toyota_nodsu_pt.dbc (100%) rename {generator => opendbc/dbc/generator}/toyota/toyota_tnga_k_pt.dbc (100%) rename gm_global_a_chassis.dbc => opendbc/dbc/gm_global_a_chassis.dbc (100%) rename gm_global_a_high_voltage_management.dbc => opendbc/dbc/gm_global_a_high_voltage_management.dbc (100%) rename gm_global_a_lowspeed.dbc => opendbc/dbc/gm_global_a_lowspeed.dbc (100%) rename gm_global_a_lowspeed_1818125.dbc => opendbc/dbc/gm_global_a_lowspeed_1818125.dbc (100%) rename gm_global_a_object.dbc => opendbc/dbc/gm_global_a_object.dbc (100%) rename gm_global_a_powertrain_expansion.dbc => opendbc/dbc/gm_global_a_powertrain_expansion.dbc (100%) rename gm_global_a_powertrain_generated.dbc => opendbc/dbc/gm_global_a_powertrain_generated.dbc (100%) rename honda_accord_2018_can_generated.dbc => opendbc/dbc/honda_accord_2018_can_generated.dbc (100%) rename honda_civic_ex_2022_can_generated.dbc => opendbc/dbc/honda_civic_ex_2022_can_generated.dbc (100%) rename honda_civic_hatchback_ex_2017_can_generated.dbc => opendbc/dbc/honda_civic_hatchback_ex_2017_can_generated.dbc (100%) rename honda_civic_touring_2016_can_generated.dbc => opendbc/dbc/honda_civic_touring_2016_can_generated.dbc (100%) rename honda_clarity_hybrid_2018_can_generated.dbc => opendbc/dbc/honda_clarity_hybrid_2018_can_generated.dbc (100%) rename honda_crv_ex_2017_body_generated.dbc => opendbc/dbc/honda_crv_ex_2017_body_generated.dbc (100%) rename honda_crv_ex_2017_can_generated.dbc => opendbc/dbc/honda_crv_ex_2017_can_generated.dbc (100%) rename honda_crv_executive_2016_can_generated.dbc => opendbc/dbc/honda_crv_executive_2016_can_generated.dbc (100%) rename honda_crv_touring_2016_can_generated.dbc => opendbc/dbc/honda_crv_touring_2016_can_generated.dbc (100%) rename honda_fit_ex_2018_can_generated.dbc => opendbc/dbc/honda_fit_ex_2018_can_generated.dbc (100%) rename honda_fit_hybrid_2018_can_generated.dbc => opendbc/dbc/honda_fit_hybrid_2018_can_generated.dbc (100%) rename honda_insight_ex_2019_can_generated.dbc => opendbc/dbc/honda_insight_ex_2019_can_generated.dbc (100%) rename honda_odyssey_exl_2018_generated.dbc => opendbc/dbc/honda_odyssey_exl_2018_generated.dbc (100%) rename honda_odyssey_extreme_edition_2018_china_can_generated.dbc => opendbc/dbc/honda_odyssey_extreme_edition_2018_china_can_generated.dbc (100%) rename honda_pilot_2023_can_generated.dbc => opendbc/dbc/honda_pilot_2023_can_generated.dbc (100%) rename hyundai_2015_ccan.dbc => opendbc/dbc/hyundai_2015_ccan.dbc (100%) rename hyundai_2015_mcan.dbc => opendbc/dbc/hyundai_2015_mcan.dbc (100%) rename hyundai_canfd.dbc => opendbc/dbc/hyundai_canfd.dbc (100%) rename hyundai_i30_2014.dbc => opendbc/dbc/hyundai_i30_2014.dbc (100%) rename hyundai_kia_generic.dbc => opendbc/dbc/hyundai_kia_generic.dbc (100%) rename hyundai_kia_mando_corner_radar_generated.dbc => opendbc/dbc/hyundai_kia_mando_corner_radar_generated.dbc (100%) rename hyundai_kia_mando_front_radar_generated.dbc => opendbc/dbc/hyundai_kia_mando_front_radar_generated.dbc (100%) rename hyundai_santafe_2007.dbc => opendbc/dbc/hyundai_santafe_2007.dbc (100%) rename luxgen_s5_2015.dbc => opendbc/dbc/luxgen_s5_2015.dbc (100%) rename mazda_2017.dbc => opendbc/dbc/mazda_2017.dbc (100%) rename mazda_3_2019.dbc => opendbc/dbc/mazda_3_2019.dbc (100%) rename mazda_radar.dbc => opendbc/dbc/mazda_radar.dbc (100%) rename mazda_rx8.dbc => opendbc/dbc/mazda_rx8.dbc (100%) rename mercedes_benz_e350_2010.dbc => opendbc/dbc/mercedes_benz_e350_2010.dbc (100%) rename nissan_leaf_2018_generated.dbc => opendbc/dbc/nissan_leaf_2018_generated.dbc (100%) rename nissan_x_trail_2017_generated.dbc => opendbc/dbc/nissan_x_trail_2017_generated.dbc (100%) rename nissan_xterra_2011.dbc => opendbc/dbc/nissan_xterra_2011.dbc (100%) rename opel_omega_2001.dbc => opendbc/dbc/opel_omega_2001.dbc (100%) rename subaru_forester_2017_generated.dbc => opendbc/dbc/subaru_forester_2017_generated.dbc (100%) rename subaru_global_2017_generated.dbc => opendbc/dbc/subaru_global_2017_generated.dbc (100%) rename subaru_global_2020_hybrid_generated.dbc => opendbc/dbc/subaru_global_2020_hybrid_generated.dbc (100%) rename subaru_outback_2015_generated.dbc => opendbc/dbc/subaru_outback_2015_generated.dbc (100%) rename subaru_outback_2019_generated.dbc => opendbc/dbc/subaru_outback_2019_generated.dbc (100%) rename tesla_can.dbc => opendbc/dbc/tesla_can.dbc (100%) rename tesla_model3_party.dbc => opendbc/dbc/tesla_model3_party.dbc (100%) rename tesla_model3_vehicle.dbc => opendbc/dbc/tesla_model3_vehicle.dbc (100%) rename tesla_powertrain.dbc => opendbc/dbc/tesla_powertrain.dbc (100%) rename tesla_radar_bosch_generated.dbc => opendbc/dbc/tesla_radar_bosch_generated.dbc (100%) rename tesla_radar_continental_generated.dbc => opendbc/dbc/tesla_radar_continental_generated.dbc (100%) rename toyota_2017_ref_pt.dbc => opendbc/dbc/toyota_2017_ref_pt.dbc (100%) rename toyota_adas.dbc => opendbc/dbc/toyota_adas.dbc (100%) rename toyota_iQ_2009_can.dbc => opendbc/dbc/toyota_iQ_2009_can.dbc (100%) rename toyota_new_mc_pt_generated.dbc => opendbc/dbc/toyota_new_mc_pt_generated.dbc (100%) rename toyota_nodsu_pt_generated.dbc => opendbc/dbc/toyota_nodsu_pt_generated.dbc (100%) rename toyota_prius_2010_pt.dbc => opendbc/dbc/toyota_prius_2010_pt.dbc (100%) rename toyota_radar_dsu_tssp.dbc => opendbc/dbc/toyota_radar_dsu_tssp.dbc (100%) rename toyota_tnga_k_pt_generated.dbc => opendbc/dbc/toyota_tnga_k_pt_generated.dbc (100%) rename toyota_tss2_adas.dbc => opendbc/dbc/toyota_tss2_adas.dbc (100%) rename volvo_v40_2017_pt.dbc => opendbc/dbc/volvo_v40_2017_pt.dbc (100%) rename volvo_v60_2015_pt.dbc => opendbc/dbc/volvo_v60_2015_pt.dbc (100%) rename vw_golf_mk4.dbc => opendbc/dbc/vw_golf_mk4.dbc (100%) rename vw_mqb_2010.dbc => opendbc/dbc/vw_mqb_2010.dbc (100%) diff --git a/.gitignore b/.gitignore index d5c2eb4a3b..3b68262069 100644 --- 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 index 8b541af667..4d0e67ec84 100644 --- 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 index 1bc9a74207..7cbf7c522d 100644 --- 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 deleted file mode 100644 index a74a06029f..0000000000 --- a/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -import os -DBC_PATH = os.path.dirname(os.path.abspath(__file__)) diff --git a/opendbc/__init__.py b/opendbc/__init__.py new file mode 100644 index 0000000000..a40e5dbfa8 --- /dev/null +++ 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 b/opendbc/can/SConscript similarity index 91% rename from can/SConscript rename to opendbc/can/SConscript index baa9537632..1c1629d584 100644 --- a/can/SConscript +++ b/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 b/opendbc/can/__init__.py similarity index 100% rename from can/__init__.py rename to opendbc/can/__init__.py diff --git a/can/can_define.py b/opendbc/can/can_define.py similarity index 100% rename from can/can_define.py rename to opendbc/can/can_define.py diff --git a/can/common.cc b/opendbc/can/common.cc similarity index 100% rename from can/common.cc rename to opendbc/can/common.cc diff --git a/can/common.h b/opendbc/can/common.h similarity index 100% rename from can/common.h rename to opendbc/can/common.h diff --git a/can/common.pxd b/opendbc/can/common.pxd similarity index 100% rename from can/common.pxd rename to opendbc/can/common.pxd diff --git a/can/common_dbc.h b/opendbc/can/common_dbc.h similarity index 100% rename from can/common_dbc.h rename to opendbc/can/common_dbc.h diff --git a/can/dbc.cc b/opendbc/can/dbc.cc similarity index 99% rename from can/dbc.cc rename to opendbc/can/dbc.cc index 44454b15f8..8e5d65277f 100644 --- a/can/dbc.cc +++ b/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 b/opendbc/can/logger.h similarity index 100% rename from can/logger.h rename to opendbc/can/logger.h diff --git a/can/packer.cc b/opendbc/can/packer.cc similarity index 100% rename from can/packer.cc rename to opendbc/can/packer.cc diff --git a/can/packer.py b/opendbc/can/packer.py similarity index 100% rename from can/packer.py rename to opendbc/can/packer.py diff --git a/can/packer_pyx.pyx b/opendbc/can/packer_pyx.pyx similarity index 100% rename from can/packer_pyx.pyx rename to opendbc/can/packer_pyx.pyx diff --git a/can/parser.cc b/opendbc/can/parser.cc similarity index 100% rename from can/parser.cc rename to opendbc/can/parser.cc diff --git a/can/parser.py b/opendbc/can/parser.py similarity index 100% rename from can/parser.py rename to opendbc/can/parser.py diff --git a/can/parser_pyx.pyx b/opendbc/can/parser_pyx.pyx similarity index 100% rename from can/parser_pyx.pyx rename to opendbc/can/parser_pyx.pyx diff --git a/can/tests/.gitignore b/opendbc/can/tests/.gitignore similarity index 100% rename from can/tests/.gitignore rename to opendbc/can/tests/.gitignore diff --git a/can/tests/__init__.py b/opendbc/can/tests/__init__.py similarity index 100% rename from can/tests/__init__.py rename to opendbc/can/tests/__init__.py diff --git a/can/tests/test.dbc b/opendbc/can/tests/test.dbc similarity index 100% rename from can/tests/test.dbc rename to opendbc/can/tests/test.dbc diff --git a/can/tests/test_checksums.py b/opendbc/can/tests/test_checksums.py similarity index 100% rename from can/tests/test_checksums.py rename to opendbc/can/tests/test_checksums.py diff --git a/can/tests/test_dbc_exceptions.py b/opendbc/can/tests/test_dbc_exceptions.py similarity index 100% rename from can/tests/test_dbc_exceptions.py rename to opendbc/can/tests/test_dbc_exceptions.py diff --git a/can/tests/test_dbc_parser.py b/opendbc/can/tests/test_dbc_parser.py similarity index 100% rename from can/tests/test_dbc_parser.py rename to opendbc/can/tests/test_dbc_parser.py diff --git a/can/tests/test_define.py b/opendbc/can/tests/test_define.py similarity index 100% rename from can/tests/test_define.py rename to opendbc/can/tests/test_define.py diff --git a/can/tests/test_packer_parser.py b/opendbc/can/tests/test_packer_parser.py similarity index 100% rename from can/tests/test_packer_parser.py rename to opendbc/can/tests/test_packer_parser.py diff --git a/can/tests/test_parser_performance.py b/opendbc/can/tests/test_parser_performance.py similarity index 100% rename from can/tests/test_parser_performance.py rename to opendbc/can/tests/test_parser_performance.py diff --git a/ESR.dbc b/opendbc/dbc/ESR.dbc similarity index 100% rename from ESR.dbc rename to opendbc/dbc/ESR.dbc diff --git a/FORD_CADS.dbc b/opendbc/dbc/FORD_CADS.dbc similarity index 100% rename from FORD_CADS.dbc rename to opendbc/dbc/FORD_CADS.dbc diff --git a/opendbc/dbc/__init__.py b/opendbc/dbc/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/acura_ilx_2016_can_generated.dbc b/opendbc/dbc/acura_ilx_2016_can_generated.dbc similarity index 100% rename from acura_ilx_2016_can_generated.dbc rename to opendbc/dbc/acura_ilx_2016_can_generated.dbc diff --git a/acura_ilx_2016_nidec.dbc b/opendbc/dbc/acura_ilx_2016_nidec.dbc similarity index 100% rename from acura_ilx_2016_nidec.dbc rename to opendbc/dbc/acura_ilx_2016_nidec.dbc diff --git a/acura_rdx_2018_can_generated.dbc b/opendbc/dbc/acura_rdx_2018_can_generated.dbc similarity index 100% rename from acura_rdx_2018_can_generated.dbc rename to opendbc/dbc/acura_rdx_2018_can_generated.dbc diff --git a/acura_rdx_2020_can_generated.dbc b/opendbc/dbc/acura_rdx_2020_can_generated.dbc similarity index 100% rename from acura_rdx_2020_can_generated.dbc rename to opendbc/dbc/acura_rdx_2020_can_generated.dbc diff --git a/bmw_e9x_e8x.dbc b/opendbc/dbc/bmw_e9x_e8x.dbc similarity index 100% rename from bmw_e9x_e8x.dbc rename to opendbc/dbc/bmw_e9x_e8x.dbc diff --git a/cadillac_ct6_chassis.dbc b/opendbc/dbc/cadillac_ct6_chassis.dbc similarity index 100% rename from cadillac_ct6_chassis.dbc rename to opendbc/dbc/cadillac_ct6_chassis.dbc diff --git a/cadillac_ct6_object.dbc b/opendbc/dbc/cadillac_ct6_object.dbc similarity index 100% rename from cadillac_ct6_object.dbc rename to opendbc/dbc/cadillac_ct6_object.dbc diff --git a/cadillac_ct6_powertrain.dbc b/opendbc/dbc/cadillac_ct6_powertrain.dbc similarity index 100% rename from cadillac_ct6_powertrain.dbc rename to opendbc/dbc/cadillac_ct6_powertrain.dbc diff --git a/chrysler_cusw.dbc b/opendbc/dbc/chrysler_cusw.dbc similarity index 100% rename from chrysler_cusw.dbc rename to opendbc/dbc/chrysler_cusw.dbc diff --git a/chrysler_pacifica_2017_hybrid_generated.dbc b/opendbc/dbc/chrysler_pacifica_2017_hybrid_generated.dbc similarity index 100% rename from chrysler_pacifica_2017_hybrid_generated.dbc rename to opendbc/dbc/chrysler_pacifica_2017_hybrid_generated.dbc diff --git a/chrysler_pacifica_2017_hybrid_private_fusion.dbc b/opendbc/dbc/chrysler_pacifica_2017_hybrid_private_fusion.dbc similarity index 100% rename from chrysler_pacifica_2017_hybrid_private_fusion.dbc rename to opendbc/dbc/chrysler_pacifica_2017_hybrid_private_fusion.dbc diff --git a/chrysler_ram_dt_generated.dbc b/opendbc/dbc/chrysler_ram_dt_generated.dbc similarity index 100% rename from chrysler_ram_dt_generated.dbc rename to opendbc/dbc/chrysler_ram_dt_generated.dbc diff --git a/chrysler_ram_hd_generated.dbc b/opendbc/dbc/chrysler_ram_hd_generated.dbc similarity index 100% rename from chrysler_ram_hd_generated.dbc rename to opendbc/dbc/chrysler_ram_hd_generated.dbc diff --git a/comma_body.dbc b/opendbc/dbc/comma_body.dbc similarity index 100% rename from comma_body.dbc rename to opendbc/dbc/comma_body.dbc diff --git a/ford_cgea1_2_bodycan_2011.dbc b/opendbc/dbc/ford_cgea1_2_bodycan_2011.dbc similarity index 100% rename from ford_cgea1_2_bodycan_2011.dbc rename to opendbc/dbc/ford_cgea1_2_bodycan_2011.dbc diff --git a/ford_cgea1_2_ptcan_2011.dbc b/opendbc/dbc/ford_cgea1_2_ptcan_2011.dbc similarity index 100% rename from ford_cgea1_2_ptcan_2011.dbc rename to opendbc/dbc/ford_cgea1_2_ptcan_2011.dbc diff --git a/ford_fusion_2018_adas.dbc b/opendbc/dbc/ford_fusion_2018_adas.dbc similarity index 100% rename from ford_fusion_2018_adas.dbc rename to opendbc/dbc/ford_fusion_2018_adas.dbc diff --git a/ford_fusion_2018_pt.dbc b/opendbc/dbc/ford_fusion_2018_pt.dbc similarity index 100% rename from ford_fusion_2018_pt.dbc rename to opendbc/dbc/ford_fusion_2018_pt.dbc diff --git a/ford_lincoln_base_pt.dbc b/opendbc/dbc/ford_lincoln_base_pt.dbc similarity index 100% rename from ford_lincoln_base_pt.dbc rename to opendbc/dbc/ford_lincoln_base_pt.dbc diff --git a/generator/chrysler/.gitignore b/opendbc/dbc/generator/chrysler/.gitignore similarity index 100% rename from generator/chrysler/.gitignore rename to opendbc/dbc/generator/chrysler/.gitignore diff --git a/generator/chrysler/_stellantis_common.dbc b/opendbc/dbc/generator/chrysler/_stellantis_common.dbc similarity index 100% rename from generator/chrysler/_stellantis_common.dbc rename to opendbc/dbc/generator/chrysler/_stellantis_common.dbc diff --git a/generator/chrysler/_stellantis_common_ram.py b/opendbc/dbc/generator/chrysler/_stellantis_common_ram.py similarity index 100% rename from generator/chrysler/_stellantis_common_ram.py rename to opendbc/dbc/generator/chrysler/_stellantis_common_ram.py diff --git a/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc b/opendbc/dbc/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc similarity index 100% rename from generator/chrysler/chrysler_pacifica_2017_hybrid.dbc rename to opendbc/dbc/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc diff --git a/generator/chrysler/chrysler_ram_dt.dbc b/opendbc/dbc/generator/chrysler/chrysler_ram_dt.dbc similarity index 100% rename from generator/chrysler/chrysler_ram_dt.dbc rename to opendbc/dbc/generator/chrysler/chrysler_ram_dt.dbc diff --git a/generator/chrysler/chrysler_ram_hd.dbc b/opendbc/dbc/generator/chrysler/chrysler_ram_hd.dbc similarity index 100% rename from generator/chrysler/chrysler_ram_hd.dbc rename to opendbc/dbc/generator/chrysler/chrysler_ram_hd.dbc diff --git a/generator/generator.py b/opendbc/dbc/generator/generator.py similarity index 100% rename from generator/generator.py rename to opendbc/dbc/generator/generator.py diff --git a/generator/gm/_community.dbc b/opendbc/dbc/generator/gm/_community.dbc similarity index 100% rename from generator/gm/_community.dbc rename to opendbc/dbc/generator/gm/_community.dbc diff --git a/generator/gm/gm_global_a_powertrain.dbc b/opendbc/dbc/generator/gm/gm_global_a_powertrain.dbc similarity index 100% rename from generator/gm/gm_global_a_powertrain.dbc rename to opendbc/dbc/generator/gm/gm_global_a_powertrain.dbc diff --git a/generator/honda/_bosch_2018.dbc b/opendbc/dbc/generator/honda/_bosch_2018.dbc similarity index 100% rename from generator/honda/_bosch_2018.dbc rename to opendbc/dbc/generator/honda/_bosch_2018.dbc diff --git a/generator/honda/_bosch_adas_2018.dbc b/opendbc/dbc/generator/honda/_bosch_adas_2018.dbc similarity index 100% rename from generator/honda/_bosch_adas_2018.dbc rename to opendbc/dbc/generator/honda/_bosch_adas_2018.dbc diff --git a/generator/honda/_community.dbc b/opendbc/dbc/generator/honda/_community.dbc similarity index 100% rename from generator/honda/_community.dbc rename to opendbc/dbc/generator/honda/_community.dbc diff --git a/generator/honda/_honda_common.dbc b/opendbc/dbc/generator/honda/_honda_common.dbc similarity index 100% rename from generator/honda/_honda_common.dbc rename to opendbc/dbc/generator/honda/_honda_common.dbc diff --git a/generator/honda/_nidec_common.dbc b/opendbc/dbc/generator/honda/_nidec_common.dbc similarity index 100% rename from generator/honda/_nidec_common.dbc rename to opendbc/dbc/generator/honda/_nidec_common.dbc diff --git a/generator/honda/_steering_sensors_a.dbc b/opendbc/dbc/generator/honda/_steering_sensors_a.dbc similarity index 100% rename from generator/honda/_steering_sensors_a.dbc rename to opendbc/dbc/generator/honda/_steering_sensors_a.dbc diff --git a/generator/honda/_steering_sensors_b.dbc b/opendbc/dbc/generator/honda/_steering_sensors_b.dbc similarity index 100% rename from generator/honda/_steering_sensors_b.dbc rename to opendbc/dbc/generator/honda/_steering_sensors_b.dbc diff --git a/generator/honda/acura_ilx_2016_can.dbc b/opendbc/dbc/generator/honda/acura_ilx_2016_can.dbc similarity index 100% rename from generator/honda/acura_ilx_2016_can.dbc rename to opendbc/dbc/generator/honda/acura_ilx_2016_can.dbc diff --git a/generator/honda/acura_rdx_2018_can.dbc b/opendbc/dbc/generator/honda/acura_rdx_2018_can.dbc similarity index 100% rename from generator/honda/acura_rdx_2018_can.dbc rename to opendbc/dbc/generator/honda/acura_rdx_2018_can.dbc diff --git a/generator/honda/acura_rdx_2020_can.dbc b/opendbc/dbc/generator/honda/acura_rdx_2020_can.dbc similarity index 100% rename from generator/honda/acura_rdx_2020_can.dbc rename to opendbc/dbc/generator/honda/acura_rdx_2020_can.dbc diff --git a/generator/honda/honda_accord_2018_can.dbc b/opendbc/dbc/generator/honda/honda_accord_2018_can.dbc similarity index 100% rename from generator/honda/honda_accord_2018_can.dbc rename to opendbc/dbc/generator/honda/honda_accord_2018_can.dbc diff --git a/generator/honda/honda_civic_ex_2022_can.dbc b/opendbc/dbc/generator/honda/honda_civic_ex_2022_can.dbc similarity index 100% rename from generator/honda/honda_civic_ex_2022_can.dbc rename to opendbc/dbc/generator/honda/honda_civic_ex_2022_can.dbc diff --git a/generator/honda/honda_civic_hatchback_ex_2017_can.dbc b/opendbc/dbc/generator/honda/honda_civic_hatchback_ex_2017_can.dbc similarity index 100% rename from generator/honda/honda_civic_hatchback_ex_2017_can.dbc rename to opendbc/dbc/generator/honda/honda_civic_hatchback_ex_2017_can.dbc diff --git a/generator/honda/honda_civic_touring_2016_can.dbc b/opendbc/dbc/generator/honda/honda_civic_touring_2016_can.dbc similarity index 100% rename from generator/honda/honda_civic_touring_2016_can.dbc rename to opendbc/dbc/generator/honda/honda_civic_touring_2016_can.dbc diff --git a/generator/honda/honda_clarity_hybrid_2018_can.dbc b/opendbc/dbc/generator/honda/honda_clarity_hybrid_2018_can.dbc similarity index 100% rename from generator/honda/honda_clarity_hybrid_2018_can.dbc rename to opendbc/dbc/generator/honda/honda_clarity_hybrid_2018_can.dbc diff --git a/generator/honda/honda_crv_ex_2017_body.dbc b/opendbc/dbc/generator/honda/honda_crv_ex_2017_body.dbc similarity index 100% rename from generator/honda/honda_crv_ex_2017_body.dbc rename to opendbc/dbc/generator/honda/honda_crv_ex_2017_body.dbc diff --git a/generator/honda/honda_crv_ex_2017_can.dbc b/opendbc/dbc/generator/honda/honda_crv_ex_2017_can.dbc similarity index 100% rename from generator/honda/honda_crv_ex_2017_can.dbc rename to opendbc/dbc/generator/honda/honda_crv_ex_2017_can.dbc diff --git a/generator/honda/honda_crv_executive_2016_can.dbc b/opendbc/dbc/generator/honda/honda_crv_executive_2016_can.dbc similarity index 100% rename from generator/honda/honda_crv_executive_2016_can.dbc rename to opendbc/dbc/generator/honda/honda_crv_executive_2016_can.dbc diff --git a/generator/honda/honda_crv_touring_2016_can.dbc b/opendbc/dbc/generator/honda/honda_crv_touring_2016_can.dbc similarity index 100% rename from generator/honda/honda_crv_touring_2016_can.dbc rename to opendbc/dbc/generator/honda/honda_crv_touring_2016_can.dbc diff --git a/generator/honda/honda_fit_ex_2018_can.dbc b/opendbc/dbc/generator/honda/honda_fit_ex_2018_can.dbc similarity index 100% rename from generator/honda/honda_fit_ex_2018_can.dbc rename to opendbc/dbc/generator/honda/honda_fit_ex_2018_can.dbc diff --git a/generator/honda/honda_fit_hybrid_2018_can.dbc b/opendbc/dbc/generator/honda/honda_fit_hybrid_2018_can.dbc similarity index 100% rename from generator/honda/honda_fit_hybrid_2018_can.dbc rename to opendbc/dbc/generator/honda/honda_fit_hybrid_2018_can.dbc diff --git a/generator/honda/honda_insight_ex_2019_can.dbc b/opendbc/dbc/generator/honda/honda_insight_ex_2019_can.dbc similarity index 100% rename from generator/honda/honda_insight_ex_2019_can.dbc rename to opendbc/dbc/generator/honda/honda_insight_ex_2019_can.dbc diff --git a/generator/honda/honda_odyssey_exl_2018.dbc b/opendbc/dbc/generator/honda/honda_odyssey_exl_2018.dbc similarity index 100% rename from generator/honda/honda_odyssey_exl_2018.dbc rename to opendbc/dbc/generator/honda/honda_odyssey_exl_2018.dbc diff --git a/generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc b/opendbc/dbc/generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc similarity index 100% rename from generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc rename to opendbc/dbc/generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc diff --git a/generator/honda/honda_pilot_2023_can.dbc b/opendbc/dbc/generator/honda/honda_pilot_2023_can.dbc similarity index 100% rename from generator/honda/honda_pilot_2023_can.dbc rename to opendbc/dbc/generator/honda/honda_pilot_2023_can.dbc diff --git a/generator/hyundai/.gitignore b/opendbc/dbc/generator/hyundai/.gitignore similarity index 100% rename from generator/hyundai/.gitignore rename to opendbc/dbc/generator/hyundai/.gitignore diff --git a/generator/hyundai/hyundai_kia_mando_corner_radar.py b/opendbc/dbc/generator/hyundai/hyundai_kia_mando_corner_radar.py similarity index 100% rename from generator/hyundai/hyundai_kia_mando_corner_radar.py rename to opendbc/dbc/generator/hyundai/hyundai_kia_mando_corner_radar.py diff --git a/generator/hyundai/hyundai_kia_mando_front_radar.py b/opendbc/dbc/generator/hyundai/hyundai_kia_mando_front_radar.py similarity index 100% rename from generator/hyundai/hyundai_kia_mando_front_radar.py rename to opendbc/dbc/generator/hyundai/hyundai_kia_mando_front_radar.py diff --git a/generator/nissan/_nissan_common.dbc b/opendbc/dbc/generator/nissan/_nissan_common.dbc similarity index 100% rename from generator/nissan/_nissan_common.dbc rename to opendbc/dbc/generator/nissan/_nissan_common.dbc diff --git a/generator/nissan/nissan_leaf_2018.dbc b/opendbc/dbc/generator/nissan/nissan_leaf_2018.dbc similarity index 100% rename from generator/nissan/nissan_leaf_2018.dbc rename to opendbc/dbc/generator/nissan/nissan_leaf_2018.dbc diff --git a/generator/nissan/nissan_x_trail_2017.dbc b/opendbc/dbc/generator/nissan/nissan_x_trail_2017.dbc similarity index 100% rename from generator/nissan/nissan_x_trail_2017.dbc rename to opendbc/dbc/generator/nissan/nissan_x_trail_2017.dbc diff --git a/generator/subaru/_subaru_global.dbc b/opendbc/dbc/generator/subaru/_subaru_global.dbc similarity index 100% rename from generator/subaru/_subaru_global.dbc rename to opendbc/dbc/generator/subaru/_subaru_global.dbc diff --git a/generator/subaru/_subaru_preglobal_2015.dbc b/opendbc/dbc/generator/subaru/_subaru_preglobal_2015.dbc similarity index 100% rename from generator/subaru/_subaru_preglobal_2015.dbc rename to opendbc/dbc/generator/subaru/_subaru_preglobal_2015.dbc diff --git a/generator/subaru/subaru_forester_2017.dbc b/opendbc/dbc/generator/subaru/subaru_forester_2017.dbc similarity index 100% rename from generator/subaru/subaru_forester_2017.dbc rename to opendbc/dbc/generator/subaru/subaru_forester_2017.dbc diff --git a/generator/subaru/subaru_global_2017.dbc b/opendbc/dbc/generator/subaru/subaru_global_2017.dbc similarity index 100% rename from generator/subaru/subaru_global_2017.dbc rename to opendbc/dbc/generator/subaru/subaru_global_2017.dbc diff --git a/generator/subaru/subaru_global_2020_hybrid.dbc b/opendbc/dbc/generator/subaru/subaru_global_2020_hybrid.dbc similarity index 100% rename from generator/subaru/subaru_global_2020_hybrid.dbc rename to opendbc/dbc/generator/subaru/subaru_global_2020_hybrid.dbc diff --git a/generator/subaru/subaru_outback_2015.dbc b/opendbc/dbc/generator/subaru/subaru_outback_2015.dbc similarity index 100% rename from generator/subaru/subaru_outback_2015.dbc rename to opendbc/dbc/generator/subaru/subaru_outback_2015.dbc diff --git a/generator/subaru/subaru_outback_2019.dbc b/opendbc/dbc/generator/subaru/subaru_outback_2019.dbc similarity index 100% rename from generator/subaru/subaru_outback_2019.dbc rename to opendbc/dbc/generator/subaru/subaru_outback_2019.dbc diff --git a/generator/tesla/.gitignore b/opendbc/dbc/generator/tesla/.gitignore similarity index 100% rename from generator/tesla/.gitignore rename to opendbc/dbc/generator/tesla/.gitignore diff --git a/generator/tesla/radar_common.py b/opendbc/dbc/generator/tesla/radar_common.py similarity index 100% rename from generator/tesla/radar_common.py rename to opendbc/dbc/generator/tesla/radar_common.py diff --git a/generator/tesla/tesla_radar_bosch.py b/opendbc/dbc/generator/tesla/tesla_radar_bosch.py similarity index 99% rename from generator/tesla/tesla_radar_bosch.py rename to opendbc/dbc/generator/tesla/tesla_radar_bosch.py index b7fa1ab4dc..6518c27436 100755 --- a/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.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 b/opendbc/dbc/generator/tesla/tesla_radar_continental.py similarity index 95% rename from generator/tesla/tesla_radar_continental.py rename to opendbc/dbc/generator/tesla/tesla_radar_continental.py index c785c7ec25..1279bf1f21 100755 --- a/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.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 b/opendbc/dbc/generator/test_generator.py similarity index 76% rename from generator/test_generator.py rename to opendbc/dbc/generator/test_generator.py index 145bb27243..1cfc70128b 100755 --- a/generator/test_generator.py +++ b/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 b/opendbc/dbc/generator/toyota/_community.dbc similarity index 100% rename from generator/toyota/_community.dbc rename to opendbc/dbc/generator/toyota/_community.dbc diff --git a/generator/toyota/_toyota_2017.dbc b/opendbc/dbc/generator/toyota/_toyota_2017.dbc similarity index 100% rename from generator/toyota/_toyota_2017.dbc rename to opendbc/dbc/generator/toyota/_toyota_2017.dbc diff --git a/generator/toyota/toyota_new_mc_pt.dbc b/opendbc/dbc/generator/toyota/toyota_new_mc_pt.dbc similarity index 100% rename from generator/toyota/toyota_new_mc_pt.dbc rename to opendbc/dbc/generator/toyota/toyota_new_mc_pt.dbc diff --git a/generator/toyota/toyota_nodsu_pt.dbc b/opendbc/dbc/generator/toyota/toyota_nodsu_pt.dbc similarity index 100% rename from generator/toyota/toyota_nodsu_pt.dbc rename to opendbc/dbc/generator/toyota/toyota_nodsu_pt.dbc diff --git a/generator/toyota/toyota_tnga_k_pt.dbc b/opendbc/dbc/generator/toyota/toyota_tnga_k_pt.dbc similarity index 100% rename from generator/toyota/toyota_tnga_k_pt.dbc rename to opendbc/dbc/generator/toyota/toyota_tnga_k_pt.dbc diff --git a/gm_global_a_chassis.dbc b/opendbc/dbc/gm_global_a_chassis.dbc similarity index 100% rename from gm_global_a_chassis.dbc rename to opendbc/dbc/gm_global_a_chassis.dbc diff --git a/gm_global_a_high_voltage_management.dbc b/opendbc/dbc/gm_global_a_high_voltage_management.dbc similarity index 100% rename from gm_global_a_high_voltage_management.dbc rename to opendbc/dbc/gm_global_a_high_voltage_management.dbc diff --git a/gm_global_a_lowspeed.dbc b/opendbc/dbc/gm_global_a_lowspeed.dbc similarity index 100% rename from gm_global_a_lowspeed.dbc rename to opendbc/dbc/gm_global_a_lowspeed.dbc diff --git a/gm_global_a_lowspeed_1818125.dbc b/opendbc/dbc/gm_global_a_lowspeed_1818125.dbc similarity index 100% rename from gm_global_a_lowspeed_1818125.dbc rename to opendbc/dbc/gm_global_a_lowspeed_1818125.dbc diff --git a/gm_global_a_object.dbc b/opendbc/dbc/gm_global_a_object.dbc similarity index 100% rename from gm_global_a_object.dbc rename to opendbc/dbc/gm_global_a_object.dbc diff --git a/gm_global_a_powertrain_expansion.dbc b/opendbc/dbc/gm_global_a_powertrain_expansion.dbc similarity index 100% rename from gm_global_a_powertrain_expansion.dbc rename to opendbc/dbc/gm_global_a_powertrain_expansion.dbc diff --git a/gm_global_a_powertrain_generated.dbc b/opendbc/dbc/gm_global_a_powertrain_generated.dbc similarity index 100% rename from gm_global_a_powertrain_generated.dbc rename to opendbc/dbc/gm_global_a_powertrain_generated.dbc diff --git a/honda_accord_2018_can_generated.dbc b/opendbc/dbc/honda_accord_2018_can_generated.dbc similarity index 100% rename from honda_accord_2018_can_generated.dbc rename to opendbc/dbc/honda_accord_2018_can_generated.dbc diff --git a/honda_civic_ex_2022_can_generated.dbc b/opendbc/dbc/honda_civic_ex_2022_can_generated.dbc similarity index 100% rename from honda_civic_ex_2022_can_generated.dbc rename to opendbc/dbc/honda_civic_ex_2022_can_generated.dbc diff --git a/honda_civic_hatchback_ex_2017_can_generated.dbc b/opendbc/dbc/honda_civic_hatchback_ex_2017_can_generated.dbc similarity index 100% rename from honda_civic_hatchback_ex_2017_can_generated.dbc rename to opendbc/dbc/honda_civic_hatchback_ex_2017_can_generated.dbc diff --git a/honda_civic_touring_2016_can_generated.dbc b/opendbc/dbc/honda_civic_touring_2016_can_generated.dbc similarity index 100% rename from honda_civic_touring_2016_can_generated.dbc rename to opendbc/dbc/honda_civic_touring_2016_can_generated.dbc diff --git a/honda_clarity_hybrid_2018_can_generated.dbc b/opendbc/dbc/honda_clarity_hybrid_2018_can_generated.dbc similarity index 100% rename from honda_clarity_hybrid_2018_can_generated.dbc rename to opendbc/dbc/honda_clarity_hybrid_2018_can_generated.dbc diff --git a/honda_crv_ex_2017_body_generated.dbc b/opendbc/dbc/honda_crv_ex_2017_body_generated.dbc similarity index 100% rename from honda_crv_ex_2017_body_generated.dbc rename to opendbc/dbc/honda_crv_ex_2017_body_generated.dbc diff --git a/honda_crv_ex_2017_can_generated.dbc b/opendbc/dbc/honda_crv_ex_2017_can_generated.dbc similarity index 100% rename from honda_crv_ex_2017_can_generated.dbc rename to opendbc/dbc/honda_crv_ex_2017_can_generated.dbc diff --git a/honda_crv_executive_2016_can_generated.dbc b/opendbc/dbc/honda_crv_executive_2016_can_generated.dbc similarity index 100% rename from honda_crv_executive_2016_can_generated.dbc rename to opendbc/dbc/honda_crv_executive_2016_can_generated.dbc diff --git a/honda_crv_touring_2016_can_generated.dbc b/opendbc/dbc/honda_crv_touring_2016_can_generated.dbc similarity index 100% rename from honda_crv_touring_2016_can_generated.dbc rename to opendbc/dbc/honda_crv_touring_2016_can_generated.dbc diff --git a/honda_fit_ex_2018_can_generated.dbc b/opendbc/dbc/honda_fit_ex_2018_can_generated.dbc similarity index 100% rename from honda_fit_ex_2018_can_generated.dbc rename to opendbc/dbc/honda_fit_ex_2018_can_generated.dbc diff --git a/honda_fit_hybrid_2018_can_generated.dbc b/opendbc/dbc/honda_fit_hybrid_2018_can_generated.dbc similarity index 100% rename from honda_fit_hybrid_2018_can_generated.dbc rename to opendbc/dbc/honda_fit_hybrid_2018_can_generated.dbc diff --git a/honda_insight_ex_2019_can_generated.dbc b/opendbc/dbc/honda_insight_ex_2019_can_generated.dbc similarity index 100% rename from honda_insight_ex_2019_can_generated.dbc rename to opendbc/dbc/honda_insight_ex_2019_can_generated.dbc diff --git a/honda_odyssey_exl_2018_generated.dbc b/opendbc/dbc/honda_odyssey_exl_2018_generated.dbc similarity index 100% rename from honda_odyssey_exl_2018_generated.dbc rename to opendbc/dbc/honda_odyssey_exl_2018_generated.dbc diff --git a/honda_odyssey_extreme_edition_2018_china_can_generated.dbc b/opendbc/dbc/honda_odyssey_extreme_edition_2018_china_can_generated.dbc similarity index 100% rename from honda_odyssey_extreme_edition_2018_china_can_generated.dbc rename to opendbc/dbc/honda_odyssey_extreme_edition_2018_china_can_generated.dbc diff --git a/honda_pilot_2023_can_generated.dbc b/opendbc/dbc/honda_pilot_2023_can_generated.dbc similarity index 100% rename from honda_pilot_2023_can_generated.dbc rename to opendbc/dbc/honda_pilot_2023_can_generated.dbc diff --git a/hyundai_2015_ccan.dbc b/opendbc/dbc/hyundai_2015_ccan.dbc similarity index 100% rename from hyundai_2015_ccan.dbc rename to opendbc/dbc/hyundai_2015_ccan.dbc diff --git a/hyundai_2015_mcan.dbc b/opendbc/dbc/hyundai_2015_mcan.dbc similarity index 100% rename from hyundai_2015_mcan.dbc rename to opendbc/dbc/hyundai_2015_mcan.dbc diff --git a/hyundai_canfd.dbc b/opendbc/dbc/hyundai_canfd.dbc similarity index 100% rename from hyundai_canfd.dbc rename to opendbc/dbc/hyundai_canfd.dbc diff --git a/hyundai_i30_2014.dbc b/opendbc/dbc/hyundai_i30_2014.dbc similarity index 100% rename from hyundai_i30_2014.dbc rename to opendbc/dbc/hyundai_i30_2014.dbc diff --git a/hyundai_kia_generic.dbc b/opendbc/dbc/hyundai_kia_generic.dbc similarity index 100% rename from hyundai_kia_generic.dbc rename to opendbc/dbc/hyundai_kia_generic.dbc diff --git a/hyundai_kia_mando_corner_radar_generated.dbc b/opendbc/dbc/hyundai_kia_mando_corner_radar_generated.dbc similarity index 100% rename from hyundai_kia_mando_corner_radar_generated.dbc rename to opendbc/dbc/hyundai_kia_mando_corner_radar_generated.dbc diff --git a/hyundai_kia_mando_front_radar_generated.dbc b/opendbc/dbc/hyundai_kia_mando_front_radar_generated.dbc similarity index 100% rename from hyundai_kia_mando_front_radar_generated.dbc rename to opendbc/dbc/hyundai_kia_mando_front_radar_generated.dbc diff --git a/hyundai_santafe_2007.dbc b/opendbc/dbc/hyundai_santafe_2007.dbc similarity index 100% rename from hyundai_santafe_2007.dbc rename to opendbc/dbc/hyundai_santafe_2007.dbc diff --git a/luxgen_s5_2015.dbc b/opendbc/dbc/luxgen_s5_2015.dbc similarity index 100% rename from luxgen_s5_2015.dbc rename to opendbc/dbc/luxgen_s5_2015.dbc diff --git a/mazda_2017.dbc b/opendbc/dbc/mazda_2017.dbc similarity index 100% rename from mazda_2017.dbc rename to opendbc/dbc/mazda_2017.dbc diff --git a/mazda_3_2019.dbc b/opendbc/dbc/mazda_3_2019.dbc similarity index 100% rename from mazda_3_2019.dbc rename to opendbc/dbc/mazda_3_2019.dbc diff --git a/mazda_radar.dbc b/opendbc/dbc/mazda_radar.dbc similarity index 100% rename from mazda_radar.dbc rename to opendbc/dbc/mazda_radar.dbc diff --git a/mazda_rx8.dbc b/opendbc/dbc/mazda_rx8.dbc similarity index 100% rename from mazda_rx8.dbc rename to opendbc/dbc/mazda_rx8.dbc diff --git a/mercedes_benz_e350_2010.dbc b/opendbc/dbc/mercedes_benz_e350_2010.dbc similarity index 100% rename from mercedes_benz_e350_2010.dbc rename to opendbc/dbc/mercedes_benz_e350_2010.dbc diff --git a/nissan_leaf_2018_generated.dbc b/opendbc/dbc/nissan_leaf_2018_generated.dbc similarity index 100% rename from nissan_leaf_2018_generated.dbc rename to opendbc/dbc/nissan_leaf_2018_generated.dbc diff --git a/nissan_x_trail_2017_generated.dbc b/opendbc/dbc/nissan_x_trail_2017_generated.dbc similarity index 100% rename from nissan_x_trail_2017_generated.dbc rename to opendbc/dbc/nissan_x_trail_2017_generated.dbc diff --git a/nissan_xterra_2011.dbc b/opendbc/dbc/nissan_xterra_2011.dbc similarity index 100% rename from nissan_xterra_2011.dbc rename to opendbc/dbc/nissan_xterra_2011.dbc diff --git a/opel_omega_2001.dbc b/opendbc/dbc/opel_omega_2001.dbc similarity index 100% rename from opel_omega_2001.dbc rename to opendbc/dbc/opel_omega_2001.dbc diff --git a/subaru_forester_2017_generated.dbc b/opendbc/dbc/subaru_forester_2017_generated.dbc similarity index 100% rename from subaru_forester_2017_generated.dbc rename to opendbc/dbc/subaru_forester_2017_generated.dbc diff --git a/subaru_global_2017_generated.dbc b/opendbc/dbc/subaru_global_2017_generated.dbc similarity index 100% rename from subaru_global_2017_generated.dbc rename to opendbc/dbc/subaru_global_2017_generated.dbc diff --git a/subaru_global_2020_hybrid_generated.dbc b/opendbc/dbc/subaru_global_2020_hybrid_generated.dbc similarity index 100% rename from subaru_global_2020_hybrid_generated.dbc rename to opendbc/dbc/subaru_global_2020_hybrid_generated.dbc diff --git a/subaru_outback_2015_generated.dbc b/opendbc/dbc/subaru_outback_2015_generated.dbc similarity index 100% rename from subaru_outback_2015_generated.dbc rename to opendbc/dbc/subaru_outback_2015_generated.dbc diff --git a/subaru_outback_2019_generated.dbc b/opendbc/dbc/subaru_outback_2019_generated.dbc similarity index 100% rename from subaru_outback_2019_generated.dbc rename to opendbc/dbc/subaru_outback_2019_generated.dbc diff --git a/tesla_can.dbc b/opendbc/dbc/tesla_can.dbc similarity index 100% rename from tesla_can.dbc rename to opendbc/dbc/tesla_can.dbc diff --git a/tesla_model3_party.dbc b/opendbc/dbc/tesla_model3_party.dbc similarity index 100% rename from tesla_model3_party.dbc rename to opendbc/dbc/tesla_model3_party.dbc diff --git a/tesla_model3_vehicle.dbc b/opendbc/dbc/tesla_model3_vehicle.dbc similarity index 100% rename from tesla_model3_vehicle.dbc rename to opendbc/dbc/tesla_model3_vehicle.dbc diff --git a/tesla_powertrain.dbc b/opendbc/dbc/tesla_powertrain.dbc similarity index 100% rename from tesla_powertrain.dbc rename to opendbc/dbc/tesla_powertrain.dbc diff --git a/tesla_radar_bosch_generated.dbc b/opendbc/dbc/tesla_radar_bosch_generated.dbc similarity index 100% rename from tesla_radar_bosch_generated.dbc rename to opendbc/dbc/tesla_radar_bosch_generated.dbc diff --git a/tesla_radar_continental_generated.dbc b/opendbc/dbc/tesla_radar_continental_generated.dbc similarity index 100% rename from tesla_radar_continental_generated.dbc rename to opendbc/dbc/tesla_radar_continental_generated.dbc diff --git a/toyota_2017_ref_pt.dbc b/opendbc/dbc/toyota_2017_ref_pt.dbc similarity index 100% rename from toyota_2017_ref_pt.dbc rename to opendbc/dbc/toyota_2017_ref_pt.dbc diff --git a/toyota_adas.dbc b/opendbc/dbc/toyota_adas.dbc similarity index 100% rename from toyota_adas.dbc rename to opendbc/dbc/toyota_adas.dbc diff --git a/toyota_iQ_2009_can.dbc b/opendbc/dbc/toyota_iQ_2009_can.dbc similarity index 100% rename from toyota_iQ_2009_can.dbc rename to opendbc/dbc/toyota_iQ_2009_can.dbc diff --git a/toyota_new_mc_pt_generated.dbc b/opendbc/dbc/toyota_new_mc_pt_generated.dbc similarity index 100% rename from toyota_new_mc_pt_generated.dbc rename to opendbc/dbc/toyota_new_mc_pt_generated.dbc diff --git a/toyota_nodsu_pt_generated.dbc b/opendbc/dbc/toyota_nodsu_pt_generated.dbc similarity index 100% rename from toyota_nodsu_pt_generated.dbc rename to opendbc/dbc/toyota_nodsu_pt_generated.dbc diff --git a/toyota_prius_2010_pt.dbc b/opendbc/dbc/toyota_prius_2010_pt.dbc similarity index 100% rename from toyota_prius_2010_pt.dbc rename to opendbc/dbc/toyota_prius_2010_pt.dbc diff --git a/toyota_radar_dsu_tssp.dbc b/opendbc/dbc/toyota_radar_dsu_tssp.dbc similarity index 100% rename from toyota_radar_dsu_tssp.dbc rename to opendbc/dbc/toyota_radar_dsu_tssp.dbc diff --git a/toyota_tnga_k_pt_generated.dbc b/opendbc/dbc/toyota_tnga_k_pt_generated.dbc similarity index 100% rename from toyota_tnga_k_pt_generated.dbc rename to opendbc/dbc/toyota_tnga_k_pt_generated.dbc diff --git a/toyota_tss2_adas.dbc b/opendbc/dbc/toyota_tss2_adas.dbc similarity index 100% rename from toyota_tss2_adas.dbc rename to opendbc/dbc/toyota_tss2_adas.dbc diff --git a/volvo_v40_2017_pt.dbc b/opendbc/dbc/volvo_v40_2017_pt.dbc similarity index 100% rename from volvo_v40_2017_pt.dbc rename to opendbc/dbc/volvo_v40_2017_pt.dbc diff --git a/volvo_v60_2015_pt.dbc b/opendbc/dbc/volvo_v60_2015_pt.dbc similarity index 100% rename from volvo_v60_2015_pt.dbc rename to opendbc/dbc/volvo_v60_2015_pt.dbc diff --git a/vw_golf_mk4.dbc b/opendbc/dbc/vw_golf_mk4.dbc similarity index 100% rename from vw_golf_mk4.dbc rename to opendbc/dbc/vw_golf_mk4.dbc diff --git a/vw_mqb_2010.dbc b/opendbc/dbc/vw_mqb_2010.dbc similarity index 100% rename from vw_mqb_2010.dbc rename to opendbc/dbc/vw_mqb_2010.dbc diff --git a/pyproject.toml b/pyproject.toml index 035775acc4..cfb6c2c6e7 100644 --- 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"]