From 783db0cf33bcf903c1ca6a58b2cb0bb9fd136b11 Mon Sep 17 00:00:00 2001 From: cydia2020 <12470297+cydia2020@users.noreply.github.com> Date: Thu, 20 Jan 2022 06:46:07 +1100 Subject: [PATCH] Toyota: unify Sienna, Avalon, Highlander Lexus NX, Lexus RX into single DBC (#23577) * remove sienna dbc same as avalon * rx and nx are also the same as avalon * highlander can also use avalon's dbc * bump opendbc * rename avalon to tnga-k * pt Co-authored-by: Adeeb Shihadeh --- opendbc | 2 +- release/files_common | 5 +---- selfdrive/car/toyota/values.py | 10 +++++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/opendbc b/opendbc index c5eb11a6e..56d4afde5 160000 --- a/opendbc +++ b/opendbc @@ -1 +1 @@ -Subproject commit c5eb11a6ec2b7156c73f463dfe79736db081216f +Subproject commit 56d4afde5cec69f586cec38182e401190cd2d04e diff --git a/release/files_common b/release/files_common index 351ca9d9b..cdaab7f47 100644 --- a/release/files_common +++ b/release/files_common @@ -592,18 +592,15 @@ opendbc/subaru_outback_2015_generated.dbc opendbc/subaru_outback_2019_generated.dbc opendbc/subaru_forester_2017_generated.dbc +opendbc/toyota_tssp_pt_generated.dbc opendbc/toyota_tssp_hybrid_generated.dbc opendbc/toyota_rav4_2017_pt_generated.dbc opendbc/toyota_prius_2017_pt_generated.dbc opendbc/toyota_corolla_2017_pt_generated.dbc -opendbc/lexus_rx_350_2016_pt_generated.dbc opendbc/toyota_nodsu_pt_generated.dbc opendbc/toyota_nodsu_hybrid_pt_generated.dbc -opendbc/toyota_highlander_2017_pt_generated.dbc -opendbc/toyota_sienna_xle_2018_pt_generated.dbc opendbc/lexus_is_2018_pt_generated.dbc opendbc/lexus_ct200h_2018_pt_generated.dbc -opendbc/lexus_nx300_2018_pt_generated.dbc opendbc/toyota_adas.dbc opendbc/toyota_tss2_adas.dbc diff --git a/selfdrive/car/toyota/values.py b/selfdrive/car/toyota/values.py index 2d317fb66..fa46bb887 100644 --- a/selfdrive/car/toyota/values.py +++ b/selfdrive/car/toyota/values.py @@ -1639,7 +1639,7 @@ DBC = { CAR.PRIUS: dbc_dict('toyota_prius_2017_pt_generated', 'toyota_adas'), CAR.COROLLA: dbc_dict('toyota_corolla_2017_pt_generated', 'toyota_adas'), CAR.LEXUS_RC: dbc_dict('lexus_is_2018_pt_generated', 'toyota_adas'), - CAR.LEXUS_RX: dbc_dict('lexus_rx_350_2016_pt_generated', 'toyota_adas'), + CAR.LEXUS_RX: dbc_dict('toyota_tssp_pt_generated', 'toyota_adas'), CAR.LEXUS_RXH: dbc_dict('toyota_tssp_hybrid_generated', 'toyota_adas'), CAR.LEXUS_RX_TSS2: dbc_dict('toyota_nodsu_pt_generated', 'toyota_tss2_adas'), CAR.LEXUS_RXH_TSS2: dbc_dict('toyota_nodsu_hybrid_pt_generated', 'toyota_tss2_adas'), @@ -1649,11 +1649,11 @@ DBC = { CAR.CAMRYH: dbc_dict('toyota_nodsu_hybrid_pt_generated', 'toyota_adas'), CAR.CAMRY_TSS2: dbc_dict('toyota_nodsu_pt_generated', 'toyota_tss2_adas'), CAR.CAMRYH_TSS2: dbc_dict('toyota_nodsu_hybrid_pt_generated', 'toyota_tss2_adas'), - CAR.HIGHLANDER: dbc_dict('toyota_highlander_2017_pt_generated', 'toyota_adas'), + CAR.HIGHLANDER: dbc_dict('toyota_tssp_pt_generated', 'toyota_adas'), CAR.HIGHLANDER_TSS2: dbc_dict('toyota_nodsu_pt_generated', 'toyota_tss2_adas'), CAR.HIGHLANDERH: dbc_dict('toyota_tssp_hybrid_generated', 'toyota_adas'), CAR.HIGHLANDERH_TSS2: dbc_dict('toyota_nodsu_hybrid_pt_generated', 'toyota_tss2_adas'), - CAR.AVALON: dbc_dict('toyota_highlander_2017_pt_generated', 'toyota_adas'), + CAR.AVALON: dbc_dict('toyota_tssp_pt_generated', 'toyota_adas'), CAR.AVALON_2019: dbc_dict('toyota_nodsu_pt_generated', 'toyota_adas'), CAR.AVALONH_2019: dbc_dict('toyota_nodsu_hybrid_pt_generated', 'toyota_adas'), CAR.AVALON_TSS2: dbc_dict('toyota_nodsu_pt_generated', 'toyota_tss2_adas'), @@ -1663,12 +1663,12 @@ DBC = { CAR.LEXUS_ES_TSS2: dbc_dict('toyota_nodsu_pt_generated', 'toyota_tss2_adas'), CAR.LEXUS_ESH_TSS2: dbc_dict('toyota_nodsu_hybrid_pt_generated', 'toyota_tss2_adas'), CAR.LEXUS_ESH: dbc_dict('lexus_ct200h_2018_pt_generated', 'toyota_adas'), - CAR.SIENNA: dbc_dict('toyota_sienna_xle_2018_pt_generated', 'toyota_adas'), + CAR.SIENNA: dbc_dict('toyota_tssp_pt_generated', 'toyota_adas'), CAR.LEXUS_IS: dbc_dict('lexus_is_2018_pt_generated', 'toyota_adas'), CAR.LEXUS_CTH: dbc_dict('lexus_ct200h_2018_pt_generated', 'toyota_adas'), CAR.RAV4H_TSS2: dbc_dict('toyota_nodsu_hybrid_pt_generated', 'toyota_tss2_adas'), CAR.LEXUS_NXH: dbc_dict('toyota_tssp_hybrid_generated', 'toyota_adas'), - CAR.LEXUS_NX: dbc_dict('lexus_nx300_2018_pt_generated', 'toyota_adas'), + CAR.LEXUS_NX: dbc_dict('toyota_tssp_pt_generated', 'toyota_adas'), CAR.LEXUS_NX_TSS2: dbc_dict('toyota_nodsu_pt_generated', 'toyota_tss2_adas'), CAR.PRIUS_TSS2: dbc_dict('toyota_nodsu_hybrid_pt_generated', 'toyota_tss2_adas'), CAR.MIRAI: dbc_dict('toyota_nodsu_hybrid_pt_generated', 'toyota_tss2_adas'),