From 1e9693ce0916b896568dcd5558a670e67843c299 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Tue, 5 Jul 2022 22:55:34 -0700 Subject: [PATCH] chrysler: common DAS_4 definition --- chrysler_pacifica_2017_hybrid_generated.dbc | 16 ++++++++-------- chrysler_ram_dt_generated.dbc | 12 ++++++++---- generator/chrysler/_stellantis_common.dbc | 8 ++++++++ generator/chrysler/_stellantis_common_ram.py | 1 + .../chrysler/chrysler_pacifica_2017_hybrid.dbc | 8 -------- generator/chrysler/chrysler_ram_dt.dbc | 4 ---- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/chrysler_pacifica_2017_hybrid_generated.dbc b/chrysler_pacifica_2017_hybrid_generated.dbc index a51c6b7..d5293c7 100644 --- a/chrysler_pacifica_2017_hybrid_generated.dbc +++ b/chrysler_pacifica_2017_hybrid_generated.dbc @@ -44,6 +44,14 @@ BO_ 500 DAS_3: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 501 DAS_4: 8 XXX + SG_ ACC_SET_SPEED_KPH : 15|8@0+ (1,0) [0|3] "km/h" XXX + SG_ ACC_SET_SPEED_MPH : 23|8@0+ (1,0) [0|3] "mph" XXX + SG_ ACC_DISTANCE_CONFIG_1 : 1|2@0+ (1,0) [0|3] "" XXX + SG_ ACC_DISTANCE_CONFIG_2 : 41|2@0+ (1,0) [0|3] "" XXX + SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX + SG_ ACC_STATE : 38|3@0+ (1,0) [0|7] "" XXX + BO_ 544 EPS_2: 8 XXX SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX SG_ COLUMN_TORQUE : 2|11@0+ (1,-1024) [-1024|1023] "" XXX @@ -243,14 +251,6 @@ BO_ 878 ACCEL_RELATED_36E: 8 XXX BO_ 324 SPEED_2: 8 XXX SG_ SPEED_2 : 31|16@0+ (0.01,0) [0|255] "m/s" XXX -BO_ 501 DAS_4: 8 XXX - SG_ ACC_SPEED_CONFIG_KPH : 15|8@0+ (1,0) [0|3] "km/h" XXX - SG_ ACC_SPEED_CONFIG_MPH : 23|8@0+ (1,0) [0|3] "mph" XXX - SG_ ACC_DISTANCE_CONFIG_1 : 1|2@0+ (1,0) [0|3] "" XXX - SG_ ACC_DISTANCE_CONFIG_2 : 41|2@0+ (1,0) [0|3] "" XXX - SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX - SG_ CRUISE_STATE : 38|3@0+ (1,0) [0|7] "" XXX - BO_ 832 UNKNOWN_340: 8 XXX SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX diff --git a/chrysler_ram_dt_generated.dbc b/chrysler_ram_dt_generated.dbc index 8898ab2..71105b7 100644 --- a/chrysler_ram_dt_generated.dbc +++ b/chrysler_ram_dt_generated.dbc @@ -46,6 +46,14 @@ BO_ 153 DAS_3: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 232 DAS_4: 8 XXX + SG_ ACC_SET_SPEED_KPH : 15|8@0+ (1,0) [0|3] "km/h" XXX + SG_ ACC_SET_SPEED_MPH : 23|8@0+ (1,0) [0|3] "mph" XXX + SG_ ACC_DISTANCE_CONFIG_1 : 1|2@0+ (1,0) [0|3] "" XXX + SG_ ACC_DISTANCE_CONFIG_2 : 41|2@0+ (1,0) [0|3] "" XXX + SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX + SG_ ACC_STATE : 38|3@0+ (1,0) [0|7] "" XXX + BO_ 49 EPS_2: 8 XXX SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX SG_ COLUMN_TORQUE : 2|11@0+ (1,-1024) [-1024|1023] "" XXX @@ -155,10 +163,6 @@ BO_ 221 Center_Stack_1: 8 XXX SG_ LKAS_Button : 53|1@1+ (1,0) [0|0] "" XXX SG_ Traction_Button : 54|1@0+ (1,0) [0|1] "" XXX -BO_ 232 DAS_4: 8 XXX - SG_ ACC_Set_Speed : 8|8@1+ (1,0) [0|255] "km/h" XXX - SG_ ACC_Activation_Status : 36|3@1+ (1,0) [0|0] "" XXX - BO_ 650 Center_Stack_2: 8 XXX SG_ LKAS_Button : 57|1@1+ (1,0) [0|0] "" XXX diff --git a/generator/chrysler/_stellantis_common.dbc b/generator/chrysler/_stellantis_common.dbc index 2657344..b211021 100644 --- a/generator/chrysler/_stellantis_common.dbc +++ b/generator/chrysler/_stellantis_common.dbc @@ -40,6 +40,14 @@ BO_ 500 DAS_3: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 501 DAS_4: 8 XXX + SG_ ACC_SET_SPEED_KPH : 15|8@0+ (1,0) [0|3] "km/h" XXX + SG_ ACC_SET_SPEED_MPH : 23|8@0+ (1,0) [0|3] "mph" XXX + SG_ ACC_DISTANCE_CONFIG_1 : 1|2@0+ (1,0) [0|3] "" XXX + SG_ ACC_DISTANCE_CONFIG_2 : 41|2@0+ (1,0) [0|3] "" XXX + SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX + SG_ ACC_STATE : 38|3@0+ (1,0) [0|7] "" XXX + BO_ 544 EPS_2: 8 XXX SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX SG_ COLUMN_TORQUE : 2|11@0+ (1,-1024) [-1024|1023] "" XXX diff --git a/generator/chrysler/_stellantis_common_ram.py b/generator/chrysler/_stellantis_common_ram.py index de1b778..d38831e 100755 --- a/generator/chrysler/_stellantis_common_ram.py +++ b/generator/chrysler/_stellantis_common_ram.py @@ -9,6 +9,7 @@ CHRYSLER_TO_RAM_ADDR = { 344: 139, 464: 464, 500: 153, + 501: 232, 544: 49, 571: 177, 559: 157, diff --git a/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc b/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc index ce3cb3b..b3bfb5a 100644 --- a/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc +++ b/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc @@ -141,14 +141,6 @@ BO_ 878 ACCEL_RELATED_36E: 8 XXX BO_ 324 SPEED_2: 8 XXX SG_ SPEED_2 : 31|16@0+ (0.01,0) [0|255] "m/s" XXX -BO_ 501 DAS_4: 8 XXX - SG_ ACC_SPEED_CONFIG_KPH : 15|8@0+ (1,0) [0|3] "km/h" XXX - SG_ ACC_SPEED_CONFIG_MPH : 23|8@0+ (1,0) [0|3] "mph" XXX - SG_ ACC_DISTANCE_CONFIG_1 : 1|2@0+ (1,0) [0|3] "" XXX - SG_ ACC_DISTANCE_CONFIG_2 : 41|2@0+ (1,0) [0|3] "" XXX - SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX - SG_ CRUISE_STATE : 38|3@0+ (1,0) [0|7] "" XXX - BO_ 832 UNKNOWN_340: 8 XXX SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX diff --git a/generator/chrysler/chrysler_ram_dt.dbc b/generator/chrysler/chrysler_ram_dt.dbc index 2f2ec45..0eebaa7 100644 --- a/generator/chrysler/chrysler_ram_dt.dbc +++ b/generator/chrysler/chrysler_ram_dt.dbc @@ -51,10 +51,6 @@ BO_ 221 Center_Stack_1: 8 XXX SG_ LKAS_Button : 53|1@1+ (1,0) [0|0] "" XXX SG_ Traction_Button : 54|1@0+ (1,0) [0|1] "" XXX -BO_ 232 DAS_4: 8 XXX - SG_ ACC_Set_Speed : 8|8@1+ (1,0) [0|255] "km/h" XXX - SG_ ACC_Activation_Status : 36|3@1+ (1,0) [0|0] "" XXX - BO_ 650 Center_Stack_2: 8 XXX SG_ LKAS_Button : 57|1@1+ (1,0) [0|0] "" XXX