From 5e2a82026842a7082e5e81e5823dab6b6616dbf4 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 16 Jun 2022 20:18:28 -0700 Subject: [PATCH 1/2] Chrysler: use universal gas and brake signals (#641) * Chrysler_Update * Only gas&brake changes * this replaces that Co-authored-by: Jonathan --- chrysler_pacifica_2017_hybrid.dbc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/chrysler_pacifica_2017_hybrid.dbc b/chrysler_pacifica_2017_hybrid.dbc index f8a0538925..fc71c47218 100644 --- a/chrysler_pacifica_2017_hybrid.dbc +++ b/chrysler_pacifica_2017_hybrid.dbc @@ -73,11 +73,11 @@ BO_ 284 BRAKE_1: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 320 BRAKE_2: 8 XXX - SG_ SPEED_RELATED_2 : 47|8@0+ (1,0) [0|63] "" XXX +BO_ 320 ESP_1: 8 XXX + SG_ Brake_Pedal_State : 2|2@1+ (1,0) [0|0] "" 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 - SG_ BRAKE_PRESSED_2 : 2|3@0+ (1,0) [0|7] "" XXX SG_ BRAKE_PRESSED_ACC : 6|1@0+ (1,0) [0|3] "" XXX BO_ 736 TRIP: 8 XXX @@ -112,6 +112,11 @@ BO_ 544 EPS_STATUS: 8 XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX +BO_ 559 ECM_5: 8 XXX + SG_ Accelerator_Position : 0|8@1+ (0.4,0) [0|100] "%" XXX + SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + BO_ 658 LKAS_COMMAND: 6 XXX SG_ COUNTER : 39|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 47|8@0+ (1,0) [0|255] "" XXX @@ -267,11 +272,6 @@ BO_ 532 ENERGY_RELATED_214: 8 XXX SG_ NOISY_SLOWLY_DECREASING : 16|9@0+ (1,0) [0|255] "" XXX SG_ ENERGY_RELATED : 0|9@0+ (1,0) [0|255] "" XXX -BO_ 559 ACCEL_GAS_22F: 8 XXX - SG_ ACCEL_22F : 3|4@0+ (1,0) [0|255] "" XXX - SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX - BO_ 655 CHARGING_MAYBE_28F: 8 XXX SG_ CHARGING : 1|2@0+ (1,0) [0|3] "" XXX From 57c8340a180dd8c75139b18050eb17c72c9cb6e4 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 18 Jun 2022 16:59:31 -0700 Subject: [PATCH 2/2] Chrysler: some unified signal names/definitions (#642) * RamInit * Only do some * only chrysler * steering looks good * Let's verify this in another PR, big change * don't regress max values * fix comments * max val Co-authored-by: Jonathan --- chrysler_pacifica_2017_hybrid.dbc | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/chrysler_pacifica_2017_hybrid.dbc b/chrysler_pacifica_2017_hybrid.dbc index fc71c47218..7ff0f010f0 100644 --- a/chrysler_pacifica_2017_hybrid.dbc +++ b/chrysler_pacifica_2017_hybrid.dbc @@ -37,11 +37,11 @@ BU_: XXX BO_ 258 STEERING: 8 XXX - SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX SG_ UNKNOWN_STEERING : 50|3@0+ (1,0) [0|15] "" XXX SG_ STEERING_RATE : 20|13@0+ (0.3187251,-1305.498) [0|8191] "deg/s" XXX SG_ STEER_ANGLE : 4|13@0+ (0.3187251,-1307.888) [-360|360] "deg" XXX + SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX BO_ 514 SPEED_1: 8 XXX SG_ SPEED_LEFT : 7|12@0+ (0.071028,0) [0|65535] "m/s" XXX @@ -51,12 +51,12 @@ BO_ 653 BRAKE_MODULE: 2 XXX SG_ BRAKE_PRESSURE : 15|8@0+ (1,0) [0|255] "" XXX SG_ BRAKE_PRESSED : 4|1@0+ (1,0) [0|4] "" XXX -BO_ 820 DOORS: 8 XXX - SG_ DOOR_OPEN_FR : 18|1@0+ (1,0) [0|1] "" 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 +BO_ 820 BCM_1: 8 XXX + SG_ Driver_Door_Ajar : 17|1@1+ (1,0) [0|1] "" XXX + SG_ Passenger_Door_Ajar : 18|1@1+ (1,0) [0|1] "" XXX + SG_ Left_Rear_Door_Ajar : 19|1@1+ (1,0) [0|1] "" XXX + SG_ Right_Rear_Door_Ajar : 20|1@1+ (1,0) [0|1] "" XXX SG_ DOOR_OPEN_TRUNK : 22|1@0+ (1,0) [0|1] "" XXX - SG_ DOOR_OPEN_FL : 17|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 @@ -331,12 +331,15 @@ BO_ 941 NEW_MSG_3ad: 8 XXX SG_ INCREASING_1 : 36|5@0+ (1,0) [0|31] "" XXX SG_ INCREASING_2 : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 500 ACC_2: 8 XXX - SG_ ACC_STATUS_1 : 7|3@0+ (1,0) [0|255] "" XXX +BO_ 500 DAS_3: 8 XXX + SG_ Engine_Torque_Request : 4|13@0+ (0.25,-500) [-500|1547.5] "Nm" XXX + SG_ ACC_StandStill : 5|1@1+ (1,0) [0|1] "" XXX + SG_ Engine_Torque_Request_Max : 7|1@1+ (1,0) [0|1] "" XXX + SG_ ACC_Enabled : 20|1@1+ (1,0) [0|1] "" XXX + SG_ ACC_Engaged : 21|1@1+ (1,0) [0|1] "" XXX + SG_ ACC_Faulted : 47|1@0+ (1,0) [0|1] "" XXX SG_ BRAKE_MAYBE : 18|11@0+ (1,0) [0|255] "" XXX - SG_ ACC_STATUS_2 : 21|3@0+ (1,0) [0|255] "" XXX SG_ BRAKE_BOOL_1 : 36|1@0+ (1,0) [0|3] "" XXX - SG_ ACC_FAULTED : 47|1@0+ (1,0) [0|1] "" XXX SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX @@ -420,9 +423,7 @@ CM_ SG_ 639 INCREASING "perhaps number of seconds divided by two for this drive" CM_ SG_ 848 INCREASING_LSB "lower part of time counter"; CM_ SG_ 848 INCREASING_MSB "upper part of time counter"; CM_ SG_ 908 INCREASING_MSB "time based"; -CM_ SG_ 500 ACC_STATUS_1 "2 briefly (9 packets) when ACC goes to green, 1 help when ACC coming to a stop and at a stop"; CM_ SG_ 500 BRAKE_MAYBE "2046 in non-ACC and non-decel. Signal on deceleration. 818 for already stopped break."; -CM_ SG_ 500 ACC_STATUS_2 "set to 1 when ACC not available, 3 when ACC available (white icon), and 7 when ACC active (green icon)"; CM_ SG_ 500 BRAKE_BOOL_1 "set to 1 when ACC decel. 0 on non-ACC and accel."; CM_ SG_ 501 CRUISE_STATE "may just be an icon, but seems to indicate different cruise modes: ACC and Non-ACC and engaged state for both."; CM_ SG_ 625 SPEED "zero on non-acc drives";