From f9da81eaec9ec9fe7afdf266fb3166918d46a09e Mon Sep 17 00:00:00 2001 From: Vehicle Researcher Date: Sat, 23 May 2020 15:40:23 -0700 Subject: [PATCH] Squashed 'opendbc/' changes from f1e69a6cf..af1821f84 af1821f84 fix endianness in signal from new hyundai message 7ef41084b Add gas/brake message for hyundai EVs, from @TK211X 472aabb4f Subaru preglobal update (#260) 45c0d9ecc fix lta message (#262) 11343c108 Library cleanup (#261) 67d70cb86 Fix Toyota message size git-subtree-dir: opendbc git-subtree-split: af1821f84e2bddf3306b9e3a349a4e0726f3eefc --- Dockerfile | 6 +- can/packer_pyx_setup.py | 4 +- can/parser_pyx_setup.py | 4 +- can/process_dbc.py | 2 +- generator/toyota/_toyota_2017.dbc | 6 +- generator/toyota/toyota_nodsu_pt.dbc | 4 +- hyundai_kia_generic.dbc | 8 + lexus_ct200h_2018_pt_generated.dbc | 6 +- lexus_gs300h_2017_pt_generated.dbc | 6 +- lexus_is_2018_pt_generated.dbc | 6 +- lexus_nx300h_2018_pt_generated.dbc | 6 +- lexus_rx_350_2016_pt_generated.dbc | 6 +- lexus_rx_hybrid_2017_pt_generated.dbc | 6 +- subaru_forester_2017.dbc | 266 ++++++++++++++++++ subaru_outback_2015_eyesight.dbc | 264 ++++++----------- toyota_avalon_2017_pt_generated.dbc | 6 +- toyota_camry_hybrid_2018_pt_generated.dbc | 6 +- toyota_corolla_2017_pt_generated.dbc | 6 +- toyota_highlander_2017_pt_generated.dbc | 6 +- ...ta_highlander_hybrid_2018_pt_generated.dbc | 6 +- toyota_nodsu_hybrid_pt_generated.dbc | 6 +- toyota_nodsu_pt_generated.dbc | 10 +- toyota_prius_2017_pt_generated.dbc | 6 +- toyota_rav4_2017_pt_generated.dbc | 6 +- toyota_rav4_hybrid_2017_pt_generated.dbc | 6 +- toyota_sienna_xle_2018_pt_generated.dbc | 6 +- 26 files changed, 426 insertions(+), 244 deletions(-) create mode 100644 subaru_forester_2017.dbc diff --git a/Dockerfile b/Dockerfile index e105313756022c..6a4bc4e5835d03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ from ubuntu:16.04 -RUN apt-get update && apt-get install -y libzmq3-dev clang wget git autoconf libtool curl make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python-openssl +RUN apt-get update && apt-get install -y libzmq3-dev capnproto libcapnp-dev clang wget git autoconf libtool curl make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python-openssl RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}" @@ -13,11 +13,9 @@ RUN pip install -r /tmp/requirements.txt ENV PYTHONPATH=/project +WORKDIR /project # TODO: Add tag to cereal RUN git clone https://github.com/commaai/cereal.git /project/cereal -RUN /project/cereal/install_capnp.sh - -WORKDIR /project COPY SConstruct . COPY . /project/opendbc diff --git a/can/packer_pyx_setup.py b/can/packer_pyx_setup.py index 48d1c260a952dc..619585068d98db 100644 --- a/can/packer_pyx_setup.py +++ b/can/packer_pyx_setup.py @@ -33,7 +33,7 @@ def get_ext_filename(self, ext_name): sourcefiles = ['packer_pyx.pyx'] -extra_compile_args = ["-std=c++11"] +extra_compile_args = ["-std=c++14"] ARCH = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip() # pylint: disable=unexpected-keyword-arg if ARCH == "aarch64": @@ -54,7 +54,7 @@ def get_ext_filename(self, ext_name): extra_compile_args=extra_compile_args, include_dirs=[ BASEDIR, - os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'), + os.path.join(BASEDIR, 'phonelibs'), ], extra_link_args=[ os.path.join(BASEDIR, 'opendbc', 'can', libdbc), diff --git a/can/parser_pyx_setup.py b/can/parser_pyx_setup.py index 5662530d7d8eb3..cc532f1a9e2896 100644 --- a/can/parser_pyx_setup.py +++ b/can/parser_pyx_setup.py @@ -33,7 +33,7 @@ def get_ext_filename(self, ext_name): sourcefiles = ['parser_pyx.pyx'] -extra_compile_args = ["-std=c++11"] +extra_compile_args = ["-std=c++14"] ARCH = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip() # pylint: disable=unexpected-keyword-arg if ARCH == "aarch64": @@ -54,7 +54,7 @@ def get_ext_filename(self, ext_name): extra_compile_args=extra_compile_args, include_dirs=[ BASEDIR, - os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'), + os.path.join(BASEDIR, 'phonelibs'), ], extra_link_args=[ os.path.join(BASEDIR, 'opendbc', 'can', libdbc), diff --git a/can/process_dbc.py b/can/process_dbc.py index 1ca0db289df206..b81eb75605d0e3 100755 --- a/can/process_dbc.py +++ b/can/process_dbc.py @@ -46,7 +46,7 @@ def process(in_fn, out_fn): checksum_start_bit = 0 counter_start_bit = 0 little_endian = True - elif can_dbc.name.startswith(("subaru_")): + elif can_dbc.name.startswith(("subaru_global_")): checksum_type = "subaru" checksum_size = 8 counter_size = None diff --git a/generator/toyota/_toyota_2017.dbc b/generator/toyota/_toyota_2017.dbc index 54f4491edf9e47..9511203584dcc1 100644 --- a/generator/toyota/_toyota_2017.dbc +++ b/generator/toyota/_toyota_2017.dbc @@ -60,12 +60,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/generator/toyota/toyota_nodsu_pt.dbc b/generator/toyota/toyota_nodsu_pt.dbc index 5290b9404d6131..c02b94cd04bb21 100644 --- a/generator/toyota/toyota_nodsu_pt.dbc +++ b/generator/toyota/toyota_nodsu_pt.dbc @@ -3,7 +3,6 @@ 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 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 @@ -12,6 +11,9 @@ BO_ 401 STEERING_LTA: 8 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 BO_ 550 BRAKE_MODULE: 8 XXX SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX diff --git a/hyundai_kia_generic.dbc b/hyundai_kia_generic.dbc index 46b69c18a16422..f6d8a5e2a88008 100644 --- a/hyundai_kia_generic.dbc +++ b/hyundai_kia_generic.dbc @@ -1248,6 +1248,14 @@ BO_ 790 EMS11: 8 EMS SG_ VS : 48|8@1+ (1.0,0.0) [0.0|254.0] "km/h" _4WD,AAF,ACU,AHLS,BCM,CLU,DATC,ECS,EPB,IBOX,LCA,LDWS_LKAS,LVR,MDPS,ODS,SCC,SMK,SPAS,TCU,TPMS SG_ RATIO_TQI_BAS_MAX_STND : 56|8@1+ (0.0078,0.0) [0.0|2.0] "" _4WD,IBOX,TCU +BO_ 881 E_EMS11: 8 XXX + SG_ Cruise_Limit_Status : 13|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Limit_Target : 23|8@1+ (1,0) [0|15] "" XXX + SG_ Gear_Change : 12|1@0+ (1,0) [0|31] "" XXX + SG_ IG_Reactive_Stat : 8|3@1+ (1,0) [0|3] "" XXX + SG_ Brake_Pedal_Pos : 0|8@1+ (1,0) [0|127] "" XXX + SG_ Accel_Pedal_Pos : 31|8@1+ (1,0) [0|7] "" XXX + BO_ 1301 CLU14: 8 CLU SG_ CF_Clu_ADrUNValueSet : 0|3@1+ (1.0,0.0) [0.0|7.0] "" BCM SG_ CF_Clu_ADrLNValueSet : 3|3@1+ (1.0,0.0) [0.0|7.0] "" BCM diff --git a/lexus_ct200h_2018_pt_generated.dbc b/lexus_ct200h_2018_pt_generated.dbc index c16f02ea5c6d5d..03c2814815353f 100644 --- a/lexus_ct200h_2018_pt_generated.dbc +++ b/lexus_ct200h_2018_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/lexus_gs300h_2017_pt_generated.dbc b/lexus_gs300h_2017_pt_generated.dbc index 07c93fb11b6605..7df3e66a0a37a6 100644 --- a/lexus_gs300h_2017_pt_generated.dbc +++ b/lexus_gs300h_2017_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/lexus_is_2018_pt_generated.dbc b/lexus_is_2018_pt_generated.dbc index a8131a76df1228..45c57e299fc0f6 100644 --- a/lexus_is_2018_pt_generated.dbc +++ b/lexus_is_2018_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/lexus_nx300h_2018_pt_generated.dbc b/lexus_nx300h_2018_pt_generated.dbc index ddb3b081ee08b3..1ec65f55724ce2 100644 --- a/lexus_nx300h_2018_pt_generated.dbc +++ b/lexus_nx300h_2018_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/lexus_rx_350_2016_pt_generated.dbc b/lexus_rx_350_2016_pt_generated.dbc index 8085713a34cd4c..7b0b62a869fadb 100644 --- a/lexus_rx_350_2016_pt_generated.dbc +++ b/lexus_rx_350_2016_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/lexus_rx_hybrid_2017_pt_generated.dbc b/lexus_rx_hybrid_2017_pt_generated.dbc index d7b51c933ddc98..83bbcd70689ade 100644 --- a/lexus_rx_hybrid_2017_pt_generated.dbc +++ b/lexus_rx_hybrid_2017_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/subaru_forester_2017.dbc b/subaru_forester_2017.dbc new file mode 100644 index 00000000000000..d163222de8b493 --- /dev/null +++ b/subaru_forester_2017.dbc @@ -0,0 +1,266 @@ +VERSION "" + + +NS_ : + NS_DESC_ + CM_ + BA_DEF_ + BA_ + VAL_ + CAT_DEF_ + CAT_ + FILTER + BA_DEF_DEF_ + EV_DATA_ + ENVVAR_DATA_ + SGTYPE_ + SGTYPE_VAL_ + BA_DEF_SGTYPE_ + BA_SGTYPE_ + SIG_TYPE_REF_ + VAL_TABLE_ + SIG_GROUP_ + SIG_VALTYPE_ + SIGTYPE_VALTYPE_ + BO_TX_BU_ + BA_DEF_REL_ + BA_REL_ + BA_DEF_DEF_REL_ + BU_SG_REL_ + BU_EV_REL_ + BU_BO_REL_ + SG_MUL_VAL_ + +BS_: + +BU_: XXX 0 + + +BO_ 2 Steering: 8 XXX + SG_ Steering_Angle : 7|16@0- (0.1,0) [-500|500] "degree" XXX + SG_ Counter : 27|3@0+ (1,0) [0|15] "" XXX + SG_ Checksum : 39|8@0+ (1,0) [0|255] "" XXX + +BO_ 208 G_Sensor: 8 XXX + SG_ Steering_Angle : 0|16@1- (1,0) [0|65535] "" XXX + SG_ Lateral : 16|16@1- (0.0035,1) [0|65535] "" XXX + SG_ Longitudinal : 48|16@1- (0.000035,0) [0|255] "" XXX + +BO_ 209 Brake_Pedal: 8 XXX + SG_ Speed : 0|16@1+ (0.05625,0) [0|255] "KPH" XXX + SG_ Brake_Pedal : 16|8@1+ (1,0) [0|255] "" XXX + +BO_ 210 Brake_2: 8 XXX + SG_ Brake_Light : 35|1@1+ (1,0) [0|15] "" XXX + SG_ Brake_Related : 36|1@1+ (1,0) [0|255] "" XXX + SG_ Right_Brake : 48|8@1+ (1,0) [0|255] "" XXX + SG_ Left_Brake : 56|8@1+ (1,0) [0|255] "" XXX + +BO_ 211 Brake_Type: 8 XXX + SG_ Brake_Light : 21|1@1+ (1,0) [0|3] "" XXX + SG_ Speed_Counter : 32|8@1+ (1,0) [0|15] "" XXX + SG_ Brake_Cruise_On : 42|1@1+ (1,0) [0|3] "" XXX + SG_ Brake_Pedal_On : 46|1@1+ (1,0) [0|3] "" XXX + SG_ Counter : 48|8@1+ (1,0) [0|255] "" XXX + +BO_ 212 Wheel_Speeds: 8 XXX + SG_ FL : 0|16@1+ (0.0592,0) [2|255] "KPH" XXX + SG_ FR : 16|16@1+ (0.0592,0) [0|255] "KPH" XXX + SG_ RL : 32|16@1+ (0.0592,0) [0|255] "" XXX + SG_ RR : 48|16@1+ (0.0592,0) [0|127] "KPH" XXX + +BO_ 320 Throttle: 8 XXX + SG_ Throttle_Pedal : 0|8@1+ (0.392157,0) [0|255] "" XXX + SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX + SG_ Not_Full_Throttle : 14|1@1+ (1,0) [0|15] "" XXX + SG_ Engine_RPM : 16|14@1+ (1,0) [0|15] "" XXX + SG_ Off_Throttle : 30|1@1+ (1,0) [0|3] "" XXX + SG_ Throttle_Cruise : 32|8@1+ (1,0) [0|255] "" XXX + SG_ Throttle_Combo : 40|8@1+ (1,0) [0|255] "" XXX + SG_ Throttle_Body_ : 48|8@1+ (1,0) [0|255] "" XXX + SG_ Off_Throttle_2 : 56|1@1+ (1,0) [0|3] "" XXX + +BO_ 321 Engine: 8 XXX + SG_ Engine_Torque : 0|15@1+ (1,0) [0|255] "" XXX + SG_ Engine_Stop : 15|1@1+ (1,0) [0|3] "" XXX + SG_ Wheel_Torque : 16|12@1+ (1,0) [0|255] "" XXX + SG_ Engine_RPM : 32|12@1+ (1,0) [0|8191] "" XXX + +BO_ 324 CruiseControl: 8 XXX + SG_ OnOffButton : 2|1@1+ (1,0) [0|3] "" XXX + SG_ SET_BUTTON : 3|1@1+ (1,0) [0|3] "" XXX + SG_ RES_BUTTON : 4|1@1+ (1,0) [0|3] "" XXX + SG_ Button : 13|1@1+ (1,0) [0|3] "" XXX + SG_ Cruise_On : 48|1@1+ (1,0) [0|3] "" XXX + SG_ Cruise_Activated : 49|1@1+ (1,0) [0|7] "" XXX + SG_ Brake_Pedal_On : 51|1@1+ (1,0) [0|3] "" XXX + +BO_ 328 Transmission: 8 XXX + SG_ Manual_Gear : 4|4@1+ (1,0) [0|255] "" XXX + SG_ Counter : 8|4@1+ (1,0) [0|255] "" XXX + SG_ Transmission_Engine : 16|15@1+ (1,0) [0|65535] "" XXX + SG_ Gear : 48|4@1+ (1,0) [0|15] "" XXX + SG_ Gear_2 : 52|4@1+ (1,0) [0|15] "" XXX + SG_ Paddle_Shift : 60|2@1+ (1,0) [0|255] "" XXX + +BO_ 329 CVT_Ratio: 8 XXX + +BO_ 336 Brake_Pressure: 8 XXX + SG_ Brake_Pressure_Right : 0|8@1+ (1,0) [0|15] "" XXX + SG_ Brake_Pressure_Left : 8|8@1+ (1,0) [0|255] "" XXX + +BO_ 338 Stalk: 8 XXX + SG_ Counter : 12|4@1+ (1,0) [0|15] "" XXX + SG_ Brake_Light : 52|1@1+ (1,0) [0|3] "" XXX + SG_ Runlights : 58|1@1+ (1,0) [0|3] "" XXX + SG_ Headlights : 59|1@1+ (1,0) [0|3] "" XXX + SG_ Highbeam : 60|1@1+ (1,0) [0|3] "" XXX + SG_ Wiper : 62|1@1+ (1,0) [0|3] "" XXX + +BO_ 352 ES_Brake: 8 XXX + SG_ Brake_Pressure : 0|16@1+ (1,0) [0|255] "" XXX + SG_ Brake_Light : 20|1@1+ (1,0) [0|2047] "" XXX + SG_ ES_Error : 21|1@1+ (1,0) [0|7] "" XXX + SG_ Brake_On : 22|1@1+ (1,0) [0|3] "" XXX + SG_ Cruise_Activated : 23|1@1+ (1,0) [0|3] "" XXX + SG_ Counter : 48|3@1+ (1,0) [0|7] "" XXX + SG_ Checksum : 56|8@1+ (1,0) [0|7] "" XXX + +BO_ 353 ES_CruiseThrottle: 8 XXX + SG_ Throttle_Cruise : 0|12@1+ (1,0) [0|255] "" XXX + SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" XXX + SG_ Cruise_Activated : 16|1@1+ (1,0) [0|7] "" XXX + SG_ Signal2 : 17|3@1+ (1,0) [0|3] "" XXX + SG_ Brake_On : 20|1@1+ (1,0) [0|7] "" XXX + SG_ DistanceSwap : 21|1@1+ (1,0) [0|3] "" XXX + SG_ Standstill : 22|1@1+ (1,0) [0|3] "" XXX + SG_ Signal3 : 23|1@1+ (1,0) [0|7] "" XXX + SG_ CloseDistance : 24|8@1+ (0.0196,0) [0|255] "m" XXX + SG_ Signal4 : 32|9@1+ (1,0) [0|255] "" XXX + SG_ Standstill_2 : 41|1@1+ (1,0) [0|3] "" XXX + SG_ ES_Error : 42|1@1+ (1,0) [0|3] "" XXX + SG_ Signal5 : 43|1@1+ (1,0) [0|3] "" XXX + SG_ Counter : 44|3@1+ (1,0) [0|15] "" XXX + SG_ Signal6 : 47|1@1+ (1,0) [0|3] "" XXX + SG_ Button : 48|3@1+ (1,0) [0|3] "" XXX + SG_ Signal7 : 51|5@1+ (1,0) [0|31] "" XXX + SG_ Checksum : 56|8@1+ (1,0) [0|15] "" XXX + +BO_ 354 ES_RPM: 8 XXX + SG_ Brake : 8|1@1+ (1,0) [0|7] "" XXX + SG_ Cruise_Activated : 9|1@1+ (1,0) [0|3] "" XXX + SG_ RPM : 16|16@1+ (1,0) [0|255] "" XXX + SG_ Checksum : 32|8@1+ (1,0) [0|65535] "" XXX + SG_ Counter : 48|3@1+ (1,0) [0|7] "" XXX + +BO_ 356 ES_LKAS: 8 XXX + SG_ Counter : 0|3@1+ (1,0) [0|7] "" XXX + SG_ LKAS_Command : 8|13@1- (-1,0) [-4096|4096] "" XXX + SG_ LKAS_Active : 24|1@1+ (1,0) [0|1] "" XXX + SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX + +BO_ 359 ES_LDW: 8 XXX + SG_ All_depart_2015 : 0|1@1+ (1,0) [0|255] "" XXX + SG_ Right_Line_2017 : 24|1@1+ (1,0) [0|7] "" XXX + SG_ Left_Line_2017 : 25|1@1+ (1,0) [0|3] "" XXX + SG_ Sig2All_Depart : 28|1@1+ (1,0) [0|3] "" XXX + SG_ Sig1All_Depart : 31|1@1+ (1,0) [0|15] "" XXX + SG_ LKAS_Inactive_2017 : 36|1@1+ (1,0) [0|3] "" XXX + SG_ LKAS_Active : 37|1@1+ (1,0) [0|3] "" XXX + SG_ Sig1Right_Depart_Front : 49|1@1+ (1,0) [0|3] "" XXX + SG_ Left_Depart_Front : 51|1@1+ (1,0) [0|3] "" XXX + SG_ Sig3All_Depart : 52|1@1+ (1,0) [0|3] "" XXX + SG_ Alerts : 48|5@1+ (1,0) [0|3] "" XXX + SG_ Sig1Right_Depart : 48|1@1+ (1,0) [0|3] "" XXX + SG_ Sig2Right_Depart : 50|1@1+ (1,0) [0|7] "" XXX + +BO_ 642 Dashlights: 8 XXX + SG_ Counter : 12|4@1+ (1,0) [0|15] "" XXX + SG_ SEATBELT_FL : 40|1@1+ (1,0) [0|3] "" XXX + SG_ LEFT_BLINKER : 44|1@1+ (1,0) [0|3] "" XXX + SG_ RIGHT_BLINKER : 45|1@1+ (1,0) [0|3] "" XXX + +BO_ 880 Steer_Torque_2: 8 XXX + SG_ Steering_Voltage_Flat : 0|8@1+ (1,0) [0|255] "" XXX + SG_ Steer_Torque_Sensor : 32|8@1- (-1,0) [0|255] "" XXX + SG_ Counter : 40|4@1+ (1,0) [0|15] "" XXX + +BO_ 881 Steering_Torque: 8 XXX + SG_ Steering_Motor_Flat : 0|10@1+ (32,0) [0|16500] "" XXX + SG_ Steer_Torque_Output : 16|11@1- (-32,0) [-16500|16500] "" XXX + SG_ LKA_Lockout : 27|1@1+ (1,0) [0|1] "" XXX + SG_ Steer_Torque_Sensor : 29|11@1- (8,0) [-8500|8500] "" XXX + SG_ Steering_Angle : 40|16@1- (-0.033,0) [-600|600] "" XXX + +BO_ 884 BodyInfo: 8 XXX + SG_ DOOR_OPEN_FR : 24|1@1+ (1,0) [0|1] "" XXX + SG_ DOOR_OPEN_FL : 25|1@1+ (1,0) [0|1] "" XXX + SG_ DOOR_OPEN_RL : 26|1@1+ (1,0) [0|1] "" XXX + SG_ DOOR_OPEN_RR : 27|1@1+ (1,0) [0|1] "" XXX + SG_ DOOR_OPEN_Hatch : 28|1@1+ (1,0) [0|1] "" XXX + +BO_ 864 Engine_Temp: 8 XXX + SG_ Oil_Temp : 16|8@1+ (1,-40) [0|255] "" XXX + SG_ Coolant_Temp : 24|8@1+ (1,-40) [0|255] "" XXX + SG_ Cruise_Activated : 45|1@1+ (1,0) [0|3] "" XXX + SG_ Saved_Speed : 56|8@1+ (1,0) [0|255] "" XXX + +BO_ 866 Fuel__: 8 XXX + +BO_ 604 BSD_RCTA: 8 XXX + SG_ Counter : 0|3@1+ (1,0) [0|1] "" XXX + SG_ State : 5|1@1+ (1,0) [0|1] "" XXX + SG_ R_ADJACENT : 32|1@1+ (1,0) [0|1] "" XXX + SG_ L_ADJACENT : 33|1@1+ (1,0) [0|1] "" XXX + SG_ R_APPROACHING : 42|1@1+ (1,0) [0|1] "" XXX + SG_ L_APPROACHING : 43|1@1+ (1,0) [0|1] "" XXX + SG_ R_RCTA : 46|1@1+ (1,0) [0|1] "" XXX + SG_ L_RCTA : 47|1@1+ (1,0) [0|1] "" XXX + +BO_ 1745 Dash_State: 8 XXX + SG_ Units : 13|1@1+ (1,0) [0|1] "" XXX + SG_ Units2 : 15|1@1+ (1,0) [0|1] "" XXX + +BO_ 355 ES_DashStatus: 8 XXX + SG_ Not_Ready_Startup : 4|2@1+ (1,0) [0|1] "" XXX + SG_ Cruise_On : 16|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Set_Speed : 24|8@1+ (1,0) [0|255] "" XXX + SG_ Counter : 40|3@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Activated : 54|1@1+ (1,0) [0|1] "" XXX + +CM_ SG_ 211 Brake_Pedal_On "high tolerance"; +CM_ SG_ 212 FL "KPH"; +CM_ SG_ 212 RL "KPH"; +CM_ SG_ 320 Off_Throttle_2 "Less sensitive"; +CM_ SG_ 320 Throttle_Body_ "Throttle related"; +CM_ SG_ 328 Gear "15 = P, 14 = R, 0 = N, 1-6=gear"; +CM_ SG_ 328 Gear_2 "15 = P, 14 = R, 0 = N, 1-6=gear"; +CM_ SG_ 353 Button "1 = main, 2 = set shallow, 3 = set deep, 4 = resume shallow, 5 resume deep"; +CM_ SG_ 353 Brake_On "long activatedish"; +CM_ SG_ 353 SET_1 "always 1"; +CM_ SG_ 353 SET_2 ""; +CM_ SG_ 354 RPM "20hz version of Transmission_Engine under Transmission"; +CM_ SG_ 358 3SecondDisengage "seatbelt disengage"; +CM_ SG_ 358 Disengage_Alert "seatbelt and steep hill disengage"; +CM_ SG_ 358 Cruise_Activated "is 1 when cruise is able to go"; +CM_ SG_ 358 ES_Error "No engagement until restart"; +CM_ SG_ 358 Lead_Car "front car detected"; +CM_ SG_ 359 Sig1Right_Depart "right depart, hill steep and seatbelt disengage"; +CM_ SG_ 359 LKAS_Inactive_2017 "1 when not steering, 0 when lkas steering"; +CM_ SG_ 359 Sig1Right_Depart_Front "object in front, right depart, hill steep and seatbelt disengage alert "; +CM_ SG_ 359 Left_Depart_Front "warning after acceleration into car in front and left depart"; +CM_ SG_ 359 Alerts "2 = lead beep"; +CM_ SG_ 359 Sig1All_Depart "Left and right depart"; +CM_ SG_ 359 Sig2All_Depart "Left and right depart"; +CM_ SG_ 359 All_depart_2015 "always 1 on 2017"; +CM_ SG_ 604 R_APPROACHING "Faster car approaching in far right lane"; +CM_ SG_ 604 L_APPROACHING "Faster car approaching in far left lane"; +CM_ SG_ 604 R_RCTA "Rear cross traffic alert, only when in R gear"; +CM_ SG_ 604 L_RCTA "Rear cross traffic alert, only when in R gear"; +CM_ SG_ 642 Counter "Affected by signals"; +CM_ SG_ 642 RIGHT_BLINKER "0 off, 2 right, 1 left"; +CM_ SG_ 642 SEATBELT_FL "Driver seatbelt"; +CM_ SG_ 880 Steering_Voltage_Flat "receives later than 371"; +VAL_ 328 Gear 0 "N" 1 "D" 2 "D" 3 "D" 4 "D" 5 "D" 6 "D" 14 "R" 15 "P"; +VAL_ 1745 Units 0 "Metric" 1 "Imperial"; +VAL_ 1745 Units2 0 "Metric 1 "Imperial"; diff --git a/subaru_outback_2015_eyesight.dbc b/subaru_outback_2015_eyesight.dbc index dd1d5422c5dba9..1facde34bf71bf 100644 --- a/subaru_outback_2015_eyesight.dbc +++ b/subaru_outback_2015_eyesight.dbc @@ -38,167 +38,126 @@ BU_: XXX 0 BO_ 2 Steering: 8 XXX SG_ Steering_Angle : 7|16@0- (0.1,0) [-500|500] "degree" XXX - SG_ NEW_SIGNAL_6 : 24|1@0+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_2 : 22|3@0+ (1,0) [0|7] "" XXX SG_ Counter : 27|3@0+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_1 : 31|4@0- (1,0) [0|65535] "" XXX SG_ Checksum : 39|8@0+ (1,0) [0|255] "" XXX BO_ 208 G_Sensor: 8 XXX - SG_ NEW_SIGNAL_3 : 32|8@1+ (1,0) [0|255] "" XXX - SG_ _Latitudinal : 16|16@1- (0.0035,1) [0|65535] "" XXX - SG_ _Longitudinal : 48|16@1- (0.000035,0) [0|255] "" XXX SG_ Steering_Angle : 0|16@1- (1,0) [0|65535] "" XXX - SG_ NEW_SIGNAL_1 : 40|8@1+ (1,0) [0|255] "" XXX + SG_ Lateral : 16|16@1- (0.0035,1) [0|65535] "" XXX + SG_ Longitudinal : 48|16@1- (0.000035,0) [0|255] "" XXX BO_ 209 Brake_Pedal: 8 XXX - SG_ NEW_SIGNAL_1 : 26|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_2 : 31|1@1+ (1,0) [0|255] "" XXX - SG_ Brake_Pedal : 16|8@1+ (1,0) [0|255] "" XXX SG_ Speed : 0|16@1+ (0.05625,0) [0|255] "KPH" XXX + SG_ Brake_Pedal : 16|8@1+ (1,0) [0|255] "" XXX BO_ 210 Brake_2: 8 XXX - SG_ Right_Brake : 48|8@1+ (1,0) [0|255] "" XXX SG_ Brake_Light : 35|1@1+ (1,0) [0|15] "" XXX SG_ Brake_Related : 36|1@1+ (1,0) [0|255] "" XXX + SG_ Right_Brake : 48|8@1+ (1,0) [0|255] "" XXX SG_ Left_Brake : 56|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_1 : 46|1@1+ (1,0) [0|4294967295] "" XXX - SG_ NEW_SIGNAL_2 : 37|3@1+ (1,0) [0|7] "" XXX BO_ 211 Brake_Type: 8 XXX - SG_ NEW_SIGNAL_3 : 7|1@1+ (1,0) [0|4294967295] "" XXX - SG_ NEW_SIGNAL_2 : 16|4@1+ (1,0) [0|15] "" XXX SG_ Brake_Light : 21|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_4 : 28|4@1+ (1,0) [0|15] "" XXX SG_ Speed_Counter : 32|8@1+ (1,0) [0|15] "" XXX SG_ Brake_Cruise_On : 42|1@1+ (1,0) [0|3] "" XXX SG_ Brake_Pedal_On : 46|1@1+ (1,0) [0|3] "" XXX SG_ Counter : 48|8@1+ (1,0) [0|255] "" XXX BO_ 212 Wheel_Speeds: 8 XXX - SG_ FL : 0|16@1+ (0.0592,0) [2|255] "KPH" XXX + SG_ FL : 0|16@1+ (0.0592,0) [0|255] "KPH" XXX SG_ FR : 16|16@1+ (0.0592,0) [0|255] "KPH" XXX SG_ RL : 32|16@1+ (0.0592,0) [0|255] "" XXX SG_ RR : 48|16@1+ (0.0592,0) [0|127] "KPH" XXX BO_ 320 Throttle: 8 XXX - SG_ Off_Throttle_2 : 56|1@1+ (1,0) [0|3] "" XXX - SG_ Throttle_Combo : 40|8@1+ (1,0) [0|255] "" XXX - SG_ Engine_RPM : 16|14@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 63|1@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_1 : 61|1@1+ (1,0) [0|3] "" XXX - SG_ Throttle_Body_ : 48|8@1+ (1,0) [0|255] "" XXX - SG_ Throttle_Cruise : 32|8@1+ (1,0) [0|255] "" XXX - SG_ Off_Throttle : 30|1@1+ (1,0) [0|3] "" XXX SG_ Throttle_Pedal : 0|8@1+ (0.392157,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX SG_ Not_Full_Throttle : 14|1@1+ (1,0) [0|15] "" XXX + SG_ Engine_RPM : 16|14@1+ (1,0) [0|15] "" XXX + SG_ Off_Throttle : 30|1@1+ (1,0) [0|3] "" XXX + SG_ Throttle_Cruise : 32|8@1+ (1,0) [0|255] "" XXX + SG_ Throttle_Combo : 40|8@1+ (1,0) [0|255] "" XXX + SG_ Throttle_Body_ : 48|8@1+ (1,0) [0|255] "" XXX + SG_ Off_Throttle_2 : 56|1@1+ (1,0) [0|3] "" XXX BO_ 321 Engine: 8 XXX - SG_ NEW_SIGNAL_7 : 59|2@1+ (1,0) [0|63] "" XXX - SG_ NEW_SIGNAL_2 : 47|1@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_5 : 48|4@1+ (1,0) [0|15] "" XXX + SG_ Engine_Torque : 0|15@1+ (1,0) [0|255] "" XXX + SG_ Engine_Stop : 15|1@1+ (1,0) [0|3] "" XXX SG_ Wheel_Torque : 16|12@1+ (1,0) [0|255] "" XXX SG_ Engine_RPM : 32|12@1+ (1,0) [0|8191] "" XXX - SG_ NEW_SIGNAL_3 : 53|2@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_6 : 46|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_8 : 28|4@1+ (1,0) [0|15] "" XXX - SG_ Engine_Stop : 15|1@1+ (1,0) [0|3] "" XXX - SG_ Engine_Torque : 0|15@1+ (1,0) [0|255] "" XXX BO_ 324 CruiseControl: 8 XXX SG_ OnOffButton : 2|1@1+ (1,0) [0|3] "" XXX SG_ SET_BUTTON : 3|1@1+ (1,0) [0|3] "" XXX SG_ RES_BUTTON : 4|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_2 : 8|1@1+ (1,0) [0|255] "" XXX SG_ Button : 13|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_9 : 15|1@1+ (1,0) [0|127] "" XXX - SG_ NEW_SIGNAL_1 : 16|8@1+ (1,-124) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 24|5@1+ (1,0) [0|16777215] "" XXX SG_ Cruise_On : 48|1@1+ (1,0) [0|3] "" XXX SG_ Cruise_Activated : 49|1@1+ (1,0) [0|7] "" XXX - SG_ NEW_SIGNAL_6 : 50|1@1+ (1,0) [0|3] "" XXX SG_ Brake_Pedal_On : 51|1@1+ (1,0) [0|3] "" XXX BO_ 328 Transmission: 8 XXX - SG_ Paddle_Shift : 60|2@1+ (1,0) [0|255] "" XXX - SG_ Gear : 48|4@1+ (1,0) [0|15] "" XXX - SG_ Gear_2 : 52|4@1+ (1,0) [0|15] "" XXX SG_ Manual_Gear : 4|4@1+ (1,0) [0|255] "" XXX - SG_ Transmission_Engine : 16|15@1+ (1,0) [0|65535] "" XXX - SG_ NEW_SIGNAL_7 : 63|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_5 : 43|1@1+ (1,0) [0|65535] "" XXX - SG_ NEW_SIGNAL_1 : 31|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_4 : 12|4@1+ (1,0) [0|15] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|255] "" XXX + SG_ Transmission_Engine : 16|15@1+ (1,0) [0|65535] "" XXX + SG_ Gear : 48|4@1+ (1,0) [0|15] "" XXX + SG_ Gear_2 : 52|4@1+ (1,0) [0|15] "" XXX + SG_ Paddle_Shift : 60|2@1+ (1,0) [0|255] "" XXX BO_ 329 CVT_Ratio: 8 XXX - SG_ NEW_SIGNAL_4 : 0|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_5 : 8|4@1+ (1,0) [0|65535] "" XXX - SG_ NEW_SIGNAL_2 : 24|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_1 : 32|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 40|8@1+ (1,0) [0|255] "" XXX BO_ 336 Brake_Pressure: 8 XXX SG_ Brake_Pressure_Right : 0|8@1+ (1,0) [0|15] "" XXX SG_ Brake_Pressure_Left : 8|8@1+ (1,0) [0|255] "" XXX BO_ 338 Stalk: 8 XXX + SG_ Counter : 12|4@1+ (1,0) [0|15] "" XXX + SG_ Brake_Light : 52|1@1+ (1,0) [0|3] "" XXX SG_ Runlights : 58|1@1+ (1,0) [0|3] "" XXX - SG_ Wiper : 62|1@1+ (1,0) [0|3] "" XXX - SG_ Highbeam : 60|1@1+ (1,0) [0|3] "" XXX SG_ Headlights : 59|1@1+ (1,0) [0|3] "" XXX - SG_ brake_light : 52|1@1+ (1,0) [0|3] "" XXX - SG_ Counter : 12|4@1+ (1,0) [0|15] "" XXX - -BO_ 346 Counter_3: 8 XXX - SG_ Counter : 0|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_1 : 20|1@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_2 : 57|1@1+ (1,0) [0|3] "" XXX + SG_ Highbeam : 60|1@1+ (1,0) [0|3] "" XXX + SG_ Wiper : 62|1@1+ (1,0) [0|3] "" XXX BO_ 352 ES_Brake: 8 XXX - SG_ Counter : 48|3@1+ (1,0) [0|7] "" XXX - SG_ Checksum : 56|8@1+ (1,0) [0|7] "" XXX SG_ Brake_Pressure : 0|16@1+ (1,0) [0|255] "" XXX - SG_ Cruise_Activated : 23|1@1+ (1,0) [0|3] "" XXX - SG_ Brake_On : 22|1@1+ (1,0) [0|3] "" XXX - SG_ ES_Error : 21|1@1+ (1,0) [0|7] "" XXX SG_ Brake_Light : 20|1@1+ (1,0) [0|2047] "" XXX + SG_ ES_Error : 21|1@1+ (1,0) [0|7] "" XXX + SG_ Brake_On : 22|1@1+ (1,0) [0|3] "" XXX + SG_ Cruise_Activated : 23|1@1+ (1,0) [0|3] "" XXX + SG_ Counter : 48|3@1+ (1,0) [0|7] "" XXX + SG_ Checksum : 56|8@1+ (1,0) [0|7] "" XXX BO_ 353 ES_CruiseThrottle: 8 XXX - SG_ Checksum : 56|8@1+ (1,0) [0|15] "" XXX - SG_ Button : 48|3@1+ (1,0) [0|3] "" XXX - SG_ ES_Error : 42|1@1+ (1,0) [0|3] "" XXX - SG_ Standstill_2 : 41|1@1+ (1,0) [0|3] "" XXX - SG_ Standstill : 22|1@1+ (1,0) [0|3] "" XXX - SG_ Unknown : 18|1@1+ (1,0) [0|7] "" XXX + SG_ Throttle_Cruise : 0|12@1+ (1,0) [0|255] "" XXX + SG_ Signal1 : 12|4@1+ (1,0) [0|15] "" XXX + SG_ Cruise_Activated : 16|1@1+ (1,0) [0|7] "" XXX + SG_ Signal2 : 17|3@1+ (1,0) [0|3] "" XXX SG_ Brake_On : 20|1@1+ (1,0) [0|7] "" XXX SG_ DistanceSwap : 21|1@1+ (1,0) [0|3] "" XXX - SG_ Counter : 44|3@1+ (1,0) [0|15] "" XXX - SG_ SET_0_1 : 32|9@1+ (1,0) [0|255] "" XXX + SG_ Standstill : 22|1@1+ (1,0) [0|3] "" XXX + SG_ Signal3 : 23|1@1+ (1,0) [0|7] "" XXX SG_ CloseDistance : 24|8@1+ (0.0196,0) [0|255] "m" XXX - SG_ SET_0_2 : 51|5@1+ (1,0) [0|31] "" XXX - SG_ SET_0_3 : 47|1@1+ (1,0) [0|3] "" XXX - SG_ SET_0_4 : 43|1@1+ (1,0) [0|3] "" XXX - SG_ SET_1 : 23|1@1+ (1,0) [0|7] "" XXX - SG_ NEW_SIGNAL_1 : 19|1@1+ (1,0) [0|1] "" XXX - SG_ Throttle_Cruise : 0|12@1+ (1,0) [0|255] "" XXX - SG_ SET_2 : 12|4@1+ (1,0) [0|15] "" XXX - SG_ Cruise_Activatedish : 16|1@1+ (1,0) [0|7] "" XXX - SG_ NEW_SIGNAL_9 : 17|1@1+ (1,0) [0|3] "" XXX + SG_ Signal4 : 32|9@1+ (1,0) [0|255] "" XXX + SG_ Standstill_2 : 41|1@1+ (1,0) [0|3] "" XXX + SG_ ES_Error : 42|1@1+ (1,0) [0|3] "" XXX + SG_ Signal5 : 43|1@1+ (1,0) [0|3] "" XXX + SG_ Counter : 44|3@1+ (1,0) [0|15] "" XXX + SG_ Signal6 : 47|1@1+ (1,0) [0|3] "" XXX + SG_ Button : 48|3@1+ (1,0) [0|3] "" XXX + SG_ Signal7 : 51|5@1+ (1,0) [0|31] "" XXX + SG_ Checksum : 56|8@1+ (1,0) [0|15] "" XXX BO_ 354 ES_RPM: 8 XXX - SG_ Counter : 48|3@1+ (1,0) [0|7] "" XXX - SG_ RPM : 16|16@1+ (1,0) [0|255] "" XXX SG_ Brake : 8|1@1+ (1,0) [0|7] "" XXX SG_ Cruise_Activated : 9|1@1+ (1,0) [0|3] "" XXX + SG_ RPM : 16|16@1+ (1,0) [0|255] "" XXX SG_ Checksum : 32|8@1+ (1,0) [0|65535] "" XXX + SG_ Counter : 48|3@1+ (1,0) [0|7] "" XXX BO_ 356 ES_LKAS: 8 XXX - SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 0|3@1+ (1,0) [0|7] "" XXX - SG_ LKAS_Active : 24|1@1+ (1,0) [0|1] "" XXX SG_ LKAS_Command : 8|13@1- (-1,0) [-4096|4096] "" XXX + SG_ LKAS_Active : 24|1@1+ (1,0) [0|1] "" XXX + SG_ Checksum : 56|8@1+ (1,0) [0|255] "" XXX BO_ 358 ES_DashStatus: 8 XXX SG_ Not_Ready_Startup : 0|3@1+ (1,0) [0|7] "" XXX @@ -206,136 +165,80 @@ BO_ 358 ES_DashStatus: 8 XXX SG_ Disengage_Alert : 14|2@1+ (1,0) [0|3] "" XXX SG_ Cruise_On : 16|1@1+ (1,0) [0|7] "" XXX SG_ Cruise_Activated : 17|1@1+ (1,0) [0|3] "" XXX + SG_ Untitled_Blank_2 : 18|1@1+ (1,0) [0|3] "" XXX SG_ WHEELS_MOVING_2015 : 19|1@1+ (1,0) [0|3] "" XXX SG_ Driver_Input : 20|1@1+ (1,0) [0|15] "" XXX + SG_ Distance_Bars : 21|3@1+ (1,0) [0|3] "" XXX + SG_ Cruise_Set_Speed : 24|8@1+ (1,0) [0|255] "" XXX SG_ ES_Error : 32|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_5_Blank : 33|1@1+ (1,0) [0|3] "" XXX SG_ Cruise_On_2 : 34|1@1+ (1,0) [0|7] "" XXX - SG_ NEW_SIGNAL_1 : 35|1@1+ (1,0) [0|31] "" XXX SG_ Counter : 37|3@1+ (1,0) [0|7] "" XXX SG_ Steep_Hill_Disengage : 44|1@1+ (1,0) [0|3] "" XXX SG_ Lead_Car : 46|1@1+ (1,0) [0|255] "" XXX - SG_ Cruise_Set_Speed : 24|8@1+ (1,0) [0|255] "" XXX - SG_ Distance_Bars : 21|3@1+ (1,0) [0|3] "" XXX - SG_ Untitled_Blank_2 : 18|1@1+ (1,0) [0|3] "" XXX SG_ Obstacle_Distance : 48|4@1+ (5,0) [0|15] "m" XXX BO_ 359 ES_LDW: 8 XXX + SG_ All_depart_2015 : 0|1@1+ (1,0) [0|255] "" XXX + SG_ Right_Line_2017 : 24|1@1+ (1,0) [0|7] "" XXX SG_ Left_Line_2017 : 25|1@1+ (1,0) [0|3] "" XXX - SG_ Sig1Right_Depart : 48|1@1+ (1,0) [0|3] "" XXX - SG_ Sig2Right_Depart : 50|1@1+ (1,0) [0|7] "" XXX + SG_ Sig2All_Depart : 28|1@1+ (1,0) [0|3] "" XXX + SG_ Sig1All_Depart : 31|1@1+ (1,0) [0|15] "" XXX SG_ LKAS_Inactive_2017 : 36|1@1+ (1,0) [0|3] "" XXX + SG_ LKAS_Active : 37|1@1+ (1,0) [0|3] "" XXX SG_ Sig1Right_Depart_Front : 49|1@1+ (1,0) [0|3] "" XXX - SG_ Sig3All_Depart : 52|1@1+ (1,0) [0|3] "" XXX SG_ Left_Depart_Front : 51|1@1+ (1,0) [0|3] "" XXX + SG_ Sig3All_Depart : 52|1@1+ (1,0) [0|3] "" XXX SG_ Alerts : 48|5@1+ (1,0) [0|3] "" XXX - SG_ LKAS_Active : 37|1@1+ (1,0) [0|3] "" XXX - SG_ Sig1All_Depart : 31|1@1+ (1,0) [0|15] "" XXX - SG_ Sig2All_Depart : 28|1@1+ (1,0) [0|3] "" XXX - SG_ Right_Line_2017 : 24|1@1+ (1,0) [0|7] "" XXX - SG_ All_depart_2015 : 0|1@1+ (1,0) [0|255] "" XXX - -BO_ 392 Counter_0: 8 XXX - SG_ Counter : 16|4@1+ (1,0) [0|15] "" XXX - -BO_ 554 NEW_MSG_3: 8 XXX - SG_ Counter : 0|4@1+ (1,0) [0|255] "" XXX - -BO_ 640 NEW_MSG_10: 8 XXX - SG_ NEW_SIGNAL_6 : 0|1@1+ (1,0) [0|7] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_2 : 24|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 33|2@1+ (1,0) [0|63] "" XXX - SG_ NEW_SIGNAL_7 : 38|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_5 : 39|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_1 : 40|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 53|2@1+ (1,0) [0|15] "" XXX + SG_ Sig1Right_Depart : 48|1@1+ (1,0) [0|3] "" XXX + SG_ Sig2Right_Depart : 50|1@1+ (1,0) [0|7] "" XXX BO_ 642 Dashlights: 8 XXX - SG_ NEW_SIGNAL_2 : 32|1@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 34|2@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_1 : 0|12@1+ (1,0) [0|255] "" XXX SG_ Counter : 12|4@1+ (1,0) [0|15] "" XXX - SG_ RIGHT_BLINKER : 45|1@1+ (1,0) [0|3] "" XXX - SG_ LEFT_BLINKER : 44|1@1+ (1,0) [0|3] "" XXX SG_ SEATBELT_FL : 40|1@1+ (1,0) [0|3] "" XXX - -BO_ 644 NEW_MSG_8: 8 XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX + SG_ LEFT_BLINKER : 44|1@1+ (1,0) [0|3] "" XXX + SG_ RIGHT_BLINKER : 45|1@1+ (1,0) [0|3] "" XXX BO_ 880 Steer_Torque_2: 8 XXX SG_ Steering_Voltage_Flat : 0|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_1 : 8|1@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 30|1@1+ (1,0) [0|3] "" XXX SG_ Steer_Torque_Sensor : 32|8@1- (-1,0) [0|255] "" XXX SG_ Counter : 40|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 48|4@1- (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_4_2017 : 52|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_5_2017 : 54|1@1+ (1,0) [0|3] "" XXX BO_ 881 Steering_Torque: 8 XXX SG_ Steering_Motor_Flat : 0|10@1+ (32,0) [0|16500] "" XXX SG_ Steer_Torque_Output : 16|11@1- (-32,0) [-16500|16500] "" XXX SG_ LKA_Lockout : 27|1@1+ (1,0) [0|1] "" XXX - SG_ Steer_Torque_Sensor : 29|11@1- (8,0) [-8500|-8500] "" XXX + SG_ Steer_Torque_Sensor : 29|11@1- (8,0) [-8500|8500] "" XXX SG_ Steering_Angle : 40|16@1- (-0.033,0) [-600|600] "" XXX -BO_ 882 Counter: 8 XXX - SG_ Something : 16|2@1+ (1,0) [0|255] "" XXX - SG_ Counter : 12|4@1+ (1,0) [0|31] "" XXX - BO_ 884 BodyInfo: 8 XXX - SG_ DOOR_OPEN_Hatch : 28|1@1+ (1,0) [0|1] "" XXX - SG_ DOOR_OPEN_RR : 27|1@1+ (1,0) [0|1] "" XXX - SG_ DOOR_OPEN_RL : 26|1@1+ (1,0) [0|1] "" XXX - SG_ DOOR_OPEN_FL : 25|1@1+ (1,0) [0|1] "" XXX SG_ DOOR_OPEN_FR : 24|1@1+ (1,0) [0|1] "" XXX - SG_ _UNKNOWN : 0|3@1+ (1,0) [0|1] "" XXX + SG_ DOOR_OPEN_FL : 25|1@1+ (1,0) [0|1] "" XXX + SG_ DOOR_OPEN_RL : 26|1@1+ (1,0) [0|1] "" XXX + SG_ DOOR_OPEN_RR : 27|1@1+ (1,0) [0|1] "" XXX + SG_ DOOR_OPEN_Hatch : 28|1@1+ (1,0) [0|1] "" XXX BO_ 864 Engine_Temp: 8 XXX - SG_ NEW_SIGNAL_1 : 32|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 44|1@1+ (1,0) [0|3] "" XXX - SG_ Saved_Speed : 56|8@1+ (1,0) [0|255] "" XXX - SG_ Cruise_Activated : 45|1@1+ (1,0) [0|3] "" XXX SG_ Oil_Temp : 16|8@1+ (1,-40) [0|255] "" XXX SG_ Coolant_Temp : 24|8@1+ (1,-40) [0|255] "" XXX - -BO_ 865 NEW_MSG_16: 8 XXX - SG_ NEW_SIGNAL_1 : 16|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 32|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_2 : 12|1@1+ (1,0) [0|255] "" XXX + SG_ Cruise_Activated : 45|1@1+ (1,0) [0|3] "" XXX + SG_ Saved_Speed : 56|8@1+ (1,0) [0|255] "" XXX BO_ 866 Fuel__: 8 XXX - SG_ NEW_SIGNAL_1 : 0|16@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_5 : 24|1@1+ (1,0) [0|32767] "" XXX - SG_ NEW_SIGNAL_3 : 32|4@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 40|8@1+ (1,0) [0|1] "" XXX - SG_ NEW_SIGNAL_2 : 48|8@1+ (1,0) [0|16777215] "" XXX - -BO_ 872 NEW_MSG_15: 8 XXX - SG_ NEW_SIGNAL_1 : 24|8@1+ (1,0) [0|65535] "" XXX - -BO_ 977 NEW_MSG_12: 8 XXX - SG_ NEW_SIGNAL_1 : 0|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 16|12@1+ (1,0) [0|255] "" XXX - -BO_ 1632 Huge_Counter: 8 XXX - SG_ Counter : 55|16@0+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_1 : 31|8@0+ (1,0) [0|255] "" XXX - -BO_ 1745 NEW_MSG_11: 8 XXX - SG_ NEW_SIGNAL_1 : 24|6@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 40|6@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 0|8@1+ (1,0) [0|255] "" XXX - -BO_ 1786 NEW_MSG_9: 8 XXX - SG_ NEW_SIGNAL_2 : 8|16@1+ (1,0) [0|15] "" XXX - SG_ Counter : 0|4@1+ (1,0) [0|255] "" XXX - +BO_ 604 BSD_RCTA: 8 XXX + SG_ Counter : 0|3@1+ (1,0) [0|1] "" XXX + SG_ State : 5|1@1+ (1,0) [0|1] "" XXX + SG_ R_ADJACENT : 32|1@1+ (1,0) [0|1] "" XXX + SG_ L_ADJACENT : 33|1@1+ (1,0) [0|1] "" XXX + SG_ R_APPROACHING : 42|1@1+ (1,0) [0|1] "" XXX + SG_ L_APPROACHING : 43|1@1+ (1,0) [0|1] "" XXX + SG_ R_RCTA : 46|1@1+ (1,0) [0|1] "" XXX + SG_ L_RCTA : 47|1@1+ (1,0) [0|1] "" XXX +BO_ 1745 Dash_State: 8 XXX + SG_ Units : 13|1@1+ (1,0) [0|1] "" XXX + SG_ Units2 : 15|1@1+ (1,0) [0|1] "" XXX -CM_ SG_ 2 NEW_SIGNAL_1 ""; CM_ SG_ 211 Brake_Pedal_On "high tolerance"; CM_ SG_ 212 FL "KPH"; CM_ SG_ 212 RL "KPH"; @@ -347,7 +250,6 @@ CM_ SG_ 353 Button "1 = main, 2 = set shallow, 3 = set deep, 4 = resume shallow, CM_ SG_ 353 Brake_On "long activatedish"; CM_ SG_ 353 SET_1 "always 1"; CM_ SG_ 353 SET_2 ""; -CM_ SG_ 353 NEW_SIGNAL_9 "flipped around quick engagement"; CM_ SG_ 354 RPM "20hz version of Transmission_Engine under Transmission"; CM_ SG_ 358 3SecondDisengage "seatbelt disengage"; CM_ SG_ 358 Disengage_Alert "seatbelt and steep hill disengage"; @@ -362,10 +264,14 @@ CM_ SG_ 359 Alerts "2 = lead beep"; CM_ SG_ 359 Sig1All_Depart "Left and right depart"; CM_ SG_ 359 Sig2All_Depart "Left and right depart"; CM_ SG_ 359 All_depart_2015 "always 1 on 2017"; +CM_ SG_ 604 R_APPROACHING "Faster car approaching in far right lane"; +CM_ SG_ 604 L_APPROACHING "Faster car approaching in far left lane"; +CM_ SG_ 604 R_RCTA "Rear cross traffic alert, only when in R gear"; +CM_ SG_ 604 L_RCTA "Rear cross traffic alert, only when in R gear"; CM_ SG_ 642 Counter "Affected by signals"; CM_ SG_ 642 RIGHT_BLINKER "0 off, 2 right, 1 left"; -CM_ SG_ 642 SEATBELT_FL ""; +CM_ SG_ 642 SEATBELT_FL "Driver seatbelt"; CM_ SG_ 880 Steering_Voltage_Flat "receives later than 371"; -CM_ SG_ 880 NEW_SIGNAL_1 "0 in 2017"; -CM_ SG_ 880 NEW_SIGNAL_4_2017 "1 in 2017"; -CM_ SG_ 880 NEW_SIGNAL_5_2017 "1 in 2017"; +VAL_ 328 Gear 0 "N" 1 "D" 2 "D" 3 "D" 4 "D" 5 "D" 6 "D" 14 "R" 15 "P"; +VAL_ 1745 Units 0 "Metric" 1 "Imperial"; +VAL_ 1745 Units2 0 "Metric 1 "Imperial"; diff --git a/toyota_avalon_2017_pt_generated.dbc b/toyota_avalon_2017_pt_generated.dbc index 9d39b290492804..e7e66055aef7b7 100644 --- a/toyota_avalon_2017_pt_generated.dbc +++ b/toyota_avalon_2017_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/toyota_camry_hybrid_2018_pt_generated.dbc b/toyota_camry_hybrid_2018_pt_generated.dbc index 0061feab7ed770..e3a7b7fdcf89f4 100644 --- a/toyota_camry_hybrid_2018_pt_generated.dbc +++ b/toyota_camry_hybrid_2018_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/toyota_corolla_2017_pt_generated.dbc b/toyota_corolla_2017_pt_generated.dbc index f683e044cb9f45..81f9b8b2b5f1cc 100644 --- a/toyota_corolla_2017_pt_generated.dbc +++ b/toyota_corolla_2017_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/toyota_highlander_2017_pt_generated.dbc b/toyota_highlander_2017_pt_generated.dbc index ec67f2722b70b0..720297001cffe9 100644 --- a/toyota_highlander_2017_pt_generated.dbc +++ b/toyota_highlander_2017_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/toyota_highlander_hybrid_2018_pt_generated.dbc b/toyota_highlander_hybrid_2018_pt_generated.dbc index 27290d1732ddd7..4f00158e492272 100644 --- a/toyota_highlander_hybrid_2018_pt_generated.dbc +++ b/toyota_highlander_hybrid_2018_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/toyota_nodsu_hybrid_pt_generated.dbc b/toyota_nodsu_hybrid_pt_generated.dbc index 9c9b548e4638ce..c440fa3d37d17d 100644 --- a/toyota_nodsu_hybrid_pt_generated.dbc +++ b/toyota_nodsu_hybrid_pt_generated.dbc @@ -111,12 +111,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/toyota_nodsu_pt_generated.dbc b/toyota_nodsu_pt_generated.dbc index 76661d3a8f4ed3..036ebe0a764692 100644 --- a/toyota_nodsu_pt_generated.dbc +++ b/toyota_nodsu_pt_generated.dbc @@ -111,12 +111,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX @@ -382,7 +382,6 @@ 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 @@ -391,6 +390,9 @@ BO_ 401 STEERING_LTA: 8 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 BO_ 550 BRAKE_MODULE: 8 XXX SG_ BRAKE_PRESSURE : 0|9@0+ (1,0) [0|511] "" XXX diff --git a/toyota_prius_2017_pt_generated.dbc b/toyota_prius_2017_pt_generated.dbc index db481d56e53b49..b130efdd2ad416 100644 --- a/toyota_prius_2017_pt_generated.dbc +++ b/toyota_prius_2017_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/toyota_rav4_2017_pt_generated.dbc b/toyota_rav4_2017_pt_generated.dbc index 82a0ff54398edd..a1dc4b7ead039c 100644 --- a/toyota_rav4_2017_pt_generated.dbc +++ b/toyota_rav4_2017_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 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 84e130c8d00539..f99bab9dbe78f7 100644 --- a/toyota_rav4_hybrid_2017_pt_generated.dbc +++ b/toyota_rav4_hybrid_2017_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX diff --git a/toyota_sienna_xle_2018_pt_generated.dbc b/toyota_sienna_xle_2018_pt_generated.dbc index 48446ecb46f3e3..50fb56fb03635c 100644 --- a/toyota_sienna_xle_2018_pt_generated.dbc +++ b/toyota_sienna_xle_2018_pt_generated.dbc @@ -94,12 +94,12 @@ BO_ 180 SPEED: 8 XXX SG_ SPEED : 47|16@0+ (0.01,0) [0|250] "kph" XXX SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX -BO_ 353 DSU_SPEED: 8 XXX +BO_ 353 DSU_SPEED: 7 XXX SG_ FORWARD_SPEED : 15|16@0- (0.00390625,-30) [0|255] "kph" XXX - + BO_ 452 ENGINE_RPM: 8 CGW SG_ RPM : 7|16@0- (0.78125,0) [0|0] "rpm" SCS - + BO_ 466 PCM_CRUISE: 8 XXX SG_ GAS_RELEASED : 4|1@0+ (1,0) [0|1] "" XXX SG_ CRUISE_ACTIVE : 5|1@0+ (1,0) [0|1] "" XXX