From d7a2efbbdd5fc5b7ae007b889d18fd9d0b0e22d9 Mon Sep 17 00:00:00 2001 From: Jafar Al-Gharaibeh Date: Fri, 1 May 2020 13:29:32 -0500 Subject: [PATCH] Raw angle signal data for easy checksum calc, and one less gear bit (#254) * LKAS_ANGLE is STEERING_ANGLE, adjust scaling/offset for easy use * one less bit fort the GEAR signal * Add GEAR positions to allow automatic parsing in OP Signed-off-by: Jafar Al-Gharaibeh --- mazda_cx5_gt_2017.dbc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mazda_cx5_gt_2017.dbc b/mazda_cx5_gt_2017.dbc index 92bb2f17..b3b1b580 100644 --- a/mazda_cx5_gt_2017.dbc +++ b/mazda_cx5_gt_2017.dbc @@ -144,8 +144,8 @@ BO_ 579 CAM_LKAS: 8 XXX SG_ LDW : 23|1@0+ (1,0) [0|1] "" XXX SG_ LKAS_REQUEST : 3|12@0+ (1,-2048) [0|2048] "" XXX SG_ ERR_BIT_2 : 30|1@0+ (1,0) [0|1] "" XXX - SG_ LKAS_ANGLE : 33|12@0+ (0.022,-45.06) [0|1] "" XXX - SG_ BIT2 : 52|1@0+ (1,0) [0|1] "" XXX + SG_ ANGLE_ENABLED : 52|1@0+ (1,0) [0|1] "" XXX + SG_ STEERING_ANGLE : 33|12@0+ (1,-2048) [-2048|2047] "" XXX BO_ 580 CAM_DISTANCE: 8 XXX SG_ S1 : 0|8@1+ (1,0) [0|127] "" XXX @@ -491,8 +491,9 @@ BO_ 552 GEAR: 8 XXX SG_ NEW_SIGNAL_5 : 26|3@0+ (1,0) [0|255] "" XXX SG_ NEW_SIGNAL_6 : 31|5@0+ (1,0) [0|31] "" XXX SG_ NEW_SIGNAL_7 : 39|1@0+ (1,0) [0|255] "" XXX - SG_ GEAR : 35|4@0+ (1,0) [0|15] "" XXX SG_ MORE_GEAR : 7|4@0+ (1,0) [0|255] "" XXX + SG_ GEAR : 35|3@0+ (1,0) [0|15] "" XXX + SG_ REVERSE : 36|1@0+ (1,0) [0|1] "" XXX BO_ 543 CRZ_EVENTS: 8 XXX SG_ NEW_SIGNAL_3 : 34|1@0+ (1,0) [0|1] "" XXX @@ -754,6 +755,7 @@ BO_ 1248 MOB4: 8 XXX CM_ SG_ 357 GEAR "13P, 26R, 13N, 24D"; CM_ SG_ 605 PED_BRAKE "3: no brake, 4: brake"; CM_ SG_ 605 BRAKE_WARNING "Flashing brake warning and audible alert for potential forward collision"; +CM_ SG_ 579 STEERING_ANGLE "steering angle aligns with 0.022 factor and -45.06 offset"; CM_ SG_ 863 SPEED_SIGN "speed limit in MPH"; CM_ SG_ 863 SPEED_SIGN_CAM "1: The speed limit is recognized by the camera. 0: speed limit is map based or is not available"; CM_ SG_ 1157 SBS_WARNING_DISTANCE "1 far, 2 mid, 3 near"; @@ -765,7 +767,9 @@ CM_ SG_ 1157 WARNING "1 Rare, 0 often"; CM_ SG_ 1088 LANE_LINES "0 LKAS disabled, 1 no lines, 2 two lines, 3 left line, 4 right line"; CM_ SG_ 1045 ABS_MALFUNCTION "off: 0, solid: 1, slow blink: 2, fast blink: 3"; CM_ SG_ 157 CAN_OFF "Disengage Cruise if enabled, if already disabled TURN it OFF "; -CM_ SG_ 552 GEAR "0 P/N, 12 R, 2 D M1, 4 M2, 14 Shift"; CM_ SG_ 552 MORE_GEAR ""; +CM_ SG_ 552 GEAR "0 P/N, 6 R, 1 D M1, 2 M2, 7 Shift"; CM_ SG_ 540 HANDS_ON_STEER_WARN "0 no warning, b warning"; CM_ SG_ 1143 REAR_CT_ALERT "Rear Cross Traffic Alert"; + +VAL_ 552 GEAR 0 "P" 1 "D" 2 "D" 3 "D" 4 "D" 5 "D" 6 "R" 7 "N";