From f96d34902f8c83a6117831f6bc52bf1a698fbf54 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 24 Jan 2022 20:51:57 -0800 Subject: [PATCH] GM: use generated DBC (#23615) * Rename GM PT dbc to generated * bump opendbc Co-authored-by: Jason Shuler old-commit-hash: cdd3598146c9e06362683e2993af730157abf0b6 --- opendbc | 2 +- release/files_common | 2 +- selfdrive/car/gm/values.py | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/opendbc b/opendbc index e94bd12bd4..f199eb33fc 160000 --- a/opendbc +++ b/opendbc @@ -1 +1 @@ -Subproject commit e94bd12bd43b6d32324087dcb90f65fb819a402d +Subproject commit f199eb33fceddb62966bda1e7c586937cf877472 diff --git a/release/files_common b/release/files_common index 02b5333a08..126bb3b37f 100644 --- a/release/files_common +++ b/release/files_common @@ -552,7 +552,7 @@ opendbc/can/dbc_out/.gitignore opendbc/chrysler_pacifica_2017_hybrid.dbc opendbc/chrysler_pacifica_2017_hybrid_private_fusion.dbc -opendbc/gm_global_a_powertrain.dbc +opendbc/gm_global_a_powertrain_generated.dbc opendbc/gm_global_a_object.dbc opendbc/gm_global_a_chassis.dbc diff --git a/selfdrive/car/gm/values.py b/selfdrive/car/gm/values.py index dd00193a1a..8e09076713 100644 --- a/selfdrive/car/gm/values.py +++ b/selfdrive/car/gm/values.py @@ -113,11 +113,11 @@ FINGERPRINTS = { } DBC = { - CAR.HOLDEN_ASTRA: dbc_dict('gm_global_a_powertrain', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), - CAR.VOLT: dbc_dict('gm_global_a_powertrain', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), - CAR.MALIBU: dbc_dict('gm_global_a_powertrain', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), - CAR.ACADIA: dbc_dict('gm_global_a_powertrain', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), - CAR.CADILLAC_ATS: dbc_dict('gm_global_a_powertrain', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), - CAR.BUICK_REGAL: dbc_dict('gm_global_a_powertrain', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), - CAR.ESCALADE_ESV: dbc_dict('gm_global_a_powertrain', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), + CAR.HOLDEN_ASTRA: dbc_dict('gm_global_a_powertrain_generated', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), + CAR.VOLT: dbc_dict('gm_global_a_powertrain_generated', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), + CAR.MALIBU: dbc_dict('gm_global_a_powertrain_generated', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), + CAR.ACADIA: dbc_dict('gm_global_a_powertrain_generated', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), + CAR.CADILLAC_ATS: dbc_dict('gm_global_a_powertrain_generated', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), + CAR.BUICK_REGAL: dbc_dict('gm_global_a_powertrain_generated', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), + CAR.ESCALADE_ESV: dbc_dict('gm_global_a_powertrain_generated', 'gm_global_a_object', chassis_dbc='gm_global_a_chassis'), }