VW MQB: Refactor volkswagen_mqb_checksum for messages with counter ig…

…nored
commaai · Feb 29, 2024 · 697933d · 697933d
1 parent 5f096db
commit 697933d
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/can/common.cc b/can/common.cc
@@ -126,10 +126,10 @@ unsigned int volkswagen_mqb_checksum(uint32_t address, const Signal &sig, const
   uint8_t counter = d[1] & 0x0F;
   switch (address) {
     case 0x86:  // LWI_01 Steering Angle
-      crc ^= (uint8_t[]){0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86, 0x86}[counter];
+      crc ^= 0x86;
       break;
     case 0x9F:  // LH_EPS_03 Electric Power Steering
-      crc ^= (uint8_t[]){0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5}[counter];
+      crc ^= 0xF5;
       break;
     case 0xAD:  // Getriebe_11 Automatic Gearbox
       crc ^= (uint8_t[]){0x3F, 0x69, 0x39, 0xDC, 0x94, 0xF9, 0x14, 0x64, 0xD8, 0x6A, 0x34, 0xCE, 0xA2, 0x55, 0xB5, 0x2C}[counter];
@@ -138,10 +138,10 @@ unsigned int volkswagen_mqb_checksum(uint32_t address, const Signal &sig, const
       crc ^= (uint8_t[]){0xB4, 0xEF, 0xF8, 0x49, 0x1E, 0xE5, 0xC2, 0xC0, 0x97, 0x19, 0x3C, 0xC9, 0xF1, 0x98, 0xD6, 0x61}[counter];
       break;
     case 0x106: // ESP_05 Electronic Stability Program
-      crc ^= (uint8_t[]){0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07}[counter];
+      crc ^= 0x07;
       break;
     case 0x117: // ACC_10 Automatic Cruise Control
-      crc ^= (uint8_t[]){0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16}[counter];
+      crc ^= 0x16;
       break;
     case 0x120: // TSK_06 Drivetrain Coordinator
       crc ^= (uint8_t[]){0xC4, 0xE2, 0x4F, 0xE4, 0xF8, 0x2F, 0x56, 0x81, 0x9F, 0xE5, 0x83, 0x44, 0x05, 0x3F, 0x97, 0xDF}[counter];
@@ -153,7 +153,7 @@ unsigned int volkswagen_mqb_checksum(uint32_t address, const Signal &sig, const
       crc ^= (uint8_t[]){0x37, 0x7D, 0xF3, 0xA9, 0x18, 0x46, 0x6D, 0x4D, 0x3D, 0x71, 0x92, 0x9C, 0xE5, 0x32, 0x10, 0xB9}[counter];
       break;
     case 0x126: // HCA_01 Heading Control Assist
-      crc ^= (uint8_t[]){0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA, 0xDA}[counter];
+      crc ^= 0xDA;
       break;
     case 0x12B: // GRA_ACC_01 Steering wheel controls for ACC
       crc ^= (uint8_t[]){0x6A, 0x38, 0xB4, 0x27, 0x22, 0xEF, 0xE1, 0xBB, 0xF8, 0x80, 0x84, 0x49, 0xC7, 0x9E, 0x1E, 0x2B}[counter];
@@ -165,23 +165,23 @@ unsigned int volkswagen_mqb_checksum(uint32_t address, const Signal &sig, const
       crc ^= (uint8_t[]){0x7F, 0xED, 0x17, 0xC2, 0x7C, 0xEB, 0x44, 0x21, 0x01, 0xFA, 0xDB, 0x15, 0x4A, 0x6B, 0x23, 0x05}[counter];
       break;
     case 0x30C: // ACC_02 Automatic Cruise Control
-      crc ^= (uint8_t[]){0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F}[counter];
+      crc ^= 0x0F;
       break;
     case 0x30F: // SWA_01 Lane Change Assist (SpurWechselAssistent)
-      crc ^= (uint8_t[]){0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C}[counter];
+      crc ^= 0x0C;
       break;
     case 0x324: // ACC_04 Automatic Cruise Control
-      crc ^= (uint8_t[]){0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27}[counter];
+      crc ^= 0x27;
       break;
     case 0x3C0: // Klemmen_Status_01 ignition and starting status
-      crc ^= (uint8_t[]){0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3, 0xC3}[counter];
+      crc ^= 0xC3;
       break;
     case 0x65D: // ESP_20 Electronic Stability Program
       crc ^= (uint8_t[]){0xAC, 0xB3, 0xAB, 0xEB, 0x7A, 0xE1, 0x3B, 0xF7, 0x73, 0xBA, 0x7C, 0x9E, 0x06, 0x5F, 0x02, 0xD9}[counter];
       break;
     default:    // As-yet undefined CAN message, CRC check expected to fail
       printf("Attempt to CRC check undefined Volkswagen message 0x%02X\n", address);
-      crc ^= (uint8_t[]){0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}[counter];
+      crc ^= 0x00;
       break;
   }
   crc = crc8_lut_8h2f[crc];