Skip to content

Commit 3f6cd74

Browse files
arne182rbiasini
arne182
authored and
rbiasini
committed
Add 3rd RSA signal and cleanup (#120)
* Add 3rd RSA signal and cleanup Moved order of messages to be ascending. Added 3rd can message from RSA and added value for the no overtake sign. * Add more comments * More comments * Add better explaination * Add 1163 Comments * SPDVAL1 checked and comment corrected * TSGN3 Signs * generate new files with rsa
1 parent a308ec1 commit 3f6cd74

12 files changed

+672
-300
lines changed

‎generator/toyota/_toyota_2017.dbc

+56-25
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ BO_ 36 KINEMATICS: 8 XXX
4040
SG_ YAW_RATE : 1|10@0+ (1,-512) [0|65535] "" XXX
4141
SG_ STEERING_TORQUE : 17|10@0+ (1,-512) [0|65535] "" XXX
4242

43+
BO_ 37 STEER_ANGLE_SENSOR: 8 XXX
44+
SG_ STEER_ANGLE : 3|12@0- (1.5,0) [-500|500] "deg" XXX
45+
SG_ STEER_FRACTION : 39|4@0- (0.1,0) [-0.7|0.7] "deg" XXX
46+
SG_ STEER_RATE : 35|12@0- (1,0) [-2000|2000] "deg/s" XXX
47+
4348
BO_ 166 BRAKE: 8 XXX
4449
SG_ BRAKE_AMOUNT : 7|8@0+ (1,0) [0|255] "" XXX
4550
SG_ BRAKE_PEDAL : 23|8@0+ (1,0) [0|255] "" XXX
@@ -63,6 +68,12 @@ BO_ 466 PCM_CRUISE: 8 XXX
6368
SG_ CRUISE_STATE : 55|4@0+ (1,0) [0|15] "" XXX
6469
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
6570

71+
BO_ 467 PCM_CRUISE_2: 8 XXX
72+
SG_ MAIN_ON : 15|1@0+ (1,0) [0|1] "" XXX
73+
SG_ LOW_SPEED_LOCKOUT : 14|2@0+ (1,0) [0|3] "kph" XXX
74+
SG_ SET_SPEED : 23|8@0+ (1,0) [0|255] "kph" XXX
75+
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
76+
6677
BO_ 552 ACCELEROMETER: 8 XXX
6778
SG_ ACCEL_Z : 22|15@0- (1,0) [0|32767] "" XXX
6879
SG_ ACCEL_X : 6|15@0- (0.001,0) [-20|20] "m/s2" XXX
@@ -103,20 +114,6 @@ BO_ 835 ACC_CONTROL: 8 DSU
103114
SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU
104115
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
105116

106-
BO_ 1556 STEERING_LEVERS: 8 XXX
107-
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX
108-
109-
BO_ 37 STEER_ANGLE_SENSOR: 8 XXX
110-
SG_ STEER_ANGLE : 3|12@0- (1.5,0) [-500|500] "deg" XXX
111-
SG_ STEER_FRACTION : 39|4@0- (0.1,0) [-0.7|0.7] "deg" XXX
112-
SG_ STEER_RATE : 35|12@0- (1,0) [-2000|2000] "deg/s" XXX
113-
114-
BO_ 467 PCM_CRUISE_2: 8 XXX
115-
SG_ MAIN_ON : 15|1@0+ (1,0) [0|1] "" XXX
116-
SG_ LOW_SPEED_LOCKOUT : 14|2@0+ (1,0) [0|3] "kph" XXX
117-
SG_ SET_SPEED : 23|8@0+ (1,0) [0|255] "kph" XXX
118-
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
119-
120117
BO_ 921 PCM_CRUISE_SM: 8 XXX
121118
SG_ MAIN_ON : 4|1@0+ (1,0) [0|1] "" XXX
122119
SG_ CRUISE_CONTROL_STATE : 11|4@0+ (1,0) [0|15] "" XXX
@@ -151,6 +148,9 @@ BO_ 1042 LKAS_HUD: 8 XXX
151148

152149
BO_ 1553 UI_SEETING: 8 XXX
153150
SG_ UNITS : 26|2@0+ (1,0) [0|3] "" XXX
151+
152+
BO_ 1556 STEERING_LEVERS: 8 XXX
153+
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX
154154

155155
BO_ 1568 SEATS_DOORS: 8 XXX
156156
SG_ SEATBELT_DRIVER_UNLATCHED : 62|1@0+ (1,0) [0|1] "" XXX
@@ -192,34 +192,65 @@ BO_ 1162 RSA2: 8 FCM
192192
SG_ SPDUNT : 63|2@0+ (1,0) [0|0] "" XXX
193193
SG_ TSRWMSG : 61|2@0+ (1,0) [0|0] "" XXX
194194
SG_ SYNCID2 : 59|4@0+ (1,0) [0|0] "" XXX
195+
196+
BO_ 1163 RSA3: 8 FCM
197+
SG_ TSREQPD : 7|1@0+ (1,0) [0|0] "" XXX
198+
SG_ TSRMSW : 6|1@0+ (1,0) [0|0] "" XXX
199+
SG_ OTSGNNTM : 5|2@0+ (1,0) [0|0] "" XXX
200+
SG_ NTLVLSPD : 3|2@0+ (1,0) [0|0] "" XXX
201+
SG_ OVSPNTM : 1|2@0+ (1,0) [0|0] "" XXX
202+
SG_ OVSPVALL : 11|4@0+ (1,-5) [0|0] "" XXX
203+
SG_ OVSPVALM : 19|4@0+ (1,-5) [0|0] "" XXX
204+
SG_ OVSPVALH : 27|4@0+ (1,-5) [0|0] "" XXX
205+
SG_ TSRSPU : 33|2@0+ (1,0) [0|0] "" XXX
195206

196207
CM_ SG_ 36 ACCEL_Y "unit is tbd";
197208
CM_ SG_ 36 YAW_RATE "verify";
198209
CM_ SG_ 36 STEERING_TORQUE "does not seem the steer torque, tbd";
210+
CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
211+
CM_ SG_ 37 STEER_RATE "factor is tbd";
199212
CM_ SG_ 466 ACCEL_NET "net acceleration produced by the system, given ACCEL_CMD, road grade and other factors";
213+
CM_ SG_ 467 SET_SPEED "43 kph are shown as 28mph, so conversion isnt perfect";
214+
CM_ SG_ 467 LOW_SPEED_LOCKOUT "in low speed lockout, system would always disengage below 28mph";
200215
CM_ SG_ 560 BRAKE_PRESSED "another brake pressed?";
201-
CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
202216
CM_ SG_ 608 STEER_TORQUE_DRIVER "driver torque";
203217
CM_ SG_ 608 STEER_OVERRIDE "set when driver torque exceeds a certain value";
204218
CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
205-
CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
206-
CM_ SG_ 37 STEER_RATE "factor is tbd";
207-
CM_ SG_ 467 SET_SPEED "43 kph are shown as 28mph, so conversion isnt perfect";
208-
CM_ SG_ 467 LOW_SPEED_LOCKOUT "in low speed lockout, system would always disengage below 28mph";
209219
CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
220+
CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
210221
CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
211222
CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
212-
CM_ SG_ 1161 SPDVAL1 "is the displayed speed 10,30,50,60,70,80,90,100,120 and 255 is for no limit. SPDVAL2 is the secondary speed usually written smaller";
213-
VAL_ 466 CRUISE_STATE 8 "active" 7 "standstill" 1 "off" ;
214-
VAL_ 467 LOW_SPEED_LOCKOUT 2 "low speed locked" 1 "ok" ;
223+
CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
224+
CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
225+
CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
226+
CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
227+
CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
228+
CM_ SG_ 1163 TSREQPD "always 1";
229+
CM_ SG_ 1163 TSRMSW "always 1";
230+
CM_ SG_ 1163 OTSGNNTM "always 3";
231+
CM_ SG_ 1163 NTLVLSPD "always 3";
232+
CM_ SG_ 1163 OVSPNTM "always 3";
233+
CM_ SG_ 1163 OVSPVALL "-5 at start then 2 after 2 seconds";
234+
CM_ SG_ 1163 OVSPVALM "-5 at start then 5 after 2 seconds";
235+
CM_ SG_ 1163 OVSPVALH "-5 at start then 10 after 2 seconds";
236+
CM_ SG_ 1163 TSRSPU "always 1";
237+
238+
VAL_ 466 CRUISE_STATE 8 "active" 7 "standstill" 1 "off";
239+
VAL_ 467 LOW_SPEED_LOCKOUT 2 "low speed locked" 1 "ok";
215240
VAL_ 614 STATE 3 "enabled" 1 "disabled";
216241
VAL_ 614 DIRECTION_CMD 3 "right" 2 "center" 1 "left";
217-
VAL_ 1553 UNITS 1 "km" 2 "miles";
218-
VAL_ 1556 TURN_SIGNALS 3 "none" 2 "right" 1 "left" ;
242+
VAL_ 921 CRUISE_CONTROL_STATE 2 "disabled" 11 "hold" 10 "hold_waiting_user_cmd" 6 "enabled" 5 "faulted";
219243
VAL_ 1042 LDA_ALERT 3 "hold with continuous beep" 2 "LDA unavailable" 1 "hold" 0 "none";
220244
VAL_ 1042 BARRIERS 3 "both" 2 "right" 1 "left" 0 "none";
221245
VAL_ 1042 RIGHT_LINE 3 "orange" 2 "double" 1 "solid" 0 "none";
222246
VAL_ 1042 LEFT_LINE 3 "orange" 2 "double" 1 "solid" 0 "none";
223-
VAL_ 921 CRUISE_CONTROL_STATE 2 "disabled" 11 "hold" 10 "hold_waiting_user_cmd" 6 "enabled" 5 "faulted";
247+
VAL_ 1553 UNITS 1 "km" 2 "miles";
248+
VAL_ 1556 TURN_SIGNALS 3 "none" 2 "right" 1 "left";
249+
VAL_ 1161 TSGN1 1 "speed sign" 0 "none";
250+
VAL_ 1161 TSGN2 1 "speed sign" 0 "none";
251+
VAL_ 1161 SPLSGN2 15 "conditional" 0 "none";
252+
VAL_ 1162 TSGN3 0 "none" 1 "speed sign" 2 "0 unlimited" 7 "unlimited" 16 "highway" 17 "no highway" 18 "motorway" 19 "no motorway" 20 "in city" 21 "outside city" 22 "pedestrian area" 23 "no pedestrian area" 65 "no overtaking left" 66 "no overtaking right" 67 "overtaking allowed again" 65 "no overtake" 129 "no entry";
253+
VAL_ 1162 SPLSGN3 15 "conditional" 0 "none";
254+
224255

225256
CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";

‎lexus_rx_hybrid_2017_pt_generated.dbc

+56-25
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ BO_ 36 KINEMATICS: 8 XXX
7272
SG_ YAW_RATE : 1|10@0+ (1,-512) [0|65535] "" XXX
7373
SG_ STEERING_TORQUE : 17|10@0+ (1,-512) [0|65535] "" XXX
7474

75+
BO_ 37 STEER_ANGLE_SENSOR: 8 XXX
76+
SG_ STEER_ANGLE : 3|12@0- (1.5,0) [-500|500] "deg" XXX
77+
SG_ STEER_FRACTION : 39|4@0- (0.1,0) [-0.7|0.7] "deg" XXX
78+
SG_ STEER_RATE : 35|12@0- (1,0) [-2000|2000] "deg/s" XXX
79+
7580
BO_ 166 BRAKE: 8 XXX
7681
SG_ BRAKE_AMOUNT : 7|8@0+ (1,0) [0|255] "" XXX
7782
SG_ BRAKE_PEDAL : 23|8@0+ (1,0) [0|255] "" XXX
@@ -95,6 +100,12 @@ BO_ 466 PCM_CRUISE: 8 XXX
95100
SG_ CRUISE_STATE : 55|4@0+ (1,0) [0|15] "" XXX
96101
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
97102

103+
BO_ 467 PCM_CRUISE_2: 8 XXX
104+
SG_ MAIN_ON : 15|1@0+ (1,0) [0|1] "" XXX
105+
SG_ LOW_SPEED_LOCKOUT : 14|2@0+ (1,0) [0|3] "kph" XXX
106+
SG_ SET_SPEED : 23|8@0+ (1,0) [0|255] "kph" XXX
107+
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
108+
98109
BO_ 552 ACCELEROMETER: 8 XXX
99110
SG_ ACCEL_Z : 22|15@0- (1,0) [0|32767] "" XXX
100111
SG_ ACCEL_X : 6|15@0- (0.001,0) [-20|20] "m/s2" XXX
@@ -135,20 +146,6 @@ BO_ 835 ACC_CONTROL: 8 DSU
135146
SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU
136147
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
137148

138-
BO_ 1556 STEERING_LEVERS: 8 XXX
139-
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX
140-
141-
BO_ 37 STEER_ANGLE_SENSOR: 8 XXX
142-
SG_ STEER_ANGLE : 3|12@0- (1.5,0) [-500|500] "deg" XXX
143-
SG_ STEER_FRACTION : 39|4@0- (0.1,0) [-0.7|0.7] "deg" XXX
144-
SG_ STEER_RATE : 35|12@0- (1,0) [-2000|2000] "deg/s" XXX
145-
146-
BO_ 467 PCM_CRUISE_2: 8 XXX
147-
SG_ MAIN_ON : 15|1@0+ (1,0) [0|1] "" XXX
148-
SG_ LOW_SPEED_LOCKOUT : 14|2@0+ (1,0) [0|3] "kph" XXX
149-
SG_ SET_SPEED : 23|8@0+ (1,0) [0|255] "kph" XXX
150-
SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
151-
152149
BO_ 921 PCM_CRUISE_SM: 8 XXX
153150
SG_ MAIN_ON : 4|1@0+ (1,0) [0|1] "" XXX
154151
SG_ CRUISE_CONTROL_STATE : 11|4@0+ (1,0) [0|15] "" XXX
@@ -183,6 +180,9 @@ BO_ 1042 LKAS_HUD: 8 XXX
183180

184181
BO_ 1553 UI_SEETING: 8 XXX
185182
SG_ UNITS : 26|2@0+ (1,0) [0|3] "" XXX
183+
184+
BO_ 1556 STEERING_LEVERS: 8 XXX
185+
SG_ TURN_SIGNALS : 29|2@0+ (1,0) [0|3] "" XXX
186186

187187
BO_ 1568 SEATS_DOORS: 8 XXX
188188
SG_ SEATBELT_DRIVER_UNLATCHED : 62|1@0+ (1,0) [0|1] "" XXX
@@ -224,35 +224,66 @@ BO_ 1162 RSA2: 8 FCM
224224
SG_ SPDUNT : 63|2@0+ (1,0) [0|0] "" XXX
225225
SG_ TSRWMSG : 61|2@0+ (1,0) [0|0] "" XXX
226226
SG_ SYNCID2 : 59|4@0+ (1,0) [0|0] "" XXX
227+
228+
BO_ 1163 RSA3: 8 FCM
229+
SG_ TSREQPD : 7|1@0+ (1,0) [0|0] "" XXX
230+
SG_ TSRMSW : 6|1@0+ (1,0) [0|0] "" XXX
231+
SG_ OTSGNNTM : 5|2@0+ (1,0) [0|0] "" XXX
232+
SG_ NTLVLSPD : 3|2@0+ (1,0) [0|0] "" XXX
233+
SG_ OVSPNTM : 1|2@0+ (1,0) [0|0] "" XXX
234+
SG_ OVSPVALL : 11|4@0+ (1,-5) [0|0] "" XXX
235+
SG_ OVSPVALM : 19|4@0+ (1,-5) [0|0] "" XXX
236+
SG_ OVSPVALH : 27|4@0+ (1,-5) [0|0] "" XXX
237+
SG_ TSRSPU : 33|2@0+ (1,0) [0|0] "" XXX
227238

228239
CM_ SG_ 36 ACCEL_Y "unit is tbd";
229240
CM_ SG_ 36 YAW_RATE "verify";
230241
CM_ SG_ 36 STEERING_TORQUE "does not seem the steer torque, tbd";
242+
CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
243+
CM_ SG_ 37 STEER_RATE "factor is tbd";
231244
CM_ SG_ 466 ACCEL_NET "net acceleration produced by the system, given ACCEL_CMD, road grade and other factors";
245+
CM_ SG_ 467 SET_SPEED "43 kph are shown as 28mph, so conversion isnt perfect";
246+
CM_ SG_ 467 LOW_SPEED_LOCKOUT "in low speed lockout, system would always disengage below 28mph";
232247
CM_ SG_ 560 BRAKE_PRESSED "another brake pressed?";
233-
CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
234248
CM_ SG_ 608 STEER_TORQUE_DRIVER "driver torque";
235249
CM_ SG_ 608 STEER_OVERRIDE "set when driver torque exceeds a certain value";
236250
CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active";
237-
CM_ SG_ 37 STEER_FRACTION "1/15th of the signal STEER_ANGLE, which is 1.5 deg; note that 0x8 is never set";
238-
CM_ SG_ 37 STEER_RATE "factor is tbd";
239-
CM_ SG_ 467 SET_SPEED "43 kph are shown as 28mph, so conversion isnt perfect";
240-
CM_ SG_ 467 LOW_SPEED_LOCKOUT "in low speed lockout, system would always disengage below 28mph";
241251
CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit";
252+
CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel";
242253
CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";
243254
CM_ SG_ 1042 REPEATED_BEEPS "recommended for fcw and other important alerts";
244-
CM_ SG_ 1161 SPDVAL1 "is the displayed speed 10,30,50,60,70,80,90,100,120 and 255 is for no limit. SPDVAL2 is the secondary speed usually written smaller";
245-
VAL_ 466 CRUISE_STATE 8 "active" 7 "standstill" 1 "off" ;
246-
VAL_ 467 LOW_SPEED_LOCKOUT 2 "low speed locked" 1 "ok" ;
255+
CM_ SG_ 1161 SPDVAL1 "Numbers 0-199 is displayed, 200-254 displays circle without number and 255 is for no limit.";
256+
CM_ SG_ 1161 SYNCID1 "counter from 1 to f at 1 Hz";
257+
CM_ SG_ 1161 SPDVAL2 "conditional speed value 70"
258+
CM_ SG_ 1162 SGNNUMP "1 if SPDVAL1 is set, otherwise 0";
259+
CM_ SG_ 1162 SYNCID2 "counter from 1 to f at 1 Hz";
260+
CM_ SG_ 1163 TSREQPD "always 1";
261+
CM_ SG_ 1163 TSRMSW "always 1";
262+
CM_ SG_ 1163 OTSGNNTM "always 3";
263+
CM_ SG_ 1163 NTLVLSPD "always 3";
264+
CM_ SG_ 1163 OVSPNTM "always 3";
265+
CM_ SG_ 1163 OVSPVALL "-5 at start then 2 after 2 seconds";
266+
CM_ SG_ 1163 OVSPVALM "-5 at start then 5 after 2 seconds";
267+
CM_ SG_ 1163 OVSPVALH "-5 at start then 10 after 2 seconds";
268+
CM_ SG_ 1163 TSRSPU "always 1";
269+
270+
VAL_ 466 CRUISE_STATE 8 "active" 7 "standstill" 1 "off";
271+
VAL_ 467 LOW_SPEED_LOCKOUT 2 "low speed locked" 1 "ok";
247272
VAL_ 614 STATE 3 "enabled" 1 "disabled";
248273
VAL_ 614 DIRECTION_CMD 3 "right" 2 "center" 1 "left";
249-
VAL_ 1553 UNITS 1 "km" 2 "miles";
250-
VAL_ 1556 TURN_SIGNALS 3 "none" 2 "right" 1 "left" ;
274+
VAL_ 921 CRUISE_CONTROL_STATE 2 "disabled" 11 "hold" 10 "hold_waiting_user_cmd" 6 "enabled" 5 "faulted";
251275
VAL_ 1042 LDA_ALERT 3 "hold with continuous beep" 2 "LDA unavailable" 1 "hold" 0 "none";
252276
VAL_ 1042 BARRIERS 3 "both" 2 "right" 1 "left" 0 "none";
253277
VAL_ 1042 RIGHT_LINE 3 "orange" 2 "double" 1 "solid" 0 "none";
254278
VAL_ 1042 LEFT_LINE 3 "orange" 2 "double" 1 "solid" 0 "none";
255-
VAL_ 921 CRUISE_CONTROL_STATE 2 "disabled" 11 "hold" 10 "hold_waiting_user_cmd" 6 "enabled" 5 "faulted";
279+
VAL_ 1553 UNITS 1 "km" 2 "miles";
280+
VAL_ 1556 TURN_SIGNALS 3 "none" 2 "right" 1 "left";
281+
VAL_ 1161 TSGN1 1 "speed sign" 0 "none";
282+
VAL_ 1161 TSGN2 1 "speed sign" 0 "none";
283+
VAL_ 1161 SPLSGN2 15 "conditional" 0 "none";
284+
VAL_ 1162 TSGN3 0 "none" 1 "speed sign" 2 "0 unlimited" 7 "unlimited" 16 "highway" 17 "no highway" 18 "motorway" 19 "no motorway" 20 "in city" 21 "outside city" 22 "pedestrian area" 23 "no pedestrian area" 65 "no overtaking left" 66 "no overtaking right" 67 "overtaking allowed again" 65 "no overtake" 129 "no entry";
285+
VAL_ 1162 SPLSGN3 15 "conditional" 0 "none";
286+
256287

257288
CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180";
258289

0 commit comments

Comments
 (0)