From 76df4094d0c9c64748d21c8616e8223fb4ff198c Mon Sep 17 00:00:00 2001 From: Vehicle Researcher Date: Fri, 29 May 2020 15:45:22 -0700 Subject: [PATCH] Squashed 'opendbc/' changes from f1e69a6cf..0430bfa5c 0430bfa5c run pre commit in ci (#268) 2ade6eeba Subaru DBC update (#242) d1185a53e Toyota ACC_CONTROL PERMIT_BRAKING and ACCEL_CMT_ALT speculated definition (#258) e6766bbbb Update SCC ECU Messages for OP Long Dev. (#267) b49b9ee75 Add DAW (#175) 3b5cccba0 Fixed up cell voltage readings and added more commands (#220) 8b0449327 Mazda: add missing static bits, tidy up endianness (#263) 124719992 Add BSD_RCTA to Subaru Global (#244) 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: 0430bfa5c2b08f9cc6ab32470fe8ac9465e7a876 --- .github/workflows/tests.yml | 3 + .gitignore | 1 + .pre-commit-config.yaml | 27 ++ Dockerfile | 8 +- can/packer_pyx_setup.py | 4 +- can/parser_pyx_setup.py | 4 +- can/process_dbc.py | 2 +- generator/toyota/_toyota_2017.dbc | 11 +- generator/toyota/toyota_nodsu_pt.dbc | 4 +- gm_global_a_high_voltage_management.dbc | 235 +++++++------- gm_global_a_powertrain_expansion.dbc | 56 ++++ hyundai_kia_generic.dbc | 138 ++++---- lexus_ct200h_2018_pt_generated.dbc | 11 +- lexus_gs300h_2017_pt_generated.dbc | 11 +- lexus_is_2018_pt_generated.dbc | 11 +- lexus_nx300h_2018_pt_generated.dbc | 11 +- lexus_rx_350_2016_pt_generated.dbc | 11 +- lexus_rx_hybrid_2017_pt_generated.dbc | 11 +- mazda_cx5_gt_2017.dbc => mazda_2017.dbc | 33 +- subaru_crosstrek_2018.dbc | 295 ++++++------------ subaru_forester_2017.dbc | 266 ++++++++++++++++ subaru_global_2017.dbc | 211 ++----------- subaru_outback_2015_eyesight.dbc | 264 +++++----------- toyota_avalon_2017_pt_generated.dbc | 11 +- toyota_camry_hybrid_2018_pt_generated.dbc | 11 +- toyota_corolla_2017_pt_generated.dbc | 11 +- toyota_highlander_2017_pt_generated.dbc | 11 +- ...ta_highlander_hybrid_2018_pt_generated.dbc | 11 +- toyota_nodsu_hybrid_pt_generated.dbc | 11 +- toyota_nodsu_pt_generated.dbc | 15 +- toyota_prius_2017_pt_generated.dbc | 11 +- toyota_rav4_2017_pt_generated.dbc | 11 +- toyota_rav4_hybrid_2017_pt_generated.dbc | 11 +- toyota_sienna_xle_2018_pt_generated.dbc | 11 +- 34 files changed, 921 insertions(+), 832 deletions(-) create mode 100644 .pre-commit-config.yaml create mode 100644 gm_global_a_powertrain_expansion.dbc rename mazda_cx5_gt_2017.dbc => mazda_2017.dbc (97%) create mode 100644 subaru_forester_2017.dbc diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2141cb0264acd0..c0296cc5c83726 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,6 +12,9 @@ jobs: set -e docker build -t opendbc . name: "Build" + - name: Static analysis + run: | + docker run opendbc bash -c "cd opendbc && git init && git add -A && pre-commit run --all" - run: | docker run opendbc bash -c "python -m unittest discover opendbc" name: "Unit tests" diff --git a/.gitignore b/.gitignore index 1e219f2b79c89f..26a5b456e4a2a4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.mypy_cache/ *.pyc *.os *.tmp diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 00000000000000..602d9d8ee634e1 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,27 @@ +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: master + hooks: + - id: check-ast + - id: check-json + - id: check-xml + - id: check-yaml +- repo: https://github.com/pre-commit/mirrors-mypy + rev: master + hooks: + - id: mypy +- repo: https://github.com/PyCQA/flake8 + rev: master + hooks: + - id: flake8 + args: + - --select=F +- repo: local + hooks: + - id: pylint + name: pylint + entry: pylint + language: system + types: [python] + args: + - --disable=R,C,W diff --git a/Dockerfile b/Dockerfile index e105313756022c..4b5a2fe39043d9 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}" @@ -10,16 +10,16 @@ RUN pyenv rehash COPY requirements.txt /tmp/ RUN pip install -r /tmp/requirements.txt +RUN pip install pre-commit==2.4.0 pylint==2.5.2 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 +RUN rm -rf /project/opendbc/.git RUN scons -c && scons -j$(nproc) 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..b0d470b972af6f 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 @@ -128,10 +128,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -285,6 +286,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; 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/gm_global_a_high_voltage_management.dbc b/gm_global_a_high_voltage_management.dbc index 1baf542a2b202e..be76709785f46f 100644 --- a/gm_global_a_high_voltage_management.dbc +++ b/gm_global_a_high_voltage_management.dbc @@ -32,126 +32,124 @@ NS_ : SG_MUL_VAL_ BS_: -BU_: K16_BECM K114B_HPCM T18_BatteryCharger - +BU_: K16_BECM K114B_HPCM T18_BatteryCharger BO_ 512 Battery_Module_1: 8 K16_BECM - SG_ Voltage_1_0_A m0 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_0_B m0 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_0_C m0 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_1_A m1 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_1_B m1 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_1_C m1 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_2_A m2 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_2_B m2 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_2_C m2 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_3_A m3 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_3_B m3 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_3_C m3 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_4_A m4 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_4_B m4 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_4_C m4 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_5_A m5 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_5_B m5 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_5_C m5 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_6_A m6 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_6_B m6 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_6_C m6 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_7_A m7 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_7_B m7 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_1_7_C m7 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Cell_Bank_Number_1 M : 53|7@1+ (1,0) [0|0] "" K16_BECM + SG_ Voltage_1_0_A m0 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_0_B m0 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_0_C m0 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_1_A m1 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_1_B m1 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_1_C m1 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_2_A m2 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_2_B m2 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_2_C m2 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_3_A m3 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_3_B m3 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_3_C m3 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_4_A m4 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_4_B m4 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_4_C m4 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_5_A m5 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_5_B m5 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_5_C m5 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_6_A m6 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_6_B m6 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_6_C m6 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_7_A m7 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_7_B m7 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_1_7_C m7 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Cell_Bank_Number_1 M : 55|3@0+ (1,0) [0|0] "" K16_BECM BO_ 514 Battery_Module_2: 8 K16_BECM - SG_ Voltage_2_0_A m0 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_0_B m0 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_0_C m0 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_1_A m1 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_1_B m1 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_1_C m1 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_2_A m2 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_2_B m2 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_2_C m2 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_3_A m3 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_3_B m3 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_3_C m3 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_4_A m4 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_4_B m4 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_4_C m4 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_5_A m5 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_5_B m5 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_5_C m5 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_6_A m6 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_6_B m6 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_6_C m6 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_7_A m7 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_7_B m7 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_2_7_C m7 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Cell_Bank_Number_2 M : 53|7@1+ (1,0) [0|0] "" K16_BECM + SG_ Voltage_2_0_A m0 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_0_B m0 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_0_C m0 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_1_A m1 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_1_B m1 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_1_C m1 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_2_A m2 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_2_B m2 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_2_C m2 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_3_A m3 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_3_B m3 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_3_C m3 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_4_A m4 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_4_B m4 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_4_C m4 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_5_A m5 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_5_B m5 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_5_C m5 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_6_A m6 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_6_B m6 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_6_C m6 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_7_A m7 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_7_B m7 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_2_7_C m7 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Cell_Bank_Number_2 M : 55|3@0+ (1,0) [0|0] "" K16_BECM BO_ 516 Battery_Module_3: 8 K16_BECM - SG_ Voltage_3_0_A m0 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_0_B m0 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_0_C m0 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_1_A m1 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_1_B m1 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_1_C m1 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_2_A m2 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_2_B m2 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_2_C m2 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_3_A m3 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_3_B m3 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_3_C m3 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_4_A m4 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_4_B m4 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_4_C m4 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_5_A m5 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_5_B m5 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_5_C m5 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_6_A m6 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_6_B m6 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_6_C m6 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_7_A m7 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_7_B m7 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_3_7_C m7 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Cell_Bank_Number_3 M : 53|7@1+ (1,0) [0|0] "" K16_BECM + SG_ Voltage_3_0_A m0 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_0_B m0 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_0_C m0 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_1_A m1 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_1_B m1 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_1_C m1 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_2_A m2 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_2_B m2 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_2_C m2 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_3_A m3 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_3_B m3 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_3_C m3 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_4_A m4 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_4_B m4 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_4_C m4 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_5_A m5 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_5_B m5 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_5_C m5 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_6_A m6 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_6_B m6 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_6_C m6 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_7_A m7 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_7_B m7 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_3_7_C m7 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Cell_Bank_Number_3 M : 55|3@0+ (1,0) [0|0] "" K16_BECM BO_ 518 Battery_Module_4: 8 K16_BECM - SG_ Voltage_4_0_A m0 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_0_B m0 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_0_C m0 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_1_A m1 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_1_B m1 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_1_C m1 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_2_A m2 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_2_B m2 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_2_C m2 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_3_A m3 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_3_B m3 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_3_C m3 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_4_A m4 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_4_B m4 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_4_C m4 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_5_A m5 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_5_B m5 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_5_C m5 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_6_A m6 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_6_B m6 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_6_C m6 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_7_A m7 : 4|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_7_B m7 : 20|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Voltage_4_7_C m7 : 36|12@1+ (0.00125,0) [0|0] "V" K16_BECM - SG_ Cell_Bank_Number_4 M : 53|7@1+ (1,0) [0|0] "" K16_BECM + SG_ Voltage_4_0_A m0 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_0_B m0 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_0_C m0 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_1_A m1 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_1_B m1 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_1_C m1 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_2_A m2 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_2_B m2 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_2_C m2 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_3_A m3 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_3_B m3 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_3_C m3 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_4_A m4 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_4_B m4 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_4_C m4 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_5_A m5 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_5_B m5 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_5_C m5 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_6_A m6 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_6_B m6 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_6_C m6 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_7_A m7 : 4|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_7_B m7 : 20|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Voltage_4_7_C m7 : 39|12@0+ (0.00125,0) [0|0] "V" K16_BECM + SG_ Cell_Bank_Number_4 M : 55|3@0+ (1,0) [0|0] "" K16_BECM BO_ 528 Pack_Stats: 8 K16_BECM SG_ Pack_Voltage : 7|12@0+ (0.125,0) [0|0] "V" K16_BECM - SG_ Pack_Amps : 9|10@0+ (0.1,0) [0|0] "" K16_BECM - SG_ Pack_Amps2 : 28|12@0+ (0.05,0) [0|0] "" K16_BECM + SG_ Pack_Current : 23|8@0- (0.15,0) [0|0] "A" K16_BECM BO_ 530 Charger_stats: 6 T18_BatteryCharger - SG_ Charger_HV_Current : 0|13@1+ (0.05,0) [0|0] "A" K16_BECM - SG_ HV_Voltage : 13|10@1+ (0.5,0) [0|0] "V" K16_BECM + SG_ Charger_HV_Current : 0|10@1+ (0.05,0) [0|0] "A" K16_BECM + SG_ HV_Voltage : 10|10@1+ (0.5,0) [0|0] "V" K16_BECM SG_ LV_Current : 23|8@1+ (0.2,0) [0|0] "A" K16_BECM - SG_ LV_Voltage : 31|10@1- (0.025,0) [0|0] "V" K16_BECM + SG_ LV_Voltage : 31|10@1+ (0.025,0) [0|0] "V" K16_BECM BO_ 770 Battery_temp: 8 K16_BECM SG_ Temp_A m0 : 8|8@1+ (0.5,-40) [0|0] "C" K16_BECM @@ -165,6 +163,26 @@ BO_ 770 Battery_temp: 8 K16_BECM SG_ Temp_I m1 : 24|8@1+ (0.5,-40) [0|0] "C" K16_BECM SG_ Switch M : 2|1@1+ (1,0) [0|0] "" K16_BECM +BO_ 782 Charger_Command: 1 T18_BatteryCharger + SG_ Command : 0|8@1+ (1,0) [0|0] "" Vector__XXX + +BO_ 772 Charger_parameters: 4 T18_BatteryCharger + SG_ Unknown : 0|8@1+ (1,0) [0|0] "" Vector__XXX + SG_ Current : 8|8@1+ (0.05,0) [0|0] "A" Vector__XXX + SG_ Voltage : 23|16@0+ (0.5,0) [0|0] "V" Vector__XXX + +BO_ 1120 Coolant_Temp: 4 K16_BECM + SG_ Coolant_Temp : 7|16@0+ (1,0) [0|0] "" Vector__XXX + +BO_ 778 AC_Stats: 7 T18_BatteryCharger + SG_ Mains_Voltage : 0|12@1+ (0.1,0) [0|0] "V" Vector__XXX + SG_ Total_Charge : 19|8@0+ (1,0) [0|0] "" Vector__XXX + +BO_ 776 Charger_unknown: 5 T18_BatteryCharger + SG_ Bit_20 : 20|1@1+ (1,0) [0|0] "" Vector__XXX + SG_ Bit_21 : 21|1@1+ (1,0) [0|0] "" Vector__XXX + SG_ Bit_22 : 22|1@1+ (1,0) [0|0] "" Vector__XXX + BA_DEF_ BO_ "GenMsgBackgroundColor" STRING ; BA_DEF_ BO_ "GenMsgForegroundColor" STRING ; BA_DEF_ BO_ "isj1939dbc" INT 0 0; @@ -173,4 +191,5 @@ BA_DEF_DEF_ "GenMsgForegroundColor" "#000000"; BA_DEF_DEF_ "isj1939dbc" 0; CM_ BU_ K16_BECM "Battery Energy Control Module"; CM_ BU_ K114B_HPCM "Hybrid Powertrain Control Module"; -CM_ BU_ T18_BatteryCharger "Battery Charger"; \ No newline at end of file +CM_ BU_ T18_BatteryCharger "Battery Charger"; +VAL_ 782 Command 1 "12V_Only" 2 "HV_Only" 3 "12V_and_HV"; diff --git a/gm_global_a_powertrain_expansion.dbc b/gm_global_a_powertrain_expansion.dbc new file mode 100644 index 00000000000000..b18ac6974da42f --- /dev/null +++ b/gm_global_a_powertrain_expansion.dbc @@ -0,0 +1,56 @@ +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_: K1_APM +BO_ 470 APM_Stats: 7 K1_APM + SG_ APM_Low_Voltage_Sensed : 16|8@1+ (0.0787402,0) [0|0] "V" Vector__XXX + SG_ APM_Temperature_1 : 24|8@1+ (1,-40) [0|0] "C" Vector__XXX + SG_ APM_Temperature_2 : 32|8@1+ (1,-40) [0|0] "C" Vector__XXX + SG_ APM_Low_Voltage_Current_Output : 40|8@1- (1,0) [0|0] "A" Vector__XXX + SG_ APM_Status : 7|8@0+ (1,0) [0|0] "" Vector__XXX + SG_ APM_High_Voltage_Input_Current : 8|8@1- (0.15,-7) [0|0] "A" Vector__XXX + SG_ APM_Counter : 48|8@1+ (1,0) [0|0] "" Vector__XXX + +BO_ 468 APM_Command: 2 K1_APM + SG_ APM_Status : 0|8@1+ (1,0) [0|0] "" Vector__XXX + SG_ APM_Voltage_Requested : 8|8@1+ (0.0787402,0) [0|0] "V" Vector__XXX + +BA_DEF_ BO_ "GenMsgBackgroundColor" STRING ; +BA_DEF_ BO_ "GenMsgForegroundColor" STRING ; +BA_DEF_ BO_ "isj1939dbc" INT 0 0; +BA_DEF_DEF_ "GenMsgBackgroundColor" "#ffffff"; +BA_DEF_DEF_ "GenMsgForegroundColor" "#000000"; +BA_DEF_DEF_ "isj1939dbc" 0; +CM_ BU_ K1_APM "14V Power Module"; +VAL_ 468 APM_Status 0 "Off" 160 "On"; diff --git a/hyundai_kia_generic.dbc b/hyundai_kia_generic.dbc index 46b69c18a16422..a3803355e0a033 100644 --- a/hyundai_kia_generic.dbc +++ b/hyundai_kia_generic.dbc @@ -990,6 +990,8 @@ BO_ 1342 LKAS12: 6 LDWS_LKAS SG_ CF_Lkas_TsrSpeed_Display_Clu : 16|8@1+ (1.0,0.0) [0.0|255.0] "" CLU SG_ CF_LkasTsrSpeed_Display_Navi : 24|8@1+ (1.0,0.0) [0.0|255.0] "" BCM,CLU SG_ CF_Lkas_TsrAddinfo_Display : 32|2@1+ (1.0,0.0) [0.0|3.0] "" CLU + SG_ CF_LkasDawStatus : 40|3@1+ (1,0) [0|7] "" CLU + SG_ CF_Lkas_Daw_USM : 39|3@1+ (1,0) [0|7] "" CLU BO_ 1338 TMU_GW_E_01: 8 CLU SG_ CF_Gway_TeleReqDrLock : 0|2@1+ (1.0,0.0) [0.0|3.0] "" BCM @@ -1159,27 +1161,27 @@ BO_ 1314 GW_IPM_PE_1: 8 BCM SG_ C_SMKTeleCrankingFailRes : 34|2@1+ (1.0,0.0) [0.0|3.0] "" CLU BO_ 1057 SCC12: 8 SCC - SG_ CF_VSM_Prefill : 0|1@1+ (1.0,0.0) [0.0|1.0] "" ESC - SG_ CF_VSM_DecCmdAct : 1|1@1+ (1.0,0.0) [0.0|1.0] "" ESC - SG_ CF_VSM_HBACmd : 2|2@1+ (1.0,0.0) [0.0|3.0] "" ESC - SG_ CF_VSM_Warn : 4|2@1+ (1.0,0.0) [0.0|3.0] "" CLU,ESC,IAP - SG_ CF_VSM_Stat : 6|2@1+ (1.0,0.0) [0.0|3.0] "" CLU,ESC,PSB - SG_ CF_VSM_BeltCmd : 8|3@1+ (1.0,0.0) [0.0|7.0] "" ESC,PSB - SG_ ACCFailInfo : 11|2@1+ (1.0,0.0) [0.0|3.0] "" CLU,CUBIS,ESC,IBOX - SG_ ACCMode : 13|2@1+ (1.0,0.0) [0.0|3.0] "" CLU,ESC,IBOX,TCU - SG_ StopReq : 15|1@1+ (1.0,0.0) [0.0|1.0] "" EPB,ESC - SG_ CR_VSM_DecCmd : 16|8@1+ (0.01,0.0) [0.0|2.55] "g" ESC - SG_ aReqMax : 24|11@1+ (0.01,-10.23) [-10.23|10.24] "m/s^2" EMS,ESC,TCU - SG_ TakeOverReq : 35|1@1+ (1.0,0.0) [0.0|1.0] "" CLU,ESC,TCU - SG_ PreFill : 36|1@1+ (1.0,0.0) [0.0|1.0] "" ESC,TCU - SG_ aReqMin : 37|11@1+ (0.01,-10.23) [-10.23|10.24] "m/s^2" EMS,ESC,TCU - SG_ CF_VSM_ConfMode : 48|2@1+ (1.0,0.0) [0.0|3.0] "" CLU,ESC - SG_ AEB_Failinfo : 50|2@1+ (1.0,0.0) [0.0|3.0] "" CLU,ESC - SG_ AEB_Status : 52|2@1+ (1.0,0.0) [0.0|3.0] "" CLU,ESC - SG_ AEB_CmdAct : 54|1@1+ (1.0,0.0) [0.0|1.0] "" ESC - SG_ AEB_StopReq : 55|1@1+ (1.0,0.0) [0.0|1.0] "" CLU,ESC - SG_ CR_VSM_Alive : 56|4@1+ (1.0,0.0) [0.0|15.0] "" ESC,PSB - SG_ CR_VSM_ChkSum : 60|4@1+ (1.0,0.0) [0.0|15.0] "" ESC,PSB + SG_ CF_VSM_Prefill : 0|1@1+ (1,0) [0|1] "" ESC + SG_ CF_VSM_DecCmdAct : 1|1@1+ (1,0) [0|1] "" ESC + SG_ CF_VSM_HBACmd : 2|2@1+ (1,0) [0|3] "" ESC + SG_ CF_VSM_Warn : 4|2@1+ (1,0) [0|3] "" CLU,ESC,IAP + SG_ CF_VSM_Stat : 6|2@1+ (1,0) [0|3] "" CLU,ESC,PSB + SG_ CF_VSM_BeltCmd : 8|3@1+ (1,0) [0|7] "" ESC,PSB + SG_ ACCFailInfo : 11|2@1+ (1,0) [0|3] "" CLU,CUBIS,ESC,IBOX + SG_ ACCMode : 13|2@1+ (1,0) [0|3] "" CLU,ESC,IBOX,TCU + SG_ StopReq : 15|1@1+ (1,0) [0|1] "" EPB,ESC + SG_ CR_VSM_DecCmd : 16|8@1+ (0.01,0) [0|2.55] "g" ESC + SG_ TakeOverReq : 35|1@1+ (1,0) [0|1] "" CLU,ESC,TCU + SG_ PreFill : 36|1@1+ (1,0) [0|1] "" ESC,TCU + SG_ CF_VSM_ConfMode : 48|2@1+ (1,0) [0|3] "" CLU,ESC + SG_ AEB_Failinfo : 50|2@1+ (1,0) [0|3] "" CLU,ESC + SG_ AEB_Status : 52|2@1+ (1,0) [0|3] "" CLU,ESC + SG_ AEB_CmdAct : 54|1@1+ (1,0) [0|1] "" ESC + SG_ AEB_StopReq : 55|1@1+ (1,0) [0|1] "" CLU,ESC + SG_ CR_VSM_Alive : 56|4@1+ (1,0) [0|15] "" ESC,PSB + SG_ CR_VSM_ChkSum : 60|4@1+ (1,0) [0|15] "" ESC,PSB + SG_ aReqValue : 37|11@1+ (0.01,-10.23) [-10.23|10.24] "m/s^2" Vector__XXX + SG_ aReqRaw : 24|11@1+ (0.01,-10.23) [-10.23|10.24] "m/s^2" Vector__XXX BO_ 1313 GW_DDM_PE: 8 BCM SG_ C_DRVDoorStatus : 0|2@1+ (1.0,0.0) [0.0|3.0] "" CLU @@ -1188,23 +1190,23 @@ BO_ 1313 GW_DDM_PE: 8 BCM SG_ C_RRDoorStatus : 6|2@1+ (1.0,0.0) [0.0|3.0] "" CLU SG_ C_TrunkStatus : 8|2@1+ (1.0,0.0) [0.0|3.0] "" CLU SG_ C_OSMirrorStatus : 10|2@1+ (1.0,0.0) [0.0|3.0] "" CLU - + BO_ 1056 SCC11: 8 SCC - SG_ MainMode_ACC : 0|1@1+ (1.0,0.0) [0.0|1.0] "" CLU,EMS,ESC - SG_ SCCInfoDisplay : 1|3@1+ (1.0,0.0) [0.0|7.0] "" CLU,ESC - SG_ AliveCounterACC : 4|4@1+ (1.0,0.0) [0.0|15.0] "" CLU,EMS,ESC,TCU - SG_ VSetDis : 8|8@1+ (1.0,0.0) [0.0|255.0] "km/h or MPH" CLU,ESC,TCU - SG_ ObjValid : 16|1@1+ (1.0,0.0) [0.0|1.0] "" CLU,ESC,TCU - SG_ DriverAlertDisplay : 17|2@1+ (1.0,0.0) [0.0|3.0] "" CLU,ESC - SG_ TauGapSet : 19|3@1+ (1.0,0.0) [0.0|7.0] "" CLU,ESC,TCU - SG_ ACC_ObjStatus : 22|2@1+ (1.0,0.0) [0.0|3.0] "" ABS,ESC - SG_ ACC_ObjLatPos : 24|9@1+ (0.1,-20.0) [-20.0|31.1] "m" ABS,ESC - SG_ ACC_ObjDist : 33|11@1+ (0.1,0.0) [0.0|204.7] "m" ABS,ESC - SG_ ACC_ObjRelSpd : 44|12@1+ (0.1,-170.0) [-170.0|239.5] "m/s" ABS,ESC - SG_ Navi_SCC_Curve_Status : 56|2@1+ (1.0,0.0) [0.0|3.0] "" CLU - SG_ Navi_SCC_Curve_Act : 58|2@1+ (1.0,0.0) [0.0|3.0] "" CLU - SG_ Navi_SCC_Camera_Act : 60|2@1+ (1.0,0.0) [0.0|3.0] "" CLU - SG_ Navi_SCC_Camera_Status : 62|2@1+ (1.0,0.0) [0.0|3.0] "" CLU + SG_ MainMode_ACC : 0|1@1+ (1,0) [0|1] "" CLU,EMS,ESC + SG_ SCCInfoDisplay : 1|3@1+ (1,0) [0|7] "" CLU,ESC + SG_ AliveCounterACC : 4|4@1+ (1,0) [0|15] "" CLU,EMS,ESC,TCU + SG_ VSetDis : 8|8@1+ (1,0) [0|255] "km/h or MPH" CLU,ESC,TCU + SG_ ObjValid : 16|1@1+ (1,0) [0|1] "" CLU,ESC,TCU + SG_ DriverAlertDisplay : 17|2@1+ (1,0) [0|3] "" CLU,ESC + SG_ TauGapSet : 19|3@1+ (1,0) [0|7] "" CLU,ESC,TCU + SG_ Navi_SCC_Curve_Status : 56|2@1+ (1,0) [0|3] "" CLU + SG_ Navi_SCC_Curve_Act : 58|2@1+ (1,0) [0|3] "" CLU + SG_ Navi_SCC_Camera_Act : 60|2@1+ (1,0) [0|3] "" CLU + SG_ Navi_SCC_Camera_Status : 62|2@1+ (1,0) [0|3] "" CLU + SG_ ACC_ObjStatus : 22|2@1+ (1,0) [0|3] "" ABS,ESC + SG_ ACC_ObjLatPos : 24|9@1+ (0.1,-20) [-20|31.1] "m" ABS,ESC + SG_ ACC_ObjRelSpd : 44|12@1+ (0.1,-170) [-170|239.5] "m/s" ABS,ESC + SG_ ACC_ObjDist : 33|11@1+ (0.1,0) [0|204.7] "m" ABS,ESC BO_ 1312 CGW3: 8 BCM SG_ CR_Photosensor_LH : 0|8@1+ (78.125,0.0) [0.0|20000.0] "" DATC,DATC @@ -1248,6 +1250,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 @@ -1367,9 +1377,9 @@ BO_ 1292 CLU13: 8 CLU SG_ CF_Clu_AliveCnt2 : 60|4@1+ (1.0,0.0) [0.0|15.0] "" EMS,LDWS_LKAS BO_ 1290 SCC13: 8 SCC - SG_ SCCDrvModeRValue : 0|3@1+ (1.0,0.0) [0.0|7.0] "" CLU - SG_ SCC_Equip : 3|1@1+ (1.0,0.0) [0.0|1.0] "" ESC - SG_ AebDrvSetStatus : 4|3@1+ (1.0,0.0) [0.0|7.0] "" CLU,ESC + SG_ SCCDrvModeRValue : 0|3@1+ (1,0) [0|7] "" CLU + SG_ SCC_Equip : 3|1@1+ (1,0) [0|1] "" ESC + SG_ AebDrvSetStatus : 4|3@1+ (1,0) [0|7] "" CLU,ESC BO_ 1287 TCS15: 4 ESC SG_ ABS_W_LAMP : 0|1@1+ (1.0,0.0) [0.0|1.0] "" _4WD,CLU,CUBIS,IBOX @@ -1423,26 +1433,38 @@ BO_ 512 EMS20: 6 EMS SG_ Split_Stat : 32|1@1+ (1.0,0.0) [0.0|1.0] "" FPCM BO_ 909 FCA11: 8 FCA - SG_ CF_VSM_Prefill : 0|1@1+ (1,0) [0|1] "" ESC - SG_ CF_VSM_HBACmd : 1|2@1+ (1,0) [0|3] "" ESC - SG_ CF_VSM_Warn : 3|2@1+ (1,0) [0|3] "" ACU,CLU,ESC - SG_ CF_VSM_BeltCmd : 5|3@1+ (1,0) [0|7] "" ESC - SG_ CR_VSM_DecCmd : 8|8@1+ (0.01,0) [0|2.55] "g" ESC - SG_ FCA_Status : 18|2@1+ (1,0) [0|3] "" ACU,CLU,ESC - SG_ FCA_CmdAct : 20|1@1+ (1,0) [0|1] "" ESC - SG_ FCA_StopReq : 21|1@1+ (1,0) [0|1] "" CLU,ESC - SG_ FCA_DrvSetStatus : 22|3@1+ (1,0) [0|7] "" CLU,ESC - SG_ CF_VSM_DecCmdAct : 31|1@1+ (1,0) [0|1] "" ESC - SG_ FCA_Failinfo : 32|3@1+ (1,0) [0|7] "" ACU,CLU,ESC - SG_ CR_FCA_Alive : 56|4@1+ (1,0) [0|15] "" ESC - SG_ CR_FCA_ChkSum : 60|4@1+ (1,0) [0|15] "" ESC + SG_ CF_VSM_Prefill : 0|1@1+ (1,0) [0|1] "" ESC + SG_ CF_VSM_HBACmd : 1|2@1+ (1,0) [0|3] "" ESC + SG_ CF_VSM_Warn : 3|2@1+ (1,0) [0|3] "" ACU,CLU,ESC + SG_ CF_VSM_BeltCmd : 5|3@1+ (1,0) [0|7] "" ESC + SG_ CR_VSM_DecCmd : 8|8@1+ (0.01,0) [0|2.55] "g" ESC + SG_ FCA_Status : 18|2@1+ (1,0) [0|3] "" ACU,CLU,ESC + SG_ FCA_CmdAct : 20|1@1+ (1,0) [0|1] "" ESC + SG_ FCA_StopReq : 21|1@1+ (1,0) [0|1] "" CLU,ESC + SG_ FCA_DrvSetStatus : 22|3@1+ (1,0) [0|7] "" CLU,ESC + SG_ CF_VSM_DecCmdAct : 31|1@1+ (1,0) [0|1] "" ESC + SG_ FCA_Failinfo : 32|3@1+ (1,0) [0|7] "" ACU,CLU,ESC + SG_ FCA_RelativeVelocity : 39|9@1+ (0.1,-25.5) [-25.5|25.5] "m/s" iBAU + SG_ FCA_TimetoCollision : 48|8@1+ (10,0) [0|2540] "ms" iBAU + SG_ CR_FCA_Alive : 56|4@1+ (1,0) [0|15] "" ESC + SG_ CR_FCA_ChkSum : 60|4@1+ (1,0) [0|15] "" ESC + SG_ Supplemental_Counter : 35|4@1+ (1,0) [0|15] "" XXX + SG_ PAINT1_Status : 16|2@1+ (1,0) [0|1] "" XXX + +BO_ 1155 FCA12: 8 FCA + SG_ FCA_USM : 0|3@1+ (1,0) [0|7] "" CGW,CLU,ESC + SG_ FCA_DrvSetState : 3|3@1+ (1,0) [0|7] "" CGW + +BO_ 1186 FRT_RADAR11: 2 FCA + SG_ CF_FCA_Equip_Front_Radar : 0|3@1+ (1,0) [0|7] "" LDWS_LKAS,LDW_LKA,ESC BO_ 905 SCC14: 8 SCC - SG_ ComfortBandUpper : 0|6@1+ (0.02,0) [0|1.26] "m/s^2" ESC - SG_ ComfortBandLower : 6|6@1+ (0.02,0) [0|1.26] "m/s^2" ESC - SG_ JerkUpperLimit : 12|7@1+ (0.1,0) [0|12.7] "m/s^3" ESC - SG_ JerkLowerLimit : 19|7@1+ (0.1,0) [0|12.7] "m/s^3" ESC - SG_ SCCMode : 32|3@1+ (1,0) [0|7] "" ESC + SG_ ComfortBandLower : 6|6@1+ (1,0) [0|0] "" Vector__XXX + SG_ ComfortBandUpper : 0|6@1+ (1,0) [0|0] "" Vector__XXX + SG_ JerkLowerLimit : 19|7@1+ (1,0) [0|0] "" Vector__XXX + SG_ JerkUpperLimit : 12|7@1+ (0.1,0) [0|0] "" Vector__XXX + SG_ ACCMode : 32|3@1+ (1,0) [0|7] "" CLU,HUD,LDWS_LKAS,ESC + SG_ ObjGap : 56|8@1+ (1,0) [0|255] "" CLU,HUD,ESC BO_ 882 ELECT_GEAR: 8 XXX SG_ Elect_Gear_Shifter : 16|3@1+ (1,0) [0|7] "" CLU diff --git a/lexus_ct200h_2018_pt_generated.dbc b/lexus_ct200h_2018_pt_generated.dbc index c16f02ea5c6d5d..72ce7b1c66a20c 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/lexus_gs300h_2017_pt_generated.dbc b/lexus_gs300h_2017_pt_generated.dbc index 07c93fb11b6605..5637b73ad7e559 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/lexus_is_2018_pt_generated.dbc b/lexus_is_2018_pt_generated.dbc index a8131a76df1228..c08b1fee62a160 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/lexus_nx300h_2018_pt_generated.dbc b/lexus_nx300h_2018_pt_generated.dbc index ddb3b081ee08b3..278bb2a2f1309e 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/lexus_rx_350_2016_pt_generated.dbc b/lexus_rx_350_2016_pt_generated.dbc index 8085713a34cd4c..55b268be843ed4 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/lexus_rx_hybrid_2017_pt_generated.dbc b/lexus_rx_hybrid_2017_pt_generated.dbc index d7b51c933ddc98..c353ab475208c3 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/mazda_cx5_gt_2017.dbc b/mazda_2017.dbc similarity index 97% rename from mazda_cx5_gt_2017.dbc rename to mazda_2017.dbc index 6d968a6cc2fac4..e763f153cfb449 100644 --- a/mazda_cx5_gt_2017.dbc +++ b/mazda_2017.dbc @@ -402,23 +402,26 @@ BO_ 158 MSG_05: 8 XXX SG_ NEW_SIGNAL_3 : 55|8@0+ (1,0) [0|255] "" XXX BO_ 157 CRZ_BTNS: 8 XXX - SG_ SET_P_INV : 21|1@0+ (1,0) [0|3] "" XXX - SG_ CAN_OFF_INV : 17|1@1+ (1,0) [0|3] "" XXX - SG_ CAN_OFF : 0|1@1+ (1,0) [0|3] "" XXX - SG_ SET_M_INV : 22|1@0+ (1,0) [0|255] "" XXX - SG_ SET_M : 5|1@0+ (1,0) [0|3] "" XXX - SG_ SET_P : 4|1@0+ (1,0) [0|3] "" XXX - SG_ RES_INV : 19|1@1+ (1,0) [0|3] "" XXX - SG_ RES : 2|1@1+ (1,0) [0|3] "" XXX + SG_ BIT1 : 16|1@0+ (1,0) [0|1] "" XXX + SG_ BIT2 : 18|1@0+ (1,0) [0|1] "" XXX + SG_ BIT3 : 20|1@0+ (1,0) [0|1] "" XXX + SG_ SET_P_INV : 21|1@0+ (1,0) [0|1] "" XXX + SG_ CAN_OFF_INV : 17|1@0+ (1,0) [0|1] "" XXX + SG_ CAN_OFF : 0|1@0+ (1,0) [0|1] "" XXX + SG_ SET_M_INV : 22|1@0+ (1,0) [0|1] "" XXX + SG_ SET_M : 5|1@0+ (1,0) [0|1] "" XXX + SG_ SET_P : 4|1@0+ (1,0) [0|1] "" XXX + SG_ RES_INV : 19|1@0+ (1,0) [0|1] "" XXX + SG_ RES : 2|1@0+ (1,0) [0|1] "" XXX SG_ DISTANCE_LESS : 7|1@0+ (1,0) [0|1] "" XXX - SG_ DISTANCE_LESS_INV : 8|1@0+ (1,0) [0|31] "" XXX - SG_ DISTANCE_MORE : 6|1@0+ (1,0) [0|3] "" XXX + SG_ DISTANCE_LESS_INV : 8|1@0+ (1,0) [0|1] "" XXX + SG_ DISTANCE_MORE : 6|1@0+ (1,0) [0|1] "" XXX SG_ DISTANCE_MORE_INV : 23|1@0+ (1,0) [0|1] "" XXX - SG_ MODE_Y : 13|1@1+ (1,0) [0|3] "" XXX - SG_ MODE_X : 14|1@0+ (1,0) [0|255] "" XXX - SG_ MODE_Y_INV : 30|1@0+ (1,0) [0|3] "" XXX - SG_ MODE_X_INV : 31|1@0+ (1,0) [0|3] "" XXX - SG_ CTR : 29|4@0+ (1,0) [0|255] "" XXX + SG_ MODE_Y : 13|1@0+ (1,0) [0|1] "" XXX + SG_ MODE_X : 14|1@0+ (1,0) [0|1] "" XXX + SG_ MODE_Y_INV : 30|1@0+ (1,0) [0|1] "" XXX + SG_ MODE_X_INV : 31|1@0+ (1,0) [0|1] "" XXX + SG_ CTR : 29|4@0+ (1,0) [0|15] "" XXX BO_ 154 BLINK_INFO: 8 XXX SG_ LEFT_BLINK : 18|1@1+ (1,0) [0|3] "" XXX diff --git a/subaru_crosstrek_2018.dbc b/subaru_crosstrek_2018.dbc index 47d8b77d2d279e..09d7161a5235f6 100644 --- a/subaru_crosstrek_2018.dbc +++ b/subaru_crosstrek_2018.dbc @@ -37,54 +37,52 @@ BU_: XXX X BO_ 2 Steering: 8 XXX + SG_ Steering_Angle : 7|16@0- (0.1,0) [0|65535] "" XXX SG_ Counter : 25|3@1+ (1,0) [0|7] "" XXX SG_ CHECKSUM : 32|8@1+ (1,0) [0|255] "" XXX - SG_ Steering_Angle : 7|16@0- (0.1,0) [0|65535] "" XXX BO_ 64 Throttle: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_1 : 12|4@1+ (1,0) [0|1] "" XXX SG_ Engine_RPM : 16|12@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 28|5@1+ (1,0) [0|1] "" XXX SG_ Throttle_Pedal : 32|8@1+ (1,0) [0|255] "" XXX SG_ Throttle_Cruise : 40|8@1+ (1,0) [0|255] "" XXX - SG_ Throttle_Combo : 48|7@1+ (1,0) [0|1] "" XXX - SG_ Signal1 : 55|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 56|4@1+ (1,0) [0|255] "" XXX + SG_ Throttle_Combo : 48|8@1+ (1,0) [0|1] "" XXX + SG_ Signal1 : 56|4@1+ (1,0) [0|255] "" XXX SG_ Off_Accel : 60|4@1+ (1,0) [0|7] "" XXX -BO_ 65 NEW_MSG_1: 8 XXX +BO_ 72 Transmission: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_4 : 32|12@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 16|12@1+ (1,0) [0|1] "" XXX - SG_ NEW_SIGNAL_5 : 31|1@0+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_6 : 48|8@1+ (1,0) [0|63] "" XXX - SG_ NEW_SIGNAL_7 : 59|2@0+ (1,0) [0|255] "" XXX + SG_ Gear : 24|8@1+ (1,0) [0|255] "" XXX + SG_ RPM : 40|16@1+ (1,0) [0|255] "" XXX -BO_ 72 Transmission: 8 XXX +BO_ 73 CVT: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_5 : 16|8@1+ (1,0) [0|255] "" XXX - SG_ Gear : 24|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 38|3@0+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 40|16@1+ (1,0) [0|255] "" XXX + SG_ CVT_Gear : 24|8@1+ (1,0) [0|127] "" XXX -BO_ 316 NEW_MSG_3: 8 XXX +BO_ 316 Brake_Status: 8 XXX + SG_ CHECKSUM : 0|8@1+ (1,0) [0|1] "" XXX + SG_ Counter : 8|4@1+ (1,0) [0|1] "" XXX + SG_ Signal1 : 12|46@1+ (1,0) [0|1] "" XXX + SG_ ES_Brake : 58|1@1+ (1,0) [0|1] "" XXX + SG_ Signal2 : 59|3@1+ (1,0) [0|1] "" XXX + SG_ Brake : 62|1@1+ (1,0) [0|1] "" XXX + SG_ Signal3 : 63|1@1+ (1,0) [0|1] "" XXX BO_ 326 Cruise_Buttons: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX SG_ Signal1 : 12|30@1+ (1,0) [0|1073741823] "" XXX SG_ Main : 42|1@1+ (1,0) [0|1] "" XXX - SG_ set : 43|1@1+ (1,0) [0|1] "" XXX + SG_ Set : 43|1@1+ (1,0) [0|1] "" XXX SG_ Resume : 44|1@1+ (1,0) [0|1] "" XXX SG_ Signal2 : 45|19@1+ (1,0) [0|524287] "" XXX BO_ 315 G_Sensor: 8 XXX - SG_ longitudinal : 63|8@0- (1,0) [0|255] "" XXX - SG_ Latitudinal : 48|8@1- (1,0) [0|255] "" XXX + SG_ Lateral : 48|8@1- (-0.1,0) [0|255] "m/s2" XXX + SG_ Longitudinal : 56|8@1- (-0.1,0) [0|255] "m/s2" XXX BO_ 314 Wheel_Speeds: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX @@ -94,26 +92,18 @@ BO_ 314 Wheel_Speeds: 8 XXX SG_ FL : 51|13@1+ (0.057,0) [0|255] "kph" XXX SG_ RL : 38|13@1+ (0.057,0) [0|255] "kph" XXX -BO_ 73 NEW_MSG_5: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_1 : 32|8@1+ (1,0) [0|4095] "" XXX - SG_ NEW_SIGNAL_2 : 24|8@1+ (1,0) [0|127] "" XXX - BO_ 280 STOP_START: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|1] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|1] "" XXX - SG_ NEW_SIGNAL_1 : 12|12@1- (1,0) [0|4095] "" XXX - SG_ NEW_SIGNAL_4 : 40|4@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 48|8@1- (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 61|1@1+ (1,0) [0|7] "" XXX SG_ State : 63|1@1+ (1,0) [0|1] "" XXX BO_ 281 Steering_Torque: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|3] "" XXX - SG_ counter : 8|4@1+ (1,0) [0|15] "" XXX + SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX SG_ Steer_Error_1 : 12|1@0+ (1,0) [0|7] "" XXX SG_ Steer_Torque_Sensor : 16|11@1- (-1,0) [0|3] "" XXX SG_ Steer_Error_2 : 28|1@1+ (1,0) [0|3] "" XXX + SG_ Steer_Warning : 29|1@1+ (1,0) [0|1] "" XXX SG_ Steering_Angle : 32|16@1- (-0.0217,0) [0|255] "" X SG_ Steer_Torque_Output : 48|11@1- (-1,0) [0|31] "" XXX @@ -126,8 +116,9 @@ BO_ 312 Brake_Pressure_L_R: 8 XXX BO_ 313 Brake_Pedal: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|1] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|1] "" XXX - SG_ Signal1 : 12|22@1+ (1,0) [0|1] "" XXX - SG_ Brake_Pedal_On : 34|1@1+ (1,0) [0|7] "" XXX + SG_ Signal1 : 12|4@1+ (1,0) [0|1] "" XXX + SG_ Speed : 16|12@1+ (0.05625,0) [0|255] "kph" XXX + SG_ Brake_Lights : 34|1@1+ (1,0) [0|7] "" XXX SG_ Signal2 : 35|1@1+ (1,0) [0|1] "" XXX SG_ Brake_Pedal : 36|12@1+ (1,0) [0|65535] "" XXX SG_ Signal3 : 48|16@1+ (1,0) [0|1] "" XXX @@ -135,16 +126,9 @@ BO_ 313 Brake_Pedal: 8 XXX BO_ 290 ES_LKAS: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX + SG_ SET_1 : 12|1@0+ (1,0) [0|3] "" XXX SG_ LKAS_Output : 16|13@1- (-1,0) [0|3] "" XXX SG_ LKAS_Request : 29|1@0+ (1,0) [0|3] "" XXX - SG_ SET_1 : 12|1@0+ (1,0) [0|3] "" XXX - -BO_ 722 NEW_MSG_10: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_1 : 27|3@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 56|2@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_5 : 45|2@0+ (1,0) [0|3] "" XXX BO_ 544 ES_Brake: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX @@ -152,66 +136,74 @@ BO_ 544 ES_Brake: 8 XXX SG_ Signal1 : 12|4@1+ (1,0) [0|1] "" XXX SG_ Brake_Pressure : 16|16@1+ (1,0) [0|255] "" XXX SG_ Signal2 : 32|4@1+ (1,0) [0|1] "" XXX - SG_ State : 36|4@1+ (1,0) [0|63] "" XXX + SG_ Cruise_Brake_Lights : 36|1@1+ (1,0) [0|63] "" XXX + SG_ Cruise_Brake_Fault : 37|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Brake_Active : 38|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Activated : 39|1@1+ (1,0) [0|1] "" XXX SG_ Signal3 : 40|24@1+ (1,0) [0|1] "" XXX BO_ 545 ES_Distance: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ ES_Cruise_Throttle : 12|20@1+ (1,0) [0|15] "" XXX + SG_ Signal1 : 12|3@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Fault : 15|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Throttle : 16|12@1+ (1,0) [0|15] "" XXX + SG_ Signal2 : 28|4@1+ (1,0) [0|1] "" XXX SG_ Car_Follow : 32|1@1+ (1,0) [0|1] "" XXX - SG_ Signal1 : 33|4@1+ (1,0) [0|1] "" XXX + SG_ Signal3 : 33|3@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Brake_Active : 36|1@1+ (1,0) [0|1] "" XXX SG_ Distance_Swap : 37|1@1+ (1,0) [0|15] "" XXX - SG_ Signal2 : 38|2@1+ (1,0) [0|1] "" XXX + SG_ Cruise_EPB : 38|1@1+ (1,0) [0|1] "" XXX + SG_ Signal4 : 39|1@0+ (1,0) [0|1] "" XXX SG_ Close_Distance : 40|8@1+ (1,0) [0|1] "" XXX - SG_ Signal3 : 48|8@1+ (1,0) [0|1] "" XXX + SG_ Signal5 : 48|8@1+ (1,0) [0|1] "" XXX SG_ Cruise_Cancel : 56|1@1+ (1,0) [0|1] "" XXX SG_ Cruise_Set : 57|1@1+ (1,0) [0|1] "" XXX SG_ Cruise_Resume : 58|1@1+ (1,0) [0|1] "" XXX - SG_ Signal4 : 59|5@1+ (1,0) [0|1] "" XXX + SG_ Signal6 : 59|5@1+ (1,0) [0|1] "" XXX BO_ 546 ES_Status: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ RPM : 16|12@1+ (1,0) [0|255] "" XXX + SG_ Signal1 : 12|3@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Fault : 15|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_RPM : 16|12@1+ (1,0) [0|255] "" XXX + SG_ Signal2 : 28|1@0+ (1,0) [0|1] "" XXX SG_ Cruise_Activated : 29|1@0+ (1,0) [0|3] "" XXX - SG_ Cruise_Brake : 30|1@1+ (1,0) [0|3] "" XXX + SG_ Brake_Lights : 30|1@1+ (1,0) [0|3] "" XXX SG_ Cruise_Hold : 31|1@1+ (1,0) [0|1] "" XXX - -BO_ 554 ES_Blank: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ SET_65535 : 39|16@1+ (1,0) [0|16777215] "" XXX - SG_ SET_1 : 13|1@1+ (1,0) [0|7] "" XXX - -BO_ 557 NEW_MSG_14: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX + SG_ Signal3 : 32|32@1+ (1,0) [0|1] "" XXX BO_ 576 CruiseControl: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_5 : 42|1@1+ (1,0) [0|3] "" XXX + SG_ Signal1 : 12|28@1+ (1,0) [0|1] "" XXX SG_ Cruise_On : 40|1@1+ (1,0) [0|3] "" XXX SG_ Cruise_Activated : 41|1@1+ (1,0) [0|3] "" XXX + SG_ Signal2 : 42|22@1+ (1,0) [0|3] "" XXX -BO_ 577 NEW_MSG_16: 8 XXX +BO_ 577 Cruise_Status: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_1 : 16|12@1+ (1,0) [0|255] "" XXX + SG_ Cruise_On : 54|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Activated : 55|1@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Active : 57|4@1+ (1,0) [0|1] "" XXX -BO_ 552 NEW_MSG_17: 8 XXX +BO_ 552 BSD_RCTA: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_1 : 48|1@1+ (1,0) [0|3] "" XXX + SG_ R_ADJACENT : 48|1@1+ (1,0) [0|1] "" XXX + SG_ L_ADJACENT : 49|1@1+ (1,0) [0|1] "" XXX + SG_ R_APPROACHING : 58|1@1+ (1,0) [0|1] "" XXX + SG_ L_APPROACHING : 59|1@1+ (1,0) [0|1] "" XXX BO_ 912 Dashlights: 8 XXX - SG_ NEW_SIGNAL_1 : 32|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_2 : 8|4@1+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ RIGHT_BLINKER : 51|1@1+ (1,0) [0|1] "" XXX - SG_ LEFT_BLINKER : 50|1@1+ (1,0) [0|3] "" XXX + SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX + SG_ ICY_ROAD : 32|2@1+ (1,0) [0|3] "" XXX SG_ SEATBELT_FL : 48|1@1+ (1,0) [0|1] "" XXX + SG_ LEFT_BLINKER : 50|1@1+ (1,0) [0|3] "" XXX + SG_ RIGHT_BLINKER : 51|1@1+ (1,0) [0|1] "" XXX BO_ 940 BodyInfo: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|1] "" XXX @@ -226,20 +218,29 @@ BO_ 940 BodyInfo: 8 XXX SG_ Highbeam : 58|1@1+ (1,0) [0|1] "" XXX SG_ FOG_LIGHTS2 : 60|1@1+ (1,0) [0|1] "" XXX SG_ WIPERS : 62|1@0+ (1,0) [0|1] "" XXX + SG_ BRAKE : 54|1@1+ (1,0) [0|1] "" XXX BO_ 801 ES_DashStatus: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|7] "" XXX SG_ PCB_Off : 12|1@1+ (1,0) [0|1] "" XXX SG_ LDW_Off : 13|1@1+ (1,0) [0|1] "" XXX + SG_ Signal1 : 14|10@1+ (1,0) [0|1] "" XXX + SG_ Cruise_Soft_Disable : 24|1@1+ (1,0) [0|1] "" XXX + SG_ Signal2 : 25|3@1+ (1,0) [0|1] "" XXX SG_ Cruise_Distance : 28|3@1+ (1,0) [0|3] "" XXX + SG_ Signal3 : 31|1@1+ (1,0) [0|1] "" XXX + SG_ Conventional_Cruise : 32|1@1+ (1,0) [0|1] "" XXX + SG_ Signal4 : 33|2@1+ (1,0) [0|1] "" XXX SG_ Cruise_Disengaged : 35|1@1+ (1,0) [0|3] "" XXX SG_ Cruise_Activated : 36|1@1+ (1,0) [0|3] "" XXX + SG_ Signal5 : 37|3@1+ (1,0) [0|1] "" XXX SG_ Cruise_Set_Speed : 40|8@1+ (1,0) [0|255] "" XXX SG_ Cruise_Fault : 48|1@1+ (1,0) [0|1] "" XXX - SG_ NEW_SIGNAL_10 : 49|2@1+ (1,0) [0|3] "" XXX - SG_ Brake_Pedal : 51|1@1+ (1,0) [0|3] "" XXX + SG_ Signal6 : 49|2@1+ (1,0) [0|3] "" XXX + SG_ Brake_Lights : 51|1@1+ (1,0) [0|3] "" XXX SG_ Car_Follow : 52|1@1+ (1,0) [0|3] "" XXX + SG_ Signal7 : 53|3@1+ (1,0) [0|1] "" XXX SG_ Far_Distance : 56|4@1+ (1,0) [0|15] "" XXX SG_ Cruise_State : 60|4@1+ (1,0) [0|15] "" XXX @@ -253,149 +254,43 @@ BO_ 802 ES_LKAS_State: 8 XXX SG_ Signal2 : 18|5@1+ (1,0) [0|7] "" XXX SG_ Backward_Speed_Limit_Menu : 23|1@1+ (1,0) [0|1] "" XXX SG_ LKAS_ENABLE_3 : 24|1@1+ (1,0) [0|1] "" XXX - SG_ Signal3 : 25|1@1+ (1,0) [0|1] "" XXX + SG_ LKAS_Left_Line_Light_Blink : 25|1@1+ (1,0) [0|1] "" XXX SG_ LKAS_ENABLE_2 : 26|1@1+ (1,0) [0|1] "" XXX - SG_ Signal4 : 27|1@1+ (1,0) [0|1] "" XXX + SG_ LKAS_Right_Line_Light_Blink : 27|1@1+ (1,0) [0|1] "" XXX SG_ LKAS_Left_Line_Visible : 28|1@1+ (1,0) [0|1] "" XXX - SG_ Signal6 : 29|1@1+ (1,0) [0|1] "" XXX + SG_ LKAS_Left_Line_Green : 29|1@1+ (1,0) [0|1] "" XXX SG_ LKAS_Right_Line_Visible : 30|1@1+ (1,0) [0|1] "" XXX - SG_ Signal7 : 31|1@1+ (1,0) [0|1] "" XXX - SG_ FCW_Cont_Beep : 32|1@1+ (1,0) [0|1] "" XXX - SG_ FCW_Repeated_Beep : 33|1@1+ (1,0) [0|1] "" XXX - SG_ Throttle_Management_Activated : 34|1@1+ (1,0) [0|1] "" XXX - SG_ Lead_Vehicle_Start_Alert : 35|1@1+ (1,0) [0|1] "" XXX - SG_ Right_Depart : 36|1@1+ (1,0) [0|3] "" XXX - SG_ Signal5 : 37|27@1+ (1,0) [0|1] "" XXX - -BO_ 805 ES_NEW_MSG_22: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 22|2@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_1 : 14|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_4 : 15|1@1+ (1,0) [0|3] "" XXX - -BO_ 808 NEW_MSG_23: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 837 NEW_MSG_24: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 40|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 32|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_5 : 24|8@1+ (1,0) [0|255] "" XXX - -BO_ 838 NEW_MSG_25: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 16|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 40|1@1+ (1,0) [0|3] "" XXX - -BO_ 842 NEW_MSG_26: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 32|8@1+ (1,0) [0|255] "" XXX + SG_ LKAS_Right_Line_Green : 31|1@1+ (1,0) [0|1] "" XXX + SG_ LKAS_Alert : 32|4@1+ (1,0) [0|15] "" XXX + SG_ Signal3 : 36|28@1+ (1,0) [0|1] "" XXX -BO_ 915 NEW_MSG_27: 8 XXX +BO_ 722 AC_State: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 16|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 32|9@1+ (1,0) [0|255] "" XXX - -BO_ 1788 NEW_MSG_28: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 40|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_4 : 48|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_5 : 16|8@1+ (1,0) [0|255] "" XXX - -BO_ 816 NEW_MSG_29: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 826 NEW_MSG_30: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 839 NEW_MSG_31: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 2015 NEW_MSG_32: 8 XXX - SG_ NEW_SIGNAL_2 : 16|8@1+ (1,0) [0|255] "" XXX - -BO_ 2024 NEW_MSG_33: 8 XXX - SG_ NEW_SIGNAL_1 : 24|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 0|3@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 16|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 32|8@1+ (1,0) [0|255] "" XXX - -BO_ 1614 NEW_MSG_34: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 1617 NEW_MSG_35: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 1632 NEW_MSG_36: 8 XXX - SG_ NEW_SIGNAL_1 : 55|16@0+ (1,0) [0|255] "" XXX - -BO_ 1650 NEW_MSG_37: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 1657 NEW_MSG_38: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 1658 NEW_MSG_39: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 33|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_4 : 31|1@0+ (1,0) [0|3] "" XXX + SG_ AC_Mode : 37|3@1+ (1,0) [0|1] "" XXX + SG_ AC_ON : 24|2@1+ (1,0) [0|1] "" XXX BO_ 1677 Dash_State: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 16|4@1+ (1,0) [0|15] "" XXX SG_ Units : 29|3@1+ (1,0) [0|7] "" XXX - SG_ Icy_Road_Warning : 20|1@1+ (1,0) [0|1] "" XXX - -BO_ 1743 NEW_MSG_41: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 1785 NEW_MSG_42: 8 XXX - SG_ NEW_SIGNAL_1 : 0|4@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 21|1@1+ (1,0) [0|31] "" XXX - SG_ NEW_SIGNAL_3 : 17|1@1+ (1,0) [0|7] "" XXX - -BO_ 1759 NEW_MSG_43: 8 XXX - SG_ NEW_SIGNAL_1 : 17|1@1+ (1,0) [0|3] "" XXX - -BO_ 1786 NEW_MSG_44: 8 XXX - SG_ NEW_SIGNAL_1 : 0|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_2 : 16|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 8|8@1+ (1,0) [0|15] "" XXX - -BO_ 1787 NEW_MSG_45: 8 XXX - SG_ NEW_SIGNAL_1 : 0|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_2 : 8|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 16|8@1+ (1,0) [0|255] "" XXX - - - CM_ SG_ 64 Throttle_Combo "Throttle Cruise + Pedal"; -CM_ SG_ 544 State "0 = ES disabled, 8 = ES enabled, 12, 13 = ES_Brake active"; -CM_ SG_ 545 ES_Cruise_Throttle "signal might be smaller, values do not correlate with Throttle:CruiseThrottle"; +CM_ SG_ 313 Brake_Lights "Driver or Cruise Brake on"; +CM_ SG_ 544 Cruise_Brake_Lights "1 = switch on brake lights"; +CM_ SG_ 545 Cruise_Throttle "RPM-like output signal"; +CM_ SG_ 545 Cruise_EPB "1 = Electric Parking Brake set"; CM_ SG_ 545 Distance_Swap "Switch from Close to Far distance"; +CM_ SG_ 546 Cruise_RPM "ES RPM output for ECM and TCM"; +CM_ SG_ 546 Signal3 "0 when cruise_activated = 1"; +CM_ SG_ 801 PCB_Off "Pre-Collision Braking off"; +CM_ SG_ 801 Brake_Lights "Driver or Cruise brake on"; +CM_ SG_ 801 Cruise_State "0 = Normal, 1 = Hold+User Brake, 2 = Ready, 3 = Hold"; +CM_ SG_ 801 Far_Distance "1=0-5m, 2=5-10m, 3=10-15m, 4=15-20m, 5=20-25m, 6=25-30m, 7=30-35m, 8=35-40m, 9=40-45m, 10=45-50m, 11=50-55m, 12=55-60m, 13=60-65m, 14=65-70m, 15=75m+"; +CM_ SG_ 801 Cruise_Soft_Disable "Eyesight soft disable (eg direct sunlight)"; +CM_ SG_ 802 LKAS_Alert "1 = FCW_Cont_Beep, 2 = FCW_Repeated_Beep, 3 = Throttle_Management_Activated_Warning, 4 = Throttle_Management_Activated_Alert, 8 = Traffic_Light_Ahead, 9 = Apply_Brake_to_Hold Position, 11 = LDW_Right, 12 = LDW_Left, 13 = Stay_Alert, 14 = Lead_Vehicle_Start_Alert"; +CM_ SG_ 912 ICY_ROAD "1 = DASHLIGHT ON, 2 = WARNING, 3 = OFF"; CM_ SG_ 940 Highbeam "01 = low beam, 11 = high beam"; CM_ SG_ 940 FOG_LIGHTS2 "yellow fog light in the dash"; -CM_ SG_ 801 PCB_Off "Pre-Collision Braking"; -CM_ SG_ 801 Cruise_State "0 = Normal, 1 = Hold+User Brake, 2 = Ready, 3 = Hold"; -CM_ SG_ 805 NEW_SIGNAL_3 "always 3"; -CM_ SG_ 805 NEW_SIGNAL_4 "always 1"; -CM_ SG_ 1677 Units "1 = imperial, 6 = metric"; -VAL_ 72 Gear 2 "N" 3 "R" 4 "P" 121 "D" 137 "1" 145 "2" 153 "3" 161 "4" 169 "5" 177 "6" ; +CM_ SG_ 1677 Units "AU/EU: 1 = imperial, 3 = metric US: 3 = imperial, 4 = metric"; +VAL_ 72 Gear 2 "N" 3 "R" 4 "P" 121 "D" 137 "1" 145 "2" 153 "3" 161 "4" 169 "5" 177 "6"; 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_global_2017.dbc b/subaru_global_2017.dbc index f1a38d8af3e428..467ef5609c5e3c 100644 --- a/subaru_global_2017.dbc +++ b/subaru_global_2017.dbc @@ -37,41 +37,23 @@ BU_: XXX X BO_ 2 Steering: 8 XXX + SG_ Steering_Angle : 7|16@0- (0.1,0) [0|65535] "" XXX SG_ Counter : 25|3@1+ (1,0) [0|7] "" XXX SG_ CHECKSUM : 32|8@1+ (1,0) [0|255] "" XXX - SG_ Steering_Angle : 7|16@0- (0.1,0) [0|65535] "" XXX BO_ 64 Throttle: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Off_Accel : 60|4@1+ (1,0) [0|7] "" XXX - SG_ NEW_SIGNAL_3 : 56|4@1+ (1,0) [0|255] "" XXX - SG_ Throttle_Cruise : 40|8@1+ (1,0) [0|255] "" XXX - SG_ Throttle_Combo : 55|8@1+ (1,0) [0|255] "" XXX - SG_ Throttle_Pedal : 32|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 48|7@1+ (1,0) [0|1] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|255] "" XXX SG_ Engine_RPM : 16|12@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_1 : 12|4@1+ (1,0) [0|1] "" XXX - SG_ NEW_SIGNAL_4 : 28|5@1+ (1,0) [0|1] "" XXX - -BO_ 65 NEW_MSG_1: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_4 : 32|12@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 16|12@1+ (1,0) [0|1] "" XXX - SG_ NEW_SIGNAL_5 : 31|1@0+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_6 : 48|8@1+ (1,0) [0|63] "" XXX - SG_ NEW_SIGNAL_7 : 59|2@0+ (1,0) [0|255] "" XXX + SG_ Throttle_Pedal : 32|8@1+ (1,0) [0|255] "" XXX + SG_ Throttle_Cruise : 40|8@1+ (1,0) [0|255] "" XXX + SG_ Throttle_Combo : 48|8@1+ (1,0) [0|255] "" XXX + SG_ Off_Accel : 60|4@1+ (1,0) [0|7] "" XXX BO_ 72 Transmission: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_5 : 16|8@1+ (1,0) [0|255] "" XXX SG_ Gear : 24|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 38|3@0+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 40|16@1+ (1,0) [0|255] "" XXX - -BO_ 316 NEW_MSG_3: 8 XXX BO_ 326 Cruise_Buttons: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX @@ -83,8 +65,8 @@ BO_ 326 Cruise_Buttons: 8 XXX SG_ Signal2 : 45|19@1+ (1,0) [0|524287] "" XXX BO_ 315 G_Sensor: 8 XXX - SG_ longitudinal : 63|8@0- (1,0) [0|255] "" XXX - SG_ Latitudinal : 48|8@1- (1,0) [0|255] "" XXX + SG_ Lateral : 48|8@1- (-0.1,0) [0|255] "m/s2" XXX + SG_ Longitudinal : 56|8@1- (-0.1,0) [0|255] "m/s2" XXX BO_ 314 Wheel_Speeds: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX @@ -94,31 +76,20 @@ BO_ 314 Wheel_Speeds: 8 XXX SG_ FL : 51|13@1+ (0.057,0) [0|255] "kph" XXX SG_ RL : 38|13@1+ (0.057,0) [0|255] "kph" XXX -BO_ 73 NEW_MSG_5: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_1 : 32|8@1+ (1,0) [0|4095] "" XXX - SG_ NEW_SIGNAL_2 : 24|8@1+ (1,0) [0|127] "" XXX - -BO_ 280 NEW_MSG_6: 8 XXX - SG_ NEW_SIGNAL_1 : 12|12@1- (1,0) [0|4095] "" XXX - SG_ NEW_SIGNAL_2 : 48|8@1- (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 61|1@1+ (1,0) [0|7] "" XXX - SG_ NEW_SIGNAL_4 : 40|4@1+ (1,0) [0|255] "" XXX - BO_ 281 Steering_Torque: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|3] "" XXX - SG_ counter : 8|4@1+ (1,0) [0|15] "" XXX + SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX + SG_ Steer_Error_1 : 12|1@0+ (1,0) [0|7] "" XXX SG_ Steer_Torque_Sensor : 16|11@1- (-1,0) [0|3] "" XXX + SG_ Steer_Error_2 : 28|1@1+ (1,0) [0|3] "" XXX SG_ Steering_Angle : 32|16@1- (-0.0217,0) [0|255] "" X SG_ Steer_Torque_Output : 48|11@1- (-1,0) [0|31] "" XXX - SG_ Steer_Error_1 : 12|1@0+ (1,0) [0|7] "" XXX - SG_ Steer_Error_2 : 28|1@1+ (1,0) [0|3] "" XXX BO_ 312 Brake_Pressure_L_R: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|31] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|3] "" XXX - SG_ Brake_2 : 56|8@1+ (1,0) [0|255] "" XXX SG_ Brake_1 : 48|8@1+ (1,0) [0|255] "" XXX + SG_ Brake_2 : 56|8@1+ (1,0) [0|255] "" XXX BO_ 313 Brake_Pedal: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX @@ -129,16 +100,9 @@ BO_ 313 Brake_Pedal: 8 XXX BO_ 290 ES_LKAS: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX + SG_ SET_1 : 12|1@0+ (1,0) [0|3] "" XXX SG_ LKAS_Output : 16|13@1- (-1,0) [0|3] "" XXX SG_ LKAS_Request : 29|1@0+ (1,0) [0|3] "" XXX - SG_ SET_1 : 12|1@0+ (1,0) [0|3] "" XXX - -BO_ 722 NEW_MSG_10: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_1 : 27|3@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 56|2@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_5 : 45|2@0+ (1,0) [0|3] "" XXX BO_ 544 ES_Brake: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX @@ -161,40 +125,26 @@ BO_ 546 ES_Status: 8 XXX SG_ Cruise_Activated : 29|1@0+ (1,0) [0|3] "" XXX SG_ Cruise_Brake : 30|1@1+ (1,0) [0|3] "" XXX -BO_ 554 ES_Blank: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ SET_65535 : 39|16@1+ (1,0) [0|16777215] "" XXX - SG_ SET_1 : 13|1@1+ (1,0) [0|7] "" XXX - -BO_ 557 NEW_MSG_14: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - BO_ 576 CruiseControl: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_5 : 42|1@1+ (1,0) [0|3] "" XXX SG_ Cruise_On : 40|1@1+ (1,0) [0|3] "" XXX SG_ Cruise_Activated : 41|1@1+ (1,0) [0|3] "" XXX -BO_ 577 NEW_MSG_16: 8 XXX +BO_ 552 BSD_RCTA: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_1 : 16|12@1+ (1,0) [0|255] "" XXX - -BO_ 552 NEW_MSG_17: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_1 : 48|1@1+ (1,0) [0|3] "" XXX + SG_ R_ADJACENT : 48|1@1+ (1,0) [0|1] "" XXX + SG_ L_ADJACENT : 49|1@1+ (1,0) [0|1] "" XXX + SG_ R_APPROACHING : 58|1@1+ (1,0) [0|1] "" XXX + SG_ L_APPROACHING : 59|1@1+ (1,0) [0|1] "" XXX BO_ 912 Dashlights: 8 XXX - SG_ NEW_SIGNAL_1 : 32|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_2 : 8|4@1+ (1,0) [0|15] "" XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ RIGHT_BLINKER : 51|1@1+ (1,0) [0|1] "" XXX - SG_ LEFT_BLINKER : 50|1@1+ (1,0) [0|3] "" XXX + SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX SG_ SEATBELT_FL : 48|1@1+ (1,0) [0|1] "" XXX + SG_ LEFT_BLINKER : 50|1@1+ (1,0) [0|3] "" XXX + SG_ RIGHT_BLINKER : 51|1@1+ (1,0) [0|1] "" XXX BO_ 940 BodyInfo: 8 XXX SG_ DOOR_OPEN_FL : 32|1@1+ (1,0) [0|255] "" XXX @@ -216,7 +166,6 @@ BO_ 801 ES_DashStatus: 8 XXX SG_ Cruise_Activated : 36|1@1+ (1,0) [0|3] "" XXX SG_ Cruise_Set_Speed : 40|8@1+ (1,0) [0|255] "" XXX SG_ Cruise_Fault : 48|1@1+ (1,0) [0|1] "" XXX - SG_ NEW_SIGNAL_10 : 49|2@1+ (1,0) [0|3] "" XXX SG_ Brake_Pedal : 51|1@1+ (1,0) [0|3] "" XXX SG_ Car_Follow : 52|1@1+ (1,0) [0|3] "" XXX SG_ Far_Distance : 56|4@1+ (1,0) [0|15] "" XXX @@ -246,130 +195,14 @@ BO_ 802 ES_LKAS_State: 8 XXX SG_ Right_Depart : 36|1@1+ (1,0) [0|3] "" XXX SG_ Signal5 : 37|27@1+ (1,0) [0|1] "" XXX -BO_ 805 ES_NEW_MSG_22: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 22|2@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_1 : 14|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_4 : 15|1@1+ (1,0) [0|3] "" XXX - -BO_ 808 NEW_MSG_23: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 837 NEW_MSG_24: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 40|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 32|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_5 : 24|8@1+ (1,0) [0|255] "" XXX - -BO_ 838 NEW_MSG_25: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 16|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 40|1@1+ (1,0) [0|3] "" XXX - -BO_ 842 NEW_MSG_26: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 32|8@1+ (1,0) [0|255] "" XXX - -BO_ 915 NEW_MSG_27: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 16|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 32|9@1+ (1,0) [0|255] "" XXX - -BO_ 1788 NEW_MSG_28: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 40|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_4 : 48|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_5 : 16|8@1+ (1,0) [0|255] "" XXX - -BO_ 816 NEW_MSG_29: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 826 NEW_MSG_30: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 839 NEW_MSG_31: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 2015 NEW_MSG_32: 8 XXX - SG_ NEW_SIGNAL_2 : 16|8@1+ (1,0) [0|255] "" XXX - -BO_ 2024 NEW_MSG_33: 8 XXX - SG_ NEW_SIGNAL_1 : 24|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 0|3@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 16|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_4 : 32|8@1+ (1,0) [0|255] "" XXX - -BO_ 1614 NEW_MSG_34: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 1617 NEW_MSG_35: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 1632 NEW_MSG_36: 8 XXX - SG_ NEW_SIGNAL_1 : 55|16@0+ (1,0) [0|255] "" XXX - -BO_ 1650 NEW_MSG_37: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 1657 NEW_MSG_38: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 1658 NEW_MSG_39: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 33|1@1+ (1,0) [0|3] "" XXX - SG_ NEW_SIGNAL_4 : 31|1@0+ (1,0) [0|3] "" XXX - BO_ 1677 Dash_State: 8 XXX SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_3 : 16|4@1+ (1,0) [0|15] "" XXX SG_ Units : 29|3@1+ (1,0) [0|7] "" XXX -BO_ 1743 NEW_MSG_41: 8 XXX - SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" XXX - SG_ Counter : 8|4@1+ (1,0) [0|15] "" XXX - -BO_ 1785 NEW_MSG_42: 8 XXX - SG_ NEW_SIGNAL_1 : 0|4@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_2 : 21|1@1+ (1,0) [0|31] "" XXX - SG_ NEW_SIGNAL_3 : 17|1@1+ (1,0) [0|7] "" XXX - -BO_ 1759 NEW_MSG_43: 8 XXX - SG_ NEW_SIGNAL_1 : 17|1@1+ (1,0) [0|3] "" XXX - -BO_ 1786 NEW_MSG_44: 8 XXX - SG_ NEW_SIGNAL_1 : 0|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_2 : 16|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 8|8@1+ (1,0) [0|15] "" XXX - -BO_ 1787 NEW_MSG_45: 8 XXX - SG_ NEW_SIGNAL_1 : 0|4@1+ (1,0) [0|15] "" XXX - SG_ NEW_SIGNAL_2 : 8|8@1+ (1,0) [0|255] "" XXX - SG_ NEW_SIGNAL_3 : 16|8@1+ (1,0) [0|255] "" XXX - - - - -CM_ SG_ 940 FOG_LIGHTS2 "yellow fog light in the dash"; -CM_ SG_ 940 Highbeam "01 = low beam, 11 = high beam"; CM_ SG_ 801 Cruise_State "0 = Normal, 3 = Hold"; CM_ SG_ 802 Traffic_light_Ahead "Crosstrek 2018 = car in front has moved"; -CM_ SG_ 805 NEW_SIGNAL_3 "always 3"; -CM_ SG_ 805 NEW_SIGNAL_4 "always 1"; +CM_ SG_ 940 FOG_LIGHTS2 "yellow fog light in the dash"; +CM_ SG_ 940 Highbeam "01 = low beam, 11 = high beam"; CM_ SG_ 1677 Units "1 = imperial, 6 = metric"; VAL_ 72 Gear 2 "N" 3 "R" 4 "P" 121 "D" 137 "1" 145 "2" 153 "3" 161 "4" 169 "5" 177 "6"; 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..d6f546e3bc2eb0 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/toyota_camry_hybrid_2018_pt_generated.dbc b/toyota_camry_hybrid_2018_pt_generated.dbc index 0061feab7ed770..393a47828fb4a1 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/toyota_corolla_2017_pt_generated.dbc b/toyota_corolla_2017_pt_generated.dbc index f683e044cb9f45..70be61d02f7f96 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/toyota_highlander_2017_pt_generated.dbc b/toyota_highlander_2017_pt_generated.dbc index ec67f2722b70b0..4c7d18386fc7f8 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/toyota_highlander_hybrid_2018_pt_generated.dbc b/toyota_highlander_hybrid_2018_pt_generated.dbc index 27290d1732ddd7..ccaf677911e521 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/toyota_nodsu_hybrid_pt_generated.dbc b/toyota_nodsu_hybrid_pt_generated.dbc index 9c9b548e4638ce..09fe04b3415a0b 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 @@ -179,10 +179,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -336,6 +337,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/toyota_nodsu_pt_generated.dbc b/toyota_nodsu_pt_generated.dbc index 76661d3a8f4ed3..e6f4a530533d4f 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 @@ -179,10 +179,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -336,6 +337,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; @@ -382,7 +385,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 +393,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..419a88bb98591f 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/toyota_rav4_2017_pt_generated.dbc b/toyota_rav4_2017_pt_generated.dbc index 82a0ff54398edd..2b7e38b720f8e1 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/toyota_rav4_hybrid_2017_pt_generated.dbc b/toyota_rav4_hybrid_2017_pt_generated.dbc index 84e130c8d00539..ae1985f6c51126 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces"; diff --git a/toyota_sienna_xle_2018_pt_generated.dbc b/toyota_sienna_xle_2018_pt_generated.dbc index 48446ecb46f3e3..da5337fefd8b65 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 @@ -162,10 +162,11 @@ BO_ 835 ACC_CONTROL: 8 DSU SG_ DISTANCE : 20|1@0+ (1,0) [0|1] "" XXX SG_ MINI_CAR : 21|1@0+ (1,0) [0|1] "" XXX SG_ SET_ME_X3 : 19|4@0+ (1,0) [0|15] "" XXX - SG_ SET_ME_1 : 30|1@0+ (1,0) [0|1] "" HCU + SG_ PERMIT_BRAKING : 30|1@0+ (1,0) [0|1] "" HCU SG_ RELEASE_STANDSTILL : 31|1@0+ (1,0) [0|1] "" HCU SG_ CANCEL_REQ : 24|1@0+ (1,0) [0|1] "" HCU SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX + SG_ ACCEL_CMD_ALT : 47|8@0- (0.05,0) [0|0] "m/s^2" XXX BO_ 836 PRE_COLLISION_2: 8 DSU SG_ CHECKSUM : 63|8@0+ (1,0) [0|0] "" XXX @@ -319,6 +320,8 @@ CM_ SG_ 614 ANGLE "set to measured angle when ipas control isn't active"; CM_ SG_ 643 COUNTER "only used on cars that use this msg for cruise control"; CM_ SG_ 643 BRAKE_STATUS "only used on cars that use this msg for cruise control"; CM_ SG_ 643 PRECOLLISION_ACTIVE "set 0.5s before any braking"; +CM_ SG_ 835 PERMIT_BRAKING "Original ACC has this going high when a car in front is detected. In openpilot and before the PERMIT_BRAKING name, this was "SET_ME_1" and is hardcoded to be high. Unsure if only informational or has an effect though existing usage in openpilot is to always set it to 1. Originally 'PMTBRKG' in the leaked toyota_2017_ref_pt.dbc file and name expansion speculated to be PerMiT BRaKinG."; +CM_ SG_ 835 ACCEL_CMD_ALT "Copy of main ACCEL_CMD, but across 8 bits instead of 16 bits like ACCEL_CMD. Unsure if only informational or has an effect. Likely informational as existing openpilot sets this to 0 and no loss of functionality observed. Originally 'AT_RAW' in leaked toyota_2017_ref_pt.dbc file."; CM_ SG_ 921 UI_SET_SPEED "set speed shown in UI with user set unit"; CM_ SG_ 951 BRAKE_LIGHTS_ACC "brake lights when ACC commands decel"; CM_ SG_ 1042 SET_ME_1 "unclear what this is, but it's always 1 in drive traces";