fix several unit mismatches (including those found by micro-ebusd conversion), add some templates+messages

Author: john30

src/vaillant/08.ehp.tsp

@@ -383,11 +383,11 @@ namespace Ehp {
 
   /** DhwLaggingTime: Backup heater use for CH */
   @ext(0x61, 0)
-  model HwcLaggingTime is ReadonlyRegister<UCH>;
+  model HwcLaggingTime is ReadonlyRegister<minutes0>;
 
   /** DhwLoadingDelay: Backup heater use for DHW */
   @ext(0x62, 0)
-  model HwcLoadingDelay is ReadonlyRegister<UCH>;
+  model HwcLoadingDelay is ReadonlyRegister<minutes0>;
 
   /** Brine_Fan_Hours: operating hours of Fan_Brine */
   @ext(0x9d, 0)

src/vaillant/08.hmu.HW5103.tsp

@@ -253,15 +253,13 @@ namespace Hmu_HW5103 {
   @inherit(r_7)
   @ext(0x47, 0xa)
   model RunDataFan1Speed {
-    @unit("rpm")
-    value: EXP;
+    value: fanspeedv;
   }
 
   @inherit(r_7)
   @ext(0x49, 0xa)
   model RunDataFan2Speed {
-    @unit("rpm")
-    value: EXP;
+    value: fanspeedv;
   }
 
   @inherit(r_7)

src/vaillant/08.hmu.tsp

@@ -1445,15 +1445,13 @@ namespace Hmu {
   @inherit(r_7)
   @ext(0x47, 0xa)
   model RunDataFan1Speed {
-    @unit("rpm")
-    value: EXP;
+    value: fanspeedv;
   }
 
   @inherit(r_7)
   @ext(0x49, 0xa)
   model RunDataFan2Speed {
-    @unit("rpm")
-    value: EXP;
+    value: fanspeedv;
   }
 
   @inherit(r_7)

src/vaillant/08.recov.tsp

@@ -106,12 +106,8 @@ namespace Recov {
   model ExhaustAirDisbalance is Register<percents>;
 
   /** Nominal flow NL */
-  @inherit(r, w)
   @ext(0x1c, 0xe)
-  model NominalFlow {
-    @unit("m3/h")
-    value: UIN;
-  }
+  model NominalFlow is Register<airflowrate>;
 
   /** Reduced ventilation to NL */
   @ext(0x1d, 0xe)
@@ -182,53 +178,29 @@ namespace Recov {
   model MaxAirHumidity is Register<percent0>;
 
   /** Supply air speed */
-  @inherit(r)
   @ext(1, 0xe)
-  model SupplyAirSpeed {
-    @unit("rpm")
-    value: UIN;
-  }
+  model SupplyAirSpeed is ReadonlyRegister<fanspeed>;
 
   /** Exhaust air speed */
-  @inherit(r)
   @ext(0x2, 0xe)
-  model ExhaustAirSpeed {
-    @unit("rpm")
-    value: UIN;
-  }
+  model ExhaustAirSpeed is ReadonlyRegister<fanspeed>;
 
   /** Supply air internal actual flow */
-  @inherit(r, u)
   @poll(2)
   @ext(0x3, 0xe)
-  model SupplyFlowActual {
-    @unit("m3/h")
-    value: UIN;
-  }
+  model SupplyFlowActual is ReadonlyUpdateRegister<airflowrate>;
 
   /** Supply air internal target flow */
-  @inherit(r)
   @ext(0x4, 0xe)
-  model SupplyFlowTarget {
-    @unit("m3/h")
-    value: UIN;
-  }
+  model SupplyFlowTarget is ReadonlyRegister<airflowrate>; //todo no measurement
 
   /** Exhaust air internal actual flow */
-  @inherit(r)
   @ext(0x5, 0xe)
-  model ExhaustFlowActual {
-    @unit("m3/h")
-    value: UIN;
-  }
+  model ExhaustFlowActual is ReadonlyRegister<airflowrate>;
 
   /** Exhaust air internal target flow */
-  @inherit(r)
   @ext(0x6, 0xe)
-  model ExhaustFlowTarget {
-    @unit("m3/h")
-    value: UIN;
-  }
+  model ExhaustFlowTarget is ReadonlyRegister<airflowrate>;
 
   /** Ventilation stage */
   @inherit(r, w)

src/vaillant/0a.pmw.hwc.tsp

@@ -79,9 +79,8 @@ namespace Pmw.Hwc {
   @inherit(r)
   @ext(0x10, 0)
   model LegioStartDay {
-    /** 0=Monday, 1=Tue, … 6=Sunday, 7=LegioProtect off, 8=every day */
-    @minValue(0)
-    @maxValue(8)
+    /** Start day for legio protection */
+    @values(Values_LegioStartDay)
     value: UCH;
   }
 
@@ -354,6 +353,18 @@ namespace Pmw.Hwc {
     }
   }
 
+  enum Values_LegioStartDay {
+    Mon: 0,
+    Tue: 1,
+    Wed: 2,
+    Thu: 3,
+    Fri: 4,
+    Sat: 5,
+    Sun: 6,
+    off: 7,
+    Mon_Sun: 8,
+  }
+
   /** included parts */
   union _includes {
     Hwcmode_inc,

src/vaillant/15.350.tsp

@@ -60,17 +60,17 @@ namespace _350 {
   model BypassValve is InstallRegister<onoff>;
 
   @ext(0x10, 0)
-  model RoomTempOffsetSelfWarming is InstallRegister<temp>;
+  model RoomTempOffsetSelfWarming is InstallRegister<calibration>;
 
   @ext(0x11, 0)
-  model RoomTempOffset is InstallRegister<temp>;
+  model RoomTempOffset is InstallRegister<calibration>;
 
   /** act. outside temperature [°C/sensor state] */
   @ext(0x12, 0)
   model OutsideTemp is InstallRegister<tempsensor>;
 
   @ext(0x13, 0)
-  model OutsideTempOffset is InstallRegister<temp>;
+  model OutsideTempOffset is InstallRegister<calibration>;
 
   @ext(0x14, 0)
   model ActualTempDesired is InstallRegister<temp0>;
@@ -145,7 +145,7 @@ namespace _350 {
   model DcfDaten is InstallRegister<UIN>;
 
   @ext(0x28, 0)
-  model IsInHoliday is InstallRegister<UCH>;
+  model IsInHoliday is InstallRegister<onoff>;
 
   @ext(0x29, 0)
   model IsInParty is InstallRegister<onoff>;
@@ -219,7 +219,7 @@ namespace _350 {
   }
 
   @ext(0x3c, 0)
-  model FrostProtectDelay is InstallRegister<UCH>;
+  model FrostProtectDelay is InstallRegister<hours>;
 
   @ext(0x3d, 0)
   model HydraulicScheme is InstallRegister<UCH>;
@@ -255,9 +255,9 @@ namespace _350 {
   @ext(0x46, 0)
   model LoadingDelayEnabled is InstallRegister<onoff>;
 
-  /** Solar flow rate [l/h] */
+  /** Solar flow rate */
   @ext(0x47, 0)
-  model SolFlowRate is InstallRegister<UIN>;
+  model SolFlowRate is InstallRegister<flowrate>;
 
   @ext(0x48, 0)
   model EDControlEnabled is InstallRegister<onoff>;
@@ -287,7 +287,7 @@ namespace _350 {
   model FlowTempMin is InstallRegister<temp>;
 
   @ext(0x51, 0)
-  model DisableAutoSync is InstallRegister<UCH>;
+  model DisableAutoSync is InstallRegister<onoff>;
 
   @ext(0x52, 0)
   model ONMINDiff is InstallRegister<UCH>;
@@ -302,7 +302,7 @@ namespace _350 {
   model EBUSFifoDiffCntMax is InstallRegister<UCH>;
 
   @ext(0x56, 0)
-  model TwoPointAnalogCtrl is InstallRegister<UCH>;
+  model TwoPointAnalogCtrl is InstallRegister<twopointanalog>;
 
   /** Actual roomtemperature setpoint [°C] */
   @ext(0x57, 0)

src/vaillant/15.370.tsp

@@ -148,7 +148,7 @@ namespace _370 {
 
   /** RaumTempOffsetEigenErwaerm: room temperature intrinsic heating offset */
   @ext(0x15, 0)
-  model RoomTempOffsetSelfWarming is ReadonlyRegister<temp>;
+  model RoomTempOffsetSelfWarming is ReadonlyRegister<calibration>;
 
   /** HC1_2stepanalogCtrl */
   @inherit(r, wi)
@@ -258,17 +258,17 @@ namespace _370 {
   @ext(0xb, 0)
   model TestVarActivateFunction is ReadonlyRegister<UCH>;
 
-  /** DHW_OPMode: operation mode of the domestic hot water circuit set implicitly (0 = off, 1 = on, 2 = auto, 3 = auto sunday, 4 = party, 6 = one time tank loading, 7 = holiday) */
+  /** DHW_OPMode: operation mode of the domestic hot water circuit */
   @ext(0x42, 0)
-  model HwcOPMode is ReadonlyRegister<UCH>;
+  model HwcOPMode is ReadonlyRegister<hwcmode7>;
 
   /** BMUB51101_DHWState: flame is on because of either tapping or tank loading */
   @ext(0x75, 0)
-  model BMUB51101HwcState is ReadonlyRegister<UCH>;
+  model BMUB51101HwcState is ReadonlyRegister<onoff>;
 
   /** B51000SetPointLoadingPump: loading pump's setpoint sent via B5 10 00 to the BMU */
   @ext(0x7b, 0)
-  model B51000TempDesiredLoadingPump is ReadonlyRegister<D1C>;
+  model B51000TempDesiredLoadingPump is ReadonlyRegister<temp1>;
 
   /** BMUB51101_BoilerFlowTemp: current flow temperature inside the BMU */
   @ext(0x77, 0)

src/vaillant/15.392.tsp

@@ -103,14 +103,9 @@ namespace _392 {
   @ext(0x12, 0)
   model HolidayEndPeriod is Register<date>;
 
-  /** DHW_OPMode */
-  @inherit(r, w)
+  /** DHW_OPMode: operation mode of the domestic hot water circuit */
   @ext(0x42, 0)
-  model HwcOPMode {
-    /** operation mode of the domestic hot water circuit */
-    @values(Values_HwcOPMode)
-    value: UCH;
-  }
+  model HwcOPMode is Register<hwcmode7>;
 
   /** DHW_DesiredTemp: setpoint of domestic hot water circuit */
   @ext(0x44, 0)
@@ -219,7 +214,7 @@ namespace _392 {
 
   /** RaumTempOffsetEigenErwaerm: room temperature intrinsic heating offset */
   @ext(0x15, 0)
-  model RoomTempOffsetSelfWarming is ReadonlyRegister<temp>;
+  model RoomTempOffsetSelfWarming is ReadonlyRegister<calibration>;
 
   /** CountryVariant: country variant (0 = west, 1 = east) */
   @ext(0x17, 0)
@@ -275,12 +270,6 @@ namespace _392 {
     auto: 2,
   }
 
-  enum Values_HwcOPMode {
-    off: 0,
-    manual: 1,
-    auto: 2,
-  }
-
   enum Values_Hc12stepanalogCtrl {
     two_point_control: 0,
     analogue_control: 1,

src/vaillant/15.430.tsp

@@ -116,14 +116,9 @@ namespace _430 {
   @ext(0x12, 0)
   model HolidayEndPeriod is Register<date>;
 
-  /** DHW_OPMode */
-  @inherit(r, w)
+  /** DHW_OPMode: operation mode of the domestic hot water circuit */
   @ext(0x42, 0)
-  model HwcOPMode {
-    /** operation mode of the domestic hot water circuit */
-    @values(Values_HwcOPMode)
-    value: UCH;
-  }
+  model HwcOPMode is Register<hwcmode7>;
 
   /** DHW_DesiredTemp: setpoint of domestic hot water circuit */
   @ext(0x44, 0)
@@ -241,7 +236,7 @@ namespace _430 {
 
   /** ContinuosHeating: -26=off, when the outside temperature falls below this threshold temperature the continuous heating function is started (off <=> function is disabled) */
   @ext(0x4f, 0)
-  model ContinuosHeating is InstallRegister<SCH>;
+  model ContinuosHeating is InstallRegister<temps>;
 
   /** PreheatingTime: in steps of 10, maximum time of enabling the heating before the heating time window starts */
   @ext(0x50, 0)
@@ -329,7 +324,7 @@ namespace _430 {
 
   /** RaumTempOffsetEigenErwaerm: room temperature intrinsic heating offset */
   @ext(0x15, 0)
-  model RoomTempOffsetSelfWarming is ReadonlyRegister<temp>;
+  model RoomTempOffsetSelfWarming is ReadonlyRegister<calibration>;
 
   /** CountryVariant: country variant (0 = west, 1 = east) */
   @ext(0x17, 0)
@@ -385,7 +380,7 @@ namespace _430 {
 
   /** B51000SetPointLoadingPump: loading pump's setpoint sent via B5 10 00 to the BMU */
   @ext(0x7b, 0)
-  model B51000TempDesiredLoadingPump is ReadonlyRegister<D1C>;
+  model B51000TempDesiredLoadingPump is ReadonlyRegister<temp1>;
 
   /** BKMK1CPLPState: nominal condition of the VR61's circulation or loading pump */
   @ext(0x7f, 0)
@@ -498,12 +493,6 @@ namespace _430 {
     auto: 2,
   }
 
-  enum Values_HwcOPMode {
-    off: 0,
-    manual: 1,
-    auto: 2,
-  }
-
   enum Values_BaseDisplay {
     off: 0,
     HC1: 1,

src/vaillant/15.470.tsp

@@ -188,7 +188,7 @@ namespace _470 {
 
   /** RaumTempOffsetEigenErwaerm: room temperature intrinsic heating offset */
   @ext(0x15, 0)
-  model RoomTempOffsetSelfWarming is ReadonlyRegister<temp>;
+  model RoomTempOffsetSelfWarming is ReadonlyRegister<calibration>;
 
   /** OpModeEffect */
   @inherit(r, wi)
@@ -319,7 +319,7 @@ namespace _470 {
 
   /** ContinuosHeating: -26=off, when the outside temperature falls below this threshold temperature the continuous heating function is started (off <=> function is disabled) */
   @ext(0x4f, 0)
-  model ContinuosHeating is InstallRegister<SCH>;
+  model ContinuosHeating is InstallRegister<temps>;
 
   /** PreheatingTime: in steps of 10, maximum time of enabling the heating before the heating time window starts */
   @ext(0x50, 0)
@@ -432,22 +432,17 @@ namespace _470 {
   @ext(0xb, 0)
   model TestVarActivateFunction is ReadonlyRegister<UCH>;
 
-  /** DHW_OPMode */
-  @inherit(r)
+  /** DHW_OPMode: operation mode of the domestic hot water circuit */
   @ext(0x42, 0)
-  model HwcOPMode {
-    /** operation mode of the domestic hot water circuit set implicitly */
-    @values(Values_HwcOPMode)
-    value: UCH;
-  }
+  model HwcOPMode is ReadonlyRegister<hwcmode7>;
 
   /** BMUB51101_DHWState: flame is on because of either tapping or tank loading */
   @ext(0x75, 0)
-  model BMUB51101HwcState is ReadonlyRegister<UCH>;
+  model BMUB51101HwcState is ReadonlyRegister<onoff>;
 
   /** B51000SetPointLoadingPump: loading pump's setpoint sent via B5 10 00 to the BMU */
   @ext(0x7b, 0)
-  model B51000TempDesiredLoadingPump is ReadonlyRegister<D1C>;
+  model B51000TempDesiredLoadingPump is ReadonlyRegister<temp1>;
 
   /** BMUB51101_BoilerFlowTemp: current flow temperature inside the BMU */
   @ext(0x77, 0)