From 40a688983a5a4caac6cdd360ee5477bde28bfccc Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 12 Feb 2022 16:28:53 -0800 Subject: [PATCH] Honda: use common DBC for CRV H and Accord Diesel (#23743) * bump * use Accord DBC for CRVH, Civic Diesel * bump * bump opendbc old-commit-hash: 31228ce5605b6ba231ac09e22fd41946bf80ab36 --- opendbc | 2 +- release/files_common | 2 -- selfdrive/car/honda/values.py | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/opendbc b/opendbc index c3d3c71aa7..46a942d679 160000 --- a/opendbc +++ b/opendbc @@ -1 +1 @@ -Subproject commit c3d3c71aa7a37364814f029778070fcb550c7cd3 +Subproject commit 46a942d6790531cf5b94b14266140e43afcfda3e diff --git a/release/files_common b/release/files_common index faf6a41db7..67e4c0e31c 100644 --- a/release/files_common +++ b/release/files_common @@ -569,12 +569,10 @@ opendbc/acura_rdx_2018_can_generated.dbc opendbc/acura_rdx_2020_can_generated.dbc opendbc/honda_civic_touring_2016_can_generated.dbc opendbc/honda_civic_hatchback_ex_2017_can_generated.dbc -opendbc/honda_civic_sedan_16_diesel_2019_can_generated.dbc opendbc/honda_crv_touring_2016_can_generated.dbc opendbc/honda_crv_ex_2017_can_generated.dbc opendbc/honda_crv_ex_2017_body_generated.dbc opendbc/honda_crv_executive_2016_can_generated.dbc -opendbc/honda_crv_hybrid_2019_can_generated.dbc opendbc/honda_fit_ex_2018_can_generated.dbc opendbc/honda_odyssey_exl_2018_generated.dbc opendbc/honda_odyssey_extreme_edition_2018_china_can_generated.dbc diff --git a/selfdrive/car/honda/values.py b/selfdrive/car/honda/values.py index 6e347b8da3..50ea52faae 100644 --- a/selfdrive/car/honda/values.py +++ b/selfdrive/car/honda/values.py @@ -1346,11 +1346,11 @@ DBC = { CAR.ACURA_RDX_3G: dbc_dict('acura_rdx_2020_can_generated', None), CAR.CIVIC: dbc_dict('honda_civic_touring_2016_can_generated', 'acura_ilx_2016_nidec'), CAR.CIVIC_BOSCH: dbc_dict('honda_civic_hatchback_ex_2017_can_generated', None), - CAR.CIVIC_BOSCH_DIESEL: dbc_dict('honda_civic_sedan_16_diesel_2019_can_generated', None), + CAR.CIVIC_BOSCH_DIESEL: dbc_dict('honda_accord_2018_can_generated', None), CAR.CRV: dbc_dict('honda_crv_touring_2016_can_generated', 'acura_ilx_2016_nidec'), CAR.CRV_5G: dbc_dict('honda_crv_ex_2017_can_generated', None, body_dbc='honda_crv_ex_2017_body_generated'), CAR.CRV_EU: dbc_dict('honda_crv_executive_2016_can_generated', 'acura_ilx_2016_nidec'), - CAR.CRV_HYBRID: dbc_dict('honda_crv_hybrid_2019_can_generated', None), + CAR.CRV_HYBRID: dbc_dict('honda_accord_2018_can_generated', None), CAR.FIT: dbc_dict('honda_fit_ex_2018_can_generated', 'acura_ilx_2016_nidec'), CAR.FREED: dbc_dict('honda_fit_ex_2018_can_generated', 'acura_ilx_2016_nidec'), CAR.HRV: dbc_dict('honda_fit_ex_2018_can_generated', 'acura_ilx_2016_nidec'),