From 0894cbc7a62b2d3d1a1b3627bc639c6bfc0231b4 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Tue, 10 Apr 2018 17:25:02 -0700 Subject: [PATCH] Toyota: added comma specific message that copies 0x266 to be able to control steer angle even if park assist ecu is plugged in --- generator/toyota/lexus_rx_hybrid_2017_pt.dbc | 1 + generator/toyota/toyota_camry_hybrid_2018_pt.dbc | 1 + generator/toyota/toyota_chr_2018_pt.dbc | 1 + generator/toyota/toyota_corolla_2017_pt.dbc | 1 + generator/toyota/toyota_prius_2017_pt.dbc | 1 + generator/toyota/toyota_rav4_2017_pt.dbc | 1 + generator/toyota/toyota_rav4_hybrid_2017_pt.dbc | 1 + toyota_camry_hybrid_2018_pt_generated.dbc | 15 +++++++++++++++ toyota_chr_2018_pt_generated.dbc | 15 +++++++++++++++ toyota_corolla_2017_pt_generated.dbc | 15 +++++++++++++++ toyota_prius_2017_pt_generated.dbc | 15 +++++++++++++++ toyota_rav4_2017_pt_generated.dbc | 15 +++++++++++++++ toyota_rav4_hybrid_2017_pt_generated.dbc | 15 +++++++++++++++ 13 files changed, 97 insertions(+) diff --git a/generator/toyota/lexus_rx_hybrid_2017_pt.dbc b/generator/toyota/lexus_rx_hybrid_2017_pt.dbc index 6ac0ff4..8fe5ec1 100644 --- a/generator/toyota/lexus_rx_hybrid_2017_pt.dbc +++ b/generator/toyota/lexus_rx_hybrid_2017_pt.dbc @@ -1,4 +1,5 @@ CM_ "IMPORT _toyota_2017.dbc" +CM_ "IMPORT _comma.dbc" BO_ 550 BRAKE_MODULE: 8 XXX SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX diff --git a/generator/toyota/toyota_camry_hybrid_2018_pt.dbc b/generator/toyota/toyota_camry_hybrid_2018_pt.dbc index 31ae8c4..c21dc77 100644 --- a/generator/toyota/toyota_camry_hybrid_2018_pt.dbc +++ b/generator/toyota/toyota_camry_hybrid_2018_pt.dbc @@ -1,4 +1,5 @@ CM_ "IMPORT _toyota_2017.dbc" +CM_ "IMPORT _comma.dbc" BO_ 295 GEAR_PACKET: 8 XXX SG_ CAR_MOVEMENT : 39|8@0- (1,0) [0|255] "" XXX diff --git a/generator/toyota/toyota_chr_2018_pt.dbc b/generator/toyota/toyota_chr_2018_pt.dbc index ef09c30..60865fb 100644 --- a/generator/toyota/toyota_chr_2018_pt.dbc +++ b/generator/toyota/toyota_chr_2018_pt.dbc @@ -1,4 +1,5 @@ CM_ "IMPORT _toyota_2017.dbc" +CM_ "IMPORT _comma.dbc" BO_ 550 BRAKE_MODULE: 8 XXX SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX diff --git a/generator/toyota/toyota_corolla_2017_pt.dbc b/generator/toyota/toyota_corolla_2017_pt.dbc index 3cf4fd1..caf7b63 100644 --- a/generator/toyota/toyota_corolla_2017_pt.dbc +++ b/generator/toyota/toyota_corolla_2017_pt.dbc @@ -1,4 +1,5 @@ CM_ "IMPORT _toyota_2017.dbc" +CM_ "IMPORT _comma.dbc" BO_ 548 BRAKE_MODULE: 8 XXX SG_ BRAKE_PRESSURE : 43|12@0+ (1,0) [0|4047] "" XXX diff --git a/generator/toyota/toyota_prius_2017_pt.dbc b/generator/toyota/toyota_prius_2017_pt.dbc index 31ae8c4..c21dc77 100644 --- a/generator/toyota/toyota_prius_2017_pt.dbc +++ b/generator/toyota/toyota_prius_2017_pt.dbc @@ -1,4 +1,5 @@ CM_ "IMPORT _toyota_2017.dbc" +CM_ "IMPORT _comma.dbc" BO_ 295 GEAR_PACKET: 8 XXX SG_ CAR_MOVEMENT : 39|8@0- (1,0) [0|255] "" XXX diff --git a/generator/toyota/toyota_rav4_2017_pt.dbc b/generator/toyota/toyota_rav4_2017_pt.dbc index 93b4443..e9d748b 100644 --- a/generator/toyota/toyota_rav4_2017_pt.dbc +++ b/generator/toyota/toyota_rav4_2017_pt.dbc @@ -1,4 +1,5 @@ CM_ "IMPORT _toyota_2017.dbc" +CM_ "IMPORT _comma.dbc" BO_ 548 BRAKE_MODULE: 8 XXX SG_ BRAKE_PRESSURE : 43|12@0+ (1,0) [0|4047] "" XXX diff --git a/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc b/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc index 6ac0ff4..8fe5ec1 100644 --- a/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc +++ b/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc @@ -1,4 +1,5 @@ CM_ "IMPORT _toyota_2017.dbc" +CM_ "IMPORT _comma.dbc" BO_ 550 BRAKE_MODULE: 8 XXX SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX diff --git a/toyota_camry_hybrid_2018_pt_generated.dbc b/toyota_camry_hybrid_2018_pt_generated.dbc index 56b47cc..d51b09d 100644 --- a/toyota_camry_hybrid_2018_pt_generated.dbc +++ b/toyota_camry_hybrid_2018_pt_generated.dbc @@ -1,6 +1,20 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT" +CM_ "Imported file _comma.dbc starts here" +BO_ 359 STEERING_IPAS_COMMA: 8 IPAS + SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX + SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX + SG_ SET_ME_X10 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 31|8@0+ (1,0) [0|255] "" XXX + SG_ DIRECTION_CMD : 38|2@0+ (1,0) [0|3] "" XXX + SG_ SET_ME_X40 : 47|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + +CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant"; + + CM_ "Imported file _toyota_2017.dbc starts here" VERSION "" @@ -197,6 +211,7 @@ CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180"; CM_ "toyota_camry_hybrid_2018_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_chr_2018_pt_generated.dbc b/toyota_chr_2018_pt_generated.dbc index ff02a1e..4884f5e 100644 --- a/toyota_chr_2018_pt_generated.dbc +++ b/toyota_chr_2018_pt_generated.dbc @@ -1,6 +1,20 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT" +CM_ "Imported file _comma.dbc starts here" +BO_ 359 STEERING_IPAS_COMMA: 8 IPAS + SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX + SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX + SG_ SET_ME_X10 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 31|8@0+ (1,0) [0|255] "" XXX + SG_ DIRECTION_CMD : 38|2@0+ (1,0) [0|3] "" XXX + SG_ SET_ME_X40 : 47|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + +CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant"; + + CM_ "Imported file _toyota_2017.dbc starts here" VERSION "" @@ -197,6 +211,7 @@ CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180"; CM_ "toyota_chr_2018_pt.dbc starts here" + BO_ 550 BRAKE_MODULE: 8 XXX SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX SG_ BRAKE_POSITION : 16|9@0+ (1,0) [0|511] "" XXX diff --git a/toyota_corolla_2017_pt_generated.dbc b/toyota_corolla_2017_pt_generated.dbc index 9906b21..42e3a09 100644 --- a/toyota_corolla_2017_pt_generated.dbc +++ b/toyota_corolla_2017_pt_generated.dbc @@ -1,6 +1,20 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT" +CM_ "Imported file _comma.dbc starts here" +BO_ 359 STEERING_IPAS_COMMA: 8 IPAS + SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX + SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX + SG_ SET_ME_X10 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 31|8@0+ (1,0) [0|255] "" XXX + SG_ DIRECTION_CMD : 38|2@0+ (1,0) [0|3] "" XXX + SG_ SET_ME_X40 : 47|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + +CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant"; + + CM_ "Imported file _toyota_2017.dbc starts here" VERSION "" @@ -197,6 +211,7 @@ CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180"; CM_ "toyota_corolla_2017_pt.dbc starts here" + BO_ 548 BRAKE_MODULE: 8 XXX SG_ BRAKE_PRESSURE : 43|12@0+ (1,0) [0|4047] "" XXX SG_ BRAKE_PRESSED : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/toyota_prius_2017_pt_generated.dbc b/toyota_prius_2017_pt_generated.dbc index 230d533..dc1bbe0 100644 --- a/toyota_prius_2017_pt_generated.dbc +++ b/toyota_prius_2017_pt_generated.dbc @@ -1,6 +1,20 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT" +CM_ "Imported file _comma.dbc starts here" +BO_ 359 STEERING_IPAS_COMMA: 8 IPAS + SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX + SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX + SG_ SET_ME_X10 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 31|8@0+ (1,0) [0|255] "" XXX + SG_ DIRECTION_CMD : 38|2@0+ (1,0) [0|3] "" XXX + SG_ SET_ME_X40 : 47|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + +CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant"; + + CM_ "Imported file _toyota_2017.dbc starts here" VERSION "" @@ -197,6 +211,7 @@ CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180"; CM_ "toyota_prius_2017_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_rav4_2017_pt_generated.dbc b/toyota_rav4_2017_pt_generated.dbc index be9f418..1d8f7f7 100644 --- a/toyota_rav4_2017_pt_generated.dbc +++ b/toyota_rav4_2017_pt_generated.dbc @@ -1,6 +1,20 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT" +CM_ "Imported file _comma.dbc starts here" +BO_ 359 STEERING_IPAS_COMMA: 8 IPAS + SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX + SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX + SG_ SET_ME_X10 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 31|8@0+ (1,0) [0|255] "" XXX + SG_ DIRECTION_CMD : 38|2@0+ (1,0) [0|3] "" XXX + SG_ SET_ME_X40 : 47|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + +CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant"; + + CM_ "Imported file _toyota_2017.dbc starts here" VERSION "" @@ -197,6 +211,7 @@ CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180"; CM_ "toyota_rav4_2017_pt.dbc starts here" + BO_ 548 BRAKE_MODULE: 8 XXX SG_ BRAKE_PRESSURE : 43|12@0+ (1,0) [0|4047] "" XXX SG_ BRAKE_PRESSED : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/toyota_rav4_hybrid_2017_pt_generated.dbc b/toyota_rav4_hybrid_2017_pt_generated.dbc index c596a63..f372dfc 100644 --- a/toyota_rav4_hybrid_2017_pt_generated.dbc +++ b/toyota_rav4_hybrid_2017_pt_generated.dbc @@ -1,6 +1,20 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT" +CM_ "Imported file _comma.dbc starts here" +BO_ 359 STEERING_IPAS_COMMA: 8 IPAS + SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX + SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX + SG_ SET_ME_X10 : 23|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 31|8@0+ (1,0) [0|255] "" XXX + SG_ DIRECTION_CMD : 38|2@0+ (1,0) [0|3] "" XXX + SG_ SET_ME_X40 : 47|8@0+ (1,0) [0|255] "" XXX + SG_ SET_ME_X00 : 55|8@0+ (1,0) [0|255] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + +CM BO_ STEERING_IPAS_COMMA "Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant"; + + CM_ "Imported file _toyota_2017.dbc starts here" VERSION "" @@ -197,6 +211,7 @@ CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180"; CM_ "toyota_rav4_hybrid_2017_pt.dbc starts here" + BO_ 550 BRAKE_MODULE: 8 XXX SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX SG_ BRAKE_POSITION : 16|9@0+ (1,0) [0|511] "" XXX