Skip to content

Commit 9b6ca31

Browse files
rbiasinirbiasini
authored
fix: Replicate changes done on _honda_2017.dbc (commaai#225)
After _dual_can_nidec_2018.dbc was created following commits were done on _honda_2017.dbc - 0132110 : Reverse engineer AEB in Honda - 7bb1e33 : honda nidec AEB values - cb27d6e : Honda Nidec: add new ACC_HUD signals to all other cars… - fa5dc68 : Fix honda dbc files after steer torque addition
1 parent 1bd26d0 commit 9b6ca31

File tree

2 files changed

+38
-8
lines changed

2 files changed

+38
-8
lines changed

‎generator/honda/_dual_can_nidec_2018.dbc

+19-4
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,21 @@ BO_ 380 POWERTRAIN_DATA: 8 PCM
5656

5757
BO_ 420 VSA_STATUS: 8 VSA
5858
SG_ USER_BRAKE : 7|16@0+ (0.015625,-1.609375) [0|1000] "" EON
59+
SG_ COMPUTER_BRAKING : 23|1@0+ (1,0) [0|1] "" EON
5960
SG_ ESP_DISABLED : 28|1@0+ (1,0) [0|1] "" EON
6061
SG_ BRAKE_HOLD_RELATED : 52|1@0+ (1,0) [0|1] "" XXX
6162
SG_ BRAKE_HOLD_ACTIVE : 46|1@0+ (1,0) [0|1] "" EON
6263
SG_ BRAKE_HOLD_ENABLED : 45|1@0+ (1,0) [0|1] "" EON
6364
SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
6465
SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON
6566

67+
BO_ 427 STEER_MOTOR_TORQUE: 3 EPS
68+
SG_ CONFIG_VALID : 7|1@0+ (1,0) [0|1] "" EON
69+
SG_ MOTOR_TORQUE : 1|10@0+ (1,0) [0|256] "" EON
70+
SG_ OUTPUT_DISABLED : 22|1@0+ (1,0) [0|1] "" EON
71+
SG_ COUNTER : 21|2@0+ (1,0) [0|3] "" EON
72+
SG_ CHECKSUM : 19|4@0+ (1,0) [0|15] "" EON
73+
6674
BO_ 432 STANDSTILL: 7 VSA
6775
SG_ CONTROLLED_STANDSTILL : 0|1@0+ (1,0) [0|1] "" EON
6876
SG_ WHEELS_MOVING : 12|1@0+ (1,0) [0|1] "" EON
@@ -93,12 +101,15 @@ BO_ 506 BRAKE_COMMAND: 8 ADAS
93101
SG_ CRUISE_FAULT_CMD : 18|1@0+ (1,0) [0|1] "" EBCM
94102
SG_ CRUISE_CANCEL_CMD : 17|1@0+ (1,0) [0|1] "" EBCM
95103
SG_ COMPUTER_BRAKE_REQUEST : 16|1@0+ (1,0) [0|1] "" EBCM
96-
SG_ SET_ME_0X80 : 31|8@0+ (1,0) [0|1] "" EBCM
104+
SG_ SET_ME_1 : 31|1@0+ (1,0) [0|1] "" EBCM
105+
SG_ AEB_REQ_1 : 29|1@0+ (1,0) [0|1] "" XXX
106+
SG_ AEB_REQ_2 : 26|3@0+ (1,0) [0|7] "" XXX
97107
SG_ BRAKE_LIGHTS : 39|1@0+ (1,0) [0|1] "" EBCM
98108
SG_ CRUISE_STATES : 38|7@0+ (1,0) [0|1] "" EBCM
99109
SG_ CHIME : 47|3@0+ (1,0) [0|7] "" EBCM
100110
SG_ ZEROS_BOH6 : 44|1@0+ (1,0) [0|1] "" EBCM
101111
SG_ FCW : 43|2@0+ (1,0) [0|3] "" EBCM
112+
SG_ AEB_STATUS : 41|2@0+ (1,0) [0|3] "" XXX
102113
SG_ COMPUTER_BRAKE : 55|10@0+ (1,0) [0|1] "" EBCM
103114
SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EBCM
104115
SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EBCM
@@ -138,7 +149,7 @@ BO_ 780 ACC_HUD: 8 ADAS
138149
SG_ BOH : 38|1@0+ (1,0) [0|1] "" BDY
139150
SG_ ACC_PROBLEM : 37|1@0+ (1,0) [0|1] "" BDY
140151
SG_ FCM_OFF : 36|1@0+ (1,0) [0|1] "" BDY
141-
SG_ BOH_2 : 35|1@0+ (1,0) [0|1] "" BDY
152+
SG_ FCM_OFF_2 : 35|1@0+ (1,0) [0|1] "" BDY
142153
SG_ FCM_PROBLEM : 34|1@0+ (1,0) [0|1] "" BDY
143154
SG_ RADAR_OBSTRUCTED : 33|1@0+ (1,0) [0|1] "" BDY
144155
SG_ ENABLE_MINI_CAR : 32|1@0+ (1,0) [0|1] "" BDY
@@ -148,10 +159,12 @@ BO_ 780 ACC_HUD: 8 ADAS
148159
SG_ BOH_4 : 42|1@0+ (1,0) [0|3] "" BDY
149160
SG_ BOH_5 : 41|1@0+ (1,0) [0|3] "" BDY
150161
SG_ CRUISE_CONTROL_LABEL : 40|1@0+ (1,0) [0|3] "" BDY
151-
SG_ HUD_DISTANCE_3 : 52|1@0+ (1,0) [0|1] "" BDY
152-
SG_ IMPERIAL_UNIT : 54|1@0+ (1,0) [0|1] "" BDY
153162
SG_ SET_ME_X01_2 : 55|1@0+ (1,0) [0|1] "" BDY
163+
SG_ IMPERIAL_UNIT : 54|1@0+ (1,0) [0|1] "" BDY
164+
SG_ HUD_DISTANCE_3 : 52|1@0+ (1,0) [0|1] "" BDY
165+
SG_ CHIME : 51|3@0+ (1,0) [0|1] "" BDY
154166
SG_ SET_ME_X01 : 48|1@0+ (1,0) [0|1] "" BDY
167+
SG_ ICONS : 63|2@0+ (1,0) [0|1] "" BDY
155168
SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" BDY
156169
SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" BDY
157170

@@ -201,6 +214,7 @@ BO_ 1029 DOORS_STATUS: 8 BDY
201214
SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
202215

203216
CM_ SG_ 490 LONG_ACCEL "wheel speed derivative, noisy and zero snapping";
217+
CM_ SG_ 506 AEB_REQ_1 "set for duration of suspected AEB event";
204218
CM_ SG_ 773 PASS_AIRBAG_ON "Might just be indicator light";
205219
CM_ SG_ 773 PASS_AIRBAG_OFF "Might just be indicator light";
206220
CM_ SG_ 780 CRUISE_SPEED "255 = no speed";
@@ -210,6 +224,7 @@ CM_ SG_ 829 BEEP "beeps are pleasant, chimes are for warnngs etc...";
210224

211225
VAL_ 506 FCW 3 "fcw" 2 "fcw" 1 "fcw" 0 "no_fcw" ;
212226
VAL_ 506 CHIME 4 "double_chime" 3 "single_chime" 2 "continuous_chime" 1 "repeating_chime" 0 "no_chime" ;
227+
VAL_ 506 AEB_STATUS 3 "aeb_prepare" 2 "aeb_ready" 1 "aeb_braking" 0 "no_aeb" ;
213228
VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
214229
VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
215230
VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;

‎honda_fit_hybrid_2018_can_generated.dbc

+19-4
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,21 @@ BO_ 380 POWERTRAIN_DATA: 8 PCM
7878

7979
BO_ 420 VSA_STATUS: 8 VSA
8080
SG_ USER_BRAKE : 7|16@0+ (0.015625,-1.609375) [0|1000] "" EON
81+
SG_ COMPUTER_BRAKING : 23|1@0+ (1,0) [0|1] "" EON
8182
SG_ ESP_DISABLED : 28|1@0+ (1,0) [0|1] "" EON
8283
SG_ BRAKE_HOLD_RELATED : 52|1@0+ (1,0) [0|1] "" XXX
8384
SG_ BRAKE_HOLD_ACTIVE : 46|1@0+ (1,0) [0|1] "" EON
8485
SG_ BRAKE_HOLD_ENABLED : 45|1@0+ (1,0) [0|1] "" EON
8586
SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EON
8687
SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EON
8788

89+
BO_ 427 STEER_MOTOR_TORQUE: 3 EPS
90+
SG_ CONFIG_VALID : 7|1@0+ (1,0) [0|1] "" EON
91+
SG_ MOTOR_TORQUE : 1|10@0+ (1,0) [0|256] "" EON
92+
SG_ OUTPUT_DISABLED : 22|1@0+ (1,0) [0|1] "" EON
93+
SG_ COUNTER : 21|2@0+ (1,0) [0|3] "" EON
94+
SG_ CHECKSUM : 19|4@0+ (1,0) [0|15] "" EON
95+
8896
BO_ 432 STANDSTILL: 7 VSA
8997
SG_ CONTROLLED_STANDSTILL : 0|1@0+ (1,0) [0|1] "" EON
9098
SG_ WHEELS_MOVING : 12|1@0+ (1,0) [0|1] "" EON
@@ -115,12 +123,15 @@ BO_ 506 BRAKE_COMMAND: 8 ADAS
115123
SG_ CRUISE_FAULT_CMD : 18|1@0+ (1,0) [0|1] "" EBCM
116124
SG_ CRUISE_CANCEL_CMD : 17|1@0+ (1,0) [0|1] "" EBCM
117125
SG_ COMPUTER_BRAKE_REQUEST : 16|1@0+ (1,0) [0|1] "" EBCM
118-
SG_ SET_ME_0X80 : 31|8@0+ (1,0) [0|1] "" EBCM
126+
SG_ SET_ME_1 : 31|1@0+ (1,0) [0|1] "" EBCM
127+
SG_ AEB_REQ_1 : 29|1@0+ (1,0) [0|1] "" XXX
128+
SG_ AEB_REQ_2 : 26|3@0+ (1,0) [0|7] "" XXX
119129
SG_ BRAKE_LIGHTS : 39|1@0+ (1,0) [0|1] "" EBCM
120130
SG_ CRUISE_STATES : 38|7@0+ (1,0) [0|1] "" EBCM
121131
SG_ CHIME : 47|3@0+ (1,0) [0|7] "" EBCM
122132
SG_ ZEROS_BOH6 : 44|1@0+ (1,0) [0|1] "" EBCM
123133
SG_ FCW : 43|2@0+ (1,0) [0|3] "" EBCM
134+
SG_ AEB_STATUS : 41|2@0+ (1,0) [0|3] "" XXX
124135
SG_ COMPUTER_BRAKE : 55|10@0+ (1,0) [0|1] "" EBCM
125136
SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" EBCM
126137
SG_ CHECKSUM : 59|4@0+ (1,0) [0|15] "" EBCM
@@ -160,7 +171,7 @@ BO_ 780 ACC_HUD: 8 ADAS
160171
SG_ BOH : 38|1@0+ (1,0) [0|1] "" BDY
161172
SG_ ACC_PROBLEM : 37|1@0+ (1,0) [0|1] "" BDY
162173
SG_ FCM_OFF : 36|1@0+ (1,0) [0|1] "" BDY
163-
SG_ BOH_2 : 35|1@0+ (1,0) [0|1] "" BDY
174+
SG_ FCM_OFF_2 : 35|1@0+ (1,0) [0|1] "" BDY
164175
SG_ FCM_PROBLEM : 34|1@0+ (1,0) [0|1] "" BDY
165176
SG_ RADAR_OBSTRUCTED : 33|1@0+ (1,0) [0|1] "" BDY
166177
SG_ ENABLE_MINI_CAR : 32|1@0+ (1,0) [0|1] "" BDY
@@ -170,10 +181,12 @@ BO_ 780 ACC_HUD: 8 ADAS
170181
SG_ BOH_4 : 42|1@0+ (1,0) [0|3] "" BDY
171182
SG_ BOH_5 : 41|1@0+ (1,0) [0|3] "" BDY
172183
SG_ CRUISE_CONTROL_LABEL : 40|1@0+ (1,0) [0|3] "" BDY
173-
SG_ HUD_DISTANCE_3 : 52|1@0+ (1,0) [0|1] "" BDY
174-
SG_ IMPERIAL_UNIT : 54|1@0+ (1,0) [0|1] "" BDY
175184
SG_ SET_ME_X01_2 : 55|1@0+ (1,0) [0|1] "" BDY
185+
SG_ IMPERIAL_UNIT : 54|1@0+ (1,0) [0|1] "" BDY
186+
SG_ HUD_DISTANCE_3 : 52|1@0+ (1,0) [0|1] "" BDY
187+
SG_ CHIME : 51|3@0+ (1,0) [0|1] "" BDY
176188
SG_ SET_ME_X01 : 48|1@0+ (1,0) [0|1] "" BDY
189+
SG_ ICONS : 63|2@0+ (1,0) [0|1] "" BDY
177190
SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" BDY
178191
SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" BDY
179192

@@ -223,6 +236,7 @@ BO_ 1029 DOORS_STATUS: 8 BDY
223236
SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" EON
224237

225238
CM_ SG_ 490 LONG_ACCEL "wheel speed derivative, noisy and zero snapping";
239+
CM_ SG_ 506 AEB_REQ_1 "set for duration of suspected AEB event";
226240
CM_ SG_ 773 PASS_AIRBAG_ON "Might just be indicator light";
227241
CM_ SG_ 773 PASS_AIRBAG_OFF "Might just be indicator light";
228242
CM_ SG_ 780 CRUISE_SPEED "255 = no speed";
@@ -232,6 +246,7 @@ CM_ SG_ 829 BEEP "beeps are pleasant, chimes are for warnngs etc...";
232246

233247
VAL_ 506 FCW 3 "fcw" 2 "fcw" 1 "fcw" 0 "no_fcw" ;
234248
VAL_ 506 CHIME 4 "double_chime" 3 "single_chime" 2 "continuous_chime" 1 "repeating_chime" 0 "no_chime" ;
249+
VAL_ 506 AEB_STATUS 3 "aeb_prepare" 2 "aeb_ready" 1 "aeb_braking" 0 "no_aeb" ;
235250
VAL_ 780 CRUISE_SPEED 255 "no_speed" 252 "stopped" ;
236251
VAL_ 780 HUD_LEAD 3 "acc_off" 2 "solid_car" 1 "dashed_car" 0 "no_car" ;
237252
VAL_ 829 BEEP 3 "single_beep" 2 "triple_beep" 1 "repeated_beep" 0 "no_beep" ;

0 commit comments

Comments
 (0)