Skip to content

Commit 5424246

Browse files
author
Vehicle Researcher
committed
Squashed 'opendbc/' changes from 2ae0327..a1aa3b7
a1aa3b7 Cleanup of Nissan DBC (#218) c1f7648 reverting changes to Chrysler: speed message seems different from car to car 2de8e9e Chrysler: Speed msg is 5 bytes f4ac315 Chrysler: add counter to 514 0fb62cf Toyota Blind Spot Monitor (TSS2-only?) (#219) git-subtree-dir: opendbc git-subtree-split: a1aa3b7
1 parent ab3557e commit 5424246

6 files changed

+91
-67
lines changed

‎generator/toyota/_toyota_nodsu_bsm.dbc

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
BO_ 1014 BSM: 8 XXX
2+
SG_ L_ADJACENT : 0|1@0+ (1,0) [0|1] "" XXX
3+
SG_ L_APPROACHING : 8|1@0+ (1,0) [0|1] "" XXX
4+
SG_ R_ADJACENT : 1|1@0+ (1,0) [0|1] "" XXX
5+
SG_ R_APPROACHING : 10|1@0+ (1,0) [0|1] "" XXX
6+
SG_ ADJACENT_ENABLED : 7|1@0+ (1,0) [0|1] "" XXX
7+
SG_ APPROACHING_ENABLED : 15|1@0+ (1,0) [0|1] "" XXX
8+
9+
CM_ SG_ 1014 L_ADJACENT "vehicle adjacent left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
10+
CM_ SG_ 1014 L_APPROACHING "vehicle approaching from left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
11+
CM_ SG_ 1014 R_ADJACENT "vehicle adjacent right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
12+
CM_ SG_ 1014 R_APPROACHING "vehicle approaching from right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
13+
CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along with APPROACHING_ENABLED. this controls bsm alert visibility";
14+
CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility";

‎generator/toyota/toyota_nodsu_hybrid_pt.dbc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CM_ "IMPORT _toyota_2017.dbc"
22
CM_ "IMPORT _comma.dbc"
3+
CM_ "IMPORT _toyota_nodsu_bsm.dbc"
34

45
BO_ 295 GEAR_PACKET: 8 XXX
56
SG_ CAR_MOVEMENT : 39|8@0- (1,0) [0|255] "" XXX

‎generator/toyota/toyota_nodsu_pt.dbc

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CM_ "IMPORT _toyota_2017.dbc"
22
CM_ "IMPORT _comma.dbc"
3+
CM_ "IMPORT _toyota_nodsu_bsm.dbc"
34

45
BO_ 401 STEERING_LTA: 8 XXX
56
SG_ COUNTER : 7|8@0+ (1,0) [0|255] "" XXX

‎nissan_2017.dbc

+39-67
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,28 @@ BO_ 645 WheelspeedRear: 8 XXX
4545
SG_ RR : 7|16@0+ (0.00555,0) [0|65535] "KPH" XXX
4646
SG_ RL : 23|16@0+ (0.00555,0) [0|65535] "KPH" XXX
4747

48-
BO_ 768 STEER_TORQUE: 8 XXX
49-
SG_ STEERING_TOURQUE : 0|7@1+ (1,0) [0|127] "" XXX
48+
BO_ 768 STEER_TORQUE: 2 XXX
49+
SG_ STEERING_TORQUE : 6|7@0+ (1,0) [0|127] "" XXX
50+
SG_ DriverTouchingWheel : 15|1@0+ (-1,1) [0|7] "" XXX
5051

5152
BO_ 459 Maybe_RegenBraking: 8 XXX
5253

5354
BO_ 372 Maybe_Gear_Selector: 8 XXX
54-
SG_ Counter : 32|4@1+ (1,0) [0|15] "" XXX
55+
SG_ Counter : 35|4@0+ (1,0) [0|15] "" XXX
5556

5657
BO_ 374 Maybe_Motor_RPM_or_Speed: 8 XXX
57-
SG_ Counter : 48|4@1+ (1,0) [0|15] "" XXX
58+
SG_ Counter : 51|4@0+ (1,0) [0|15] "" XXX
5859

5960
BO_ 460 Maybe_Brake_Related: 8 XXX
6061

6162
BO_ 2 SteeringWheel: 8 XXX
62-
SG_ Steering_RateChange : 23|8@0+ (1,0) [0|255] "" XXX
63-
SG_ Always_07 : 31|8@0+ (1,0) [0|255] "" XXX
63+
SG_ Steering_RateChange : 16|8@1+ (1,0) [0|255] "" XXX
64+
SG_ Always_07 : 24|8@1+ (1,0) [0|255] "" XXX
6465
SG_ Steering_Angle : 0|16@1- (-0.1,0) [0|65535] "" XXX
66+
SG_ Counter : 32|4@1+ (1,0) [0|15] "" XXX
6567

6668
BO_ 384 Maybe_PowerInfo: 8 XXX
67-
SG_ Unknown_Timer_PowerInfo : 48|4@1+ (1,0) [0|15] "" XXX
69+
SG_ Unknown_Timer_PowerInfo : 51|4@0+ (1,0) [0|15] "" XXX
6870
SG_ EnginePower : 27|12@0- (1,0) [0|1] "" XXX
6971
SG_ RequestedAccel : 23|12@0- (1,0) [0|4294967295] "" XXX
7072

@@ -78,64 +80,39 @@ BO_ 666 WheelspeedFront: 8 XXX
7880
SG_ FR : 7|16@0+ (0.00555,0) [0|65535] "KPH" XXX
7981
SG_ FL : 23|16@0+ (0.00555,0) [0|65535] "KPH" XXX
8082

81-
BO_ 398 NEW_MSG_2: 8 XXX
82-
83-
BO_ 389 NEW_MSG_3: 8 XXX
84-
SG_ NEW_SIGNAL_1 : 15|8@0+ (1,0) [0|255] "" XXX
85-
SG_ NEW_SIGNAL_2 : 22|6@0+ (1,0) [0|3] "" XXX
86-
SG_ NEW_SIGNAL_4 : 47|8@0+ (1,0) [0|255] "" XXX
87-
SG_ NEW_SIGNAL_5 : 55|4@0+ (1,0) [0|255] "" XXX
88-
SG_ NEW_SIGNAL_6 : 63|8@0+ (1,0) [0|127] "" XXX
89-
SG_ COUNTER : 48|4@1+ (1,0) [0|15] "" XXX
90-
SG_ NEW_SIGNAL_3 : 30|8@0- (1,0) [0|255] "" XXX
91-
92-
BO_ 397 NEW_MSG_4: 8 XXX
93-
SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|3] "" XXX
94-
SG_ NEW_SIGNAL_2 : 23|16@0+ (1,0) [0|32767] "" XXX
95-
SG_ NEW_SIGNAL_3 : 39|16@0+ (1,0) [0|65535] "" XXX
96-
SG_ NEW_SIGNAL_4 : 55|16@0+ (1,0) [0|31] "" XXX
97-
98-
BO_ 658 NEW_MSG_5: 8 XXX
99-
SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|255] "" XXX
100-
101-
BO_ 855 NEW_MSG_6: 8 XXX
102-
SG_ NEW_SIGNAL_1 : 7|8@0+ (1,0) [0|255] "" XXX
103-
104-
BO_ 773 NEW_MSG_7: 8 XXX
105-
SG_ NEW_SIGNAL_1 : 39|8@0+ (1,0) [0|255] "" XXX
106-
SG_ NEW_SIGNAL_2 : 47|8@0+ (1,0) [0|255] "" XXX
83+
BO_ 389 Steering: 8 XXX
84+
SG_ COUNTER : 51|4@0+ (1,0) [0|15] "" XXX
85+
SG_ LKAS_ACTIVE : 37|1@0+ (1,0) [0|3] "" XXX
86+
SG_ LKAS_Torque : 47|8@0+ (1,0) [0|255] "" XXX
87+
SG_ CRC : 63|8@0+ (1,0) [0|127] "" XXX
88+
SG_ Angle : 23|18@0+ (-0.01,1310) [0|262143] "" XXX
89+
SG_ DriverTorque : 7|12@0+ (1,-2047) [0|4095] "" XXX
10790

10891
BO_ 851 SPEED_RELATED: 8 XXX
10992
SG_ SPEED_RELATED : 7|16@0+ (0.01014,0) [0|65535] "" XXX
11093

11194
BO_ 386 Accelerator: 8 XXX
11295
SG_ Accelerator : 38|7@0+ (1,0) [0|127] "" XXX
11396

114-
BO_ 347 ACCELSOMETHING: 8 XXX
115-
SG_ PowerMaybe : 9|10@0+ (1,0) [0|1023] "" XXX
116-
SG_ ACCELERATOR2 : 6|11@0+ (1,-800) [0|65535] "" XXX
117-
118-
BO_ 346 ANOTHER_ACCEL: 8 XXX
119-
SG_ ANOTHERACCEL : 23|10@0+ (1,0) [0|1023] "" XXX
120-
SG_ Reverse_ACCEL : 25|10@0+ (1,0) [0|1023] "" XXX
121-
122-
BO_ 348 FULLRANGEACCEL: 8 XXX
123-
SG_ AccelFullRange : 47|10@0+ (1,0) [0|1023] "" XXX
124-
SG_ Accel : 26|11@0+ (1,0) [0|2047] "" XXX
97+
BO_ 348 Throttle: 8 XXX
12598
SG_ NEW_SIGNAL_1 : 7|8@0+ (1,0) [0|255] "" XXX
126-
127-
BO_ 566 ANOTHERFULLRANGEACCEL: 8 XXX
128-
SG_ ANOTHERFULLRANGEACCEL : 43|8@0+ (1,0) [0|1023] "" XXX
129-
SG_ RPMORTORQUE : 31|8@0+ (1,0) [0|255] "" XXX
130-
131-
BO_ 523 Yetyetanotheraccel: 8 XXX
132-
SG_ ANOTHERREVERSEACCEL : 37|10@0+ (1,0) [0|1023] "" XXX
133-
SG_ yetyetanotheraccel : 31|10@0+ (1,0) [0|255] "" XXX
134-
135-
BO_ 779 ANOTHERRRFULLRANGEACCEL: 8 XXX
136-
SG_ ANOTHERRRFULLRANGEACCEL : 47|8@0+ (1,0) [0|255] "" XXX
137-
138-
BO_ 1108 Doors: 8 XXX
99+
SG_ Throttle : 26|11@0+ (1,0) [0|2047] "" XXX
100+
SG_ ThrottlePedal : 47|10@0+ (1,0) [0|1023] "" XXX
101+
102+
BO_ 523 CruiseThrottle: 6 XXX
103+
SG_ PROPILOT_BUTTON : 8|1@0+ (1,0) [0|1] "" XXX
104+
SG_ CANCEL_BUTTON : 9|1@0+ (1,0) [0|1] "" XXX
105+
SG_ GAS_PEDAL_INVERTED : 37|10@0+ (1,0) [0|1023] "" XXX
106+
SG_ unsure2 : 23|8@0+ (1,0) [0|255] "" XXX
107+
SG_ SET_BUTTON : 11|1@0+ (1,0) [0|1] "" XXX
108+
SG_ RES_BUTTON : 12|1@0+ (1,0) [0|1] "" XXX
109+
SG_ FOLLOW_DISTANCE_BUTTON : 10|1@0+ (1,0) [0|1] "" XXX
110+
SG_ NO_BUTTON_PRESSED : 13|1@0+ (1,0) [0|1] "" XXX
111+
SG_ GAS_PEDAL : 31|10@0+ (1,0) [0|255] "" XXX
112+
SG_ unsure3 : 43|4@0+ (1,0) [0|15] "" XXX
113+
SG_ unsure : 7|10@0+ (1,0) [0|63] "" XXX
114+
115+
BO_ 1108 DoorsLights: 8 XXX
139116
SG_ DOOR_CLOSED_RR : 40|1@0+ (1,0) [0|1] "" XXX
140117
SG_ DOOR_OPEN_RR : 41|1@0+ (1,0) [0|1] "" XXX
141118
SG_ DOOR_CLOSED_RL : 42|1@0+ (1,0) [0|1] "" XXX
@@ -145,21 +122,17 @@ BO_ 1108 Doors: 8 XXX
145122
SG_ DOOR_CLOSED_FR : 46|1@0+ (1,0) [0|3] "" XXX
146123
SG_ DOOR_OPEN_FR : 47|1@0+ (1,0) [0|3] "" XXX
147124
SG_ BOOT_OPEN : 55|1@0+ (1,0) [0|1] "" XXX
125+
SG_ BRAKE_LIGHT : 54|1@0+ (1,0) [0|1] "" XXX
126+
SG_ USER_BRAKE_PRESSED : 23|1@0+ (1,0) [0|1] "" XXX
148127

149128
BO_ 403 LKAS_OLD: 8 XXX
150129
SG_ Checksum : 63|8@0+ (1,0) [0|255] "" XXX
151130
SG_ Angle_2 : 32|13@0+ (1,-4000) [0|63] "" XXX
152-
SG_ Counter : 48|4@1+ (1,0) [0|15] "" XXX
131+
SG_ Counter : 51|4@0+ (1,0) [0|15] "" XXX
153132
SG_ Angle_1 : 10|13@0+ (0.12,-480) [0|65535] "" XXX
154133
SG_ Steering_Torque : 7|13@0+ (-1,4000) [0|65535] "" XXX
155134
SG_ Torque_Command : 29|13@0+ (1,-4000) [0|255] "" XXX
156135

157-
BO_ 412 NEW_MSG_9: 8 XXX
158-
SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|65535] "" XXX
159-
SG_ NEW_SIGNAL_3 : 23|16@0+ (1,0) [0|65535] "" XXX
160-
SG_ NEW_SIGNAL_2 : 39|8@0+ (1,0) [0|3] "" XXX
161-
SG_ NEW_SIGNAL_4 : 47|8@0+ (1,0) [0|255] "" XXX
162-
163136
BO_ 361 LKAS: 8 XXX
164137
SG_ NEW_SIGNAL_4 : 39|8@0+ (1,0) [0|255] "" XXX
165138
SG_ SET_X80 : 47|8@0+ (1,0) [0|255] "" XXX
@@ -175,10 +148,9 @@ BO_ 438 ProPilot: 8 XXX
175148
SG_ NEW_SIGNAL_8 : 63|8@0+ (1,0) [0|7] "" XXX
176149
SG_ Counter : 55|4@0+ (1,0) [0|255] "" XXX
177150
SG_ NEW_SIGNAL_6 : 47|8@0+ (1,0) [0|255] "" XXX
178-
SG_ SET_3 : 32|2@1+ (1,0) [0|15] "" XXX
151+
SG_ SET_3 : 33|2@0+ (1,0) [0|15] "" XXX
179152
SG_ NEW_SIGNAL_1 : 7|12@0- (1,0) [0|255] "" XXX
180153
SG_ NEW_SIGNAL_3 : 23|12@0- (-1,0) [0|255] "" XXX
181-
SG_ CRUISE_ON : 36|1@0+ (1,0) [0|255] "" XXX
182154
SG_ CRUISE_ACTIVATED : 38|1@0+ (1,0) [0|3] "" XXX
183155
SG_ STEER_STATUS : 51|1@1+ (1,0) [0|3] "" XXX
184-
156+
SG_ CRUISE_ON : 36|1@0+ (1,0) [0|255] "" XXX

‎toyota_nodsu_hybrid_pt_generated.dbc

+18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
CM_ "AUTOGENERATED FILE, DO NOT EDIT"
22

33

4+
CM_ "Imported file _toyota_nodsu_bsm.dbc starts here"
5+
BO_ 1014 BSM: 8 XXX
6+
SG_ L_ADJACENT : 0|1@0+ (1,0) [0|1] "" XXX
7+
SG_ L_APPROACHING : 8|1@0+ (1,0) [0|1] "" XXX
8+
SG_ R_ADJACENT : 1|1@0+ (1,0) [0|1] "" XXX
9+
SG_ R_APPROACHING : 10|1@0+ (1,0) [0|1] "" XXX
10+
SG_ ADJACENT_ENABLED : 7|1@0+ (1,0) [0|1] "" XXX
11+
SG_ APPROACHING_ENABLED : 15|1@0+ (1,0) [0|1] "" XXX
12+
13+
CM_ SG_ 1014 L_ADJACENT "vehicle adjacent left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
14+
CM_ SG_ 1014 L_APPROACHING "vehicle approaching from left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
15+
CM_ SG_ 1014 R_ADJACENT "vehicle adjacent right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
16+
CM_ SG_ 1014 R_APPROACHING "vehicle approaching from right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
17+
CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along with APPROACHING_ENABLED. this controls bsm alert visibility";
18+
CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility";
19+
20+
421
CM_ "Imported file _comma.dbc starts here"
522
BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
623
SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
@@ -360,6 +377,7 @@ CM_ "toyota_nodsu_hybrid_pt.dbc starts here"
360377

361378

362379

380+
363381
BO_ 295 GEAR_PACKET: 8 XXX
364382
SG_ CAR_MOVEMENT : 39|8@0- (1,0) [0|255] "" XXX
365383
SG_ COUNTER : 55|8@0+ (1,0) [0|255] "" XXX

‎toyota_nodsu_pt_generated.dbc

+18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
CM_ "AUTOGENERATED FILE, DO NOT EDIT"
22

33

4+
CM_ "Imported file _toyota_nodsu_bsm.dbc starts here"
5+
BO_ 1014 BSM: 8 XXX
6+
SG_ L_ADJACENT : 0|1@0+ (1,0) [0|1] "" XXX
7+
SG_ L_APPROACHING : 8|1@0+ (1,0) [0|1] "" XXX
8+
SG_ R_ADJACENT : 1|1@0+ (1,0) [0|1] "" XXX
9+
SG_ R_APPROACHING : 10|1@0+ (1,0) [0|1] "" XXX
10+
SG_ ADJACENT_ENABLED : 7|1@0+ (1,0) [0|1] "" XXX
11+
SG_ APPROACHING_ENABLED : 15|1@0+ (1,0) [0|1] "" XXX
12+
13+
CM_ SG_ 1014 L_ADJACENT "vehicle adjacent left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
14+
CM_ SG_ 1014 L_APPROACHING "vehicle approaching from left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
15+
CM_ SG_ 1014 R_ADJACENT "vehicle adjacent right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
16+
CM_ SG_ 1014 R_APPROACHING "vehicle approaching from right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED";
17+
CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along with APPROACHING_ENABLED. this controls bsm alert visibility";
18+
CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility";
19+
20+
421
CM_ "Imported file _comma.dbc starts here"
522
BO_ 359 STEERING_IPAS_COMMA: 8 IPAS
623
SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX
@@ -360,6 +377,7 @@ CM_ "toyota_nodsu_pt.dbc starts here"
360377

361378

362379

380+
363381
BO_ 401 STEERING_LTA: 8 XXX
364382
SG_ COUNTER : 7|8@0+ (1,0) [0|255] "" XXX
365383
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX

0 commit comments

Comments
 (0)