From e0d7cdd695900ac5e54c25f57abd19355539cfe4 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 4 Aug 2022 22:51:44 -0700 Subject: [PATCH] move the val line too --- chrysler_pacifica_2017_hybrid_generated.dbc | 2 ++ chrysler_ram_dt_generated.dbc | 3 ++- chrysler_ram_hd_generated.dbc | 2 ++ generator/chrysler/_stellantis_common.dbc | 2 ++ generator/chrysler/_stellantis_common_ram.py | 2 +- generator/chrysler/chrysler_ram_dt.dbc | 1 - 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/chrysler_pacifica_2017_hybrid_generated.dbc b/chrysler_pacifica_2017_hybrid_generated.dbc index 01f6b70..a93ae1d 100644 --- a/chrysler_pacifica_2017_hybrid_generated.dbc +++ b/chrysler_pacifica_2017_hybrid_generated.dbc @@ -127,6 +127,8 @@ BO_ 820 BCM_1: 8 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_ 368 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ; + CM_ SG_ 258 STEERING_ANGLE_HP "Steering angle high precision"; CM_ SG_ 264 ENGINE_TORQUE "Effective engine torque"; CM_ SG_ 264 EXPECTED_ENGINE_TORQUE "Expected Engine Torque based on target engine speed"; diff --git a/chrysler_ram_dt_generated.dbc b/chrysler_ram_dt_generated.dbc index fa6bd91..0736a52 100644 --- a/chrysler_ram_dt_generated.dbc +++ b/chrysler_ram_dt_generated.dbc @@ -129,6 +129,8 @@ BO_ 657 BCM_1: 8 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_ 147 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ; + CM_ SG_ 258 STEERING_ANGLE_HP "Steering angle high precision"; CM_ SG_ 264 ENGINE_TORQUE "Effective engine torque"; CM_ SG_ 264 EXPECTED_ENGINE_TORQUE "Expected Engine Torque based on target engine speed"; @@ -189,4 +191,3 @@ CM_ SG_ 250 Auto_High_Beam "1 = HIGH BEAMS OK 0 = HIGH BEAMS OFF "; CM_ SG_ 250 LKAS_LANE_LINES "9 = LEFT CAUTION, 11 = VERY LEFT CAUTION 10 = RIGHT CAUTION, 14 = VERY RIGHT, 4 = NO LINES DETECTED, 3 = LINES DETECTED, SYSTEM ACTIVE"; CM_ SG_ 464 Driver_Seatbelt_Status "1 unbuckled 0 buckled"; CM_ SG_ 792 High_Beam_Lever_Status "1 is high beam, 0 reg"; -VAL_ 147 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ; diff --git a/chrysler_ram_hd_generated.dbc b/chrysler_ram_hd_generated.dbc index 8f68727..2481213 100644 --- a/chrysler_ram_hd_generated.dbc +++ b/chrysler_ram_hd_generated.dbc @@ -129,6 +129,8 @@ BO_ 820 BCM_1: 8 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_ 368 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ; + CM_ SG_ 258 STEERING_ANGLE_HP "Steering angle high precision"; CM_ SG_ 264 ENGINE_TORQUE "Effective engine torque"; CM_ SG_ 264 EXPECTED_ENGINE_TORQUE "Expected Engine Torque based on target engine speed"; diff --git a/generator/chrysler/_stellantis_common.dbc b/generator/chrysler/_stellantis_common.dbc index e367d39..0de6e9f 100644 --- a/generator/chrysler/_stellantis_common.dbc +++ b/generator/chrysler/_stellantis_common.dbc @@ -123,6 +123,8 @@ BO_ 820 BCM_1: 8 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_ 368 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ; + CM_ SG_ 258 STEERING_ANGLE_HP "Steering angle high precision"; CM_ SG_ 264 ENGINE_TORQUE "Effective engine torque"; CM_ SG_ 264 EXPECTED_ENGINE_TORQUE "Expected Engine Torque based on target engine speed"; diff --git a/generator/chrysler/_stellantis_common_ram.py b/generator/chrysler/_stellantis_common_ram.py index 860dab3..b117db0 100755 --- a/generator/chrysler/_stellantis_common_ram.py +++ b/generator/chrysler/_stellantis_common_ram.py @@ -37,7 +37,7 @@ if __name__ == "__main__": wrote_addrs = set() for line in in_f.readlines(): - if line.startswith('BO_'): + if line.startswith(('BO_', 'VAL_')): sl = line.split(' ') addr = int(sl[1]) wrote_addrs.add(addr) diff --git a/generator/chrysler/chrysler_ram_dt.dbc b/generator/chrysler/chrysler_ram_dt.dbc index c9fcf3f..4c1828e 100644 --- a/generator/chrysler/chrysler_ram_dt.dbc +++ b/generator/chrysler/chrysler_ram_dt.dbc @@ -51,4 +51,3 @@ CM_ SG_ 250 Auto_High_Beam "1 = HIGH BEAMS OK 0 = HIGH BEAMS OFF "; CM_ SG_ 250 LKAS_LANE_LINES "9 = LEFT CAUTION, 11 = VERY LEFT CAUTION 10 = RIGHT CAUTION, 14 = VERY RIGHT, 4 = NO LINES DETECTED, 3 = LINES DETECTED, SYSTEM ACTIVE"; CM_ SG_ 464 Driver_Seatbelt_Status "1 unbuckled 0 buckled"; CM_ SG_ 792 High_Beam_Lever_Status "1 is high beam, 0 reg"; -VAL_ 147 Gear_State 4 "D" 2 "N" 1 "R" 0 "P" ;