From eb703cc884e2c3c565352ea2450181a97dd3684a Mon Sep 17 00:00:00 2001
From: burmistrzak <61958704+burmistrzak@users.noreply.github.com>
Date: Wed, 15 Jan 2025 23:12:37 +0000
Subject: [PATCH 1/7] Add baseline support for `08.hmu.HW5103`

---
 src/main.tsp                   |   1 +
 src/vaillant/08.hmu.HW5103.tsp | 335 +++++++++++++++++++++++++++++++++
 src/vaillant/_templates.tsp    |  60 ++++++
 3 files changed, 396 insertions(+)
 create mode 100644 src/vaillant/08.hmu.HW5103.tsp

diff --git a/src/main.tsp b/src/main.tsp
index b237fbe60..c04270a3f 100644
--- a/src/main.tsp
+++ b/src/main.tsp
@@ -9,6 +9,7 @@ import "./vaillant/06.vms.tsp";
 import "./vaillant/08.bai.tsp";
 import "./vaillant/08.ehp.tsp";
 import "./vaillant/08.hmu.tsp";
+import "./vaillant/08.hmu.HW5103.tsp";
 import "./vaillant/08.recov.tsp";
 import "./vaillant/08.v3x.tsp";
 import "./vaillant/0a.pmw.hwc.tsp";
diff --git a/src/vaillant/08.hmu.HW5103.tsp b/src/vaillant/08.hmu.HW5103.tsp
new file mode 100644
index 000000000..d9bf9e6b6
--- /dev/null
+++ b/src/vaillant/08.hmu.HW5103.tsp
@@ -0,0 +1,335 @@
+import "@ebusd/ebus-typespec";
+import "./_templates.tsp";
+using Ebus;
+using Ebus.Num;
+using Ebus.Dtm;
+using Ebus.Str;
+namespace Vaillant;
+
+// @zz(0x08)
+namespace Hmu.Hw5103 {
+  /** default *r */
+  @base(MF, 0x1a, 0x5, 0xff, 0x32)
+  model r_2 {
+    @maxLength(3)
+    value: IGN;
+  }
+
+  @inherit(r_2)
+  @ext(0)
+  model YieldHcDay {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_2)
+  @ext(1)
+  model YieldCoolDay {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_2)
+  @ext(0x2)
+  model YieldHwcDay {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_2)
+  @ext(0xe)
+  model YieldHcMonth {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_2)
+  @ext(0xf)
+  model CopHcMonth {
+    @divisor(10)
+    value: UIN;
+  }
+
+  @inherit(r_2)
+  @ext(0x10)
+  model YieldHc {
+    @unit("kWh")
+    value: energy;
+  }
+
+  @inherit(r_2)
+  @ext(0x11)
+  model CopHc {
+    @divisor(10)
+    value: UIN;
+  }
+
+  @inherit(r_2)
+  @ext(0x12)
+  model YieldHwcMonth {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_2)
+  @ext(0x13)
+  model CopHwcMonth {
+    @divisor(10)
+    value: UIN;
+  }
+
+  /** energy yield hot water */
+  @inherit(r_2)
+  @ext(0x16)
+  model YieldHwc {
+    value: energy4;
+  }
+
+  @inherit(r_2)
+  @ext(0x17)
+  model CopHwc {
+    @divisor(10)
+    value: UIN;
+  }
+
+  /** current energy integral */
+  @inherit(r_2)
+  @ext(0x21)
+  model EnergyIntegral {
+    value: integral;
+  }
+
+  /** current yielded energy from the environment */
+  @inherit(r_2)
+  @ext(0x23)
+  model CurrentYieldPower {
+    @unit("kW")
+    @divisor(10)
+    value: D1B;
+  }
+
+  /** current compressor utilization */
+  @inherit(r_2)
+  @ext(0x25)
+  model CurrentCompressorUtil {
+    @unit("%")
+    value: D1B;
+  }
+
+  @inherit(r_2)
+  @ext(0x3c)
+  model BuildingCircuitFlow {
+    @unit("l/h")
+    value: UIN;
+  }
+
+  @inherit(r_2)
+  @ext(0x3d)
+  model FlowPressure {
+    @unit("bar")
+    @divisor(4)
+    value: D2C;
+  }
+
+  @inherit(r_2)
+  @ext(0x4d)
+  model TotalEnergyUsage {
+    @unit("kWh")
+    value: energy;
+  }
+
+  /** default *r */
+  @base(MF, 0x9, 0x54, 0x2, 0)
+  model r_7 {
+    @maxLength(4)
+    value: IGN;
+  }
+
+  @inherit(r_7)
+  @ext(0xd, 0xa)
+  model CompressorSpeed {
+    @unit("rps")
+    value: EXP;
+  }
+
+  /** (EEV Position in different scale?) */
+  @inherit(r_7)
+  @ext(0x28, 0xa)
+  model EEVPositionAbs {
+    value: UIN;
+  }
+
+  @inherit(r_7)
+  @ext(0x47, 0xa)
+  model Fan1Speed {
+    @unit("rpm")
+    value: EXP;
+  }
+
+  @inherit(r_7)
+  @ext(0x49, 0xa)
+  model Fan2Speed {
+    @unit("rpm")
+    value: EXP;
+  }
+
+  @inherit(r_7)
+  @ext(0x53, 0xd)
+  model Statuscode {
+    value: hmucode;
+  }
+
+  @inherit(r_7)
+  @ext(0x5b, 0xd)
+  model ElectricPowerConsumption {
+    /** current electrical power consumption (Watt) */
+    @unit("W")
+    value: EXP;
+  }
+
+  @inherit(r_7)
+  @ext(0x6a, 0x9)
+  model HighPressure {
+    value: pressv;
+  }
+
+  @inherit(r_7)
+  @ext(0x98, 0x8)
+  model CompressorInletTemp {
+    value: tempv;
+  }
+
+  @inherit(r_7)
+  @ext(0xa2, 0x8)
+  model CompressorOutletTemp {
+    value: tempv;
+  }
+
+  @inherit(r_7)
+  @ext(0xac, 0x8)
+  model EEVOutletTemp {
+    value: tempv;
+  }
+
+  @inherit(r_7)
+  @ext(0xb8, 0xb)
+  model HMUHours {
+    value: hoursum2;
+  }
+
+  @inherit(r_7)
+  @ext(0xb9, 0xb)
+  model HcHours {
+    value: hoursum2;
+  }
+
+  @inherit(r_7)
+  @ext(0xbc, 0xb)
+  model HwcHours {
+    /** total runtime of Hwc mode */
+    value: hoursum2;
+  }
+
+  @inherit(r_7)
+  @ext(0xc2, 0xb)
+  model CompressorHours {
+    value: hoursum2;
+  }
+
+  @inherit(r_7)
+  @ext(0xc3, 0xb)
+  model CompressorStarts {
+    value: cntstarts2;
+  }
+
+  @inherit(r_7)
+  @ext(0xc4, 0xb)
+  model BuildingCircuitPumpHours {
+    value: hoursum2;
+  }
+
+  @inherit(r_7)
+  @ext(0xc5, 0x9)
+  model BuildingCircuitPumpPower {
+    @unit("%")
+    value: EXP;
+  }
+
+  @inherit(r_7)
+  @ext(0xc5, 0xb)
+  model BuildingCircuitPumpStarts {
+    /** total starts of building circuit pump */
+    value: cntstarts2;
+  }
+
+  @inherit(r_7)
+  @ext(0xc8, 0xb)
+  model FourPortValveHours {
+    value: hoursum2;
+  }
+
+  @inherit(r_7)
+  @ext(0xc9, 0xb)
+  model FourPortValveSwitches {
+    value: cntstarts2;
+  }
+
+  @inherit(r_7)
+  @ext(0xd7, 0xb)
+  model Fan1Hours {
+    value: hoursum2;
+  }
+
+  @inherit(r_7)
+  @ext(0xd8, 0xb)
+  model Fan1Starts {
+    value: cntstarts2;
+  }
+
+  @inherit(r_7)
+  @ext(0xd9, 0xb)
+  model Fan2Hours {
+    value: hoursum2;
+  }
+
+  @inherit(r_7)
+  @ext(0xda, 0xb)
+  model Fan2Starts {
+    value: cntstarts2;
+  }
+
+  @inherit(r_7)
+  @ext(0xde, 0x8)
+  model AirInletTemp {
+    value: tempv;
+  }
+
+  /** default *r */
+  @base(MF, 0x11)
+  model r_8 {}
+
+  /** compressor runtime in min and starts in Hc mode */
+  @inherit(r_8)
+  @ext(0x18, 1)
+  model CompressorRuntimeHc {
+    @maxLength(1) ign: IGN;
+    runtime: minutes4;
+    cycles: cntstarts;
+  }
+
+  /** compressor runtime in min and starts in Hwc mode */
+  @inherit(r_8)
+  @ext(0x18, 0x2)
+  model CompressorRuntimeHwc {
+    @maxLength(1) ign: IGN;
+    runtime: minutes4;
+    cycles: cntstarts;
+  }
+
+
+}
diff --git a/src/vaillant/_templates.tsp b/src/vaillant/_templates.tsp
index 2dcbc32f7..e13b214a0 100644
--- a/src/vaillant/_templates.tsp
+++ b/src/vaillant/_templates.tsp
@@ -470,6 +470,10 @@ model rTimeSlotWithoutTemp {
 @values(Values_appliancecode)
 scalar appliancecode extends UCH;
 
+/** HMU Status code */
+@values(Values_hmucode)
+scalar hmucode extends UIN;
+
 enum Values_daysel {
   selected: 0,
   Mo_Fr: 1,
@@ -730,6 +734,62 @@ enum Values_appliancecode {
   frost_protect: 34,
 }
 
+enum Values_hmucode {
+  frost_protect: 34,
+  standby: 100,
+  heat_compressor_shutdown: 101,
+  heat_compressor_blocked: 102,
+  heat_prerun: 103,
+  heat_compressor_active: 104,
+  heat_overrun: 107,
+  cool_compressor_shutdown: 111,
+  cool_compressor_blocked: 112,
+  cool_prerun: 113,
+  cool_compressor_active: 114,
+  cool_overrun: 117,
+  heat_immersion_heater_active: 125,
+  hwc_compressor_blocked: 132,
+  hwc_prerun: 133,
+  hwc_compressor_active: 134,
+  hwc_immersion_heater_active: 135,
+  hwc_overrun: 137,
+  heat_immersion_heater_shutdown: 141,
+  heat_immersion_heater_blocked: 142,
+  hwc_immersion_heater_shutdown: 151,
+  hwc_immersion_heater_blocked: 152,
+  air_purging_program_active: 202,
+  compressor_oil_heating_activated: 240,
+  fan1_blocked: 252,
+  fan1_airinlet_too_high: 255,
+  fan1_airinlet_too_low: 256,
+  fan2_blocked: 260,
+  building_circuit_flow_too_low: 275,
+  building_circuit_pump_fault: 277,
+  frequency_converter_fault_compressor: 280,
+  frequency_converter_fault_mains_voltage: 281,
+  frequency_converter_fault_overheating: 282,
+  deicing_time_too_long: 283,
+  deicing_flow_temperature_too_low: 284,
+  compressor_outlet_temperature_too_high: 285,
+  hot_gas_temperature_switch_open: 286,
+  fan1_wind: 287,
+  fan2_wind: 288,
+  current_limt_active: 289,
+  high_pressure_switch_open: 302,
+  compressor_outlet_temperature_too_high_1: 303,
+  evaporation_temperature_too_low: 304,
+  condensation_temperature_too_low: 305,
+  evaporation_temperature_too_high: 306,
+  condensation_temperature_too_high: 308,
+  building_circuit_return_temperature_too_low: 312,
+  building_circuit_return_temperature_too_high: 314,
+  immersion_heater_flow_temperature_too_high: 351,
+  deicing_active: 516,
+  frequency_converter_fault: 575,
+  connection_fault_frequency_converter: 581,
+  four_port_valve_position_fault: 590,
+}
+
 /** default *r for register */
 @base(MF, 0x9, 0xd)
 model r {}

From 47a453ef5b947684b156235667cd1284bf1bbcbf Mon Sep 17 00:00:00 2001
From: burmistrzak <61958704+burmistrzak@users.noreply.github.com>
Date: Fri, 17 Jan 2025 16:10:47 +0000
Subject: [PATCH 2/7] Import HW5103-specifc config

---
 src/main.tsp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main.tsp b/src/main.tsp
index c04270a3f..3e702669d 100644
--- a/src/main.tsp
+++ b/src/main.tsp
@@ -53,6 +53,8 @@ import "./vaillant/64.v65.tsp";
 import "./vaillant/75.rcc.tsp";
 import "./vaillant/75.v81.tsp";
 import "./vaillant/76.vwz.tsp";
+import "./vaillant/76.vwz.HW5103.tsp";
+import "./vaillant/76.vwzio.HW5103.tsp";
 import "./vaillant/84.zeo.tsp";
 import "./vaillant/a0.sol.hwc.tsp";
 import "./vaillant/a1.sol.cc.tsp";

From 0f1bc61dde9fda3337017c26685938f2674459ac Mon Sep 17 00:00:00 2001
From: burmistrzak <61958704+burmistrzak@users.noreply.github.com>
Date: Mon, 27 Jan 2025 15:27:26 +0000
Subject: [PATCH 3/7] Cleanup & add `b511`

---
 src/vaillant/08.hmu.HW5103.tsp | 479 ++++++++++++++++++++-------------
 1 file changed, 299 insertions(+), 180 deletions(-)

diff --git a/src/vaillant/08.hmu.HW5103.tsp b/src/vaillant/08.hmu.HW5103.tsp
index d9bf9e6b6..a304f6228 100644
--- a/src/vaillant/08.hmu.HW5103.tsp
+++ b/src/vaillant/08.hmu.HW5103.tsp
@@ -8,328 +8,447 @@ namespace Vaillant;
 
 // @zz(0x08)
 namespace Hmu.Hw5103 {
-  /** default *r */
-  @base(MF, 0x1a, 0x5, 0xff, 0x32)
-  model r_2 {
-    @maxLength(3)
-    value: IGN;
-  }
-
-  @inherit(r_2)
-  @ext(0)
-  model YieldHcDay {
-    @unit("kWh")
-    @divisor(10)
-    value: energy;
-  }
-
-  @inherit(r_2)
-  @ext(1)
-  model YieldCoolDay {
-    @unit("kWh")
-    @divisor(10)
-    value: energy;
-  }
-
-  @inherit(r_2)
-  @ext(0x2)
-  model YieldHwcDay {
-    @unit("kWh")
-    @divisor(10)
-    value: energy;
-  }
-
-  @inherit(r_2)
-  @ext(0xe)
-  model YieldHcMonth {
-    @unit("kWh")
-    @divisor(10)
-    value: energy;
-  }
-
-  @inherit(r_2)
-  @ext(0xf)
-  model CopHcMonth {
-    @divisor(10)
-    value: UIN;
-  }
-
-  @inherit(r_2)
-  @ext(0x10)
-  model YieldHc {
-    @unit("kWh")
-    value: energy;
-  }
-
-  @inherit(r_2)
-  @ext(0x11)
-  model CopHc {
-    @divisor(10)
-    value: UIN;
-  }
-
-  @inherit(r_2)
-  @ext(0x12)
-  model YieldHwcMonth {
-    @unit("kWh")
-    @divisor(10)
-    value: energy;
-  }
-
-  @inherit(r_2)
-  @ext(0x13)
-  model CopHwcMonth {
-    @divisor(10)
-    value: UIN;
-  }
-
-  /** energy yield hot water */
-  @inherit(r_2)
-  @ext(0x16)
-  model YieldHwc {
-    value: energy4;
-  }
-
-  @inherit(r_2)
-  @ext(0x17)
-  model CopHwc {
-    @divisor(10)
-    value: UIN;
-  }
-
-  /** current energy integral */
-  @inherit(r_2)
-  @ext(0x21)
-  model EnergyIntegral {
-    value: integral;
-  }
-
-  /** current yielded energy from the environment */
-  @inherit(r_2)
-  @ext(0x23)
-  model CurrentYieldPower {
-    @unit("kW")
-    @divisor(10)
-    value: D1B;
-  }
-
-  /** current compressor utilization */
-  @inherit(r_2)
-  @ext(0x25)
-  model CurrentCompressorUtil {
-    @unit("%")
-    value: D1B;
-  }
-
-  @inherit(r_2)
-  @ext(0x3c)
-  model BuildingCircuitFlow {
-    @unit("l/h")
-    value: UIN;
-  }
-
-  @inherit(r_2)
-  @ext(0x3d)
-  model FlowPressure {
-    @unit("bar")
-    @divisor(4)
-    value: D2C;
-  }
-
-  @inherit(r_2)
-  @ext(0x4d)
-  model TotalEnergyUsage {
-    @unit("kWh")
-    value: energy;
-  }
-
+  // B509
   /** default *r */
   @base(MF, 0x9, 0x54, 0x2, 0)
-  model r_7 {
+  model r_0 {
     @maxLength(4)
     value: IGN;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xd, 0xa)
   model CompressorSpeed {
     @unit("rps")
     value: EXP;
   }
 
-  /** (EEV Position in different scale?) */
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0x28, 0xa)
-  model EEVPositionAbs {
+  model EevPositionAbs {
     value: UIN;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0x47, 0xa)
   model Fan1Speed {
     @unit("rpm")
     value: EXP;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0x49, 0xa)
   model Fan2Speed {
     @unit("rpm")
     value: EXP;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0x53, 0xd)
   model Statuscode {
     value: hmucode;
   }
 
-  @inherit(r_7)
+/**
+  @inherit(r_0)
   @ext(0x5b, 0xd)
   model ElectricPowerConsumption {
-    /** current electrical power consumption (Watt) */
     @unit("W")
     value: EXP;
   }
+*/
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0x6a, 0x9)
   model HighPressure {
     value: pressv;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0x98, 0x8)
   model CompressorInletTemp {
     value: tempv;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xa2, 0x8)
   model CompressorOutletTemp {
     value: tempv;
   }
 
-  @inherit(r_7)
+/**
+  @inherit(r_0)
+  @ext(0xa6, 0xe)
+  model DiagFlowTemp {
+    value: tempv;
+  }
+
+  @inherit(r_0)
+  @ext(0xa7, 0xe)
+  model DiagEvaporationTemp {
+    value: tempv;
+  }
+
+  @inherit(r_0)
+  @ext(0xa9, 0xe)
+  model DiagOverheatingActualValue {
+    value: tempv;
+  }
+*/
+
+  @inherit(r_0)
   @ext(0xac, 0x8)
-  model EEVOutletTemp {
+  model EevOutletTemp {
     value: tempv;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xb8, 0xb)
-  model HMUHours {
+  model HmuHours {
     value: hoursum2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xb9, 0xb)
-  model HcHours {
+  model HeatingHours {
     value: hoursum2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xbc, 0xb)
-  model HwcHours {
-    /** total runtime of Hwc mode */
+  model WaterHours {
     value: hoursum2;
   }
 
-  @inherit(r_7)
+/**
+  @inherit(r_0)
+  @ext(0xbd, 0x9)
+  model DiagWaterThroughput {
+    @unit("l/h")
+    value: EXP;
+  }
+*/
+
+  @inherit(r_0)
   @ext(0xc2, 0xb)
   model CompressorHours {
     value: hoursum2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xc3, 0xb)
   model CompressorStarts {
     value: cntstarts2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xc4, 0xb)
-  model BuildingCircuitPumpHours {
+  model BuildingPumpHours {
     value: hoursum2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xc5, 0x9)
-  model BuildingCircuitPumpPower {
+  model BuildingPumpPower {
     @unit("%")
     value: EXP;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xc5, 0xb)
-  model BuildingCircuitPumpStarts {
-    /** total starts of building circuit pump */
+  model BuildingPumpStarts {
     value: cntstarts2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xc8, 0xb)
   model FourPortValveHours {
     value: hoursum2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xc9, 0xb)
   model FourPortValveSwitches {
     value: cntstarts2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xd7, 0xb)
   model Fan1Hours {
     value: hoursum2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xd8, 0xb)
   model Fan1Starts {
     value: cntstarts2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xd9, 0xb)
   model Fan2Hours {
     value: hoursum2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xda, 0xb)
   model Fan2Starts {
     value: cntstarts2;
   }
 
-  @inherit(r_7)
+  @inherit(r_0)
   @ext(0xde, 0x8)
   model AirInletTemp {
     value: tempv;
   }
 
+  // B511
   /** default *r */
   @base(MF, 0x11)
-  model r_8 {}
+  model r_1 {}
 
-  /** compressor runtime in min and starts in Hc mode */
-  @inherit(r_8)
+  @inherit(r_1)
+  @ext(1)
+  model Status {
+    supplytemp: temp1;
+    returntemp: temp1;
+    @maxLength(4) ign: IGN;
+    pumpstate: pumpstate;
+  }
+
+  @condition(Id.Id.sw, ">=902")
+  @inherit(r_1)
   @ext(0x18, 1)
-  model CompressorRuntimeHc {
+  model CompressorHeating {
     @maxLength(1) ign: IGN;
     runtime: minutes4;
     cycles: cntstarts;
   }
 
-  /** compressor runtime in min and starts in Hwc mode */
-  @inherit(r_8)
+  @condition(Id.Id.sw, ">=902")
+  @inherit(r_1)
   @ext(0x18, 0x2)
-  model CompressorRuntimeHwc {
+  model CompressorWater {
     @maxLength(1) ign: IGN;
     runtime: minutes4;
     cycles: cntstarts;
   }
 
+  // B516
+  /** default *r */
+  @base(MF, 0x16)
+  model r_2 {
+    @maxLength(1)
+    value: IGN;
+  }
+
+  @inherit(r_2)
+  @ext(0x14)
+  model CurrentPowerConsumption {
+    @unit("W")
+    value: EXP;
+  }
+
+  // B51A FF32xx
+  /** default *r */
+  @base(MF, 0x1a, 0x5, 0xff, 0x32)
+  model r_3 {
+    @maxLength(3)
+    value: IGN;
+  }
+
+  @inherit(r_3)
+  @ext(0)
+  model YieldHeatingDay {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_3)
+  @ext(1)
+  model YieldCoolingDay {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_3)
+  @ext(0x2)
+  model YieldWaterDay {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_3)
+  @ext(0xe)
+  model YieldHeatingMonth {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_3)
+  @ext(0xf)
+  model CopHeatingMonth {
+    @divisor(10)
+    value: UIN;
+  }
+
+  @inherit(r_3)
+  @ext(0x10)
+  model YieldHeating {
+    @unit("kWh")
+    value: energy;
+  }
+
+  @inherit(r_3)
+  @ext(0x11)
+  model CopHeating {
+    @divisor(10)
+    value: UIN;
+  }
 
+  @inherit(r_3)
+  @ext(0x12)
+  model YieldWaterMonth {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_3)
+  @ext(0x13)
+  model CopWaterMonth {
+    @divisor(10)
+    value: UIN;
+  }
+
+  @inherit(r_3)
+  @ext(0x16)
+  model YieldWater {
+    value: energy;
+  }
+
+  @inherit(r_3)
+  @ext(0x17)
+  model CopWater {
+    @divisor(10)
+    value: UIN;
+  }
+
+  @inherit(r_3)
+  @ext(0x1e)
+  model CompressorBlocktime {
+    @unit("min")
+    value: UIN;
+  }
+
+  @inherit(r_3)
+  @ext(0x1f)
+  model SupplyTempWeighted {
+    @unit("°C")
+    @divisor(10)
+    value: D2C;
+  }
+
+  @inherit(r_3)
+  @ext(0x20)
+  model FlowTemp {
+    @unit("°C")
+    value: D2C;
+  }
+
+  @inherit(r_3)
+  @ext(0x21)
+  model EnergyIntegral {
+    value: integral;
+  }
+
+/**
+  @inherit(r_3)
+  @ext(0x22)
+  model SourceTempInput {
+    @unit("°C")
+    value: D2C;
+  }
+*/
+
+  @inherit(r_3)
+  @ext(0x23)
+  model CurrentYieldPower {
+    @unit("kW")
+    @divisor(10)
+    value: D1B;
+  }
+
+  @inherit(r_3)
+  @ext(0x24)
+  model CurrentConsumedPower {
+    @unit("kW")
+    @divisor(10)
+    value: D1B;
+  }
+
+  @inherit(r_3)
+  @ext(0x25)
+  model CompressorModulation {
+    @unit("%")
+    value: D2C;
+  }
+
+  @inherit(r_3)
+  @ext(0x2A)
+  model YieldCoolingMonth {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_3)
+  @ext(0x2B)
+  model CopCoolingMonth {
+    @divisor(10)
+    value: UIN;
+  }
+
+  @inherit(r_3)
+  @ext(0x2C)
+  model YieldCooling {
+    @unit("kWh")
+    @divisor(10)
+    value: energy;
+  }
+
+  @inherit(r_3)
+  @ext(0x2D)
+  model CopCooling {
+    @divisor(10)
+    value: UIN;
+  }
+
+
+  @inherit(r_3)
+  @ext(0x3c)
+  model WaterThroughput {
+    @unit("l/h")
+    value: UIN;
+  }
+
+  @condition(Id.Id.sw, ">=902")
+  @inherit(r_3)
+  @ext(0x3d)
+  model FlowPressure {
+    @unit("bar")
+    @divisor(4)
+    value: D2C;
+  }
+
+  @inherit(r_3)
+  @ext(0x4d)
+  model TotalEnergyUsage {
+    @unit("kWh")
+    value: energy;
+  }
 }

From 6e080bb1e2bbcb51685b3e45c275d4c8db7c3924 Mon Sep 17 00:00:00 2001
From: burmistrzak <61958704+burmistrzak@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:58:19 +0000
Subject: [PATCH 4/7] Remove unused imports

---
 src/main.tsp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main.tsp b/src/main.tsp
index 3e702669d..c04270a3f 100644
--- a/src/main.tsp
+++ b/src/main.tsp
@@ -53,8 +53,6 @@ import "./vaillant/64.v65.tsp";
 import "./vaillant/75.rcc.tsp";
 import "./vaillant/75.v81.tsp";
 import "./vaillant/76.vwz.tsp";
-import "./vaillant/76.vwz.HW5103.tsp";
-import "./vaillant/76.vwzio.HW5103.tsp";
 import "./vaillant/84.zeo.tsp";
 import "./vaillant/a0.sol.hwc.tsp";
 import "./vaillant/a1.sol.cc.tsp";

From ba1ae8905bb1236f62e92152c4bec62ae1087014 Mon Sep 17 00:00:00 2001
From: burmistrzak <61958704+burmistrzak@users.noreply.github.com>
Date: Mon, 27 Jan 2025 17:24:14 +0000
Subject: [PATCH 5/7] Rename water to DHW

---
 src/vaillant/08.hmu.HW5103.tsp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/vaillant/08.hmu.HW5103.tsp b/src/vaillant/08.hmu.HW5103.tsp
index a304f6228..cfb3b4e6c 100644
--- a/src/vaillant/08.hmu.HW5103.tsp
+++ b/src/vaillant/08.hmu.HW5103.tsp
@@ -116,7 +116,7 @@ namespace Hmu.Hw5103 {
 
   @inherit(r_0)
   @ext(0xbc, 0xb)
-  model WaterHours {
+  model DhwHours {
     value: hoursum2;
   }
 
@@ -228,7 +228,7 @@ namespace Hmu.Hw5103 {
   @condition(Id.Id.sw, ">=902")
   @inherit(r_1)
   @ext(0x18, 0x2)
-  model CompressorWater {
+  model CompressorDhw {
     @maxLength(1) ign: IGN;
     runtime: minutes4;
     cycles: cntstarts;
@@ -275,7 +275,7 @@ namespace Hmu.Hw5103 {
 
   @inherit(r_3)
   @ext(0x2)
-  model YieldWaterDay {
+  model YieldDhwDay {
     @unit("kWh")
     @divisor(10)
     value: energy;
@@ -312,7 +312,7 @@ namespace Hmu.Hw5103 {
 
   @inherit(r_3)
   @ext(0x12)
-  model YieldWaterMonth {
+  model YieldDhwMonth {
     @unit("kWh")
     @divisor(10)
     value: energy;
@@ -320,20 +320,20 @@ namespace Hmu.Hw5103 {
 
   @inherit(r_3)
   @ext(0x13)
-  model CopWaterMonth {
+  model CopDhwMonth {
     @divisor(10)
     value: UIN;
   }
 
   @inherit(r_3)
   @ext(0x16)
-  model YieldWater {
+  model YieldDhw {
     value: energy;
   }
 
   @inherit(r_3)
   @ext(0x17)
-  model CopWater {
+  model CopDhw {
     @divisor(10)
     value: UIN;
   }

From 709e72a5fe17d14851891c215e7cdfd761afcdcf Mon Sep 17 00:00:00 2001
From: burmistrzak <61958704+burmistrzak@users.noreply.github.com>
Date: Wed, 29 Jan 2025 00:51:53 +0000
Subject: [PATCH 6/7] Rename DHW registers

---
 src/vaillant/08.hmu.HW5103.tsp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/vaillant/08.hmu.HW5103.tsp b/src/vaillant/08.hmu.HW5103.tsp
index cfb3b4e6c..9d6fadca2 100644
--- a/src/vaillant/08.hmu.HW5103.tsp
+++ b/src/vaillant/08.hmu.HW5103.tsp
@@ -116,7 +116,7 @@ namespace Hmu.Hw5103 {
 
   @inherit(r_0)
   @ext(0xbc, 0xb)
-  model DhwHours {
+  model HwcHours {
     value: hoursum2;
   }
 
@@ -228,7 +228,7 @@ namespace Hmu.Hw5103 {
   @condition(Id.Id.sw, ">=902")
   @inherit(r_1)
   @ext(0x18, 0x2)
-  model CompressorDhw {
+  model CompressorHwc {
     @maxLength(1) ign: IGN;
     runtime: minutes4;
     cycles: cntstarts;
@@ -244,7 +244,7 @@ namespace Hmu.Hw5103 {
 
   @inherit(r_2)
   @ext(0x14)
-  model CurrentPowerConsumption {
+  model HmuPowerConsumption {
     @unit("W")
     value: EXP;
   }
@@ -275,7 +275,7 @@ namespace Hmu.Hw5103 {
 
   @inherit(r_3)
   @ext(0x2)
-  model YieldDhwDay {
+  model YieldHwcDay {
     @unit("kWh")
     @divisor(10)
     value: energy;
@@ -312,7 +312,7 @@ namespace Hmu.Hw5103 {
 
   @inherit(r_3)
   @ext(0x12)
-  model YieldDhwMonth {
+  model YieldHwcMonth {
     @unit("kWh")
     @divisor(10)
     value: energy;
@@ -320,20 +320,20 @@ namespace Hmu.Hw5103 {
 
   @inherit(r_3)
   @ext(0x13)
-  model CopDhwMonth {
+  model CopHwcMonth {
     @divisor(10)
     value: UIN;
   }
 
   @inherit(r_3)
   @ext(0x16)
-  model YieldDhw {
+  model YieldHwc {
     value: energy;
   }
 
   @inherit(r_3)
   @ext(0x17)
-  model CopDhw {
+  model CopHwc {
     @divisor(10)
     value: UIN;
   }

From cd3da821dc5594cc2705aa4a47ced7fe597f0df0 Mon Sep 17 00:00:00 2001
From: burmistrzak <61958704+burmistrzak@users.noreply.github.com>
Date: Wed, 29 Jan 2025 04:10:13 +0000
Subject: [PATCH 7/7] Rename various registers

---
 src/vaillant/08.hmu.HW5103.tsp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/vaillant/08.hmu.HW5103.tsp b/src/vaillant/08.hmu.HW5103.tsp
index 9d6fadca2..e06eda2a3 100644
--- a/src/vaillant/08.hmu.HW5103.tsp
+++ b/src/vaillant/08.hmu.HW5103.tsp
@@ -104,19 +104,19 @@ namespace Hmu.Hw5103 {
 
   @inherit(r_0)
   @ext(0xb8, 0xb)
-  model HmuHours {
+  model HoursTotal {
     value: hoursum2;
   }
 
   @inherit(r_0)
   @ext(0xb9, 0xb)
-  model HeatingHours {
+  model HoursHeating {
     value: hoursum2;
   }
 
   @inherit(r_0)
   @ext(0xbc, 0xb)
-  model HwcHours {
+  model HoursHwc {
     value: hoursum2;
   }
 
@@ -219,7 +219,7 @@ namespace Hmu.Hw5103 {
   @condition(Id.Id.sw, ">=902")
   @inherit(r_1)
   @ext(0x18, 1)
-  model CompressorHeating {
+  model CompressorHc {
     @maxLength(1) ign: IGN;
     runtime: minutes4;
     cycles: cntstarts;
@@ -244,7 +244,7 @@ namespace Hmu.Hw5103 {
 
   @inherit(r_2)
   @ext(0x14)
-  model HmuPowerConsumption {
+  model PowerConsumptionHmu {
     @unit("W")
     value: EXP;
   }