From 53198b6deec2b6a84391431f0f9290f48632d991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Czekan=CC=81ski?= Date: Thu, 12 Sep 2024 00:21:30 +0200 Subject: [PATCH] VW MQB: Add missing fields in Motor_20 --- opendbc/can/tests/test_checksums.py | 3 +-- opendbc/dbc/vw_mqb_2010.dbc | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/opendbc/can/tests/test_checksums.py b/opendbc/can/tests/test_checksums.py index 73d07ba7ba..f84ce11760 100644 --- a/opendbc/can/tests/test_checksums.py +++ b/opendbc/can/tests/test_checksums.py @@ -149,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') + ]) def test_mqb_crc_ESP_21(self, subtests): self.verify_mqb_crc(subtests, "ESP_21", 0xFD, [ @@ -231,7 +231,6 @@ def test_mqb_crc_TSK_06(self, subtests): b'\x0b\x0f\x00\x02\x00\x08\xff\x21', ]) - @pytest.mark.skip(reason="Missing field definitions in .dbc for Motor_20") def test_mqb_crc_Motor_20(self, subtests): self.verify_mqb_crc(subtests, "Motor_20", 0x121, [ b'\xb9\x00\x00\xc0\x39\x46\x7e\xfe', diff --git a/opendbc/dbc/vw_mqb_2010.dbc b/opendbc/dbc/vw_mqb_2010.dbc index 0fd81e80df..e9891f87b1 100644 --- a/opendbc/dbc/vw_mqb_2010.dbc +++ b/opendbc/dbc/vw_mqb_2010.dbc @@ -877,7 +877,11 @@ BO_ 289 Motor_20: 8 Motor_Diesel_MQB SG_ MO_rel_Saugrohrdruck_gem_err : 36|1@1+ (1,0) [0|1] "" Gateway_MQB SG_ MO_Moment_im_Leerlauf : 37|1@1+ (1,0) [0|1] "" Gateway_MQB,Getriebe_DQ_Hybrid_MQB,Getriebe_DQ_MQB SG_ MO_Schubabschaltung : 38|1@1+ (1,0) [0|1] "" Gateway_MQB + SG_ MO_StartStopp_StoppVorbereitung : 39|1@1+ (1,0) [0|1] "" Gateway_MQB,Getriebe_AL550,Getriebe_DQ SG_ MO_Solldrehz_Leerlauf : 40|8@1+ (10,0) [0|2540] "Unit_MinutInver" Gateway_MQB,Getriebe_DQ_Hybrid_MQB,Getriebe_DQ_MQB + SG_ MO_Entkopplung_Sollschlupf : 48|7@1+ (20,0) [0|2480] "Unit_MinutInver" Gateway_MQB + SG_ MO_temporaere_Fahrerabwesenheit : 55|1@1+ (1,0) [0|1] "" Gateway_MQB,Getriebe_AL550 + SG_ TSK_a_Soll_gradientenbegrenzt : 57|7@1+ (0.1,-7.2) [-7.2|5.4] "Unit_MeterPerSeconSquar" Gateway_MQB BO_ 967 Motor_26: 8 Motor_Diesel_MQB SG_ MO_HYB_Status_HV_Ladung : 8|3@1+ (1,0) [0|7] "" Gateway_MQB