From 89856dd0d6a805c0c92e695632eb04415d6be8f1 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Sun, 28 Jan 2018 21:02:47 -0800 Subject: [PATCH] fix bugs in some counter/checksum definitions --- acura_rdx_2018_can.dbc | 10 +++++----- generator/honda/honda_crv_touring_2016_can.dbc | 8 ++++---- honda_accord_touring_2016_can.dbc | 4 ++-- honda_civic_hatchback_ex_2017_can.dbc | 4 ---- honda_clarity_hybrid_2018_can.dbc | 4 ---- honda_crv_touring_2016_can_generated.dbc | 8 ++++---- 6 files changed, 15 insertions(+), 23 deletions(-) diff --git a/acura_rdx_2018_can.dbc b/acura_rdx_2018_can.dbc index bec9baca..b25c7419 100644 --- a/acura_rdx_2018_can.dbc +++ b/acura_rdx_2018_can.dbc @@ -83,15 +83,15 @@ BO_ 399 STEER_STATUS: 6 EPS SG_ STEER_TORQUE_MOTOR : 23|16@0- (1,0) [-31000|31000] "tbd" NEO SG_ STEER_STATUS : 35|4@0+ (1,0) [0|15] "" NEO SG_ STEER_CONTROL_ACTIVE : 36|1@0+ (1,0) [0|1] "" NEO - SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" NEO SG_ COUNTER : 45|2@0+ (1,0) [0|3] "" NEO + SG_ CHECKSUM : 43|4@0+ (1,0) [0|15] "" NEO BO_ 404 STEERING_CONTROL: 4 NEO SG_ STEER_TORQUE : 7|12@0- (1,0) [-768|768] "" EPS SG_ SET_ME_X00 : 22|7@0+ (1,0) [0|127] "" EPS SG_ STEER_TORQUE_REQUEST : 23|1@0+ (1,0) [0|1] "" EPS - SG_ CHECKSUM : 29|2@0+ (1,0) [0|3] "" EPS - SG_ COUNTER : 27|4@0+ (1,0) [0|15] "" EPS + SG_ COUNTER : 29|2@0+ (1,0) [0|15] "" EPS + SG_ CHECKSUM : 27|4@0+ (1,0) [0|3] "" EPS BO_ 420 VSA_STATUS: 8 VSA SG_ USER_BRAKE : 7|16@0+ (0.015625,-1.609375) [0|1000] "" NEO @@ -131,8 +131,8 @@ BO_ 476 XXX_8: 5 XXX BO_ 487 XXX_9: 4 VSA SG_ BRAKE_PRESSURE1 : 7|10@0+ (0.015625,-103) [0|1000] "" NEO SG_ BRAKE_PRESSURE2 : 9|10@0+ (0.015625,-103) [0|1000] "" NEO - SG_ CHECKSUM : 29|2@0+ (1,0) [0|3] "" NEO - SG_ COUNTER : 27|4@0+ (1,0) [0|15] "" NEO + SG_ COUNTER : 29|2@0+ (1,0) [0|15] "" NEO + SG_ CHECKSUM : 27|4@0+ (1,0) [0|3] "" NEO BO_ 490 VEHICLE_DYNAMICS: 8 VSA SG_ LONG_ACCEL : 23|16@0- (0.0015384,0) [-20|20] "m/s2" NEO diff --git a/generator/honda/honda_crv_touring_2016_can.dbc b/generator/honda/honda_crv_touring_2016_can.dbc index 3e0ca14e..753958f9 100644 --- a/generator/honda/honda_crv_touring_2016_can.dbc +++ b/generator/honda/honda_crv_touring_2016_can.dbc @@ -25,8 +25,8 @@ BO_ 404 STEERING_CONTROL: 4 EON SG_ SET_ME_X00 : 11|4@0+ (1,0) [0|15] "" EPS SG_ STEER_TORQUE_REQUEST : 23|1@0+ (1,0) [0|1] "" EPS SG_ SET_ME_X00 : 22|7@0+ (1,0) [0|127] "" EPS - SG_ CHECKSUM : 29|2@0+ (1,0) [0|3] "" EPS - SG_ COUNTER : 27|4@0+ (1,0) [0|15] "" EPS + SG_ COUNTER : 29|2@0+ (1,0) [0|15] "" EPS + SG_ CHECKSUM : 27|4@0+ (1,0) [0|3] "" EPS BO_ 420 VSA_STATUS: 8 VSA SG_ USER_BRAKE : 7|16@0+ (0.015625,-1.609375) [0|1000] "" EON @@ -45,8 +45,8 @@ BO_ 422 SCM_BUTTONS: 8 SCM BO_ 487 BRAKE_PRESSURE: 4 VSA SG_ BRAKE_PRESSURE1 : 7|10@0+ (0.015625,-103) [0|1000] "" EON SG_ BRAKE_PRESSURE2 : 9|10@0+ (0.015625,-103) [0|1000] "" EON - SG_ CHECKSUM : 29|2@0+ (1,0) [0|3] "" EON - SG_ COUNTER : 27|4@0+ (1,0) [0|15] "" EON + SG_ COUNTER : 29|2@0+ (1,0) [0|15] "" EON + SG_ CHECKSUM : 27|4@0+ (1,0) [0|3] "" EON BO_ 660 SCM_FEEDBACK: 8 SCM SG_ RIGHT_BLINKER : 6|1@0+ (1,0) [0|1] "" EON diff --git a/honda_accord_touring_2016_can.dbc b/honda_accord_touring_2016_can.dbc index 4339619a..d615a19a 100644 --- a/honda_accord_touring_2016_can.dbc +++ b/honda_accord_touring_2016_can.dbc @@ -174,14 +174,14 @@ BO_ 597 ROUGH_WHEEL_SPEED: 8 VSA SG_ SET_TO_X55_2 : 47|8@0+ (1,0) [0|255] "" NEO SG_ LONG_COUNTER : 55|8@0+ (1,0) [0|255] "" XXX SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX - SG_ CHECKSUM : 56|4@1+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 59|4@1+ (1,0) [0|15] "" XXX BO_ 660 SCM_COMMANDS: 8 SCM SG_ RIGHT_BLINKER : 6|1@0+ (1,0) [0|1] "" NEO SG_ LEFT_BLINKER : 5|1@0+ (1,0) [0|1] "" NEO SG_ WIPERS_SPEED : 4|2@0+ (1,0) [0|3] "" NEO SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX - SG_ CHECKSUM : 56|4@1+ (1,0) [0|15] "" XXX + SG_ CHECKSUM : 59|4@1+ (1,0) [0|15] "" XXX BO_ 661 XXX_10: 4 XXX SG_ COUNTER : 29|2@0+ (1,0) [0|3] "" XXX diff --git a/honda_civic_hatchback_ex_2017_can.dbc b/honda_civic_hatchback_ex_2017_can.dbc index e03e8d92..73a7758d 100644 --- a/honda_civic_hatchback_ex_2017_can.dbc +++ b/honda_civic_hatchback_ex_2017_can.dbc @@ -189,10 +189,6 @@ BO_ 490 XXX_13: 8 XXX SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" XXX SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" XXX -BO_ 493 XXX_14: 5 XXX - SG_ COUNTER : 37|2@0+ (1,0) [0|3] "" XXX - SG_ CHECKSUM : 32|4@1+ (1,0) [0|15] "" XXX - BO_ 495 ACC_CONTROL_ON: 8 XXX SG_ SET_TO_75 : 31|8@0+ (1,0) [0|255] "" XXX SG_ SET_TO_30 : 39|8@0+ (1,0) [0|255] "" XXX diff --git a/honda_clarity_hybrid_2018_can.dbc b/honda_clarity_hybrid_2018_can.dbc index 7460800e..86272de0 100644 --- a/honda_clarity_hybrid_2018_can.dbc +++ b/honda_clarity_hybrid_2018_can.dbc @@ -141,10 +141,6 @@ BO_ 464 WHEEL_SPEEDS: 8 VSA SG_ WHEEL_SPEED_RR : 42|15@0+ (0.002759506,0) [0|70] "m/s" NEO SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" NEO -BO_ 470 XXX_6: 2 VSA - SG_ COUNTER : 13|2@0+ (1,0) [0|3] "" NEO - SG_ CHECKSUM : 8|4@0+ (1,0) [0|3] "" NEO - BO_ 476 XXX_7: 7 XXX SG_ CHECKSUM : 51|4@0+ (1,0) [0|3] "" NEO SG_ COUNTER : 53|2@0+ (1,0) [0|3] "" NEO diff --git a/honda_crv_touring_2016_can_generated.dbc b/honda_crv_touring_2016_can_generated.dbc index d06b3d80..61c96578 100644 --- a/honda_crv_touring_2016_can_generated.dbc +++ b/honda_crv_touring_2016_can_generated.dbc @@ -242,8 +242,8 @@ BO_ 404 STEERING_CONTROL: 4 EON SG_ SET_ME_X00 : 11|4@0+ (1,0) [0|15] "" EPS SG_ STEER_TORQUE_REQUEST : 23|1@0+ (1,0) [0|1] "" EPS SG_ SET_ME_X00 : 22|7@0+ (1,0) [0|127] "" EPS - SG_ CHECKSUM : 29|2@0+ (1,0) [0|3] "" EPS - SG_ COUNTER : 27|4@0+ (1,0) [0|15] "" EPS + SG_ COUNTER : 29|2@0+ (1,0) [0|15] "" EPS + SG_ CHECKSUM : 27|4@0+ (1,0) [0|3] "" EPS BO_ 420 VSA_STATUS: 8 VSA SG_ USER_BRAKE : 7|16@0+ (0.015625,-1.609375) [0|1000] "" EON @@ -262,8 +262,8 @@ BO_ 422 SCM_BUTTONS: 8 SCM BO_ 487 BRAKE_PRESSURE: 4 VSA SG_ BRAKE_PRESSURE1 : 7|10@0+ (0.015625,-103) [0|1000] "" EON SG_ BRAKE_PRESSURE2 : 9|10@0+ (0.015625,-103) [0|1000] "" EON - SG_ CHECKSUM : 29|2@0+ (1,0) [0|3] "" EON - SG_ COUNTER : 27|4@0+ (1,0) [0|15] "" EON + SG_ COUNTER : 29|2@0+ (1,0) [0|15] "" EON + SG_ CHECKSUM : 27|4@0+ (1,0) [0|3] "" EON BO_ 660 SCM_FEEDBACK: 8 SCM SG_ RIGHT_BLINKER : 6|1@0+ (1,0) [0|1] "" EON