From 2b5b0aa5ea425d49fc34e62004eec0af1d553ba7 Mon Sep 17 00:00:00 2001 From: Riccardo Date: Fri, 26 Jan 2018 00:20:45 -0800 Subject: [PATCH] Toyota: different factor for STEER_TORQUE_EPS --- generator/toyota/_toyota.dbc | 6 ------ generator/toyota/toyota_corolla_2017_pt.dbc | 8 +++++++- generator/toyota/toyota_prius_2017_pt.dbc | 6 ++++++ generator/toyota/toyota_rav4_2017_pt.dbc | 6 ++++++ generator/toyota/toyota_rav4_hybrid_2017_pt.dbc | 8 +++++++- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/generator/toyota/_toyota.dbc b/generator/toyota/_toyota.dbc index 9298f66..3e2b5ec 100644 --- a/generator/toyota/_toyota.dbc +++ b/generator/toyota/_toyota.dbc @@ -69,12 +69,6 @@ BO_ 552 ACCELEROMETER: 8 XXX BO_ 560 BRAKE_MODULE2: 7 XXX SG_ BRAKE_PRESSED : 26|1@0+ (1,0) [0|1] "" XXX -BO_ 608 STEER_TORQUE_SENSOR: 8 XXX - SG_ STEER_TORQUE_EPS : 47|16@0- (0.66,0) [-20000|20000] "" XXX - SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX - SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX - BO_ 614 STEERING_IPAS: 8 IPAS SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX SG_ ANGLE : 3|12@0- (1,0) [0|16777215] "" XXX diff --git a/generator/toyota/toyota_corolla_2017_pt.dbc b/generator/toyota/toyota_corolla_2017_pt.dbc index b716257..f7c782b 100644 --- a/generator/toyota/toyota_corolla_2017_pt.dbc +++ b/generator/toyota/toyota_corolla_2017_pt.dbc @@ -8,6 +8,12 @@ BO_ 705 GAS_PEDAL: 8 XXX SG_ GAS_RELEASED : 3|1@0+ (1,0) [0|1] "" XXX SG_ GAS_PEDAL : 55|8@0+ (0.005,0) [0|1] "" XXX +BO_ 608 STEER_TORQUE_SENSOR: 8 XXX + SG_ STEER_TORQUE_EPS : 47|16@0- (1.0,0) [-20000|20000] "" XXX + SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX + SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + BO_ 610 EPS_STATUS: 5 EPS SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX @@ -20,4 +26,4 @@ CM_ SG_ 548 BRAKE_PRESSURE "seems prop to pedal force"; CM_ SG_ 548 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8"; VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P"; VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled"; -VAL_ 610 LKA_STATE 50 "temporary_fault"; \ No newline at end of file +VAL_ 610 LKA_STATE 50 "temporary_fault"; diff --git a/generator/toyota/toyota_prius_2017_pt.dbc b/generator/toyota/toyota_prius_2017_pt.dbc index a77d05a..b29f1e7 100644 --- a/generator/toyota/toyota_prius_2017_pt.dbc +++ b/generator/toyota/toyota_prius_2017_pt.dbc @@ -14,6 +14,12 @@ BO_ 550 BRAKE_MODULE: 8 XXX BO_ 581 GAS_PEDAL: 8 XXX SG_ GAS_PEDAL : 23|8@0+ (0.005,0) [0|1] "" XXX +BO_ 608 STEER_TORQUE_SENSOR: 8 XXX + SG_ STEER_TORQUE_EPS : 47|16@0- (0.66,0) [-20000|20000] "" XXX + SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX + SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + BO_ 610 EPS_STATUS: 8 EPS SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX SG_ LKA_STATE : 31|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 1c917d8..3f30aef 100644 --- a/generator/toyota/toyota_rav4_2017_pt.dbc +++ b/generator/toyota/toyota_rav4_2017_pt.dbc @@ -8,6 +8,12 @@ BO_ 705 GAS_PEDAL: 8 XXX SG_ GAS_RELEASED : 3|1@0+ (1,0) [0|1] "" XXX SG_ GAS_PEDAL : 55|8@0+ (0.005,0) [0|1] "" XXX +BO_ 608 STEER_TORQUE_SENSOR: 8 XXX + SG_ STEER_TORQUE_EPS : 47|16@0- (0.73,0) [-20000|20000] "" XXX + SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX + SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + BO_ 610 EPS_STATUS: 5 EPS SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX diff --git a/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc b/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc index c7b8b3a..d2f0b37 100644 --- a/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc +++ b/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc @@ -8,6 +8,12 @@ BO_ 550 BRAKE_MODULE: 8 XXX BO_ 581 GAS_PEDAL: 8 XXX SG_ GAS_PEDAL : 23|8@0+ (0.005,0) [0|1] "" XXX +BO_ 608 STEER_TORQUE_SENSOR: 8 XXX + SG_ STEER_TORQUE_EPS : 47|16@0- (0.73,0) [-20000|20000] "" XXX + SG_ STEER_TORQUE_DRIVER : 15|16@0- (1,0) [-32768|32767] "" XXX + SG_ STEER_OVERRIDE : 0|1@0+ (1,0) [0|1] "" XXX + SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + BO_ 610 EPS_STATUS: 5 EPS SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX @@ -21,4 +27,4 @@ CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear th CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered"; VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled"; VAL_ 610 LKA_STATE 50 "temporary_fault"; -VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P"; \ No newline at end of file +VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";