diff --git a/SConstruct b/SConstruct index 8aa46b9359767e..7cc672cef01201 100644 --- a/SConstruct +++ b/SConstruct @@ -349,7 +349,7 @@ Export('common', 'gpucommon') env_swaglog = env.Clone() env_swaglog['CXXFLAGS'].append('-DSWAGLOG="\\"common/swaglog.h\\""') SConscript(['msgq_repo/SConscript'], exports={'env': env_swaglog}) -SConscript(['opendbc/can/SConscript'], exports={'env': env_swaglog}) +SConscript(['opendbc_repo/SConscript'], exports={'env': env_swaglog}) SConscript(['cereal/SConscript']) diff --git a/opendbc_repo b/opendbc_repo index fb6ad760cce11e..8e349c395545b7 160000 --- a/opendbc_repo +++ b/opendbc_repo @@ -1 +1 @@ -Subproject commit fb6ad760cce11efc21abc37bafa6e3013dc79797 +Subproject commit 8e349c395545b7d4ba59dcf317ef55baa591510c diff --git a/tools/cabana/SConscript b/tools/cabana/SConscript index 74dc4d9f50ee0a..1cacaba4a21b47 100644 --- a/tools/cabana/SConscript +++ b/tools/cabana/SConscript @@ -39,4 +39,4 @@ output_json_file = 'tools/cabana/dbc/car_fingerprint_to_dbc.json' generate_dbc = cabana_env.Command('#' + output_json_file, ['dbc/generate_dbc_json.py'], "python3 tools/cabana/dbc/generate_dbc_json.py --out " + output_json_file) -cabana_env.Depends(generate_dbc, ["#common", "#selfdrive/pandad", '#opendbc', "#cereal", "#msgq_repo", Glob("#opendbc/*.dbc")]) +cabana_env.Depends(generate_dbc, ["#common", "#selfdrive/pandad", '#opendbc_repo', "#cereal", "#msgq_repo"])