rework partial of mcmode in PR #328 and fix several maxpreheating fields and add found fine granular setmaxpreheating message

john30 · john30 · commit 998470ff02e6 · 2024-12-28T12:49:38.000+01:00
diff --git a/csvall.sh b/csvall.sh
@@ -20,6 +20,7 @@ sed -i \
   -e 's#,UIN,,,hours#,hoursum2,,,#ig' \
   -e 's#,UIN,,hours,#,hoursum2,,,#ig' \
   -e 's#,UCH,,sec,#,seconds0,,,#ig' \
+  -e 's#,UCH,,min / 5,#,minutes5,,,#ig' \
   -e 's#,mcmode,,,"0=OFF, 1=ON, 2=AUTO, 3=MANUAL"#,hwcmode2,,,#' \
   -e 's#,hwcmode2,,,"0=OFF, 1=ON, 2=AUTO, 3=MANUAL"#,hwcmode2,,,#' \
   -e 's#,ULG,,,Maintance Alarm Date#,DTM,,,Maintance Alarm Date#' \
diff --git a/ebusd-2.1.x/de/vaillant/_templates.csv b/ebusd-2.1.x/de/vaillant/_templates.csv
@@ -13,6 +13,7 @@ time2,VTM,,,Zeit
 minutes,ULG,120,min,Minuten
 minutes0,UCH,,min,Minuten
 minutes2,UIN,,min,Minuten
+minutes5,UCH,-5,min,Minuten
 hoursum,ULG,,h,Stunden
 hoursum2,UIN,,h,Stunden
 hours,UCH,,h,Stunden
diff --git a/ebusd-2.1.x/en/vaillant/50.ehp.mc.csv b/ebusd-2.1.x/en/vaillant/50.ehp.mc.csv
@@ -19,7 +19,7 @@ r;w,,OtShutdownLimit,OtShutdownLimit,,,,"3600",,,desiredtemp,,,BMR: Outside temp
 r;wi,,FlowTempMin,MinFlowTemp,,,,"3000",,,temp0,,,BMR:Minimum Flow Temperature for circuit
 r;w;u,,FlowTempDesired,Flow setpoint,,,,"4600",,,temp1,,,BMR:flow temperature that is actually desired by circuit
 r;wi,,FlowTempMax,MaxFlowTemp,,,,"3100",,,temp0,,,BMR:Maximum Flow Temperature for circuit
-r;wi,,HcMaxPreHeating,HcMaxPreHeating,,,,"3800",,,UCH,,hours,BMR: Maximum Preheating time in minutes
+r;wi,,HcMaxPreHeating,HcMaxPreHeating,,,,"3800",,,minutes5,,,BMR: Maximum Preheating time in minutes
 [SW<=339]r;wi,,FloorProtectionLimit,Floor_Protection_Limit,,,,"7B01",,,desiredtemp,,,Floor protection temperature at which the heat pump goes to error mode.
 [SW>=340]r,,FloorProtectionLimit,Floor_Protection_Limit,,,,"7B01",,,desiredtemp,,,Floor protection temperature at which the heat pump goes to error mode.
 r;wi,,FloorPavingDryingDay,FloorPavingDryingDay,,,,"3B00",,,UCH,,,BMR: actual day of floor paving drying program (1...29)
diff --git a/ebusd-2.1.x/en/vaillant/52.mc2.mc.4.csv b/ebusd-2.1.x/en/vaillant/52.mc2.mc.4.csv
@@ -33,7 +33,7 @@ r;w,,OtShutdownLimit,OtShutdownLimit1,,,,"3600",,,desiredtemp,,,"For outside tem
 r;w,,HcPumpIdlePeriod,HcPumpIdlePeriod1,,,,"4F00",,,minutes0,,,Time pump is not running in a pause at least
 r;w,,FlowTempMin,MinFlowTemp1,,,,"3000",,,temp0,,,For a heat demand the desired flow temperature will at least be this value
 r;w,,FlowTempMax,MaxFlowTemp1,,,,"3100",,,temp0,,,For a heat demand the desired flow temperature will maximal be this value
-r;w,,HcMaxPreHeating,HcMaxPreHeating1,,,,"3800",,,hours,,,The heating start before a time window could shifted forwards maximal this time (related to the outside temperature)
+r;w,,HcMaxPreHeating,HcMaxPreHeating1,,,,"3800",,,minutes5,,,The heating start before a time window could shifted forwards maximal this time (related to the outside temperature)
 r;w,,TeleswitchOperatingMode,TeleswitchOperatingMode1,,,,"3F00",,,mcmode,,,If the tele switch port is activated the mixer circuit operates in this mode
 r;wi,,FloorPavingDryingDay,FloorPavingDryingDay1,,,,"3B00",,,UCH,,,Current day of floor paving drying routine
 # ##### MK1: Cooling #####,,,,,,,,,,,,,
diff --git a/ebusd-2.1.x/en/vaillant/53.mc2.mc.5.csv b/ebusd-2.1.x/en/vaillant/53.mc2.mc.5.csv
@@ -33,7 +33,7 @@ r;w,,OtShutdownLimit,OtShutdownLimit3,,,,"3600",,,desiredtemp,,,"For outside tem
 r;w,,HcPumpIdlePeriod,HcPumpIdlePeriod3,,,,"4F00",,,minutes0,,,Time pump is not running in a pause at least
 r;w,,FlowTempMin,MinFlowTemp3,,,,"3000",,,temp0,,,For a heat demand the desired flow temperature will at least be this value
 r;w,,FlowTempMax,MaxFlowTemp3,,,,"3100",,,temp0,,,For a heat demand the desired flow temperature will maximal be this value
-r;w,,HcMaxPreHeating,HcMaxPreHeating3,,,,"3800",,,hours,,,The heating start before a time window could shifted forwards maximal this time (related to the outside temperature)
+r;w,,HcMaxPreHeating,HcMaxPreHeating3,,,,"3800",,,minutes5,,,The heating start before a time window could shifted forwards maximal this time (related to the outside temperature)
 r;w,,TeleswitchOperatingMode,TeleswitchOperatingMode3,,,,"3F00",,,mcmode,,,If the tele switch port is activated the mixer circuit operates in this mode
 r;wi,,FloorPavingDryingDay,FloorPavingDryingDay3,,,,"3B00",,,UCH,,,Current day of floor paving drying routine
 # ##### MK2: Cooling #####,,,,,,,,,,,,,
diff --git a/ebusd-2.1.x/en/vaillant/_templates.csv b/ebusd-2.1.x/en/vaillant/_templates.csv
@@ -13,6 +13,7 @@ time2,VTM,,,time
 minutes,ULG,120,min,minutes
 minutes0,UCH,,min,minutes
 minutes2,UIN,,min,minutes
+minutes5,UCH,-5,min,minutes
 hoursum,ULG,,h,hours
 hoursum2,UIN,,h,hours
 hours,UCH,,h,hours
diff --git a/ebusd-2.1.x/en/vaillant/mcmode.inc b/ebusd-2.1.x/en/vaillant/mcmode.inc
@@ -17,8 +17,9 @@ w,,SetShutdownTemp,Set outside shutdown temperature,,,,0c,,,temp0,,,
 w,,SetPumpIdlePeriod,Set pump idle period,,,,0d,,,minutes0,,,
 w,,SetFlowTempMin,Set min flow temperature,,,,0e,,,temp0,,,
 w,,SetFlowTempMax,Set max flow temperature,,,,0f,,,temp0,,,
-w,,SetMaxPreHeating,Set max pre-heating,,,,10,,,hours12,,,
-r,,Params,Parameters,,,,09,,,temp0:tempdesired;temps:tempdesiredlow;curve;mctype7;temps:shutdowntemp;minutes0:pumpidleperiod;temps:flowtempmin;temps:flowtempmax;hours12:maxpreheating,,,
+w,,SetMaxPreHeating,Set max pre-heating,,,,10,,,hours,,,
+w,,SetMaxPreHeatingFine,Set max pre-heating,,,,3f,,,minutes5,,,,
+r,,Params,Parameters,,,,09,,,temp0:tempdesired;temps:tempdesiredlow;curve;mctype7;temps:shutdowntemp;minutes0:pumpidleperiod;temps:flowtempmin;temps:flowtempmax;hours:maxpreheating,,,
 r,,Status0a,Status flow temperature/mixer/pump/desired flow temperature,,,,0A,,,temp:flowtemp;mixer;onoff:pump;onoff;temp0:flowtempdesired
 r,,Status,Status flow desired/current,,,,0D,,,temp0:flowtempdesired;onoff;temp:flowtemp;temp0:tempdesired,,,
 r,,Status16,Outside temperature,,,,16,,,temp,,,
diff --git a/src/de.yaml b/src/de.yaml
@@ -1810,10 +1810,9 @@ Heating curve: 'Heizkurve: Heating curve'
 'HcMaxPreHeating: The heating start before a time window could shifted forwards maximal this time (related to the outside temperature)': >-
   Max. Voraufheizung: The heating start before a time window could shifted
   forwards maximal this time (related to the outside temperature)
-maximum time central heating is released in advance of the first time window (time is adjusted according to current outside temperature): >-
-  maximum time central heating is released in advance of the first time window
-  (time is adjusted according to current outside temperature)
-HcMaxPreHeating: Max. Voraufheizung
+'HcMaxPreHeating: maximum time central heating is released in advance of the first time window (time is adjusted according to current outside temperature)': >-
+  Max. Voraufheizung: maximum time central heating is released in advance of the
+  first time window (time is adjusted according to current outside temperature)
 'TeleswitchOperatingMode: If the tele switch port is activated the burner circuit operates in this mode': >-
   TeleSWITCH Betriebsart: If the tele switch port is activated the burner
   circuit operates in this mode
@@ -1934,7 +1933,9 @@ Operating mode of mixer circuit: 'Betriebsart: Operating mode of mixer circuit'
   Maximaler Vorlaufsollwert: For a heat demand the desired flow temperature will
   maximal be this value
 'DesiredTemperature1: Day temperature setpoint of the circuit': 'Solltemperatur: Day temperature setpoint of the circuit'
-HcMaxPreHeating1: Max. Voraufheizung
+'HcMaxPreHeating1: maximum time central heating is released in advance of the first time window (time is adjusted according to current outside temperature)': >-
+  Max. Voraufheizung: maximum time central heating is released in advance of the
+  first time window (time is adjusted according to current outside temperature)
 'HcMaxPreHeating1: The heating start before a time window could shifted forwards maximal this time (related to the outside temperature)': >-
   Max. Voraufheizung: The heating start before a time window could shifted
   forwards maximal this time (related to the outside temperature)
diff --git a/src/en.yaml b/src/en.yaml
@@ -1677,10 +1677,9 @@ Heating curve: heating curve
 'HcMaxPreHeating: The heating start before a time window could shifted forwards maximal this time (related to the outside temperature)': >-
   HcMaxPreHeating: The heating start before a time window could shifted forwards
   maximal this time (related to the outside temperature)
-maximum time central heating is released in advance of the first time window (time is adjusted according to current outside temperature): >-
-  maximum time central heating is released in advance of the first time window
-  (time is adjusted according to current outside temperature)
-HcMaxPreHeating: HcMaxPreHeating
+'HcMaxPreHeating: maximum time central heating is released in advance of the first time window (time is adjusted according to current outside temperature)': >-
+  HcMaxPreHeating: maximum time central heating is released in advance of the
+  first time window (time is adjusted according to current outside temperature)
 'TeleswitchOperatingMode: If the tele switch port is activated the burner circuit operates in this mode': >-
   TeleswitchOperatingMode: If the tele switch port is activated the burner
   circuit operates in this mode
@@ -1787,7 +1786,9 @@ Operating mode of mixer circuit: Operating mode of mixer circuit
   MaxFlowTemp1: For a heat demand the desired flow temperature will maximal be
   this value
 'DesiredTemperature1: Day temperature setpoint of the circuit': 'DesiredTemperature1: Day temperature setpoint of the circuit'
-HcMaxPreHeating1: HcMaxPreHeating1
+'HcMaxPreHeating1: maximum time central heating is released in advance of the first time window (time is adjusted according to current outside temperature)': >-
+  HcMaxPreHeating1: maximum time central heating is released in advance of the
+  first time window (time is adjusted according to current outside temperature)
 'HcMaxPreHeating1: The heating start before a time window could shifted forwards maximal this time (related to the outside temperature)': >-
   HcMaxPreHeating1: The heating start before a time window could shifted
   forwards maximal this time (related to the outside temperature)
diff --git a/src/i18n.yaml b/src/i18n.yaml
@@ -10236,23 +10236,19 @@ hcmaxpreheatingtheheatingstartbeforeatimewindowcouldshiftedforwardsmaximalthisti
     forwards maximal this time (related to the outside temperature)
   locations:
     - vaillant/26.solsy.hc.csv:sw_le400:r::0x38,0
-maximumtimecentralheatingisreleasedinadvanceofthefirsttimewindowtimeisadjustedaccordingtocurrentoutsidetemperature:
+hcmaxpreheatingmaximumtimecentralheatingisreleasedinadvanceofthefirsttimewindowtimeisadjustedaccordingtocurrentoutsidetemperature:
   first: >-
-    maximum time central heating is released in advance of the first time window
-    (time is adjusted according to current outside temperature)
+    HcMaxPreHeating: maximum time central heating is released in advance of the
+    first time window (time is adjusted according to current outside
+    temperature)
   en: >-
-    maximum time central heating is released in advance of the first time window
-    (time is adjusted according to current outside temperature)
+    HcMaxPreHeating: maximum time central heating is released in advance of the
+    first time window (time is adjusted according to current outside
+    temperature)
   de: >-
-    maximum time central heating is released in advance of the first time window
-    (time is adjusted according to current outside temperature)
-  locations:
-    - vaillant/26.solsy.hc.csv:sw_ge401:r::0x38,0:value
-    - vaillant/50.solsy.mc.csv:sw_ge401:r::0x38,0:value
-hcmaxpreheating:
-  first: HcMaxPreHeating
-  en: HcMaxPreHeating
-  de: Max. Voraufheizung
+    Max. Voraufheizung: maximum time central heating is released in advance of
+    the first time window (time is adjusted according to current outside
+    temperature)
   locations:
     - vaillant/26.solsy.hc.csv:sw_ge401:r::0x38,0
 teleswitchoperatingmodeiftheteleswitchportisactivatedtheburnercircuitoperatesinthismode:
@@ -10826,10 +10822,19 @@ desiredtemperature1daytemperaturesetpointofthecircuit:
   locations:
     - vaillant/50.solsy.mc.csv::r::0x32,0
     - vaillant/52.mc2.mc.4.csv::r::0x32,0
-hcmaxpreheating1:
-  first: HcMaxPreHeating1
-  en: HcMaxPreHeating1
-  de: Max. Voraufheizung
+hcmaxpreheating1maximumtimecentralheatingisreleasedinadvanceofthefirsttimewindowtimeisadjustedaccordingtocurrentoutsidetemperature:
+  first: >-
+    HcMaxPreHeating1: maximum time central heating is released in advance of the
+    first time window (time is adjusted according to current outside
+    temperature)
+  en: >-
+    HcMaxPreHeating1: maximum time central heating is released in advance of the
+    first time window (time is adjusted according to current outside
+    temperature)
+  de: >-
+    Max. Voraufheizung: maximum time central heating is released in advance of
+    the first time window (time is adjusted according to current outside
+    temperature)
   locations:
     - vaillant/50.solsy.mc.csv:sw_ge401:r::0x38,0
 hcmaxpreheating1theheatingstartbeforeatimewindowcouldshiftedforwardsmaximalthistimerelatedtotheoutsidetemperature:
@@ -13063,6 +13068,7 @@ minutes:
     - vaillant/_templates.csv:minutes
     - vaillant/_templates.csv:minutes0
     - vaillant/_templates.csv:minutes2
+    - vaillant/_templates.csv:minutes5
 hours:
   first: hours
   en: hours
diff --git a/src/vaillant/26.solsy.hc.tsp b/src/vaillant/26.solsy.hc.tsp
@@ -150,14 +150,9 @@ namespace Solsy.Hc {
     @ext(0x7b, 0)
     model EnergyDemandNotReachedDelay is ReadonlyRegister<hours>;
 
-    /** HcMaxPreHeating */
-    @inherit(r, wi)
+    /** HcMaxPreHeating: maximum time central heating is released in advance of the first time window (time is adjusted according to current outside temperature) */
     @ext(0x38, 0)
-    model HcMaxPreHeating {
-      /** maximum time central heating is released in advance of the first time window (time is adjusted according to current outside temperature) */
-      @unit("min / 5")
-      value: UCH;
-    }
+    model HcMaxPreHeating is InstallRegister<minutes5>;
   }
   @condition(Id.Id.sw, "<=400")
   namespace Sw_le400 {
diff --git a/src/vaillant/26.vr630.hc.tsp b/src/vaillant/26.vr630.hc.tsp
@@ -129,12 +129,8 @@ namespace Vr630.Hc {
   @condition(Id.Id.sw, ">=401")
   namespace Sw_ge401 {
     /** Max. Voraufheizung */
-    @inherit(r, wi)
     @ext(0x38, 0)
-    model HcMaxPreHeating {
-      @unit("min / 5")
-      value: UCH;
-    }
+    model HcMaxPreHeating is InstallRegister<minutes5>;
   }
 
   /** included parts */
diff --git a/src/vaillant/50.ehp.mc.tsp b/src/vaillant/50.ehp.mc.tsp
@@ -43,7 +43,7 @@ namespace Ehp.Mc {
 
   /** HcMaxPreHeating: BMR: Maximum Preheating time in minutes */
   @ext(0x38, 0)
-  model HcMaxPreHeating is InstallRegister<hours>;
+  model HcMaxPreHeating is InstallRegister<minutes5>;
 
   /** FloorPavingDryingDay: BMR: actual day of floor paving drying program (1...29) */
   @ext(0x3b, 0)
diff --git a/src/vaillant/50.solsy.mc.tsp b/src/vaillant/50.solsy.mc.tsp
@@ -145,14 +145,9 @@ namespace Solsy.Mc {
   }
   @condition(Id.Id.sw, ">=401")
   namespace Sw_ge401 {
-    /** HcMaxPreHeating1 */
-    @inherit(r, wi)
+    /** HcMaxPreHeating1: maximum time central heating is released in advance of the first time window (time is adjusted according to current outside temperature) */
     @ext(0x38, 0)
-    model HcMaxPreHeating {
-      /** maximum time central heating is released in advance of the first time window (time is adjusted according to current outside temperature) */
-      @unit("min / 5")
-      value: UCH;
-    }
+    model HcMaxPreHeating is InstallRegister<minutes5>;
   }
   @condition(Id.Id.sw, "<=400")
   namespace Sw_le400 {
diff --git a/src/vaillant/50.vr630.mc.tsp b/src/vaillant/50.vr630.mc.tsp
@@ -151,12 +151,8 @@ namespace Vr630.Mc {
   @condition(Id.Id.sw, ">=401")
   namespace Sw_ge401 {
     /** Max. Voraufheizung */
-    @inherit(r, wi)
     @ext(0x38, 0)
-    model HcMaxPreHeating {
-      @unit("min / 5")
-      value: UCH;
-    }
+    model HcMaxPreHeating is InstallRegister<minutes5>;
   }
 
   /** included parts */
diff --git a/src/vaillant/51.vr630.mc.3.tsp b/src/vaillant/51.vr630.mc.3.tsp
@@ -151,12 +151,8 @@ namespace Vr630.Mc._3 {
   @condition(Id.Id.sw, ">=401")
   namespace Sw_ge401 {
     /** Max. Voraufheizung */
-    @inherit(r, wi)
     @ext(0x38, 0)
-    model HcMaxPreHeating {
-      @unit("min / 5")
-      value: UCH;
-    }
+    model HcMaxPreHeating is InstallRegister<minutes5>;
   }
 
   /** included parts */
diff --git a/src/vaillant/52.mc2.mc.4.tsp b/src/vaillant/52.mc2.mc.4.tsp
@@ -134,7 +134,7 @@ namespace Mc2.Mc._4 {
 
   /** HcMaxPreHeating1: The heating start before a time window could shifted forwards maximal this time (related to the outside temperature) */
   @ext(0x38, 0)
-  model HcMaxPreHeating is Register<hours>;
+  model HcMaxPreHeating is Register<minutes5>;
 
   /** TeleswitchOperatingMode1: If the tele switch port is activated the mixer circuit operates in this mode */
   @ext(0x3f, 0)
diff --git a/src/vaillant/53.mc2.mc.5.tsp b/src/vaillant/53.mc2.mc.5.tsp
@@ -134,7 +134,7 @@ namespace Mc2.Mc._5 {
 
   /** HcMaxPreHeating3: The heating start before a time window could shifted forwards maximal this time (related to the outside temperature) */
   @ext(0x38, 0)
-  model HcMaxPreHeating is Register<hours>;
+  model HcMaxPreHeating is Register<minutes5>;
 
   /** TeleswitchOperatingMode3: If the tele switch port is activated the mixer circuit operates in this mode */
   @ext(0x3f, 0)
diff --git a/src/vaillant/_templates.tsp b/src/vaillant/_templates.tsp
@@ -60,6 +60,11 @@ scalar minutes0 extends UCH;
 @unit("min")
 scalar minutes2 extends UIN;
 
+/** minutes */
+@unit("min")
+@factor(5)
+scalar minutes5 extends UCH;
+
 /** hours */
 @unit("h")
 scalar hoursum extends ULG;
diff --git a/src/vaillant/mcmode_inc.tsp b/src/vaillant/mcmode_inc.tsp
@@ -116,7 +116,14 @@ namespace Mcmode_inc {
   @inherit(wm)
   @ext(0x10)
   model SetMaxPreHeating {
-    value: hours12;
+    value: hours;
+  }
+
+  /** Set max pre-heating */
+  @inherit(wm)
+  @ext(0x3f)
+  model SetMaxPreHeatingFine {
+    value: minutes5;
   }
 
   /** Parameters */
@@ -131,7 +138,7 @@ namespace Mcmode_inc {
     pumpidleperiod: minutes0;
     flowtempmin: temps;
     flowtempmax: temps;
-    maxpreheating: hours12;
+    maxpreheating: hours;
   }
 
   /** Status flow temperature/mixer/pump/desired flow temperature */
