diff --git a/chrysler_pacifica_2017_hybrid_generated.dbc b/chrysler_pacifica_2017_hybrid_generated.dbc index 3036bc7284..4348569f39 100644 --- a/chrysler_pacifica_2017_hybrid_generated.dbc +++ b/chrysler_pacifica_2017_hybrid_generated.dbc @@ -63,7 +63,6 @@ BO_ 500 DAS_3: 8 XXX SG_ ACC_FAULTED : 47|1@0+ (1,0) [0|1] "" XXX SG_ COLLISION_BRK_PREP : 48|1@1+ (1,0) [0|0] "" XXX SG_ ACC_BRK_PREP : 49|1@1+ (1,0) [0|0] "" XXX - SG_ BRAKE_BOOL_1 : 36|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 @@ -74,6 +73,7 @@ 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_BRAKE_ENABLED : 29|1@0+ (1,0) [0|1] "" XXX BO_ 544 EPS_2: 8 XXX SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX @@ -103,12 +103,23 @@ BO_ 571 CRUISE_BUTTONS: 3 XXX SG_ COUNTER : 15|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 23|8@0+ (1,0) [0|255] "" XXX +BO_ 625 DAS_5: 8 XXX + SG_ FCW_STATE : 2|1@1+ (1,0) [0|0] "" XXX + SG_ FCW_DISTANCE : 3|2@1+ (1,0) [0|0] "" XXX + SG_ ACCFCW_MESSAGE : 12|4@1+ (1,0) [0|0] "" XXX + SG_ SET_SPEED_KPH : 24|8@1+ (1,0) [0|250] "km/h" XXX + SG_ WHEEL_TORQUE_REQUEST : 38|15@0+ (1,-7767) [-7767|24999] "Nm" XXX + SG_ WHEEL_TORQUE_REQUEST_ACTIVE : 39|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|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 SG_ LKAS_ALERTS : 27|4@0+ (1,0) [0|1] "" XXX SG_ CAR_MODEL : 15|8@0+ (1,0) [0|255] "" XXX SG_ AUTO_HIGH_BEAM_ON : 47|1@1+ (1,0) [0|0] "" XXX + SG_ LKAS_DISABLED : 56|1@1+ (1,0) [0|0] "" XXX BO_ 720 BSM_1: 6 XXX SG_ RIGHT_STATUS : 5|1@0+ (1,0) [0|1] "" XXX @@ -278,12 +289,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_ 625 ACC_1: 8 XXX - SG_ SPEED : 31|8@0+ (1,0) [0|255] "km/h" XXX - SG_ ACCEL_PERHAPS : 39|16@0+ (1,0) [0|255] "" XXX - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX - SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" 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 diff --git a/chrysler_ram_dt_generated.dbc b/chrysler_ram_dt_generated.dbc index 2eb5aecf39..ff769b1a45 100644 --- a/chrysler_ram_dt_generated.dbc +++ b/chrysler_ram_dt_generated.dbc @@ -65,7 +65,6 @@ BO_ 153 DAS_3: 8 XXX SG_ ACC_FAULTED : 47|1@0+ (1,0) [0|1] "" XXX SG_ COLLISION_BRK_PREP : 48|1@1+ (1,0) [0|0] "" XXX SG_ ACC_BRK_PREP : 49|1@1+ (1,0) [0|0] "" XXX - SG_ BRAKE_BOOL_1 : 36|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 @@ -76,6 +75,7 @@ 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_BRAKE_ENABLED : 29|1@0+ (1,0) [0|1] "" XXX BO_ 49 EPS_2: 8 XXX SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX @@ -105,12 +105,23 @@ BO_ 177 CRUISE_BUTTONS: 3 XXX SG_ COUNTER : 15|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 23|8@0+ (1,0) [0|255] "" XXX +BO_ 163 DAS_5: 8 XXX + SG_ FCW_STATE : 2|1@1+ (1,0) [0|0] "" XXX + SG_ FCW_DISTANCE : 3|2@1+ (1,0) [0|0] "" XXX + SG_ ACCFCW_MESSAGE : 12|4@1+ (1,0) [0|0] "" XXX + SG_ SET_SPEED_KPH : 24|8@1+ (1,0) [0|250] "km/h" XXX + SG_ WHEEL_TORQUE_REQUEST : 38|15@0+ (1,-7767) [-7767|24999] "Nm" XXX + SG_ WHEEL_TORQUE_REQUEST_ACTIVE : 39|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|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 SG_ LKAS_ALERTS : 27|4@0+ (1,0) [0|1] "" XXX SG_ CAR_MODEL : 15|8@0+ (1,0) [0|255] "" XXX SG_ AUTO_HIGH_BEAM_ON : 47|1@1+ (1,0) [0|0] "" XXX + SG_ LKAS_DISABLED : 56|1@1+ (1,0) [0|0] "" XXX BO_ 720 BSM_1: 6 XXX SG_ RIGHT_STATUS : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/chrysler_ram_hd_generated.dbc b/chrysler_ram_hd_generated.dbc index 82cf0d3656..73882d8a26 100644 --- a/chrysler_ram_hd_generated.dbc +++ b/chrysler_ram_hd_generated.dbc @@ -65,7 +65,6 @@ BO_ 500 DAS_3: 8 XXX SG_ ACC_FAULTED : 47|1@0+ (1,0) [0|1] "" XXX SG_ COLLISION_BRK_PREP : 48|1@1+ (1,0) [0|0] "" XXX SG_ ACC_BRK_PREP : 49|1@1+ (1,0) [0|0] "" XXX - SG_ BRAKE_BOOL_1 : 36|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 @@ -76,6 +75,7 @@ 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_BRAKE_ENABLED : 29|1@0+ (1,0) [0|1] "" XXX BO_ 544 EPS_2: 8 XXX SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX @@ -105,12 +105,23 @@ BO_ 570 CRUISE_BUTTONS: 3 XXX SG_ COUNTER : 15|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 23|8@0+ (1,0) [0|255] "" XXX +BO_ 625 DAS_5: 8 XXX + SG_ FCW_STATE : 2|1@1+ (1,0) [0|0] "" XXX + SG_ FCW_DISTANCE : 3|2@1+ (1,0) [0|0] "" XXX + SG_ ACCFCW_MESSAGE : 12|4@1+ (1,0) [0|0] "" XXX + SG_ SET_SPEED_KPH : 24|8@1+ (1,0) [0|250] "km/h" XXX + SG_ WHEEL_TORQUE_REQUEST : 38|15@0+ (1,-7767) [-7767|24999] "Nm" XXX + SG_ WHEEL_TORQUE_REQUEST_ACTIVE : 39|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|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 SG_ LKAS_ALERTS : 27|4@0+ (1,0) [0|1] "" XXX SG_ CAR_MODEL : 15|8@0+ (1,0) [0|255] "" XXX SG_ AUTO_HIGH_BEAM_ON : 47|1@1+ (1,0) [0|0] "" XXX + SG_ LKAS_DISABLED : 56|1@1+ (1,0) [0|0] "" XXX BO_ 720 BSM_1: 6 XXX SG_ RIGHT_STATUS : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/generator/chrysler/_stellantis_common.dbc b/generator/chrysler/_stellantis_common.dbc index fbf0f91663..63e75a8842 100644 --- a/generator/chrysler/_stellantis_common.dbc +++ b/generator/chrysler/_stellantis_common.dbc @@ -59,7 +59,6 @@ BO_ 500 DAS_3: 8 XXX SG_ ACC_FAULTED : 47|1@0+ (1,0) [0|1] "" XXX SG_ COLLISION_BRK_PREP : 48|1@1+ (1,0) [0|0] "" XXX SG_ ACC_BRK_PREP : 49|1@1+ (1,0) [0|0] "" XXX - SG_ BRAKE_BOOL_1 : 36|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 @@ -70,6 +69,7 @@ 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_BRAKE_ENABLED : 29|1@0+ (1,0) [0|1] "" XXX BO_ 544 EPS_2: 8 XXX SG_ LKAS_STATE : 23|4@0+ (1,0) [0|15] "" XXX @@ -99,12 +99,23 @@ BO_ 571 CRUISE_BUTTONS: 3 XXX SG_ COUNTER : 15|4@0+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 23|8@0+ (1,0) [0|255] "" XXX +BO_ 625 DAS_5: 8 XXX + SG_ FCW_STATE : 2|1@1+ (1,0) [0|0] "" XXX + SG_ FCW_DISTANCE : 3|2@1+ (1,0) [0|0] "" XXX + SG_ ACCFCW_MESSAGE : 12|4@1+ (1,0) [0|0] "" XXX + SG_ SET_SPEED_KPH : 24|8@1+ (1,0) [0|250] "km/h" XXX + SG_ WHEEL_TORQUE_REQUEST : 38|15@0+ (1,-7767) [-7767|24999] "Nm" XXX + SG_ WHEEL_TORQUE_REQUEST_ACTIVE : 39|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|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 SG_ LKAS_ALERTS : 27|4@0+ (1,0) [0|1] "" XXX SG_ CAR_MODEL : 15|8@0+ (1,0) [0|255] "" XXX SG_ AUTO_HIGH_BEAM_ON : 47|1@1+ (1,0) [0|0] "" XXX + SG_ LKAS_DISABLED : 56|1@1+ (1,0) [0|0] "" XXX BO_ 720 BSM_1: 6 XXX SG_ RIGHT_STATUS : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/generator/chrysler/_stellantis_common_ram.py b/generator/chrysler/_stellantis_common_ram.py index 5072985ebc..5481e7ddca 100755 --- a/generator/chrysler/_stellantis_common_ram.py +++ b/generator/chrysler/_stellantis_common_ram.py @@ -16,6 +16,7 @@ 544: 49, 571: 177, 559: 157, + 625: 163, 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 2c6541d809..ce1063f372 100644 --- a/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc +++ b/generator/chrysler/chrysler_pacifica_2017_hybrid.dbc @@ -139,12 +139,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_ 625 ACC_1: 8 XXX - SG_ SPEED : 31|8@0+ (1,0) [0|255] "km/h" XXX - SG_ ACCEL_PERHAPS : 39|16@0+ (1,0) [0|255] "" XXX - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX - SG_ COUNTER : 55|4@0+ (1,0) [0|15] "" 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