Fix offsets for block CRCs

Author: zuckschwerdt

src/devices/m_bus.c

@@ -784,13 +784,15 @@ static int parse_block2(const m_bus_data_t *in, m_bus_block1_t *block1)
             b2->ST          = b[5];
             b2->CW          = (b[9] << 8) | (b[8]);
             b2->pl_offset   = BLOCK1A_SIZE - 2 + 8;
-            b2->q_total     = ((uint32_t)b[20] << 24) | (b[19] << 16) | (b[18] << 8) | (b[17]);
-            b2->q_lastyear  = ((uint32_t)b[26] << 24) | (b[25] << 16) | (b[24] << 8) | (b[23]);
-            b2->q_lastmonth = ((uint32_t)b[32] << 24) | (b[31] << 16) | (b[30] << 8) | (b[29]);
+            // Note the offsets to skip block CRCs
+            b2->q_total     = ((uint32_t)b[20+2] << 24) | (b[19+2] << 16) | (b[18+2] << 8) | (b[17+2]);
+            b2->q_lastyear  = ((uint32_t)b[26+2] << 24) | (b[25+2] << 16) | (b[24+2] << 8) | (b[23+2]);
+            b2->q_lastmonth = ((uint32_t)b[32+4] << 24) | (b[31+2] << 16) | (b[30+2] << 8) | (b[29+2]);
             if (block1->A_DevType == 6) {
                 /* WarmWater */
             }
             if (block1->A_DevType == 8) {
+                /* Heat Cost Allocator */
                 // snprintf(extra, sizeof(extra), "%02x%02x%02x%02x%02x", b[6], b[7], b[8], b[9], b[10]);
             }
         }