From 68cab29e8da8a7af3537fa95b97e2e331c54e069 Mon Sep 17 00:00:00 2001 From: Maksim Salau Date: Thu, 4 Apr 2019 19:48:16 +0300 Subject: [PATCH] Fix manually created dbc files (#154) --- ford_cgea1_2_bodycan_2011.dbc | 2 ++ ford_cgea1_2_ptcan_2011.dbc | 2 ++ ford_fusion_2018_adas.dbc | 2 ++ ford_fusion_2018_pt.dbc | 5 +++- honda_clarity_hybrid_2018_can.dbc | 2 +- ...odyssey_extreme_edition_2018_china_can.dbc | 2 +- mazda_cx5_gt_2017.dbc | 14 +++++----- subaru_outback_2015_eyesight.dbc | 26 +++++++++---------- tesla_can.dbc | 4 +-- toyota_prius_2010_pt.dbc | 2 +- 10 files changed, 35 insertions(+), 26 deletions(-) diff --git a/ford_cgea1_2_bodycan_2011.dbc b/ford_cgea1_2_bodycan_2011.dbc index e13743a6..49fcae19 100644 --- a/ford_cgea1_2_bodycan_2011.dbc +++ b/ford_cgea1_2_bodycan_2011.dbc @@ -31,6 +31,8 @@ NS_ : BU_BO_REL_ SG_MUL_VAL_ +BS_: + BU_: XXX diff --git a/ford_cgea1_2_ptcan_2011.dbc b/ford_cgea1_2_ptcan_2011.dbc index cc5635fa..128721cb 100644 --- a/ford_cgea1_2_ptcan_2011.dbc +++ b/ford_cgea1_2_ptcan_2011.dbc @@ -31,6 +31,8 @@ NS_ : BU_BO_REL_ SG_MUL_VAL_ +BS_: + BU_: XXX diff --git a/ford_fusion_2018_adas.dbc b/ford_fusion_2018_adas.dbc index 63a0b990..2e1647b3 100644 --- a/ford_fusion_2018_adas.dbc +++ b/ford_fusion_2018_adas.dbc @@ -31,6 +31,8 @@ NS_ : BU_BO_REL_ SG_MUL_VAL_ +BS_: + BU_: XXX BO_ 1280 Object_00: 8 XXX diff --git a/ford_fusion_2018_pt.dbc b/ford_fusion_2018_pt.dbc index 1667a360..c4b706d0 100644 --- a/ford_fusion_2018_pt.dbc +++ b/ford_fusion_2018_pt.dbc @@ -31,6 +31,8 @@ NS_ : BU_BO_REL_ SG_MUL_VAL_ +BS_: + BU_: XXX BO_ 130 EPAS_INFO: 8 XXX @@ -128,9 +130,10 @@ BO_ 984 Lane_Keep_Assist_Ui: 8 XXX SG_ Hands_Warning : 49|1@0+ (1,0) [0|1] "" XXX SG_ Set_Me_X30 : 63|8@0+ (1,0) [0|255] "" XXX +CM_ SG_ 970 Lkas_Action "only vals 4, 5, 8, 9 seem to work. 4 and 5 are a bit smoother" ; + VAL_ 357 Cruise_State 4 "active" 3 "standby" 0 "off" ; VAL_ 970 Lkas_Action 15 "off" 9 "abrupt" 8 "abrupt2" 5 "smooth" 4 "smooth2" ; VAL_ 970 Lkas_Alert 15 "no_alert" 3 "high_intensity" 2 "mid_intensity" 1 "low_intensity" ; VAL_ 972 LaActAvail_D_Actl 3 "available" 2 "tbd" 1 "not_available" 0 "fault" ; VAL_ 984 Lines_Hud 15 "none" 11 "grey_yellow" 8 "green_red" 7 "yellow_grey" 6 "grey_grey" 4 "red_green" 3 "green_green" ; -CM_ SG_ 970 Lkas_Action "only vals 4, 5, 8, 9 seem to work. 4 and 5 are a bit smoother" ; diff --git a/honda_clarity_hybrid_2018_can.dbc b/honda_clarity_hybrid_2018_can.dbc index 86272de0..3d46f52c 100644 --- a/honda_clarity_hybrid_2018_can.dbc +++ b/honda_clarity_hybrid_2018_can.dbc @@ -409,6 +409,7 @@ BO_TX_BU_ 862 : NEO,ADAS; BO_TX_BU_ 927 : NEO,ADAS; +CM_ "CHFFR_METRIC 330 STEER_ANGLE STEER_ANGLE 0.36 180; CHFFR_METRIC 380 ENGINE_RPM ENGINE_RPM 1 0; CHFFR_METRIC 804 ENGINE_TEMPERATURE ENGINE_TEMPERATURE 1 0"; CM_ SG_ 401 GEAR "10 = reverse, 11 = transition"; CM_ SG_ 490 LONG_ACCEL "wheel speed derivative, noisy and zero snapping"; CM_ SG_ 773 PASS_AIRBAG_ON "Might just be indicator light"; @@ -430,4 +431,3 @@ VAL_ 806 CMBS_BUTTON 3 "pressed" 0 "released" ; VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ; VAL_ 891 WIPERS 4 "High" 2 "Low" 0 "Off" ; VAL_ 927 ACC_ALERTS 29 "esp_active_acc_canceled" 10 "b_pedal_applied" 9 "speed_too_low" 8 "speed_too_high" 7 "p_brake_applied" 6 "gear_no_d" 5 "seatbelt" 4 "too_steep_downhill" 3 "too_steep_uphill" 2 "too_close" 1 "no_vehicle_ahead" ; -CM_ "CHFFR_METRIC 330 STEER_ANGLE STEER_ANGLE 0.36 180; CHFFR_METRIC 380 ENGINE_RPM ENGINE_RPM 1 0; CHFFR_METRIC 804 ENGINE_TEMPERATURE ENGINE_TEMPERATURE 1 0"; diff --git a/honda_odyssey_extreme_edition_2018_china_can.dbc b/honda_odyssey_extreme_edition_2018_china_can.dbc index 91859aa2..5126bb16 100644 --- a/honda_odyssey_extreme_edition_2018_china_can.dbc +++ b/honda_odyssey_extreme_edition_2018_china_can.dbc @@ -276,6 +276,7 @@ BO_ 1302 ODOMETER: 8 XXX +CM_ "CHFFR_METRIC 342 STEER_ANGLE STEER_ANGLE 0.36 180; CHFFR_METRIC 380 ENGINE_RPM ENGINE_RPM 1 0; CHFFR_METRIC 804 ENGINE_TEMPERATURE ENGINE_TEMPERATURE 1 0"; CM_ SG_ 490 LONG_ACCEL "wheel speed derivative, noisy and zero snapping"; CM_ SG_ 773 PASS_AIRBAG_OFF "Might just be indicator light"; CM_ SG_ 773 PASS_AIRBAG_ON "Might just be indicator light"; @@ -295,4 +296,3 @@ VAL_ 401 GEAR 7 "L" 10 "S" 4 "D" 3 "N" 2 "R" 1 "P" ; VAL_ 422 CRUISE_BUTTONS 7 "tbd" 6 "tbd" 5 "tbd" 4 "accel_res" 3 "decel_set" 2 "cancel" 1 "main" 0 "none" ; VAL_ 422 LIGHTS_SETTING 3 "high_beam" 2 "low_beam" 1 "position" 0 "no_lights" ; VAL_ 422 CRUISE_SETTING 3 "distance_adj" 2 "tbd" 1 "lkas_button" 0 "none" ; -CM_ "CHFFR_METRIC 342 STEER_ANGLE STEER_ANGLE 0.36 180; CHFFR_METRIC 380 ENGINE_RPM ENGINE_RPM 1 0; CHFFR_METRIC 804 ENGINE_TEMPERATURE ENGINE_TEMPERATURE 1 0"; diff --git a/mazda_cx5_gt_2017.dbc b/mazda_cx5_gt_2017.dbc index d0b84c22..3926e2df 100644 --- a/mazda_cx5_gt_2017.dbc +++ b/mazda_cx5_gt_2017.dbc @@ -247,7 +247,7 @@ BO_ 1277 NEW_MSG_10: 8 XXX SG_ NEW_SIGNAL_2 : 15|8@0+ (1,0) [0|255] "" XXX SG_ counter : 7|8@0+ (1,0) [0|255] "" XXX -BO_ 1275 2017_5: 8 XXX +BO_ 1275 MSG_2017_5: 8 XXX SG_ counter : 4|5@0+ (1,0) [0|255] "" XXX BO_ 1274 NEW_MSG_12: 8 XXX @@ -565,23 +565,23 @@ BO_ 121 EPB: 8 XXX SG_ NEW_SIGNAL_11 : 45|1@0+ (1,0) [0|1] "" XXX SG_ EPB_ACTIVE : 29|1@0+ (1,0) [0|15] "" XXX -BO_ 1070 2017_1: 8 XXX +BO_ 1070 MSG_2017_1: 8 XXX -BO_ 1183 2017_2: 8 XXX +BO_ 1183 MSG_2017_2: 8 XXX -BO_ 1243 2017_3: 8 XXX +BO_ 1243 MSG_2017_3: 8 XXX SG_ NEW_SIGNAL_1 : 7|64@0+ (1,0) [0|18446744073709552000] "" XXX BO_ 1269 MSG_2017_4: 8 XXX SG_ NEW_SIGNAL_1 : 55|16@0+ (1,0) [0|18446744073709552000] "" XXX -BO_ 1178 2017_6: 8 XXX +BO_ 1178 MSG_2017_6: 8 XXX SG_ NEW_SIGNAL_1 : 7|64@0+ (1,0) [0|18446744073709552000] "" XXX -BO_ 1179 2017_7: 8 XXX +BO_ 1179 MSG_2017_7: 8 XXX SG_ NEW_SIGNAL_1 : 7|64@0+ (1,0) [0|18446744073709552000] "" XXX -BO_ 1435 2017_8: 8 XXX +BO_ 1435 MSG_2017_8: 8 XXX BO_ 253 NEW_MSG_7: 8 XXX SG_ NEW_SIGNAL_1 : 16|1@0+ (1,0) [0|65535] "" XXX diff --git a/subaru_outback_2015_eyesight.dbc b/subaru_outback_2015_eyesight.dbc index aad63e31..f233d3bb 100644 --- a/subaru_outback_2015_eyesight.dbc +++ b/subaru_outback_2015_eyesight.dbc @@ -33,7 +33,7 @@ NS_ : BS_: -BU_: XXX 0 +BU_: XXX BO_ 2 Steering: 8 XXX @@ -211,24 +211,24 @@ BO_ 358 ES_Status: 8 XXX SG_ NEW_SIGNAL_5_Blank : 33|1@1+ (1,0) [0|3] "" XXX SG_ NEW_SIGNAL_4_Blank : 34|1@1+ (1,0) [0|7] "" XXX SG_ NEW_SIGNAL_1 : 35|1@0+ (1,0) [0|31] "" XXX - SG_ 3SecondDisengage : 13|2@0+ (1,0) [0|3] "" XXX + SG_ Sig3SecondDisengage : 13|2@0+ (1,0) [0|3] "" XXX SG_ Not_Ready_Startup : 0|3@1+ (1,0) [0|7] "" XXX SG_ Steep_Hill_Disengage : 44|1@0+ (1,0) [0|3] "" XXX SG_ Disengage_Alert : 15|2@0+ (1,0) [0|3] "" XXX BO_ 359 ES_LDW: 8 XXX - SG_ 2Right_Depart : 50|1@1+ (1,0) [0|7] "" XXX - SG_ 2All_Depart : 28|1@0+ (1,0) [0|3] "" XXX - SG_ 3All_Depart : 52|1@0+ (1,0) [0|3] "" XXX + SG_ Sig2Right_Depart : 50|1@1+ (1,0) [0|7] "" XXX + SG_ Sig2All_Depart : 28|1@0+ (1,0) [0|3] "" XXX + SG_ Sig3All_Depart : 52|1@0+ (1,0) [0|3] "" XXX SG_ Left_Depart_Front : 51|1@0+ (1,0) [0|3] "" XXX SG_ All_depart_2015 : 0|1@1+ (1,0) [0|255] "" XXX SG_ LKAS_Inactive_2017 : 36|1@1+ (1,0) [0|3] "" XXX SG_ LKAS_Steer_Active_2017 : 37|1@0+ (1,0) [0|3] "" XXX SG_ Right_Line_2017 : 24|1@1+ (1,0) [0|7] "" XXX SG_ Left_Line_2017 : 25|1@1+ (1,0) [0|3] "" XXX - SG_ 1All_Depart : 31|1@0+ (1,0) [0|15] "" XXX - SG_ 1Right_Depart_Front : 49|1@1+ (1,0) [0|3] "" XXX - SG_ 1Right_Depart : 48|1@1+ (1,0) [0|3] "" XXX + SG_ Sig1All_Depart : 31|1@0+ (1,0) [0|15] "" XXX + SG_ Sig1Right_Depart_Front : 49|1@1+ (1,0) [0|3] "" XXX + SG_ Sig1Right_Depart : 48|1@1+ (1,0) [0|3] "" XXX BO_ 392 Counter_0: 8 XXX SG_ Counter : 16|4@1+ (1,0) [0|15] "" XXX @@ -350,15 +350,15 @@ CM_ SG_ 353 Brake_On "long activatedish"; CM_ SG_ 354 RPM "20hz version of Transmission_Engine under Transmission"; CM_ SG_ 358 Cruise_Activated "is 1 when cruise is able to go"; CM_ SG_ 358 Car_Follow "front car detected"; -CM_ SG_ 358 3SecondDisengage "seatbelt disengage"; +CM_ SG_ 358 Sig3SecondDisengage "seatbelt disengage"; CM_ SG_ 358 Disengage_Alert "seatbelt and steep hill disengage"; -CM_ SG_ 359 2All_Depart "Left and right depart"; +CM_ SG_ 359 Sig2All_Depart "Left and right depart"; CM_ SG_ 359 Left_Depart_Front "warning after acceleration into car in front and left depart"; CM_ SG_ 359 All_depart_2015 "always 1 on 2017"; CM_ SG_ 359 LKAS_Inactive_2017 "1 when not steering, 0 when lkas steering"; -CM_ SG_ 359 1All_Depart "Left and right depart"; -CM_ SG_ 359 1Right_Depart_Front "object in front, right depart, hill steep and seatbelt disengage alert "; -CM_ SG_ 359 1Right_Depart "right depart, hill steep and seatbelt disengage"; +CM_ SG_ 359 Sig1All_Depart "Left and right depart"; +CM_ SG_ 359 Sig1Right_Depart_Front "object in front, right depart, hill steep and seatbelt disengage alert "; +CM_ SG_ 359 Sig1Right_Depart "right depart, hill steep and seatbelt disengage"; CM_ SG_ 642 Counter "Affected by signals"; CM_ SG_ 642 RIGHT_BLINKER "0 off, 2 right, 1 left"; CM_ SG_ 880 Steering_Voltage_Flat "receives later than 371"; diff --git a/tesla_can.dbc b/tesla_can.dbc index 37d839e4..c257fe2e 100644 --- a/tesla_can.dbc +++ b/tesla_can.dbc @@ -307,6 +307,8 @@ BO_ 840 GTW_status: 8 GTW SG_ GTW_statusChecksum : 63|8@0+ (1,0) [0|255] "" NEO SG_ GTW_statusCounter : 51|4@0+ (1,0) [0|15] "" NEO +CM_ "CHFFR_METRIC 1160 DAS_steeringAngleRequest STEER_ANGLE 0.1098666 180; CHFFR_METRIC 264 DI_motorRPM ENGINE_RPM 1 0"; + VAL_ 3 StW_Angl 16383 "SNA" ; VAL_ 3 StW_AnglSens_Id 2 "MUST" 0 "PSBL" 1 "SELF" ; VAL_ 3 StW_AnglSens_Stat 2 "ERR" 3 "ERR_INI" 1 "INI" 0 "OK" ; @@ -417,5 +419,3 @@ VAL_ 904 MCU_clusterReadyForDrive 0 "NO_SNA" 1 "YES" ; VAL_ 1160 DAS_steeringAngleRequest 16384 "ZERO_ANGLE" ; VAL_ 1160 DAS_steeringControlType 1 "ANGLE_CONTROL" 3 "DISABLED" 0 "NONE" 2 "RESERVED" ; VAL_ 1160 DAS_steeringHapticRequest 1 "ACTIVE" 0 "IDLE" ; - -CM_ "CHFFR_METRIC 1160 DAS_steeringAngleRequest STEER_ANGLE 0.1098666 180; CHFFR_METRIC 264 DI_motorRPM ENGINE_RPM 1 0"; diff --git a/toyota_prius_2010_pt.dbc b/toyota_prius_2010_pt.dbc index 5dba5195..634b1dc0 100644 --- a/toyota_prius_2010_pt.dbc +++ b/toyota_prius_2010_pt.dbc @@ -169,6 +169,7 @@ BO_ 452 POWERTRAIN: 8 XXX +CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180"; CM_ SG_ 36 ACCEL_Y "unit is tbd"; CM_ SG_ 36 STEERING_TORQUE "does not seem the steer torque, tbd"; CM_ SG_ 36 YAW_RATE "verify"; @@ -200,4 +201,3 @@ VAL_ 1042 RIGHT_LINE 3 "orange" 2 "double" 1 "solid" 0 "none" ; VAL_ 1042 LEFT_LINE 3 "orange" 2 "double" 1 "solid" 0 "none" ; VAL_ 1042 LDA_ALERT 3 "hold with continuous beep" 2 "LDA unavailable" 1 "hold" 0 "none" ; VAL_ 1553 UNITS 1 "km" 2 "miles" ; -CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";