From 26551d2de2ee77909df6e9c48505d4579096ee4e Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 19 Jan 2024 17:10:41 -0800 Subject: [PATCH 1/3] stellantis: new signals (#986) --- chrysler_pacifica_2017_hybrid_generated.dbc | 3 +++ chrysler_ram_dt_generated.dbc | 10 ++++++++-- chrysler_ram_hd_generated.dbc | 3 +++ generator/chrysler/_stellantis_common.dbc | 3 +++ generator/chrysler/chrysler_ram_dt.dbc | 7 +++++-- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/chrysler_pacifica_2017_hybrid_generated.dbc b/chrysler_pacifica_2017_hybrid_generated.dbc index a325645e8d..2573fb1341 100644 --- a/chrysler_pacifica_2017_hybrid_generated.dbc +++ b/chrysler_pacifica_2017_hybrid_generated.dbc @@ -22,6 +22,7 @@ BO_ 280 ECM_TRQ: 8 XXX BO_ 284 ESP_8: 8 XXX SG_ BRK_PRESSURE : 3|12@0+ (1,0) [0|1] "" XXX + SG_ Vehicle_Stopped : 7|1@0+ (1,0) [0|1] "" XXX SG_ BRAKE_PEDAL : 19|12@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 39|16@0+ (0.0078125,0) [0|511.984375] "km/h" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX @@ -29,6 +30,8 @@ BO_ 284 ESP_8: 8 XXX BO_ 320 ESP_1: 8 XXX SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" XXX + SG_ ACC_Engaged : 15|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_Enabled : 23|1@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 33|10@0+ (0.5,0) [0|511] "km/h" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX diff --git a/chrysler_ram_dt_generated.dbc b/chrysler_ram_dt_generated.dbc index 29d890d5c6..8b2fbcbae3 100644 --- a/chrysler_ram_dt_generated.dbc +++ b/chrysler_ram_dt_generated.dbc @@ -24,6 +24,7 @@ BO_ 181 ECM_TRQ: 8 XXX BO_ 121 ESP_8: 8 XXX SG_ BRK_PRESSURE : 3|12@0+ (1,0) [0|1] "" XXX + SG_ Vehicle_Stopped : 7|1@0+ (1,0) [0|1] "" XXX SG_ BRAKE_PEDAL : 19|12@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 39|16@0+ (0.0078125,0) [0|511.984375] "km/h" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX @@ -31,6 +32,8 @@ BO_ 121 ESP_8: 8 XXX BO_ 131 ESP_1: 8 XXX SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" XXX + SG_ ACC_Engaged : 15|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_Enabled : 23|1@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 33|10@0+ (0.5,0) [0|511] "km/h" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX @@ -158,10 +161,13 @@ BO_ 53 PCM_2: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX BO_ 133 TCM_1: 8 XXX - SG_ DESIRED_GEAR : 15|4@0+ (1,0) [0|1] "" XXX SG_ SHIFT_PENDING : 2|1@0+ (1,0) [0|1] "" XXX - SG_ SPEED_TURBINE : 27|12@0+ (0.04,0) [0|1] "km/h" XXX SG_ ACTUAL_GEAR : 11|4@0+ (1,0) [0|15] "" XXX + SG_ DESIRED_GEAR : 15|4@0+ (1,0) [0|1] "" XXX + SG_ TC_LOCKED : 17|1@1+ (1,0) [0|0] "" XXX + SG_ OUTPUT_SPEED : 31|16@0+ (1,0) [0|65534] "rpm" XXX + SG_ INPUT_SPEED : 47|16@0+ (1,0) [0|65534] "rpm" XXX + SG_ RATIO : 11|4@0+ (1,0) [0|15] "" XXX BO_ 135 ABS_2: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|1] "" XXX diff --git a/chrysler_ram_hd_generated.dbc b/chrysler_ram_hd_generated.dbc index 5ededbc015..6394741209 100644 --- a/chrysler_ram_hd_generated.dbc +++ b/chrysler_ram_hd_generated.dbc @@ -24,6 +24,7 @@ BO_ 280 ECM_TRQ: 8 XXX BO_ 284 ESP_8: 8 XXX SG_ BRK_PRESSURE : 3|12@0+ (1,0) [0|1] "" XXX + SG_ Vehicle_Stopped : 7|1@0+ (1,0) [0|1] "" XXX SG_ BRAKE_PEDAL : 19|12@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 39|16@0+ (0.0078125,0) [0|511.984375] "km/h" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX @@ -31,6 +32,8 @@ BO_ 284 ESP_8: 8 XXX BO_ 320 ESP_1: 8 XXX SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" XXX + SG_ ACC_Engaged : 15|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_Enabled : 23|1@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 33|10@0+ (0.5,0) [0|511] "km/h" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX diff --git a/generator/chrysler/_stellantis_common.dbc b/generator/chrysler/_stellantis_common.dbc index 9516235f59..10c7040875 100644 --- a/generator/chrysler/_stellantis_common.dbc +++ b/generator/chrysler/_stellantis_common.dbc @@ -18,6 +18,7 @@ BO_ 280 ECM_TRQ: 8 XXX BO_ 284 ESP_8: 8 XXX SG_ BRK_PRESSURE : 3|12@0+ (1,0) [0|1] "" XXX + SG_ Vehicle_Stopped : 7|1@0+ (1,0) [0|1] "" XXX SG_ BRAKE_PEDAL : 19|12@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 39|16@0+ (0.0078125,0) [0|511.984375] "km/h" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX @@ -25,6 +26,8 @@ BO_ 284 ESP_8: 8 XXX BO_ 320 ESP_1: 8 XXX SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" XXX + SG_ ACC_Engaged : 15|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_Enabled : 23|1@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 33|10@0+ (0.5,0) [0|511] "km/h" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX diff --git a/generator/chrysler/chrysler_ram_dt.dbc b/generator/chrysler/chrysler_ram_dt.dbc index 4c1828ef05..b24eb0ae98 100644 --- a/generator/chrysler/chrysler_ram_dt.dbc +++ b/generator/chrysler/chrysler_ram_dt.dbc @@ -7,10 +7,13 @@ BO_ 53 PCM_2: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX BO_ 133 TCM_1: 8 XXX - SG_ DESIRED_GEAR : 15|4@0+ (1,0) [0|1] "" XXX SG_ SHIFT_PENDING : 2|1@0+ (1,0) [0|1] "" XXX - SG_ SPEED_TURBINE : 27|12@0+ (0.04,0) [0|1] "km/h" XXX SG_ ACTUAL_GEAR : 11|4@0+ (1,0) [0|15] "" XXX + SG_ DESIRED_GEAR : 15|4@0+ (1,0) [0|1] "" XXX + SG_ TC_LOCKED : 17|1@1+ (1,0) [0|0] "" XXX + SG_ OUTPUT_SPEED : 31|16@0+ (1,0) [0|65534] "rpm" XXX + SG_ INPUT_SPEED : 47|16@0+ (1,0) [0|65534] "rpm" XXX + SG_ RATIO : 11|4@0+ (1,0) [0|15] "" XXX BO_ 135 ABS_2: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|1] "" XXX From f4b1061ae03994013809dc4a03ac571bfeda5714 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Sat, 20 Jan 2024 21:54:48 -0800 Subject: [PATCH 2/3] chrysler: more signals (#1001) * chrysler: more signals * make checksums and counters big endian * remove duplicate message * remove duplicate message --- chrysler_pacifica_2017_hybrid_generated.dbc | 49 ++++++++++++++----- chrysler_ram_dt_generated.dbc | 41 +++++++++++++++- chrysler_ram_hd_generated.dbc | 38 ++++++++++++++ generator/chrysler/_stellantis_common.dbc | 38 ++++++++++++++ generator/chrysler/_stellantis_common_ram.py | 3 ++ .../chrysler_pacifica_2017_hybrid.dbc | 11 ----- generator/chrysler/chrysler_ram_dt.dbc | 3 +- 7 files changed, 159 insertions(+), 24 deletions(-) diff --git a/chrysler_pacifica_2017_hybrid_generated.dbc b/chrysler_pacifica_2017_hybrid_generated.dbc index 2573fb1341..d8f4c6623e 100644 --- a/chrysler_pacifica_2017_hybrid_generated.dbc +++ b/chrysler_pacifica_2017_hybrid_generated.dbc @@ -28,15 +28,41 @@ BO_ 284 ESP_8: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 288 ECM_2: 7 XXX + SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_ENABLE : 6|1@1+ (1,0) [0|0] "" XXX + SG_ TCM_TORQUE_REQ_ENABLE : 7|1@1+ (1,0) [0|0] "" XXX + SG_ Accelerator_Position : 16|8@1+ (0.4,0) [0|100] "%" XXX + SG_ CRUISE_OVERRIDE : 31|1@1+ (1,0) [0|0] "" XXX + SG_ COUNTER : 47|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 55|8@0+ (1,0) [0|0] "" XXX + BO_ 320 ESP_1: 8 XXX + SG_ Brake_State : 0|2@1+ (1,0) [0|0] "" XXX SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" XXX SG_ ACC_Engaged : 15|1@0+ (1,0) [0|1] "" XXX SG_ ACC_Enabled : 23|1@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 33|10@0+ (0.5,0) [0|511] "km/h" XXX + SG_ ACC_OFF_REQ : 39|2@0+ (1,0) [0|0] "" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX SG_ BRAKE_PRESSED_ACC : 6|1@0+ (1,0) [0|3] "" XXX +BO_ 268 ESP_2: 8 ESC + SG_ ESC_TORQUE_REQ : 4|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX + SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_MAX : 6|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_MIN : 7|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_TORQUE_REQ : 20|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX + SG_ TCS_ACTIVE : 21|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_TORQUE_REQ_MAX : 22|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_BRK_PREP : 40|1@1+ (1,0) [0|0] "" XXX + SG_ DISABLE_FUEL_SHUTOFF : 47|1@1+ (1,0) [0|0] "" XXX + SG_ DAS_REQ_ACTIVE : 48|3@1+ (1,0) [0|0] "" XXX + SG_ COLLISION_BRK_PREP : 51|1@1+ (1,0) [0|0] "" XXX + SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX + BO_ 344 ESP_6: 8 XXX SG_ WHEEL_SPEED_FL : 5|14@0+ (0.5,0) [0|8191] "rpm" XXX SG_ WHEEL_SPEED_FR : 21|14@0+ (0.5,0) [0|8191] "rpm" XXX @@ -75,7 +101,11 @@ BO_ 501 DAS_4: 8 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 + SG_ FCW_OFF : 25|2@0+ (1,0) [0|3] "" XXX + SG_ FCW_ERROR : 27|2@0+ (1,0) [0|3] "" XXX SG_ FCW_BRAKE_ENABLED : 29|1@0+ (1,0) [0|1] "" XXX + SG_ FCW_BRAKE_DISABLED : 47|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_FAULTED : 50|1@0+ (1,0) [0|1] "" XXX BO_ 544 EPS_2: 8 XXX SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX @@ -115,6 +145,11 @@ BO_ 625 DAS_5: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 669 EPB_1: 3 XXX + SG_ PARKING_BRAKE_STATUS : 11|3@0+ (1,0) [0|7] "" XXX + SG_ COUNTER : 15|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 23|8@0+ (1,0) [0|255] "" XXX + BO_ 678 DAS_6: 8 XXX SG_ LKAS_ICON_COLOR : 1|2@0+ (1,0) [0|3] "" XXX SG_ LKAS_LANE_LINES : 19|4@0+ (1,0) [0|1] "" XXX @@ -137,11 +172,14 @@ BO_ 820 BCM_1: 8 XXX SG_ DOOR_OPEN_RL : 19|1@0+ (1,0) [0|1] "" XXX SG_ DOOR_OPEN_RR : 20|1@0+ (1,0) [0|1] "" XXX SG_ DOOR_OPEN_TRUNK : 22|1@0+ (1,0) [0|1] "" XXX + SG_ PARKING_BRAKE_SWITCH : 23|1@0+ (1,0) [0|1] "" XXX SG_ TURN_LIGHT_LEFT : 31|1@0+ (1,0) [0|1] "" XXX SG_ TURN_LIGHT_RIGHT : 30|1@0+ (1,0) [0|1] "" XXX SG_ HIGH_BEAM_DISPLAY : 58|1@0+ (1,0) [0|1] "" XXX +VAL_ 320 ACC_OFF_REQ 2 "PERMANENT" 1 "TEMPORARY" 0 "NONE" VAL_ 368 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ; +VAL_ 669 PARKING_BRAKE_STATUS 3 "RELEASING" 2 "APPLYING" 1 "APPLIED" 0 "OFF" ; CM_ SG_ 258 STEERING_ANGLE_HP "Steering angle high precision"; CM_ SG_ 264 ENGINE_TORQUE "Effective engine torque"; @@ -222,12 +260,6 @@ BO_ 608 PARKSENSE_SIGNAL: 8 XXX BO_ 729 LKAS_HEARTBIT: 5 XXX SG_ LKAS_STATUS_OK : 31|16@0+ (1,0) [0|65535] "" XXX -BO_ 288 ACCEL_RELATED_120: 7 XXX - SG_ COUNTER : 47|4@0+ (1,0) [0|15] "" XXX - SG_ CHECKSUM : 55|8@0+ (1,0) [0|255] "" XXX - SG_ ACCEL : 23|8@0+ (1,0) [0|255] "" XXX - SG_ GAS_ENGINE_RPM_MAYBE : 31|16@0+ (1,0) [0|65535] "" XXX - BO_ 257 ACCEL_RELATED_101: 5 XXX SG_ ENERGY_OR_RPM : 31|8@0+ (1,0) [0|255] "" XXX @@ -291,11 +323,6 @@ BO_ 324 SPEED_2: 8 XXX BO_ 832 UNKNOWN_340: 8 XXX SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX -BO_ 268 ACC_10c: 8 XXX - SG_ BRAKE_PERHAPS : 48|1@0+ (1,0) [0|3] "" XXX - SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX - CM_ SG_ 653 BRAKE_PRESSURE "max seems to be 148"; CM_ SG_ 746 PRNDL "5=L, 4=D, 3=N, 2=R, 1=P"; CM_ SG_ 320 BRAKE_PRESSED_2 "Value is 5 when brake is pressed by human, 1 when ACC brake"; diff --git a/chrysler_ram_dt_generated.dbc b/chrysler_ram_dt_generated.dbc index 8b2fbcbae3..b502c15bee 100644 --- a/chrysler_ram_dt_generated.dbc +++ b/chrysler_ram_dt_generated.dbc @@ -30,15 +30,41 @@ BO_ 121 ESP_8: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 123 ECM_2: 7 XXX + SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_ENABLE : 6|1@1+ (1,0) [0|0] "" XXX + SG_ TCM_TORQUE_REQ_ENABLE : 7|1@1+ (1,0) [0|0] "" XXX + SG_ Accelerator_Position : 16|8@1+ (0.4,0) [0|100] "%" XXX + SG_ CRUISE_OVERRIDE : 31|1@1+ (1,0) [0|0] "" XXX + SG_ COUNTER : 47|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 55|8@0+ (1,0) [0|0] "" XXX + BO_ 131 ESP_1: 8 XXX + SG_ Brake_State : 0|2@1+ (1,0) [0|0] "" XXX SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" XXX SG_ ACC_Engaged : 15|1@0+ (1,0) [0|1] "" XXX SG_ ACC_Enabled : 23|1@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 33|10@0+ (0.5,0) [0|511] "km/h" XXX + SG_ ACC_OFF_REQ : 39|2@0+ (1,0) [0|0] "" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX SG_ BRAKE_PRESSED_ACC : 6|1@0+ (1,0) [0|3] "" XXX +BO_ 113 ESP_2: 8 ESC + SG_ ESC_TORQUE_REQ : 4|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX + SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_MAX : 6|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_MIN : 7|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_TORQUE_REQ : 20|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX + SG_ TCS_ACTIVE : 21|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_TORQUE_REQ_MAX : 22|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_BRK_PREP : 40|1@1+ (1,0) [0|0] "" XXX + SG_ DISABLE_FUEL_SHUTOFF : 47|1@1+ (1,0) [0|0] "" XXX + SG_ DAS_REQ_ACTIVE : 48|3@1+ (1,0) [0|0] "" XXX + SG_ COLLISION_BRK_PREP : 51|1@1+ (1,0) [0|0] "" XXX + SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX + BO_ 139 ESP_6: 8 XXX SG_ WHEEL_SPEED_FL : 5|14@0+ (0.5,0) [0|8191] "rpm" XXX SG_ WHEEL_SPEED_FR : 21|14@0+ (0.5,0) [0|8191] "rpm" XXX @@ -77,7 +103,11 @@ BO_ 232 DAS_4: 8 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 + SG_ FCW_OFF : 25|2@0+ (1,0) [0|3] "" XXX + SG_ FCW_ERROR : 27|2@0+ (1,0) [0|3] "" XXX SG_ FCW_BRAKE_ENABLED : 29|1@0+ (1,0) [0|1] "" XXX + SG_ FCW_BRAKE_DISABLED : 47|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_FAULTED : 50|1@0+ (1,0) [0|1] "" XXX BO_ 49 EPS_2: 8 XXX SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX @@ -117,6 +147,11 @@ BO_ 163 DAS_5: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 213 EPB_1: 3 XXX + SG_ PARKING_BRAKE_STATUS : 11|3@0+ (1,0) [0|7] "" XXX + SG_ COUNTER : 15|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 23|8@0+ (1,0) [0|255] "" XXX + BO_ 250 DAS_6: 8 XXX SG_ LKAS_ICON_COLOR : 1|2@0+ (1,0) [0|3] "" XXX SG_ LKAS_LANE_LINES : 19|4@0+ (1,0) [0|1] "" XXX @@ -139,11 +174,14 @@ BO_ 657 BCM_1: 8 XXX SG_ DOOR_OPEN_RL : 19|1@0+ (1,0) [0|1] "" XXX SG_ DOOR_OPEN_RR : 20|1@0+ (1,0) [0|1] "" XXX SG_ DOOR_OPEN_TRUNK : 22|1@0+ (1,0) [0|1] "" XXX + SG_ PARKING_BRAKE_SWITCH : 23|1@0+ (1,0) [0|1] "" XXX SG_ TURN_LIGHT_LEFT : 31|1@0+ (1,0) [0|1] "" XXX SG_ TURN_LIGHT_RIGHT : 30|1@0+ (1,0) [0|1] "" XXX SG_ HIGH_BEAM_DISPLAY : 58|1@0+ (1,0) [0|1] "" XXX +VAL_ 131 ACC_OFF_REQ 2 "PERMANENT" 1 "TEMPORARY" 0 "NONE" VAL_ 147 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ; +VAL_ 213 PARKING_BRAKE_STATUS 3 "RELEASING" 2 "APPLYING" 1 "APPLIED" 0 "OFF" ; CM_ SG_ 258 STEERING_ANGLE_HP "Steering angle high precision"; CM_ SG_ 264 ENGINE_TORQUE "Effective engine torque"; @@ -167,7 +205,8 @@ BO_ 133 TCM_1: 8 XXX SG_ TC_LOCKED : 17|1@1+ (1,0) [0|0] "" XXX SG_ OUTPUT_SPEED : 31|16@0+ (1,0) [0|65534] "rpm" XXX SG_ INPUT_SPEED : 47|16@0+ (1,0) [0|65534] "rpm" XXX - SG_ RATIO : 11|4@0+ (1,0) [0|15] "" XXX + SG_ OUTPUT_SPEED_SIGN : 57|2@0+ (1,0) [0|3] "" XXX + SG_ COUNTER : 61|4@0+ (1,0) [0|15] "" XXX BO_ 135 ABS_2: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|1] "" XXX diff --git a/chrysler_ram_hd_generated.dbc b/chrysler_ram_hd_generated.dbc index 6394741209..697c3bf912 100644 --- a/chrysler_ram_hd_generated.dbc +++ b/chrysler_ram_hd_generated.dbc @@ -30,15 +30,41 @@ BO_ 284 ESP_8: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 288 ECM_2: 7 XXX + SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_ENABLE : 6|1@1+ (1,0) [0|0] "" XXX + SG_ TCM_TORQUE_REQ_ENABLE : 7|1@1+ (1,0) [0|0] "" XXX + SG_ Accelerator_Position : 16|8@1+ (0.4,0) [0|100] "%" XXX + SG_ CRUISE_OVERRIDE : 31|1@1+ (1,0) [0|0] "" XXX + SG_ COUNTER : 47|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 55|8@0+ (1,0) [0|0] "" XXX + BO_ 320 ESP_1: 8 XXX + SG_ Brake_State : 0|2@1+ (1,0) [0|0] "" XXX SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" XXX SG_ ACC_Engaged : 15|1@0+ (1,0) [0|1] "" XXX SG_ ACC_Enabled : 23|1@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 33|10@0+ (0.5,0) [0|511] "km/h" XXX + SG_ ACC_OFF_REQ : 39|2@0+ (1,0) [0|0] "" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX SG_ BRAKE_PRESSED_ACC : 6|1@0+ (1,0) [0|3] "" XXX +BO_ 268 ESP_2: 8 ESC + SG_ ESC_TORQUE_REQ : 4|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX + SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_MAX : 6|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_MIN : 7|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_TORQUE_REQ : 20|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX + SG_ TCS_ACTIVE : 21|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_TORQUE_REQ_MAX : 22|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_BRK_PREP : 40|1@1+ (1,0) [0|0] "" XXX + SG_ DISABLE_FUEL_SHUTOFF : 47|1@1+ (1,0) [0|0] "" XXX + SG_ DAS_REQ_ACTIVE : 48|3@1+ (1,0) [0|0] "" XXX + SG_ COLLISION_BRK_PREP : 51|1@1+ (1,0) [0|0] "" XXX + SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX + BO_ 344 ESP_6: 8 XXX SG_ WHEEL_SPEED_FL : 5|14@0+ (0.5,0) [0|8191] "rpm" XXX SG_ WHEEL_SPEED_FR : 21|14@0+ (0.5,0) [0|8191] "rpm" XXX @@ -77,7 +103,11 @@ BO_ 501 DAS_4: 8 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 + SG_ FCW_OFF : 25|2@0+ (1,0) [0|3] "" XXX + SG_ FCW_ERROR : 27|2@0+ (1,0) [0|3] "" XXX SG_ FCW_BRAKE_ENABLED : 29|1@0+ (1,0) [0|1] "" XXX + SG_ FCW_BRAKE_DISABLED : 47|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_FAULTED : 50|1@0+ (1,0) [0|1] "" XXX BO_ 544 EPS_2: 8 XXX SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX @@ -117,6 +147,11 @@ BO_ 625 DAS_5: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 669 EPB_1: 3 XXX + SG_ PARKING_BRAKE_STATUS : 11|3@0+ (1,0) [0|7] "" XXX + SG_ COUNTER : 15|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 23|8@0+ (1,0) [0|255] "" XXX + BO_ 629 DAS_6: 8 XXX SG_ LKAS_ICON_COLOR : 1|2@0+ (1,0) [0|3] "" XXX SG_ LKAS_LANE_LINES : 19|4@0+ (1,0) [0|1] "" XXX @@ -139,11 +174,14 @@ BO_ 820 BCM_1: 8 XXX SG_ DOOR_OPEN_RL : 19|1@0+ (1,0) [0|1] "" XXX SG_ DOOR_OPEN_RR : 20|1@0+ (1,0) [0|1] "" XXX SG_ DOOR_OPEN_TRUNK : 22|1@0+ (1,0) [0|1] "" XXX + SG_ PARKING_BRAKE_SWITCH : 23|1@0+ (1,0) [0|1] "" XXX SG_ TURN_LIGHT_LEFT : 31|1@0+ (1,0) [0|1] "" XXX SG_ TURN_LIGHT_RIGHT : 30|1@0+ (1,0) [0|1] "" XXX SG_ HIGH_BEAM_DISPLAY : 58|1@0+ (1,0) [0|1] "" XXX +VAL_ 320 ACC_OFF_REQ 2 "PERMANENT" 1 "TEMPORARY" 0 "NONE" VAL_ 368 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ; +VAL_ 669 PARKING_BRAKE_STATUS 3 "RELEASING" 2 "APPLYING" 1 "APPLIED" 0 "OFF" ; CM_ SG_ 258 STEERING_ANGLE_HP "Steering angle high precision"; CM_ SG_ 264 ENGINE_TORQUE "Effective engine torque"; diff --git a/generator/chrysler/_stellantis_common.dbc b/generator/chrysler/_stellantis_common.dbc index 10c7040875..df913561de 100644 --- a/generator/chrysler/_stellantis_common.dbc +++ b/generator/chrysler/_stellantis_common.dbc @@ -24,15 +24,41 @@ BO_ 284 ESP_8: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 288 ECM_2: 7 XXX + SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_ENABLE : 6|1@1+ (1,0) [0|0] "" XXX + SG_ TCM_TORQUE_REQ_ENABLE : 7|1@1+ (1,0) [0|0] "" XXX + SG_ Accelerator_Position : 16|8@1+ (0.4,0) [0|100] "%" XXX + SG_ CRUISE_OVERRIDE : 31|1@1+ (1,0) [0|0] "" XXX + SG_ COUNTER : 47|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 55|8@0+ (1,0) [0|0] "" XXX + BO_ 320 ESP_1: 8 XXX + SG_ Brake_State : 0|2@1+ (1,0) [0|0] "" XXX SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" XXX SG_ ACC_Engaged : 15|1@0+ (1,0) [0|1] "" XXX SG_ ACC_Enabled : 23|1@0+ (1,0) [0|1] "" XXX SG_ Vehicle_Speed : 33|10@0+ (0.5,0) [0|511] "km/h" XXX + SG_ ACC_OFF_REQ : 39|2@0+ (1,0) [0|0] "" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX SG_ BRAKE_PRESSED_ACC : 6|1@0+ (1,0) [0|3] "" XXX +BO_ 268 ESP_2: 8 ESC + SG_ ESC_TORQUE_REQ : 4|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX + SG_ ACC_TORQUE_REQ_ENABLE : 5|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_MAX : 6|1@1+ (1,0) [0|0] "" XXX + SG_ ESC_TORQUE_REQ_MIN : 7|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_TORQUE_REQ : 20|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX + SG_ TCS_ACTIVE : 21|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_TORQUE_REQ_MAX : 22|1@1+ (1,0) [0|0] "" XXX + SG_ ACC_BRK_PREP : 40|1@1+ (1,0) [0|0] "" XXX + SG_ DISABLE_FUEL_SHUTOFF : 47|1@1+ (1,0) [0|0] "" XXX + SG_ DAS_REQ_ACTIVE : 48|3@1+ (1,0) [0|0] "" XXX + SG_ COLLISION_BRK_PREP : 51|1@1+ (1,0) [0|0] "" XXX + SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX + BO_ 344 ESP_6: 8 XXX SG_ WHEEL_SPEED_FL : 5|14@0+ (0.5,0) [0|8191] "rpm" XXX SG_ WHEEL_SPEED_FR : 21|14@0+ (0.5,0) [0|8191] "rpm" XXX @@ -71,7 +97,11 @@ BO_ 501 DAS_4: 8 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 + SG_ FCW_OFF : 25|2@0+ (1,0) [0|3] "" XXX + SG_ FCW_ERROR : 27|2@0+ (1,0) [0|3] "" XXX SG_ FCW_BRAKE_ENABLED : 29|1@0+ (1,0) [0|1] "" XXX + SG_ FCW_BRAKE_DISABLED : 47|1@0+ (1,0) [0|1] "" XXX + SG_ ACC_FAULTED : 50|1@0+ (1,0) [0|1] "" XXX BO_ 544 EPS_2: 8 XXX SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX @@ -111,6 +141,11 @@ BO_ 625 DAS_5: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 669 EPB_1: 3 XXX + SG_ PARKING_BRAKE_STATUS : 11|3@0+ (1,0) [0|7] "" XXX + SG_ COUNTER : 15|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 23|8@0+ (1,0) [0|255] "" XXX + BO_ 678 DAS_6: 8 XXX SG_ LKAS_ICON_COLOR : 1|2@0+ (1,0) [0|3] "" XXX SG_ LKAS_LANE_LINES : 19|4@0+ (1,0) [0|1] "" XXX @@ -133,11 +168,14 @@ BO_ 820 BCM_1: 8 XXX SG_ DOOR_OPEN_RL : 19|1@0+ (1,0) [0|1] "" XXX SG_ DOOR_OPEN_RR : 20|1@0+ (1,0) [0|1] "" XXX SG_ DOOR_OPEN_TRUNK : 22|1@0+ (1,0) [0|1] "" XXX + SG_ PARKING_BRAKE_SWITCH : 23|1@0+ (1,0) [0|1] "" XXX SG_ TURN_LIGHT_LEFT : 31|1@0+ (1,0) [0|1] "" XXX SG_ TURN_LIGHT_RIGHT : 30|1@0+ (1,0) [0|1] "" XXX SG_ HIGH_BEAM_DISPLAY : 58|1@0+ (1,0) [0|1] "" XXX +VAL_ 320 ACC_OFF_REQ 2 "PERMANENT" 1 "TEMPORARY" 0 "NONE" VAL_ 368 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ; +VAL_ 669 PARKING_BRAKE_STATUS 3 "RELEASING" 2 "APPLYING" 1 "APPLIED" 0 "OFF" ; CM_ SG_ 258 STEERING_ANGLE_HP "Steering angle high precision"; CM_ SG_ 264 ENGINE_TORQUE "Effective engine torque"; diff --git a/generator/chrysler/_stellantis_common_ram.py b/generator/chrysler/_stellantis_common_ram.py index 5481e7ddca..fa408f1315 100755 --- a/generator/chrysler/_stellantis_common_ram.py +++ b/generator/chrysler/_stellantis_common_ram.py @@ -5,8 +5,10 @@ "_stellantis_common_ram_dt_generated.dbc": { 258: 35, 264: 37, + 268: 113, 280: 181, 284: 121, + 288: 123, 320: 131, 344: 139, 368: 147, @@ -17,6 +19,7 @@ 571: 177, 559: 157, 625: 163, + 669: 213, 678: 250, 720: 720, 792: 792, diff --git a/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc b/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc index ce1063f372..3f4b373843 100644 --- a/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc +++ b/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc @@ -70,12 +70,6 @@ BO_ 608 PARKSENSE_SIGNAL: 8 XXX BO_ 729 LKAS_HEARTBIT: 5 XXX SG_ LKAS_STATUS_OK : 31|16@0+ (1,0) [0|65535] "" XXX -BO_ 288 ACCEL_RELATED_120: 7 XXX - SG_ COUNTER : 47|4@0+ (1,0) [0|15] "" XXX - SG_ CHECKSUM : 55|8@0+ (1,0) [0|255] "" XXX - SG_ ACCEL : 23|8@0+ (1,0) [0|255] "" XXX - SG_ GAS_ENGINE_RPM_MAYBE : 31|16@0+ (1,0) [0|65535] "" XXX - BO_ 257 ACCEL_RELATED_101: 5 XXX SG_ ENERGY_OR_RPM : 31|8@0+ (1,0) [0|255] "" XXX @@ -139,11 +133,6 @@ BO_ 324 SPEED_2: 8 XXX BO_ 832 UNKNOWN_340: 8 XXX SG_ SPEED_DIGITAL : 63|8@0+ (1,0) [0|255] "mph" XXX -BO_ 268 ACC_10c: 8 XXX - SG_ BRAKE_PERHAPS : 48|1@0+ (1,0) [0|3] "" XXX - SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX - CM_ SG_ 653 BRAKE_PRESSURE "max seems to be 148"; CM_ SG_ 746 PRNDL "5=L, 4=D, 3=N, 2=R, 1=P"; CM_ SG_ 320 BRAKE_PRESSED_2 "Value is 5 when brake is pressed by human, 1 when ACC brake"; diff --git a/generator/chrysler/chrysler_ram_dt.dbc b/generator/chrysler/chrysler_ram_dt.dbc index b24eb0ae98..c9be635e10 100644 --- a/generator/chrysler/chrysler_ram_dt.dbc +++ b/generator/chrysler/chrysler_ram_dt.dbc @@ -13,7 +13,8 @@ BO_ 133 TCM_1: 8 XXX SG_ TC_LOCKED : 17|1@1+ (1,0) [0|0] "" XXX SG_ OUTPUT_SPEED : 31|16@0+ (1,0) [0|65534] "rpm" XXX SG_ INPUT_SPEED : 47|16@0+ (1,0) [0|65534] "rpm" XXX - SG_ RATIO : 11|4@0+ (1,0) [0|15] "" XXX + SG_ OUTPUT_SPEED_SIGN : 57|2@0+ (1,0) [0|3] "" XXX + SG_ COUNTER : 61|4@0+ (1,0) [0|15] "" XXX BO_ 135 ABS_2: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|1] "" XXX From 3cfd0bf4eb73953f3d179dddc1ba2c92e317188c Mon Sep 17 00:00:00 2001 From: garrettpall <76917194+garrettpall@users.noreply.github.com> Date: Tue, 23 Jan 2024 05:24:19 -0500 Subject: [PATCH 3/3] GM: Add BSM signal on powertrain bus (#993) * Add GM BSM * Apply suggestions from code review Co-authored-by: Shane Smiskol * Update Generated * Add note * gen --------- Co-authored-by: Shane Smiskol --- generator/gm/gm_global_a_powertrain.dbc | 6 ++++++ gm_global_a_powertrain_generated.dbc | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/generator/gm/gm_global_a_powertrain.dbc b/generator/gm/gm_global_a_powertrain.dbc index fbe0bd397d..1b073fdcc8 100644 --- a/generator/gm/gm_global_a_powertrain.dbc +++ b/generator/gm/gm_global_a_powertrain.dbc @@ -105,6 +105,10 @@ BO_ 320 BCMTurnSignals: 3 K9_BCM SG_ HighBeamsActive : 7|1@0+ (1,0) [0|1] "" XXX SG_ HighBeamsTemporary : 5|1@0+ (1,0) [0|1] "" XXX +BO_ 322 BCMBlindSpotMonitor: 7 K9_BCM + SG_ LeftBSM : 6|1@0+ (1,0) [0|1] "" XXX + SG_ RightBSM : 7|1@0+ (1,0) [0|1] "" XXX + BO_ 328 PSCM_148: 1 K43_PSCM BO_ 381 ESPStatus: 6 K20_ECM @@ -297,6 +301,8 @@ CM_ BU_ K124_ASCM "Active Safety Control Module"; CM_ SG_ 381 MSG17D_AccPower "Need to investigate"; CM_ BO_ 190 "Length varies from 6 to 8 bytes by car"; CM_ SG_ 190 GasPedalAndAcc "ACC baseline is 62"; +CM_ SG_ 322 LeftBSM "For some cars, this can only be when the blinker is also active"; +CM_ SG_ 322 RightBSM "For some cars, this can only be when the blinker is also active"; CM_ SG_ 352 ImmobilizerInfo "Non-zero when ignition or accessory mode"; CM_ SG_ 451 GasPedalAndAcc2 "ACC baseline is 62"; CM_ SG_ 481 ACCAlwaysOne "Usually 1 if the car is equipped with ACC"; diff --git a/gm_global_a_powertrain_generated.dbc b/gm_global_a_powertrain_generated.dbc index 6ecb36f2fa..90ef830100 100644 --- a/gm_global_a_powertrain_generated.dbc +++ b/gm_global_a_powertrain_generated.dbc @@ -125,6 +125,10 @@ BO_ 320 BCMTurnSignals: 3 K9_BCM SG_ HighBeamsActive : 7|1@0+ (1,0) [0|1] "" XXX SG_ HighBeamsTemporary : 5|1@0+ (1,0) [0|1] "" XXX +BO_ 322 BCMBlindSpotMonitor: 7 K9_BCM + SG_ LeftBSM : 6|1@0+ (1,0) [0|1] "" XXX + SG_ RightBSM : 7|1@0+ (1,0) [0|1] "" XXX + BO_ 328 PSCM_148: 1 K43_PSCM BO_ 381 ESPStatus: 6 K20_ECM @@ -317,6 +321,8 @@ CM_ BU_ K124_ASCM "Active Safety Control Module"; CM_ SG_ 381 MSG17D_AccPower "Need to investigate"; CM_ BO_ 190 "Length varies from 6 to 8 bytes by car"; CM_ SG_ 190 GasPedalAndAcc "ACC baseline is 62"; +CM_ SG_ 322 LeftBSM "For some cars, this can only be when the blinker is also active"; +CM_ SG_ 322 RightBSM "For some cars, this can only be when the blinker is also active"; CM_ SG_ 352 ImmobilizerInfo "Non-zero when ignition or accessory mode"; CM_ SG_ 451 GasPedalAndAcc2 "ACC baseline is 62"; CM_ SG_ 481 ACCAlwaysOne "Usually 1 if the car is equipped with ACC";