rework #504 with simplify, unify naming scheme with already existing and add 'Stat' prefix, add StatEnergySumYear with input params

Author: john30

src/vaillant/b516_inc.tsp

@@ -7,98 +7,164 @@ namespace Vaillant;
 
 /** b516 energy statistics */
 namespace B516_inc {
+  @base(MF, 0x16, 0x10)
+  model rc {
+    // @out
+    // @values(Values_period)
+    // period: UCH;
+    // @out
+    // @constValue(0xffff)
+    // ign2: UIN;
+    /** the energy source */
+    @out
+    @values(Values_source)
+    source: UCH;
+
+    /** the energy usage */
+    @out
+    @values(Values_usage)
+    usage: UCH;
+  }
+
+  @inherit(rc)
+  @ext(
+    3, // period=year
+    0xff, 0xff // fix value
+  )
+  model StatEnergySumYear {
+    // according to #490 and #504:
+    // hex digits MDYY with M=month*2 (or 0 for year period), D=day of month (or 0 for year/month period), YY=year*2 since 2000 (or 0 for total)
+    // i.e. bits (rev): yyyyyyy mmmm ddddd
+    //  e.g. 0x3257 = 0b0011001 0010 10111 = 2025-02-23
+    //  e.g. 0x3180 = 0b0011000 1100 00000 = 2024-12-00
+    // @out
+    // date: UIN; // would require a new base datatype
+    @out
+    @constValue(0)
+    ign2: UCH; // ignored M+D for period=year
+
+    /** the year as offset from 2000 */
+    @out
+    @divisor(2)
+    year: UCH; // upper 7 bits of YY (with divisor)
 
-  model energye {
     @maxLength(7)
-    ign: IGN;
-    @unit("Wh")
-    energye: EXP;
+    ign: IGN; // repeats the query (more or less)
+
+    value: energye;
   }
 
-  @base(MF, 0x16, 0x10)
-  model r_1 {}
+  enum Values_period {
+    total: 0,
+    day: 1,
+    month: 2,
+    year: 3,
+  }
+
+  enum Values_source {
+    solar: 1,
+    environment: 2,
+    electricity: 3,
+    gas: 4,
+  }
+
+  enum Values_usage {
+    all: 0,
+    heat: 2,
+    water: 4,
+    cool: 5,
+  }
+
+  @base(MF, 0x16, 0x10,
+    0, // period=total
+    0xff, 0xff // fix value
+  )
+  model r {
+    @maxLength(7)
+    ign: IGN;
+  }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0x30)
-  model SolarSumSystem {
+  @inherit(r)
+  @ext(1, 0, 0, 0)
+  model StatSolarEnergySum {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x01, 0x03, 0x00, 0x30)
-  model SolarHeatingSystem {
+  @inherit(r)
+  @ext(1, 0x03, 0, 0)
+  model StatSolarEnergySumHc {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x01, 0x04, 0x00, 0x30)
-  model SolarHotWaterSystem {
+  @inherit(r)
+  @ext(1, 0x04, 0, 0)
+  model StatSolarEnergySumHwc {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x02, 0x00, 0x00, 0x30)
-  model EnvironmentalSumSystem {
+  @inherit(r)
+  @ext(0x02, 0, 0, 0)
+  model StatEnvironmentEnergySum {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x02, 0x03, 0x00, 0x30)
-  model EnvironmentalHeatingSystem {
+  @inherit(r)
+  @ext(0x02, 0x03, 0, 0)
+  model StatEnvironmentEnergySumHc {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x02, 0x04, 0x00, 0x30)
-  model EnvironmentalHotWaterSystem {
+  @inherit(r)
+  @ext(0x02, 0x04, 0, 0)
+  model StatEnvironmentEnergySumHwc {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x02, 0x05, 0x00, 0x30)
-  model EnvironmentalCoolingSystem {
+  @inherit(r)
+  @ext(0x02, 0x05, 0, 0)
+  model StatEnvironmentEnergySumCool {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x03, 0x00, 0x00, 0x30)
-  model ElectricalSumSystem {
+  @inherit(r)
+  @ext(0x03, 0, 0, 0)
+  model StatElectricEnergySum {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x03, 0x03, 0x00, 0x30)
-  model ElectricalHeatingSystem {
+  @inherit(r)
+  @ext(0x03, 0x03, 0, 0)
+  model StatElectricEnergySumHc {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x03, 0x04, 0x00, 0x30)
-  model ElectricalHotWaterSystem {
+  @inherit(r)
+  @ext(0x03, 0x04, 0, 0)
+  model StatElectricEnergySumHwc {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x03, 0x05, 0x00, 0x30)
-  model ElectricalCoolingSystem {
+  @inherit(r)
+  @ext(0x03, 0x05, 0, 0)
+  model StatElectricEnergySumCool {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x04, 0x00, 0x00, 0x30)
-  model FuelSumSystem {
+  @inherit(r)
+  @ext(0x04, 0, 0, 0)
+  model StatFuelSum {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x04, 0x03, 0x00, 0x30)
-  model FuelHeatingSystem {
+  @inherit(r)
+  @ext(0x04, 0x03, 0, 0)
+  model StatFuelSumHc {
     value: energye;
   }
 
-  @inherit(r_1)
-  @ext(0x00, 0xff, 0xff, 0x04, 0x04, 0x00, 0x30)
-  model FuelHotWaterSystem {
+  @inherit(r)
+  @ext(0x04, 0x04, 0, 0)
+  model StatFuelSumHwc {
     value: energye;
   }
 }