From 54fb1158f6fad63387cf2535adea02848a4a61f2 Mon Sep 17 00:00:00 2001 From: Chris Souers Date: Thu, 14 Dec 2023 17:23:47 -0500 Subject: [PATCH] Honda: Add LKAS_HUD enabled bit and full signal coverage of SCM_BUTTONS. * prep buttons frame for intercept via OP * remove overlapping signal in LKAS_HUD --- acura_ilx_2016_can_generated.dbc | 4 ++-- acura_rdx_2018_can_generated.dbc | 4 ++-- acura_rdx_2020_can_generated.dbc | 18 +++++++++-------- can/tests/test_checksums.py | 3 ++- generator/honda/_bosch_2018.dbc | 14 +++++++------ generator/honda/_bosch_adas_2018.dbc | 4 ++-- generator/honda/_nidec_common.dbc | 4 ++-- generator/honda/honda_civic_ex_2022_can.dbc | 6 ++++-- honda_accord_2018_can_generated.dbc | 18 +++++++++-------- honda_civic_ex_2022_can_generated.dbc | 20 +++++++++++-------- ..._civic_hatchback_ex_2017_can_generated.dbc | 18 +++++++++-------- honda_civic_touring_2016_can_generated.dbc | 4 ++-- honda_clarity_hybrid_2018_can_generated.dbc | 4 ++-- honda_crv_ex_2017_can_generated.dbc | 18 +++++++++-------- honda_crv_executive_2016_can_generated.dbc | 4 ++-- honda_crv_touring_2016_can_generated.dbc | 4 ++-- honda_fit_ex_2018_can_generated.dbc | 4 ++-- honda_fit_hybrid_2018_can_generated.dbc | 4 ++-- honda_insight_ex_2019_can_generated.dbc | 18 +++++++++-------- honda_odyssey_exl_2018_generated.dbc | 4 ++-- ...treme_edition_2018_china_can_generated.dbc | 4 ++-- 21 files changed, 100 insertions(+), 81 deletions(-) diff --git a/acura_ilx_2016_can_generated.dbc b/acura_ilx_2016_can_generated.dbc index 1afb5bade6..d821e65e1a 100644 --- a/acura_ilx_2016_can_generated.dbc +++ b/acura_ilx_2016_can_generated.dbc @@ -245,9 +245,9 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/acura_rdx_2018_can_generated.dbc b/acura_rdx_2018_can_generated.dbc index 6596b44514..a45b41651a 100644 --- a/acura_rdx_2018_can_generated.dbc +++ b/acura_rdx_2018_can_generated.dbc @@ -245,9 +245,9 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/acura_rdx_2020_can_generated.dbc b/acura_rdx_2020_can_generated.dbc index c6149921dc..393a13ace4 100644 --- a/acura_rdx_2020_can_generated.dbc +++ b/acura_rdx_2020_can_generated.dbc @@ -307,10 +307,12 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 662 SCM_BUTTONS: 4 SCM - SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON SG_ CRUISE_SETTING : 3|2@0+ (1,0) [0|3] "" EON - SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON + SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON + SG_ BOH_1 : 1|20@0+ (1,0) [0|255] "" XXX + SG_ BOH_2 : 4|1@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 27|4@0+ (1,0) [0|15] "" EON + SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON BO_ 806 SCM_FEEDBACK: 8 SCM SG_ DRIVERS_DOOR_OPEN : 17|1@0+ (1,0) [0|1] "" XXX @@ -347,9 +349,9 @@ BO_ 927 RADAR_HUD: 8 RADAR SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX BO_ 13274 LKAS_HUD_A: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -368,9 +370,9 @@ BO_ 13274 LKAS_HUD_A: 5 ADAS SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" BDY BO_ 13275 LKAS_HUD_B: 8 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -426,9 +428,9 @@ BO_ 495 ACC_CONTROL_ON: 8 XXX SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/can/tests/test_checksums.py b/can/tests/test_checksums.py index 93ddbe0074..5e4b7f74c6 100755 --- a/can/tests/test_checksums.py +++ b/can/tests/test_checksums.py @@ -16,7 +16,8 @@ def test_honda_checksum(self): packer = CANPacker(dbc_file) values = { - 'SET_ME_X41': 0x41, + 'ENABLED': 1, + 'SET_ME_X20': 0x20, 'STEERING_REQUIRED': 1, 'SOLID_LANES': 1, 'BEEP': 0, diff --git a/generator/honda/_bosch_2018.dbc b/generator/honda/_bosch_2018.dbc index bf981781d0..48b4d03972 100644 --- a/generator/honda/_bosch_2018.dbc +++ b/generator/honda/_bosch_2018.dbc @@ -137,10 +137,12 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 662 SCM_BUTTONS: 4 SCM - SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON SG_ CRUISE_SETTING : 3|2@0+ (1,0) [0|3] "" EON - SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON + SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON + SG_ BOH_1 : 1|20@0+ (1,0) [0|255] "" XXX + SG_ BOH_2 : 4|1@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 27|4@0+ (1,0) [0|15] "" EON + SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON BO_ 806 SCM_FEEDBACK: 8 SCM SG_ DRIVERS_DOOR_OPEN : 17|1@0+ (1,0) [0|1] "" XXX @@ -177,9 +179,9 @@ BO_ 927 RADAR_HUD: 8 RADAR SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX BO_ 13274 LKAS_HUD_A: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -198,9 +200,9 @@ BO_ 13274 LKAS_HUD_A: 5 ADAS SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" BDY BO_ 13275 LKAS_HUD_B: 8 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/generator/honda/_bosch_adas_2018.dbc b/generator/honda/_bosch_adas_2018.dbc index dc8def55cb..365d04bb5b 100644 --- a/generator/honda/_bosch_adas_2018.dbc +++ b/generator/honda/_bosch_adas_2018.dbc @@ -25,9 +25,9 @@ BO_ 495 ACC_CONTROL_ON: 8 XXX SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/generator/honda/_nidec_common.dbc b/generator/honda/_nidec_common.dbc index 142508911d..22561edba0 100644 --- a/generator/honda/_nidec_common.dbc +++ b/generator/honda/_nidec_common.dbc @@ -57,9 +57,9 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/generator/honda/honda_civic_ex_2022_can.dbc b/generator/honda/honda_civic_ex_2022_can.dbc index 97aee26423..44c42b359b 100644 --- a/generator/honda/honda_civic_ex_2022_can.dbc +++ b/generator/honda/honda_civic_ex_2022_can.dbc @@ -51,9 +51,9 @@ BO_ 467 CRUISE_FAULT_STATUS: 8 XXX SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 829 LKAS_HUD: 8 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -94,3 +94,5 @@ CM_ SG_ 456 STANDSTILL "set to 1 when camera requests -4.0 m/s^2"; VAL_ 401 GEAR_SHIFTER 32 "L" 16 "S" 8 "D" 4 "N" 2 "R" 1 "P"; VAL_ 401 GEAR 7 "L" 10 "S" 4 "D" 3 "N" 2 "R" 1 "P"; VAL_ 419 GEAR_SHIFTER 32 "D" 16 "N" 8 "R" 4 "P" 0 "B" ; +VAL_ 662 CRUISE_BUTTONS 7 "tbd" 6 "tbd" 5 "tbd" 4 "accel_res" 3 "decel_set" 2 "cancel" 1 "main" 0 "none" ; +VAL_ 662 CRUISE_SETTING 3 "distance_adj" 2 "tbd" 1 "lkas_button" 0 "none" ; diff --git a/honda_accord_2018_can_generated.dbc b/honda_accord_2018_can_generated.dbc index 85947333d5..8d59c3a1a3 100644 --- a/honda_accord_2018_can_generated.dbc +++ b/honda_accord_2018_can_generated.dbc @@ -307,10 +307,12 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 662 SCM_BUTTONS: 4 SCM - SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON SG_ CRUISE_SETTING : 3|2@0+ (1,0) [0|3] "" EON - SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON + SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON + SG_ BOH_1 : 1|20@0+ (1,0) [0|255] "" XXX + SG_ BOH_2 : 4|1@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 27|4@0+ (1,0) [0|15] "" EON + SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON BO_ 806 SCM_FEEDBACK: 8 SCM SG_ DRIVERS_DOOR_OPEN : 17|1@0+ (1,0) [0|1] "" XXX @@ -347,9 +349,9 @@ BO_ 927 RADAR_HUD: 8 RADAR SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX BO_ 13274 LKAS_HUD_A: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -368,9 +370,9 @@ BO_ 13274 LKAS_HUD_A: 5 ADAS SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" BDY BO_ 13275 LKAS_HUD_B: 8 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -426,9 +428,9 @@ BO_ 495 ACC_CONTROL_ON: 8 XXX SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/honda_civic_ex_2022_can_generated.dbc b/honda_civic_ex_2022_can_generated.dbc index 581e7c66e4..370bdae407 100644 --- a/honda_civic_ex_2022_can_generated.dbc +++ b/honda_civic_ex_2022_can_generated.dbc @@ -325,10 +325,12 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 662 SCM_BUTTONS: 4 SCM - SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON SG_ CRUISE_SETTING : 3|2@0+ (1,0) [0|3] "" EON - SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON + SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON + SG_ BOH_1 : 1|20@0+ (1,0) [0|255] "" XXX + SG_ BOH_2 : 4|1@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 27|4@0+ (1,0) [0|15] "" EON + SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON BO_ 806 SCM_FEEDBACK: 8 SCM SG_ DRIVERS_DOOR_OPEN : 17|1@0+ (1,0) [0|1] "" XXX @@ -365,9 +367,9 @@ BO_ 927 RADAR_HUD: 8 RADAR SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX BO_ 13274 LKAS_HUD_A: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -386,9 +388,9 @@ BO_ 13274 LKAS_HUD_A: 5 ADAS SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" BDY BO_ 13275 LKAS_HUD_B: 8 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -477,9 +479,9 @@ BO_ 467 CRUISE_FAULT_STATUS: 8 XXX SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 829 LKAS_HUD: 8 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -520,3 +522,5 @@ CM_ SG_ 456 STANDSTILL "set to 1 when camera requests -4.0 m/s^2"; VAL_ 401 GEAR_SHIFTER 32 "L" 16 "S" 8 "D" 4 "N" 2 "R" 1 "P"; VAL_ 401 GEAR 7 "L" 10 "S" 4 "D" 3 "N" 2 "R" 1 "P"; VAL_ 419 GEAR_SHIFTER 32 "D" 16 "N" 8 "R" 4 "P" 0 "B" ; +VAL_ 662 CRUISE_BUTTONS 7 "tbd" 6 "tbd" 5 "tbd" 4 "accel_res" 3 "decel_set" 2 "cancel" 1 "main" 0 "none" ; +VAL_ 662 CRUISE_SETTING 3 "distance_adj" 2 "tbd" 1 "lkas_button" 0 "none" ; diff --git a/honda_civic_hatchback_ex_2017_can_generated.dbc b/honda_civic_hatchback_ex_2017_can_generated.dbc index 75ba176a8f..3b76e0f79f 100644 --- a/honda_civic_hatchback_ex_2017_can_generated.dbc +++ b/honda_civic_hatchback_ex_2017_can_generated.dbc @@ -307,10 +307,12 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 662 SCM_BUTTONS: 4 SCM - SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON SG_ CRUISE_SETTING : 3|2@0+ (1,0) [0|3] "" EON - SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON + SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON + SG_ BOH_1 : 1|20@0+ (1,0) [0|255] "" XXX + SG_ BOH_2 : 4|1@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 27|4@0+ (1,0) [0|15] "" EON + SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON BO_ 806 SCM_FEEDBACK: 8 SCM SG_ DRIVERS_DOOR_OPEN : 17|1@0+ (1,0) [0|1] "" XXX @@ -347,9 +349,9 @@ BO_ 927 RADAR_HUD: 8 RADAR SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX BO_ 13274 LKAS_HUD_A: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -368,9 +370,9 @@ BO_ 13274 LKAS_HUD_A: 5 ADAS SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" BDY BO_ 13275 LKAS_HUD_B: 8 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -426,9 +428,9 @@ BO_ 495 ACC_CONTROL_ON: 8 XXX SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/honda_civic_touring_2016_can_generated.dbc b/honda_civic_touring_2016_can_generated.dbc index 82271c417e..366d38a65b 100644 --- a/honda_civic_touring_2016_can_generated.dbc +++ b/honda_civic_touring_2016_can_generated.dbc @@ -245,9 +245,9 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/honda_clarity_hybrid_2018_can_generated.dbc b/honda_clarity_hybrid_2018_can_generated.dbc index 5e5cf294fc..0fd7b71985 100644 --- a/honda_clarity_hybrid_2018_can_generated.dbc +++ b/honda_clarity_hybrid_2018_can_generated.dbc @@ -245,9 +245,9 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/honda_crv_ex_2017_can_generated.dbc b/honda_crv_ex_2017_can_generated.dbc index 9f3dc0fba9..5eb96f8619 100644 --- a/honda_crv_ex_2017_can_generated.dbc +++ b/honda_crv_ex_2017_can_generated.dbc @@ -307,10 +307,12 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 662 SCM_BUTTONS: 4 SCM - SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON SG_ CRUISE_SETTING : 3|2@0+ (1,0) [0|3] "" EON - SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON + SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON + SG_ BOH_1 : 1|20@0+ (1,0) [0|255] "" XXX + SG_ BOH_2 : 4|1@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 27|4@0+ (1,0) [0|15] "" EON + SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON BO_ 806 SCM_FEEDBACK: 8 SCM SG_ DRIVERS_DOOR_OPEN : 17|1@0+ (1,0) [0|1] "" XXX @@ -347,9 +349,9 @@ BO_ 927 RADAR_HUD: 8 RADAR SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX BO_ 13274 LKAS_HUD_A: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -368,9 +370,9 @@ BO_ 13274 LKAS_HUD_A: 5 ADAS SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" BDY BO_ 13275 LKAS_HUD_B: 8 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -426,9 +428,9 @@ BO_ 495 ACC_CONTROL_ON: 8 XXX SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/honda_crv_executive_2016_can_generated.dbc b/honda_crv_executive_2016_can_generated.dbc index 272cf5dd36..410f583112 100644 --- a/honda_crv_executive_2016_can_generated.dbc +++ b/honda_crv_executive_2016_can_generated.dbc @@ -245,9 +245,9 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/honda_crv_touring_2016_can_generated.dbc b/honda_crv_touring_2016_can_generated.dbc index 1648442155..a59640bfe1 100644 --- a/honda_crv_touring_2016_can_generated.dbc +++ b/honda_crv_touring_2016_can_generated.dbc @@ -245,9 +245,9 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/honda_fit_ex_2018_can_generated.dbc b/honda_fit_ex_2018_can_generated.dbc index 1a80a9d4e2..2e0d54b8af 100644 --- a/honda_fit_ex_2018_can_generated.dbc +++ b/honda_fit_ex_2018_can_generated.dbc @@ -245,9 +245,9 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/honda_fit_hybrid_2018_can_generated.dbc b/honda_fit_hybrid_2018_can_generated.dbc index 68d603734c..be83c9a4d9 100644 --- a/honda_fit_hybrid_2018_can_generated.dbc +++ b/honda_fit_hybrid_2018_can_generated.dbc @@ -245,9 +245,9 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/honda_insight_ex_2019_can_generated.dbc b/honda_insight_ex_2019_can_generated.dbc index ccbf25bfc7..19dcd81365 100644 --- a/honda_insight_ex_2019_can_generated.dbc +++ b/honda_insight_ex_2019_can_generated.dbc @@ -307,10 +307,12 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 662 SCM_BUTTONS: 4 SCM - SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON SG_ CRUISE_SETTING : 3|2@0+ (1,0) [0|3] "" EON - SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON + SG_ CRUISE_BUTTONS : 7|3@0+ (1,0) [0|7] "" EON + SG_ BOH_1 : 1|20@0+ (1,0) [0|255] "" XXX + SG_ BOH_2 : 4|1@0+ (1,0) [0|1] "" XXX SG_ CHECKSUM : 27|4@0+ (1,0) [0|15] "" EON + SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" EON BO_ 806 SCM_FEEDBACK: 8 SCM SG_ DRIVERS_DOOR_OPEN : 17|1@0+ (1,0) [0|1] "" XXX @@ -347,9 +349,9 @@ BO_ 927 RADAR_HUD: 8 RADAR SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX BO_ 13274 LKAS_HUD_A: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -368,9 +370,9 @@ BO_ 13274 LKAS_HUD_A: 5 ADAS SG_ CHECKSUM : 35|4@0+ (1,0) [0|15] "" BDY BO_ 13275 LKAS_HUD_B: 8 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY @@ -426,9 +428,9 @@ BO_ 495 ACC_CONTROL_ON: 8 XXX SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/honda_odyssey_exl_2018_generated.dbc b/honda_odyssey_exl_2018_generated.dbc index bb33513b28..5e24a3978b 100644 --- a/honda_odyssey_exl_2018_generated.dbc +++ b/honda_odyssey_exl_2018_generated.dbc @@ -245,9 +245,9 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY diff --git a/honda_odyssey_extreme_edition_2018_china_can_generated.dbc b/honda_odyssey_extreme_edition_2018_china_can_generated.dbc index b5664d9e74..bfdf9ee9ab 100644 --- a/honda_odyssey_extreme_edition_2018_china_can_generated.dbc +++ b/honda_odyssey_extreme_edition_2018_china_can_generated.dbc @@ -245,9 +245,9 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON BO_ 829 LKAS_HUD: 5 ADAS + SG_ ENABLED : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_ME_X20 : 6|6@0+ (1,0) [0|127] "" BDY SG_ CAM_TEMP_HIGH : 7|1@0+ (1,0) [0|255] "" BDY - SG_ SET_ME_X41 : 6|7@0+ (1,0) [0|127] "" BDY - SG_ BOH : 6|7@0+ (1,0) [0|127] "" BDY SG_ DASHED_LANES : 14|1@0+ (1,0) [0|1] "" BDY SG_ DTC : 13|1@0+ (1,0) [0|1] "" BDY SG_ LKAS_PROBLEM : 12|1@0+ (1,0) [0|1] "" BDY