diff --git a/ebusd-2.1.x/de/vaillant/08.hmu.csv b/ebusd-2.1.x/de/vaillant/08.hmu.csv
old mode 100644
new mode 100755
index 4d8b20fc..55ff5b9f
--- a/ebusd-2.1.x/de/vaillant/08.hmu.csv
+++ b/ebusd-2.1.x/de/vaillant/08.hmu.csv
@@ -1,25 +1,137 @@
 # type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment,field2,part (m/s),datatypes/templates,divider/values,unit,comment,field3,part (m/s),datatypes/templates,divider/values,unit,comment,field4,part (m/s),datatypes/templates,divider/values,unit,comment
-*r,,,,,,"B511",,,,,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B511,,,,,,,,,,,,,,,,,,,,,,,,,
 r,,State,,,,,07,energy,,UCH,,,,,,energy,,kWh,,onoff,,UCH,0=off;1=on,,,state,,UCH,0x01=ready;0x0b=error;0x09=heating;0x11=cooling;0x81=heating_water,,
-# Heatpump statistics,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-*r,,,,,,"B51A","05FF32",,,IGN:3,,,,,,,,,,,,,,,,,,,,,
-r,,EnergyHc,,,,,00,,,energy,,,,,,,,,,,,,,,,,,,,,
-r,,EnergyCool,,,,,01,,,energy,,,,,,,,,,,,,,,,,,,,,
-r,,Hours,,,,,40,,,energy,,,,,,,,,,,,,,,,,,,,,
-r,,HoursHc,,,,,41,,,energy,,,,,,,,,,,,,,,,,,,,,
-r,,HoursCool,,,,,43,,,energy,,,,,,,,,,,,,,,,,,,,,
-# some more statistics from Live Monitor,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-r,,EnergyIntegral,,,,,21,,,integral,,°min,aktuelles Energieintegral in °min,,,,,,,,,,,,,,,,,,
-r,,CurrentYieldPower,,,,,23,,,D1B,10,kW,aktuell gewonnene Energie aus der Umwelt in kW,,,,,,,,,,,,,,,,,,
-r,,CurrentConsumedPower,,,,,24,,,D1B,10,kW,aktueller Stromverbrauch der Wärmepumpe in kW,,,,,,,,,,,,,,,,,,
-r,,CurrentCompressorUtil,,,,,25,,,D1B,,%,aktuelle Kompressorauslastung in Prozent,,,,,,,,,,,,,,,,,,
+# Values from Live Monitor,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B51A,05,,,,,,,,,,,,,,,,,,,,,,,,
+*w,,,,,,B51A,05,,,,,,,,,,,,,,,,,,,,,,,,
+w,,ReadLiveMonitor,Payload needed sent: FF321f=desired supply (D2C);FF3220=current supply (D2C);FF3224=current power consumption (UIN);FF3223=power generated (UIN);FF3225=Modulation (D1B);FF3226=Air intake (D2C),,,,,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,LiveMonitorDesiredSupply,D2C,,,,FF321f,,,IGN:3,,,,temperature,,D2C,,°C,,,,,,,,,,,,,
+r,,LiveMonitorCurrentSupply,D2C,,,,FF3220,,,IGN:3,,,,temperature,,D2C,,°C,,,,,,,,,,,,,
+r,,LiveMonitorPowerConsumption,UIN,,,,FF3224,,,IGN:3,,,,,,energy,10,kW,,,,,,,,,,,,,
+r,,LiveMonitorPowerGenerated,UIN,,,,FF3223,,,IGN:3,,,,,,energy,10,kW,,,,,,,,,,,,,
+r,,LiveMonitorCompressorModulation,D1B,,,,FF3225,,,IGN:3,,,,percentage,,D1B,,,,,,,,,,,,,,,
+r,,LiveMonitorAirIntake,D1B,,,,FF3226,,,IGN:3,,,,temperature,,SIN,16,°C,,,,,,,,,,,,,
+r,,CompressorHours,,,,,FF3400,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,CompressorStarts,,,,,FF3401,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,BuildingPumpHours,,,,,FF3402,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,BuildingPumpStarts,,,,,FF3403,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,4PortValveHours,,,,,FF3406,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,4PortValveSwitches,,,,,FF3407,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,EEVSteps,,,,,FF340D,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,NoOfSwitchingOps,,,,,FF3430,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,Fan1OperHours,,,,,FF3451,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,Fan1Starts,,,,,FF3452,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,Fan2OperHours,,,,,FF345E,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,Fan2Starts,,,,,FF345F,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,YieldHcDay,,,,,FF3200,,,IGN:3,,,,,,energy,10,kWh,,,,,,,,,,,,,
+r,,YieldCoolingDay,,,,,FF3201,,,IGN:3,,,,,,energy,10,kWh,,,,,,,,,,,,,
+r,,YieldHwcDay,,,,,FF3202,,,IGN:3,,,,,,energy,10,kWh,,,,,,,,,,,,,
+r,,ch_3,,,,,FF3203,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_4,,,,,FF3204,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_5,,,,,FF3205,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_6,,,,,FF3206,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_7,,,,,FF3207,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,YieldHcMonth,,,,,FF320e,,,IGN:3,,,,,,energy,10,kWh,,,,,,,,,,,,,
+r,,CopHcMonth,,,,,FF320f,,,IGN:3,,,,,,UIN,10,,,,,,,,,,,,,,
+r,,YieldHc,,,,,FF3210,,,IGN:3,,,,,,energy,,kWh,,,,,,,,,,,,,
+r,,CopHc,,,,,FF3211,,,IGN:3,,,,,,UIN,10,,,,,,,,,,,,,,
+r,,YieldHwcMonth,,,,,FF3212,,,IGN:3,,,,,,energy,10,kWh,,,,,,,,,,,,,
+r,,CopHwcMonth,,,,,FF3213,,,IGN:3,,,,,,UIN,10,,,,,,,,,,,,,,
+r,,YieldHwc,,,,,FF3216,,,IGN:3,,,,,,energy,,kWh,,,,,,,,,,,,,
+r,,CopHwc,,,,,FF3217,,,IGN:3,,,,,,UIN,10,,,,,,,,,,,,,,
+r,,ch_18,,,,,FF3218,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,TargetTempHc,,,,,FF321C,,,IGN:3,,,,,,D2C,,°C,Target temperature Hc (°C),,,,,,,,,,,,
+# Uncomment the next line if you want to be able to change TargetTempHc (from Home Assistant for example)
+#w,hmu,TargetTempHc,,,08,B51A,06B5321C,,,D2C,,°C,Target temperature Hc(°C),,,,,,,,,,,,,,,,,,
+r,,ch_1e,,,,,321e,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,SourceTempOutput,,,,,FF3227,,,IGN:3,,,,,,D2C,,°C,,,,,,,,,,,,,
+r,,BuildingCircuitFlow,,,,,FF323C,,,IGN:3,,,,,,UIN,,l/h,,,,,,,,,,,,,
+r,,FlowPressure,,,,,FF323d,,,IGN:3,,,,,,D2C,4,,,,,,,,,,,,,,
+r,,SourcePressure,,,,,FF323e,,,IGN:3,,,,,,D2C,4,,,,,,,,,,,,,,
+r,,TotalRunningHours,,,,,FF3240,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,RunningHoursCH,,,,,FF3241,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,RunningHoursCooling,,,,,FF3243,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,RunningHoursHwc,,,,,FF3244,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,ch_46,,,,,FF3246,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_49,,,,,FF3249,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_4a,,,,,FF324a,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_4b,,,,,FF324b,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_4c,,,,,FF324c,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,TotalEnergyUsage,,,,,FF324D,,,IGN:3,,,,,,energy,,kWh,,,,,,,,,,,,,
+r,,ch_63,,,,,FF3263,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+# Heat pump configuration menu values
+r,,HeatCurve,,,,,8F352D,,,IGN:3,,,,,,BCD,10,,heat curve 0.1 to 4.0,,,,,,,,,,,,
+# Uncomment the next line if you want to be able to change HeatCurve (from Home Assistant for example)
+#w,hmu,HeatCurve,,,08,B51A,06CD352D,,,BCD,10,,,,,,,,,,,,,,,,,,,,
+r,,SummerSwitchOffTemp,,,,,8F352E,,,IGN:3,,,,,,D2C,,°C,Switch-off temperature summer (°C),,,,,,,,,,,,
+r,,HcBivalencePoint,,,,,8F352F,,,IGN:3,,,,,,D2C,,°C,Central heating bivalence point (°C),,,,,,,,,,,,
+r,,HwcBivalencePoint,,,,,8F3530,,,IGN:3,,,,,,D2C,,°C,Bivalence point domestic hot water (°C),,,,,,,,,,,,
+r,,MaxFlowTemp,,,,,8F3532,,,IGN:3,,,,,,D2C,,°C,Maximum flow temperature (°C),,,,,,,,,,,,
+r,,MinFlowTemp,,,,,8F3533,,,IGN:3,,,,,,D2C,,°C,Minimum flow temperature (°C),,,,,,,,,,,,
+r,,HcModeActive,,,,,8F3534,,,IGN:3,,,,,,UCH,0=no;1=yes,,Central heating mode active (yes/no),,,,,,,,,,,,
+r,,HwcModeActive,,,,,8F3535,,,IGN:3,,,,,,UCH,0=no;1=yes,,Domestic hot water mode active (yes/no),,,,,,,,,,,,
+r,,HwcChargeHysteresis,,,,,8F3539,,,IGN:3,,,,,,D2C,,°K,Hysteresis Hwc charging (°K),,,,,,,,,,,,
+r,,ImmersionHeaterMode,,,,,C4331E,,,IGN:3,,,,,,UCH,0=off;1=on,,Immersion heater mode (on/off),,,,,,,,,,,,
+r,,CompressorHysteresisHc,,,,,F83443,,,IGN:3,,,,,,D2C,,°K,Compressor hysteresis central heating (°K),,,,,,,,,,,,
+r,,CompressorHysteresisCooling,,,,,86353F,,,IGN:3,,,,,,D2C,,,Compressor hysteresis cooling (°K),,,,,,,,,,,,
+r,,HwcMode,,,,,523444,,,IGN:3,,,,,,UCH,0=eco;1=normal;2=balance,,Domestic hot water mod (eco/normal/balance),,,,,,,,,,,,
+r,,TargetTempHwc,,,,,C63207,,,IGN:3,,,,,,D2C,,°C,Target Hwc temperature (°C),,,,,,,,,,,,
+# Uncomment the next line if you want to be able to change TargetTempHwc (from Home Assistant for example)
+#w,hmu,TargetTempHwc,,,08,B51A,06783207,,,D2C,,°C,Target Hwc temperature (°C),,,,,,,,,,,,,,,,,,
+# Additional values from Live Monitor Main,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B503,00,,,,,,,,,,,,,,,,,,,,,,,,
+*w,,,,,,B503,00,,,,,,,,,,,,,,,,,,,,,,,,
+w,,ReadLiveMonitorMain,Payload needed sent: 03FFFF,,,,,,m,HEX:1,,,,,,,,,,,,,,,,,,,,,
+r,,LiveMonitorMain,,71,,,,id,,UCH,0x39=Controller starting;0xf4=Standby;0xf5=Supply on;0xf6=Heating: Flow ok;0xf7=Heating: temperature self test;0xf8=Heating: Start;0xfa=Heating: Fan on;0xfc=EEV switch;0xfd=Compressor starting;0xfe=Heating: compressor on;0x00=Compressor off;0x02=Compressor coast down;0x03=Deicing start;0x04=Deicing;0x05=Deicing end;0x12=Cooling: Flow on;0x14=Cooling: temperature self test;0x15=Cooling: starting;0x17=Cooling: Fan on;0x13=Cooling: Flow ok;0x19=Cooling: EEV?;0x1a=Cooling: compressor starting;0x1b=Cooling: compressor on;0x1d=Cooling: ending;0x29=Start condition not met;0x57=Device error;0x44=Flow error in distribution system,,,function,,UCH,0x01=Heating;0x02=Cooling,,,,,,,,,,,,,,
+# Values from VWZ test menu & UniTower test menu,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+# Query to WP entries Installer level/Test Menu/Sensor test,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B514,05,,,,,,,,,,,,,,,,,,,,,,,,
+*w,,,,,,B514,05,,,,,,,,,,,,,,,,,,,,,,,,
+r,,EEVSwitch,,,,,1403FFFF,,,IGN:2,,,,,,onoff,,,Four way valve (on/off),,,,,,,,,,,,
+w,,ReadEEVPosition,,,,,1503FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,EEVPosition,,,,,1503FFFF,,,IGN:2,,,,percentage,,UIN,,,,,,,,,,,,,,,
+r,,HeatingCoilCompressor,,,,,1703FFFF,,,IGN:2,,,,,,onoff,,,Heating coil compressor (on/off),,,,,,,,,,,,
+w,,ReadFlowTempSupply,,,,,2803FFFF,,,IGN:2,,,,,,temps2,10,°C,Supply temperature (°C),,,,,,,,,,,,
+r,,FlowTempSupply,,,,,2803FFFF,,,IGN:2,,,,temperature,,SIN,10,,°C,,,,,,,,,,,,
+w,,ReadFlowTempReturn,,,,,2903FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,FlowTempReturn,,,,,2903FFFF,,,IGN:2,,,,,,temps2,10,°C,Return temperature (°C),,,,,,,,,,,,
+w,,ReadDeliveryFlow,Read T.016,,,,2B03FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,DeliveryFlow,,,,,2B03FFFF,,,IGN:2,,,,,,UIN,,l/h,Current heating water flow rate (liter/hour),,,,,,,,,,,,
+w,,ReadCompressorExitTemp,,,,,3703FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,CompressorExitTemp,,,,,3703FFFF,,,IGN:2,,,,,,temps2,10,°C,Compressor outlet temperature (°C),,,,,,,,,,,,
+w,,ReadCompressorIntakeTemp,,,,,3803FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,CompressorIntakeTemp,,,,,3803FFFF,,,IGN:2,,,,,,temps2,10,°C,Compressor inlet temperature (°C),,,,,,,,,,,,
+w,,ReadEEVTemp,,,,,3b000000,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,EEVTemp,,,,,3b000000,,,IGN:2,,,,temperature,,SIN,10,,°C,,,,,,,,,,,,
+w,,ReadHighPressure,,,,,3F03FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,HighPressure,,,,,3F03FFFF,,,IGN:2,,,,pressure,,SIN,10,,bar,,,,,,,,,,,,
+r,,LowPressure,,,,,4003FFFF,,,IGN:2,,,,,,UIN,10,bar,Low pressure (bar),,,,,,,,,,,,
+w,,ReadCondensateTemp,,,,,5603FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,CondensationTemp,,,,,5603FFFF,,,IGN:2,,,,,,temps2,10,°C,Condensation temperature (°C),,,,,,,,,,,,
+w,,ReadEvapTemp,,,,,5503FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,EvaporationTemp,,,,,5503FFFF,,,IGN:2,,,,temperature,,SIN,10,,°C,,,,,,,,,,,,
+w,,ReadCompressorRPM,,,,,5D03FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,CompressorRPM,,,,,5D03FFFF,,,IGN:2,,,,,,UIN,10,Hz,Compressor speed (RPM),,,,,,,,,,,,
+r,,BuildingCircuitPumpPower,,,,,0103FFFF,,,IGN:2,,,,,,UIN,,%,Building circuit pump power (% of maximum),,,,,,,,,,,,
+r,,Fan1,,,,,1103FFFF,,,IGN:2,,,,,,UIN,,%,Fan 1 speed (% of max),,,,,,,,,,,,
+r,,Fan2,,,,,1203FFFF,,,IGN:2,,,,,,UIN,,%,Fan 2 speed (% of max),,,,,,,,,,,,
+r,,CondensateTrayHeater,,,,,1303FFFF,,,IGN:2,,,,,,onoff,,,Condensate tray heater (on/off),,,,,,,,,,,,
+r,,BuildingCircuitWaterPressure,,,,,2A03FFFF,,,IGN:2,,,,,,UIN,10,bar,Gebouwcircuit waterPressure (bar),,,,,,,,,,,,
+r,,AirInletTemp,,,,,3003FFFF,,,IGN:2,,,,,,temps2,10,°C,Air inlet temperature (°C),,,,,,,,,,,,
+r,,CondensorOutletTemp,,,,,3B03FFFF,,,IGN:2,,,,,,temps2,10,°C,Condensor outlet temperature (°C),,,,,,,,,,,,
+r,,HighPressureSwitch,,,,,4303FFFF,,,IGN:2,,,,,,UCH,0=open;1=closed,,High pressure switch (open/closed),,,,,,,,,,,,
+r,,OverheatingTargetValue,,,,,5703FFFF,,,IGN:2,,,,,,temps2,10,°K,Overheating target temperature (°K),,,,,,,,,,,,
+r,,OverheatingActualValue,,,,,5803FFFF,,,IGN:2,,,,,,temps2,10,°K,Overheating temperature actual (°K),,,,,,,,,,,,
+r,,SubcoolingTargetValue,,,,,5903FFFF,,,IGN:2,,,,,,temps2,10,°K,Subcooling target temperaturee (°K),,,,,,,,,,,,
+r,,SubcoolingActualValue,,,,,5A03FFFF,,,IGN:2,,,,,,temps2,10,°K,Subcooling temperature actual (°K),,,,,,,,,,,,
+r,,TemperatureSwitchCompressorOutlet,,,,,7B03FFFF,,,IGN:2,,,,,,UCH,0=open;1=closed,,,,,,,,,,,,,,
 # Total heating yields,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-*r,,,,,,"B516","18",,,IGN:1,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B516,18,,,IGN:1,,,,,,,,,,,,,,,,,,,,,
 r,,YieldTotal,,,,,01,,,energy,,,,,,,,,,,,,,,,,,,,,
 # Total electric power consumption,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 r,,ConsumptionTotal,,,,,02,,,energy,,,,,,,,,,,,,,,,,,,,,
 # Ecologic energy Yields,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-*r,,,,,,"B516","1A01",,,IGN:1,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B516,1A01,,,IGN:1,,,,,,,,,,,,,,,,,,,,,
 r,,YieldThisYear1,,,,,0100,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,YieldThisYear2,,,,,0200,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,YieldThisYear3,,,,,0300,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
@@ -33,7 +145,7 @@ r,,YieldThisYear10,,,,,0A00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,YieldThisYear11,,,,,0B00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,YieldThisYear12,,,,,0C00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 # Electric power consumption,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-*r,,,,,,"B516","1A02",,,IGN:1,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B516,1A02,,,IGN:1,,,,,,,,,,,,,,,,,,,,,
 r,,ConsumptionThisYear1,,,,,0100,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,ConsumptionThisYear2,,,,,0200,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,ConsumptionThisYear3,,,,,0300,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
@@ -46,8 +158,5 @@ r,,ConsumptionThisYear9,,,,,0900,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,ConsumptionThisYear10,,,,,0A00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,ConsumptionThisYear11,,,,,0B00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,ConsumptionThisYear12,,,,,0C00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
-# Values from UniTower Test Menu,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-*r,,,,,,B514,05,,,IGN:2,,,,,,,,,,,,,,,,,,,,,
-r,,WaterThroughput,,,,,2B03FFFF,,,UIN,,l/h,Aktuelle Heizwasser Durchflussrate der Wärmepumpe in Liter pro Stunde,,,,,,,,,,,,,,,,,,
 !include,hcmode.inc,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!include,errors.inc,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+!include,errors.inc,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
\ No newline at end of file
diff --git a/ebusd-2.1.x/en/vaillant/08.hmu.csv b/ebusd-2.1.x/en/vaillant/08.hmu.csv
old mode 100644
new mode 100755
index 0a12b0fa..55ff5b9f
--- a/ebusd-2.1.x/en/vaillant/08.hmu.csv
+++ b/ebusd-2.1.x/en/vaillant/08.hmu.csv
@@ -1,25 +1,137 @@
 # type (r[1-9];w;u),circuit,name,[comment],[QQ],ZZ,PBSB,[ID],field1,part (m/s),datatypes/templates,divider/values,unit,comment,field2,part (m/s),datatypes/templates,divider/values,unit,comment,field3,part (m/s),datatypes/templates,divider/values,unit,comment,field4,part (m/s),datatypes/templates,divider/values,unit,comment
-*r,,,,,,"B511",,,,,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B511,,,,,,,,,,,,,,,,,,,,,,,,,
 r,,State,,,,,07,energy,,UCH,,,,,,energy,,kWh,,onoff,,UCH,0=off;1=on,,,state,,UCH,0x01=ready;0x0b=error;0x09=heating;0x11=cooling;0x81=heating_water,,
-# Heatpump statistics,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-*r,,,,,,"B51A","05FF32",,,IGN:3,,,,,,,,,,,,,,,,,,,,,
-r,,EnergyHc,,,,,00,,,energy,,,,,,,,,,,,,,,,,,,,,
-r,,EnergyCool,,,,,01,,,energy,,,,,,,,,,,,,,,,,,,,,
-r,,Hours,,,,,40,,,energy,,,,,,,,,,,,,,,,,,,,,
-r,,HoursHc,,,,,41,,,energy,,,,,,,,,,,,,,,,,,,,,
-r,,HoursCool,,,,,43,,,energy,,,,,,,,,,,,,,,,,,,,,
-# some more statistics from Live Monitor,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-r,,EnergyIntegral,,,,,21,,,integral,,°min,current energy integral in °min,,,,,,,,,,,,,,,,,,
-r,,CurrentYieldPower,,,,,23,,,D1B,10,kW,current yielded energy from the environment in kW,,,,,,,,,,,,,,,,,,
-r,,CurrentConsumedPower,,,,,24,,,D1B,10,kW,current power consumption of the heatpump in kW,,,,,,,,,,,,,,,,,,
-r,,CurrentCompressorUtil,,,,,25,,,D1B,,%,current compressor utilization in percent,,,,,,,,,,,,,,,,,,
+# Values from Live Monitor,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B51A,05,,,,,,,,,,,,,,,,,,,,,,,,
+*w,,,,,,B51A,05,,,,,,,,,,,,,,,,,,,,,,,,
+w,,ReadLiveMonitor,Payload needed sent: FF321f=desired supply (D2C);FF3220=current supply (D2C);FF3224=current power consumption (UIN);FF3223=power generated (UIN);FF3225=Modulation (D1B);FF3226=Air intake (D2C),,,,,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,LiveMonitorDesiredSupply,D2C,,,,FF321f,,,IGN:3,,,,temperature,,D2C,,°C,,,,,,,,,,,,,
+r,,LiveMonitorCurrentSupply,D2C,,,,FF3220,,,IGN:3,,,,temperature,,D2C,,°C,,,,,,,,,,,,,
+r,,LiveMonitorPowerConsumption,UIN,,,,FF3224,,,IGN:3,,,,,,energy,10,kW,,,,,,,,,,,,,
+r,,LiveMonitorPowerGenerated,UIN,,,,FF3223,,,IGN:3,,,,,,energy,10,kW,,,,,,,,,,,,,
+r,,LiveMonitorCompressorModulation,D1B,,,,FF3225,,,IGN:3,,,,percentage,,D1B,,,,,,,,,,,,,,,
+r,,LiveMonitorAirIntake,D1B,,,,FF3226,,,IGN:3,,,,temperature,,SIN,16,°C,,,,,,,,,,,,,
+r,,CompressorHours,,,,,FF3400,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,CompressorStarts,,,,,FF3401,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,BuildingPumpHours,,,,,FF3402,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,BuildingPumpStarts,,,,,FF3403,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,4PortValveHours,,,,,FF3406,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,4PortValveSwitches,,,,,FF3407,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,EEVSteps,,,,,FF340D,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,NoOfSwitchingOps,,,,,FF3430,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,Fan1OperHours,,,,,FF3451,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,Fan1Starts,,,,,FF3452,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,Fan2OperHours,,,,,FF345E,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,Fan2Starts,,,,,FF345F,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,YieldHcDay,,,,,FF3200,,,IGN:3,,,,,,energy,10,kWh,,,,,,,,,,,,,
+r,,YieldCoolingDay,,,,,FF3201,,,IGN:3,,,,,,energy,10,kWh,,,,,,,,,,,,,
+r,,YieldHwcDay,,,,,FF3202,,,IGN:3,,,,,,energy,10,kWh,,,,,,,,,,,,,
+r,,ch_3,,,,,FF3203,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_4,,,,,FF3204,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_5,,,,,FF3205,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_6,,,,,FF3206,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_7,,,,,FF3207,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,YieldHcMonth,,,,,FF320e,,,IGN:3,,,,,,energy,10,kWh,,,,,,,,,,,,,
+r,,CopHcMonth,,,,,FF320f,,,IGN:3,,,,,,UIN,10,,,,,,,,,,,,,,
+r,,YieldHc,,,,,FF3210,,,IGN:3,,,,,,energy,,kWh,,,,,,,,,,,,,
+r,,CopHc,,,,,FF3211,,,IGN:3,,,,,,UIN,10,,,,,,,,,,,,,,
+r,,YieldHwcMonth,,,,,FF3212,,,IGN:3,,,,,,energy,10,kWh,,,,,,,,,,,,,
+r,,CopHwcMonth,,,,,FF3213,,,IGN:3,,,,,,UIN,10,,,,,,,,,,,,,,
+r,,YieldHwc,,,,,FF3216,,,IGN:3,,,,,,energy,,kWh,,,,,,,,,,,,,
+r,,CopHwc,,,,,FF3217,,,IGN:3,,,,,,UIN,10,,,,,,,,,,,,,,
+r,,ch_18,,,,,FF3218,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,TargetTempHc,,,,,FF321C,,,IGN:3,,,,,,D2C,,°C,Target temperature Hc (°C),,,,,,,,,,,,
+# Uncomment the next line if you want to be able to change TargetTempHc (from Home Assistant for example)
+#w,hmu,TargetTempHc,,,08,B51A,06B5321C,,,D2C,,°C,Target temperature Hc(°C),,,,,,,,,,,,,,,,,,
+r,,ch_1e,,,,,321e,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,SourceTempOutput,,,,,FF3227,,,IGN:3,,,,,,D2C,,°C,,,,,,,,,,,,,
+r,,BuildingCircuitFlow,,,,,FF323C,,,IGN:3,,,,,,UIN,,l/h,,,,,,,,,,,,,
+r,,FlowPressure,,,,,FF323d,,,IGN:3,,,,,,D2C,4,,,,,,,,,,,,,,
+r,,SourcePressure,,,,,FF323e,,,IGN:3,,,,,,D2C,4,,,,,,,,,,,,,,
+r,,TotalRunningHours,,,,,FF3240,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,RunningHoursCH,,,,,FF3241,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,RunningHoursCooling,,,,,FF3243,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,RunningHoursHwc,,,,,FF3244,,,IGN:3,,,,,,UIN,,hours,,,,,,,,,,,,,
+r,,ch_46,,,,,FF3246,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_49,,,,,FF3249,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_4a,,,,,FF324a,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_4b,,,,,FF324b,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,ch_4c,,,,,FF324c,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+r,,TotalEnergyUsage,,,,,FF324D,,,IGN:3,,,,,,energy,,kWh,,,,,,,,,,,,,
+r,,ch_63,,,,,FF3263,,,IGN:3,,,,,,UIN,,,,,,,,,,,,,,,
+# Heat pump configuration menu values
+r,,HeatCurve,,,,,8F352D,,,IGN:3,,,,,,BCD,10,,heat curve 0.1 to 4.0,,,,,,,,,,,,
+# Uncomment the next line if you want to be able to change HeatCurve (from Home Assistant for example)
+#w,hmu,HeatCurve,,,08,B51A,06CD352D,,,BCD,10,,,,,,,,,,,,,,,,,,,,
+r,,SummerSwitchOffTemp,,,,,8F352E,,,IGN:3,,,,,,D2C,,°C,Switch-off temperature summer (°C),,,,,,,,,,,,
+r,,HcBivalencePoint,,,,,8F352F,,,IGN:3,,,,,,D2C,,°C,Central heating bivalence point (°C),,,,,,,,,,,,
+r,,HwcBivalencePoint,,,,,8F3530,,,IGN:3,,,,,,D2C,,°C,Bivalence point domestic hot water (°C),,,,,,,,,,,,
+r,,MaxFlowTemp,,,,,8F3532,,,IGN:3,,,,,,D2C,,°C,Maximum flow temperature (°C),,,,,,,,,,,,
+r,,MinFlowTemp,,,,,8F3533,,,IGN:3,,,,,,D2C,,°C,Minimum flow temperature (°C),,,,,,,,,,,,
+r,,HcModeActive,,,,,8F3534,,,IGN:3,,,,,,UCH,0=no;1=yes,,Central heating mode active (yes/no),,,,,,,,,,,,
+r,,HwcModeActive,,,,,8F3535,,,IGN:3,,,,,,UCH,0=no;1=yes,,Domestic hot water mode active (yes/no),,,,,,,,,,,,
+r,,HwcChargeHysteresis,,,,,8F3539,,,IGN:3,,,,,,D2C,,°K,Hysteresis Hwc charging (°K),,,,,,,,,,,,
+r,,ImmersionHeaterMode,,,,,C4331E,,,IGN:3,,,,,,UCH,0=off;1=on,,Immersion heater mode (on/off),,,,,,,,,,,,
+r,,CompressorHysteresisHc,,,,,F83443,,,IGN:3,,,,,,D2C,,°K,Compressor hysteresis central heating (°K),,,,,,,,,,,,
+r,,CompressorHysteresisCooling,,,,,86353F,,,IGN:3,,,,,,D2C,,,Compressor hysteresis cooling (°K),,,,,,,,,,,,
+r,,HwcMode,,,,,523444,,,IGN:3,,,,,,UCH,0=eco;1=normal;2=balance,,Domestic hot water mod (eco/normal/balance),,,,,,,,,,,,
+r,,TargetTempHwc,,,,,C63207,,,IGN:3,,,,,,D2C,,°C,Target Hwc temperature (°C),,,,,,,,,,,,
+# Uncomment the next line if you want to be able to change TargetTempHwc (from Home Assistant for example)
+#w,hmu,TargetTempHwc,,,08,B51A,06783207,,,D2C,,°C,Target Hwc temperature (°C),,,,,,,,,,,,,,,,,,
+# Additional values from Live Monitor Main,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B503,00,,,,,,,,,,,,,,,,,,,,,,,,
+*w,,,,,,B503,00,,,,,,,,,,,,,,,,,,,,,,,,
+w,,ReadLiveMonitorMain,Payload needed sent: 03FFFF,,,,,,m,HEX:1,,,,,,,,,,,,,,,,,,,,,
+r,,LiveMonitorMain,,71,,,,id,,UCH,0x39=Controller starting;0xf4=Standby;0xf5=Supply on;0xf6=Heating: Flow ok;0xf7=Heating: temperature self test;0xf8=Heating: Start;0xfa=Heating: Fan on;0xfc=EEV switch;0xfd=Compressor starting;0xfe=Heating: compressor on;0x00=Compressor off;0x02=Compressor coast down;0x03=Deicing start;0x04=Deicing;0x05=Deicing end;0x12=Cooling: Flow on;0x14=Cooling: temperature self test;0x15=Cooling: starting;0x17=Cooling: Fan on;0x13=Cooling: Flow ok;0x19=Cooling: EEV?;0x1a=Cooling: compressor starting;0x1b=Cooling: compressor on;0x1d=Cooling: ending;0x29=Start condition not met;0x57=Device error;0x44=Flow error in distribution system,,,function,,UCH,0x01=Heating;0x02=Cooling,,,,,,,,,,,,,,
+# Values from VWZ test menu & UniTower test menu,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+# Query to WP entries Installer level/Test Menu/Sensor test,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B514,05,,,,,,,,,,,,,,,,,,,,,,,,
+*w,,,,,,B514,05,,,,,,,,,,,,,,,,,,,,,,,,
+r,,EEVSwitch,,,,,1403FFFF,,,IGN:2,,,,,,onoff,,,Four way valve (on/off),,,,,,,,,,,,
+w,,ReadEEVPosition,,,,,1503FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,EEVPosition,,,,,1503FFFF,,,IGN:2,,,,percentage,,UIN,,,,,,,,,,,,,,,
+r,,HeatingCoilCompressor,,,,,1703FFFF,,,IGN:2,,,,,,onoff,,,Heating coil compressor (on/off),,,,,,,,,,,,
+w,,ReadFlowTempSupply,,,,,2803FFFF,,,IGN:2,,,,,,temps2,10,°C,Supply temperature (°C),,,,,,,,,,,,
+r,,FlowTempSupply,,,,,2803FFFF,,,IGN:2,,,,temperature,,SIN,10,,°C,,,,,,,,,,,,
+w,,ReadFlowTempReturn,,,,,2903FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,FlowTempReturn,,,,,2903FFFF,,,IGN:2,,,,,,temps2,10,°C,Return temperature (°C),,,,,,,,,,,,
+w,,ReadDeliveryFlow,Read T.016,,,,2B03FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,DeliveryFlow,,,,,2B03FFFF,,,IGN:2,,,,,,UIN,,l/h,Current heating water flow rate (liter/hour),,,,,,,,,,,,
+w,,ReadCompressorExitTemp,,,,,3703FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,CompressorExitTemp,,,,,3703FFFF,,,IGN:2,,,,,,temps2,10,°C,Compressor outlet temperature (°C),,,,,,,,,,,,
+w,,ReadCompressorIntakeTemp,,,,,3803FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,CompressorIntakeTemp,,,,,3803FFFF,,,IGN:2,,,,,,temps2,10,°C,Compressor inlet temperature (°C),,,,,,,,,,,,
+w,,ReadEEVTemp,,,,,3b000000,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,EEVTemp,,,,,3b000000,,,IGN:2,,,,temperature,,SIN,10,,°C,,,,,,,,,,,,
+w,,ReadHighPressure,,,,,3F03FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,HighPressure,,,,,3F03FFFF,,,IGN:2,,,,pressure,,SIN,10,,bar,,,,,,,,,,,,
+r,,LowPressure,,,,,4003FFFF,,,IGN:2,,,,,,UIN,10,bar,Low pressure (bar),,,,,,,,,,,,
+w,,ReadCondensateTemp,,,,,5603FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,CondensationTemp,,,,,5603FFFF,,,IGN:2,,,,,,temps2,10,°C,Condensation temperature (°C),,,,,,,,,,,,
+w,,ReadEvapTemp,,,,,5503FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,EvaporationTemp,,,,,5503FFFF,,,IGN:2,,,,temperature,,SIN,10,,°C,,,,,,,,,,,,
+w,,ReadCompressorRPM,,,,,5D03FFFF,,m,HEX:3,,,,,,,,,,,,,,,,,,,,,
+r,,CompressorRPM,,,,,5D03FFFF,,,IGN:2,,,,,,UIN,10,Hz,Compressor speed (RPM),,,,,,,,,,,,
+r,,BuildingCircuitPumpPower,,,,,0103FFFF,,,IGN:2,,,,,,UIN,,%,Building circuit pump power (% of maximum),,,,,,,,,,,,
+r,,Fan1,,,,,1103FFFF,,,IGN:2,,,,,,UIN,,%,Fan 1 speed (% of max),,,,,,,,,,,,
+r,,Fan2,,,,,1203FFFF,,,IGN:2,,,,,,UIN,,%,Fan 2 speed (% of max),,,,,,,,,,,,
+r,,CondensateTrayHeater,,,,,1303FFFF,,,IGN:2,,,,,,onoff,,,Condensate tray heater (on/off),,,,,,,,,,,,
+r,,BuildingCircuitWaterPressure,,,,,2A03FFFF,,,IGN:2,,,,,,UIN,10,bar,Gebouwcircuit waterPressure (bar),,,,,,,,,,,,
+r,,AirInletTemp,,,,,3003FFFF,,,IGN:2,,,,,,temps2,10,°C,Air inlet temperature (°C),,,,,,,,,,,,
+r,,CondensorOutletTemp,,,,,3B03FFFF,,,IGN:2,,,,,,temps2,10,°C,Condensor outlet temperature (°C),,,,,,,,,,,,
+r,,HighPressureSwitch,,,,,4303FFFF,,,IGN:2,,,,,,UCH,0=open;1=closed,,High pressure switch (open/closed),,,,,,,,,,,,
+r,,OverheatingTargetValue,,,,,5703FFFF,,,IGN:2,,,,,,temps2,10,°K,Overheating target temperature (°K),,,,,,,,,,,,
+r,,OverheatingActualValue,,,,,5803FFFF,,,IGN:2,,,,,,temps2,10,°K,Overheating temperature actual (°K),,,,,,,,,,,,
+r,,SubcoolingTargetValue,,,,,5903FFFF,,,IGN:2,,,,,,temps2,10,°K,Subcooling target temperaturee (°K),,,,,,,,,,,,
+r,,SubcoolingActualValue,,,,,5A03FFFF,,,IGN:2,,,,,,temps2,10,°K,Subcooling temperature actual (°K),,,,,,,,,,,,
+r,,TemperatureSwitchCompressorOutlet,,,,,7B03FFFF,,,IGN:2,,,,,,UCH,0=open;1=closed,,,,,,,,,,,,,,
 # Total heating yields,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-*r,,,,,,"B516","18",,,IGN:1,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B516,18,,,IGN:1,,,,,,,,,,,,,,,,,,,,,
 r,,YieldTotal,,,,,01,,,energy,,,,,,,,,,,,,,,,,,,,,
 # Total electric power consumption,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 r,,ConsumptionTotal,,,,,02,,,energy,,,,,,,,,,,,,,,,,,,,,
 # Ecologic energy Yields,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-*r,,,,,,"B516","1A01",,,IGN:1,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B516,1A01,,,IGN:1,,,,,,,,,,,,,,,,,,,,,
 r,,YieldThisYear1,,,,,0100,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,YieldThisYear2,,,,,0200,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,YieldThisYear3,,,,,0300,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
@@ -33,7 +145,7 @@ r,,YieldThisYear10,,,,,0A00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,YieldThisYear11,,,,,0B00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,YieldThisYear12,,,,,0C00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 # Electric power consumption,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-*r,,,,,,"B516","1A02",,,IGN:1,,,,,,,,,,,,,,,,,,,,,
+*r,,,,,,B516,1A02,,,IGN:1,,,,,,,,,,,,,,,,,,,,,
 r,,ConsumptionThisYear1,,,,,0100,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,ConsumptionThisYear2,,,,,0200,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,ConsumptionThisYear3,,,,,0300,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
@@ -46,8 +158,5 @@ r,,ConsumptionThisYear9,,,,,0900,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,ConsumptionThisYear10,,,,,0A00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,ConsumptionThisYear11,,,,,0B00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
 r,,ConsumptionThisYear12,,,,,0C00,month,,D1B,,,,,,IGN:1,,,,,,energy,,,,,,,,,
-# Values from UniTower Test Menu,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-*r,,,,,,B514,05,,,IGN:2,,,,,,,,,,,,,,,,,,,,,
-r,,WaterThroughput,,,,,2B03FFFF,,,UIN,,l/h,current heating water flow rate in liters per hour,,,,,,,,,,,,,,,,,,
 !include,hcmode.inc,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-!include,errors.inc,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+!include,errors.inc,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
\ No newline at end of file