From b23f2c5ab6b609c034902453a8214689ef184235 Mon Sep 17 00:00:00 2001 From: Vehicle Researcher Date: Fri, 28 Jun 2019 21:09:13 +0000 Subject: [PATCH] Squashed 'opendbc/' changes from 34bd4c4dc..38650f842 38650f842 Toyota: STEERING_LTA actually has an angle interface a0394d4a7 Toyota LTA: back to unit factor 0a03d0889 Honda: fix China model. Toyota: add STEERING_LTA message for nodsu cars f1c17ae92 Toyota dsu-less: more precise steering angle conversion 0e94a296f Toyota: better pt dbc file naming for all dsuless cars 9199a5582 Toyota: better name for adas bdc files f5ddc1c38 Toyota DSU-less: added better measurement of steer angle c60b91ff6 Toyota Camry: using the same conversion factor for STEER_TORQUE_EPS as in the CHR git-subtree-dir: opendbc git-subtree-split: 38650f842ba919b1cf67bde601052fed38003a89 old-commit-hash: 1c6164e11ccb5ac2888e71b53aeee4fa478031cb --- generator/toyota/toyota_camry_hybrid_2018_pt.dbc | 2 +- ...brid_2018_pt.dbc => toyota_nodsu_hybrid_pt.dbc} | 1 + ...{toyota_chr_2018_pt.dbc => toyota_nodsu_pt.dbc} | 12 ++++++++++++ honda_odyssey_extreme_edition_2018_china_can.dbc | 5 +++-- toyota_prius_2017_adas.dbc => toyota_adas.dbc | 0 toyota_camry_hybrid_2018_pt_generated.dbc | 2 +- ...ted.dbc => toyota_nodsu_hybrid_pt_generated.dbc | 3 ++- ..._generated.dbc => toyota_nodsu_pt_generated.dbc | 14 +++++++++++++- toyota_rav4_2019_adas.dbc => toyota_tss2_adas.dbc | 0 9 files changed, 33 insertions(+), 6 deletions(-) rename generator/toyota/{toyota_chr_hybrid_2018_pt.dbc => toyota_nodsu_hybrid_pt.dbc} (96%) rename generator/toyota/{toyota_chr_2018_pt.dbc => toyota_nodsu_pt.dbc} (74%) rename toyota_prius_2017_adas.dbc => toyota_adas.dbc (100%) rename toyota_chr_hybrid_2018_pt_generated.dbc => toyota_nodsu_hybrid_pt_generated.dbc (99%) rename toyota_chr_2018_pt_generated.dbc => toyota_nodsu_pt_generated.dbc (96%) rename toyota_rav4_2019_adas.dbc => toyota_tss2_adas.dbc (100%) diff --git a/generator/toyota/toyota_camry_hybrid_2018_pt.dbc b/generator/toyota/toyota_camry_hybrid_2018_pt.dbc index efde86ba9c..1d41d1e202 100644 --- a/generator/toyota/toyota_camry_hybrid_2018_pt.dbc +++ b/generator/toyota/toyota_camry_hybrid_2018_pt.dbc @@ -16,7 +16,7 @@ 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_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 diff --git a/generator/toyota/toyota_chr_hybrid_2018_pt.dbc b/generator/toyota/toyota_nodsu_hybrid_pt.dbc similarity index 96% rename from generator/toyota/toyota_chr_hybrid_2018_pt.dbc rename to generator/toyota/toyota_nodsu_hybrid_pt.dbc index c86fcaaf65..4f64157518 100644 --- a/generator/toyota/toyota_chr_hybrid_2018_pt.dbc +++ b/generator/toyota/toyota_nodsu_hybrid_pt.dbc @@ -20,6 +20,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 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 + SG_ STEER_ANGLE : 31|16@0- (0.056,0) [-500|500] "" XXX BO_ 610 EPS_STATUS: 8 EPS SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX diff --git a/generator/toyota/toyota_chr_2018_pt.dbc b/generator/toyota/toyota_nodsu_pt.dbc similarity index 74% rename from generator/toyota/toyota_chr_2018_pt.dbc rename to generator/toyota/toyota_nodsu_pt.dbc index 7306ed2c06..026abdd881 100644 --- a/generator/toyota/toyota_chr_2018_pt.dbc +++ b/generator/toyota/toyota_nodsu_pt.dbc @@ -1,6 +1,17 @@ CM_ "IMPORT _toyota_2017.dbc" CM_ "IMPORT _comma.dbc" +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 + SG_ SETME_X3 : 29|2@0+ (1,0) [0|3] "" 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.056,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 + 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 @@ -15,6 +26,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 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 + SG_ STEER_ANGLE : 31|16@0- (0.056,0) [-500|500] "" XXX BO_ 610 EPS_STATUS: 8 EPS SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX diff --git a/honda_odyssey_extreme_edition_2018_china_can.dbc b/honda_odyssey_extreme_edition_2018_china_can.dbc index 5126bb16a9..6bdcaab04b 100644 --- a/honda_odyssey_extreme_edition_2018_china_can.dbc +++ b/honda_odyssey_extreme_edition_2018_china_can.dbc @@ -150,14 +150,15 @@ BO_ 780 ACC_HUD: 8 ADAS SG_ FCM_PROBLEM : 34|1@0+ (1,0) [0|1] "" BDY SG_ RADAR_OBSTRUCTED : 33|1@0+ (1,0) [0|1] "" BDY SG_ ENABLE_MINI_CAR : 32|1@0+ (1,0) [0|1] "" BDY - SG_ SET_ME_X03 : 47|2@0+ (1,0) [0|3] "" BDY + SG_ HUD_DISTANCE : 47|2@0+ (1,0) [0|3] "" BDY SG_ HUD_LEAD : 45|2@0+ (1,0) [0|3] "" BDY SG_ BOH_3 : 43|1@0+ (1,0) [0|3] "" BDY SG_ BOH_4 : 42|1@0+ (1,0) [0|3] "" BDY SG_ BOH_5 : 41|1@0+ (1,0) [0|3] "" BDY SG_ CRUISE_CONTROL_LABEL : 40|1@0+ (1,0) [0|3] "" BDY SG_ HUD_DISTANCE_3 : 52|1@0+ (1,0) [0|1] "" BDY - SG_ SET_ME_X03_2 : 55|2@0+ (1,0) [0|3] "" BDY + SG_ IMPERIAL_UNIT : 54|1@0+ (1,0) [0|1] "" BDY + SG_ SET_ME_X01_2 : 55|1@0+ (1,0) [0|1] "" BDY SG_ SET_ME_X01 : 48|1@0+ (1,0) [0|1] "" BDY SG_ COUNTER : 61|2@0+ (1,0) [0|3] "" BDY SG_ CHECKSUM : 59|4@0+ (1,0) [0|3] "" BDY diff --git a/toyota_prius_2017_adas.dbc b/toyota_adas.dbc similarity index 100% rename from toyota_prius_2017_adas.dbc rename to toyota_adas.dbc diff --git a/toyota_camry_hybrid_2018_pt_generated.dbc b/toyota_camry_hybrid_2018_pt_generated.dbc index 35b4d97e24..5578b70637 100644 --- a/toyota_camry_hybrid_2018_pt_generated.dbc +++ b/toyota_camry_hybrid_2018_pt_generated.dbc @@ -314,7 +314,7 @@ 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_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 diff --git a/toyota_chr_hybrid_2018_pt_generated.dbc b/toyota_nodsu_hybrid_pt_generated.dbc similarity index 99% rename from toyota_chr_hybrid_2018_pt_generated.dbc rename to toyota_nodsu_hybrid_pt_generated.dbc index 5e53e12970..0e2bbb3141 100644 --- a/toyota_chr_hybrid_2018_pt_generated.dbc +++ b/toyota_nodsu_hybrid_pt_generated.dbc @@ -295,7 +295,7 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none"; CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180"; -CM_ "toyota_chr_hybrid_2018_pt.dbc starts here" +CM_ "toyota_nodsu_hybrid_pt.dbc starts here" @@ -318,6 +318,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 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 + SG_ STEER_ANGLE : 31|16@0- (0.056,0) [-500|500] "" XXX BO_ 610 EPS_STATUS: 8 EPS SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX diff --git a/toyota_chr_2018_pt_generated.dbc b/toyota_nodsu_pt_generated.dbc similarity index 96% rename from toyota_chr_2018_pt_generated.dbc rename to toyota_nodsu_pt_generated.dbc index 69ba269691..d9e343f6a0 100644 --- a/toyota_chr_2018_pt_generated.dbc +++ b/toyota_nodsu_pt_generated.dbc @@ -295,10 +295,21 @@ VAL_ 1162 SPLSGN3 15 "conditional blank" 4 "wet road" 5 "rain" 0 "none"; CM_ "CHFFR_METRIC 37 STEER_ANGLE STEER_ANGLE 0.36 180"; -CM_ "toyota_chr_2018_pt.dbc starts here" +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 + SG_ SETME_X3 : 29|2@0+ (1,0) [0|3] "" 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.056,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 + 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 @@ -313,6 +324,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 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 + SG_ STEER_ANGLE : 31|16@0- (0.056,0) [-500|500] "" XXX BO_ 610 EPS_STATUS: 8 EPS SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX diff --git a/toyota_rav4_2019_adas.dbc b/toyota_tss2_adas.dbc similarity index 100% rename from toyota_rav4_2019_adas.dbc rename to toyota_tss2_adas.dbc