sort and add LKA_ACTIVE signal (also flip STEER_REQUEST and _2)

mlocoteta · Dec 9, 2022 · 4ffd0f2 · 4ffd0f2
1 parent 8703739
commit 4ffd0f2
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/generator/toyota/toyota_nodsu_pt.dbc b/generator/toyota/toyota_nodsu_pt.dbc
@@ -2,17 +2,18 @@ CM_ "IMPORT _comma.dbc";
 CM_ "IMPORT _toyota_2017.dbc";
 
 BO_ 401 STEERING_LTA: 8 XXX
- SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
+ SG_ STEER_REQUEST : 0|1@0+ (1,0) [0|1] "" XXX
+ SG_ COUNTER : 6|6@0+ (1,0) [0|255] "" XXX
+ SG_ SETME_X1 : 7|1@0+ (1,0) [0|1] "" XXX
+ SG_ STEER_ANGLE_CMD : 15|16@0- (0.0573,0) [-540|540] "" XXX
+ SG_ STEER_REQUEST_2 : 25|1@0+ (1,0) [0|1] "" XXX
+ SG_ LKA_ACTIVE : 26|1@0+ (1,0) [0|1] "" XXX
  SG_ SETME_X3 : 29|2@0+ (1,0) [0|3] "" XXX
+ SG_ BIT : 30|1@0+ (1,0) [0|1] "" XXX
  SG_ PERCENTAGE : 39|8@0+ (1,0) [0|255] "" XXX
  SG_ SETME_X64 : 47|8@0+ (1,0) [0|255] "" XXX
  SG_ ANGLE : 55|8@0- (0.5,0) [0|255] "" XXX
- SG_ STEER_ANGLE_CMD : 15|16@0- (0.0573,0) [-540|540] "" XXX
- SG_ STEER_REQUEST : 25|1@0+ (1,0) [0|1] "" XXX
- SG_ BIT : 30|1@0+ (1,0) [0|1] "" XXX
- SG_ COUNTER : 6|6@0+ (1,0) [0|255] "" XXX
- SG_ STEER_REQUEST_2 : 0|1@0+ (1,0) [0|1] "" XXX
- SG_ SETME_X1 : 7|1@0+ (1,0) [0|1] "" XXX
+ SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 550 BRAKE_MODULE: 8 XXX
  SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX
@@ -38,8 +39,9 @@ CM_ SG_ 401 PERCENTAGE "driver override percentage (0-100), very close to steeri
 CM_ SG_ 401 SETME_X64 "ramps to 0 smoothly then back on falling edge of STEER_REQUEST if BIT isn't 1";
 CM_ SG_ 401 ANGLE "angle of car relative to lane center on LTA camera";
 CM_ SG_ 401 STEER_ANGLE_CMD "desired angle, OEM steers up to 95 degrees, no angle limit but torque will bottom out";
-CM_ SG_ 401 STEER_REQUEST "enable bit for steering, 1 to steer, 0 to not";
 CM_ SG_ 401 BIT "has correlation to STEER_REQUEST";
+CM_ SG_ 401 LKA_ACTIVE "1 when using LTA for LKA";
+CM_ SG_ 401 STEER_REQUEST "enable bit for steering, 1 to steer, 0 to not";
 CM_ SG_ 401 STEER_REQUEST_2 "enable bit for steering, 1 to steer, 0 to not";
 CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";