Add QDS modes WW/HCA

Author: zuckschwerdt

src/devices/m_bus.c

@@ -22,6 +22,9 @@ for further processing by an Application layer (outside this program).
 #define BLOCK2B_SIZE 118    // Maximum size of Block 2, format B
 #define BLOCK1_2B_SIZE 128
 
+#define QDS_WW         0x06 /* Q_walk_by Warm Water */
+#define QDS_HCA        0x08 /* Q_walk_by Heat Cost Allocator */
+
 // Convert two BCD encoded nibbles to an integer
 static unsigned bcd2int(uint8_t bcd)
 {
@@ -156,9 +159,13 @@ typedef struct {
     uint8_t     tpci;
     uint8_t     apci;
     /* Q-walk_by */
-    float       q_total;
-    float       q_lastyear;
-    float       q_lastmonth;
+    int         q_mode;
+    int         q_total;
+    int         q_lastyear;
+    int         q_lastmonth;
+    float       q_total_m3;
+    float       q_lastyear_m3;
+    float       q_lastmonth_m3;
 } m_bus_block2_t;
 
 // Data structure for block 1
@@ -791,13 +798,15 @@ static int parse_block2(const m_bus_data_t *in, m_bus_block1_t *block1)
             if (block1->A_DevType == 6) {
                 /* WarmWater */
                 // Value factor is 0.001, e.g. 123.456 m3
-                b2->q_total     /= 1000.0f;
-                b2->q_lastyear  /= 1000.0f;
-                b2->q_lastmonth /= 1000.0f;
+                b2->q_total_m3     = b2->q_total     / 1000.0f;
+                b2->q_lastyear_m3  = b2->q_lastyear  / 1000.0f;
+                b2->q_lastmonth_m3 = b2->q_lastmonth / 1000.0f;
+                b2->q_mode = QDS_WW;
             }
             if (block1->A_DevType == 8) {
                 /* Heat Cost Allocator */
                 // Value factor is 1, e.g. 123456 m3
+                b2->q_mode = QDS_HCA;
             }
         }
     //    fprintf(stderr, "Instantaneous Value: %02x%02x : %f\n",b[9],b[10],((b[10]<<8)|b[9])*0.01);
@@ -940,9 +949,12 @@ static int m_bus_output_data(r_device *decoder, bitbuffer_t *bitbuffer, const m_
 //                "L",        "Length",       DATA_INT,       block1->L,
                 "data_length",  "Data Length",          DATA_INT,           out->length,
                 "data",     "Data",         DATA_STRING,    str_buf,
-                "Q_total",      "Q_total",      DATA_COND,  block1->block2.CI == 0x78,  DATA_FORMAT,    "%.3f m3",    DATA_DOUBLE,   block1->block2.q_total,
-                "Q_lastyear",   "Q_lastyear",   DATA_COND,  block1->block2.CI == 0x78,  DATA_FORMAT,    "%.3f m3",    DATA_DOUBLE,   block1->block2.q_lastyear,
-                "Q_lastmonth",  "Q_lastmonth",  DATA_COND,  block1->block2.CI == 0x78,  DATA_FORMAT,    "%.3f m3",    DATA_DOUBLE,   block1->block2.q_lastmonth,
+                "Q_total_m3",       "Q_total_m3",       DATA_COND,  block1->block2.q_mode == QDS_WW,    DATA_FORMAT,    "%.3f m3",    DATA_DOUBLE,   block1->block2.q_total_m3,
+                "Q_lastyear_m3",    "Q_lastyear_m3",    DATA_COND,  block1->block2.q_mode == QDS_WW,    DATA_FORMAT,    "%.3f m3",    DATA_DOUBLE,   block1->block2.q_lastyear_m3,
+                "Q_lastmonth_m3",   "Q_lastmonth_m3",   DATA_COND,  block1->block2.q_mode == QDS_WW,    DATA_FORMAT,    "%.3f m3",    DATA_DOUBLE,   block1->block2.q_lastmonth_m3,
+                "Q_total",          "Q_total",          DATA_COND,  block1->block2.q_mode == QDS_HCA,   DATA_DOUBLE,   block1->block2.q_total,
+                "Q_lastyear",       "Q_lastyear",       DATA_COND,  block1->block2.q_mode == QDS_HCA,   DATA_DOUBLE,   block1->block2.q_lastyear,
+                "Q_lastmonth",      "Q_lastmonth",      DATA_COND,  block1->block2.q_mode == QDS_HCA,   DATA_DOUBLE,   block1->block2.q_lastmonth,
                 "mic",      "Integrity",    DATA_STRING,    "CRC",
                 NULL);
         /* clang-format on */