From 70a8a425efd57729b749b5653bfebe4f3f9fe774 Mon Sep 17 00:00:00 2001 From: chrispypatt Date: Sun, 12 Jan 2025 17:45:44 -0600 Subject: [PATCH 1/3] Toyota: Add secoc distance message from PCM --- opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc b/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc index 43878647ab..b6123ca7bf 100644 --- a/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc +++ b/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc @@ -67,6 +67,17 @@ BO_ 418 CRUISE_RELATED: 8 XXX SG_ CRUISE_ACTIVE : 7|1@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 589 PCM_CRUISE_4: 8 XXX + SG_ DISTANCE : 2|1@0+ (1,0) [0|1] "" XXX + SG_ CANCEL : 4|1@0+ (1,0) [0|1] "" XXX + SG_ DECREASE : 5|1@0+ (1,0) [0|1] "" XXX + SG_ ENABLE : 6|1@0+ (1,0) [0|1] "" XXX + SG_ INCREASE : 7|1@0+ (1,0) [0|1] "" XXX + SG_ COUNTER : 27|4@0+ (1,0) [0|15] "" XXX + SG_ AUTHENTICATOR : 35|28@0+ (1,0) [0|268435455] "" XXX + SG_ RESET_FLAG : 37|2@0+ (1,0) [0|3] "" XXX + SG_ MSG_CNT_LOWER : 39|2@0+ (1,0) [0|3] "" XXX + BO_ 610 EPS_STATUS: 8 EPS SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX SG_ LTA_STATE : 15|5@0+ (1,0) [0|31] "" XXX @@ -138,7 +149,6 @@ CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along CM_ SG_ 1014 L_APPROACHING "vehicle approaching from left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; CM_ SG_ 1014 R_APPROACHING "vehicle approaching from right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility"; - VAL_ 401 SETME_X3 3 "TSS 2.0" 1 "TSS 2.5 or 2022 RAV4" 0 "TSS 2.0 on Alphard, Highlander, NX"; VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled"; VAL_ 610 LTA_STATE 25 "temporary_fault" 9 "temporary_fault2" 5 "active" 3 "lta_missing_unavailable" 1 "standby"; From 2cac4f3b92b7b00dc88addd0b4be06945c18b1cd Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 14 Jan 2025 14:21:18 -0800 Subject: [PATCH 2/3] Update opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc --- opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc b/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc index b6123ca7bf..acedc14c8f 100644 --- a/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc +++ b/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc @@ -67,7 +67,7 @@ BO_ 418 CRUISE_RELATED: 8 XXX SG_ CRUISE_ACTIVE : 7|1@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 589 PCM_CRUISE_4: 8 XXX +BO_ 589 PCM_CRUISE_4: 8 PCM SG_ DISTANCE : 2|1@0+ (1,0) [0|1] "" XXX SG_ CANCEL : 4|1@0+ (1,0) [0|1] "" XXX SG_ DECREASE : 5|1@0+ (1,0) [0|1] "" XXX From 55ceaad6f8abb0d6e64d564ce600601b2139a5fd Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Tue, 14 Jan 2025 14:21:33 -0800 Subject: [PATCH 3/3] Update opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc --- opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc | 1 + 1 file changed, 1 insertion(+) diff --git a/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc b/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc index acedc14c8f..eefe990667 100644 --- a/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc +++ b/opendbc/dbc/generator/toyota/toyota_secoc_pt.dbc @@ -149,6 +149,7 @@ CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along CM_ SG_ 1014 L_APPROACHING "vehicle approaching from left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; CM_ SG_ 1014 R_APPROACHING "vehicle approaching from right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility"; + VAL_ 401 SETME_X3 3 "TSS 2.0" 1 "TSS 2.5 or 2022 RAV4" 0 "TSS 2.0 on Alphard, Highlander, NX"; VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled"; VAL_ 610 LTA_STATE 25 "temporary_fault" 9 "temporary_fault2" 5 "active" 3 "lta_missing_unavailable" 1 "standby";