From b481811f26c5ca55236734ce8f42665678db6362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Czekan=CC=81ski?= Date: Fri, 13 Sep 2024 22:23:44 +0200 Subject: [PATCH] VW MQB: Keep CAN IDs in order ACC_02 had address in decimal format and was out of order. --- opendbc/can/tests/test_checksums.py | 40 ++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/opendbc/can/tests/test_checksums.py b/opendbc/can/tests/test_checksums.py index d67210b4ae..5fa4119d97 100644 --- a/opendbc/can/tests/test_checksums.py +++ b/opendbc/can/tests/test_checksums.py @@ -75,26 +75,6 @@ def test_vw_mqb_crc_LWI_01(self, subtests): b'\x60\x0f\x62\xc0\x00\x00\x00\x00', ]) - def test_vw_mqb_crc_ACC_02(self, subtests): - self.verify_vw_mqb_crc(subtests, "ACC_02", 780, [ - b'\x82\xf0\x3f\x00\x40\x30\x00\x40', - b'\xe6\xf1\x3f\x00\x40\x30\x00\x40', - b'\x4a\xf2\x3f\x00\x40\x30\x00\x40', - b'\x2e\xf3\x3f\x00\x40\x30\x00\x40', - b'\x3d\xf4\x3f\x00\x40\x30\x00\x40', - b'\x59\xf5\x3f\x00\x40\x30\x00\x40', - b'\xf5\xf6\x3f\x00\x40\x30\x00\x40', - b'\x91\xf7\x3f\x00\x40\x30\x00\x40', - b'\xd3\xf8\x3f\x00\x40\x30\x00\x40', - b'\xb7\xf9\x3f\x00\x40\x30\x00\x40', - b'\x1b\xfa\x3f\x00\x40\x30\x00\x40', - b'\x7f\xfb\x3f\x00\x40\x30\x00\x40', - b'\x6c\xfc\x3f\x00\x40\x30\x00\x40', - b'\x08\xfd\x3f\x00\x40\x30\x00\x40', - b'\xa4\xfe\x3f\x00\x40\x30\x00\x40', - b'\xc0\xff\x3f\x00\x40\x30\x00\x40', - ]) - def test_vw_mqb_crc_Airbag_01(self, subtests): self.verify_vw_mqb_crc(subtests, "Airbag_01", 0x40, [ b'\xaf\x00\x00\x80\xc0\x00\x20\x3e', @@ -415,6 +395,26 @@ def test_vw_mqb_crc_ESP_33(self, subtests): b'\x68\x0f\x80\x02\x00\x00\x00\x00', ]) + def test_vw_mqb_crc_ACC_02(self, subtests): + self.verify_vw_mqb_crc(subtests, "ACC_02", 0x30C, [ + b'\x82\xf0\x3f\x00\x40\x30\x00\x40', + b'\xe6\xf1\x3f\x00\x40\x30\x00\x40', + b'\x4a\xf2\x3f\x00\x40\x30\x00\x40', + b'\x2e\xf3\x3f\x00\x40\x30\x00\x40', + b'\x3d\xf4\x3f\x00\x40\x30\x00\x40', + b'\x59\xf5\x3f\x00\x40\x30\x00\x40', + b'\xf5\xf6\x3f\x00\x40\x30\x00\x40', + b'\x91\xf7\x3f\x00\x40\x30\x00\x40', + b'\xd3\xf8\x3f\x00\x40\x30\x00\x40', + b'\xb7\xf9\x3f\x00\x40\x30\x00\x40', + b'\x1b\xfa\x3f\x00\x40\x30\x00\x40', + b'\x7f\xfb\x3f\x00\x40\x30\x00\x40', + b'\x6c\xfc\x3f\x00\x40\x30\x00\x40', + b'\x08\xfd\x3f\x00\x40\x30\x00\x40', + b'\xa4\xfe\x3f\x00\x40\x30\x00\x40', + b'\xc0\xff\x3f\x00\x40\x30\x00\x40', + ]) + def test_vw_mqb_crc_SWA_01(self, subtests): self.verify_vw_mqb_crc(subtests, "SWA_01", 0x30F, [ b'\x10\x00\x10\x00\x00\x00\x00\x00',