Merge branch 'merge504' into merge564

Author: john30

src/vaillant/08.bai.tsp

@@ -22,6 +22,7 @@ import "./bai.0010043897_inc.tsp";
 import "./bai.0010008045_inc.tsp";
 import "./errors_inc.tsp";
 import "./hcmode_inc.tsp";
+import "./b516_inc.tsp";
 using Ebus;
 using Ebus.Num;
 using Ebus.Dtm;
@@ -392,5 +393,6 @@ namespace Bai {
 
     Errors_inc,
     Hcmode_inc,
+    B516_inc,
   }
 }

src/vaillant/08.hmu.tsp

@@ -2,6 +2,7 @@ import "@ebusd/ebus-typespec";
 import "./_templates.tsp";
 import "./hcmode_inc.tsp";
 import "./errors_inc.tsp";
+import "./b516_inc.tsp";
 using Ebus;
 using Ebus.Num;
 using Ebus.Dtm;
@@ -1695,5 +1696,6 @@ namespace Hmu {
   union _includes {
     Hcmode_inc,
     Errors_inc,
+    B516_inc,
   }
 }

src/vaillant/15.720.tsp

@@ -1,5 +1,6 @@
 import "@ebusd/ebus-typespec";
 import "./_templates.tsp";
+import "./b516_inc.tsp";
 using Ebus;
 using Ebus.Num;
 using Ebus.Dtm;
@@ -63,50 +64,6 @@ namespace _720 {
     cleared: yesno;
   }
 
-  // Energy Stats
-
-  /** default *r */
-  @base(MF, 0x16, 0x10, 0, 0xff, 0xff)
-  model r_0c {
-    @maxLength(7)
-    ign: IGN;
-  }
-
-  /** EnergyStatsSolarSumSystem */
-  @inherit(r_0c)
-  @ext(0x1, 0, 0x21, 0x32)
-  @condition(_720.FM5Config.value, "<=2")
-  model EnergyStatsSolarSumSystem {
-    @unit("Wh")
-    value: EXP;
-  }
-
-  /** EnergyStatsSolarHeatingSystem */
-  @inherit(r_0c)
-  @ext(0x1, 0x3, 0x21, 0x32)
-  @condition(_720.FM5Config.value, "<=2")
-  model EnergyStatsSolarHeatingSystem {
-    @unit("Wh")
-    value: EXP;
-  }
-
-  /** EnergyStatsSolarHotWaterSystem */
-  @inherit(r_0c)
-  @ext(0x1, 0x4, 0x21, 0x32)
-  @condition(_720.FM5Config.value, "<=2")
-  model EnergyStatsSolarHotWaterSystem {
-    @unit("Wh")
-    value: EXP;
-  }
-
-  /** EnergyStatsElectricalSumSystem */
-  @inherit(r_0c)
-  @ext(0x3, 0, 0x21, 0x32)
-  model EnergyStatsElectricalSumSystem {
-    @unit("Wh")
-    value: EXP;
-  }
-
   /** default *r */
   @base(MF, 0x24, 0x2, 0, 0, 0)
   model r_1 {
@@ -3814,4 +3771,11 @@ namespace _720 {
     Ongoing: 1,
     Resolved: 2,
   }
+
+  // includes
+
+  /** included parts */
+  union _includes {
+    B516_inc,
+  }
 }

src/vaillant/26.vr_71.tsp

@@ -1,6 +1,7 @@
 import "@ebusd/ebus-typespec";
 import "./_templates.tsp";
 import "./errors_inc.tsp";
+import "./b516_inc.tsp";
 using Ebus;
 using Ebus.Num;
 using Ebus.Dtm;
@@ -139,5 +140,6 @@ namespace Vr_71 {
   /** included parts */
   union _includes {
     Errors_inc,
+    B516_inc,
   }
 }

src/vaillant/76.vwz.tsp

@@ -1,5 +1,6 @@
 import "@ebusd/ebus-typespec";
 import "./_templates.tsp";
+import "./b516_inc.tsp";
 using Ebus;
 using Ebus.Num;
 using Ebus.Dtm;
@@ -74,4 +75,9 @@ namespace Vwz {
     heating: 0,
     dhw: 1,
   }
+
+  /** included parts */
+  union _includes {
+    B516_inc,
+  }
 }

src/vaillant/b516_inc.tsp

@@ -0,0 +1,170 @@
+import "@ebusd/ebus-typespec";
+import "./_templates.tsp";
+using Ebus;
+using Ebus.Num;
+using Ebus.Str;
+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)
+
+    @maxLength(7)
+    ign: IGN; // repeats the query (more or less)
+
+    value: energye;
+  }
+
+  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)
+  @ext(1, 0, 0, 0)
+  model StatSolarEnergySum {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(1, 0x03, 0, 0)
+  model StatSolarEnergySumHc {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(1, 0x04, 0, 0)
+  model StatSolarEnergySumHwc {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(0x02, 0, 0, 0)
+  model StatEnvironmentEnergySum {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(0x02, 0x03, 0, 0)
+  model StatEnvironmentEnergySumHc {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(0x02, 0x04, 0, 0)
+  model StatEnvironmentEnergySumHwc {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(0x02, 0x05, 0, 0)
+  model StatEnvironmentEnergySumCool {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(0x03, 0, 0, 0)
+  model StatElectricEnergySum {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(0x03, 0x03, 0, 0)
+  model StatElectricEnergySumHc {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(0x03, 0x04, 0, 0)
+  model StatElectricEnergySumHwc {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(0x03, 0x05, 0, 0)
+  model StatElectricEnergySumCool {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(0x04, 0, 0, 0)
+  model StatFuelSum {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(0x04, 0x03, 0, 0)
+  model StatFuelSumHc {
+    value: energye;
+  }
+
+  @inherit(r)
+  @ext(0x04, 0x04, 0, 0)
+  model StatFuelSumHwc {
+    value: energye;
+  }
+}