From 5ba787024f53a00d76c7b253d1f3fee87763c679 Mon Sep 17 00:00:00 2001 From: Uku Loskit Date: Wed, 10 Jul 2024 00:56:39 +0300 Subject: [PATCH 1/2] Convert tests to pytests (#1060) * Convert tests to pytests * cleanup * args * clean * linter --------- Co-authored-by: Maxime Desroches --- .github/workflows/tests.yml | 2 +- can/tests/test_checksums.py | 13 +--- can/tests/test_dbc_exceptions.py | 20 +++--- can/tests/test_dbc_parser.py | 15 ++--- can/tests/test_define.py | 37 +++++------ can/tests/test_packer_parser.py | 94 +++++++++++++--------------- can/tests/test_parser_performance.py | 15 ++--- requirements.txt | 2 + 8 files changed, 79 insertions(+), 119 deletions(-) mode change 100755 => 100644 can/tests/test_checksums.py mode change 100755 => 100644 can/tests/test_dbc_exceptions.py mode change 100755 => 100644 can/tests/test_dbc_parser.py mode change 100755 => 100644 can/tests/test_define.py mode change 100755 => 100644 can/tests/test_packer_parser.py mode change 100755 => 100644 can/tests/test_parser_performance.py diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index aaebd78243..7db8acdb30 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: - name: Build opendbc run: ${{ env.RUN }} "cd ../ && scons -j$(nproc) --minimal" - name: Unit tests - run: ${{ env.RUN }} "pytest" + run: ${{ env.RUN }} "pytest -n logical" static-analysis: name: static analysis diff --git a/can/tests/test_checksums.py b/can/tests/test_checksums.py old mode 100755 new mode 100644 index 93ddbe0074..25eadd64cd --- a/can/tests/test_checksums.py +++ b/can/tests/test_checksums.py @@ -1,12 +1,9 @@ -#!/usr/bin/env python3 -import unittest - from opendbc.can.parser import CANParser from opendbc.can.packer import CANPacker from opendbc.can.tests.test_packer_parser import can_list_to_can_capnp -class TestCanChecksums(unittest.TestCase): +class TestCanChecksums: def test_honda_checksum(self): """Test checksums for Honda standard and extended CAN ids""" @@ -34,9 +31,5 @@ def test_honda_checksum(self): can_strings = [can_list_to_can_capnp(msgs), ] parser.update_strings(can_strings) - self.assertEqual(parser.vl['LKAS_HUD']['CHECKSUM'], std) - self.assertEqual(parser.vl['LKAS_HUD_A']['CHECKSUM'], ext) - - -if __name__ == "__main__": - unittest.main() + assert parser.vl['LKAS_HUD']['CHECKSUM'] == std + assert parser.vl['LKAS_HUD_A']['CHECKSUM'] == ext diff --git a/can/tests/test_dbc_exceptions.py b/can/tests/test_dbc_exceptions.py old mode 100755 new mode 100644 index 1f13f53927..b765d27fb2 --- a/can/tests/test_dbc_exceptions.py +++ b/can/tests/test_dbc_exceptions.py @@ -1,28 +1,26 @@ -#!/usr/bin/env python3 - -import unittest +import pytest from opendbc.can.parser import CANParser, CANDefine from opendbc.can.packer import CANPacker from opendbc.can.tests import TEST_DBC -class TestCanParserPackerExceptions(unittest.TestCase): +class TestCanParserPackerExceptions: def test_civic_exceptions(self): dbc_file = "honda_civic_touring_2016_can_generated" dbc_invalid = dbc_file + "abcdef" msgs = [("STEERING_CONTROL", 50)] - with self.assertRaises(RuntimeError): + with pytest.raises(RuntimeError): CANParser(dbc_invalid, msgs, 0) - with self.assertRaises(RuntimeError): + with pytest.raises(RuntimeError): CANPacker(dbc_invalid) - with self.assertRaises(RuntimeError): + with pytest.raises(RuntimeError): CANDefine(dbc_invalid) - with self.assertRaises(KeyError): + with pytest.raises(KeyError): CANDefine(TEST_DBC) parser = CANParser(dbc_file, msgs, 0) - with self.assertRaises(RuntimeError): + with pytest.raises(RuntimeError): parser.update_strings([b'']) # Everything is supposed to work below @@ -30,7 +28,3 @@ def test_civic_exceptions(self): CANParser(dbc_file, [], 0) CANPacker(dbc_file) CANDefine(dbc_file) - - -if __name__ == "__main__": - unittest.main() diff --git a/can/tests/test_dbc_parser.py b/can/tests/test_dbc_parser.py old mode 100755 new mode 100644 index 5da41d49b7..4e9bb34f20 --- a/can/tests/test_dbc_parser.py +++ b/can/tests/test_dbc_parser.py @@ -1,16 +1,13 @@ -#!/usr/bin/env python3 -import unittest - from opendbc.can.parser import CANParser from opendbc.can.tests import ALL_DBCS -class TestDBCParser(unittest.TestCase): +class TestDBCParser: def test_enough_dbcs(self): # sanity check that we're running on the real DBCs - self.assertGreater(len(ALL_DBCS), 20) + assert len(ALL_DBCS) > 20 - def test_parse_all_dbcs(self): + def test_parse_all_dbcs(self, subtests): """ Dynamic DBC parser checks: - Checksum and counter length, start bit, endianness @@ -20,9 +17,5 @@ def test_parse_all_dbcs(self): """ for dbc in ALL_DBCS: - with self.subTest(dbc=dbc): + with subtests.test(dbc=dbc): CANParser(dbc, [], 0) - - -if __name__ == "__main__": - unittest.main() diff --git a/can/tests/test_define.py b/can/tests/test_define.py old mode 100755 new mode 100644 index 6387ef9cb0..ec29f4a59b --- a/can/tests/test_define.py +++ b/can/tests/test_define.py @@ -1,35 +1,26 @@ -#!/usr/bin/env python3 -import unittest - from opendbc.can.can_define import CANDefine from opendbc.can.tests import ALL_DBCS -class TestCADNDefine(unittest.TestCase): +class TestCADNDefine: def test_civic(self): dbc_file = "honda_civic_touring_2016_can_generated" defs = CANDefine(dbc_file) - self.assertDictEqual(defs.dv[399], defs.dv['STEER_STATUS']) - self.assertDictEqual(defs.dv[399], - {'STEER_STATUS': - {7: 'PERMANENT_FAULT', - 6: 'TMP_FAULT', - 5: 'FAULT_1', - 4: 'NO_TORQUE_ALERT_2', - 3: 'LOW_SPEED_LOCKOUT', - 2: 'NO_TORQUE_ALERT_1', - 0: 'NORMAL'} - } - ) - - def test_all_dbcs(self): + assert defs.dv[399] == defs.dv['STEER_STATUS'] + assert defs.dv[399] == {'STEER_STATUS': + {7: 'PERMANENT_FAULT', + 6: 'TMP_FAULT', + 5: 'FAULT_1', + 4: 'NO_TORQUE_ALERT_2', + 3: 'LOW_SPEED_LOCKOUT', + 2: 'NO_TORQUE_ALERT_1', + 0: 'NORMAL'} + } + + def test_all_dbcs(self, subtests): # Asserts no exceptions on all DBCs for dbc in ALL_DBCS: - with self.subTest(dbc=dbc): + with subtests.test(dbc=dbc): CANDefine(dbc) - - -if __name__ == "__main__": - unittest.main() diff --git a/can/tests/test_packer_parser.py b/can/tests/test_packer_parser.py old mode 100755 new mode 100644 index c313805c47..9023e53dc2 --- a/can/tests/test_packer_parser.py +++ b/can/tests/test_packer_parser.py @@ -1,5 +1,4 @@ -#!/usr/bin/env python3 -import unittest +import pytest import random import cereal.messaging as messaging @@ -31,7 +30,7 @@ def can_list_to_can_capnp(can_msgs, msgtype='can', logMonoTime=None): return dat.to_bytes() -class TestCanParserPacker(unittest.TestCase): +class TestCanParserPacker: def test_packer(self): packer = CANPacker(TEST_DBC) @@ -39,9 +38,9 @@ def test_packer(self): for i in range(256): values = {"COUNTER": i} addr, _, dat, bus = packer.make_can_msg("CAN_FD_MESSAGE", b, values) - self.assertEqual(addr, 245) - self.assertEqual(bus, b) - self.assertEqual(dat[0], i) + assert addr == 245 + assert bus == b + assert dat[0] == i def test_packer_counter(self): msgs = [("CAN_FD_MESSAGE", 0), ] @@ -53,7 +52,7 @@ def test_packer_counter(self): msg = packer.make_can_msg("CAN_FD_MESSAGE", 0, {}) dat = can_list_to_can_capnp([msg, ]) parser.update_strings([dat]) - self.assertEqual(parser.vl["CAN_FD_MESSAGE"]["COUNTER"], i % 256) + assert parser.vl["CAN_FD_MESSAGE"]["COUNTER"] == (i % 256) # setting COUNTER should override for _ in range(100): @@ -64,7 +63,7 @@ def test_packer_counter(self): }) dat = can_list_to_can_capnp([msg, ]) parser.update_strings([dat]) - self.assertEqual(parser.vl["CAN_FD_MESSAGE"]["COUNTER"], cnt) + assert parser.vl["CAN_FD_MESSAGE"]["COUNTER"] == cnt # then, should resume counting from the override value cnt = parser.vl["CAN_FD_MESSAGE"]["COUNTER"] @@ -72,7 +71,7 @@ def test_packer_counter(self): msg = packer.make_can_msg("CAN_FD_MESSAGE", 0, {}) dat = can_list_to_can_capnp([msg, ]) parser.update_strings([dat]) - self.assertEqual(parser.vl["CAN_FD_MESSAGE"]["COUNTER"], (cnt + i) % 256) + assert parser.vl["CAN_FD_MESSAGE"]["COUNTER"] == ((cnt + i) % 256) def test_parser_can_valid(self): msgs = [("CAN_FD_MESSAGE", 10), ] @@ -80,13 +79,13 @@ def test_parser_can_valid(self): parser = CANParser(TEST_DBC, msgs, 0) # shouldn't be valid initially - self.assertFalse(parser.can_valid) + assert not parser.can_valid # not valid until the message is seen for _ in range(100): dat = can_list_to_can_capnp([]) parser.update_strings([dat]) - self.assertFalse(parser.can_valid) + assert not parser.can_valid # valid once seen for i in range(1, 100): @@ -94,7 +93,7 @@ def test_parser_can_valid(self): msg = packer.make_can_msg("CAN_FD_MESSAGE", 0, {}) dat = can_list_to_can_capnp([msg, ], logMonoTime=t) parser.update_strings([dat]) - self.assertTrue(parser.can_valid) + assert parser.can_valid def test_parser_counter_can_valid(self): """ @@ -113,13 +112,13 @@ def test_parser_counter_can_valid(self): # bad static counter, invalid once it's seen MAX_BAD_COUNTER messages for idx in range(0x1000): parser.update_strings([bts]) - self.assertEqual((idx + 1) < MAX_BAD_COUNTER, parser.can_valid) + assert ((idx + 1) < MAX_BAD_COUNTER) == parser.can_valid # one to recover msg = packer.make_can_msg("STEERING_CONTROL", 0, {"COUNTER": 1}) bts = can_list_to_can_capnp([msg]) parser.update_strings([bts]) - self.assertTrue(parser.can_valid) + assert parser.can_valid def test_parser_no_partial_update(self): """ @@ -144,18 +143,18 @@ def rx_steering_msg(values, bad_checksum=False): parser.update_strings([bts]) rx_steering_msg({"STEER_TORQUE": 100}, bad_checksum=False) - self.assertEqual(parser.vl["STEERING_CONTROL"]["STEER_TORQUE"], 100) - self.assertEqual(parser.vl_all["STEERING_CONTROL"]["STEER_TORQUE"], [100]) + assert parser.vl["STEERING_CONTROL"]["STEER_TORQUE"] == 100 + assert parser.vl_all["STEERING_CONTROL"]["STEER_TORQUE"] == [100] for _ in range(5): rx_steering_msg({"STEER_TORQUE": 200}, bad_checksum=True) - self.assertEqual(parser.vl["STEERING_CONTROL"]["STEER_TORQUE"], 100) - self.assertEqual(parser.vl_all["STEERING_CONTROL"]["STEER_TORQUE"], []) + assert parser.vl["STEERING_CONTROL"]["STEER_TORQUE"] == 100 + assert parser.vl_all["STEERING_CONTROL"]["STEER_TORQUE"] == [] # Even if CANParser doesn't update instantaneous vl, make sure it didn't add invalid values to vl_all rx_steering_msg({"STEER_TORQUE": 300}, bad_checksum=False) - self.assertEqual(parser.vl["STEERING_CONTROL"]["STEER_TORQUE"], 300) - self.assertEqual(parser.vl_all["STEERING_CONTROL"]["STEER_TORQUE"], [300]) + assert parser.vl["STEERING_CONTROL"]["STEER_TORQUE"] == 300 + assert parser.vl_all["STEERING_CONTROL"]["STEER_TORQUE"] == [300] def test_packer_parser(self): msgs = [ @@ -189,11 +188,11 @@ def test_packer_parser(self): for k, v in values.items(): for key, val in v.items(): - self.assertAlmostEqual(parser.vl[k][key], val) + assert parser.vl[k][key] == pytest.approx(val) # also check address for sig in ("STEER_TORQUE", "STEER_TORQUE_REQUEST", "COUNTER", "CHECKSUM"): - self.assertEqual(parser.vl["STEERING_CONTROL"][sig], parser.vl[228][sig]) + assert parser.vl["STEERING_CONTROL"][sig] == parser.vl[228][sig] def test_scale_offset(self): """Test that both scale and offset are correctly preserved""" @@ -209,7 +208,7 @@ def test_scale_offset(self): parser.update_strings([bts]) - self.assertAlmostEqual(parser.vl["VSA_STATUS"]["USER_BRAKE"], brake) + assert parser.vl["VSA_STATUS"]["USER_BRAKE"] == pytest.approx(brake) def test_subaru(self): # Subaru is little endian @@ -234,10 +233,10 @@ def test_subaru(self): bts = can_list_to_can_capnp([msgs]) parser.update_strings([bts]) - self.assertAlmostEqual(parser.vl["ES_LKAS"]["LKAS_Output"], steer) - self.assertAlmostEqual(parser.vl["ES_LKAS"]["LKAS_Request"], active) - self.assertAlmostEqual(parser.vl["ES_LKAS"]["SET_1"], 1) - self.assertAlmostEqual(parser.vl["ES_LKAS"]["COUNTER"], idx % 16) + assert parser.vl["ES_LKAS"]["LKAS_Output"] == pytest.approx(steer) + assert parser.vl["ES_LKAS"]["LKAS_Request"] == pytest.approx(active) + assert parser.vl["ES_LKAS"]["SET_1"] == pytest.approx(1) + assert parser.vl["ES_LKAS"]["COUNTER"] == pytest.approx(idx % 16) idx += 1 def test_bus_timeout(self): @@ -267,16 +266,16 @@ def send_msg(blank=False): # all good, no timeout for _ in range(1000): send_msg() - self.assertFalse(parser.bus_timeout, str(_)) + assert not parser.bus_timeout, str(_) # timeout after 10 blank msgs for n in range(200): send_msg(blank=True) - self.assertEqual(n >= 10, parser.bus_timeout) + assert (n >= 10) == parser.bus_timeout # no timeout immediately after seen again send_msg() - self.assertFalse(parser.bus_timeout) + assert not parser.bus_timeout def test_updated(self): """Test updated value dict""" @@ -286,7 +285,7 @@ def test_updated(self): packer = CANPacker(dbc_file) # Make sure nothing is updated - self.assertEqual(len(parser.vl_all["VSA_STATUS"]["USER_BRAKE"]), 0) + assert len(parser.vl_all["VSA_STATUS"]["USER_BRAKE"]) == 0 idx = 0 for _ in range(10): @@ -304,9 +303,9 @@ def test_updated(self): parser.update_strings(can_strings) vl_all = parser.vl_all["VSA_STATUS"]["USER_BRAKE"] - self.assertEqual(vl_all, user_brake_vals) + assert vl_all == user_brake_vals if len(user_brake_vals): - self.assertEqual(vl_all[-1], parser.vl["VSA_STATUS"]["USER_BRAKE"]) + assert vl_all[-1] == parser.vl["VSA_STATUS"]["USER_BRAKE"] def test_timestamp_nanos(self): """Test message timestamp dict""" @@ -323,7 +322,7 @@ def test_timestamp_nanos(self): # Check the default timestamp is zero for msg in ("VSA_STATUS", "POWERTRAIN_DATA"): ts_nanos = parser.ts_nanos[msg].values() - self.assertEqual(set(ts_nanos), {0}) + assert set(ts_nanos) == {0} # Check: # - timestamp is only updated for correct messages @@ -339,9 +338,9 @@ def test_timestamp_nanos(self): parser.update_strings(can_strings) ts_nanos = parser.ts_nanos["VSA_STATUS"].values() - self.assertEqual(set(ts_nanos), {log_mono_time}) + assert set(ts_nanos) == {log_mono_time} ts_nanos = parser.ts_nanos["POWERTRAIN_DATA"].values() - self.assertEqual(set(ts_nanos), {0}) + assert set(ts_nanos) == {0} def test_nonexistent_messages(self): # Ensure we don't allow messages not in the DBC @@ -349,13 +348,13 @@ def test_nonexistent_messages(self): for msg in existing_messages: CANParser(TEST_DBC, [(msg, 0)]) - with self.assertRaises(RuntimeError): + with pytest.raises(RuntimeError): new_msg = msg + "1" if isinstance(msg, str) else msg + 1 CANParser(TEST_DBC, [(new_msg, 0)]) def test_track_all_signals(self): parser = CANParser("toyota_nodsu_pt_generated", [("ACC_CONTROL", 0)]) - self.assertEqual(parser.vl["ACC_CONTROL"], { + assert parser.vl["ACC_CONTROL"] == { "ACCEL_CMD": 0, "ALLOW_LONG_PRESS": 0, "ACC_MALFUNCTION": 0, @@ -371,15 +370,15 @@ def test_track_all_signals(self): "ITS_CONNECT_LEAD": 0, "ACCEL_CMD_ALT": 0, "CHECKSUM": 0, - }) + } def test_disallow_duplicate_messages(self): CANParser("toyota_nodsu_pt_generated", [("ACC_CONTROL", 5)]) - with self.assertRaises(RuntimeError): + with pytest.raises(RuntimeError): CANParser("toyota_nodsu_pt_generated", [("ACC_CONTROL", 5), ("ACC_CONTROL", 10)]) - with self.assertRaises(RuntimeError): + with pytest.raises(RuntimeError): CANParser("toyota_nodsu_pt_generated", [("ACC_CONTROL", 10), ("ACC_CONTROL", 10)]) def test_allow_undefined_msgs(self): @@ -387,13 +386,6 @@ def test_allow_undefined_msgs(self): # discovery tests in openpilot first packer = CANPacker("toyota_nodsu_pt_generated") - self.assertEqual(packer.make_can_msg("ACC_CONTROL", 0, {"UNKNOWN_SIGNAL": 0}), - [835, 0, b'\x00\x00\x00\x00\x00\x00\x00N', 0]) - self.assertEqual(packer.make_can_msg("UNKNOWN_MESSAGE", 0, {"UNKNOWN_SIGNAL": 0}), - [0, 0, b'', 0]) - self.assertEqual(packer.make_can_msg(0, 0, {"UNKNOWN_SIGNAL": 0}), - [0, 0, b'', 0]) - - -if __name__ == "__main__": - unittest.main() + assert packer.make_can_msg("ACC_CONTROL", 0, {"UNKNOWN_SIGNAL": 0}) == [835, 0, b'\x00\x00\x00\x00\x00\x00\x00N', 0] + assert packer.make_can_msg("UNKNOWN_MESSAGE", 0, {"UNKNOWN_SIGNAL": 0}) == [0, 0, b'', 0] + assert packer.make_can_msg(0, 0, {"UNKNOWN_SIGNAL": 0}) == [0, 0, b'', 0] diff --git a/can/tests/test_parser_performance.py b/can/tests/test_parser_performance.py old mode 100755 new mode 100644 index 2010fa4bf7..fe0392b825 --- a/can/tests/test_parser_performance.py +++ b/can/tests/test_parser_performance.py @@ -1,14 +1,13 @@ -#!/usr/bin/env python3 +import pytest import time -import unittest from opendbc.can.parser import CANParser from opendbc.can.packer import CANPacker from opendbc.can.tests.test_packer_parser import can_list_to_can_capnp -@unittest.skip("TODO: varies too much between machines") -class TestParser(unittest.TestCase): +@pytest.mark.skip("TODO: varies too much between machines") +class TestParser: def _benchmark(self, checks, thresholds, n): parser = CANParser('toyota_new_mc_pt_generated', checks, 0) packer = CANPacker('toyota_new_mc_pt_generated') @@ -43,13 +42,9 @@ def _benchmark(self, checks, thresholds, n): print('%s: [%d] %.1fms to parse %s, avg: %dns' % (self._testMethodName, n, et/1e6, len(can_msgs), avg_nanos)) minn, maxx = thresholds - self.assertLess(avg_nanos, maxx) - self.assertGreater(avg_nanos, minn, "Performance seems to have improved, update test thresholds.") + assert avg_nanos < maxx + assert avg_nanos > minn, "Performance seems to have improved, update test thresholds." def test_performance_all_signals(self): self._benchmark([('ACC_CONTROL', 10)], (10000, 19000), 1) self._benchmark([('ACC_CONTROL', 10)], (1300, 5000), 10) - - -if __name__ == "__main__": - unittest.main() diff --git a/requirements.txt b/requirements.txt index 10f8414dda..3eab8fb0c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,5 @@ pycapnp pyyaml scons pytest +pytest-xdist +pytest-subtests From cff2af8ff8690466109f56be62129ebfb85cd5dc Mon Sep 17 00:00:00 2001 From: eFini Date: Fri, 19 Jul 2024 10:23:14 +0800 Subject: [PATCH 2/2] clean/remove community (SDSU/Pedal/IPAS) dbc (#1063) remove community dbc import --- acura_ilx_2016_can_generated.dbc | 18 -------- acura_rdx_2018_can_generated.dbc | 18 -------- generator/gm/gm_global_a_powertrain.dbc | 1 - generator/honda/acura_ilx_2016_can.dbc | 1 - generator/honda/acura_rdx_2018_can.dbc | 1 - generator/honda/honda_civic_ex_2022_can.dbc | 1 - .../honda/honda_civic_touring_2016_can.dbc | 1 - .../honda/honda_clarity_hybrid_2018_can.dbc | 1 - .../honda/honda_crv_executive_2016_can.dbc | 1 - .../honda/honda_crv_touring_2016_can.dbc | 1 - generator/honda/honda_fit_ex_2018_can.dbc | 1 - generator/honda/honda_fit_hybrid_2018_can.dbc | 1 - generator/honda/honda_odyssey_exl_2018.dbc | 1 - ...odyssey_extreme_edition_2018_china_can.dbc | 1 - generator/toyota/toyota_new_mc_pt.dbc | 1 - generator/toyota/toyota_nodsu_pt.dbc | 1 - generator/toyota/toyota_tnga_k_pt.dbc | 1 - gm_global_a_powertrain_generated.dbc | 18 -------- honda_civic_ex_2022_can_generated.dbc | 18 -------- honda_civic_touring_2016_can_generated.dbc | 18 -------- honda_clarity_hybrid_2018_can_generated.dbc | 18 -------- honda_crv_executive_2016_can_generated.dbc | 18 -------- honda_crv_touring_2016_can_generated.dbc | 18 -------- honda_fit_ex_2018_can_generated.dbc | 18 -------- honda_fit_hybrid_2018_can_generated.dbc | 18 -------- honda_odyssey_exl_2018_generated.dbc | 18 -------- ...treme_edition_2018_china_can_generated.dbc | 18 -------- toyota_new_mc_pt_generated.dbc | 44 ------------------- toyota_nodsu_pt_generated.dbc | 44 ------------------- toyota_tnga_k_pt_generated.dbc | 44 ------------------- 30 files changed, 363 deletions(-) diff --git a/acura_ilx_2016_can_generated.dbc b/acura_ilx_2016_can_generated.dbc index 24c8f67892..191ec84933 100644 --- a/acura_ilx_2016_can_generated.dbc +++ b/acura_ilx_2016_can_generated.dbc @@ -1,24 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _honda_common.dbc starts here"; BO_ 304 GAS_PEDAL_2: 8 PCM SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON diff --git a/acura_rdx_2018_can_generated.dbc b/acura_rdx_2018_can_generated.dbc index 4c23725176..3c034413cf 100644 --- a/acura_rdx_2018_can_generated.dbc +++ b/acura_rdx_2018_can_generated.dbc @@ -1,24 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _honda_common.dbc starts here"; BO_ 304 GAS_PEDAL_2: 8 PCM SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON diff --git a/generator/gm/gm_global_a_powertrain.dbc b/generator/gm/gm_global_a_powertrain.dbc index e4315be99f..937de76c94 100644 --- a/generator/gm/gm_global_a_powertrain.dbc +++ b/generator/gm/gm_global_a_powertrain.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; VERSION "" diff --git a/generator/honda/acura_ilx_2016_can.dbc b/generator/honda/acura_ilx_2016_can.dbc index 11e1d9ecf3..5a60a9c9e1 100644 --- a/generator/honda/acura_ilx_2016_can.dbc +++ b/generator/honda/acura_ilx_2016_can.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _honda_common.dbc"; CM_ "IMPORT _nidec_common.dbc"; CM_ "IMPORT _steering_sensors_b.dbc"; diff --git a/generator/honda/acura_rdx_2018_can.dbc b/generator/honda/acura_rdx_2018_can.dbc index e83429e592..06327f928f 100644 --- a/generator/honda/acura_rdx_2018_can.dbc +++ b/generator/honda/acura_rdx_2018_can.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _honda_common.dbc"; CM_ "IMPORT _nidec_common.dbc"; CM_ "IMPORT _steering_sensors_b.dbc"; diff --git a/generator/honda/honda_civic_ex_2022_can.dbc b/generator/honda/honda_civic_ex_2022_can.dbc index 8ca13746ea..ad50302379 100644 --- a/generator/honda/honda_civic_ex_2022_can.dbc +++ b/generator/honda/honda_civic_ex_2022_can.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _honda_common.dbc"; CM_ "IMPORT _bosch_2018.dbc"; CM_ "IMPORT _steering_sensors_a.dbc"; diff --git a/generator/honda/honda_civic_touring_2016_can.dbc b/generator/honda/honda_civic_touring_2016_can.dbc index 9346f5f881..89b6ceae35 100644 --- a/generator/honda/honda_civic_touring_2016_can.dbc +++ b/generator/honda/honda_civic_touring_2016_can.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _honda_common.dbc"; CM_ "IMPORT _nidec_common.dbc"; CM_ "IMPORT _steering_sensors_a.dbc"; diff --git a/generator/honda/honda_clarity_hybrid_2018_can.dbc b/generator/honda/honda_clarity_hybrid_2018_can.dbc index 2d1ec35f20..edeaa29993 100644 --- a/generator/honda/honda_clarity_hybrid_2018_can.dbc +++ b/generator/honda/honda_clarity_hybrid_2018_can.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _honda_common.dbc"; CM_ "IMPORT _nidec_common.dbc"; CM_ "IMPORT _steering_sensors_a.dbc"; diff --git a/generator/honda/honda_crv_executive_2016_can.dbc b/generator/honda/honda_crv_executive_2016_can.dbc index 291795b9ee..7d0af49217 100644 --- a/generator/honda/honda_crv_executive_2016_can.dbc +++ b/generator/honda/honda_crv_executive_2016_can.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _honda_common.dbc"; CM_ "IMPORT _nidec_common.dbc"; diff --git a/generator/honda/honda_crv_touring_2016_can.dbc b/generator/honda/honda_crv_touring_2016_can.dbc index 9e33720b26..75fd63f3b0 100644 --- a/generator/honda/honda_crv_touring_2016_can.dbc +++ b/generator/honda/honda_crv_touring_2016_can.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _honda_common.dbc"; CM_ "IMPORT _nidec_common.dbc"; CM_ "IMPORT _steering_sensors_b.dbc"; diff --git a/generator/honda/honda_fit_ex_2018_can.dbc b/generator/honda/honda_fit_ex_2018_can.dbc index bb54f25850..371ddd19a8 100644 --- a/generator/honda/honda_fit_ex_2018_can.dbc +++ b/generator/honda/honda_fit_ex_2018_can.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _honda_common.dbc"; CM_ "IMPORT _nidec_common.dbc"; CM_ "IMPORT _steering_sensors_b.dbc"; diff --git a/generator/honda/honda_fit_hybrid_2018_can.dbc b/generator/honda/honda_fit_hybrid_2018_can.dbc index c6d4fdde56..fa445b3496 100644 --- a/generator/honda/honda_fit_hybrid_2018_can.dbc +++ b/generator/honda/honda_fit_hybrid_2018_can.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _honda_common.dbc"; CM_ "IMPORT _nidec_common.dbc"; diff --git a/generator/honda/honda_odyssey_exl_2018.dbc b/generator/honda/honda_odyssey_exl_2018.dbc index 2b42d3e763..7a37e0124f 100644 --- a/generator/honda/honda_odyssey_exl_2018.dbc +++ b/generator/honda/honda_odyssey_exl_2018.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _honda_common.dbc"; CM_ "IMPORT _nidec_common.dbc"; CM_ "IMPORT _steering_sensors_b.dbc"; diff --git a/generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc b/generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc index fc3c152f1b..fed29d0664 100644 --- a/generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc +++ b/generator/honda/honda_odyssey_extreme_edition_2018_china_can.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _honda_common.dbc"; CM_ "IMPORT _nidec_common.dbc"; diff --git a/generator/toyota/toyota_new_mc_pt.dbc b/generator/toyota/toyota_new_mc_pt.dbc index be824cc043..91a8723f5a 100644 --- a/generator/toyota/toyota_new_mc_pt.dbc +++ b/generator/toyota/toyota_new_mc_pt.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _toyota_2017.dbc"; BO_ 548 BRAKE_MODULE: 8 XXX diff --git a/generator/toyota/toyota_nodsu_pt.dbc b/generator/toyota/toyota_nodsu_pt.dbc index f35f5571a3..1e2d2f9e4b 100644 --- a/generator/toyota/toyota_nodsu_pt.dbc +++ b/generator/toyota/toyota_nodsu_pt.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _toyota_2017.dbc"; BO_ 401 STEERING_LTA: 8 XXX diff --git a/generator/toyota/toyota_tnga_k_pt.dbc b/generator/toyota/toyota_tnga_k_pt.dbc index faf5b0a942..a06469c372 100644 --- a/generator/toyota/toyota_tnga_k_pt.dbc +++ b/generator/toyota/toyota_tnga_k_pt.dbc @@ -1,4 +1,3 @@ -CM_ "IMPORT _community.dbc"; CM_ "IMPORT _toyota_2017.dbc"; BO_ 550 BRAKE_MODULE: 8 XXX diff --git a/gm_global_a_powertrain_generated.dbc b/gm_global_a_powertrain_generated.dbc index 1c78dd7b07..a3f473af73 100644 --- a/gm_global_a_powertrain_generated.dbc +++ b/gm_global_a_powertrain_generated.dbc @@ -1,23 +1,5 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; - -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 NEO - SG_ GAS_COMMAND : 7|16@0+ (0.125677,-75.909) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.251976,-76.601) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (0.125677,-75.909) [0|1] "" NEO - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (0.251976,-76.601) [0|1] "" NEO - SG_ STATE : 39|4@0+ (1,0) [0|15] "" NEO - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" NEO - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" NEO - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - CM_ "gm_global_a_powertrain.dbc starts here"; VERSION "" diff --git a/honda_civic_ex_2022_can_generated.dbc b/honda_civic_ex_2022_can_generated.dbc index 8433001dcf..2e474f6fc0 100644 --- a/honda_civic_ex_2022_can_generated.dbc +++ b/honda_civic_ex_2022_can_generated.dbc @@ -1,24 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _honda_common.dbc starts here"; BO_ 304 GAS_PEDAL_2: 8 PCM SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON diff --git a/honda_civic_touring_2016_can_generated.dbc b/honda_civic_touring_2016_can_generated.dbc index db6b21423f..e7b02285e8 100644 --- a/honda_civic_touring_2016_can_generated.dbc +++ b/honda_civic_touring_2016_can_generated.dbc @@ -1,24 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _honda_common.dbc starts here"; BO_ 304 GAS_PEDAL_2: 8 PCM SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON diff --git a/honda_clarity_hybrid_2018_can_generated.dbc b/honda_clarity_hybrid_2018_can_generated.dbc index f47f7628b8..8353038ba3 100644 --- a/honda_clarity_hybrid_2018_can_generated.dbc +++ b/honda_clarity_hybrid_2018_can_generated.dbc @@ -1,24 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _honda_common.dbc starts here"; BO_ 304 GAS_PEDAL_2: 8 PCM SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON diff --git a/honda_crv_executive_2016_can_generated.dbc b/honda_crv_executive_2016_can_generated.dbc index c218b19ed5..f62a28bcd3 100644 --- a/honda_crv_executive_2016_can_generated.dbc +++ b/honda_crv_executive_2016_can_generated.dbc @@ -1,24 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _honda_common.dbc starts here"; BO_ 304 GAS_PEDAL_2: 8 PCM SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON diff --git a/honda_crv_touring_2016_can_generated.dbc b/honda_crv_touring_2016_can_generated.dbc index 8b3f1b208b..66ce03d574 100644 --- a/honda_crv_touring_2016_can_generated.dbc +++ b/honda_crv_touring_2016_can_generated.dbc @@ -1,24 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _honda_common.dbc starts here"; BO_ 304 GAS_PEDAL_2: 8 PCM SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON diff --git a/honda_fit_ex_2018_can_generated.dbc b/honda_fit_ex_2018_can_generated.dbc index 05cd391c78..8f38033879 100644 --- a/honda_fit_ex_2018_can_generated.dbc +++ b/honda_fit_ex_2018_can_generated.dbc @@ -1,24 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _honda_common.dbc starts here"; BO_ 304 GAS_PEDAL_2: 8 PCM SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON diff --git a/honda_fit_hybrid_2018_can_generated.dbc b/honda_fit_hybrid_2018_can_generated.dbc index 3ada5c74f0..c1247b2708 100644 --- a/honda_fit_hybrid_2018_can_generated.dbc +++ b/honda_fit_hybrid_2018_can_generated.dbc @@ -1,24 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _honda_common.dbc starts here"; BO_ 304 GAS_PEDAL_2: 8 PCM SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON diff --git a/honda_odyssey_exl_2018_generated.dbc b/honda_odyssey_exl_2018_generated.dbc index 1dd222ed97..dcad96db25 100644 --- a/honda_odyssey_exl_2018_generated.dbc +++ b/honda_odyssey_exl_2018_generated.dbc @@ -1,24 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _honda_common.dbc starts here"; BO_ 304 GAS_PEDAL_2: 8 PCM SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON diff --git a/honda_odyssey_extreme_edition_2018_china_can_generated.dbc b/honda_odyssey_extreme_edition_2018_china_can_generated.dbc index b109a70b62..7d17803d09 100644 --- a/honda_odyssey_extreme_edition_2018_china_can_generated.dbc +++ b/honda_odyssey_extreme_edition_2018_china_can_generated.dbc @@ -1,24 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.253984064,-83.3) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.126992032,-83.3) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _honda_common.dbc starts here"; BO_ 304 GAS_PEDAL_2: 8 PCM SG_ ENGINE_TORQUE_ESTIMATE : 7|16@0- (1,0) [-1000|1000] "Nm" EON diff --git a/toyota_new_mc_pt_generated.dbc b/toyota_new_mc_pt_generated.dbc index dfb69df492..4126560fcc 100644 --- a/toyota_new_mc_pt_generated.dbc +++ b/toyota_new_mc_pt_generated.dbc @@ -1,50 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 359 STEERING_IPAS_COMMA: 8 IPAS - SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX - SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX - SG_ SET_ME_X10 : 23|8@0+ (1,0) [0|255] "" XXX - SG_ SET_ME_X00 : 31|8@0+ (1,0) [0|255] "" XXX - SG_ DIRECTION_CMD : 38|2@0+ (1,0) [0|3] "" XXX - SG_ SET_ME_X40 : 47|8@0+ (1,0) [0|255] "" XXX - SG_ SET_ME_X00_1 : 55|8@0+ (1,0) [0|255] "" XXX - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX - -CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant"; - -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.159375,-151.111) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - -BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX - SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX - -CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss"; - -BO_ 767 SDSU: 8 XXX - SG_ FD_BUTTON : 7|1@0+ (1,0) [0|1] "" XXX - SG_ STATE : 23|4@0+ (1,0) [0|15] "" XXX - -CM_ "BO_ SDSU: The sDSU is a modified DSU for use in TSS-P Toyotas. Learn more: https://github.com/RetroPilot/ocelot/tree/main/firmware/smart_dsu"; -CM_ SG_ 767 FD_BUTTON "The follow distance button signal as forwarded by the sdsu"; - -VAL_ 767 STATE 7 "STATE_AEB_CTRL" 6 "FAULT_INVALID" 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _toyota_2017.dbc starts here"; VERSION "" diff --git a/toyota_nodsu_pt_generated.dbc b/toyota_nodsu_pt_generated.dbc index efbcccc860..549f667087 100644 --- a/toyota_nodsu_pt_generated.dbc +++ b/toyota_nodsu_pt_generated.dbc @@ -1,50 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 359 STEERING_IPAS_COMMA: 8 IPAS - SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX - SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX - SG_ SET_ME_X10 : 23|8@0+ (1,0) [0|255] "" XXX - SG_ SET_ME_X00 : 31|8@0+ (1,0) [0|255] "" XXX - SG_ DIRECTION_CMD : 38|2@0+ (1,0) [0|3] "" XXX - SG_ SET_ME_X40 : 47|8@0+ (1,0) [0|255] "" XXX - SG_ SET_ME_X00_1 : 55|8@0+ (1,0) [0|255] "" XXX - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX - -CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant"; - -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.159375,-151.111) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - -BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX - SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX - -CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss"; - -BO_ 767 SDSU: 8 XXX - SG_ FD_BUTTON : 7|1@0+ (1,0) [0|1] "" XXX - SG_ STATE : 23|4@0+ (1,0) [0|15] "" XXX - -CM_ "BO_ SDSU: The sDSU is a modified DSU for use in TSS-P Toyotas. Learn more: https://github.com/RetroPilot/ocelot/tree/main/firmware/smart_dsu"; -CM_ SG_ 767 FD_BUTTON "The follow distance button signal as forwarded by the sdsu"; - -VAL_ 767 STATE 7 "STATE_AEB_CTRL" 6 "FAULT_INVALID" 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _toyota_2017.dbc starts here"; VERSION "" diff --git a/toyota_tnga_k_pt_generated.dbc b/toyota_tnga_k_pt_generated.dbc index d95cfbe69a..1a21ab81b6 100644 --- a/toyota_tnga_k_pt_generated.dbc +++ b/toyota_tnga_k_pt_generated.dbc @@ -1,50 +1,6 @@ CM_ "AUTOGENERATED FILE, DO NOT EDIT"; -CM_ "Imported file _community.dbc starts here"; -BO_ 359 STEERING_IPAS_COMMA: 8 IPAS - SG_ STATE : 7|4@0+ (1,0) [0|15] "" XXX - SG_ ANGLE : 3|12@0- (1.5,0) [-510|510] "deg" XXX - SG_ SET_ME_X10 : 23|8@0+ (1,0) [0|255] "" XXX - SG_ SET_ME_X00 : 31|8@0+ (1,0) [0|255] "" XXX - SG_ DIRECTION_CMD : 38|2@0+ (1,0) [0|3] "" XXX - SG_ SET_ME_X40 : 47|8@0+ (1,0) [0|255] "" XXX - SG_ SET_ME_X00_1 : 55|8@0+ (1,0) [0|255] "" XXX - SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX - -CM_ "BO_ STEERING_IPAS_COMMA: Copy of msg 614 so we can do angle control while the Park Assist ECU is connected (Panda spoofs 614 with 359 on connector J70). Note that addresses 0x266 and 0x167 are checksum-invariant"; - -BO_ 512 GAS_COMMAND: 6 EON - SG_ GAS_COMMAND : 7|16@0+ (0.159375,-75.555) [0|1] "" INTERCEPTOR - SG_ GAS_COMMAND2 : 23|16@0+ (0.159375,-151.111) [0|1] "" INTERCEPTOR - SG_ ENABLE : 39|1@0+ (1,0) [0|1] "" INTERCEPTOR - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" INTERCEPTOR - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" INTERCEPTOR - -BO_ 513 GAS_SENSOR: 6 INTERCEPTOR - SG_ INTERCEPTOR_GAS : 7|16@0+ (1,0) [0|1] "" EON - SG_ INTERCEPTOR_GAS2 : 23|16@0+ (1,0) [0|1] "" EON - SG_ STATE : 39|4@0+ (1,0) [0|15] "" EON - SG_ COUNTER_PEDAL : 35|4@0+ (1,0) [0|15] "" EON - SG_ CHECKSUM_PEDAL : 47|8@0+ (1,0) [0|255] "" EON - -VAL_ 513 STATE 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - -BO_ 35 SECONDARY_STEER_ANGLE: 8 XXX - SG_ ZORRO_STEER : 7|24@0- (0.004901594652,0) [-500|500] "" XXX - -CM_ "BO_ SECONDARY_STEER_ANGLE: ZSS is a high-precision steering angle sensor that can replace the lower resolution sensor in most TSS1 Toyotas. Learn more: https://github.com/commaai/openpilot/wiki/Toyota-Lexus#zorro-steering-sensor-zss"; - -BO_ 767 SDSU: 8 XXX - SG_ FD_BUTTON : 7|1@0+ (1,0) [0|1] "" XXX - SG_ STATE : 23|4@0+ (1,0) [0|15] "" XXX - -CM_ "BO_ SDSU: The sDSU is a modified DSU for use in TSS-P Toyotas. Learn more: https://github.com/RetroPilot/ocelot/tree/main/firmware/smart_dsu"; -CM_ SG_ 767 FD_BUTTON "The follow distance button signal as forwarded by the sdsu"; - -VAL_ 767 STATE 7 "STATE_AEB_CTRL" 6 "FAULT_INVALID" 5 "FAULT_TIMEOUT" 4 "FAULT_STARTUP" 3 "FAULT_SCE" 2 "FAULT_SEND" 1 "FAULT_BAD_CHECKSUM" 0 "NO_FAULT" ; - - CM_ "Imported file _toyota_2017.dbc starts here"; VERSION ""