From 7183393bd8c6b226d1b7c3e07949e70ed6aa193d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Czekan=CC=81ski?= Date: Thu, 12 Sep 2024 00:07:22 +0200 Subject: [PATCH] VW MQB: Add missing fields in Getriebe_11 Test case is reenabled and now passes --- opendbc/can/tests/test_checksums.py | 3 +-- opendbc/dbc/vw_mqb_2010.dbc | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/opendbc/can/tests/test_checksums.py b/opendbc/can/tests/test_checksums.py index 6e9109e863..cc2ff54f63 100644 --- a/opendbc/can/tests/test_checksums.py +++ b/opendbc/can/tests/test_checksums.py @@ -131,7 +131,6 @@ def test_mqb_crc_LH_EPS_03(self, subtests): b'\xe2\x3f\x05\x00\x05\x0a\x00\x30', ]) - @pytest.mark.skip(reason="Missing field definitions in .dbc for Getriebe_11") def test_mqb_crc_Getriebe_11(self, subtests): self.verify_mqb_crc(subtests, "Getriebe_11", 0xAD, [ b'\xf8\xe0\xbf\xff\x5f\x20\x20\x20', @@ -150,7 +149,7 @@ def test_mqb_crc_Getriebe_11(self, subtests): b'\xbd\xed\xbf\xff\xaa\x20\x20\x10', b'\x67\xee\xbf\xff\xaa\x20\x20\x10', b'\x36\xef\xbf\xff\xaa\x20\x20\x10', - ], counter_field='COUNTERXX') + ]) @pytest.mark.skip(reason="Missing field definitions in .dbc for ESP_21") def test_mqb_crc_ESP_21(self, subtests): diff --git a/opendbc/dbc/vw_mqb_2010.dbc b/opendbc/dbc/vw_mqb_2010.dbc index 44ec0cd3e0..586f256634 100644 --- a/opendbc/dbc/vw_mqb_2010.dbc +++ b/opendbc/dbc/vw_mqb_2010.dbc @@ -483,13 +483,15 @@ BO_ 296 Getriebe_06: 3 Getriebe_DQ_Hybrid_MQB BO_ 173 Getriebe_11: 8 Getriebe_DQ_Hybrid_MQB SG_ CHECKSUM : 0|8@1+ (1,0) [0|255] "" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB - SG_ COUNTERXX : 8|4@1+ (1,0) [0|15] "" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB + SG_ COUNTER : 8|4@1+ (1,0) [0|15] "" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB SG_ GE_MMom_Soll_02 : 12|10@1+ (1,-509) [-509|509] "Unit_NewtoMeter" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB SG_ GE_MMom_Vorhalt_02 : 22|10@1+ (1,-509) [-509|509] "Unit_NewtoMeter" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB SG_ GE_Uefkt : 32|10@1+ (0.1,0) [0|102.2] "" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB SG_ GE_Fahrstufe : 42|5@1+ (1,0) [0|31] "" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB - SG_ GE_Schaltvorgang : 47|1@1+ (1,0) [0|1] "" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB - SG_ GE_Status_Kupplung : 54|2@1+ (1,0) [0|3] "" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB + SG_ GE_Schaltablauf : 47|2@1+ (1,0) [0|3] "" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB + SG_ GE_Uefkt_unplausibel : 49|1@1+ (1,0) [0|1] "" Gateway_MQB + SG_ GE_MMom_Status_02 : 50|3@1+ (1,0) [0|7] "" Gateway_MQB + SG_ GE_Status_Kraftschluss : 53|3@1+ (1,0) [0|7] "" Gateway_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB SG_ GE_MMom_Status : 56|2@1+ (1,0) [0|3] "" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB SG_ GE_Freig_MMom_Vorhalt : 58|1@1+ (1,0) [0|1] "" Gateway_MQB,Motor_Diesel_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB SG_ GE_Verbot_Ausblendung : 59|1@1+ (1,0) [0|1] "" Gateway_MQB,Motor_Hybrid_MQB,Motor_Otto_MQB