From 93375fe6030f581c978bc75ae91c5ddc0242fc1a Mon Sep 17 00:00:00 2001 From: Vehicle Researcher Date: Wed, 26 Feb 2020 16:20:23 -0800 Subject: [PATCH] Squashed 'opendbc/' changes from 2ae0327ea..a1aa3b78f a1aa3b78f Cleanup of Nissan DBC (#218) c1f764828 reverting changes to Chrysler: speed message seems different from car to car 2de8e9e82 Chrysler: Speed msg is 5 bytes f4ac315ed Chrysler: add counter to 514 0fb62cf86 Toyota Blind Spot Monitor (TSS2-only?) (#219) git-subtree-dir: opendbc git-subtree-split: a1aa3b78f7ae9405fcb42fa8f94aa3dae8acb987 --- generator/toyota/_toyota_nodsu_bsm.dbc | 14 +++ generator/toyota/toyota_nodsu_hybrid_pt.dbc | 1 + generator/toyota/toyota_nodsu_pt.dbc | 1 + nissan_2017.dbc | 106 +++++++------------- toyota_nodsu_hybrid_pt_generated.dbc | 18 ++++ toyota_nodsu_pt_generated.dbc | 18 ++++ 6 files changed, 91 insertions(+), 67 deletions(-) create mode 100644 generator/toyota/_toyota_nodsu_bsm.dbc diff --git a/generator/toyota/_toyota_nodsu_bsm.dbc b/generator/toyota/_toyota_nodsu_bsm.dbc new file mode 100644 index 00000000000000..2f80e58e82dce1 --- /dev/null +++ b/generator/toyota/_toyota_nodsu_bsm.dbc @@ -0,0 +1,14 @@ +BO_ 1014 BSM: 8 XXX + SG_ L_ADJACENT : 0|1@0+ (1,0) [0|1] "" XXX + SG_ L_APPROACHING : 8|1@0+ (1,0) [0|1] "" XXX + SG_ R_ADJACENT : 1|1@0+ (1,0) [0|1] "" XXX + SG_ R_APPROACHING : 10|1@0+ (1,0) [0|1] "" XXX + SG_ ADJACENT_ENABLED : 7|1@0+ (1,0) [0|1] "" XXX + SG_ APPROACHING_ENABLED : 15|1@0+ (1,0) [0|1] "" XXX + +CM_ SG_ 1014 L_ADJACENT "vehicle adjacent left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 L_APPROACHING "vehicle approaching from left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 R_ADJACENT "vehicle adjacent right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 R_APPROACHING "vehicle approaching from right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along with APPROACHING_ENABLED. this controls bsm alert visibility"; +CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility"; diff --git a/generator/toyota/toyota_nodsu_hybrid_pt.dbc b/generator/toyota/toyota_nodsu_hybrid_pt.dbc index ac91c726f3970d..ef5f0f1e20c6e7 100644 --- a/generator/toyota/toyota_nodsu_hybrid_pt.dbc +++ b/generator/toyota/toyota_nodsu_hybrid_pt.dbc @@ -1,5 +1,6 @@ CM_ "IMPORT _toyota_2017.dbc" CM_ "IMPORT _comma.dbc" +CM_ "IMPORT _toyota_nodsu_bsm.dbc" BO_ 295 GEAR_PACKET: 8 XXX SG_ CAR_MOVEMENT : 39|8@0- (1,0) [0|255] "" XXX diff --git a/generator/toyota/toyota_nodsu_pt.dbc b/generator/toyota/toyota_nodsu_pt.dbc index 9bc1b1e6739079..5290b9404d6131 100644 --- a/generator/toyota/toyota_nodsu_pt.dbc +++ b/generator/toyota/toyota_nodsu_pt.dbc @@ -1,5 +1,6 @@ CM_ "IMPORT _toyota_2017.dbc" CM_ "IMPORT _comma.dbc" +CM_ "IMPORT _toyota_nodsu_bsm.dbc" BO_ 401 STEERING_LTA: 8 XXX SG_ COUNTER : 7|8@0+ (1,0) [0|255] "" XXX diff --git a/nissan_2017.dbc b/nissan_2017.dbc index 1d03b7ab5f72d9..1eec1c56f58585 100644 --- a/nissan_2017.dbc +++ b/nissan_2017.dbc @@ -45,26 +45,28 @@ BO_ 645 WheelspeedRear: 8 XXX SG_ RR : 7|16@0+ (0.00555,0) [0|65535] "KPH" XXX SG_ RL : 23|16@0+ (0.00555,0) [0|65535] "KPH" XXX -BO_ 768 STEER_TORQUE: 8 XXX - SG_ STEERING_TOURQUE : 0|7@1+ (1,0) [0|127] "" XXX +BO_ 768 STEER_TORQUE: 2 XXX + SG_ STEERING_TORQUE : 6|7@0+ (1,0) [0|127] "" XXX + SG_ DriverTouchingWheel : 15|1@0+ (-1,1) [0|7] "" XXX BO_ 459 Maybe_RegenBraking: 8 XXX BO_ 372 Maybe_Gear_Selector: 8 XXX - SG_ Counter : 32|4@1+ (1,0) [0|15] "" XXX + SG_ Counter : 35|4@0+ (1,0) [0|15] "" XXX BO_ 374 Maybe_Motor_RPM_or_Speed: 8 XXX - SG_ Counter : 48|4@1+ (1,0) [0|15] "" XXX + SG_ Counter : 51|4@0+ (1,0) [0|15] "" XXX BO_ 460 Maybe_Brake_Related: 8 XXX BO_ 2 SteeringWheel: 8 XXX - SG_ Steering_RateChange : 23|8@0+ (1,0) [0|255] "" XXX - SG_ Always_07 : 31|8@0+ (1,0) [0|255] "" XXX + SG_ Steering_RateChange : 16|8@1+ (1,0) [0|255] "" XXX + SG_ Always_07 : 24|8@1+ (1,0) [0|255] "" XXX SG_ Steering_Angle : 0|16@1- (-0.1,0) [0|65535] "" XXX + SG_ Counter : 32|4@1+ (1,0) [0|15] "" XXX BO_ 384 Maybe_PowerInfo: 8 XXX - SG_ Unknown_Timer_PowerInfo : 48|4@1+ (1,0) [0|15] "" XXX + SG_ Unknown_Timer_PowerInfo : 51|4@0+ (1,0) [0|15] "" XXX SG_ EnginePower : 27|12@0- (1,0) [0|1] "" XXX SG_ RequestedAccel : 23|12@0- (1,0) [0|4294967295] "" XXX @@ -78,32 +80,13 @@ BO_ 666 WheelspeedFront: 8 XXX SG_ FR : 7|16@0+ (0.00555,0) [0|65535] "KPH" XXX SG_ FL : 23|16@0+ (0.00555,0) [0|65535] "KPH" XXX -BO_ 398 NEW_MSG_2: 8 XXX - -BO_ 389 NEW_MSG_3: 8 XXX - SG_ NEW_SIGNAL_1 : 15|8@0+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 22|6@0+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_4 : 47|8@0+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_5 : 55|4@0+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_6 : 63|8@0+ (1,0) [0|127] "" XXX - SG_ COUNTER : 48|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 30|8@0- (1,0) [0|255] "" XXX - -BO_ 397 NEW_MSG_4: 8 XXX - SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_2 : 23|16@0+ (1,0) [0|32767] "" XXX - SG_ NEW_SIGNAL_3 : 39|16@0+ (1,0) [0|65535] "" XXX - SG_ NEW_SIGNAL_4 : 55|16@0+ (1,0) [0|31] "" XXX - -BO_ 658 NEW_MSG_5: 8 XXX - SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|255] "" XXX - -BO_ 855 NEW_MSG_6: 8 XXX - SG_ NEW_SIGNAL_1 : 7|8@0+ (1,0) [0|255] "" XXX - -BO_ 773 NEW_MSG_7: 8 XXX - SG_ NEW_SIGNAL_1 : 39|8@0+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 47|8@0+ (1,0) [0|255] "" XXX +BO_ 389 Steering: 8 XXX + SG_ COUNTER : 51|4@0+ (1,0) [0|15] "" XXX + SG_ LKAS_ACTIVE : 37|1@0+ (1,0) [0|3] "" XXX + SG_ LKAS_Torque : 47|8@0+ (1,0) [0|255] "" XXX + SG_ CRC : 63|8@0+ (1,0) [0|127] "" XXX + SG_ Angle : 23|18@0+ (-0.01,1310) [0|262143] "" XXX + SG_ DriverTorque : 7|12@0+ (1,-2047) [0|4095] "" XXX BO_ 851 SPEED_RELATED: 8 XXX SG_ SPEED_RELATED : 7|16@0+ (0.01014,0) [0|65535] "" XXX @@ -111,31 +94,25 @@ BO_ 851 SPEED_RELATED: 8 XXX BO_ 386 Accelerator: 8 XXX SG_ Accelerator : 38|7@0+ (1,0) [0|127] "" XXX -BO_ 347 ACCELSOMETHING: 8 XXX - SG_ PowerMaybe : 9|10@0+ (1,0) [0|1023] "" XXX - SG_ ACCELERATOR2 : 6|11@0+ (1,-800) [0|65535] "" XXX - -BO_ 346 ANOTHER_ACCEL: 8 XXX - SG_ ANOTHERACCEL : 23|10@0+ (1,0) [0|1023] "" XXX - SG_ Reverse_ACCEL : 25|10@0+ (1,0) [0|1023] "" XXX - -BO_ 348 FULLRANGEACCEL: 8 XXX - SG_ AccelFullRange : 47|10@0+ (1,0) [0|1023] "" XXX - SG_ Accel : 26|11@0+ (1,0) [0|2047] "" XXX +BO_ 348 Throttle: 8 XXX SG_ NEW_SIGNAL_1 : 7|8@0+ (1,0) [0|255] "" XXX - -BO_ 566 ANOTHERFULLRANGEACCEL: 8 XXX - SG_ ANOTHERFULLRANGEACCEL : 43|8@0+ (1,0) [0|1023] "" XXX - SG_ RPMORTORQUE : 31|8@0+ (1,0) [0|255] "" XXX - -BO_ 523 Yetyetanotheraccel: 8 XXX - SG_ ANOTHERREVERSEACCEL : 37|10@0+ (1,0) [0|1023] "" XXX - SG_ yetyetanotheraccel : 31|10@0+ (1,0) [0|255] "" XXX - -BO_ 779 ANOTHERRRFULLRANGEACCEL: 8 XXX - SG_ ANOTHERRRFULLRANGEACCEL : 47|8@0+ (1,0) [0|255] "" XXX - -BO_ 1108 Doors: 8 XXX + SG_ Throttle : 26|11@0+ (1,0) [0|2047] "" XXX + SG_ ThrottlePedal : 47|10@0+ (1,0) [0|1023] "" XXX + +BO_ 523 CruiseThrottle: 6 XXX + SG_ PROPILOT_BUTTON : 8|1@0+ (1,0) [0|1] "" XXX + SG_ CANCEL_BUTTON : 9|1@0+ (1,0) [0|1] "" XXX + SG_ GAS_PEDAL_INVERTED : 37|10@0+ (1,0) [0|1023] "" XXX + SG_ unsure2 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ SET_BUTTON : 11|1@0+ (1,0) [0|1] "" XXX + SG_ RES_BUTTON : 12|1@0+ (1,0) [0|1] "" XXX + SG_ FOLLOW_DISTANCE_BUTTON : 10|1@0+ (1,0) [0|1] "" XXX + SG_ NO_BUTTON_PRESSED : 13|1@0+ (1,0) [0|1] "" XXX + SG_ GAS_PEDAL : 31|10@0+ (1,0) [0|255] "" XXX + SG_ unsure3 : 43|4@0+ (1,0) [0|15] "" XXX + SG_ unsure : 7|10@0+ (1,0) [0|63] "" XXX + +BO_ 1108 DoorsLights: 8 XXX SG_ DOOR_CLOSED_RR : 40|1@0+ (1,0) [0|1] "" XXX SG_ DOOR_OPEN_RR : 41|1@0+ (1,0) [0|1] "" XXX SG_ DOOR_CLOSED_RL : 42|1@0+ (1,0) [0|1] "" XXX @@ -145,21 +122,17 @@ BO_ 1108 Doors: 8 XXX SG_ DOOR_CLOSED_FR : 46|1@0+ (1,0) [0|3] "" XXX SG_ DOOR_OPEN_FR : 47|1@0+ (1,0) [0|3] "" XXX SG_ BOOT_OPEN : 55|1@0+ (1,0) [0|1] "" XXX + SG_ BRAKE_LIGHT : 54|1@0+ (1,0) [0|1] "" XXX + SG_ USER_BRAKE_PRESSED : 23|1@0+ (1,0) [0|1] "" XXX BO_ 403 LKAS_OLD: 8 XXX SG_ Checksum : 63|8@0+ (1,0) [0|255] "" XXX SG_ Angle_2 : 32|13@0+ (1,-4000) [0|63] "" XXX - SG_ Counter : 48|4@1+ (1,0) [0|15] "" XXX + SG_ Counter : 51|4@0+ (1,0) [0|15] "" XXX SG_ Angle_1 : 10|13@0+ (0.12,-480) [0|65535] "" XXX SG_ Steering_Torque : 7|13@0+ (-1,4000) [0|65535] "" XXX SG_ Torque_Command : 29|13@0+ (1,-4000) [0|255] "" XXX -BO_ 412 NEW_MSG_9: 8 XXX - SG_ NEW_SIGNAL_1 : 7|16@0+ (1,0) [0|65535] "" XXX - SG_ NEW_SIGNAL_3 : 23|16@0+ (1,0) [0|65535] "" XXX - SG_ NEW_SIGNAL_2 : 39|8@0+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_4 : 47|8@0+ (1,0) [0|255] "" XXX - BO_ 361 LKAS: 8 XXX SG_ NEW_SIGNAL_4 : 39|8@0+ (1,0) [0|255] "" XXX SG_ SET_X80 : 47|8@0+ (1,0) [0|255] "" XXX @@ -175,10 +148,9 @@ BO_ 438 ProPilot: 8 XXX SG_ NEW_SIGNAL_8 : 63|8@0+ (1,0) [0|7] "" XXX SG_ Counter : 55|4@0+ (1,0) [0|255] "" XXX SG_ NEW_SIGNAL_6 : 47|8@0+ (1,0) [0|255] "" XXX - SG_ SET_3 : 32|2@1+ (1,0) [0|15] "" XXX + SG_ SET_3 : 33|2@0+ (1,0) [0|15] "" XXX SG_ NEW_SIGNAL_1 : 7|12@0- (1,0) [0|255] "" XXX SG_ NEW_SIGNAL_3 : 23|12@0- (-1,0) [0|255] "" XXX - SG_ CRUISE_ON : 36|1@0+ (1,0) [0|255] "" XXX SG_ CRUISE_ACTIVATED : 38|1@0+ (1,0) [0|3] "" XXX SG_ STEER_STATUS : 51|1@1+ (1,0) [0|3] "" XXX - + SG_ CRUISE_ON : 36|1@0+ (1,0) [0|255] "" XXX diff --git a/toyota_nodsu_hybrid_pt_generated.dbc b/toyota_nodsu_hybrid_pt_generated.dbc index 28ad1d61aca454..3b76797437c53f 100644 --- a/toyota_nodsu_hybrid_pt_generated.dbc +++ b/toyota_nodsu_hybrid_pt_generated.dbc @@ -1,6 +1,23 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT" +CM_ "Imported file _toyota_nodsu_bsm.dbc starts here" +BO_ 1014 BSM: 8 XXX + SG_ L_ADJACENT : 0|1@0+ (1,0) [0|1] "" XXX + SG_ L_APPROACHING : 8|1@0+ (1,0) [0|1] "" XXX + SG_ R_ADJACENT : 1|1@0+ (1,0) [0|1] "" XXX + SG_ R_APPROACHING : 10|1@0+ (1,0) [0|1] "" XXX + SG_ ADJACENT_ENABLED : 7|1@0+ (1,0) [0|1] "" XXX + SG_ APPROACHING_ENABLED : 15|1@0+ (1,0) [0|1] "" XXX + +CM_ SG_ 1014 L_ADJACENT "vehicle adjacent left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 L_APPROACHING "vehicle approaching from left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 R_ADJACENT "vehicle adjacent right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 R_APPROACHING "vehicle approaching from right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along with APPROACHING_ENABLED. this controls bsm alert visibility"; +CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility"; + + CM_ "Imported file _comma.dbc starts here" BO_ 359 STEERING_IPAS_COMMA: 8 IPAS SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX @@ -360,6 +377,7 @@ CM_ "toyota_nodsu_hybrid_pt.dbc starts here" + BO_ 295 GEAR_PACKET: 8 XXX SG_ CAR_MOVEMENT : 39|8@0- (1,0) [0|255] "" XXX SG_ COUNTER : 55|8@0+ (1,0) [0|255] "" XXX diff --git a/toyota_nodsu_pt_generated.dbc b/toyota_nodsu_pt_generated.dbc index ab54939b50a4df..75e4115e8c46b5 100644 --- a/toyota_nodsu_pt_generated.dbc +++ b/toyota_nodsu_pt_generated.dbc @@ -1,6 +1,23 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT" +CM_ "Imported file _toyota_nodsu_bsm.dbc starts here" +BO_ 1014 BSM: 8 XXX + SG_ L_ADJACENT : 0|1@0+ (1,0) [0|1] "" XXX + SG_ L_APPROACHING : 8|1@0+ (1,0) [0|1] "" XXX + SG_ R_ADJACENT : 1|1@0+ (1,0) [0|1] "" XXX + SG_ R_APPROACHING : 10|1@0+ (1,0) [0|1] "" XXX + SG_ ADJACENT_ENABLED : 7|1@0+ (1,0) [0|1] "" XXX + SG_ APPROACHING_ENABLED : 15|1@0+ (1,0) [0|1] "" XXX + +CM_ SG_ 1014 L_ADJACENT "vehicle adjacent left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 L_APPROACHING "vehicle approaching from left side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 R_ADJACENT "vehicle adjacent right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 R_APPROACHING "vehicle approaching from right side of car. enabled above 10mph, regardless of ADJACENT_ENABLED or APPROACHING_ENABLED"; +CM_ SG_ 1014 ADJACENT_ENABLED "when BSM is enabled in settings, this is on along with APPROACHING_ENABLED. this controls bsm alert visibility"; +CM_ SG_ 1014 APPROACHING_ENABLED "when BSM is enabled in settings, this is on along with ADJACENT_ENABLED. this controls bsm alert visibility"; + + CM_ "Imported file _comma.dbc starts here" BO_ 359 STEERING_IPAS_COMMA: 8 IPAS SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX @@ -360,6 +377,7 @@ CM_ "toyota_nodsu_pt.dbc starts here" + BO_ 401 STEERING_LTA: 8 XXX SG_ COUNTER : 7|8@0+ (1,0) [0|255] "" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX