fix+merge PR #430 and PR #454

Author: john30

ebusd-2.1.x/en/vaillant/06.pms.csv

@@ -13,8 +13,8 @@ r,,Ntc2Sensor,Ntc2Sensor,,,,"0600",,,tempsensor,,,Temperature in solar back flow
 r,,Ntc3Sensor,Ntc3Sensor,,,,"0700",,,tempsensor,,,Temperature in buffer flow (to buffer)
 r,,Ntc4Sensor,Ntc4Sensor,,,,"0800",,,tempsensor,,,Temperature in buffer back flow (from buffer)
 r;wi,,SolPumpRelay,Relais Solarpumpe,,,,"0F00",,,onoff,,,Solar pump relay: 0: OFF; 1: ON
-r;wi,,SolPumpPower,SolarPumpPower,,,,"1000",,,power,,,Performance of solar pump: (7 - 100 %)
-r;wi,,BufferPumpPower,BufferPumpPower,,,,"1100",,,power,,,Performance of buffer pump: (15 - 100%)
+r;wi,,SolPumpPower,SolarPumpPower,,,,"1000",,,percent0,,,Performance of solar pump: (7 - 100 %)
+r;wi,,BufferPumpPower,BufferPumpPower,,,,"1100",,,percent0,,,Performance of buffer pump: (15 - 100%)
 r,,MonitorMatlabLast5minSolAverage,MonitorMatlab_Last5minSolarAverage,,,,"1700",,,SIN,,,
 r,,CurrentSolTempDesired,CurrentSolarSetpoint,,,,"1800",,,UIN,,°C,Temperature target in solar flow at sensor Ntc1Sensor
 r,,CurrentVPMLoadingMode,CurrentVPM_LoadingMode,,,,"1900",,,UCH,,,"1. DHW-Support (stand alone), 2. CH-Support (stand alone), 3. +10K (stand alone), 4. SwimmingPool, 5.DHW-Support (with external control), 6. CH-Support (with external control), 7. +10K (with external control)"

ebusd-2.1.x/en/vaillant/06.vms.csv

@@ -7,8 +7,8 @@
 r,,Ntc1Sensor,Ntc1Sensor,,,,"0500",,,tempsensor,,,Temperature in solar flow (from solar collector)
 r,,Ntc2Sensor,Ntc2Sensor,,,,"0600",,,tempsensor,,,Temperature in solar back flow (to solar collector)
 r;wi,,SolPumpRelay,Relais Solarpumpe,,,,"0F00",,,onoff,,,Solar pump relay: 0: OFF; 1: ON
-r;wi,,SolPumpPower,SolarPumpPower,,,,"1000",,,power,,,Performance of solar pump: (7 - 100 %)
-r;wi,,BufferPumpPower,BufferPumpPower,,,,"1100",,,power,,,Performance of buffer pump: (15 - 100%)
+r;wi,,SolPumpPower,SolarPumpPower,,,,"1000",,,percent0,,,Performance of solar pump: (7 - 100 %)
+r;wi,,BufferPumpPower,BufferPumpPower,,,,"1100",,,percent0,,,Performance of buffer pump: (15 - 100%)
 r,,MonitorMatlabLast5minSolAverage,MonitorMatlab_Last5minSolarAverage,,,,"1700",,,SIN,,,
 r,,CurrentVPMLoadingMode,CurrentVPM_LoadingMode,,,,"1900",,,UCH,,,"1. DHW-Support (stand alone), 2. CH-Support (stand alone), 3. +10K (stand alone), 4. SwimmingPool, 5.DHW-Support (with external control), 6. CH-Support (with external control), 7. +10K (with external control)"
 r,,RunTimePump1Minutes,RunTimePump1_Minutes,,,,"1A00",,,minutes0,,,Runtime of solar pump in minutes

src/vaillant/06.pms.tsp

@@ -50,11 +50,11 @@ namespace Pms {
 
   /** SolarPumpPower: Performance of solar pump: (7 - 100 %) */
   @ext(0x10, 0)
-  model SolPumpPower is InstallRegister<power>;
+  model SolPumpPower is InstallRegister<percent0>;
 
   /** BufferPumpPower: Performance of buffer pump: (15 - 100%) */
   @ext(0x11, 0)
-  model BufferPumpPower is InstallRegister<power>;
+  model BufferPumpPower is InstallRegister<percent0>;
 
   /** MonitorMatlab_Last5minSolarAverage */
   @ext(0x17, 0)

src/vaillant/06.vms.tsp

@@ -26,11 +26,11 @@ namespace Vms {
 
   /** SolarPumpPower: Performance of solar pump: (7 - 100 %) */
   @ext(0x10, 0)
-  model SolPumpPower is InstallRegister<power>;
+  model SolPumpPower is InstallRegister<percent0>;
 
   /** BufferPumpPower: Performance of buffer pump: (15 - 100%) */
   @ext(0x11, 0)
-  model BufferPumpPower is InstallRegister<power>;
+  model BufferPumpPower is InstallRegister<percent0>;
 
   /** MonitorMatlab_Last5minSolarAverage */
   @ext(0x17, 0)