Skip to content

Commit 36c471e

Browse files
martinlmartinl
authored
Fixed signals order and added new signals for subaru global (#221)
* update ES_DashStatus, add ES_Fault * add Transmission and Gear values * add ACC_State * normalize ACC/ES signal prefix to Cruise * fix ES_Status order, ACC buttons naming * fix BodyInfo signals ordering, add Wipers * Brake Pedal update * ES_Brake update * Throttle updates * ES_Distance updates * ES_Distance updates * reorder signals * rename Lead_Vehicle_Start_Alert * Add ACC Short_Distance * move Short_Distance * Fill BodyInfo * Update ES_Distance * Brake_Pedal signal fix * Update ES_Distance and BodyInfo * Update Brake_Pedal * ES_Distance Signal1 size fix * Update ES_Brake * Add STOP_START * add Cruise_State values * Add ES_Status:Cruise_Hold * Add ES_DashStatus PCB off and LDW off * Add STOP_START * Reorder ES_DashStatus * Add Icy Road Warning
1 parent 7b5a1fc commit 36c471e

File tree

2 files changed

+82
-45
lines changed

2 files changed

+82
-45
lines changed

‎subaru_crosstrek_2018.dbc

+65-33
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ BO_ 2 Steering: 8 XXX
4343

4444
BO_ 64 Throttle: 8 XXX
4545
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
46-
SG_ Off_Accel : 60|4@1+ (1,0) [0|7] "" XXX
47-
SG_ NEW_SIGNAL_3 : 56|4@1+ (1,0) [0|255] "" XXX
48-
SG_ Throttle_Cruise : 40|8@1+ (1,0) [0|255] "" XXX
49-
SG_ Throttle_Combo : 55|8@1+ (1,0) [0|255] "" XXX
50-
SG_ Throttle_Pedal : 32|8@1+ (1,0) [0|255] "" XXX
51-
SG_ NEW_SIGNAL_2 : 48|7@1+ (1,0) [0|1] "" XXX
5246
SG_ Counter : 8|4@1+ (1,0) [0|255] "" XXX
53-
SG_ Engine_RPM : 16|12@1+ (1,0) [0|255] "" XXX
5447
SG_ NEW_SIGNAL_1 : 12|4@1+ (1,0) [0|1] "" XXX
48+
SG_ Engine_RPM : 16|12@1+ (1,0) [0|255] "" XXX
5549
SG_ NEW_SIGNAL_4 : 28|5@1+ (1,0) [0|1] "" XXX
50+
SG_ Throttle_Pedal : 32|8@1+ (1,0) [0|255] "" XXX
51+
SG_ Throttle_Cruise : 40|8@1+ (1,0) [0|255] "" XXX
52+
SG_ Throttle_Combo : 48|7@1+ (1,0) [0|1] "" XXX
53+
SG_ Signal1 : 55|8@1+ (1,0) [0|255] "" XXX
54+
SG_ NEW_SIGNAL_3 : 56|4@1+ (1,0) [0|255] "" XXX
55+
SG_ Off_Accel : 60|4@1+ (1,0) [0|7] "" XXX
5656

5757
BO_ 65 NEW_MSG_1: 8 XXX
5858
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -63,12 +63,13 @@ BO_ 65 NEW_MSG_1: 8 XXX
6363
SG_ NEW_SIGNAL_6 : 48|8@1+ (1,0) [0|63] "" XXX
6464
SG_ NEW_SIGNAL_7 : 59|2@0+ (1,0) [0|255] "" XXX
6565

66-
BO_ 72 NEW_MSG_2: 8 XXX
66+
BO_ 72 Transmission: 8 XXX
6767
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
6868
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
69-
SG_ NEW_SIGNAL_3 : 40|16@1+ (1,0) [0|255] "" XXX
70-
SG_ NEW_SIGNAL_4 : 38|3@0+ (1,0) [0|255] "" XXX
7169
SG_ NEW_SIGNAL_5 : 16|8@1+ (1,0) [0|255] "" XXX
70+
SG_ Gear : 24|8@1+ (1,0) [0|255] "" XXX
71+
SG_ NEW_SIGNAL_4 : 38|3@0+ (1,0) [0|255] "" XXX
72+
SG_ NEW_SIGNAL_3 : 40|16@1+ (1,0) [0|255] "" XXX
7273

7374
BO_ 316 NEW_MSG_3: 8 XXX
7475

@@ -98,28 +99,38 @@ BO_ 73 NEW_MSG_5: 8 XXX
9899
SG_ NEW_SIGNAL_1 : 32|8@1+ (1,0) [0|4095] "" XXX
99100
SG_ NEW_SIGNAL_2 : 24|8@1+ (1,0) [0|127] "" XXX
100101

101-
BO_ 280 NEW_MSG_6: 8 XXX
102+
BO_ 280 STOP_START: 8 XXX
103+
SG_ Checksum : 0|8@1+ (1,0) [0|1] "" XXX
104+
SG_ Counter : 8|4@1+ (1,0) [0|1] "" XXX
102105
SG_ NEW_SIGNAL_1 : 12|12@1- (1,0) [0|4095] "" XXX
106+
SG_ NEW_SIGNAL_4 : 40|4@1+ (1,0) [0|255] "" XXX
103107
SG_ NEW_SIGNAL_2 : 48|8@1- (1,0) [0|255] "" XXX
104108
SG_ NEW_SIGNAL_3 : 61|1@1+ (1,0) [0|7] "" XXX
105-
SG_ NEW_SIGNAL_4 : 40|4@1+ (1,0) [0|255] "" XXX
109+
SG_ State : 63|1@1+ (1,0) [0|1] "" XXX
106110

107111
BO_ 281 Steering_Torque: 8 XXX
108112
SG_ checksum : 0|8@1+ (1,0) [0|3] "" XXX
109113
SG_ counter : 8|4@1+ (1,0) [0|15] "" XXX
114+
SG_ Steer_Error_1 : 12|1@0+ (1,0) [0|7] "" XXX
110115
SG_ Steer_Torque_Sensor : 16|11@1- (-1,0) [0|3] "" XXX
116+
SG_ Steer_Error_2 : 28|1@1+ (1,0) [0|3] "" XXX
111117
SG_ Steering_Angle : 32|16@1- (-0.0217,0) [0|255] "" X
112118
SG_ Steer_Torque_Output : 48|11@1- (-1,0) [0|31] "" XXX
113119

114120
BO_ 312 Brake_Pressure_L_R: 8 XXX
115121
SG_ Checksum : 0|8@1+ (1,0) [0|31] "" XXX
116122
SG_ Counter : 8|4@1+ (1,0) [0|3] "" XXX
117-
SG_ Brake_2 : 56|8@1+ (1,0) [0|255] "" XXX
118123
SG_ Brake_1 : 48|8@1+ (1,0) [0|255] "" XXX
124+
SG_ Brake_2 : 56|8@1+ (1,0) [0|255] "" XXX
119125

120126
BO_ 313 Brake_Pedal: 8 XXX
127+
SG_ Checksum : 0|8@1+ (1,0) [0|1] "" XXX
128+
SG_ Counter : 8|4@1+ (1,0) [0|1] "" XXX
129+
SG_ Signal1 : 12|22@1+ (1,0) [0|1] "" XXX
121130
SG_ Brake_Pedal_On : 34|1@1+ (1,0) [0|7] "" XXX
131+
SG_ Signal2 : 35|1@1+ (1,0) [0|1] "" XXX
122132
SG_ Brake_Pedal : 36|12@1+ (1,0) [0|65535] "" XXX
133+
SG_ Signal3 : 48|16@1+ (1,0) [0|1] "" XXX
123134

124135
BO_ 290 ES_LKAS: 8 XXX
125136
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -138,25 +149,34 @@ BO_ 722 NEW_MSG_10: 8 XXX
138149
BO_ 544 ES_Brake: 8 XXX
139150
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
140151
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
152+
SG_ Signal1 : 12|4@1+ (1,0) [0|1] "" XXX
141153
SG_ Brake_Pressure : 16|16@1+ (1,0) [0|255] "" XXX
142-
SG_ __Status : 36|4@1+ (1,0) [0|63] "" XXX
154+
SG_ Signal2 : 32|4@1+ (1,0) [0|1] "" XXX
155+
SG_ State : 36|4@1+ (1,0) [0|63] "" XXX
156+
SG_ Signal3 : 40|24@1+ (1,0) [0|1] "" XXX
143157

144158
BO_ 545 ES_Distance: 8 XXX
145159
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
146160
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
147-
SG_ Signal1 : 12|20@1+ (1,0) [0|15] "" XXX
148-
SG_ Signal2 : 32|24@1+ (1,0) [0|15] "" XXX
149-
SG_ ACC_Cancel : 56|1@1+ (1,0) [0|1] "" XXX
150-
SG_ ACC_Set : 57|1@1+ (1,0) [0|1] "" XXX
151-
SG_ ACC_Resume : 58|1@1+ (1,0) [0|1] "" XXX
152-
SG_ Signal3 : 59|5@1+ (1,0) [0|1] "" XXX
161+
SG_ ES_Cruise_Throttle : 12|20@1+ (1,0) [0|15] "" XXX
162+
SG_ Car_Follow : 32|1@1+ (1,0) [0|1] "" XXX
163+
SG_ Signal1 : 33|4@1+ (1,0) [0|1] "" XXX
164+
SG_ Distance_Swap : 37|1@1+ (1,0) [0|15] "" XXX
165+
SG_ Signal2 : 38|2@1+ (1,0) [0|1] "" XXX
166+
SG_ Close_Distance : 40|8@1+ (1,0) [0|1] "" XXX
167+
SG_ Signal3 : 48|8@1+ (1,0) [0|1] "" XXX
168+
SG_ Cruise_Cancel : 56|1@1+ (1,0) [0|1] "" XXX
169+
SG_ Cruise_Set : 57|1@1+ (1,0) [0|1] "" XXX
170+
SG_ Cruise_Resume : 58|1@1+ (1,0) [0|1] "" XXX
171+
SG_ Signal4 : 59|5@1+ (1,0) [0|1] "" XXX
153172

154173
BO_ 546 ES_Status: 8 XXX
155174
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
156175
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
157176
SG_ RPM : 16|12@1+ (1,0) [0|255] "" XXX
158177
SG_ Cruise_Activated : 29|1@0+ (1,0) [0|3] "" XXX
159178
SG_ Cruise_Brake : 30|1@1+ (1,0) [0|3] "" XXX
179+
SG_ Cruise_Hold : 31|1@1+ (1,0) [0|1] "" XXX
160180

161181
BO_ 554 ES_Blank: 8 XXX
162182
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -194,28 +214,34 @@ BO_ 912 Dashlights: 8 XXX
194214
SG_ SEATBELT_FL : 48|1@1+ (1,0) [0|1] "" XXX
195215

196216
BO_ 940 BodyInfo: 8 XXX
197-
SG_ DASH_BTN_LIGHTS : 56|1@0+ (1,0) [0|1] "" XXX
217+
SG_ Checksum : 0|8@1+ (1,0) [0|1] "" XXX
218+
SG_ Counter : 8|4@1+ (1,0) [0|1] "" XXX
198219
SG_ DOOR_OPEN_FL : 32|1@1+ (1,0) [0|255] "" XXX
199220
SG_ DOOR_OPEN_FR : 33|1@1+ (1,0) [0|3] "" XXX
200221
SG_ DOOR_OPEN_RL : 34|1@1+ (1,0) [0|1] "" XXX
201222
SG_ DOOR_OPEN_RR : 35|1@1+ (1,0) [0|1] "" XXX
202223
SG_ DOOR_OPEN_TRUNK : 36|1@0+ (1,0) [0|1] "" XXX
203-
SG_ FOG_LIGHTS2 : 60|1@1+ (1,0) [0|1] "" XXX
204-
SG_ Highbeam : 58|1@1+ (1,0) [0|1] "" XXX
224+
SG_ DASH_BTN_LIGHTS : 56|1@0+ (1,0) [0|1] "" XXX
205225
SG_ Lowbeam : 57|1@1+ (1,0) [0|3] "" XXX
226+
SG_ Highbeam : 58|1@1+ (1,0) [0|1] "" XXX
227+
SG_ FOG_LIGHTS2 : 60|1@1+ (1,0) [0|1] "" XXX
228+
SG_ WIPERS : 62|1@0+ (1,0) [0|1] "" XXX
206229

207230
BO_ 801 ES_DashStatus: 8 XXX
208231
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
209232
SG_ Counter : 8|4@1+ (1,0) [0|7] "" XXX
233+
SG_ PCB_Off : 12|1@1+ (1,0) [0|1] "" XXX
234+
SG_ LDW_Off : 13|1@1+ (1,0) [0|1] "" XXX
235+
SG_ Cruise_Distance : 28|3@1+ (1,0) [0|3] "" XXX
236+
SG_ Cruise_Disengaged : 35|1@1+ (1,0) [0|3] "" XXX
237+
SG_ Cruise_Activated : 36|1@1+ (1,0) [0|3] "" XXX
238+
SG_ Cruise_Set_Speed : 40|8@1+ (1,0) [0|255] "" XXX
239+
SG_ Cruise_Fault : 48|1@1+ (1,0) [0|1] "" XXX
210240
SG_ NEW_SIGNAL_10 : 49|2@1+ (1,0) [0|3] "" XXX
211241
SG_ Brake_Pedal : 51|1@1+ (1,0) [0|3] "" XXX
212-
SG_ Cruise_Set_Speed : 40|8@1+ (1,0) [0|255] "" XXX
213-
SG_ Cruise_Activated : 36|1@1+ (1,0) [0|3] "" XXX
214-
SG_ Cruise_Disengaged : 35|1@1+ (1,0) [0|3] "" XXX
215-
SG_ Far_Distance : 56|4@1+ (1,0) [0|15] "" XXX
216242
SG_ Car_Follow : 52|1@1+ (1,0) [0|3] "" XXX
217-
SG_ ACC_Distance : 28|3@1+ (1,0) [0|3] "" XXX
218-
SG_ ACC_Hold : 60|4@1+ (1,0) [0|15] "" XXX
243+
SG_ Far_Distance : 56|4@1+ (1,0) [0|15] "" XXX
244+
SG_ Cruise_State : 60|4@1+ (1,0) [0|15] "" XXX
219245

220246
BO_ 802 ES_LKAS_State: 8 XXX
221247
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -237,9 +263,9 @@ BO_ 802 ES_LKAS_State: 8 XXX
237263
SG_ FCW_Cont_Beep : 32|1@1+ (1,0) [0|1] "" XXX
238264
SG_ FCW_Repeated_Beep : 33|1@1+ (1,0) [0|1] "" XXX
239265
SG_ Throttle_Management_Activated : 34|1@1+ (1,0) [0|1] "" XXX
266+
SG_ Lead_Vehicle_Start_Alert : 35|1@1+ (1,0) [0|1] "" XXX
240267
SG_ Right_Depart : 36|1@1+ (1,0) [0|3] "" XXX
241268
SG_ Signal5 : 37|27@1+ (1,0) [0|1] "" XXX
242-
SG_ Vehicle_In_Front_Has_Moved : 35|1@1+ (1,0) [0|1] "" XXX
243269

244270
BO_ 805 ES_NEW_MSG_22: 8 XXX
245271
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -334,6 +360,7 @@ BO_ 1677 Dash_State: 8 XXX
334360
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
335361
SG_ NEW_SIGNAL_3 : 16|4@1+ (1,0) [0|15] "" XXX
336362
SG_ Units : 29|3@1+ (1,0) [0|7] "" XXX
363+
SG_ Icy_Road_Warning : 20|1@1+ (1,0) [0|1] "" XXX
337364

338365
BO_ 1743 NEW_MSG_41: 8 XXX
339366
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -360,10 +387,15 @@ BO_ 1787 NEW_MSG_45: 8 XXX
360387

361388

362389

363-
CM_ SG_ 940 FOG_LIGHTS2 "yellow fog light in the dash";
390+
CM_ SG_ 64 Throttle_Combo "Throttle Cruise + Pedal";
391+
CM_ SG_ 544 State "0 = ES disabled, 8 = ES enabled, 12, 13 = ES_Brake active";
392+
CM_ SG_ 545 ES_Cruise_Throttle "signal might be smaller, values do not correlate with Throttle:CruiseThrottle";
393+
CM_ SG_ 545 Distance_Swap "Switch from Close to Far distance";
364394
CM_ SG_ 940 Highbeam "01 = low beam, 11 = high beam";
365-
CM_ SG_ 801 ACC_Hold "0 = No Hold, 3 = Hold";
366-
CM_ SG_ 802 Vehicle_In_Front_Has_Moved "Crosstrek 2018 = car in front has moved";
395+
CM_ SG_ 940 FOG_LIGHTS2 "yellow fog light in the dash";
396+
CM_ SG_ 801 PCB_Off "Pre-Collision Braking";
397+
CM_ SG_ 801 Cruise_State "0 = Normal, 1 = Hold+User Brake, 2 = Ready, 3 = Hold";
367398
CM_ SG_ 805 NEW_SIGNAL_3 "always 3";
368399
CM_ SG_ 805 NEW_SIGNAL_4 "always 1";
369400
CM_ SG_ 1677 Units "1 = imperial, 6 = metric";
401+
VAL_ 72 Gear 2 "N" 3 "R" 4 "P" 121 "D" 137 "1" 145 "2" 153 "3" 161 "4" 169 "5" 177 "6" ;

‎subaru_global_2017.dbc

+17-12
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,13 @@ BO_ 65 NEW_MSG_1: 8 XXX
6363
SG_ NEW_SIGNAL_6 : 48|8@1+ (1,0) [0|63] "" XXX
6464
SG_ NEW_SIGNAL_7 : 59|2@0+ (1,0) [0|255] "" XXX
6565

66-
BO_ 72 NEW_MSG_2: 8 XXX
66+
BO_ 72 Transmission: 8 XXX
6767
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
6868
SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX
69-
SG_ NEW_SIGNAL_3 : 40|16@1+ (1,0) [0|255] "" XXX
70-
SG_ NEW_SIGNAL_4 : 38|3@0+ (1,0) [0|255] "" XXX
7169
SG_ NEW_SIGNAL_5 : 16|8@1+ (1,0) [0|255] "" XXX
70+
SG_ Gear : 24|8@1+ (1,0) [0|255] "" XXX
71+
SG_ NEW_SIGNAL_4 : 38|3@0+ (1,0) [0|255] "" XXX
72+
SG_ NEW_SIGNAL_3 : 40|16@1+ (1,0) [0|255] "" XXX
7273

7374
BO_ 316 NEW_MSG_3: 8 XXX
7475

@@ -196,28 +197,30 @@ BO_ 912 Dashlights: 8 XXX
196197
SG_ SEATBELT_FL : 48|1@1+ (1,0) [0|1] "" XXX
197198

198199
BO_ 940 BodyInfo: 8 XXX
199-
SG_ DASH_BTN_LIGHTS : 56|1@0+ (1,0) [0|1] "" XXX
200200
SG_ DOOR_OPEN_FL : 32|1@1+ (1,0) [0|255] "" XXX
201201
SG_ DOOR_OPEN_FR : 33|1@1+ (1,0) [0|3] "" XXX
202202
SG_ DOOR_OPEN_RL : 34|1@1+ (1,0) [0|1] "" XXX
203203
SG_ DOOR_OPEN_RR : 35|1@1+ (1,0) [0|1] "" XXX
204204
SG_ DOOR_OPEN_TRUNK : 36|1@0+ (1,0) [0|1] "" XXX
205-
SG_ FOG_LIGHTS2 : 60|1@1+ (1,0) [0|1] "" XXX
206-
SG_ Highbeam : 58|1@1+ (1,0) [0|1] "" XXX
205+
SG_ DASH_BTN_LIGHTS : 56|1@0+ (1,0) [0|1] "" XXX
207206
SG_ Lowbeam : 57|1@1+ (1,0) [0|3] "" XXX
207+
SG_ Highbeam : 58|1@1+ (1,0) [0|1] "" XXX
208+
SG_ FOG_LIGHTS2 : 60|1@1+ (1,0) [0|1] "" XXX
209+
SG_ WIPERS : 62|1@0+ (1,0) [0|1] "" XXX
208210

209211
BO_ 801 ES_DashStatus: 8 XXX
210212
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
211213
SG_ Counter : 8|4@1+ (1,0) [0|7] "" XXX
212-
SG_ NEW_SIGNAL_9 : 60|4@1+ (1,0) [0|15] "" XXX
214+
SG_ Cruise_Distance : 28|3@1+ (1,0) [0|3] "" XXX
215+
SG_ Cruise_Disengaged : 35|1@1+ (1,0) [0|3] "" XXX
216+
SG_ Cruise_Activated : 36|1@1+ (1,0) [0|3] "" XXX
217+
SG_ Cruise_Set_Speed : 40|8@1+ (1,0) [0|255] "" XXX
218+
SG_ Cruise_Fault : 48|1@1+ (1,0) [0|1] "" XXX
213219
SG_ NEW_SIGNAL_10 : 49|2@1+ (1,0) [0|3] "" XXX
214220
SG_ Brake_Pedal : 51|1@1+ (1,0) [0|3] "" XXX
215-
SG_ Cruise_Set_Speed : 40|8@1+ (1,0) [0|255] "" XXX
216-
SG_ Cruise_Activated : 36|1@1+ (1,0) [0|3] "" XXX
217-
SG_ Cruise_Disengaged : 35|1@1+ (1,0) [0|3] "" XXX
218-
SG_ Far_Distance : 56|4@1+ (1,0) [0|15] "" XXX
219221
SG_ Car_Follow : 52|1@1+ (1,0) [0|3] "" XXX
220-
SG_ ACC_Distance : 28|3@1+ (1,0) [0|3] "" XXX
222+
SG_ Far_Distance : 56|4@1+ (1,0) [0|15] "" XXX
223+
SG_ Cruise_State : 60|4@1+ (1,0) [0|15] "" XXX
221224

222225
BO_ 802 ES_LKAS_State: 8 XXX
223226
SG_ Checksum : 0|8@1+ (1,0) [0|255] "" XXX
@@ -364,7 +367,9 @@ BO_ 1787 NEW_MSG_45: 8 XXX
364367

365368
CM_ SG_ 940 FOG_LIGHTS2 "yellow fog light in the dash";
366369
CM_ SG_ 940 Highbeam "01 = low beam, 11 = high beam";
370+
CM_ SG_ 801 Cruise_State "0 = Normal, 3 = Hold";
367371
CM_ SG_ 802 Traffic_light_Ahead "Crosstrek 2018 = car in front has moved";
368372
CM_ SG_ 805 NEW_SIGNAL_3 "always 3";
369373
CM_ SG_ 805 NEW_SIGNAL_4 "always 1";
370374
CM_ SG_ 1677 Units "1 = imperial, 6 = metric";
375+
VAL_ 72 Gear 2 "N" 3 "R" 4 "P" 121 "D" 137 "1" 145 "2" 153 "3" 161 "4" 169 "5" 177 "6";

0 commit comments

Comments
 (0)