diff --git a/docs/Modbus-Entity-Registers.md b/docs/Modbus-Entity-Registers.md
index 829ace1f4..00540f20e 100644
--- a/docs/Modbus-Entity-Registers.md
+++ b/docs/Modbus-Entity-Registers.md
@@ -20,30 +20,22 @@ This file has been auto-generated. Do not modify.
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
 | heatingactivated | heating activated | boolean |   | true | DEVICE_DATA | 14 | 1 | 1 |
 uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -52,161 +44,101 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
 | mandefrost | manual defrost | cmd |   | true | DEVICE_DATA | 84 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
-uint24
-| dhw.nrg | energy | uint24 (>=0<=167772) | kWh | false | DHW | 0 | 2 | 1/100 |
-uint24
-| nrgheat | energy heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 87 | 2 | 1/100 |
-uint24
-| nrgcool | energy cooling | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 89 | 2 | 1/100 |
-uint24
-| metertotal | meter total | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 91 | 2 | 1/100 |
-uint24
-| metercomp | meter compressor | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 93 | 2 | 1/100 |
-uint24
-| metereheat | meter e-heater | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 95 | 2 | 1/100 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 97 | 2 | 1/100 |
-uint24
-| metercool | meter cooling | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 99 | 2 | 1/100 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=167772) | kWh | false | DHW | 2 | 2 | 1/100 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| dhw.nrg | energy | uint24 | kWh | false | DHW | 0 | 2 | 1/100 |
+| nrgheat | energy heating | uint24 | kWh | false | DEVICE_DATA | 87 | 2 | 1/100 |
+| nrgcool | energy cooling | uint24 | kWh | false | DEVICE_DATA | 89 | 2 | 1/100 |
+| metertotal | meter total | uint24 | kWh | false | DEVICE_DATA | 91 | 2 | 1/100 |
+| metercomp | meter compressor | uint24 | kWh | false | DEVICE_DATA | 93 | 2 | 1/100 |
+| metereheat | meter e-heater | uint24 | kWh | false | DEVICE_DATA | 95 | 2 | 1/100 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/100 |
+| metercool | meter cooling | uint24 | kWh | false | DEVICE_DATA | 99 | 2 | 1/100 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/100 |
 | uptimetotal | heatpump total uptime | time | minutes | false | DEVICE_DATA | 101 | 2 | 1/60 |
 | uptimecontrol | total operating time heat | time | minutes | false | DEVICE_DATA | 103 | 2 | 1/60 |
 | uptimecompheating | operating time compressor heating | time | minutes | false | DEVICE_DATA | 105 | 2 | 1/60 |
 | uptimecompcooling | operating time compressor cooling | time | minutes | false | DEVICE_DATA | 107 | 2 | 1/60 |
 | dhw.uptimecomp | operating time compressor | time | minutes | false | DHW | 4 | 2 | 1/60 |
 | uptimecomppool | operating time compressor pool | time | minutes | false | DEVICE_DATA | 109 | 2 | 1/60 |
-uint24
-| totalcompstarts | total compressor control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 111 | 2 | 1 |
-uint24
-| heatingstarts | heating control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 113 | 2 | 1 |
-uint24
-| coolingstarts | cooling control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 115 | 2 | 1 |
-uint24
-| dhw.startshp | starts hp | uint24 (>=0<=16777214) |   | false | DHW | 6 | 2 | 1 |
-uint24
-| poolstarts | pool control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 117 | 2 | 1 |
-uint24
-| nrgconstotal | total energy consumption | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 119 | 2 | 1 |
-uint24
-| nrgconscomptotal | total energy consumption compressor | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 121 | 2 | 1 |
-uint24
-| nrgconscompheating | energy consumption compressor heating | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 123 | 2 | 1 |
-uint24
-| dhw.nrgconscomp | energy consumption compressor | uint24 (>=0<=16777214) | kWh | false | DHW | 8 | 2 | 1 |
-uint24
-| nrgconscompcooling | energy consumption compressor cooling | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 125 | 2 | 1 |
-uint24
-| nrgconscomppool | energy consumption compressor pool | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 127 | 2 | 1 |
-uint24
-| auxelecheatnrgconstotal | total aux elec. heater energy consumption | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 129 | 2 | 1 |
-uint24
-| auxelecheatnrgconsheating | aux elec. heater energy consumption heating | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 131 | 2 | 1 |
-uint24
-| dhw.auxelecheatnrgcons | aux elec. heater energy consumption | uint24 (>=0<=16777214) | kWh | false | DHW | 10 | 2 | 1 |
-uint24
-| auxelecheatnrgconspool | aux elec. heater energy consumption pool | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 133 | 2 | 1 |
-uint24
-| nrgsupptotal | total energy supplied | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 135 | 2 | 1 |
-uint24
-| nrgsuppheating | total energy supplied heating | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 137 | 2 | 1 |
-uint24
-| dhw.nrgsupp | total energy warm supplied | uint24 (>=0<=16777214) | kWh | false | DHW | 12 | 2 | 1 |
-uint24
-| nrgsuppcooling | total energy supplied cooling | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 139 | 2 | 1 |
-uint24
-| nrgsupppool | total energy supplied pool | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 141 | 2 | 1 |
-uint16
-| hppower | compressor power output | uint16 (>=0<=3199) | kW | false | DEVICE_DATA | 143 | 1 | 1/10 |
+| totalcompstarts | total compressor control starts | uint24 |   | false | DEVICE_DATA | 111 | 2 | 1 |
+| heatingstarts | heating control starts | uint24 |   | false | DEVICE_DATA | 113 | 2 | 1 |
+| coolingstarts | cooling control starts | uint24 |   | false | DEVICE_DATA | 115 | 2 | 1 |
+| dhw.startshp | starts hp | uint24 |   | false | DHW | 6 | 2 | 1 |
+| poolstarts | pool control starts | uint24 |   | false | DEVICE_DATA | 117 | 2 | 1 |
+| nrgconstotal | total energy consumption | uint24 | kWh | false | DEVICE_DATA | 119 | 2 | 1 |
+| nrgconscomptotal | total energy consumption compressor | uint24 | kWh | false | DEVICE_DATA | 121 | 2 | 1 |
+| nrgconscompheating | energy consumption compressor heating | uint24 | kWh | false | DEVICE_DATA | 123 | 2 | 1 |
+| dhw.nrgconscomp | energy consumption compressor | uint24 | kWh | false | DHW | 8 | 2 | 1 |
+| nrgconscompcooling | energy consumption compressor cooling | uint24 | kWh | false | DEVICE_DATA | 125 | 2 | 1 |
+| nrgconscomppool | energy consumption compressor pool | uint24 | kWh | false | DEVICE_DATA | 127 | 2 | 1 |
+| auxelecheatnrgconstotal | total aux elec. heater energy consumption | uint24 | kWh | false | DEVICE_DATA | 129 | 2 | 1 |
+| auxelecheatnrgconsheating | aux elec. heater energy consumption heating | uint24 | kWh | false | DEVICE_DATA | 131 | 2 | 1 |
+| dhw.auxelecheatnrgcons | aux elec. heater energy consumption | uint24 | kWh | false | DHW | 10 | 2 | 1 |
+| auxelecheatnrgconspool | aux elec. heater energy consumption pool | uint24 | kWh | false | DEVICE_DATA | 133 | 2 | 1 |
+| nrgsupptotal | total energy supplied | uint24 | kWh | false | DEVICE_DATA | 135 | 2 | 1 |
+| nrgsuppheating | total energy supplied heating | uint24 | kWh | false | DEVICE_DATA | 137 | 2 | 1 |
+| dhw.nrgsupp | total energy warm supplied | uint24 | kWh | false | DHW | 12 | 2 | 1 |
+| nrgsuppcooling | total energy supplied cooling | uint24 | kWh | false | DEVICE_DATA | 139 | 2 | 1 |
+| nrgsupppool | total energy supplied pool | uint24 | kWh | false | DEVICE_DATA | 141 | 2 | 1 |
+| hppower | compressor power output | uint16 | kW | false | DEVICE_DATA | 143 | 1 | 1/10 |
 uint8
-| hpmaxpower | compressor max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 144 | 1 | 1 |
+| hpmaxpower | compressor max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 144 | 1 | 1 |
 uint8
-| pvmaxcomp | pv compressor max power | uint8 (>=0<=25) | kW | true | DEVICE_DATA | 145 | 1 | 1/10 |
+| pvmaxcomp | pv compressor max power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 145 | 1 | 1/10 |
 uint8
 | powerreduction | power reduction | uint8 (>=30<=60) | % | true | DEVICE_DATA | 146 | 1 | 10 |
 uint8
 | hpsetdiffpress | set differential pressure | uint8 (>=150<=750) | mbar | true | DEVICE_DATA | 147 | 1 | 50 |
 | hpcompon | hp compressor | boolean |   | false | DEVICE_DATA | 148 | 1 | 1 |
 | hpactivity | compressor activity | enum |   | false | DEVICE_DATA | 149 | 1 | 1 |
-uint8
-| hpbrinepumpspd | brine pump speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 150 | 1 | 1 |
+| hpbrinepumpspd | brine pump speed | uint8 | % | false | DEVICE_DATA | 150 | 1 | 1 |
 | hpswitchvalve | switch valve | boolean |   | false | DEVICE_DATA | 151 | 1 | 1 |
+| hpcompspd | compressor speed | uint8 | % | false | DEVICE_DATA | 152 | 1 | 1 |
+| hptargetspd | compressor target speed | uint8 | % | false | DEVICE_DATA | 153 | 1 | 1 |
+| hpcircspd | circulation pump speed | uint8 | % | false | DEVICE_DATA | 154 | 1 | 1 |
+| recvalve | receiver valve VR0 | uint8 | % | false | DEVICE_DATA | 155 | 1 | 1 |
+| expvalve | expansion valve VR1 | uint8 | % | false | DEVICE_DATA | 156 | 1 | 1 |
+| hpbrinein | brine in/evaporator | int16 | C | false | DEVICE_DATA | 157 | 1 | 1/10 |
+| hpbrineout | brine out/condenser | int16 | C | false | DEVICE_DATA | 158 | 1 | 1/10 |
+| hptc0 | heat carrier return (TC0) | int16 | C | false | DEVICE_DATA | 159 | 1 | 1/10 |
+| hptc1 | heat carrier forward (TC1) | int16 | C | false | DEVICE_DATA | 160 | 1 | 1/10 |
+| hptc3 | condenser temperature (TC3) | int16 | C | false | DEVICE_DATA | 161 | 1 | 1/10 |
+| hptr1 | compressor temperature (TR1) | int16 | C | false | DEVICE_DATA | 162 | 1 | 1/10 |
+| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 | C | false | DEVICE_DATA | 163 | 1 | 1/10 |
+| hptr4 | evaporator inlet temperature (TR4) | int16 | C | false | DEVICE_DATA | 164 | 1 | 1/10 |
+| hptr5 | compressor inlet temperature (TR5) | int16 | C | false | DEVICE_DATA | 165 | 1 | 1/10 |
+| hptr6 | compressor outlet temperature (TR6) | int16 | C | false | DEVICE_DATA | 166 | 1 | 1/10 |
+| hptr7 | refrigerant temperature gas side (condenser input) (TR7) | int16 | C | false | DEVICE_DATA | 167 | 1 | 1/10 |
+| hptl2 | air inlet temperature (TL2) | int16 | C | false | DEVICE_DATA | 168 | 1 | 1/10 |
+| hppl1 | low pressure side temperature (PL1) | int16 | C | false | DEVICE_DATA | 169 | 1 | 1/10 |
+| hpph1 | high pressure side temperature (PH1) | int16 | C | false | DEVICE_DATA | 170 | 1 | 1/10 |
+| hpta4 | drain pan temp (TA4) | int16 | C | false | DEVICE_DATA | 171 | 1 | 1/10 |
+| hptw1 | reservoir temp (TW1) | int16 | C | false | DEVICE_DATA | 172 | 1 | 1/10 |
 uint8
-| hpcompspd | compressor speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 152 | 1 | 1 |
-uint8
-| hptargetspd | compressor target speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 153 | 1 | 1 |
-uint8
-| hpcircspd | circulation pump speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 154 | 1 | 1 |
-uint8
-| recvalve | receiver valve VR0 | uint8 (>=0<=100) | % | false | DEVICE_DATA | 155 | 1 | 1 |
-uint8
-| expvalve | expansion valve VR1 | uint8 (>=0<=100) | % | false | DEVICE_DATA | 156 | 1 | 1 |
-int16
-| hpbrinein | brine in/evaporator | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 157 | 1 | 1/10 |
-int16
-| hpbrineout | brine out/condenser | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 158 | 1 | 1/10 |
-int16
-| hptc0 | heat carrier return (TC0) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 159 | 1 | 1/10 |
-int16
-| hptc1 | heat carrier forward (TC1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 160 | 1 | 1/10 |
-int16
-| hptc3 | condenser temperature (TC3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 161 | 1 | 1/10 |
-int16
-| hptr1 | compressor temperature (TR1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 162 | 1 | 1/10 |
-int16
-| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 163 | 1 | 1/10 |
-int16
-| hptr4 | evaporator inlet temperature (TR4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 164 | 1 | 1/10 |
-int16
-| hptr5 | compressor inlet temperature (TR5) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 165 | 1 | 1/10 |
-int16
-| hptr6 | compressor outlet temperature (TR6) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 166 | 1 | 1/10 |
-int16
-| hptr7 | refrigerant temperature gas side (condenser input) (TR7) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 167 | 1 | 1/10 |
-int16
-| hptl2 | air inlet temperature (TL2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 168 | 1 | 1/10 |
-int16
-| hppl1 | low pressure side temperature (PL1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 169 | 1 | 1/10 |
-int16
-| hpph1 | high pressure side temperature (PH1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 170 | 1 | 1/10 |
-int16
-| hpta4 | drain pan temp (TA4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 171 | 1 | 1/10 |
-int16
-| hptw1 | reservoir temp (TW1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 172 | 1 | 1/10 |
-uint8
-| poolsettemp | pool set temperature | uint8 (>=0<=127) | C | true | DEVICE_DATA | 173 | 1 | 1/2 |
+| poolsettemp | pool set temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 173 | 1 | 1/2 |
 | hpin1 | input 1 state | boolean |   | false | DEVICE_DATA | 174 | 1 | 1 |
 | hpin1opt | input 1 options | string |   | true | DEVICE_DATA | 175 | 8 | 1 |
 | hpin2 | input 2 state | boolean |   | false | DEVICE_DATA | 183 | 1 | 1 |
@@ -223,8 +155,7 @@ uint8
 | auxheateronly | aux heater only | boolean |   | true | DEVICE_DATA | 214 | 1 | 1 |
 | auxheateroff | disable aux heater | boolean |   | true | DEVICE_DATA | 215 | 1 | 1 |
 | auxheaterstatus | aux heater status | enum |   | false | DEVICE_DATA | 216 | 1 | 1 |
-uint8
-| auxheaterlevel | aux heater level | uint8 (>=0<=100) | % | false | DEVICE_DATA | 217 | 1 | 1 |
+| auxheaterlevel | aux heater level | uint8 | % | false | DEVICE_DATA | 217 | 1 | 1 |
 uint16
 | auxheaterdelay | aux heater on delay | uint16 (>=10<=1000) | K*min | true | DEVICE_DATA | 218 | 1 | 10 |
 uint8
@@ -240,15 +171,14 @@ uint16
 | hphystpool | on/off hyst pool | uint16 (>=50<=1500) | K*min | true | DEVICE_DATA | 224 | 1 | 5 |
 | silentmode | silent mode | enum |   | true | DEVICE_DATA | 225 | 1 | 1 |
 uint8
-| silentfrom | silent mode from | uint8 (>=0<=3810) | minutes | true | DEVICE_DATA | 226 | 1 | 15 |
+| silentfrom | silent mode from | uint8 (>=0<=0) | minutes | true | DEVICE_DATA | 226 | 1 | 15 |
 uint8
-| silentto | silent mode to | uint8 (>=0<=3810) | minutes | true | DEVICE_DATA | 227 | 1 | 15 |
+| silentto | silent mode to | uint8 (>=0<=0) | minutes | true | DEVICE_DATA | 227 | 1 | 15 |
 int8
-| mintempsilent | min outside temp for silent mode | int8 (>=-126<=126) | C | true | DEVICE_DATA | 228 | 1 | 1 |
+| mintempsilent | min outside temp for silent mode | int8 (>=0<=0) | C | true | DEVICE_DATA | 228 | 1 | 1 |
 int8
-| tempparmode | outside temp parallel mode | int8 (>=-126<=126) | C | true | DEVICE_DATA | 229 | 1 | 1 |
-int8
-| auxheatmix | aux heater mixing valve | int8 (>=-100<=100) | % | false | DEVICE_DATA | 230 | 1 | 1 |
+| tempparmode | outside temp parallel mode | int8 (>=0<=0) | C | true | DEVICE_DATA | 229 | 1 | 1 |
+| auxheatmix | aux heater mixing valve | int8 | % | false | DEVICE_DATA | 230 | 1 | 1 |
 uint8
 | tempdiffheat | temp diff TC3/TC0 heat | uint8 (>=2<=10) | K | true | DEVICE_DATA | 231 | 1 | 1/10 |
 uint8
@@ -258,7 +188,7 @@ uint8
 | vc0valve | VC0 valve | boolean |   | true | DEVICE_DATA | 235 | 1 | 1 |
 | primepump | primary heatpump | boolean |   | true | DEVICE_DATA | 236 | 1 | 1 |
 uint8
-| primepumpmod | primary heatpump modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 237 | 1 | 1 |
+| primepumpmod | primary heatpump modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 237 | 1 | 1 |
 | hp3way | 3-way valve | boolean |   | true | DEVICE_DATA | 238 | 1 | 1 |
 | elheatstep1 | el. heater step 1 | boolean |   | true | DEVICE_DATA | 239 | 1 | 1 |
 | elheatstep2 | el. heater step 2 | boolean |   | true | DEVICE_DATA | 240 | 1 | 1 |
@@ -267,13 +197,11 @@ uint8
 | hppumpmode | primary heatpump mode | enum |   | true | DEVICE_DATA | 243 | 1 | 1 |
 uint8
 | fan | fan | uint8 (>=20<=100) | % | true | DEVICE_DATA | 244 | 1 | 1 |
-uint8
-| fanspd | fan speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 245 | 1 | 1 |
+| fanspd | fan speed | uint8 | % | false | DEVICE_DATA | 245 | 1 | 1 |
 | shutdown | shutdown | cmd |   | true | DEVICE_DATA | 246 | 1 | 1 |
+| hpcurrpower | compressor current power | uint16 | W | false | DEVICE_DATA | 247 | 1 | 1 |
 uint16
-| hpcurrpower | compressor current power | uint16 (>=0<=31999) | W | false | DEVICE_DATA | 247 | 1 | 1 |
-uint16
-| hppowerlimit | power limit | uint16 (>=0<=31999) | W | true | DEVICE_DATA | 248 | 1 | 1 |
+| hppowerlimit | power limit | uint16 (>=0<=0) | W | true | DEVICE_DATA | 248 | 1 | 1 |
 | dhw.alternatingop | alternating operation | boolean |   | true | DHW | 15 | 1 | 1 |
 uint8
 | dhw.altopprioheat | prioritise heating during dhw | uint8 (>=20<=120) | minutes | true | DHW | 16 | 1 | 1 |
@@ -292,27 +220,24 @@ uint8
 uint8
 | dhw.ecoplusdiff | eco+ diff | uint8 (>=4<=15) | K | true | DHW | 23 | 1 | 1 |
 uint8
-| dhw.comfstop | comfort stop temp | uint8 (>=0<=254) | C | true | DHW | 24 | 1 | 1 |
+| dhw.comfstop | comfort stop temp | uint8 (>=0<=0) | C | true | DHW | 24 | 1 | 1 |
 uint8
-| dhw.ecostop | eco stop temp | uint8 (>=0<=254) | C | true | DHW | 25 | 1 | 1 |
+| dhw.ecostop | eco stop temp | uint8 (>=0<=0) | C | true | DHW | 25 | 1 | 1 |
 uint8
-| dhw.ecoplusstop | eco+ stop temp | uint8 (>=0<=254) | C | true | DHW | 26 | 1 | 1 |
+| dhw.ecoplusstop | eco+ stop temp | uint8 (>=0<=0) | C | true | DHW | 26 | 1 | 1 |
 | dhw.hpcircpump | circulation pump available during dhw | boolean |   | true | DHW | 27 | 1 | 1 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -326,23 +251,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -352,13 +272,10 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 
 ### Greenstar 2000
@@ -372,41 +289,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -430,9 +335,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -441,62 +346,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -510,23 +399,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -536,18 +420,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -564,41 +444,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -622,9 +490,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -633,62 +501,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -702,23 +554,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -728,18 +575,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -756,41 +599,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -814,9 +645,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -825,62 +656,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -894,23 +709,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -920,18 +730,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -948,41 +754,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -1006,9 +800,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -1017,62 +811,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -1086,23 +864,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -1112,18 +885,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -1140,41 +909,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -1198,9 +955,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -1209,62 +966,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -1278,23 +1019,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -1304,18 +1040,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -1332,41 +1064,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -1390,9 +1110,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -1401,62 +1121,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -1470,23 +1174,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -1496,18 +1195,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -1524,41 +1219,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -1582,9 +1265,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -1593,62 +1276,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -1662,23 +1329,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -1688,18 +1350,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -1716,41 +1374,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -1774,9 +1420,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -1785,62 +1431,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -1854,23 +1484,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -1880,18 +1505,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -1908,41 +1529,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -1966,9 +1575,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -1977,62 +1586,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -2046,23 +1639,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -2072,18 +1660,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -2100,41 +1684,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -2158,9 +1730,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -2169,62 +1741,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -2238,23 +1794,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -2264,18 +1815,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -2292,41 +1839,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -2350,9 +1885,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -2361,62 +1896,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -2430,23 +1949,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -2456,18 +1970,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -2484,41 +1994,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -2542,9 +2040,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -2553,62 +2051,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -2622,23 +2104,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -2648,18 +2125,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -2676,41 +2149,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -2734,9 +2195,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -2745,62 +2206,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -2814,23 +2259,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -2840,18 +2280,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -2868,41 +2304,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -2926,9 +2350,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -2937,62 +2361,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -3006,23 +2414,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -3032,18 +2435,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -3060,41 +2459,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -3118,9 +2505,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -3129,62 +2516,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -3198,23 +2569,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -3224,18 +2590,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -3252,41 +2614,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -3310,9 +2660,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -3321,62 +2671,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -3390,23 +2724,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -3416,18 +2745,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -3444,41 +2769,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -3502,9 +2815,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -3513,62 +2826,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -3582,23 +2879,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -3608,18 +2900,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -3636,41 +2924,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -3694,9 +2970,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -3705,62 +2981,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -3774,23 +3034,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -3800,18 +3055,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -3828,41 +3079,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -3886,9 +3125,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -3897,62 +3136,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -3966,23 +3189,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -3992,18 +3210,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -4020,41 +3234,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -4078,9 +3280,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -4089,62 +3291,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -4158,23 +3344,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -4184,18 +3365,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -4212,30 +3389,22 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
 | heatingactivated | heating activated | boolean |   | true | DEVICE_DATA | 14 | 1 | 1 |
 uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -4244,161 +3413,101 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
 | mandefrost | manual defrost | cmd |   | true | DEVICE_DATA | 84 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
-uint24
-| dhw.nrg | energy | uint24 (>=0<=167772) | kWh | false | DHW | 0 | 2 | 1/100 |
-uint24
-| nrgheat | energy heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 87 | 2 | 1/100 |
-uint24
-| nrgcool | energy cooling | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 89 | 2 | 1/100 |
-uint24
-| metertotal | meter total | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 91 | 2 | 1/100 |
-uint24
-| metercomp | meter compressor | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 93 | 2 | 1/100 |
-uint24
-| metereheat | meter e-heater | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 95 | 2 | 1/100 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 97 | 2 | 1/100 |
-uint24
-| metercool | meter cooling | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 99 | 2 | 1/100 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=167772) | kWh | false | DHW | 2 | 2 | 1/100 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| dhw.nrg | energy | uint24 | kWh | false | DHW | 0 | 2 | 1/100 |
+| nrgheat | energy heating | uint24 | kWh | false | DEVICE_DATA | 87 | 2 | 1/100 |
+| nrgcool | energy cooling | uint24 | kWh | false | DEVICE_DATA | 89 | 2 | 1/100 |
+| metertotal | meter total | uint24 | kWh | false | DEVICE_DATA | 91 | 2 | 1/100 |
+| metercomp | meter compressor | uint24 | kWh | false | DEVICE_DATA | 93 | 2 | 1/100 |
+| metereheat | meter e-heater | uint24 | kWh | false | DEVICE_DATA | 95 | 2 | 1/100 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/100 |
+| metercool | meter cooling | uint24 | kWh | false | DEVICE_DATA | 99 | 2 | 1/100 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/100 |
 | uptimetotal | heatpump total uptime | time | minutes | false | DEVICE_DATA | 101 | 2 | 1/60 |
 | uptimecontrol | total operating time heat | time | minutes | false | DEVICE_DATA | 103 | 2 | 1/60 |
 | uptimecompheating | operating time compressor heating | time | minutes | false | DEVICE_DATA | 105 | 2 | 1/60 |
 | uptimecompcooling | operating time compressor cooling | time | minutes | false | DEVICE_DATA | 107 | 2 | 1/60 |
 | dhw.uptimecomp | operating time compressor | time | minutes | false | DHW | 4 | 2 | 1/60 |
 | uptimecomppool | operating time compressor pool | time | minutes | false | DEVICE_DATA | 109 | 2 | 1/60 |
-uint24
-| totalcompstarts | total compressor control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 111 | 2 | 1 |
-uint24
-| heatingstarts | heating control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 113 | 2 | 1 |
-uint24
-| coolingstarts | cooling control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 115 | 2 | 1 |
-uint24
-| dhw.startshp | starts hp | uint24 (>=0<=16777214) |   | false | DHW | 6 | 2 | 1 |
-uint24
-| poolstarts | pool control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 117 | 2 | 1 |
-uint24
-| nrgconstotal | total energy consumption | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 119 | 2 | 1 |
-uint24
-| nrgconscomptotal | total energy consumption compressor | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 121 | 2 | 1 |
-uint24
-| nrgconscompheating | energy consumption compressor heating | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 123 | 2 | 1 |
-uint24
-| dhw.nrgconscomp | energy consumption compressor | uint24 (>=0<=16777214) | kWh | false | DHW | 8 | 2 | 1 |
-uint24
-| nrgconscompcooling | energy consumption compressor cooling | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 125 | 2 | 1 |
-uint24
-| nrgconscomppool | energy consumption compressor pool | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 127 | 2 | 1 |
-uint24
-| auxelecheatnrgconstotal | total aux elec. heater energy consumption | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 129 | 2 | 1 |
-uint24
-| auxelecheatnrgconsheating | aux elec. heater energy consumption heating | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 131 | 2 | 1 |
-uint24
-| dhw.auxelecheatnrgcons | aux elec. heater energy consumption | uint24 (>=0<=16777214) | kWh | false | DHW | 10 | 2 | 1 |
-uint24
-| auxelecheatnrgconspool | aux elec. heater energy consumption pool | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 133 | 2 | 1 |
-uint24
-| nrgsupptotal | total energy supplied | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 135 | 2 | 1 |
-uint24
-| nrgsuppheating | total energy supplied heating | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 137 | 2 | 1 |
-uint24
-| dhw.nrgsupp | total energy warm supplied | uint24 (>=0<=16777214) | kWh | false | DHW | 12 | 2 | 1 |
-uint24
-| nrgsuppcooling | total energy supplied cooling | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 139 | 2 | 1 |
-uint24
-| nrgsupppool | total energy supplied pool | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 141 | 2 | 1 |
-uint16
-| hppower | compressor power output | uint16 (>=0<=3199) | kW | false | DEVICE_DATA | 143 | 1 | 1/10 |
+| totalcompstarts | total compressor control starts | uint24 |   | false | DEVICE_DATA | 111 | 2 | 1 |
+| heatingstarts | heating control starts | uint24 |   | false | DEVICE_DATA | 113 | 2 | 1 |
+| coolingstarts | cooling control starts | uint24 |   | false | DEVICE_DATA | 115 | 2 | 1 |
+| dhw.startshp | starts hp | uint24 |   | false | DHW | 6 | 2 | 1 |
+| poolstarts | pool control starts | uint24 |   | false | DEVICE_DATA | 117 | 2 | 1 |
+| nrgconstotal | total energy consumption | uint24 | kWh | false | DEVICE_DATA | 119 | 2 | 1 |
+| nrgconscomptotal | total energy consumption compressor | uint24 | kWh | false | DEVICE_DATA | 121 | 2 | 1 |
+| nrgconscompheating | energy consumption compressor heating | uint24 | kWh | false | DEVICE_DATA | 123 | 2 | 1 |
+| dhw.nrgconscomp | energy consumption compressor | uint24 | kWh | false | DHW | 8 | 2 | 1 |
+| nrgconscompcooling | energy consumption compressor cooling | uint24 | kWh | false | DEVICE_DATA | 125 | 2 | 1 |
+| nrgconscomppool | energy consumption compressor pool | uint24 | kWh | false | DEVICE_DATA | 127 | 2 | 1 |
+| auxelecheatnrgconstotal | total aux elec. heater energy consumption | uint24 | kWh | false | DEVICE_DATA | 129 | 2 | 1 |
+| auxelecheatnrgconsheating | aux elec. heater energy consumption heating | uint24 | kWh | false | DEVICE_DATA | 131 | 2 | 1 |
+| dhw.auxelecheatnrgcons | aux elec. heater energy consumption | uint24 | kWh | false | DHW | 10 | 2 | 1 |
+| auxelecheatnrgconspool | aux elec. heater energy consumption pool | uint24 | kWh | false | DEVICE_DATA | 133 | 2 | 1 |
+| nrgsupptotal | total energy supplied | uint24 | kWh | false | DEVICE_DATA | 135 | 2 | 1 |
+| nrgsuppheating | total energy supplied heating | uint24 | kWh | false | DEVICE_DATA | 137 | 2 | 1 |
+| dhw.nrgsupp | total energy warm supplied | uint24 | kWh | false | DHW | 12 | 2 | 1 |
+| nrgsuppcooling | total energy supplied cooling | uint24 | kWh | false | DEVICE_DATA | 139 | 2 | 1 |
+| nrgsupppool | total energy supplied pool | uint24 | kWh | false | DEVICE_DATA | 141 | 2 | 1 |
+| hppower | compressor power output | uint16 | kW | false | DEVICE_DATA | 143 | 1 | 1/10 |
 uint8
-| hpmaxpower | compressor max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 144 | 1 | 1 |
+| hpmaxpower | compressor max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 144 | 1 | 1 |
 uint8
-| pvmaxcomp | pv compressor max power | uint8 (>=0<=25) | kW | true | DEVICE_DATA | 145 | 1 | 1/10 |
+| pvmaxcomp | pv compressor max power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 145 | 1 | 1/10 |
 uint8
 | powerreduction | power reduction | uint8 (>=30<=60) | % | true | DEVICE_DATA | 146 | 1 | 10 |
 uint8
 | hpsetdiffpress | set differential pressure | uint8 (>=150<=750) | mbar | true | DEVICE_DATA | 147 | 1 | 50 |
 | hpcompon | hp compressor | boolean |   | false | DEVICE_DATA | 148 | 1 | 1 |
 | hpactivity | compressor activity | enum |   | false | DEVICE_DATA | 149 | 1 | 1 |
-uint8
-| hpbrinepumpspd | brine pump speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 150 | 1 | 1 |
+| hpbrinepumpspd | brine pump speed | uint8 | % | false | DEVICE_DATA | 150 | 1 | 1 |
 | hpswitchvalve | switch valve | boolean |   | false | DEVICE_DATA | 151 | 1 | 1 |
+| hpcompspd | compressor speed | uint8 | % | false | DEVICE_DATA | 152 | 1 | 1 |
+| hptargetspd | compressor target speed | uint8 | % | false | DEVICE_DATA | 153 | 1 | 1 |
+| hpcircspd | circulation pump speed | uint8 | % | false | DEVICE_DATA | 154 | 1 | 1 |
+| recvalve | receiver valve VR0 | uint8 | % | false | DEVICE_DATA | 155 | 1 | 1 |
+| expvalve | expansion valve VR1 | uint8 | % | false | DEVICE_DATA | 156 | 1 | 1 |
+| hpbrinein | brine in/evaporator | int16 | C | false | DEVICE_DATA | 157 | 1 | 1/10 |
+| hpbrineout | brine out/condenser | int16 | C | false | DEVICE_DATA | 158 | 1 | 1/10 |
+| hptc0 | heat carrier return (TC0) | int16 | C | false | DEVICE_DATA | 159 | 1 | 1/10 |
+| hptc1 | heat carrier forward (TC1) | int16 | C | false | DEVICE_DATA | 160 | 1 | 1/10 |
+| hptc3 | condenser temperature (TC3) | int16 | C | false | DEVICE_DATA | 161 | 1 | 1/10 |
+| hptr1 | compressor temperature (TR1) | int16 | C | false | DEVICE_DATA | 162 | 1 | 1/10 |
+| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 | C | false | DEVICE_DATA | 163 | 1 | 1/10 |
+| hptr4 | evaporator inlet temperature (TR4) | int16 | C | false | DEVICE_DATA | 164 | 1 | 1/10 |
+| hptr5 | compressor inlet temperature (TR5) | int16 | C | false | DEVICE_DATA | 165 | 1 | 1/10 |
+| hptr6 | compressor outlet temperature (TR6) | int16 | C | false | DEVICE_DATA | 166 | 1 | 1/10 |
+| hptr7 | refrigerant temperature gas side (condenser input) (TR7) | int16 | C | false | DEVICE_DATA | 167 | 1 | 1/10 |
+| hptl2 | air inlet temperature (TL2) | int16 | C | false | DEVICE_DATA | 168 | 1 | 1/10 |
+| hppl1 | low pressure side temperature (PL1) | int16 | C | false | DEVICE_DATA | 169 | 1 | 1/10 |
+| hpph1 | high pressure side temperature (PH1) | int16 | C | false | DEVICE_DATA | 170 | 1 | 1/10 |
+| hpta4 | drain pan temp (TA4) | int16 | C | false | DEVICE_DATA | 171 | 1 | 1/10 |
+| hptw1 | reservoir temp (TW1) | int16 | C | false | DEVICE_DATA | 172 | 1 | 1/10 |
 uint8
-| hpcompspd | compressor speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 152 | 1 | 1 |
-uint8
-| hptargetspd | compressor target speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 153 | 1 | 1 |
-uint8
-| hpcircspd | circulation pump speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 154 | 1 | 1 |
-uint8
-| recvalve | receiver valve VR0 | uint8 (>=0<=100) | % | false | DEVICE_DATA | 155 | 1 | 1 |
-uint8
-| expvalve | expansion valve VR1 | uint8 (>=0<=100) | % | false | DEVICE_DATA | 156 | 1 | 1 |
-int16
-| hpbrinein | brine in/evaporator | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 157 | 1 | 1/10 |
-int16
-| hpbrineout | brine out/condenser | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 158 | 1 | 1/10 |
-int16
-| hptc0 | heat carrier return (TC0) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 159 | 1 | 1/10 |
-int16
-| hptc1 | heat carrier forward (TC1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 160 | 1 | 1/10 |
-int16
-| hptc3 | condenser temperature (TC3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 161 | 1 | 1/10 |
-int16
-| hptr1 | compressor temperature (TR1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 162 | 1 | 1/10 |
-int16
-| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 163 | 1 | 1/10 |
-int16
-| hptr4 | evaporator inlet temperature (TR4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 164 | 1 | 1/10 |
-int16
-| hptr5 | compressor inlet temperature (TR5) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 165 | 1 | 1/10 |
-int16
-| hptr6 | compressor outlet temperature (TR6) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 166 | 1 | 1/10 |
-int16
-| hptr7 | refrigerant temperature gas side (condenser input) (TR7) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 167 | 1 | 1/10 |
-int16
-| hptl2 | air inlet temperature (TL2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 168 | 1 | 1/10 |
-int16
-| hppl1 | low pressure side temperature (PL1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 169 | 1 | 1/10 |
-int16
-| hpph1 | high pressure side temperature (PH1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 170 | 1 | 1/10 |
-int16
-| hpta4 | drain pan temp (TA4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 171 | 1 | 1/10 |
-int16
-| hptw1 | reservoir temp (TW1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 172 | 1 | 1/10 |
-uint8
-| poolsettemp | pool set temperature | uint8 (>=0<=127) | C | true | DEVICE_DATA | 173 | 1 | 1/2 |
+| poolsettemp | pool set temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 173 | 1 | 1/2 |
 | hpin1 | input 1 state | boolean |   | false | DEVICE_DATA | 174 | 1 | 1 |
 | hpin1opt | input 1 options | string |   | true | DEVICE_DATA | 175 | 8 | 1 |
 | hpin2 | input 2 state | boolean |   | false | DEVICE_DATA | 183 | 1 | 1 |
@@ -4415,8 +3524,7 @@ uint8
 | auxheateronly | aux heater only | boolean |   | true | DEVICE_DATA | 214 | 1 | 1 |
 | auxheateroff | disable aux heater | boolean |   | true | DEVICE_DATA | 215 | 1 | 1 |
 | auxheaterstatus | aux heater status | enum |   | false | DEVICE_DATA | 216 | 1 | 1 |
-uint8
-| auxheaterlevel | aux heater level | uint8 (>=0<=100) | % | false | DEVICE_DATA | 217 | 1 | 1 |
+| auxheaterlevel | aux heater level | uint8 | % | false | DEVICE_DATA | 217 | 1 | 1 |
 uint16
 | auxheaterdelay | aux heater on delay | uint16 (>=10<=1000) | K*min | true | DEVICE_DATA | 218 | 1 | 10 |
 uint8
@@ -4432,15 +3540,14 @@ uint16
 | hphystpool | on/off hyst pool | uint16 (>=50<=1500) | K*min | true | DEVICE_DATA | 224 | 1 | 5 |
 | silentmode | silent mode | enum |   | true | DEVICE_DATA | 225 | 1 | 1 |
 uint8
-| silentfrom | silent mode from | uint8 (>=0<=3810) | minutes | true | DEVICE_DATA | 226 | 1 | 15 |
+| silentfrom | silent mode from | uint8 (>=0<=0) | minutes | true | DEVICE_DATA | 226 | 1 | 15 |
 uint8
-| silentto | silent mode to | uint8 (>=0<=3810) | minutes | true | DEVICE_DATA | 227 | 1 | 15 |
+| silentto | silent mode to | uint8 (>=0<=0) | minutes | true | DEVICE_DATA | 227 | 1 | 15 |
 int8
-| mintempsilent | min outside temp for silent mode | int8 (>=-126<=126) | C | true | DEVICE_DATA | 228 | 1 | 1 |
+| mintempsilent | min outside temp for silent mode | int8 (>=0<=0) | C | true | DEVICE_DATA | 228 | 1 | 1 |
 int8
-| tempparmode | outside temp parallel mode | int8 (>=-126<=126) | C | true | DEVICE_DATA | 229 | 1 | 1 |
-int8
-| auxheatmix | aux heater mixing valve | int8 (>=-100<=100) | % | false | DEVICE_DATA | 230 | 1 | 1 |
+| tempparmode | outside temp parallel mode | int8 (>=0<=0) | C | true | DEVICE_DATA | 229 | 1 | 1 |
+| auxheatmix | aux heater mixing valve | int8 | % | false | DEVICE_DATA | 230 | 1 | 1 |
 uint8
 | tempdiffheat | temp diff TC3/TC0 heat | uint8 (>=2<=10) | K | true | DEVICE_DATA | 231 | 1 | 1/10 |
 uint8
@@ -4450,7 +3557,7 @@ uint8
 | vc0valve | VC0 valve | boolean |   | true | DEVICE_DATA | 235 | 1 | 1 |
 | primepump | primary heatpump | boolean |   | true | DEVICE_DATA | 236 | 1 | 1 |
 uint8
-| primepumpmod | primary heatpump modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 237 | 1 | 1 |
+| primepumpmod | primary heatpump modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 237 | 1 | 1 |
 | hp3way | 3-way valve | boolean |   | true | DEVICE_DATA | 238 | 1 | 1 |
 | elheatstep1 | el. heater step 1 | boolean |   | true | DEVICE_DATA | 239 | 1 | 1 |
 | elheatstep2 | el. heater step 2 | boolean |   | true | DEVICE_DATA | 240 | 1 | 1 |
@@ -4459,13 +3566,11 @@ uint8
 | hppumpmode | primary heatpump mode | enum |   | true | DEVICE_DATA | 243 | 1 | 1 |
 uint8
 | fan | fan | uint8 (>=20<=100) | % | true | DEVICE_DATA | 244 | 1 | 1 |
-uint8
-| fanspd | fan speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 245 | 1 | 1 |
+| fanspd | fan speed | uint8 | % | false | DEVICE_DATA | 245 | 1 | 1 |
 | shutdown | shutdown | cmd |   | true | DEVICE_DATA | 246 | 1 | 1 |
+| hpcurrpower | compressor current power | uint16 | W | false | DEVICE_DATA | 247 | 1 | 1 |
 uint16
-| hpcurrpower | compressor current power | uint16 (>=0<=31999) | W | false | DEVICE_DATA | 247 | 1 | 1 |
-uint16
-| hppowerlimit | power limit | uint16 (>=0<=31999) | W | true | DEVICE_DATA | 248 | 1 | 1 |
+| hppowerlimit | power limit | uint16 (>=0<=0) | W | true | DEVICE_DATA | 248 | 1 | 1 |
 | dhw.alternatingop | alternating operation | boolean |   | true | DHW | 15 | 1 | 1 |
 uint8
 | dhw.altopprioheat | prioritise heating during dhw | uint8 (>=20<=120) | minutes | true | DHW | 16 | 1 | 1 |
@@ -4484,27 +3589,24 @@ uint8
 uint8
 | dhw.ecoplusdiff | eco+ diff | uint8 (>=4<=15) | K | true | DHW | 23 | 1 | 1 |
 uint8
-| dhw.comfstop | comfort stop temp | uint8 (>=0<=254) | C | true | DHW | 24 | 1 | 1 |
+| dhw.comfstop | comfort stop temp | uint8 (>=0<=0) | C | true | DHW | 24 | 1 | 1 |
 uint8
-| dhw.ecostop | eco stop temp | uint8 (>=0<=254) | C | true | DHW | 25 | 1 | 1 |
+| dhw.ecostop | eco stop temp | uint8 (>=0<=0) | C | true | DHW | 25 | 1 | 1 |
 uint8
-| dhw.ecoplusstop | eco+ stop temp | uint8 (>=0<=254) | C | true | DHW | 26 | 1 | 1 |
+| dhw.ecoplusstop | eco+ stop temp | uint8 (>=0<=0) | C | true | DHW | 26 | 1 | 1 |
 | dhw.hpcircpump | circulation pump available during dhw | boolean |   | true | DHW | 27 | 1 | 1 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -4518,23 +3620,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -4544,13 +3641,10 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 
 ### Geo 5xx
@@ -4564,30 +3658,22 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
 | heatingactivated | heating activated | boolean |   | true | DEVICE_DATA | 14 | 1 | 1 |
 uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -4596,161 +3682,101 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
 | mandefrost | manual defrost | cmd |   | true | DEVICE_DATA | 84 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
-uint24
-| dhw.nrg | energy | uint24 (>=0<=167772) | kWh | false | DHW | 0 | 2 | 1/100 |
-uint24
-| nrgheat | energy heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 87 | 2 | 1/100 |
-uint24
-| nrgcool | energy cooling | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 89 | 2 | 1/100 |
-uint24
-| metertotal | meter total | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 91 | 2 | 1/100 |
-uint24
-| metercomp | meter compressor | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 93 | 2 | 1/100 |
-uint24
-| metereheat | meter e-heater | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 95 | 2 | 1/100 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 97 | 2 | 1/100 |
-uint24
-| metercool | meter cooling | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 99 | 2 | 1/100 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=167772) | kWh | false | DHW | 2 | 2 | 1/100 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| dhw.nrg | energy | uint24 | kWh | false | DHW | 0 | 2 | 1/100 |
+| nrgheat | energy heating | uint24 | kWh | false | DEVICE_DATA | 87 | 2 | 1/100 |
+| nrgcool | energy cooling | uint24 | kWh | false | DEVICE_DATA | 89 | 2 | 1/100 |
+| metertotal | meter total | uint24 | kWh | false | DEVICE_DATA | 91 | 2 | 1/100 |
+| metercomp | meter compressor | uint24 | kWh | false | DEVICE_DATA | 93 | 2 | 1/100 |
+| metereheat | meter e-heater | uint24 | kWh | false | DEVICE_DATA | 95 | 2 | 1/100 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/100 |
+| metercool | meter cooling | uint24 | kWh | false | DEVICE_DATA | 99 | 2 | 1/100 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/100 |
 | uptimetotal | heatpump total uptime | time | minutes | false | DEVICE_DATA | 101 | 2 | 1/60 |
 | uptimecontrol | total operating time heat | time | minutes | false | DEVICE_DATA | 103 | 2 | 1/60 |
 | uptimecompheating | operating time compressor heating | time | minutes | false | DEVICE_DATA | 105 | 2 | 1/60 |
 | uptimecompcooling | operating time compressor cooling | time | minutes | false | DEVICE_DATA | 107 | 2 | 1/60 |
 | dhw.uptimecomp | operating time compressor | time | minutes | false | DHW | 4 | 2 | 1/60 |
 | uptimecomppool | operating time compressor pool | time | minutes | false | DEVICE_DATA | 109 | 2 | 1/60 |
-uint24
-| totalcompstarts | total compressor control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 111 | 2 | 1 |
-uint24
-| heatingstarts | heating control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 113 | 2 | 1 |
-uint24
-| coolingstarts | cooling control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 115 | 2 | 1 |
-uint24
-| dhw.startshp | starts hp | uint24 (>=0<=16777214) |   | false | DHW | 6 | 2 | 1 |
-uint24
-| poolstarts | pool control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 117 | 2 | 1 |
-uint24
-| nrgconstotal | total energy consumption | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 119 | 2 | 1 |
-uint24
-| nrgconscomptotal | total energy consumption compressor | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 121 | 2 | 1 |
-uint24
-| nrgconscompheating | energy consumption compressor heating | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 123 | 2 | 1 |
-uint24
-| dhw.nrgconscomp | energy consumption compressor | uint24 (>=0<=16777214) | kWh | false | DHW | 8 | 2 | 1 |
-uint24
-| nrgconscompcooling | energy consumption compressor cooling | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 125 | 2 | 1 |
-uint24
-| nrgconscomppool | energy consumption compressor pool | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 127 | 2 | 1 |
-uint24
-| auxelecheatnrgconstotal | total aux elec. heater energy consumption | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 129 | 2 | 1 |
-uint24
-| auxelecheatnrgconsheating | aux elec. heater energy consumption heating | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 131 | 2 | 1 |
-uint24
-| dhw.auxelecheatnrgcons | aux elec. heater energy consumption | uint24 (>=0<=16777214) | kWh | false | DHW | 10 | 2 | 1 |
-uint24
-| auxelecheatnrgconspool | aux elec. heater energy consumption pool | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 133 | 2 | 1 |
-uint24
-| nrgsupptotal | total energy supplied | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 135 | 2 | 1 |
-uint24
-| nrgsuppheating | total energy supplied heating | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 137 | 2 | 1 |
-uint24
-| dhw.nrgsupp | total energy warm supplied | uint24 (>=0<=16777214) | kWh | false | DHW | 12 | 2 | 1 |
-uint24
-| nrgsuppcooling | total energy supplied cooling | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 139 | 2 | 1 |
-uint24
-| nrgsupppool | total energy supplied pool | uint24 (>=0<=16777214) | kWh | false | DEVICE_DATA | 141 | 2 | 1 |
-uint16
-| hppower | compressor power output | uint16 (>=0<=3199) | kW | false | DEVICE_DATA | 143 | 1 | 1/10 |
+| totalcompstarts | total compressor control starts | uint24 |   | false | DEVICE_DATA | 111 | 2 | 1 |
+| heatingstarts | heating control starts | uint24 |   | false | DEVICE_DATA | 113 | 2 | 1 |
+| coolingstarts | cooling control starts | uint24 |   | false | DEVICE_DATA | 115 | 2 | 1 |
+| dhw.startshp | starts hp | uint24 |   | false | DHW | 6 | 2 | 1 |
+| poolstarts | pool control starts | uint24 |   | false | DEVICE_DATA | 117 | 2 | 1 |
+| nrgconstotal | total energy consumption | uint24 | kWh | false | DEVICE_DATA | 119 | 2 | 1 |
+| nrgconscomptotal | total energy consumption compressor | uint24 | kWh | false | DEVICE_DATA | 121 | 2 | 1 |
+| nrgconscompheating | energy consumption compressor heating | uint24 | kWh | false | DEVICE_DATA | 123 | 2 | 1 |
+| dhw.nrgconscomp | energy consumption compressor | uint24 | kWh | false | DHW | 8 | 2 | 1 |
+| nrgconscompcooling | energy consumption compressor cooling | uint24 | kWh | false | DEVICE_DATA | 125 | 2 | 1 |
+| nrgconscomppool | energy consumption compressor pool | uint24 | kWh | false | DEVICE_DATA | 127 | 2 | 1 |
+| auxelecheatnrgconstotal | total aux elec. heater energy consumption | uint24 | kWh | false | DEVICE_DATA | 129 | 2 | 1 |
+| auxelecheatnrgconsheating | aux elec. heater energy consumption heating | uint24 | kWh | false | DEVICE_DATA | 131 | 2 | 1 |
+| dhw.auxelecheatnrgcons | aux elec. heater energy consumption | uint24 | kWh | false | DHW | 10 | 2 | 1 |
+| auxelecheatnrgconspool | aux elec. heater energy consumption pool | uint24 | kWh | false | DEVICE_DATA | 133 | 2 | 1 |
+| nrgsupptotal | total energy supplied | uint24 | kWh | false | DEVICE_DATA | 135 | 2 | 1 |
+| nrgsuppheating | total energy supplied heating | uint24 | kWh | false | DEVICE_DATA | 137 | 2 | 1 |
+| dhw.nrgsupp | total energy warm supplied | uint24 | kWh | false | DHW | 12 | 2 | 1 |
+| nrgsuppcooling | total energy supplied cooling | uint24 | kWh | false | DEVICE_DATA | 139 | 2 | 1 |
+| nrgsupppool | total energy supplied pool | uint24 | kWh | false | DEVICE_DATA | 141 | 2 | 1 |
+| hppower | compressor power output | uint16 | kW | false | DEVICE_DATA | 143 | 1 | 1/10 |
 uint8
-| hpmaxpower | compressor max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 144 | 1 | 1 |
+| hpmaxpower | compressor max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 144 | 1 | 1 |
 uint8
-| pvmaxcomp | pv compressor max power | uint8 (>=0<=25) | kW | true | DEVICE_DATA | 145 | 1 | 1/10 |
+| pvmaxcomp | pv compressor max power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 145 | 1 | 1/10 |
 uint8
 | powerreduction | power reduction | uint8 (>=30<=60) | % | true | DEVICE_DATA | 146 | 1 | 10 |
 uint8
 | hpsetdiffpress | set differential pressure | uint8 (>=150<=750) | mbar | true | DEVICE_DATA | 147 | 1 | 50 |
 | hpcompon | hp compressor | boolean |   | false | DEVICE_DATA | 148 | 1 | 1 |
 | hpactivity | compressor activity | enum |   | false | DEVICE_DATA | 149 | 1 | 1 |
-uint8
-| hpbrinepumpspd | brine pump speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 150 | 1 | 1 |
+| hpbrinepumpspd | brine pump speed | uint8 | % | false | DEVICE_DATA | 150 | 1 | 1 |
 | hpswitchvalve | switch valve | boolean |   | false | DEVICE_DATA | 151 | 1 | 1 |
+| hpcompspd | compressor speed | uint8 | % | false | DEVICE_DATA | 152 | 1 | 1 |
+| hptargetspd | compressor target speed | uint8 | % | false | DEVICE_DATA | 153 | 1 | 1 |
+| hpcircspd | circulation pump speed | uint8 | % | false | DEVICE_DATA | 154 | 1 | 1 |
+| recvalve | receiver valve VR0 | uint8 | % | false | DEVICE_DATA | 155 | 1 | 1 |
+| expvalve | expansion valve VR1 | uint8 | % | false | DEVICE_DATA | 156 | 1 | 1 |
+| hpbrinein | brine in/evaporator | int16 | C | false | DEVICE_DATA | 157 | 1 | 1/10 |
+| hpbrineout | brine out/condenser | int16 | C | false | DEVICE_DATA | 158 | 1 | 1/10 |
+| hptc0 | heat carrier return (TC0) | int16 | C | false | DEVICE_DATA | 159 | 1 | 1/10 |
+| hptc1 | heat carrier forward (TC1) | int16 | C | false | DEVICE_DATA | 160 | 1 | 1/10 |
+| hptc3 | condenser temperature (TC3) | int16 | C | false | DEVICE_DATA | 161 | 1 | 1/10 |
+| hptr1 | compressor temperature (TR1) | int16 | C | false | DEVICE_DATA | 162 | 1 | 1/10 |
+| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 | C | false | DEVICE_DATA | 163 | 1 | 1/10 |
+| hptr4 | evaporator inlet temperature (TR4) | int16 | C | false | DEVICE_DATA | 164 | 1 | 1/10 |
+| hptr5 | compressor inlet temperature (TR5) | int16 | C | false | DEVICE_DATA | 165 | 1 | 1/10 |
+| hptr6 | compressor outlet temperature (TR6) | int16 | C | false | DEVICE_DATA | 166 | 1 | 1/10 |
+| hptr7 | refrigerant temperature gas side (condenser input) (TR7) | int16 | C | false | DEVICE_DATA | 167 | 1 | 1/10 |
+| hptl2 | air inlet temperature (TL2) | int16 | C | false | DEVICE_DATA | 168 | 1 | 1/10 |
+| hppl1 | low pressure side temperature (PL1) | int16 | C | false | DEVICE_DATA | 169 | 1 | 1/10 |
+| hpph1 | high pressure side temperature (PH1) | int16 | C | false | DEVICE_DATA | 170 | 1 | 1/10 |
+| hpta4 | drain pan temp (TA4) | int16 | C | false | DEVICE_DATA | 171 | 1 | 1/10 |
+| hptw1 | reservoir temp (TW1) | int16 | C | false | DEVICE_DATA | 172 | 1 | 1/10 |
 uint8
-| hpcompspd | compressor speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 152 | 1 | 1 |
-uint8
-| hptargetspd | compressor target speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 153 | 1 | 1 |
-uint8
-| hpcircspd | circulation pump speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 154 | 1 | 1 |
-uint8
-| recvalve | receiver valve VR0 | uint8 (>=0<=100) | % | false | DEVICE_DATA | 155 | 1 | 1 |
-uint8
-| expvalve | expansion valve VR1 | uint8 (>=0<=100) | % | false | DEVICE_DATA | 156 | 1 | 1 |
-int16
-| hpbrinein | brine in/evaporator | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 157 | 1 | 1/10 |
-int16
-| hpbrineout | brine out/condenser | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 158 | 1 | 1/10 |
-int16
-| hptc0 | heat carrier return (TC0) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 159 | 1 | 1/10 |
-int16
-| hptc1 | heat carrier forward (TC1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 160 | 1 | 1/10 |
-int16
-| hptc3 | condenser temperature (TC3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 161 | 1 | 1/10 |
-int16
-| hptr1 | compressor temperature (TR1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 162 | 1 | 1/10 |
-int16
-| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 163 | 1 | 1/10 |
-int16
-| hptr4 | evaporator inlet temperature (TR4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 164 | 1 | 1/10 |
-int16
-| hptr5 | compressor inlet temperature (TR5) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 165 | 1 | 1/10 |
-int16
-| hptr6 | compressor outlet temperature (TR6) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 166 | 1 | 1/10 |
-int16
-| hptr7 | refrigerant temperature gas side (condenser input) (TR7) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 167 | 1 | 1/10 |
-int16
-| hptl2 | air inlet temperature (TL2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 168 | 1 | 1/10 |
-int16
-| hppl1 | low pressure side temperature (PL1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 169 | 1 | 1/10 |
-int16
-| hpph1 | high pressure side temperature (PH1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 170 | 1 | 1/10 |
-int16
-| hpta4 | drain pan temp (TA4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 171 | 1 | 1/10 |
-int16
-| hptw1 | reservoir temp (TW1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 172 | 1 | 1/10 |
-uint8
-| poolsettemp | pool set temperature | uint8 (>=0<=127) | C | true | DEVICE_DATA | 173 | 1 | 1/2 |
+| poolsettemp | pool set temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 173 | 1 | 1/2 |
 | hpin1 | input 1 state | boolean |   | false | DEVICE_DATA | 174 | 1 | 1 |
 | hpin1opt | input 1 options | string |   | true | DEVICE_DATA | 175 | 8 | 1 |
 | hpin2 | input 2 state | boolean |   | false | DEVICE_DATA | 183 | 1 | 1 |
@@ -4767,8 +3793,7 @@ uint8
 | auxheateronly | aux heater only | boolean |   | true | DEVICE_DATA | 214 | 1 | 1 |
 | auxheateroff | disable aux heater | boolean |   | true | DEVICE_DATA | 215 | 1 | 1 |
 | auxheaterstatus | aux heater status | enum |   | false | DEVICE_DATA | 216 | 1 | 1 |
-uint8
-| auxheaterlevel | aux heater level | uint8 (>=0<=100) | % | false | DEVICE_DATA | 217 | 1 | 1 |
+| auxheaterlevel | aux heater level | uint8 | % | false | DEVICE_DATA | 217 | 1 | 1 |
 uint16
 | auxheaterdelay | aux heater on delay | uint16 (>=10<=1000) | K*min | true | DEVICE_DATA | 218 | 1 | 10 |
 uint8
@@ -4784,15 +3809,14 @@ uint16
 | hphystpool | on/off hyst pool | uint16 (>=50<=1500) | K*min | true | DEVICE_DATA | 224 | 1 | 5 |
 | silentmode | silent mode | enum |   | true | DEVICE_DATA | 225 | 1 | 1 |
 uint8
-| silentfrom | silent mode from | uint8 (>=0<=3810) | minutes | true | DEVICE_DATA | 226 | 1 | 15 |
+| silentfrom | silent mode from | uint8 (>=0<=0) | minutes | true | DEVICE_DATA | 226 | 1 | 15 |
 uint8
-| silentto | silent mode to | uint8 (>=0<=3810) | minutes | true | DEVICE_DATA | 227 | 1 | 15 |
+| silentto | silent mode to | uint8 (>=0<=0) | minutes | true | DEVICE_DATA | 227 | 1 | 15 |
 int8
-| mintempsilent | min outside temp for silent mode | int8 (>=-126<=126) | C | true | DEVICE_DATA | 228 | 1 | 1 |
+| mintempsilent | min outside temp for silent mode | int8 (>=0<=0) | C | true | DEVICE_DATA | 228 | 1 | 1 |
 int8
-| tempparmode | outside temp parallel mode | int8 (>=-126<=126) | C | true | DEVICE_DATA | 229 | 1 | 1 |
-int8
-| auxheatmix | aux heater mixing valve | int8 (>=-100<=100) | % | false | DEVICE_DATA | 230 | 1 | 1 |
+| tempparmode | outside temp parallel mode | int8 (>=0<=0) | C | true | DEVICE_DATA | 229 | 1 | 1 |
+| auxheatmix | aux heater mixing valve | int8 | % | false | DEVICE_DATA | 230 | 1 | 1 |
 uint8
 | tempdiffheat | temp diff TC3/TC0 heat | uint8 (>=2<=10) | K | true | DEVICE_DATA | 231 | 1 | 1/10 |
 uint8
@@ -4802,7 +3826,7 @@ uint8
 | vc0valve | VC0 valve | boolean |   | true | DEVICE_DATA | 235 | 1 | 1 |
 | primepump | primary heatpump | boolean |   | true | DEVICE_DATA | 236 | 1 | 1 |
 uint8
-| primepumpmod | primary heatpump modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 237 | 1 | 1 |
+| primepumpmod | primary heatpump modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 237 | 1 | 1 |
 | hp3way | 3-way valve | boolean |   | true | DEVICE_DATA | 238 | 1 | 1 |
 | elheatstep1 | el. heater step 1 | boolean |   | true | DEVICE_DATA | 239 | 1 | 1 |
 | elheatstep2 | el. heater step 2 | boolean |   | true | DEVICE_DATA | 240 | 1 | 1 |
@@ -4811,13 +3835,11 @@ uint8
 | hppumpmode | primary heatpump mode | enum |   | true | DEVICE_DATA | 243 | 1 | 1 |
 uint8
 | fan | fan | uint8 (>=20<=100) | % | true | DEVICE_DATA | 244 | 1 | 1 |
-uint8
-| fanspd | fan speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 245 | 1 | 1 |
+| fanspd | fan speed | uint8 | % | false | DEVICE_DATA | 245 | 1 | 1 |
 | shutdown | shutdown | cmd |   | true | DEVICE_DATA | 246 | 1 | 1 |
+| hpcurrpower | compressor current power | uint16 | W | false | DEVICE_DATA | 247 | 1 | 1 |
 uint16
-| hpcurrpower | compressor current power | uint16 (>=0<=31999) | W | false | DEVICE_DATA | 247 | 1 | 1 |
-uint16
-| hppowerlimit | power limit | uint16 (>=0<=31999) | W | true | DEVICE_DATA | 248 | 1 | 1 |
+| hppowerlimit | power limit | uint16 (>=0<=0) | W | true | DEVICE_DATA | 248 | 1 | 1 |
 | dhw.alternatingop | alternating operation | boolean |   | true | DHW | 15 | 1 | 1 |
 uint8
 | dhw.altopprioheat | prioritise heating during dhw | uint8 (>=20<=120) | minutes | true | DHW | 16 | 1 | 1 |
@@ -4836,27 +3858,24 @@ uint8
 uint8
 | dhw.ecoplusdiff | eco+ diff | uint8 (>=4<=15) | K | true | DHW | 23 | 1 | 1 |
 uint8
-| dhw.comfstop | comfort stop temp | uint8 (>=0<=254) | C | true | DHW | 24 | 1 | 1 |
+| dhw.comfstop | comfort stop temp | uint8 (>=0<=0) | C | true | DHW | 24 | 1 | 1 |
 uint8
-| dhw.ecostop | eco stop temp | uint8 (>=0<=254) | C | true | DHW | 25 | 1 | 1 |
+| dhw.ecostop | eco stop temp | uint8 (>=0<=0) | C | true | DHW | 25 | 1 | 1 |
 uint8
-| dhw.ecoplusstop | eco+ stop temp | uint8 (>=0<=254) | C | true | DHW | 26 | 1 | 1 |
+| dhw.ecoplusstop | eco+ stop temp | uint8 (>=0<=0) | C | true | DHW | 26 | 1 | 1 |
 | dhw.hpcircpump | circulation pump available during dhw | boolean |   | true | DHW | 27 | 1 | 1 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -4870,23 +3889,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -4896,13 +3910,10 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 
 ### Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2
@@ -4916,41 +3927,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -4974,9 +3973,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -4985,62 +3984,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -5054,23 +4037,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -5080,18 +4058,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -5108,41 +4082,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -5166,9 +4128,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -5177,62 +4139,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -5246,23 +4192,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -5272,18 +4213,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -5300,41 +4237,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -5358,9 +4283,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -5369,62 +4294,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -5438,23 +4347,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -5464,18 +4368,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -5492,41 +4392,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -5550,9 +4438,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -5561,62 +4449,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -5630,23 +4502,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -5656,18 +4523,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -5684,41 +4547,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -5742,9 +4593,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -5753,62 +4604,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -5822,23 +4657,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -5848,18 +4678,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -5876,41 +4702,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -5934,9 +4748,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -5945,62 +4759,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -6014,23 +4812,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -6040,18 +4833,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -6061,16 +4850,13 @@ uint24
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| netflowtemp | heat network flow temp | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 276 | 1 | 1/10 |
+| netflowtemp | heat network flow temp | uint16 | C | false | DEVICE_DATA | 276 | 1 | 1/10 |
+| heatvalve | heating valve | uint8 | % | false | DEVICE_DATA | 277 | 1 | 1 |
+| dhw.dhwvalve | valve | uint8 | % | false | DHW | 75 | 1 | 1 |
 uint8
-| heatvalve | heating valve | uint8 (>=0<=100) | % | false | DEVICE_DATA | 277 | 1 | 1 |
+| keepwarmtemp | keep warm temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 278 | 1 | 1 |
 uint8
-| dhw.dhwvalve | valve | uint8 (>=0<=100) | % | false | DHW | 75 | 1 | 1 |
-uint8
-| keepwarmtemp | keep warm temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 278 | 1 | 1 |
-uint8
-| setreturntemp | set temp return | uint8 (>=0<=254) | C | true | DEVICE_DATA | 279 | 1 | 1 |
+| setreturntemp | set temp return | uint8 (>=0<=0) | C | true | DEVICE_DATA | 279 | 1 | 1 |
 | heating | heating | boolean |   | false | DEVICE_DATA | 280 | 1 | 1 |
 | reset | reset | cmd |   | true | DEVICE_DATA | 0 | 1 | 1 |
 | chimneysweeper | chimney sweeper | cmd |   | true | DEVICE_DATA | 1 | 1 | 1 |
@@ -6079,30 +4865,22 @@ uint8
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
 | heatingactivated | heating activated | boolean |   | true | DEVICE_DATA | 14 | 1 | 1 |
 uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -6111,62 +4889,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -6180,23 +4942,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -6206,13 +4963,10 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 
 ### Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W
@@ -6226,41 +4980,29 @@ uint24
 | tapwateractive | tapwater active | boolean |   | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
 | selflowtemp | selected flow temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 5 | 1 | 1 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 6 | 1 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-uint16
-| curflowtemp | current flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-uint16
-| rettemp | return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-uint16
-| switchtemp | mixing switch temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| syspress | system pressure | uint8 (>=0<=25) | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
-uint16
-| boiltemp | actual boiler temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-uint16
-| headertemp | low loss header | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint16
-| exhausttemp | exhaust temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 6 | 1 | 1 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| curflowtemp | current flow temperature | uint16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| rettemp | return temperature | uint16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| switchtemp | mixing switch temperature | uint16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| syspress | system pressure | uint8 | bar | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| boiltemp | actual boiler temperature | uint16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| headertemp | low loss header | uint16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| exhausttemp | exhaust temperature | uint16 | C | false | DEVICE_DATA | 249 | 1 | 1/10 |
 | burngas | gas | boolean |   | false | DEVICE_DATA | 250 | 1 | 1 |
 | burngas2 | gas stage 2 | boolean |   | false | DEVICE_DATA | 251 | 1 | 1 |
-uint16
-| flamecurr | flame current | uint16 (>=0<=3199) | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
+| flamecurr | flame current | uint16 | µA | false | DEVICE_DATA | 252 | 1 | 1/10 |
 | fanwork | fan | boolean |   | false | DEVICE_DATA | 253 | 1 | 1 |
 | ignwork | ignition | boolean |   | false | DEVICE_DATA | 254 | 1 | 1 |
 | oilpreheat | oil preheating | boolean |   | false | DEVICE_DATA | 255 | 1 | 1 |
 uint8
-| burnminpower | burner min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 256 | 1 | 1 |
+| burnminpower | burner min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 256 | 1 | 1 |
 uint8
 | burnmaxpower | burner max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 257 | 1 | 1 |
 uint8
 | burnminperiod | burner min period | uint8 (>=0<=120) | minutes | true | DEVICE_DATA | 258 | 1 | 1 |
-uint8
-| absburnpow | burner current power (absolute) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 259 | 1 | 1 |
-uint16
-| heatblock | heating block | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
+| absburnpow | burner current power (absolute) | uint8 | % | false | DEVICE_DATA | 259 | 1 | 1 |
+| heatblock | heating block | uint16 | C | false | DEVICE_DATA | 260 | 1 | 1/10 |
 int8
 | boilhyston | hysteresis on temperature | int8 (>=-20<=0) | C | true | DEVICE_DATA | 261 | 1 | 1 |
 int8
@@ -6284,9 +5026,9 @@ uint8
 | heatingtemp | heating temperature | uint8 (>=0<=90) | C | true | DEVICE_DATA | 15 | 1 | 1 |
 | heatingpump | heating pump | boolean |   | false | DEVICE_DATA | 16 | 1 | 1 |
 uint8
-| pumpmodmax | boiler pump max power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 17 | 1 | 1 |
+| pumpmodmax | boiler pump max power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 17 | 1 | 1 |
 uint8
-| pumpmodmin | boiler pump min power | uint8 (>=0<=100) | % | true | DEVICE_DATA | 18 | 1 | 1 |
+| pumpmodmin | boiler pump min power | uint8 (>=0<=0) | % | true | DEVICE_DATA | 18 | 1 | 1 |
 | pumpmode | boiler pump mode | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | pumpcharacter | boiler pump characteristic | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -6295,62 +5037,46 @@ uint8
 | pumpontemp | pump logic temperature | uint8 (>=0<=60) | C | true | DEVICE_DATA | 22 | 1 | 1 |
 uint8
 | selburnpow | burner selected max power | uint8 (>=0<=254) | % | true | DEVICE_DATA | 23 | 1 | 1 |
-uint8
-| curburnpow | burner current power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 24 | 1 | 1 |
-uint24
-| burnstarts | burner starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 25 | 2 | 1 |
+| curburnpow | burner current power | uint8 | % | false | DEVICE_DATA | 24 | 1 | 1 |
+| burnstarts | burner starts | uint24 |   | false | DEVICE_DATA | 25 | 2 | 1 |
 | burnworkmin | total burner operating time | time | minutes | false | DEVICE_DATA | 27 | 2 | 1 |
 | burn2workmin | burner stage 2 operating time | time | minutes | false | DEVICE_DATA | 29 | 2 | 1 |
 | heatworkmin | total heat operating time | time | minutes | false | DEVICE_DATA | 31 | 2 | 1 |
-uint24
-| heatstarts | burner starts heating | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 33 | 2 | 1 |
+| heatstarts | burner starts heating | uint24 |   | false | DEVICE_DATA | 33 | 2 | 1 |
 | ubauptime | total UBA operating time | time | minutes | false | DEVICE_DATA | 35 | 2 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 37 | 28 | 1 |
 | servicecode | service code | string |   | false | DEVICE_DATA | 65 | 2 | 1 |
-uint16
-| servicecodenumber | service code number | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| servicecodenumber | service code number | uint16 |   | false | DEVICE_DATA | 67 | 1 | 1 |
 | maintenancemessage | maintenance message | string |   | false | DEVICE_DATA | 68 | 2 | 1 |
 | maintenance | maintenance scheduled | enum |   | true | DEVICE_DATA | 70 | 1 | 1 |
 uint16
-| maintenancetime | time to next maintenance | uint16 (>=0<=31999) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
+| maintenancetime | time to next maintenance | uint16 (>=0<=0) | hours | true | DEVICE_DATA | 71 | 1 | 1 |
 | maintenancedate | next maintenance date | string |   | true | DEVICE_DATA | 72 | 6 | 1 |
 | emergencyops | emergency operation | boolean |   | true | DEVICE_DATA | 78 | 1 | 1 |
 uint8
 | emergencytemp | emergency temperature | uint8 (>=15<=70) | C | true | DEVICE_DATA | 79 | 1 | 1 |
-int16
-| pc0flow | Flow PC0 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
-int16
-| pc1flow | Flow PC1 | int16 (>=-31999<=31999) | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
+| pc0flow | Flow PC0 | int16 | l/h | false | DEVICE_DATA | 80 | 1 | 1 |
+| pc1flow | Flow PC1 | int16 | l/h | false | DEVICE_DATA | 81 | 1 | 1 |
 | pc1on | PC1 | boolean |   | false | DEVICE_DATA | 82 | 1 | 1 |
-uint8
-| pc1rate | PC1 rate | uint8 (>=0<=100) | % | false | DEVICE_DATA | 83 | 1 | 1 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=1677721) | kWh | false | DHW | 2 | 2 | 1/10 |
-uint24
-| gasmeterheat | gas meter heating | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
-uint24
-| dhw.gasmeter | gas meter | uint24 (>=0<=1677721) | kWh | false | DHW | 71 | 2 | 1/10 |
-uint24
-| nrgheat2 | energy heating 2 | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
-uint24
-| dhw.nrg2 | energy 2 | uint24 (>=0<=1677721) | kWh | false | DHW | 73 | 2 | 1/10 |
+| pc1rate | PC1 rate | uint8 | % | false | DEVICE_DATA | 83 | 1 | 1 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 97 | 2 | 1/10 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 2 | 2 | 1/10 |
+| gasmeterheat | gas meter heating | uint24 | kWh | false | DEVICE_DATA | 271 | 2 | 1/10 |
+| dhw.gasmeter | gas meter | uint24 | kWh | false | DHW | 71 | 2 | 1/10 |
+| nrgheat2 | energy heating 2 | uint24 | kWh | false | DEVICE_DATA | 273 | 2 | 1/10 |
+| dhw.nrg2 | energy 2 | uint24 | kWh | false | DHW | 73 | 2 | 1/10 |
 | dhw.tapactivated | turn on/off | boolean |   | true | DHW | 28 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 | C | false | DHW | 29 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | false | DHW | 29 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 30 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 30 | 1 | 1 |
+| dhw.seltemplow | selected lower temperature | uint8 (>=0<=0) | C | true | DHW | 31 | 1 | 1 |
 uint8
-| dhw.seltemplow | selected lower temperature | uint8 (>=0<=254) | C | true | DHW | 31 | 1 | 1 |
+| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=0) | C | true | DHW | 32 | 1 | 1 |
+| dhw.seltempoff | selected temperature for off | uint8 | C | false | DHW | 33 | 1 | 1 |
 uint8
-| dhw.tempecoplus | selected eco+ temperature | uint8 (>=0<=254) | C | true | DHW | 32 | 1 | 1 |
-uint8
-| dhw.seltempoff | selected temperature for off | uint8 (>=0<=254) | C | false | DHW | 33 | 1 | 1 |
-uint8
-| dhw.seltempsingle | single charge temperature | uint8 (>=0<=254) | C | true | DHW | 34 | 1 | 1 |
-uint16
-| dhw.solartemp | solar boiler temperature | uint16 (>=0<=3199) | C | false | DHW | 35 | 1 | 1/10 |
+| dhw.seltempsingle | single charge temperature | uint8 (>=0<=0) | C | true | DHW | 34 | 1 | 1 |
+| dhw.solartemp | solar boiler temperature | uint16 | C | false | DHW | 35 | 1 | 1/10 |
 | dhw.type | type | enum |   | false | DHW | 36 | 1 | 1 |
 | dhw.comfort | comfort | enum |   | true | DHW | 37 | 1 | 1 |
 | dhw.comfort1 | comfort mode | enum |   | true | DHW | 38 | 1 | 1 |
@@ -6364,23 +5090,18 @@ uint8
 | dhw.circpump | circulation pump available | boolean |   | true | DHW | 43 | 1 | 1 |
 | dhw.chargetype | charging type | enum |   | false | DHW | 44 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 45 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 45 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 46 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 46 | 1 | 1 |
 uint8
 | dhw.disinfectiontemp | disinfection temperature | uint8 (>=60<=80) | C | true | DHW | 47 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 48 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 49 | 1 | 1 |
-uint16
-| dhw.curtemp | current intern temperature | uint16 (>=0<=3199) | C | false | DHW | 50 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 51 | 1 | 1/10 |
-uint8
-| dhw.curflow | current tap water flow | uint8 (>=0<=25) | l/min | false | DHW | 52 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 53 | 1 | 1/10 |
-uint16
-| dhw.storagetemp2 | storage extern temperature | uint16 (>=0<=3199) | C | false | DHW | 54 | 1 | 1/10 |
+| dhw.curtemp | current intern temperature | uint16 | C | false | DHW | 50 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 51 | 1 | 1/10 |
+| dhw.curflow | current tap water flow | uint8 | l/min | false | DHW | 52 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 53 | 1 | 1/10 |
+| dhw.storagetemp2 | storage extern temperature | uint16 | C | false | DHW | 54 | 1 | 1/10 |
 | dhw.activated | activated | boolean |   | true | DHW | 55 | 1 | 1 |
 | dhw.onetime | one time charging | boolean |   | true | DHW | 56 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 57 | 1 | 1 |
@@ -6390,18 +5111,14 @@ uint16
 | dhw.active | active | boolean |   | false | DHW | 61 | 1 | 1 |
 | dhw.3wayvalve | 3-way valve active | boolean |   | false | DHW | 62 | 1 | 1 |
 | dhw.chargepump | charge pump | boolean |   | false | DHW | 63 | 1 | 1 |
-uint16
-| dhw.mixertemp | mixer temperature | uint16 (>=0<=3199) | C | false | DHW | 64 | 1 | 1/10 |
-uint16
-| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 (>=0<=3199) | C | false | DHW | 65 | 1 | 1/10 |
+| dhw.mixertemp | mixer temperature | uint16 | C | false | DHW | 64 | 1 | 1/10 |
+| dhw.cylmiddletemp | cylinder middle temperature (TS3) | uint16 | C | false | DHW | 65 | 1 | 1/10 |
 | dhw.dhwprio | dhw priority | boolean |   | true | DHW | 66 | 1 | 1 |
-uint24
-| dhw.starts | starts | uint24 (>=0<=16777214) |   | false | DHW | 67 | 2 | 1 |
+| dhw.starts | starts | uint24 |   | false | DHW | 67 | 2 | 1 |
 | dhw.workm | active time | time | minutes | false | DHW | 69 | 2 | 1 |
 uint8
-| nompower | nominal Power | uint8 (>=0<=254) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
+| nompower | nominal Power | uint8 (>=0<=0) | kW | true | DEVICE_DATA | 275 | 1 | 1 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 85 | 2 | 1/100 |
 uint24
 | nrgheat | energy heating | uint24 (>=0<=10000000) | kWh | true | DEVICE_DATA | 87 | 2 | 1/100 |
 uint24
@@ -6416,10 +5133,8 @@ uint24
 | errorcode | error code | string |   | false | DEVICE_DATA | 0 | 8 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
-int16
-| hc1.seltemp | selected room temperature | int16 (>=-319<=319) | C | false | HC | 0 | 1 | 1/100 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-319<=319) | C | false | HC | 1 | 1 | 1/100 |
+| hc1.seltemp | selected room temperature | int16 | C | false | HC | 0 | 1 | 1/100 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/100 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 
 ### EasyControl, CT200
@@ -6429,10 +5144,8 @@ int16
 | errorcode | error code | string |   | false | DEVICE_DATA | 0 | 8 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
-int16
-| hc1.seltemp | selected room temperature | int16 (>=-319<=319) | C | false | HC | 0 | 1 | 1/100 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-319<=319) | C | false | HC | 1 | 1 | 1/100 |
+| hc1.seltemp | selected room temperature | int16 | C | false | HC | 0 | 1 | 1/100 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/100 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 
 ### UI800, BC400
@@ -6443,15 +5156,13 @@ int16
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | true | DEVICE_DATA | 33 | 13 | 1 |
 int8
-| intoffset | internal temperature offset | int8 (>=-12<=12) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
+| intoffset | internal temperature offset | int8 (>=0<=0) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 | floordry | floor drying | enum |   | false | DEVICE_DATA | 47 | 1 | 1 |
-int16
-| dampedoutdoortemp | damped outdoor temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 48 | 1 | 1/10 |
-uint8
-| floordrytemp | floor drying temperature | uint8 (>=0<=254) | C | false | DEVICE_DATA | 49 | 1 | 1 |
+| dampedoutdoortemp | damped outdoor temperature | int16 | C | false | DEVICE_DATA | 48 | 1 | 1/10 |
+| floordrytemp | floor drying temperature | uint8 | C | false | DEVICE_DATA | 49 | 1 | 1 |
 | building | building type | enum |   | true | DEVICE_DATA | 50 | 1 | 1 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
 | damping | damping outdoor temperature | boolean |   | true | DEVICE_DATA | 52 | 1 | 1 |
 | solar | solar | boolean |   | true | DEVICE_DATA | 53 | 1 | 1 |
 | hybridstrategy | hybrid control strategy | enum |   | true | DEVICE_DATA | 54 | 1 | 1 |
@@ -6475,38 +5186,35 @@ int8
 | absent | absent | boolean |   | true | DEVICE_DATA | 64 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 uint8
-| hc1.manualtemp | manual temperature | uint8 (>=0<=127) | C | true | HC | 6 | 1 | 1/2 |
+| hc1.manualtemp | manual temperature | uint8 (>=0<=0) | C | true | HC | 6 | 1 | 1/2 |
 uint8
-| hc1.comforttemp | comfort temperature | uint8 (>=0<=127) | C | true | HC | 7 | 1 | 1/2 |
+| hc1.comforttemp | comfort temperature | uint8 (>=0<=0) | C | true | HC | 7 | 1 | 1/2 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=10<=30) | C | true | HC | 8 | 1 | 1 |
 uint8
-| hc1.designtemp | design temperature | uint8 (>=0<=254) | C | true | HC | 9 | 1 | 1 |
+| hc1.designtemp | design temperature | uint8 (>=0<=0) | C | true | HC | 9 | 1 | 1 |
 int8
-| hc1.offsettemp | offset temperature | int8 (>=-126<=126) | C | true | HC | 10 | 1 | 1 |
+| hc1.offsettemp | offset temperature | int8 (>=0<=0) | C | true | HC | 10 | 1 | 1 |
 uint8
-| hc1.minflowtemp | min flow temperature | uint8 (>=0<=254) | C | true | HC | 11 | 1 | 1 |
+| hc1.minflowtemp | min flow temperature | uint8 (>=0<=0) | C | true | HC | 11 | 1 | 1 |
 uint8
-| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=254) | C | true | HC | 12 | 1 | 1 |
+| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=0) | C | true | HC | 12 | 1 | 1 |
 uint8
-| hc1.roominfluence | room influence | uint8 (>=0<=254) | C | true | HC | 13 | 1 | 1 |
+| hc1.roominfluence | room influence | uint8 (>=0<=0) | C | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=25) |   | true | HC | 14 | 1 | 1/10 |
-int16
-| hc1.curroominfl | current room influence | int16 (>=-3199<=3199) | C | false | HC | 15 | 1 | 1/10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) |   | true | HC | 14 | 1 | 1/10 |
+| hc1.curroominfl | current room influence | int16 | C | false | HC | 15 | 1 | 1/10 |
 | hc1.nofrostmode | nofrost mode | enum |   | true | HC | 16 | 1 | 1 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-126<=126) | C | true | HC | 17 | 1 | 1 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.summersetmode | set summer mode | enum |   | true | HC | 20 | 1 | 1 |
 | hc1.hpoperatingmode | heatpump operating mode | enum |   | true | HC | 21 | 1 | 1 |
@@ -6520,13 +5228,13 @@ int8
 int8
 | hc1.cooltemp | cooling temperature | int8 (>=-1<=30) | C | true | HC | 28 | 1 | 1/2 |
 uint8
-| hc1.fastheatup | fast heatup | uint8 (>=0<=100) | % | true | HC | 29 | 1 | 1 |
+| hc1.fastheatup | fast heatup | uint8 (>=0<=0) | % | true | HC | 29 | 1 | 1 |
 | hc1.switchonoptimization | switch-on optimization | boolean |   | true | HC | 30 | 1 | 1 |
 | hc1.reducemode | reduce mode | enum |   | true | HC | 31 | 1 | 1 |
 int8
-| hc1.noreducetemp | no reduce below temperature | int8 (>=-126<=126) | C | true | HC | 32 | 1 | 1 |
+| hc1.noreducetemp | no reduce below temperature | int8 (>=0<=0) | C | true | HC | 32 | 1 | 1 |
 int8
-| hc1.reducetemp | off/reduce switch temperature | int8 (>=-126<=126) | C | true | HC | 33 | 1 | 1 |
+| hc1.reducetemp | off/reduce switch temperature | int8 (>=0<=0) | C | true | HC | 33 | 1 | 1 |
 | hc1.dhwprio | dhw priority | boolean |   | true | HC | 34 | 1 | 1 |
 | hc1.hpcooling | hp cooling | boolean |   | true | HC | 35 | 1 | 1 |
 | hc1.coolingon | cooling on | boolean |   | false | HC | 36 | 1 | 1 |
@@ -6534,9 +5242,9 @@ int8
 uint8
 | hc1.dewoffset | dew point offset | uint8 (>=2<=10) | K | true | HC | 38 | 1 | 1 |
 uint8
-| hc1.roomtempdiff | room temp difference | uint8 (>=0<=254) | K | true | HC | 39 | 1 | 1 |
+| hc1.roomtempdiff | room temp difference | uint8 (>=0<=0) | K | true | HC | 39 | 1 | 1 |
 uint8
-| hc1.hpminflowtemp | HP min. flow temp. | uint8 (>=0<=254) | C | true | HC | 40 | 1 | 1 |
+| hc1.hpminflowtemp | HP min. flow temp. | uint8 (>=0<=0) | C | true | HC | 40 | 1 | 1 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
 | hc1.remotehum | room humidity from remote | cmd | % | true | HC | 43 | 1 | 1 |
@@ -6548,7 +5256,7 @@ uint8
 | hc1.instantstart | instant start | uint8 (>=1<=10) | K | true | HC | 46 | 1 | 1 |
 | hc1.boost | boost mode | boolean |   | true | HC | 47 | 1 | 1 |
 uint8
-| hc1.boosttime | boost time | uint8 (>=0<=254) | hours | true | HC | 48 | 1 | 1 |
+| hc1.boosttime | boost time | uint8 (>=0<=0) | hours | true | HC | 48 | 1 | 1 |
 uint8
 | hc1.coolstart | cooling starttemp | uint8 (>=20<=35) | C | true | HC | 49 | 1 | 1 |
 uint8
@@ -6560,8 +5268,7 @@ int8
 | hc1.redthreshold | reduction threshold | int8 (>=12<=22) | C | true | HC | 53 | 1 | 1/2 |
 uint8
 | hc1.solarinfl | solar influence | uint8 (>=-5<=4294967295) | C | true | HC | 54 | 1 | 1 |
-uint8
-| hc1.currsolarinfl | current solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
+| hc1.currsolarinfl | current solar influence | uint8 | C | false | HC | 55 | 1 | 1/10 |
 | hc1.heatingpid | heating PID | enum |   | true | HC | 56 | 1 | 1 |
 | hc1.pumpopt | pump optimization | boolean |   | true | HC | 57 | 1 | 1 |
 uint8
@@ -6571,12 +5278,12 @@ uint8
 | dhw.mode | operating mode | enum |   | true | DHW | 0 | 1 | 1 |
 | dhw.modetype | mode type | enum |   | false | DHW | 1 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | true | DHW | 2 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 (>=0<=0) | C | true | DHW | 2 | 1 | 1 |
 uint8
-| dhw.settemplow | set low temperature | uint8 (>=0<=254) | C | true | DHW | 3 | 1 | 1 |
+| dhw.settemplow | set low temperature | uint8 (>=0<=0) | C | true | DHW | 3 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 4 | 1 | 1 |
 uint8
-| dhw.chargeduration | charge duration | uint8 (>=0<=3810) | minutes | true | DHW | 5 | 1 | 15 |
+| dhw.chargeduration | charge duration | uint8 (>=0<=0) | minutes | true | DHW | 5 | 1 | 15 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
 | dhw.extra | extra | boolean |   | false | DHW | 7 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 8 | 1 | 1 |
@@ -6595,12 +5302,10 @@ uint8
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 
 ### RC10
@@ -6611,25 +5316,24 @@ uint8
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.daytemp | day temperature | uint8 (>=0<=127) | C | true | HC | 60 | 1 | 1/2 |
+| hc1.daytemp | day temperature | uint8 (>=0<=0) | C | true | HC | 60 | 1 | 1/2 |
 uint8
-| hc1.nighttemp | night temperature | uint8 (>=0<=127) | C | true | HC | 61 | 1 | 1/2 |
+| hc1.nighttemp | night temperature | uint8 (>=0<=0) | C | true | HC | 61 | 1 | 1/2 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 uint8
-| hc1.minflowtemp | min flow temperature | uint8 (>=0<=254) | C | true | HC | 11 | 1 | 1 |
+| hc1.minflowtemp | min flow temperature | uint8 (>=0<=0) | C | true | HC | 11 | 1 | 1 |
 uint8
-| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=254) | C | true | HC | 12 | 1 | 1 |
+| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=0) | C | true | HC | 12 | 1 | 1 |
 uint8
-| hc1.tempautotemp | temporary set temperature automode | uint8 (>=0<=127) | C | true | HC | 27 | 1 | 1/2 |
+| hc1.tempautotemp | temporary set temperature automode | uint8 (>=0<=0) | C | true | HC | 27 | 1 | 1/2 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=10<=30) | C | true | HC | 8 | 1 | 1 |
@@ -6645,23 +5349,19 @@ uint8
 | display | display | enum |   | true | DEVICE_DATA | 65 | 1 | 1 |
 | language | language | enum |   | false | DEVICE_DATA | 66 | 1 | 1 |
 int8
-| clockoffset | clock offset | int8 (>=-126<=126) | seconds | true | DEVICE_DATA | 67 | 1 | 1 |
+| clockoffset | clock offset | int8 (>=0<=0) | seconds | true | DEVICE_DATA | 67 | 1 | 1 |
 int8
-| intoffset | internal temperature offset | int8 (>=-12<=12) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
+| intoffset | internal temperature offset | int8 (>=0<=0) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
-int16
-| inttemp1 | temperature sensor 1 | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
-int16
-| inttemp2 | temperature sensor 2 | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| inttemp1 | temperature sensor 1 | int16 | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
+| inttemp2 | temperature sensor 2 | int16 | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
 | damping | damping outdoor temperature | boolean |   | true | DEVICE_DATA | 52 | 1 | 1 |
-int8
-| dampedoutdoortemp | damped outdoor temperature | int8 (>=-126<=126) | C | false | DEVICE_DATA | 48 | 1 | 1 |
+| dampedoutdoortemp | damped outdoor temperature | int8 | C | false | DEVICE_DATA | 48 | 1 | 1 |
 | building | building type | enum |   | true | DEVICE_DATA | 50 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
@@ -6675,8 +5375,7 @@ int8
 | hc1.offsettemp | offset temperature | int8 (>=-5<=5) | C | true | HC | 10 | 1 | 1/2 |
 uint8
 | hc1.holidaytemp | holiday temperature | uint8 (>=5<=30) | C | true | HC | 62 | 1 | 1/2 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1 |
 | hc1.summermode | summer mode | enum |   | false | HC | 22 | 1 | 1 |
@@ -6726,7 +5425,7 @@ int8
 uint8
 | dhw.disinfecthour | disinfection hour | uint8 (>=0<=23) |   | true | DHW | 15 | 1 | 1 |
 uint8
-| dhw.maxtemp | maximum temperature | uint8 (>=0<=254) | C | true | DHW | 16 | 1 | 1 |
+| dhw.maxtemp | maximum temperature | uint8 (>=0<=0) | C | true | DHW | 16 | 1 | 1 |
 | dhw.onetimekey | one time key function | boolean |   | true | DHW | 17 | 1 | 1 |
 | dhw.switchtime | program switchtime | string |   | true | DHW | 18 | 8 | 1 |
 | dhw.circswitchtime | circulation program switchtime | string |   | true | DHW | 26 | 8 | 1 |
@@ -6742,22 +5441,21 @@ uint8
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 uint8
-| hc1.manualtemp | manual temperature | uint8 (>=0<=127) | C | true | HC | 6 | 1 | 1/2 |
+| hc1.manualtemp | manual temperature | uint8 (>=0<=0) | C | true | HC | 6 | 1 | 1/2 |
 uint8
-| hc1.offtemp | temperature when mode is off | uint8 (>=0<=127) | C | true | HC | 111 | 1 | 1/2 |
+| hc1.offtemp | temperature when mode is off | uint8 (>=0<=0) | C | true | HC | 111 | 1 | 1/2 |
 uint8
-| hc1.daytemp2 | day temperature T2 | uint8 (>=0<=127) | C | true | HC | 112 | 1 | 1/2 |
+| hc1.daytemp2 | day temperature T2 | uint8 (>=0<=0) | C | true | HC | 112 | 1 | 1/2 |
 uint8
-| hc1.daytemp3 | day temperature T3 | uint8 (>=0<=127) | C | true | HC | 113 | 1 | 1/2 |
+| hc1.daytemp3 | day temperature T3 | uint8 (>=0<=0) | C | true | HC | 113 | 1 | 1/2 |
 uint8
-| hc1.daytemp4 | day temperature T4 | uint8 (>=0<=127) | C | true | HC | 114 | 1 | 1/2 |
+| hc1.daytemp4 | day temperature T4 | uint8 (>=0<=0) | C | true | HC | 114 | 1 | 1/2 |
 uint8
-| hc1.nighttemp | night temperature T1 | uint8 (>=0<=127) | C | true | HC | 61 | 1 | 1/2 |
+| hc1.nighttemp | night temperature T1 | uint8 (>=0<=0) | C | true | HC | 61 | 1 | 1/2 |
 | hc1.switchtime | program switchtime | string |   | true | HC | 115 | 8 | 1 |
 
 ### Moduline 400
@@ -6768,7 +5466,7 @@ uint8
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int8
-| clockoffset | clock offset | int8 (>=-126<=126) | seconds | true | DEVICE_DATA | 67 | 1 | 1 |
+| clockoffset | clock offset | int8 (>=0<=0) | seconds | true | DEVICE_DATA | 67 | 1 | 1 |
 | autodst | automatic change daylight saving time | boolean |   | true | DEVICE_DATA | 70 | 1 | 1 |
 | language | language | enum |   | true | DEVICE_DATA | 66 | 1 | 1 |
 | backlight | key backlight | boolean |   | true | DEVICE_DATA | 71 | 1 | 1 |
@@ -6780,17 +5478,16 @@ uint8
 | heatingpid | heating PID | enum |   | true | DEVICE_DATA | 74 | 1 | 1 |
 | preheating | preheating in the clock program | boolean |   | true | DEVICE_DATA | 75 | 1 | 1 |
 int8
-| intoffset | internal temperature offset | int8 (>=-12<=12) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
+| intoffset | internal temperature offset | int8 (>=0<=0) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 uint8
-| hc1.pause | pause time | uint8 (>=0<=254) | hours | true | HC | 91 | 1 | 1 |
+| hc1.pause | pause time | uint8 (>=0<=0) | hours | true | HC | 91 | 1 | 1 |
 uint8
-| hc1.party | party time | uint8 (>=0<=254) | hours | true | HC | 92 | 1 | 1 |
+| hc1.party | party time | uint8 (>=0<=0) | hours | true | HC | 92 | 1 | 1 |
 | hc1.vacations1 | vacation dates 1 | string |   | true | HC | 123 | 11 | 1 |
 | hc1.vacations2 | vacation dates 2 | string |   | true | HC | 134 | 11 | 1 |
 | hc1.vacations3 | vacation dates 3 | string |   | true | HC | 145 | 11 | 1 |
@@ -6803,19 +5500,19 @@ uint8
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 uint8
-| hc1.holidaytemp | holiday temperature | uint8 (>=0<=127) | C | true | HC | 62 | 1 | 1/2 |
+| hc1.holidaytemp | holiday temperature | uint8 (>=0<=0) | C | true | HC | 62 | 1 | 1/2 |
 uint8
-| hc1.nighttemp | night temperature T1 | uint8 (>=0<=127) | C | true | HC | 61 | 1 | 1/2 |
+| hc1.nighttemp | night temperature T1 | uint8 (>=0<=0) | C | true | HC | 61 | 1 | 1/2 |
 uint8
-| hc1.daytemp2 | day temperature T2 | uint8 (>=0<=127) | C | true | HC | 112 | 1 | 1/2 |
+| hc1.daytemp2 | day temperature T2 | uint8 (>=0<=0) | C | true | HC | 112 | 1 | 1/2 |
 uint8
-| hc1.daytemp3 | day temperature T3 | uint8 (>=0<=127) | C | true | HC | 113 | 1 | 1/2 |
+| hc1.daytemp3 | day temperature T3 | uint8 (>=0<=0) | C | true | HC | 113 | 1 | 1/2 |
 uint8
-| hc1.daytemp4 | day temperature T4 | uint8 (>=0<=127) | C | true | HC | 114 | 1 | 1/2 |
+| hc1.daytemp4 | day temperature T4 | uint8 (>=0<=0) | C | true | HC | 114 | 1 | 1/2 |
 uint8
-| hc1.manualtemp | manual temperature | uint8 (>=0<=127) | C | true | HC | 6 | 1 | 1/2 |
+| hc1.manualtemp | manual temperature | uint8 (>=0<=0) | C | true | HC | 6 | 1 | 1/2 |
 uint8
-| hc1.offtemp | temperature when mode is off | uint8 (>=0<=127) | C | true | HC | 111 | 1 | 1/2 |
+| hc1.offtemp | temperature when mode is off | uint8 (>=0<=0) | C | true | HC | 111 | 1 | 1/2 |
 | dhw.mode | operating mode | enum |   | true | DHW | 0 | 1 | 1 |
 | dhw.whenmodeoff | when thermostat mode off | boolean |   | true | DHW | 60 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 8 | 1 | 1 |
@@ -6830,47 +5527,44 @@ uint8
 | errorcode | error code | string |   | false | DEVICE_DATA | 0 | 8 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 int8
-| intoffset | internal temperature offset | int8 (>=-12<=12) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
+| intoffset | internal temperature offset | int8 (>=0<=0) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 | heatingpid | heating PID | enum |   | true | DEVICE_DATA | 74 | 1 | 1 |
 | backlight | key backlight | boolean |   | true | DEVICE_DATA | 71 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 uint8
-| hc1.daytemp | day temperature | uint8 (>=0<=127) | C | true | HC | 60 | 1 | 1/2 |
+| hc1.daytemp | day temperature | uint8 (>=0<=0) | C | true | HC | 60 | 1 | 1/2 |
 uint8
-| hc1.nighttemp | night temperature | uint8 (>=0<=127) | C | true | HC | 61 | 1 | 1/2 |
+| hc1.nighttemp | night temperature | uint8 (>=0<=0) | C | true | HC | 61 | 1 | 1/2 |
 uint8
-| hc1.reducehours | duration for nighttemp | uint8 (>=0<=254) | hours | true | HC | 200 | 1 | 1 |
-uint16
-| hc1.reduceminutes | remaining time for nightmode | uint16 (>=0<=31999) | minutes | false | HC | 201 | 1 | 1 |
+| hc1.reducehours | duration for nighttemp | uint8 (>=0<=0) | hours | true | HC | 200 | 1 | 1 |
+| hc1.reduceminutes | remaining time for nightmode | uint16 | minutes | false | HC | 201 | 1 | 1 |
 | dhw.mode | operating mode | enum |   | true | DHW | 0 | 1 | 1 |
 | errorcode | error code | string |   | false | DEVICE_DATA | 0 | 8 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.daytemp | day temperature | uint8 (>=0<=127) | C | true | HC | 60 | 1 | 1/2 |
+| hc1.daytemp | day temperature | uint8 (>=0<=0) | C | true | HC | 60 | 1 | 1/2 |
 uint8
-| hc1.nighttemp | night temperature | uint8 (>=0<=127) | C | true | HC | 61 | 1 | 1/2 |
+| hc1.nighttemp | night temperature | uint8 (>=0<=0) | C | true | HC | 61 | 1 | 1/2 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 uint8
-| hc1.minflowtemp | min flow temperature | uint8 (>=0<=254) | C | true | HC | 11 | 1 | 1 |
+| hc1.minflowtemp | min flow temperature | uint8 (>=0<=0) | C | true | HC | 11 | 1 | 1 |
 uint8
-| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=254) | C | true | HC | 12 | 1 | 1 |
+| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=0) | C | true | HC | 12 | 1 | 1 |
 uint8
-| hc1.tempautotemp | temporary set temperature automode | uint8 (>=0<=127) | C | true | HC | 27 | 1 | 1/2 |
+| hc1.tempautotemp | temporary set temperature automode | uint8 (>=0<=0) | C | true | HC | 27 | 1 | 1/2 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=10<=30) | C | true | HC | 8 | 1 | 1 |
@@ -6883,23 +5577,21 @@ uint8
 | errorcode | error code | string |   | false | DEVICE_DATA | 0 | 8 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 int8
-| intoffset | internal temperature offset | int8 (>=-12<=12) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
+| intoffset | internal temperature offset | int8 (>=0<=0) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 | heatingpid | heating PID | enum |   | true | DEVICE_DATA | 74 | 1 | 1 |
 | backlight | key backlight | boolean |   | true | DEVICE_DATA | 71 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 uint8
-| hc1.daytemp | day temperature | uint8 (>=0<=127) | C | true | HC | 60 | 1 | 1/2 |
+| hc1.daytemp | day temperature | uint8 (>=0<=0) | C | true | HC | 60 | 1 | 1/2 |
 uint8
-| hc1.nighttemp | night temperature | uint8 (>=0<=127) | C | true | HC | 61 | 1 | 1/2 |
+| hc1.nighttemp | night temperature | uint8 (>=0<=0) | C | true | HC | 61 | 1 | 1/2 |
 uint8
-| hc1.reducehours | duration for nighttemp | uint8 (>=0<=254) | hours | true | HC | 200 | 1 | 1 |
-uint16
-| hc1.reduceminutes | remaining time for nightmode | uint16 (>=0<=31999) | minutes | false | HC | 201 | 1 | 1 |
+| hc1.reducehours | duration for nighttemp | uint8 (>=0<=0) | hours | true | HC | 200 | 1 | 1 |
+| hc1.reduceminutes | remaining time for nightmode | uint16 | minutes | false | HC | 201 | 1 | 1 |
 | dhw.mode | operating mode | enum |   | true | DHW | 0 | 1 | 1 |
 
 ### RC35
@@ -6913,18 +5605,14 @@ int8
 | intoffset | internal temperature offset | int8 (>=-5<=5) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 int8
 | minexttemp | minimal external temperature | int8 (>=-30<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
-int16
-| inttemp1 | temperature sensor 1 | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
-int16
-| inttemp2 | temperature sensor 2 | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
+| inttemp1 | temperature sensor 1 | int16 | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
+| inttemp2 | temperature sensor 2 | int16 | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
 | damping | damping outdoor temperature | boolean |   | true | DEVICE_DATA | 52 | 1 | 1 |
-int8
-| dampedoutdoortemp | damped outdoor temperature | int8 (>=-126<=126) | C | false | DEVICE_DATA | 48 | 1 | 1 |
+| dampedoutdoortemp | damped outdoor temperature | int8 | C | false | DEVICE_DATA | 48 | 1 | 1 |
 | building | building type | enum |   | true | DEVICE_DATA | 50 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
@@ -6938,8 +5626,7 @@ int8
 | hc1.offsettemp | offset temperature | int8 (>=-5<=5) | C | true | HC | 10 | 1 | 1/2 |
 uint8
 | hc1.holidaytemp | holiday temperature | uint8 (>=5<=30) | C | true | HC | 62 | 1 | 1/2 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1 |
 | hc1.summermode | summer mode | enum |   | false | HC | 22 | 1 | 1 |
@@ -7005,22 +5692,21 @@ uint8
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 uint8
-| hc1.manualtemp | manual temperature | uint8 (>=0<=127) | C | true | HC | 6 | 1 | 1/2 |
+| hc1.manualtemp | manual temperature | uint8 (>=0<=0) | C | true | HC | 6 | 1 | 1/2 |
 uint8
-| hc1.offtemp | temperature when mode is off | uint8 (>=0<=127) | C | true | HC | 111 | 1 | 1/2 |
+| hc1.offtemp | temperature when mode is off | uint8 (>=0<=0) | C | true | HC | 111 | 1 | 1/2 |
 uint8
-| hc1.daytemp2 | day temperature T2 | uint8 (>=0<=127) | C | true | HC | 112 | 1 | 1/2 |
+| hc1.daytemp2 | day temperature T2 | uint8 (>=0<=0) | C | true | HC | 112 | 1 | 1/2 |
 uint8
-| hc1.daytemp3 | day temperature T3 | uint8 (>=0<=127) | C | true | HC | 113 | 1 | 1/2 |
+| hc1.daytemp3 | day temperature T3 | uint8 (>=0<=0) | C | true | HC | 113 | 1 | 1/2 |
 uint8
-| hc1.daytemp4 | day temperature T4 | uint8 (>=0<=127) | C | true | HC | 114 | 1 | 1/2 |
+| hc1.daytemp4 | day temperature T4 | uint8 (>=0<=0) | C | true | HC | 114 | 1 | 1/2 |
 uint8
-| hc1.nighttemp | night temperature T1 | uint8 (>=0<=127) | C | true | HC | 61 | 1 | 1/2 |
+| hc1.nighttemp | night temperature T1 | uint8 (>=0<=0) | C | true | HC | 61 | 1 | 1/2 |
 | hc1.switchtime | program switchtime | string |   | true | HC | 115 | 8 | 1 |
 
 ### RFM20 Remote
@@ -7032,8 +5718,7 @@ uint8
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 
 ### RC25
@@ -7044,25 +5729,24 @@ int16
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.daytemp | day temperature | uint8 (>=0<=127) | C | true | HC | 60 | 1 | 1/2 |
+| hc1.daytemp | day temperature | uint8 (>=0<=0) | C | true | HC | 60 | 1 | 1/2 |
 uint8
-| hc1.nighttemp | night temperature | uint8 (>=0<=127) | C | true | HC | 61 | 1 | 1/2 |
+| hc1.nighttemp | night temperature | uint8 (>=0<=0) | C | true | HC | 61 | 1 | 1/2 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 uint8
-| hc1.minflowtemp | min flow temperature | uint8 (>=0<=254) | C | true | HC | 11 | 1 | 1 |
+| hc1.minflowtemp | min flow temperature | uint8 (>=0<=0) | C | true | HC | 11 | 1 | 1 |
 uint8
-| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=254) | C | true | HC | 12 | 1 | 1 |
+| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=0) | C | true | HC | 12 | 1 | 1 |
 uint8
-| hc1.tempautotemp | temporary set temperature automode | uint8 (>=0<=127) | C | true | HC | 27 | 1 | 1/2 |
+| hc1.tempautotemp | temporary set temperature automode | uint8 (>=0<=0) | C | true | HC | 27 | 1 | 1/2 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1 |
@@ -7076,15 +5760,13 @@ uint8
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | true | DEVICE_DATA | 33 | 13 | 1 |
 int8
-| intoffset | internal temperature offset | int8 (>=-12<=12) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
+| intoffset | internal temperature offset | int8 (>=0<=0) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 | floordry | floor drying | enum |   | false | DEVICE_DATA | 47 | 1 | 1 |
-int16
-| dampedoutdoortemp | damped outdoor temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 48 | 1 | 1/10 |
-uint8
-| floordrytemp | floor drying temperature | uint8 (>=0<=254) | C | false | DEVICE_DATA | 49 | 1 | 1 |
+| dampedoutdoortemp | damped outdoor temperature | int16 | C | false | DEVICE_DATA | 48 | 1 | 1/10 |
+| floordrytemp | floor drying temperature | uint8 | C | false | DEVICE_DATA | 49 | 1 | 1 |
 | building | building type | enum |   | true | DEVICE_DATA | 50 | 1 | 1 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
 | damping | damping outdoor temperature | boolean |   | true | DEVICE_DATA | 52 | 1 | 1 |
 | solar | solar | boolean |   | true | DEVICE_DATA | 53 | 1 | 1 |
 | vacations | vacation dates | string |   | true | DEVICE_DATA | 76 | 13 | 1 |
@@ -7109,38 +5791,35 @@ int8
 | absent | absent | boolean |   | true | DEVICE_DATA | 64 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 uint8
-| hc1.manualtemp | manual temperature | uint8 (>=0<=127) | C | true | HC | 6 | 1 | 1/2 |
+| hc1.manualtemp | manual temperature | uint8 (>=0<=0) | C | true | HC | 6 | 1 | 1/2 |
 uint8
-| hc1.comforttemp | comfort temperature | uint8 (>=0<=127) | C | true | HC | 7 | 1 | 1/2 |
+| hc1.comforttemp | comfort temperature | uint8 (>=0<=0) | C | true | HC | 7 | 1 | 1/2 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=10<=30) | C | true | HC | 8 | 1 | 1 |
 uint8
-| hc1.designtemp | design temperature | uint8 (>=0<=254) | C | true | HC | 9 | 1 | 1 |
+| hc1.designtemp | design temperature | uint8 (>=0<=0) | C | true | HC | 9 | 1 | 1 |
 int8
-| hc1.offsettemp | offset temperature | int8 (>=-126<=126) | C | true | HC | 10 | 1 | 1 |
+| hc1.offsettemp | offset temperature | int8 (>=0<=0) | C | true | HC | 10 | 1 | 1 |
 uint8
-| hc1.minflowtemp | min flow temperature | uint8 (>=0<=254) | C | true | HC | 11 | 1 | 1 |
+| hc1.minflowtemp | min flow temperature | uint8 (>=0<=0) | C | true | HC | 11 | 1 | 1 |
 uint8
-| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=254) | C | true | HC | 12 | 1 | 1 |
+| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=0) | C | true | HC | 12 | 1 | 1 |
 uint8
-| hc1.roominfluence | room influence | uint8 (>=0<=254) | C | true | HC | 13 | 1 | 1 |
+| hc1.roominfluence | room influence | uint8 (>=0<=0) | C | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=25) |   | true | HC | 14 | 1 | 1/10 |
-int16
-| hc1.curroominfl | current room influence | int16 (>=-3199<=3199) | C | false | HC | 15 | 1 | 1/10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) |   | true | HC | 14 | 1 | 1/10 |
+| hc1.curroominfl | current room influence | int16 | C | false | HC | 15 | 1 | 1/10 |
 | hc1.nofrostmode | nofrost mode | enum |   | true | HC | 16 | 1 | 1 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-126<=126) | C | true | HC | 17 | 1 | 1 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.summersetmode | set summer mode | enum |   | true | HC | 20 | 1 | 1 |
 | hc1.hpoperatingmode | heatpump operating mode | enum |   | true | HC | 21 | 1 | 1 |
@@ -7154,13 +5833,13 @@ int8
 int8
 | hc1.cooltemp | cooling temperature | int8 (>=-1<=30) | C | true | HC | 28 | 1 | 1/2 |
 uint8
-| hc1.fastheatup | fast heatup | uint8 (>=0<=100) | % | true | HC | 29 | 1 | 1 |
+| hc1.fastheatup | fast heatup | uint8 (>=0<=0) | % | true | HC | 29 | 1 | 1 |
 | hc1.switchonoptimization | switch-on optimization | boolean |   | true | HC | 30 | 1 | 1 |
 | hc1.reducemode | reduce mode | enum |   | true | HC | 31 | 1 | 1 |
 int8
-| hc1.noreducetemp | no reduce below temperature | int8 (>=-126<=126) | C | true | HC | 32 | 1 | 1 |
+| hc1.noreducetemp | no reduce below temperature | int8 (>=0<=0) | C | true | HC | 32 | 1 | 1 |
 int8
-| hc1.reducetemp | off/reduce switch temperature | int8 (>=-126<=126) | C | true | HC | 33 | 1 | 1 |
+| hc1.reducetemp | off/reduce switch temperature | int8 (>=0<=0) | C | true | HC | 33 | 1 | 1 |
 | hc1.dhwprio | dhw priority | boolean |   | true | HC | 34 | 1 | 1 |
 | hc1.hpcooling | hp cooling | boolean |   | true | HC | 35 | 1 | 1 |
 | hc1.coolingon | cooling on | boolean |   | false | HC | 36 | 1 | 1 |
@@ -7168,9 +5847,9 @@ int8
 uint8
 | hc1.dewoffset | dew point offset | uint8 (>=2<=10) | K | true | HC | 38 | 1 | 1 |
 uint8
-| hc1.roomtempdiff | room temp difference | uint8 (>=0<=254) | K | true | HC | 39 | 1 | 1 |
+| hc1.roomtempdiff | room temp difference | uint8 (>=0<=0) | K | true | HC | 39 | 1 | 1 |
 uint8
-| hc1.hpminflowtemp | HP min. flow temp. | uint8 (>=0<=254) | C | true | HC | 40 | 1 | 1 |
+| hc1.hpminflowtemp | HP min. flow temp. | uint8 (>=0<=0) | C | true | HC | 40 | 1 | 1 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 uint8
 | hc1.heatondelay | heat-on delay | uint8 (>=1<=48) | hours | true | HC | 44 | 1 | 1 |
@@ -7180,7 +5859,7 @@ uint8
 | hc1.instantstart | instant start | uint8 (>=1<=10) | K | true | HC | 46 | 1 | 1 |
 | hc1.boost | boost mode | boolean |   | true | HC | 47 | 1 | 1 |
 uint8
-| hc1.boosttime | boost time | uint8 (>=0<=254) | hours | true | HC | 48 | 1 | 1 |
+| hc1.boosttime | boost time | uint8 (>=0<=0) | hours | true | HC | 48 | 1 | 1 |
 uint8
 | hc1.coolstart | cooling starttemp | uint8 (>=20<=35) | C | true | HC | 49 | 1 | 1 |
 uint8
@@ -7192,8 +5871,7 @@ int8
 | hc1.redthreshold | reduction threshold | int8 (>=12<=22) | C | true | HC | 53 | 1 | 1/2 |
 uint8
 | hc1.solarinfl | solar influence | uint8 (>=-5<=4294967295) | C | true | HC | 54 | 1 | 1 |
-uint8
-| hc1.currsolarinfl | current solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
+| hc1.currsolarinfl | current solar influence | uint8 | C | false | HC | 55 | 1 | 1/10 |
 | hc1.heatingpid | heating PID | enum |   | true | HC | 56 | 1 | 1 |
 | hc1.pumpopt | pump optimization | boolean |   | true | HC | 57 | 1 | 1 |
 uint8
@@ -7203,12 +5881,12 @@ uint8
 | dhw.mode | operating mode | enum |   | true | DHW | 0 | 1 | 1 |
 | dhw.modetype | mode type | enum |   | false | DHW | 1 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | true | DHW | 2 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 (>=0<=0) | C | true | DHW | 2 | 1 | 1 |
 uint8
-| dhw.settemplow | set low temperature | uint8 (>=0<=254) | C | true | DHW | 3 | 1 | 1 |
+| dhw.settemplow | set low temperature | uint8 (>=0<=0) | C | true | DHW | 3 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 4 | 1 | 1 |
 uint8
-| dhw.chargeduration | charge duration | uint8 (>=0<=3810) | minutes | true | DHW | 5 | 1 | 15 |
+| dhw.chargeduration | charge duration | uint8 (>=0<=0) | minutes | true | DHW | 5 | 1 | 15 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
 | dhw.extra | extra | boolean |   | false | DHW | 7 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 8 | 1 | 1 |
@@ -7227,15 +5905,13 @@ uint8
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | true | DEVICE_DATA | 33 | 13 | 1 |
 int8
-| intoffset | internal temperature offset | int8 (>=-12<=12) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
+| intoffset | internal temperature offset | int8 (>=0<=0) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 | floordry | floor drying | enum |   | false | DEVICE_DATA | 47 | 1 | 1 |
-int16
-| dampedoutdoortemp | damped outdoor temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 48 | 1 | 1/10 |
-uint8
-| floordrytemp | floor drying temperature | uint8 (>=0<=254) | C | false | DEVICE_DATA | 49 | 1 | 1 |
+| dampedoutdoortemp | damped outdoor temperature | int16 | C | false | DEVICE_DATA | 48 | 1 | 1/10 |
+| floordrytemp | floor drying temperature | uint8 | C | false | DEVICE_DATA | 49 | 1 | 1 |
 | building | building type | enum |   | true | DEVICE_DATA | 50 | 1 | 1 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
 | damping | damping outdoor temperature | boolean |   | true | DEVICE_DATA | 52 | 1 | 1 |
 | solar | solar | boolean |   | true | DEVICE_DATA | 53 | 1 | 1 |
 | hybridstrategy | hybrid control strategy | enum |   | true | DEVICE_DATA | 54 | 1 | 1 |
@@ -7259,38 +5935,35 @@ int8
 | absent | absent | boolean |   | true | DEVICE_DATA | 64 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 uint8
-| hc1.manualtemp | manual temperature | uint8 (>=0<=127) | C | true | HC | 6 | 1 | 1/2 |
+| hc1.manualtemp | manual temperature | uint8 (>=0<=0) | C | true | HC | 6 | 1 | 1/2 |
 uint8
-| hc1.comforttemp | comfort temperature | uint8 (>=0<=127) | C | true | HC | 7 | 1 | 1/2 |
+| hc1.comforttemp | comfort temperature | uint8 (>=0<=0) | C | true | HC | 7 | 1 | 1/2 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=10<=30) | C | true | HC | 8 | 1 | 1 |
 uint8
-| hc1.designtemp | design temperature | uint8 (>=0<=254) | C | true | HC | 9 | 1 | 1 |
+| hc1.designtemp | design temperature | uint8 (>=0<=0) | C | true | HC | 9 | 1 | 1 |
 int8
-| hc1.offsettemp | offset temperature | int8 (>=-126<=126) | C | true | HC | 10 | 1 | 1 |
+| hc1.offsettemp | offset temperature | int8 (>=0<=0) | C | true | HC | 10 | 1 | 1 |
 uint8
-| hc1.minflowtemp | min flow temperature | uint8 (>=0<=254) | C | true | HC | 11 | 1 | 1 |
+| hc1.minflowtemp | min flow temperature | uint8 (>=0<=0) | C | true | HC | 11 | 1 | 1 |
 uint8
-| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=254) | C | true | HC | 12 | 1 | 1 |
+| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=0) | C | true | HC | 12 | 1 | 1 |
 uint8
-| hc1.roominfluence | room influence | uint8 (>=0<=254) | C | true | HC | 13 | 1 | 1 |
+| hc1.roominfluence | room influence | uint8 (>=0<=0) | C | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=25) |   | true | HC | 14 | 1 | 1/10 |
-int16
-| hc1.curroominfl | current room influence | int16 (>=-3199<=3199) | C | false | HC | 15 | 1 | 1/10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) |   | true | HC | 14 | 1 | 1/10 |
+| hc1.curroominfl | current room influence | int16 | C | false | HC | 15 | 1 | 1/10 |
 | hc1.nofrostmode | nofrost mode | enum |   | true | HC | 16 | 1 | 1 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-126<=126) | C | true | HC | 17 | 1 | 1 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.summersetmode | set summer mode | enum |   | true | HC | 20 | 1 | 1 |
 | hc1.hpoperatingmode | heatpump operating mode | enum |   | true | HC | 21 | 1 | 1 |
@@ -7304,13 +5977,13 @@ int8
 int8
 | hc1.cooltemp | cooling temperature | int8 (>=-1<=30) | C | true | HC | 28 | 1 | 1/2 |
 uint8
-| hc1.fastheatup | fast heatup | uint8 (>=0<=100) | % | true | HC | 29 | 1 | 1 |
+| hc1.fastheatup | fast heatup | uint8 (>=0<=0) | % | true | HC | 29 | 1 | 1 |
 | hc1.switchonoptimization | switch-on optimization | boolean |   | true | HC | 30 | 1 | 1 |
 | hc1.reducemode | reduce mode | enum |   | true | HC | 31 | 1 | 1 |
 int8
-| hc1.noreducetemp | no reduce below temperature | int8 (>=-126<=126) | C | true | HC | 32 | 1 | 1 |
+| hc1.noreducetemp | no reduce below temperature | int8 (>=0<=0) | C | true | HC | 32 | 1 | 1 |
 int8
-| hc1.reducetemp | off/reduce switch temperature | int8 (>=-126<=126) | C | true | HC | 33 | 1 | 1 |
+| hc1.reducetemp | off/reduce switch temperature | int8 (>=0<=0) | C | true | HC | 33 | 1 | 1 |
 | hc1.dhwprio | dhw priority | boolean |   | true | HC | 34 | 1 | 1 |
 | hc1.hpcooling | hp cooling | boolean |   | true | HC | 35 | 1 | 1 |
 | hc1.coolingon | cooling on | boolean |   | false | HC | 36 | 1 | 1 |
@@ -7318,9 +5991,9 @@ int8
 uint8
 | hc1.dewoffset | dew point offset | uint8 (>=2<=10) | K | true | HC | 38 | 1 | 1 |
 uint8
-| hc1.roomtempdiff | room temp difference | uint8 (>=0<=254) | K | true | HC | 39 | 1 | 1 |
+| hc1.roomtempdiff | room temp difference | uint8 (>=0<=0) | K | true | HC | 39 | 1 | 1 |
 uint8
-| hc1.hpminflowtemp | HP min. flow temp. | uint8 (>=0<=254) | C | true | HC | 40 | 1 | 1 |
+| hc1.hpminflowtemp | HP min. flow temp. | uint8 (>=0<=0) | C | true | HC | 40 | 1 | 1 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
 | hc1.remotehum | room humidity from remote | cmd | % | true | HC | 43 | 1 | 1 |
@@ -7332,7 +6005,7 @@ uint8
 | hc1.instantstart | instant start | uint8 (>=1<=10) | K | true | HC | 46 | 1 | 1 |
 | hc1.boost | boost mode | boolean |   | true | HC | 47 | 1 | 1 |
 uint8
-| hc1.boosttime | boost time | uint8 (>=0<=254) | hours | true | HC | 48 | 1 | 1 |
+| hc1.boosttime | boost time | uint8 (>=0<=0) | hours | true | HC | 48 | 1 | 1 |
 uint8
 | hc1.coolstart | cooling starttemp | uint8 (>=20<=35) | C | true | HC | 49 | 1 | 1 |
 uint8
@@ -7344,8 +6017,7 @@ int8
 | hc1.redthreshold | reduction threshold | int8 (>=12<=22) | C | true | HC | 53 | 1 | 1/2 |
 uint8
 | hc1.solarinfl | solar influence | uint8 (>=-5<=4294967295) | C | true | HC | 54 | 1 | 1 |
-uint8
-| hc1.currsolarinfl | current solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
+| hc1.currsolarinfl | current solar influence | uint8 | C | false | HC | 55 | 1 | 1/10 |
 | hc1.heatingpid | heating PID | enum |   | true | HC | 56 | 1 | 1 |
 | hc1.pumpopt | pump optimization | boolean |   | true | HC | 57 | 1 | 1 |
 uint8
@@ -7355,12 +6027,12 @@ uint8
 | dhw.mode | operating mode | enum |   | true | DHW | 0 | 1 | 1 |
 | dhw.modetype | mode type | enum |   | false | DHW | 1 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | true | DHW | 2 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 (>=0<=0) | C | true | DHW | 2 | 1 | 1 |
 uint8
-| dhw.settemplow | set low temperature | uint8 (>=0<=254) | C | true | DHW | 3 | 1 | 1 |
+| dhw.settemplow | set low temperature | uint8 (>=0<=0) | C | true | DHW | 3 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 4 | 1 | 1 |
 uint8
-| dhw.chargeduration | charge duration | uint8 (>=0<=3810) | minutes | true | DHW | 5 | 1 | 15 |
+| dhw.chargeduration | charge duration | uint8 (>=0<=0) | minutes | true | DHW | 5 | 1 | 15 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
 | dhw.extra | extra | boolean |   | false | DHW | 7 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 8 | 1 | 1 |
@@ -7379,12 +6051,10 @@ uint8
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 
 ### Rego 2000/3000
@@ -7395,15 +6065,13 @@ uint8
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | true | DEVICE_DATA | 33 | 13 | 1 |
 int8
-| intoffset | internal temperature offset | int8 (>=-12<=12) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
+| intoffset | internal temperature offset | int8 (>=0<=0) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 | floordry | floor drying | enum |   | false | DEVICE_DATA | 47 | 1 | 1 |
-int16
-| dampedoutdoortemp | damped outdoor temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 48 | 1 | 1/10 |
-uint8
-| floordrytemp | floor drying temperature | uint8 (>=0<=254) | C | false | DEVICE_DATA | 49 | 1 | 1 |
+| dampedoutdoortemp | damped outdoor temperature | int16 | C | false | DEVICE_DATA | 48 | 1 | 1/10 |
+| floordrytemp | floor drying temperature | uint8 | C | false | DEVICE_DATA | 49 | 1 | 1 |
 | building | building type | enum |   | true | DEVICE_DATA | 50 | 1 | 1 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
 | damping | damping outdoor temperature | boolean |   | true | DEVICE_DATA | 52 | 1 | 1 |
 | solar | solar | boolean |   | true | DEVICE_DATA | 53 | 1 | 1 |
 | vacations | vacation dates | string |   | true | DEVICE_DATA | 76 | 13 | 1 |
@@ -7428,38 +6096,35 @@ int8
 | absent | absent | boolean |   | true | DEVICE_DATA | 64 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 uint8
-| hc1.manualtemp | manual temperature | uint8 (>=0<=127) | C | true | HC | 6 | 1 | 1/2 |
+| hc1.manualtemp | manual temperature | uint8 (>=0<=0) | C | true | HC | 6 | 1 | 1/2 |
 uint8
-| hc1.comforttemp | comfort temperature | uint8 (>=0<=127) | C | true | HC | 7 | 1 | 1/2 |
+| hc1.comforttemp | comfort temperature | uint8 (>=0<=0) | C | true | HC | 7 | 1 | 1/2 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=10<=30) | C | true | HC | 8 | 1 | 1 |
 uint8
-| hc1.designtemp | design temperature | uint8 (>=0<=254) | C | true | HC | 9 | 1 | 1 |
+| hc1.designtemp | design temperature | uint8 (>=0<=0) | C | true | HC | 9 | 1 | 1 |
 int8
-| hc1.offsettemp | offset temperature | int8 (>=-126<=126) | C | true | HC | 10 | 1 | 1 |
+| hc1.offsettemp | offset temperature | int8 (>=0<=0) | C | true | HC | 10 | 1 | 1 |
 uint8
-| hc1.minflowtemp | min flow temperature | uint8 (>=0<=254) | C | true | HC | 11 | 1 | 1 |
+| hc1.minflowtemp | min flow temperature | uint8 (>=0<=0) | C | true | HC | 11 | 1 | 1 |
 uint8
-| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=254) | C | true | HC | 12 | 1 | 1 |
+| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=0) | C | true | HC | 12 | 1 | 1 |
 uint8
-| hc1.roominfluence | room influence | uint8 (>=0<=254) | C | true | HC | 13 | 1 | 1 |
+| hc1.roominfluence | room influence | uint8 (>=0<=0) | C | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=25) |   | true | HC | 14 | 1 | 1/10 |
-int16
-| hc1.curroominfl | current room influence | int16 (>=-3199<=3199) | C | false | HC | 15 | 1 | 1/10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) |   | true | HC | 14 | 1 | 1/10 |
+| hc1.curroominfl | current room influence | int16 | C | false | HC | 15 | 1 | 1/10 |
 | hc1.nofrostmode | nofrost mode | enum |   | true | HC | 16 | 1 | 1 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-126<=126) | C | true | HC | 17 | 1 | 1 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.summersetmode | set summer mode | enum |   | true | HC | 20 | 1 | 1 |
 | hc1.hpoperatingmode | heatpump operating mode | enum |   | true | HC | 21 | 1 | 1 |
@@ -7473,13 +6138,13 @@ int8
 int8
 | hc1.cooltemp | cooling temperature | int8 (>=-1<=30) | C | true | HC | 28 | 1 | 1/2 |
 uint8
-| hc1.fastheatup | fast heatup | uint8 (>=0<=100) | % | true | HC | 29 | 1 | 1 |
+| hc1.fastheatup | fast heatup | uint8 (>=0<=0) | % | true | HC | 29 | 1 | 1 |
 | hc1.switchonoptimization | switch-on optimization | boolean |   | true | HC | 30 | 1 | 1 |
 | hc1.reducemode | reduce mode | enum |   | true | HC | 31 | 1 | 1 |
 int8
-| hc1.noreducetemp | no reduce below temperature | int8 (>=-126<=126) | C | true | HC | 32 | 1 | 1 |
+| hc1.noreducetemp | no reduce below temperature | int8 (>=0<=0) | C | true | HC | 32 | 1 | 1 |
 int8
-| hc1.reducetemp | off/reduce switch temperature | int8 (>=-126<=126) | C | true | HC | 33 | 1 | 1 |
+| hc1.reducetemp | off/reduce switch temperature | int8 (>=0<=0) | C | true | HC | 33 | 1 | 1 |
 | hc1.dhwprio | dhw priority | boolean |   | true | HC | 34 | 1 | 1 |
 | hc1.hpcooling | hp cooling | boolean |   | true | HC | 35 | 1 | 1 |
 | hc1.coolingon | cooling on | boolean |   | false | HC | 36 | 1 | 1 |
@@ -7487,9 +6152,9 @@ int8
 uint8
 | hc1.dewoffset | dew point offset | uint8 (>=2<=10) | K | true | HC | 38 | 1 | 1 |
 uint8
-| hc1.roomtempdiff | room temp difference | uint8 (>=0<=254) | K | true | HC | 39 | 1 | 1 |
+| hc1.roomtempdiff | room temp difference | uint8 (>=0<=0) | K | true | HC | 39 | 1 | 1 |
 uint8
-| hc1.hpminflowtemp | HP min. flow temp. | uint8 (>=0<=254) | C | true | HC | 40 | 1 | 1 |
+| hc1.hpminflowtemp | HP min. flow temp. | uint8 (>=0<=0) | C | true | HC | 40 | 1 | 1 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
 | hc1.remotehum | room humidity from remote | cmd | % | true | HC | 43 | 1 | 1 |
@@ -7501,7 +6166,7 @@ uint8
 | hc1.instantstart | instant start | uint8 (>=1<=10) | K | true | HC | 46 | 1 | 1 |
 | hc1.boost | boost mode | boolean |   | true | HC | 47 | 1 | 1 |
 uint8
-| hc1.boosttime | boost time | uint8 (>=0<=254) | hours | true | HC | 48 | 1 | 1 |
+| hc1.boosttime | boost time | uint8 (>=0<=0) | hours | true | HC | 48 | 1 | 1 |
 uint8
 | hc1.coolstart | cooling starttemp | uint8 (>=20<=35) | C | true | HC | 49 | 1 | 1 |
 uint8
@@ -7513,8 +6178,7 @@ int8
 | hc1.redthreshold | reduction threshold | int8 (>=12<=22) | C | true | HC | 53 | 1 | 1/2 |
 uint8
 | hc1.solarinfl | solar influence | uint8 (>=-5<=4294967295) | C | true | HC | 54 | 1 | 1 |
-uint8
-| hc1.currsolarinfl | current solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
+| hc1.currsolarinfl | current solar influence | uint8 | C | false | HC | 55 | 1 | 1/10 |
 | hc1.heatingpid | heating PID | enum |   | true | HC | 56 | 1 | 1 |
 | hc1.pumpopt | pump optimization | boolean |   | true | HC | 57 | 1 | 1 |
 uint8
@@ -7524,12 +6188,12 @@ uint8
 | dhw.mode | operating mode | enum |   | true | DHW | 0 | 1 | 1 |
 | dhw.modetype | mode type | enum |   | false | DHW | 1 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | true | DHW | 2 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 (>=0<=0) | C | true | DHW | 2 | 1 | 1 |
 uint8
-| dhw.settemplow | set low temperature | uint8 (>=0<=254) | C | true | DHW | 3 | 1 | 1 |
+| dhw.settemplow | set low temperature | uint8 (>=0<=0) | C | true | DHW | 3 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 4 | 1 | 1 |
 uint8
-| dhw.chargeduration | charge duration | uint8 (>=0<=3810) | minutes | true | DHW | 5 | 1 | 15 |
+| dhw.chargeduration | charge duration | uint8 (>=0<=0) | minutes | true | DHW | 5 | 1 | 15 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
 | dhw.extra | extra | boolean |   | false | DHW | 7 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 8 | 1 | 1 |
@@ -7547,15 +6211,12 @@ uint8
 | errorcode | error code | string |   | false | DEVICE_DATA | 0 | 8 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
-int16
-| hc1.seltemp | selected room temperature | int16 (>=-15999<=15999) | C | false | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.seltemp | selected room temperature | int16 | C | false | HC | 0 | 1 | 1/2 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | false | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 
 ### CRF200S
 
@@ -7564,15 +6225,12 @@ uint8
 | errorcode | error code | string |   | false | DEVICE_DATA | 0 | 8 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
-int16
-| hc1.seltemp | selected room temperature | int16 (>=-15999<=15999) | C | false | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.seltemp | selected room temperature | int16 | C | false | HC | 0 | 1 | 1/2 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | false | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 
 ### Comfort+2RF
 
@@ -7581,15 +6239,12 @@ uint8
 | errorcode | error code | string |   | false | DEVICE_DATA | 0 | 8 | 1 |
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
-int16
-| hc1.seltemp | selected room temperature | int16 (>=-15999<=15999) | C | false | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.seltemp | selected room temperature | int16 | C | false | HC | 0 | 1 | 1/2 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | false | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 
 ### Rego 3000, UI800, Logamatic BC400
 
@@ -7599,15 +6254,13 @@ uint8
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | true | DEVICE_DATA | 33 | 13 | 1 |
 int8
-| intoffset | internal temperature offset | int8 (>=-12<=12) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
+| intoffset | internal temperature offset | int8 (>=0<=0) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 | floordry | floor drying | enum |   | false | DEVICE_DATA | 47 | 1 | 1 |
-int16
-| dampedoutdoortemp | damped outdoor temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 48 | 1 | 1/10 |
-uint8
-| floordrytemp | floor drying temperature | uint8 (>=0<=254) | C | false | DEVICE_DATA | 49 | 1 | 1 |
+| dampedoutdoortemp | damped outdoor temperature | int16 | C | false | DEVICE_DATA | 48 | 1 | 1/10 |
+| floordrytemp | floor drying temperature | uint8 | C | false | DEVICE_DATA | 49 | 1 | 1 |
 | building | building type | enum |   | true | DEVICE_DATA | 50 | 1 | 1 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
 | damping | damping outdoor temperature | boolean |   | true | DEVICE_DATA | 52 | 1 | 1 |
 | solar | solar | boolean |   | true | DEVICE_DATA | 53 | 1 | 1 |
 | hybridstrategy | hybrid control strategy | enum |   | true | DEVICE_DATA | 54 | 1 | 1 |
@@ -7631,38 +6284,35 @@ int8
 | absent | absent | boolean |   | true | DEVICE_DATA | 64 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 uint8
-| hc1.manualtemp | manual temperature | uint8 (>=0<=127) | C | true | HC | 6 | 1 | 1/2 |
+| hc1.manualtemp | manual temperature | uint8 (>=0<=0) | C | true | HC | 6 | 1 | 1/2 |
 uint8
-| hc1.comforttemp | comfort temperature | uint8 (>=0<=127) | C | true | HC | 7 | 1 | 1/2 |
+| hc1.comforttemp | comfort temperature | uint8 (>=0<=0) | C | true | HC | 7 | 1 | 1/2 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=10<=30) | C | true | HC | 8 | 1 | 1 |
 uint8
-| hc1.designtemp | design temperature | uint8 (>=0<=254) | C | true | HC | 9 | 1 | 1 |
+| hc1.designtemp | design temperature | uint8 (>=0<=0) | C | true | HC | 9 | 1 | 1 |
 int8
-| hc1.offsettemp | offset temperature | int8 (>=-126<=126) | C | true | HC | 10 | 1 | 1 |
+| hc1.offsettemp | offset temperature | int8 (>=0<=0) | C | true | HC | 10 | 1 | 1 |
 uint8
-| hc1.minflowtemp | min flow temperature | uint8 (>=0<=254) | C | true | HC | 11 | 1 | 1 |
+| hc1.minflowtemp | min flow temperature | uint8 (>=0<=0) | C | true | HC | 11 | 1 | 1 |
 uint8
-| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=254) | C | true | HC | 12 | 1 | 1 |
+| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=0) | C | true | HC | 12 | 1 | 1 |
 uint8
-| hc1.roominfluence | room influence | uint8 (>=0<=254) | C | true | HC | 13 | 1 | 1 |
+| hc1.roominfluence | room influence | uint8 (>=0<=0) | C | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=25) |   | true | HC | 14 | 1 | 1/10 |
-int16
-| hc1.curroominfl | current room influence | int16 (>=-3199<=3199) | C | false | HC | 15 | 1 | 1/10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) |   | true | HC | 14 | 1 | 1/10 |
+| hc1.curroominfl | current room influence | int16 | C | false | HC | 15 | 1 | 1/10 |
 | hc1.nofrostmode | nofrost mode | enum |   | true | HC | 16 | 1 | 1 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-126<=126) | C | true | HC | 17 | 1 | 1 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.summersetmode | set summer mode | enum |   | true | HC | 20 | 1 | 1 |
 | hc1.hpoperatingmode | heatpump operating mode | enum |   | true | HC | 21 | 1 | 1 |
@@ -7676,13 +6326,13 @@ int8
 int8
 | hc1.cooltemp | cooling temperature | int8 (>=-1<=30) | C | true | HC | 28 | 1 | 1/2 |
 uint8
-| hc1.fastheatup | fast heatup | uint8 (>=0<=100) | % | true | HC | 29 | 1 | 1 |
+| hc1.fastheatup | fast heatup | uint8 (>=0<=0) | % | true | HC | 29 | 1 | 1 |
 | hc1.switchonoptimization | switch-on optimization | boolean |   | true | HC | 30 | 1 | 1 |
 | hc1.reducemode | reduce mode | enum |   | true | HC | 31 | 1 | 1 |
 int8
-| hc1.noreducetemp | no reduce below temperature | int8 (>=-126<=126) | C | true | HC | 32 | 1 | 1 |
+| hc1.noreducetemp | no reduce below temperature | int8 (>=0<=0) | C | true | HC | 32 | 1 | 1 |
 int8
-| hc1.reducetemp | off/reduce switch temperature | int8 (>=-126<=126) | C | true | HC | 33 | 1 | 1 |
+| hc1.reducetemp | off/reduce switch temperature | int8 (>=0<=0) | C | true | HC | 33 | 1 | 1 |
 | hc1.dhwprio | dhw priority | boolean |   | true | HC | 34 | 1 | 1 |
 | hc1.hpcooling | hp cooling | boolean |   | true | HC | 35 | 1 | 1 |
 | hc1.coolingon | cooling on | boolean |   | false | HC | 36 | 1 | 1 |
@@ -7690,9 +6340,9 @@ int8
 uint8
 | hc1.dewoffset | dew point offset | uint8 (>=2<=10) | K | true | HC | 38 | 1 | 1 |
 uint8
-| hc1.roomtempdiff | room temp difference | uint8 (>=0<=254) | K | true | HC | 39 | 1 | 1 |
+| hc1.roomtempdiff | room temp difference | uint8 (>=0<=0) | K | true | HC | 39 | 1 | 1 |
 uint8
-| hc1.hpminflowtemp | HP min. flow temp. | uint8 (>=0<=254) | C | true | HC | 40 | 1 | 1 |
+| hc1.hpminflowtemp | HP min. flow temp. | uint8 (>=0<=0) | C | true | HC | 40 | 1 | 1 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
 | hc1.remotehum | room humidity from remote | cmd | % | true | HC | 43 | 1 | 1 |
@@ -7704,7 +6354,7 @@ uint8
 | hc1.instantstart | instant start | uint8 (>=1<=10) | K | true | HC | 46 | 1 | 1 |
 | hc1.boost | boost mode | boolean |   | true | HC | 47 | 1 | 1 |
 uint8
-| hc1.boosttime | boost time | uint8 (>=0<=254) | hours | true | HC | 48 | 1 | 1 |
+| hc1.boosttime | boost time | uint8 (>=0<=0) | hours | true | HC | 48 | 1 | 1 |
 uint8
 | hc1.coolstart | cooling starttemp | uint8 (>=20<=35) | C | true | HC | 49 | 1 | 1 |
 uint8
@@ -7716,8 +6366,7 @@ int8
 | hc1.redthreshold | reduction threshold | int8 (>=12<=22) | C | true | HC | 53 | 1 | 1/2 |
 uint8
 | hc1.solarinfl | solar influence | uint8 (>=-5<=4294967295) | C | true | HC | 54 | 1 | 1 |
-uint8
-| hc1.currsolarinfl | current solar influence | uint8 (>=0<=25) | C | false | HC | 55 | 1 | 1/10 |
+| hc1.currsolarinfl | current solar influence | uint8 | C | false | HC | 55 | 1 | 1/10 |
 | hc1.heatingpid | heating PID | enum |   | true | HC | 56 | 1 | 1 |
 | hc1.pumpopt | pump optimization | boolean |   | true | HC | 57 | 1 | 1 |
 uint8
@@ -7727,12 +6376,12 @@ uint8
 | dhw.mode | operating mode | enum |   | true | DHW | 0 | 1 | 1 |
 | dhw.modetype | mode type | enum |   | false | DHW | 1 | 1 | 1 |
 uint8
-| dhw.settemp | set temperature | uint8 (>=0<=254) | C | true | DHW | 2 | 1 | 1 |
+| dhw.settemp | set temperature | uint8 (>=0<=0) | C | true | DHW | 2 | 1 | 1 |
 uint8
-| dhw.settemplow | set low temperature | uint8 (>=0<=254) | C | true | DHW | 3 | 1 | 1 |
+| dhw.settemplow | set low temperature | uint8 (>=0<=0) | C | true | DHW | 3 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 4 | 1 | 1 |
 uint8
-| dhw.chargeduration | charge duration | uint8 (>=0<=3810) | minutes | true | DHW | 5 | 1 | 15 |
+| dhw.chargeduration | charge duration | uint8 (>=0<=0) | minutes | true | DHW | 5 | 1 | 15 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
 | dhw.extra | extra | boolean |   | false | DHW | 7 | 1 | 1 |
 | dhw.disinfecting | disinfecting | boolean |   | true | DHW | 8 | 1 | 1 |
@@ -7751,25 +6400,24 @@ uint8
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.daytemp | day temperature | uint8 (>=0<=127) | C | true | HC | 60 | 1 | 1/2 |
+| hc1.daytemp | day temperature | uint8 (>=0<=0) | C | true | HC | 60 | 1 | 1/2 |
 uint8
-| hc1.nighttemp | night temperature | uint8 (>=0<=127) | C | true | HC | 61 | 1 | 1/2 |
+| hc1.nighttemp | night temperature | uint8 (>=0<=0) | C | true | HC | 61 | 1 | 1/2 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 uint8
-| hc1.minflowtemp | min flow temperature | uint8 (>=0<=254) | C | true | HC | 11 | 1 | 1 |
+| hc1.minflowtemp | min flow temperature | uint8 (>=0<=0) | C | true | HC | 11 | 1 | 1 |
 uint8
-| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=254) | C | true | HC | 12 | 1 | 1 |
+| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=0) | C | true | HC | 12 | 1 | 1 |
 uint8
-| hc1.tempautotemp | temporary set temperature automode | uint8 (>=0<=127) | C | true | HC | 27 | 1 | 1/2 |
+| hc1.tempautotemp | temporary set temperature automode | uint8 (>=0<=0) | C | true | HC | 27 | 1 | 1/2 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=10<=30) | C | true | HC | 8 | 1 | 1 |
@@ -7778,25 +6426,24 @@ uint8
 | lastcode | last error code | string |   | false | DEVICE_DATA | 8 | 25 | 1 |
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.daytemp | day temperature | uint8 (>=0<=127) | C | true | HC | 60 | 1 | 1/2 |
+| hc1.daytemp | day temperature | uint8 (>=0<=0) | C | true | HC | 60 | 1 | 1/2 |
 uint8
-| hc1.nighttemp | night temperature | uint8 (>=0<=127) | C | true | HC | 61 | 1 | 1/2 |
+| hc1.nighttemp | night temperature | uint8 (>=0<=0) | C | true | HC | 61 | 1 | 1/2 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 uint8
-| hc1.minflowtemp | min flow temperature | uint8 (>=0<=254) | C | true | HC | 11 | 1 | 1 |
+| hc1.minflowtemp | min flow temperature | uint8 (>=0<=0) | C | true | HC | 11 | 1 | 1 |
 uint8
-| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=254) | C | true | HC | 12 | 1 | 1 |
+| hc1.maxflowtemp | max flow temperature | uint8 (>=0<=0) | C | true | HC | 12 | 1 | 1 |
 uint8
-| hc1.tempautotemp | temporary set temperature automode | uint8 (>=0<=127) | C | true | HC | 27 | 1 | 1/2 |
+| hc1.tempautotemp | temporary set temperature automode | uint8 (>=0<=0) | C | true | HC | 27 | 1 | 1/2 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=10<=30) | C | true | HC | 8 | 1 | 1 |
@@ -7812,23 +6459,19 @@ uint8
 | display | display | enum |   | true | DEVICE_DATA | 65 | 1 | 1 |
 | language | language | enum |   | false | DEVICE_DATA | 66 | 1 | 1 |
 int8
-| clockoffset | clock offset | int8 (>=-126<=126) | seconds | true | DEVICE_DATA | 67 | 1 | 1 |
+| clockoffset | clock offset | int8 (>=0<=0) | seconds | true | DEVICE_DATA | 67 | 1 | 1 |
 int8
-| intoffset | internal temperature offset | int8 (>=-12<=12) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
+| intoffset | internal temperature offset | int8 (>=0<=0) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 int8
-| minexttemp | minimal external temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 51 | 1 | 1 |
-int16
-| inttemp1 | temperature sensor 1 | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
-int16
-| inttemp2 | temperature sensor 2 | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
+| minexttemp | minimal external temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
+| inttemp1 | temperature sensor 1 | int16 | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
+| inttemp2 | temperature sensor 2 | int16 | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
 | damping | damping outdoor temperature | boolean |   | true | DEVICE_DATA | 52 | 1 | 1 |
-int8
-| dampedoutdoortemp | damped outdoor temperature | int8 (>=-126<=126) | C | false | DEVICE_DATA | 48 | 1 | 1 |
+| dampedoutdoortemp | damped outdoor temperature | int8 | C | false | DEVICE_DATA | 48 | 1 | 1 |
 | building | building type | enum |   | true | DEVICE_DATA | 50 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
@@ -7842,8 +6485,7 @@ int8
 | hc1.offsettemp | offset temperature | int8 (>=-5<=5) | C | true | HC | 10 | 1 | 1/2 |
 uint8
 | hc1.holidaytemp | holiday temperature | uint8 (>=5<=30) | C | true | HC | 62 | 1 | 1/2 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1 |
 | hc1.summermode | summer mode | enum |   | false | HC | 22 | 1 | 1 |
@@ -7893,7 +6535,7 @@ int8
 uint8
 | dhw.disinfecthour | disinfection hour | uint8 (>=0<=23) |   | true | DHW | 15 | 1 | 1 |
 uint8
-| dhw.maxtemp | maximum temperature | uint8 (>=0<=254) | C | true | DHW | 16 | 1 | 1 |
+| dhw.maxtemp | maximum temperature | uint8 (>=0<=0) | C | true | DHW | 16 | 1 | 1 |
 | dhw.onetimekey | one time key function | boolean |   | true | DHW | 17 | 1 | 1 |
 | dhw.switchtime | program switchtime | string |   | true | DHW | 18 | 8 | 1 |
 | dhw.circswitchtime | circulation program switchtime | string |   | true | DHW | 26 | 8 | 1 |
@@ -7911,18 +6553,14 @@ int8
 | intoffset | internal temperature offset | int8 (>=-5<=5) | C | true | DEVICE_DATA | 46 | 1 | 1/10 |
 int8
 | minexttemp | minimal external temperature | int8 (>=-30<=0) | C | true | DEVICE_DATA | 51 | 1 | 1 |
-int16
-| inttemp1 | temperature sensor 1 | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
-int16
-| inttemp2 | temperature sensor 2 | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
+| inttemp1 | temperature sensor 1 | int16 | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
+| inttemp2 | temperature sensor 2 | int16 | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
 | damping | damping outdoor temperature | boolean |   | true | DEVICE_DATA | 52 | 1 | 1 |
-int8
-| dampedoutdoortemp | damped outdoor temperature | int8 (>=-126<=126) | C | false | DEVICE_DATA | 48 | 1 | 1 |
+| dampedoutdoortemp | damped outdoor temperature | int8 | C | false | DEVICE_DATA | 48 | 1 | 1 |
 | building | building type | enum |   | true | DEVICE_DATA | 50 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
@@ -7936,8 +6574,7 @@ int8
 | hc1.offsettemp | offset temperature | int8 (>=-5<=5) | C | true | HC | 10 | 1 | 1/2 |
 uint8
 | hc1.holidaytemp | holiday temperature | uint8 (>=5<=30) | C | true | HC | 62 | 1 | 1/2 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1 |
 | hc1.summermode | summer mode | enum |   | false | HC | 22 | 1 | 1 |
@@ -8018,22 +6655,20 @@ uint8
 | tempdiffboiler | temp diff boiler support | uint8 (>=1<=99) | C | true | DEVICE_DATA | 60 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/10 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.heattemp | heat temperature | uint8 (>=0<=127) | C | true | HC | 202 | 1 | 1/2 |
+| hc1.heattemp | heat temperature | uint8 (>=0<=0) | C | true | HC | 202 | 1 | 1/2 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-63<=63) | C | true | HC | 17 | 1 | 1/2 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1/2 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1/2 |
 | hc1.roomsensor | room sensor | enum |   | true | HC | 203 | 1 | 1 |
@@ -8048,7 +6683,7 @@ uint8
 | hc1.designtemp | design temperature | uint8 (>=30<=90) | C | true | HC | 9 | 1 | 1 |
 | hc1.roominfluence | room influence | enum |   | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=100) | % | true | HC | 14 | 1 | 10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) | % | true | HC | 14 | 1 | 10 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
@@ -8077,22 +6712,20 @@ uint8
 | tempdiffboiler | temp diff boiler support | uint8 (>=1<=99) | C | true | DEVICE_DATA | 60 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/10 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.heattemp | heat temperature | uint8 (>=0<=127) | C | true | HC | 202 | 1 | 1/2 |
+| hc1.heattemp | heat temperature | uint8 (>=0<=0) | C | true | HC | 202 | 1 | 1/2 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-63<=63) | C | true | HC | 17 | 1 | 1/2 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1/2 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1/2 |
 | hc1.roomsensor | room sensor | enum |   | true | HC | 203 | 1 | 1 |
@@ -8107,7 +6740,7 @@ uint8
 | hc1.designtemp | design temperature | uint8 (>=30<=90) | C | true | HC | 9 | 1 | 1 |
 | hc1.roominfluence | room influence | enum |   | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=100) | % | true | HC | 14 | 1 | 10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) | % | true | HC | 14 | 1 | 10 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
@@ -8134,22 +6767,20 @@ uint8
 | tempdiffboiler | temp diff boiler support | uint8 (>=1<=99) | C | true | DEVICE_DATA | 60 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/10 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.heattemp | heat temperature | uint8 (>=0<=127) | C | true | HC | 202 | 1 | 1/2 |
+| hc1.heattemp | heat temperature | uint8 (>=0<=0) | C | true | HC | 202 | 1 | 1/2 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-63<=63) | C | true | HC | 17 | 1 | 1/2 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1/2 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1/2 |
 | hc1.roomsensor | room sensor | enum |   | true | HC | 203 | 1 | 1 |
@@ -8164,7 +6795,7 @@ uint8
 | hc1.designtemp | design temperature | uint8 (>=30<=90) | C | true | HC | 9 | 1 | 1 |
 | hc1.roominfluence | room influence | enum |   | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=100) | % | true | HC | 14 | 1 | 10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) | % | true | HC | 14 | 1 | 10 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
@@ -8191,22 +6822,20 @@ uint8
 | tempdiffboiler | temp diff boiler support | uint8 (>=1<=99) | C | true | DEVICE_DATA | 60 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/10 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.heattemp | heat temperature | uint8 (>=0<=127) | C | true | HC | 202 | 1 | 1/2 |
+| hc1.heattemp | heat temperature | uint8 (>=0<=0) | C | true | HC | 202 | 1 | 1/2 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-63<=63) | C | true | HC | 17 | 1 | 1/2 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1/2 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1/2 |
 | hc1.roomsensor | room sensor | enum |   | true | HC | 203 | 1 | 1 |
@@ -8221,7 +6850,7 @@ uint8
 | hc1.designtemp | design temperature | uint8 (>=30<=90) | C | true | HC | 9 | 1 | 1 |
 | hc1.roominfluence | room influence | enum |   | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=100) | % | true | HC | 14 | 1 | 10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) | % | true | HC | 14 | 1 | 10 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
@@ -8250,22 +6879,20 @@ uint8
 | tempdiffboiler | temp diff boiler support | uint8 (>=1<=99) | C | true | DEVICE_DATA | 60 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/10 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.heattemp | heat temperature | uint8 (>=0<=127) | C | true | HC | 202 | 1 | 1/2 |
+| hc1.heattemp | heat temperature | uint8 (>=0<=0) | C | true | HC | 202 | 1 | 1/2 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-63<=63) | C | true | HC | 17 | 1 | 1/2 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1/2 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1/2 |
 | hc1.roomsensor | room sensor | enum |   | true | HC | 203 | 1 | 1 |
@@ -8280,7 +6907,7 @@ uint8
 | hc1.designtemp | design temperature | uint8 (>=30<=90) | C | true | HC | 9 | 1 | 1 |
 | hc1.roominfluence | room influence | enum |   | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=100) | % | true | HC | 14 | 1 | 10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) | % | true | HC | 14 | 1 | 10 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
@@ -8309,22 +6936,20 @@ uint8
 | tempdiffboiler | temp diff boiler support | uint8 (>=1<=99) | C | true | DEVICE_DATA | 60 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/10 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.heattemp | heat temperature | uint8 (>=0<=127) | C | true | HC | 202 | 1 | 1/2 |
+| hc1.heattemp | heat temperature | uint8 (>=0<=0) | C | true | HC | 202 | 1 | 1/2 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-63<=63) | C | true | HC | 17 | 1 | 1/2 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1/2 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1/2 |
 | hc1.roomsensor | room sensor | enum |   | true | HC | 203 | 1 | 1 |
@@ -8339,7 +6964,7 @@ uint8
 | hc1.designtemp | design temperature | uint8 (>=30<=90) | C | true | HC | 9 | 1 | 1 |
 | hc1.roominfluence | room influence | enum |   | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=100) | % | true | HC | 14 | 1 | 10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) | % | true | HC | 14 | 1 | 10 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
@@ -8366,22 +6991,20 @@ uint8
 | tempdiffboiler | temp diff boiler support | uint8 (>=1<=99) | C | true | DEVICE_DATA | 60 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/10 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.heattemp | heat temperature | uint8 (>=0<=127) | C | true | HC | 202 | 1 | 1/2 |
+| hc1.heattemp | heat temperature | uint8 (>=0<=0) | C | true | HC | 202 | 1 | 1/2 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-63<=63) | C | true | HC | 17 | 1 | 1/2 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1/2 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1/2 |
 | hc1.roomsensor | room sensor | enum |   | true | HC | 203 | 1 | 1 |
@@ -8396,7 +7019,7 @@ uint8
 | hc1.designtemp | design temperature | uint8 (>=30<=90) | C | true | HC | 9 | 1 | 1 |
 | hc1.roominfluence | room influence | enum |   | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=100) | % | true | HC | 14 | 1 | 10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) | % | true | HC | 14 | 1 | 10 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
@@ -8425,22 +7048,20 @@ uint8
 | tempdiffboiler | temp diff boiler support | uint8 (>=1<=99) | C | true | DEVICE_DATA | 60 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/10 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.heattemp | heat temperature | uint8 (>=0<=127) | C | true | HC | 202 | 1 | 1/2 |
+| hc1.heattemp | heat temperature | uint8 (>=0<=0) | C | true | HC | 202 | 1 | 1/2 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-63<=63) | C | true | HC | 17 | 1 | 1/2 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1/2 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1/2 |
 | hc1.roomsensor | room sensor | enum |   | true | HC | 203 | 1 | 1 |
@@ -8455,7 +7076,7 @@ uint8
 | hc1.designtemp | design temperature | uint8 (>=30<=90) | C | true | HC | 9 | 1 | 1 |
 | hc1.roominfluence | room influence | enum |   | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=100) | % | true | HC | 14 | 1 | 10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) | % | true | HC | 14 | 1 | 10 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
@@ -8482,22 +7103,20 @@ uint8
 | tempdiffboiler | temp diff boiler support | uint8 (>=1<=99) | C | true | DEVICE_DATA | 60 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/10 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.heattemp | heat temperature | uint8 (>=0<=127) | C | true | HC | 202 | 1 | 1/2 |
+| hc1.heattemp | heat temperature | uint8 (>=0<=0) | C | true | HC | 202 | 1 | 1/2 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-63<=63) | C | true | HC | 17 | 1 | 1/2 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1/2 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1/2 |
 | hc1.roomsensor | room sensor | enum |   | true | HC | 203 | 1 | 1 |
@@ -8512,7 +7131,7 @@ uint8
 | hc1.designtemp | design temperature | uint8 (>=30<=90) | C | true | HC | 9 | 1 | 1 |
 | hc1.roominfluence | room influence | enum |   | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=100) | % | true | HC | 14 | 1 | 10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) | % | true | HC | 14 | 1 | 10 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
@@ -8539,22 +7158,20 @@ uint8
 | tempdiffboiler | temp diff boiler support | uint8 (>=1<=99) | C | true | DEVICE_DATA | 60 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/10 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.heattemp | heat temperature | uint8 (>=0<=127) | C | true | HC | 202 | 1 | 1/2 |
+| hc1.heattemp | heat temperature | uint8 (>=0<=0) | C | true | HC | 202 | 1 | 1/2 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-63<=63) | C | true | HC | 17 | 1 | 1/2 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1/2 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1/2 |
 | hc1.roomsensor | room sensor | enum |   | true | HC | 203 | 1 | 1 |
@@ -8569,7 +7186,7 @@ uint8
 | hc1.designtemp | design temperature | uint8 (>=30<=90) | C | true | HC | 9 | 1 | 1 |
 | hc1.roominfluence | room influence | enum |   | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=100) | % | true | HC | 14 | 1 | 10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) | % | true | HC | 14 | 1 | 10 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
@@ -8598,22 +7215,20 @@ uint8
 | tempdiffboiler | temp diff boiler support | uint8 (>=1<=99) | C | true | DEVICE_DATA | 60 | 1 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/10 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 | hc1.mode | operating mode | enum |   | true | HC | 3 | 1 | 1 |
 | hc1.modetype | mode type | enum |   | false | HC | 4 | 1 | 1 |
 uint8
-| hc1.heattemp | heat temperature | uint8 (>=0<=127) | C | true | HC | 202 | 1 | 1/2 |
+| hc1.heattemp | heat temperature | uint8 (>=0<=0) | C | true | HC | 202 | 1 | 1/2 |
 uint8
-| hc1.ecotemp | eco temperature | uint8 (>=0<=127) | C | true | HC | 5 | 1 | 1/2 |
+| hc1.ecotemp | eco temperature | uint8 (>=0<=0) | C | true | HC | 5 | 1 | 1/2 |
 int8
-| hc1.nofrosttemp | nofrost temperature | int8 (>=-63<=63) | C | true | HC | 17 | 1 | 1/2 |
+| hc1.nofrosttemp | nofrost temperature | int8 (>=0<=0) | C | true | HC | 17 | 1 | 1/2 |
 | hc1.control | control device | enum |   | true | HC | 41 | 1 | 1 |
 | hc1.program | program | enum |   | true | HC | 26 | 1 | 1 |
 | hc1.remotetemp | room temperature from remote | cmd | C | true | HC | 42 | 1 | 1/10 |
-uint8
-| hc1.targetflowtemp | target flow temperature | uint8 (>=0<=254) | C | false | HC | 18 | 1 | 1 |
+| hc1.targetflowtemp | target flow temperature | uint8 | C | false | HC | 18 | 1 | 1 |
 uint8
 | hc1.summertemp | summer temperature | uint8 (>=9<=25) | C | true | HC | 8 | 1 | 1/2 |
 | hc1.roomsensor | room sensor | enum |   | true | HC | 203 | 1 | 1 |
@@ -8628,7 +7243,7 @@ uint8
 | hc1.designtemp | design temperature | uint8 (>=30<=90) | C | true | HC | 9 | 1 | 1 |
 | hc1.roominfluence | room influence | enum |   | true | HC | 13 | 1 | 1 |
 uint8
-| hc1.roominflfactor | room influence factor | uint8 (>=0<=100) | % | true | HC | 14 | 1 | 10 |
+| hc1.roominflfactor | room influence factor | uint8 (>=0<=0) | % | true | HC | 14 | 1 | 10 |
 | hc1.heatingtype | heating type | enum |   | true | HC | 19 | 1 | 1 |
 | hc1.controlmode | control mode | enum |   | true | HC | 25 | 1 | 1 |
 | dhw.charge | charge | boolean |   | true | DHW | 6 | 1 | 1 |
@@ -8642,8 +7257,7 @@ uint8
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 
 ### RC100H, CR10H
@@ -8655,8 +7269,7 @@ int16
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 
 ### RC120RF, TR120RF, CR20RF
@@ -8668,8 +7281,7 @@ int16
 | datetime | date/time | string |   | false | DEVICE_DATA | 33 | 13 | 1 |
 int16
 | hc1.seltemp | selected room temperature | int16 (>=0<=30) | C | true | HC | 0 | 1 | 1/2 |
-int16
-| hc1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | HC | 1 | 1 | 1/10 |
+| hc1.currtemp | current room temperature | int16 | C | false | HC | 1 | 1 | 1/10 |
 | hc1.haclimate | mqtt discovery current room temperature | enum |   | false | HC | 2 | 1 | 1 |
 
 ## Devices of type \_mixer
@@ -8678,18 +7290,15 @@ int16
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| hc1.flowtemphc | flow temperature (TC1) | uint16 (>=0<=3199) | C | false | HC | 0 | 1 | 1/10 |
+| hc1.flowtemphc | flow temperature (TC1) | uint16 | C | false | HC | 0 | 1 | 1/10 |
+| hc1.valvestatus | mixing valve actuator (VC1) | uint8 | % | false | HC | 1 | 1 | 1 |
 uint8
-| hc1.valvestatus | mixing valve actuator (VC1) | uint8 (>=0<=100) | % | false | HC | 1 | 1 | 1 |
-uint8
-| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=254) | C | true | HC | 2 | 1 | 1 |
+| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=0) | C | true | HC | 2 | 1 | 1 |
 | hc1.pumpstatus | pump status (PC1) | boolean |   | true | HC | 3 | 1 | 1 |
 | hc1.activated | activated | boolean |   | true | HC | 4 | 1 | 1 |
-uint16
-| hc1.flow | Durchfluss | uint16 (>=0<=31999) | l/h | false | HC | 5 | 1 | 1 |
+| hc1.flow | Durchfluss | uint16 | l/h | false | HC | 5 | 1 | 1 |
 uint8
-| hc1.setdiffpress | set differential pressure | uint8 (>=0<=12700) | mbar | true | HC | 6 | 1 | 50 |
+| hc1.setdiffpress | set differential pressure | uint8 (>=0<=0) | mbar | true | HC | 6 | 1 | 50 |
 uint8
 | hc1.valvesettime | time to set valve | uint8 (>=10<=600) | seconds | true | HC | 7 | 1 | 10 |
 uint8
@@ -8700,12 +7309,10 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| hc1.flowtemphc | flow temperature (TC1) | uint16 (>=0<=3199) | C | false | HC | 0 | 1 | 1/10 |
-int8
-| hc1.valvestatus | mixing valve actuator (VC1) | int8 (>=-100<=100) | % | false | HC | 1 | 1 | 1 |
+| hc1.flowtemphc | flow temperature (TC1) | uint16 | C | false | HC | 0 | 1 | 1/10 |
+| hc1.valvestatus | mixing valve actuator (VC1) | int8 | % | false | HC | 1 | 1 | 1 |
 uint8
-| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=254) | C | true | HC | 2 | 1 | 1 |
+| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=0) | C | true | HC | 2 | 1 | 1 |
 | hc1.pumpstatus | pump status (PC1) | boolean |   | true | HC | 3 | 1 | 1 |
 | hc1.activated | activated | boolean |   | true | HC | 4 | 1 | 1 |
 uint8
@@ -8715,46 +7322,37 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| hc1.flowtemphc | flow temperature (TC1) | uint16 (>=0<=3199) | C | false | HC | 0 | 1 | 1/10 |
+| hc1.flowtemphc | flow temperature (TC1) | uint16 | C | false | HC | 0 | 1 | 1/10 |
+| hc1.valvestatus | mixing valve actuator (VC1) | uint8 | % | false | HC | 1 | 1 | 1 |
 uint8
-| hc1.valvestatus | mixing valve actuator (VC1) | uint8 (>=0<=100) | % | false | HC | 1 | 1 | 1 |
-uint8
-| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=254) | C | true | HC | 2 | 1 | 1 |
+| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=0) | C | true | HC | 2 | 1 | 1 |
 | hc1.pumpstatus | pump status (PC1) | boolean |   | true | HC | 3 | 1 | 1 |
-uint16
-| hc1.flowtempvf | flow temperature in header (T0/Vf) | uint16 (>=0<=3199) | C | false | HC | 10 | 1 | 1/10 |
+| hc1.flowtempvf | flow temperature in header (T0/Vf) | uint16 | C | false | HC | 10 | 1 | 1/10 |
 
 ### IPM2
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| hc1.flowtemphc | flow temperature (TC1) | uint16 (>=0<=3199) | C | false | HC | 0 | 1 | 1/10 |
+| hc1.flowtemphc | flow temperature (TC1) | uint16 | C | false | HC | 0 | 1 | 1/10 |
+| hc1.valvestatus | mixing valve actuator (VC1) | uint8 | % | false | HC | 1 | 1 | 1 |
 uint8
-| hc1.valvestatus | mixing valve actuator (VC1) | uint8 (>=0<=100) | % | false | HC | 1 | 1 | 1 |
-uint8
-| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=254) | C | true | HC | 2 | 1 | 1 |
+| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=0) | C | true | HC | 2 | 1 | 1 |
 | hc1.pumpstatus | pump status (PC1) | boolean |   | true | HC | 3 | 1 | 1 |
-uint16
-| hc1.flowtempvf | flow temperature in header (T0/Vf) | uint16 (>=0<=3199) | C | false | HC | 10 | 1 | 1/10 |
+| hc1.flowtempvf | flow temperature in header (T0/Vf) | uint16 | C | false | HC | 10 | 1 | 1/10 |
 
 ### MM50
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| hc1.flowtemphc | flow temperature (TC1) | uint16 (>=0<=3199) | C | false | HC | 0 | 1 | 1/10 |
+| hc1.flowtemphc | flow temperature (TC1) | uint16 | C | false | HC | 0 | 1 | 1/10 |
+| hc1.valvestatus | mixing valve actuator (VC1) | uint8 | % | false | HC | 1 | 1 | 1 |
 uint8
-| hc1.valvestatus | mixing valve actuator (VC1) | uint8 (>=0<=100) | % | false | HC | 1 | 1 | 1 |
-uint8
-| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=254) | C | true | HC | 2 | 1 | 1 |
+| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=0) | C | true | HC | 2 | 1 | 1 |
 | hc1.pumpstatus | pump status (PC1) | boolean |   | true | HC | 3 | 1 | 1 |
 | hc1.activated | activated | boolean |   | true | HC | 4 | 1 | 1 |
-uint16
-| hc1.flow | Durchfluss | uint16 (>=0<=31999) | l/h | false | HC | 5 | 1 | 1 |
+| hc1.flow | Durchfluss | uint16 | l/h | false | HC | 5 | 1 | 1 |
 uint8
-| hc1.setdiffpress | set differential pressure | uint8 (>=0<=12700) | mbar | true | HC | 6 | 1 | 50 |
+| hc1.setdiffpress | set differential pressure | uint8 (>=0<=0) | mbar | true | HC | 6 | 1 | 50 |
 uint8
 | hc1.valvesettime | time to set valve | uint8 (>=10<=600) | seconds | true | HC | 7 | 1 | 10 |
 uint8
@@ -8765,18 +7363,15 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| hc1.flowtemphc | flow temperature (TC1) | uint16 (>=0<=3199) | C | false | HC | 0 | 1 | 1/10 |
+| hc1.flowtemphc | flow temperature (TC1) | uint16 | C | false | HC | 0 | 1 | 1/10 |
+| hc1.valvestatus | mixing valve actuator (VC1) | uint8 | % | false | HC | 1 | 1 | 1 |
 uint8
-| hc1.valvestatus | mixing valve actuator (VC1) | uint8 (>=0<=100) | % | false | HC | 1 | 1 | 1 |
-uint8
-| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=254) | C | true | HC | 2 | 1 | 1 |
+| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=0) | C | true | HC | 2 | 1 | 1 |
 | hc1.pumpstatus | pump status (PC1) | boolean |   | true | HC | 3 | 1 | 1 |
 | hc1.activated | activated | boolean |   | true | HC | 4 | 1 | 1 |
-uint16
-| hc1.flow | Durchfluss | uint16 (>=0<=31999) | l/h | false | HC | 5 | 1 | 1 |
+| hc1.flow | Durchfluss | uint16 | l/h | false | HC | 5 | 1 | 1 |
 uint8
-| hc1.setdiffpress | set differential pressure | uint8 (>=0<=12700) | mbar | true | HC | 6 | 1 | 50 |
+| hc1.setdiffpress | set differential pressure | uint8 (>=0<=0) | mbar | true | HC | 6 | 1 | 50 |
 uint8
 | hc1.valvesettime | time to set valve | uint8 (>=10<=600) | seconds | true | HC | 7 | 1 | 10 |
 uint8
@@ -8787,18 +7382,15 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| hc1.flowtemphc | flow temperature (TC1) | uint16 (>=0<=3199) | C | false | HC | 0 | 1 | 1/10 |
+| hc1.flowtemphc | flow temperature (TC1) | uint16 | C | false | HC | 0 | 1 | 1/10 |
+| hc1.valvestatus | mixing valve actuator (VC1) | uint8 | % | false | HC | 1 | 1 | 1 |
 uint8
-| hc1.valvestatus | mixing valve actuator (VC1) | uint8 (>=0<=100) | % | false | HC | 1 | 1 | 1 |
-uint8
-| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=254) | C | true | HC | 2 | 1 | 1 |
+| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=0) | C | true | HC | 2 | 1 | 1 |
 | hc1.pumpstatus | pump status (PC1) | boolean |   | true | HC | 3 | 1 | 1 |
 | hc1.activated | activated | boolean |   | true | HC | 4 | 1 | 1 |
-uint16
-| hc1.flow | Durchfluss | uint16 (>=0<=31999) | l/h | false | HC | 5 | 1 | 1 |
+| hc1.flow | Durchfluss | uint16 | l/h | false | HC | 5 | 1 | 1 |
 uint8
-| hc1.setdiffpress | set differential pressure | uint8 (>=0<=12700) | mbar | true | HC | 6 | 1 | 50 |
+| hc1.setdiffpress | set differential pressure | uint8 (>=0<=0) | mbar | true | HC | 6 | 1 | 50 |
 uint8
 | hc1.valvesettime | time to set valve | uint8 (>=10<=600) | seconds | true | HC | 7 | 1 | 10 |
 uint8
@@ -8809,18 +7401,15 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| hc1.flowtemphc | flow temperature (TC1) | uint16 (>=0<=3199) | C | false | HC | 0 | 1 | 1/10 |
+| hc1.flowtemphc | flow temperature (TC1) | uint16 | C | false | HC | 0 | 1 | 1/10 |
+| hc1.valvestatus | mixing valve actuator (VC1) | uint8 | % | false | HC | 1 | 1 | 1 |
 uint8
-| hc1.valvestatus | mixing valve actuator (VC1) | uint8 (>=0<=100) | % | false | HC | 1 | 1 | 1 |
-uint8
-| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=254) | C | true | HC | 2 | 1 | 1 |
+| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=0) | C | true | HC | 2 | 1 | 1 |
 | hc1.pumpstatus | pump status (PC1) | boolean |   | true | HC | 3 | 1 | 1 |
 | hc1.activated | activated | boolean |   | true | HC | 4 | 1 | 1 |
-uint16
-| hc1.flow | Durchfluss | uint16 (>=0<=31999) | l/h | false | HC | 5 | 1 | 1 |
+| hc1.flow | Durchfluss | uint16 | l/h | false | HC | 5 | 1 | 1 |
 uint8
-| hc1.setdiffpress | set differential pressure | uint8 (>=0<=12700) | mbar | true | HC | 6 | 1 | 50 |
+| hc1.setdiffpress | set differential pressure | uint8 (>=0<=0) | mbar | true | HC | 6 | 1 | 50 |
 uint8
 | hc1.valvesettime | time to set valve | uint8 (>=10<=600) | seconds | true | HC | 7 | 1 | 10 |
 uint8
@@ -8831,18 +7420,15 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| hc1.flowtemphc | flow temperature (TC1) | uint16 (>=0<=3199) | C | false | HC | 0 | 1 | 1/10 |
+| hc1.flowtemphc | flow temperature (TC1) | uint16 | C | false | HC | 0 | 1 | 1/10 |
+| hc1.valvestatus | mixing valve actuator (VC1) | uint8 | % | false | HC | 1 | 1 | 1 |
 uint8
-| hc1.valvestatus | mixing valve actuator (VC1) | uint8 (>=0<=100) | % | false | HC | 1 | 1 | 1 |
-uint8
-| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=254) | C | true | HC | 2 | 1 | 1 |
+| hc1.flowsettemp | setpoint flow temperature | uint8 (>=0<=0) | C | true | HC | 2 | 1 | 1 |
 | hc1.pumpstatus | pump status (PC1) | boolean |   | true | HC | 3 | 1 | 1 |
 | hc1.activated | activated | boolean |   | true | HC | 4 | 1 | 1 |
-uint16
-| hc1.flow | Durchfluss | uint16 (>=0<=31999) | l/h | false | HC | 5 | 1 | 1 |
+| hc1.flow | Durchfluss | uint16 | l/h | false | HC | 5 | 1 | 1 |
 uint8
-| hc1.setdiffpress | set differential pressure | uint8 (>=0<=12700) | mbar | true | HC | 6 | 1 | 50 |
+| hc1.setdiffpress | set differential pressure | uint8 (>=0<=0) | mbar | true | HC | 6 | 1 | 50 |
 uint8
 | hc1.valvesettime | time to set valve | uint8 (>=10<=600) | seconds | true | HC | 7 | 1 | 10 |
 uint8
@@ -8855,142 +7441,108 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-int16
-| collectortemp | collector temperature (TS1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
-int16
-| cylbottomtemp | cylinder bottom temperature (TS2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| collectortemp | collector temperature (TS1) | int16 | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
+| cylbottomtemp | cylinder bottom temperature (TS2) | int16 | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
 | solarpump | pump (PS1) | boolean |   | false | DEVICE_DATA | 2 | 1 | 1 |
 | pumpworktime | pump working time | time | minutes | false | DEVICE_DATA | 3 | 2 | 1 |
 uint8
-| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 5 | 1 | 1 |
+| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 5 | 1 | 1 |
 | collectorshutdown | collector shutdown | boolean |   | false | DEVICE_DATA | 6 | 1 | 1 |
 | cylheated | cyl heated | boolean |   | false | DEVICE_DATA | 7 | 1 | 1 |
+| solarpumpmod | pump modulation (PS1) | uint8 | % | false | DEVICE_DATA | 8 | 1 | 1 |
 uint8
-| solarpumpmod | pump modulation (PS1) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 8 | 1 | 1 |
+| pumpminmod | minimum pump modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 9 | 1 | 1 |
 uint8
-| pumpminmod | minimum pump modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 9 | 1 | 1 |
+| turnondiff | pump turn on difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 10 | 1 | 1 |
 uint8
-| turnondiff | pump turn on difference | uint8 (>=0<=254) | C | true | DEVICE_DATA | 10 | 1 | 1 |
+| turnoffdiff | pump turn off difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 11 | 1 | 1 |
+| solarpower | actual solar power | int16 | W | false | DEVICE_DATA | 12 | 1 | 1 |
+| energylasthour | energy last hour | uint24 | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
 uint8
-| turnoffdiff | pump turn off difference | uint8 (>=0<=254) | C | true | DEVICE_DATA | 11 | 1 | 1 |
-int16
-| solarpower | actual solar power | int16 (>=-31999<=31999) | W | false | DEVICE_DATA | 12 | 1 | 1 |
-uint24
-| energylasthour | energy last hour | uint24 (>=0<=1677721) | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
+| maxflow | maximum solar flow | uint8 (>=0<=0) | l/min | true | DEVICE_DATA | 15 | 1 | 1/10 |
 uint8
-| maxflow | maximum solar flow | uint8 (>=0<=25) | l/min | true | DEVICE_DATA | 15 | 1 | 1/10 |
-uint8
-| dhw.mintemp | minimum temperature | uint8 (>=0<=254) | C | true | DHW | 0 | 1 | 1 |
+| dhw.mintemp | minimum temperature | uint8 (>=0<=0) | C | true | DHW | 0 | 1 | 1 |
 | solarenabled | solarmodule enabled | boolean |   | true | DEVICE_DATA | 16 | 1 | 1 |
 
 ### ISM1
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-int16
-| collectortemp | collector temperature (TS1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
-int16
-| cylbottomtemp | cylinder bottom temperature (TS2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| collectortemp | collector temperature (TS1) | int16 | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
+| cylbottomtemp | cylinder bottom temperature (TS2) | int16 | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
 | solarpump | pump (PS1) | boolean |   | false | DEVICE_DATA | 2 | 1 | 1 |
 | pumpworktime | pump working time | time | minutes | false | DEVICE_DATA | 3 | 2 | 1 |
 uint8
-| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 5 | 1 | 1 |
+| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 5 | 1 | 1 |
 | collectorshutdown | collector shutdown | boolean |   | false | DEVICE_DATA | 6 | 1 | 1 |
 | cylheated | cyl heated | boolean |   | false | DEVICE_DATA | 7 | 1 | 1 |
-int16
-| cylmiddletemp | cylinder middle temperature (TS3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 17 | 1 | 1/10 |
-int16
-| retheatassist | return temperature heat assistance (TS4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 18 | 1 | 1/10 |
+| cylmiddletemp | cylinder middle temperature (TS3) | int16 | C | false | DEVICE_DATA | 17 | 1 | 1/10 |
+| retheatassist | return temperature heat assistance (TS4) | int16 | C | false | DEVICE_DATA | 18 | 1 | 1/10 |
 | heatassistvalve | heat assistance valve (M1) | boolean |   | false | DEVICE_DATA | 19 | 1 | 1 |
-uint24
-| energylasthour | energy last hour | uint24 (>=0<=1677721) | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
+| energylasthour | energy last hour | uint24 | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
 
 ### ISM2
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-int16
-| collectortemp | collector temperature (TS1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
-int16
-| cylbottomtemp | cylinder bottom temperature (TS2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| collectortemp | collector temperature (TS1) | int16 | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
+| cylbottomtemp | cylinder bottom temperature (TS2) | int16 | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
 | solarpump | pump (PS1) | boolean |   | false | DEVICE_DATA | 2 | 1 | 1 |
 | pumpworktime | pump working time | time | minutes | false | DEVICE_DATA | 3 | 2 | 1 |
 uint8
-| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 5 | 1 | 1 |
+| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 5 | 1 | 1 |
 | collectorshutdown | collector shutdown | boolean |   | false | DEVICE_DATA | 6 | 1 | 1 |
 | cylheated | cyl heated | boolean |   | false | DEVICE_DATA | 7 | 1 | 1 |
-int16
-| cylmiddletemp | cylinder middle temperature (TS3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 17 | 1 | 1/10 |
-int16
-| retheatassist | return temperature heat assistance (TS4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 18 | 1 | 1/10 |
+| cylmiddletemp | cylinder middle temperature (TS3) | int16 | C | false | DEVICE_DATA | 17 | 1 | 1/10 |
+| retheatassist | return temperature heat assistance (TS4) | int16 | C | false | DEVICE_DATA | 18 | 1 | 1/10 |
 | heatassistvalve | heat assistance valve (M1) | boolean |   | false | DEVICE_DATA | 19 | 1 | 1 |
-uint24
-| energylasthour | energy last hour | uint24 (>=0<=1677721) | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
+| energylasthour | energy last hour | uint24 | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
 
 ### SM50
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-int16
-| collectortemp | collector temperature (TS1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
-int16
-| cylbottomtemp | cylinder bottom temperature (TS2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| collectortemp | collector temperature (TS1) | int16 | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
+| cylbottomtemp | cylinder bottom temperature (TS2) | int16 | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
 | solarpump | pump (PS1) | boolean |   | false | DEVICE_DATA | 2 | 1 | 1 |
 | pumpworktime | pump working time | time | minutes | false | DEVICE_DATA | 3 | 2 | 1 |
 uint8
-| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 5 | 1 | 1 |
+| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 5 | 1 | 1 |
 | collectorshutdown | collector shutdown | boolean |   | false | DEVICE_DATA | 6 | 1 | 1 |
 | cylheated | cyl heated | boolean |   | false | DEVICE_DATA | 7 | 1 | 1 |
+| solarpumpmod | pump modulation (PS1) | uint8 | % | false | DEVICE_DATA | 8 | 1 | 1 |
 uint8
-| solarpumpmod | pump modulation (PS1) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 8 | 1 | 1 |
+| pumpminmod | minimum pump modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 9 | 1 | 5 |
 uint8
-| pumpminmod | minimum pump modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 9 | 1 | 5 |
+| turnondiff | pump turn on difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 10 | 1 | 1/10 |
 uint8
-| turnondiff | pump turn on difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| turnoffdiff | pump turn off difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 11 | 1 | 1/10 |
-int16
-| collector2temp | collector 2 temperature (TS7) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 20 | 1 | 1/10 |
-int16
-| cylmiddletemp | cylinder middle temperature (TS3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 17 | 1 | 1/10 |
-int16
-| retheatassist | return temperature heat assistance (TS4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 18 | 1 | 1/10 |
-int16
-| ts8 | (TS8) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 21 | 1 | 1/10 |
-int16
-| ts16 | (TS16) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 22 | 1 | 1/10 |
+| turnoffdiff | pump turn off difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 11 | 1 | 1/10 |
+| collector2temp | collector 2 temperature (TS7) | int16 | C | false | DEVICE_DATA | 20 | 1 | 1/10 |
+| cylmiddletemp | cylinder middle temperature (TS3) | int16 | C | false | DEVICE_DATA | 17 | 1 | 1/10 |
+| retheatassist | return temperature heat assistance (TS4) | int16 | C | false | DEVICE_DATA | 18 | 1 | 1/10 |
+| ts8 | (TS8) | int16 | C | false | DEVICE_DATA | 21 | 1 | 1/10 |
+| ts16 | (TS16) | int16 | C | false | DEVICE_DATA | 22 | 1 | 1/10 |
 | heatassistvalve | heat assistance valve (M1) | boolean |   | false | DEVICE_DATA | 19 | 1 | 1 |
-uint8
-| heatassistpower | heat assistance valve power (M1) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 23 | 1 | 1 |
+| heatassistpower | heat assistance valve power (M1) | uint8 | % | false | DEVICE_DATA | 23 | 1 | 1 |
 | solarpump2 | pump 2 (PS4) | boolean |   | false | DEVICE_DATA | 24 | 1 | 1 |
-uint8
-| solarpump2mod | pump 2 modulation (PS4) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 25 | 1 | 1 |
-int16
-| cyl2bottomtemp | second cylinder bottom temperature (TS5) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 26 | 1 | 1/10 |
-int16
-| cyl3bottomtemp | third cylinder bottom temperature (TS11) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 27 | 1 | 1/10 |
-int16
-| cyltoptemp | cylinder top temperature (TS10) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 28 | 1 | 1/10 |
-int16
-| heatexchangertemp | heat exchanger temperature (TS6) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 29 | 1 | 1/10 |
-uint8
-| cylpumpmod | cylinder pump modulation (PS5) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 30 | 1 | 1 |
+| solarpump2mod | pump 2 modulation (PS4) | uint8 | % | false | DEVICE_DATA | 25 | 1 | 1 |
+| cyl2bottomtemp | second cylinder bottom temperature (TS5) | int16 | C | false | DEVICE_DATA | 26 | 1 | 1/10 |
+| cyl3bottomtemp | third cylinder bottom temperature (TS11) | int16 | C | false | DEVICE_DATA | 27 | 1 | 1/10 |
+| cyltoptemp | cylinder top temperature (TS10) | int16 | C | false | DEVICE_DATA | 28 | 1 | 1/10 |
+| heatexchangertemp | heat exchanger temperature (TS6) | int16 | C | false | DEVICE_DATA | 29 | 1 | 1/10 |
+| cylpumpmod | cylinder pump modulation (PS5) | uint8 | % | false | DEVICE_DATA | 30 | 1 | 1 |
 | valvestatus | valve status | boolean |   | false | DEVICE_DATA | 31 | 1 | 1 |
 | vs1status | valve status VS1 | boolean |   | false | DEVICE_DATA | 32 | 1 | 1 |
 | vs3status | valve status VS3 | boolean |   | false | DEVICE_DATA | 33 | 1 | 1 |
 | transferpump | transfer pump | boolean |   | false | DEVICE_DATA | 34 | 1 | 1 |
+| transferpumpmod | transfer pump modulation | uint8 | % | false | DEVICE_DATA | 35 | 1 | 1 |
 uint8
-| transferpumpmod | transfer pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 35 | 1 | 1 |
+| collectormaxtemp | maximum collector temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 36 | 1 | 1 |
 uint8
-| collectormaxtemp | maximum collector temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 36 | 1 | 1 |
-uint8
-| collectormintemp | minimum collector temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 37 | 1 | 1 |
-uint24
-| energylasthour | energy last hour | uint24 (>=0<=1677721) | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
-uint24
-| energytoday | total energy today | uint24 (>=0<=16777214) | Wh | false | DEVICE_DATA | 38 | 2 | 1 |
-uint24
-| energytotal | total energy | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 40 | 2 | 1/10 |
+| collectormintemp | minimum collector temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 37 | 1 | 1 |
+| energylasthour | energy last hour | uint24 | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
+| energytoday | total energy today | uint24 | Wh | false | DEVICE_DATA | 38 | 2 | 1 |
+| energytotal | total energy | uint24 | kWh | false | DEVICE_DATA | 40 | 2 | 1/10 |
 | pump2worktime | pump 2 working time | time | minutes | false | DEVICE_DATA | 42 | 2 | 1 |
 | m1worktime | differential control working time | time | minutes | false | DEVICE_DATA | 44 | 2 | 1 |
 | heattransfersystem | heattransfer system | boolean |   | true | DEVICE_DATA | 46 | 1 | 1 |
@@ -9003,100 +7555,76 @@ uint24
 | plainwatermode | plain water mode | boolean |   | true | DEVICE_DATA | 53 | 1 | 1 |
 | doublematchflow | doublematchflow | boolean |   | true | DEVICE_DATA | 54 | 1 | 1 |
 uint8
-| pump2minmod | minimum pump 2 modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 55 | 1 | 1 |
+| pump2minmod | minimum pump 2 modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 55 | 1 | 1 |
 uint8
-| turnondiff2 | pump 2 turn on difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 56 | 1 | 1/10 |
+| turnondiff2 | pump 2 turn on difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 56 | 1 | 1/10 |
 uint8
-| turnoffdiff2 | pump 2 turn off difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 57 | 1 | 1/10 |
+| turnoffdiff2 | pump 2 turn off difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 57 | 1 | 1/10 |
 | pump2kick | pump kick 2 | boolean |   | true | DEVICE_DATA | 58 | 1 | 1 |
 uint8
-| climatezone | climate zone | uint8 (>=0<=254) |   | true | DEVICE_DATA | 59 | 1 | 1 |
+| climatezone | climate zone | uint8 (>=0<=0) |   | true | DEVICE_DATA | 59 | 1 | 1 |
 uint16
-| collector1area | collector 1 area | uint16 (>=0<=3199) | m² | true | DEVICE_DATA | 60 | 1 | 1/10 |
+| collector1area | collector 1 area | uint16 (>=0<=0) | m² | true | DEVICE_DATA | 60 | 1 | 1/10 |
 | collector1type | collector 1 type | enum |   | true | DEVICE_DATA | 61 | 1 | 1 |
 uint16
-| collector2area | collector 2 area | uint16 (>=0<=3199) | m² | true | DEVICE_DATA | 62 | 1 | 1/10 |
+| collector2area | collector 2 area | uint16 (>=0<=0) | m² | true | DEVICE_DATA | 62 | 1 | 1/10 |
 | collector2type | collector 2 type | enum |   | true | DEVICE_DATA | 63 | 1 | 1 |
 | cylpriority | cylinder priority | enum |   | true | DEVICE_DATA | 64 | 1 | 1 |
-uint16
-| heatcntflowtemp | heat counter flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 65 | 1 | 1/10 |
-uint16
-| heatcntrettemp | heat counter return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 66 | 1 | 1/10 |
-uint8
-| heatcnt | heat counter impulses | uint8 (>=0<=254) |   | false | DEVICE_DATA | 67 | 1 | 1 |
-uint16
-| swapflowtemp | swap flow temperature (TS14) | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
-uint16
-| swaprettemp | swap return temperature (TS15) | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
+| heatcntflowtemp | heat counter flow temperature | uint16 | C | false | DEVICE_DATA | 65 | 1 | 1/10 |
+| heatcntrettemp | heat counter return temperature | uint16 | C | false | DEVICE_DATA | 66 | 1 | 1/10 |
+| heatcnt | heat counter impulses | uint8 |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| swapflowtemp | swap flow temperature (TS14) | uint16 | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
+| swaprettemp | swap return temperature (TS15) | uint16 | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
 int8
-| heatassiston | heat assistance on | int8 (>=-12<=12) | K | true | DEVICE_DATA | 70 | 1 | 1/10 |
+| heatassiston | heat assistance on | int8 (>=0<=0) | K | true | DEVICE_DATA | 70 | 1 | 1/10 |
 int8
-| heatassistoff | heat assistance off | int8 (>=-12<=12) | K | true | DEVICE_DATA | 71 | 1 | 1/10 |
+| heatassistoff | heat assistance off | int8 (>=0<=0) | K | true | DEVICE_DATA | 71 | 1 | 1/10 |
 
 ### SM100, MS100
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-int16
-| collectortemp | collector temperature (TS1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
-int16
-| cylbottomtemp | cylinder bottom temperature (TS2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| collectortemp | collector temperature (TS1) | int16 | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
+| cylbottomtemp | cylinder bottom temperature (TS2) | int16 | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
 | solarpump | pump (PS1) | boolean |   | false | DEVICE_DATA | 2 | 1 | 1 |
 | pumpworktime | pump working time | time | minutes | false | DEVICE_DATA | 3 | 2 | 1 |
 uint8
-| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 5 | 1 | 1 |
+| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 5 | 1 | 1 |
 | collectorshutdown | collector shutdown | boolean |   | false | DEVICE_DATA | 6 | 1 | 1 |
 | cylheated | cyl heated | boolean |   | false | DEVICE_DATA | 7 | 1 | 1 |
+| solarpumpmod | pump modulation (PS1) | uint8 | % | false | DEVICE_DATA | 8 | 1 | 1 |
 uint8
-| solarpumpmod | pump modulation (PS1) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 8 | 1 | 1 |
+| pumpminmod | minimum pump modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 9 | 1 | 5 |
 uint8
-| pumpminmod | minimum pump modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 9 | 1 | 5 |
+| turnondiff | pump turn on difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 10 | 1 | 1/10 |
 uint8
-| turnondiff | pump turn on difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| turnoffdiff | pump turn off difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 11 | 1 | 1/10 |
-int16
-| collector2temp | collector 2 temperature (TS7) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 20 | 1 | 1/10 |
-int16
-| cylmiddletemp | cylinder middle temperature (TS3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 17 | 1 | 1/10 |
-int16
-| retheatassist | return temperature heat assistance (TS4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 18 | 1 | 1/10 |
-int16
-| ts8 | (TS8) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 21 | 1 | 1/10 |
-int16
-| ts16 | (TS16) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 22 | 1 | 1/10 |
+| turnoffdiff | pump turn off difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 11 | 1 | 1/10 |
+| collector2temp | collector 2 temperature (TS7) | int16 | C | false | DEVICE_DATA | 20 | 1 | 1/10 |
+| cylmiddletemp | cylinder middle temperature (TS3) | int16 | C | false | DEVICE_DATA | 17 | 1 | 1/10 |
+| retheatassist | return temperature heat assistance (TS4) | int16 | C | false | DEVICE_DATA | 18 | 1 | 1/10 |
+| ts8 | (TS8) | int16 | C | false | DEVICE_DATA | 21 | 1 | 1/10 |
+| ts16 | (TS16) | int16 | C | false | DEVICE_DATA | 22 | 1 | 1/10 |
 | heatassistvalve | heat assistance valve (M1) | boolean |   | false | DEVICE_DATA | 19 | 1 | 1 |
-uint8
-| heatassistpower | heat assistance valve power (M1) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 23 | 1 | 1 |
+| heatassistpower | heat assistance valve power (M1) | uint8 | % | false | DEVICE_DATA | 23 | 1 | 1 |
 | solarpump2 | pump 2 (PS4) | boolean |   | false | DEVICE_DATA | 24 | 1 | 1 |
-uint8
-| solarpump2mod | pump 2 modulation (PS4) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 25 | 1 | 1 |
-int16
-| cyl2bottomtemp | second cylinder bottom temperature (TS5) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 26 | 1 | 1/10 |
-int16
-| cyl3bottomtemp | third cylinder bottom temperature (TS11) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 27 | 1 | 1/10 |
-int16
-| cyltoptemp | cylinder top temperature (TS10) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 28 | 1 | 1/10 |
-int16
-| heatexchangertemp | heat exchanger temperature (TS6) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 29 | 1 | 1/10 |
-uint8
-| cylpumpmod | cylinder pump modulation (PS5) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 30 | 1 | 1 |
+| solarpump2mod | pump 2 modulation (PS4) | uint8 | % | false | DEVICE_DATA | 25 | 1 | 1 |
+| cyl2bottomtemp | second cylinder bottom temperature (TS5) | int16 | C | false | DEVICE_DATA | 26 | 1 | 1/10 |
+| cyl3bottomtemp | third cylinder bottom temperature (TS11) | int16 | C | false | DEVICE_DATA | 27 | 1 | 1/10 |
+| cyltoptemp | cylinder top temperature (TS10) | int16 | C | false | DEVICE_DATA | 28 | 1 | 1/10 |
+| heatexchangertemp | heat exchanger temperature (TS6) | int16 | C | false | DEVICE_DATA | 29 | 1 | 1/10 |
+| cylpumpmod | cylinder pump modulation (PS5) | uint8 | % | false | DEVICE_DATA | 30 | 1 | 1 |
 | valvestatus | valve status | boolean |   | false | DEVICE_DATA | 31 | 1 | 1 |
 | vs1status | valve status VS1 | boolean |   | false | DEVICE_DATA | 32 | 1 | 1 |
 | vs3status | valve status VS3 | boolean |   | false | DEVICE_DATA | 33 | 1 | 1 |
 | transferpump | transfer pump | boolean |   | false | DEVICE_DATA | 34 | 1 | 1 |
+| transferpumpmod | transfer pump modulation | uint8 | % | false | DEVICE_DATA | 35 | 1 | 1 |
 uint8
-| transferpumpmod | transfer pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 35 | 1 | 1 |
+| collectormaxtemp | maximum collector temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 36 | 1 | 1 |
 uint8
-| collectormaxtemp | maximum collector temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 36 | 1 | 1 |
-uint8
-| collectormintemp | minimum collector temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 37 | 1 | 1 |
-uint24
-| energylasthour | energy last hour | uint24 (>=0<=1677721) | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
-uint24
-| energytoday | total energy today | uint24 (>=0<=16777214) | Wh | false | DEVICE_DATA | 38 | 2 | 1 |
-uint24
-| energytotal | total energy | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 40 | 2 | 1/10 |
+| collectormintemp | minimum collector temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 37 | 1 | 1 |
+| energylasthour | energy last hour | uint24 | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
+| energytoday | total energy today | uint24 | Wh | false | DEVICE_DATA | 38 | 2 | 1 |
+| energytotal | total energy | uint24 | kWh | false | DEVICE_DATA | 40 | 2 | 1/10 |
 | pump2worktime | pump 2 working time | time | minutes | false | DEVICE_DATA | 42 | 2 | 1 |
 | m1worktime | differential control working time | time | minutes | false | DEVICE_DATA | 44 | 2 | 1 |
 | heattransfersystem | heattransfer system | boolean |   | true | DEVICE_DATA | 46 | 1 | 1 |
@@ -9109,100 +7637,76 @@ uint24
 | plainwatermode | plain water mode | boolean |   | true | DEVICE_DATA | 53 | 1 | 1 |
 | doublematchflow | doublematchflow | boolean |   | true | DEVICE_DATA | 54 | 1 | 1 |
 uint8
-| pump2minmod | minimum pump 2 modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 55 | 1 | 1 |
+| pump2minmod | minimum pump 2 modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 55 | 1 | 1 |
 uint8
-| turnondiff2 | pump 2 turn on difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 56 | 1 | 1/10 |
+| turnondiff2 | pump 2 turn on difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 56 | 1 | 1/10 |
 uint8
-| turnoffdiff2 | pump 2 turn off difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 57 | 1 | 1/10 |
+| turnoffdiff2 | pump 2 turn off difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 57 | 1 | 1/10 |
 | pump2kick | pump kick 2 | boolean |   | true | DEVICE_DATA | 58 | 1 | 1 |
 uint8
-| climatezone | climate zone | uint8 (>=0<=254) |   | true | DEVICE_DATA | 59 | 1 | 1 |
+| climatezone | climate zone | uint8 (>=0<=0) |   | true | DEVICE_DATA | 59 | 1 | 1 |
 uint16
-| collector1area | collector 1 area | uint16 (>=0<=3199) | m² | true | DEVICE_DATA | 60 | 1 | 1/10 |
+| collector1area | collector 1 area | uint16 (>=0<=0) | m² | true | DEVICE_DATA | 60 | 1 | 1/10 |
 | collector1type | collector 1 type | enum |   | true | DEVICE_DATA | 61 | 1 | 1 |
 uint16
-| collector2area | collector 2 area | uint16 (>=0<=3199) | m² | true | DEVICE_DATA | 62 | 1 | 1/10 |
+| collector2area | collector 2 area | uint16 (>=0<=0) | m² | true | DEVICE_DATA | 62 | 1 | 1/10 |
 | collector2type | collector 2 type | enum |   | true | DEVICE_DATA | 63 | 1 | 1 |
 | cylpriority | cylinder priority | enum |   | true | DEVICE_DATA | 64 | 1 | 1 |
-uint16
-| heatcntflowtemp | heat counter flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 65 | 1 | 1/10 |
-uint16
-| heatcntrettemp | heat counter return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 66 | 1 | 1/10 |
-uint8
-| heatcnt | heat counter impulses | uint8 (>=0<=254) |   | false | DEVICE_DATA | 67 | 1 | 1 |
-uint16
-| swapflowtemp | swap flow temperature (TS14) | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
-uint16
-| swaprettemp | swap return temperature (TS15) | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
+| heatcntflowtemp | heat counter flow temperature | uint16 | C | false | DEVICE_DATA | 65 | 1 | 1/10 |
+| heatcntrettemp | heat counter return temperature | uint16 | C | false | DEVICE_DATA | 66 | 1 | 1/10 |
+| heatcnt | heat counter impulses | uint8 |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| swapflowtemp | swap flow temperature (TS14) | uint16 | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
+| swaprettemp | swap return temperature (TS15) | uint16 | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
 int8
-| heatassiston | heat assistance on | int8 (>=-12<=12) | K | true | DEVICE_DATA | 70 | 1 | 1/10 |
+| heatassiston | heat assistance on | int8 (>=0<=0) | K | true | DEVICE_DATA | 70 | 1 | 1/10 |
 int8
-| heatassistoff | heat assistance off | int8 (>=-12<=12) | K | true | DEVICE_DATA | 71 | 1 | 1/10 |
+| heatassistoff | heat assistance off | int8 (>=0<=0) | K | true | DEVICE_DATA | 71 | 1 | 1/10 |
 
 ### SM200, MS200
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-int16
-| collectortemp | collector temperature (TS1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
-int16
-| cylbottomtemp | cylinder bottom temperature (TS2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| collectortemp | collector temperature (TS1) | int16 | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
+| cylbottomtemp | cylinder bottom temperature (TS2) | int16 | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
 | solarpump | pump (PS1) | boolean |   | false | DEVICE_DATA | 2 | 1 | 1 |
 | pumpworktime | pump working time | time | minutes | false | DEVICE_DATA | 3 | 2 | 1 |
 uint8
-| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 5 | 1 | 1 |
+| cylmaxtemp | maximum cylinder temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 5 | 1 | 1 |
 | collectorshutdown | collector shutdown | boolean |   | false | DEVICE_DATA | 6 | 1 | 1 |
 | cylheated | cyl heated | boolean |   | false | DEVICE_DATA | 7 | 1 | 1 |
+| solarpumpmod | pump modulation (PS1) | uint8 | % | false | DEVICE_DATA | 8 | 1 | 1 |
 uint8
-| solarpumpmod | pump modulation (PS1) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 8 | 1 | 1 |
+| pumpminmod | minimum pump modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 9 | 1 | 5 |
 uint8
-| pumpminmod | minimum pump modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 9 | 1 | 5 |
+| turnondiff | pump turn on difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 10 | 1 | 1/10 |
 uint8
-| turnondiff | pump turn on difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 10 | 1 | 1/10 |
-uint8
-| turnoffdiff | pump turn off difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 11 | 1 | 1/10 |
-int16
-| collector2temp | collector 2 temperature (TS7) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 20 | 1 | 1/10 |
-int16
-| cylmiddletemp | cylinder middle temperature (TS3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 17 | 1 | 1/10 |
-int16
-| retheatassist | return temperature heat assistance (TS4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 18 | 1 | 1/10 |
-int16
-| ts8 | (TS8) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 21 | 1 | 1/10 |
-int16
-| ts16 | (TS16) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 22 | 1 | 1/10 |
+| turnoffdiff | pump turn off difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 11 | 1 | 1/10 |
+| collector2temp | collector 2 temperature (TS7) | int16 | C | false | DEVICE_DATA | 20 | 1 | 1/10 |
+| cylmiddletemp | cylinder middle temperature (TS3) | int16 | C | false | DEVICE_DATA | 17 | 1 | 1/10 |
+| retheatassist | return temperature heat assistance (TS4) | int16 | C | false | DEVICE_DATA | 18 | 1 | 1/10 |
+| ts8 | (TS8) | int16 | C | false | DEVICE_DATA | 21 | 1 | 1/10 |
+| ts16 | (TS16) | int16 | C | false | DEVICE_DATA | 22 | 1 | 1/10 |
 | heatassistvalve | heat assistance valve (M1) | boolean |   | false | DEVICE_DATA | 19 | 1 | 1 |
-uint8
-| heatassistpower | heat assistance valve power (M1) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 23 | 1 | 1 |
+| heatassistpower | heat assistance valve power (M1) | uint8 | % | false | DEVICE_DATA | 23 | 1 | 1 |
 | solarpump2 | pump 2 (PS4) | boolean |   | false | DEVICE_DATA | 24 | 1 | 1 |
-uint8
-| solarpump2mod | pump 2 modulation (PS4) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 25 | 1 | 1 |
-int16
-| cyl2bottomtemp | second cylinder bottom temperature (TS5) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 26 | 1 | 1/10 |
-int16
-| cyl3bottomtemp | third cylinder bottom temperature (TS11) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 27 | 1 | 1/10 |
-int16
-| cyltoptemp | cylinder top temperature (TS10) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 28 | 1 | 1/10 |
-int16
-| heatexchangertemp | heat exchanger temperature (TS6) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 29 | 1 | 1/10 |
-uint8
-| cylpumpmod | cylinder pump modulation (PS5) | uint8 (>=0<=100) | % | false | DEVICE_DATA | 30 | 1 | 1 |
+| solarpump2mod | pump 2 modulation (PS4) | uint8 | % | false | DEVICE_DATA | 25 | 1 | 1 |
+| cyl2bottomtemp | second cylinder bottom temperature (TS5) | int16 | C | false | DEVICE_DATA | 26 | 1 | 1/10 |
+| cyl3bottomtemp | third cylinder bottom temperature (TS11) | int16 | C | false | DEVICE_DATA | 27 | 1 | 1/10 |
+| cyltoptemp | cylinder top temperature (TS10) | int16 | C | false | DEVICE_DATA | 28 | 1 | 1/10 |
+| heatexchangertemp | heat exchanger temperature (TS6) | int16 | C | false | DEVICE_DATA | 29 | 1 | 1/10 |
+| cylpumpmod | cylinder pump modulation (PS5) | uint8 | % | false | DEVICE_DATA | 30 | 1 | 1 |
 | valvestatus | valve status | boolean |   | false | DEVICE_DATA | 31 | 1 | 1 |
 | vs1status | valve status VS1 | boolean |   | false | DEVICE_DATA | 32 | 1 | 1 |
 | vs3status | valve status VS3 | boolean |   | false | DEVICE_DATA | 33 | 1 | 1 |
 | transferpump | transfer pump | boolean |   | false | DEVICE_DATA | 34 | 1 | 1 |
+| transferpumpmod | transfer pump modulation | uint8 | % | false | DEVICE_DATA | 35 | 1 | 1 |
 uint8
-| transferpumpmod | transfer pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 35 | 1 | 1 |
+| collectormaxtemp | maximum collector temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 36 | 1 | 1 |
 uint8
-| collectormaxtemp | maximum collector temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 36 | 1 | 1 |
-uint8
-| collectormintemp | minimum collector temperature | uint8 (>=0<=254) | C | true | DEVICE_DATA | 37 | 1 | 1 |
-uint24
-| energylasthour | energy last hour | uint24 (>=0<=1677721) | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
-uint24
-| energytoday | total energy today | uint24 (>=0<=16777214) | Wh | false | DEVICE_DATA | 38 | 2 | 1 |
-uint24
-| energytotal | total energy | uint24 (>=0<=1677721) | kWh | false | DEVICE_DATA | 40 | 2 | 1/10 |
+| collectormintemp | minimum collector temperature | uint8 (>=0<=0) | C | true | DEVICE_DATA | 37 | 1 | 1 |
+| energylasthour | energy last hour | uint24 | Wh | false | DEVICE_DATA | 13 | 2 | 1/10 |
+| energytoday | total energy today | uint24 | Wh | false | DEVICE_DATA | 38 | 2 | 1 |
+| energytotal | total energy | uint24 | kWh | false | DEVICE_DATA | 40 | 2 | 1/10 |
 | pump2worktime | pump 2 working time | time | minutes | false | DEVICE_DATA | 42 | 2 | 1 |
 | m1worktime | differential control working time | time | minutes | false | DEVICE_DATA | 44 | 2 | 1 |
 | heattransfersystem | heattransfer system | boolean |   | true | DEVICE_DATA | 46 | 1 | 1 |
@@ -9215,35 +7719,30 @@ uint24
 | plainwatermode | plain water mode | boolean |   | true | DEVICE_DATA | 53 | 1 | 1 |
 | doublematchflow | doublematchflow | boolean |   | true | DEVICE_DATA | 54 | 1 | 1 |
 uint8
-| pump2minmod | minimum pump 2 modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 55 | 1 | 1 |
+| pump2minmod | minimum pump 2 modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 55 | 1 | 1 |
 uint8
-| turnondiff2 | pump 2 turn on difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 56 | 1 | 1/10 |
+| turnondiff2 | pump 2 turn on difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 56 | 1 | 1/10 |
 uint8
-| turnoffdiff2 | pump 2 turn off difference | uint8 (>=0<=25) | C | true | DEVICE_DATA | 57 | 1 | 1/10 |
+| turnoffdiff2 | pump 2 turn off difference | uint8 (>=0<=0) | C | true | DEVICE_DATA | 57 | 1 | 1/10 |
 | pump2kick | pump kick 2 | boolean |   | true | DEVICE_DATA | 58 | 1 | 1 |
 uint8
-| climatezone | climate zone | uint8 (>=0<=254) |   | true | DEVICE_DATA | 59 | 1 | 1 |
+| climatezone | climate zone | uint8 (>=0<=0) |   | true | DEVICE_DATA | 59 | 1 | 1 |
 uint16
-| collector1area | collector 1 area | uint16 (>=0<=3199) | m² | true | DEVICE_DATA | 60 | 1 | 1/10 |
+| collector1area | collector 1 area | uint16 (>=0<=0) | m² | true | DEVICE_DATA | 60 | 1 | 1/10 |
 | collector1type | collector 1 type | enum |   | true | DEVICE_DATA | 61 | 1 | 1 |
 uint16
-| collector2area | collector 2 area | uint16 (>=0<=3199) | m² | true | DEVICE_DATA | 62 | 1 | 1/10 |
+| collector2area | collector 2 area | uint16 (>=0<=0) | m² | true | DEVICE_DATA | 62 | 1 | 1/10 |
 | collector2type | collector 2 type | enum |   | true | DEVICE_DATA | 63 | 1 | 1 |
 | cylpriority | cylinder priority | enum |   | true | DEVICE_DATA | 64 | 1 | 1 |
-uint16
-| heatcntflowtemp | heat counter flow temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 65 | 1 | 1/10 |
-uint16
-| heatcntrettemp | heat counter return temperature | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 66 | 1 | 1/10 |
-uint8
-| heatcnt | heat counter impulses | uint8 (>=0<=254) |   | false | DEVICE_DATA | 67 | 1 | 1 |
-uint16
-| swapflowtemp | swap flow temperature (TS14) | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
-uint16
-| swaprettemp | swap return temperature (TS15) | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
+| heatcntflowtemp | heat counter flow temperature | uint16 | C | false | DEVICE_DATA | 65 | 1 | 1/10 |
+| heatcntrettemp | heat counter return temperature | uint16 | C | false | DEVICE_DATA | 66 | 1 | 1/10 |
+| heatcnt | heat counter impulses | uint8 |   | false | DEVICE_DATA | 67 | 1 | 1 |
+| swapflowtemp | swap flow temperature (TS14) | uint16 | C | false | DEVICE_DATA | 68 | 1 | 1/10 |
+| swaprettemp | swap return temperature (TS15) | uint16 | C | false | DEVICE_DATA | 69 | 1 | 1/10 |
 int8
-| heatassiston | heat assistance on | int8 (>=-12<=12) | K | true | DEVICE_DATA | 70 | 1 | 1/10 |
+| heatassiston | heat assistance on | int8 (>=0<=0) | K | true | DEVICE_DATA | 70 | 1 | 1/10 |
 int8
-| heatassistoff | heat assistance off | int8 (>=-12<=12) | K | true | DEVICE_DATA | 71 | 1 | 1/10 |
+| heatassistoff | heat assistance off | int8 (>=0<=0) | K | true | DEVICE_DATA | 71 | 1 | 1/10 |
 
 ## Devices of type \_heatpump
 
@@ -9251,43 +7750,25 @@ int8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint8
-| airhumidity | relative air humidity | uint8 (>=0<=100) | % | false | DEVICE_DATA | 0 | 1 | 1 |
-uint8
-| dewtemperature | dew point temperature | uint8 (>=0<=254) | C | false | DEVICE_DATA | 1 | 1 | 1 |
-int16
-| curflowtemp | current flow temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 2 | 1 | 1/10 |
-int16
-| rettemp | return temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 3 | 1 | 1/10 |
-int16
-| sysrettemp | system return temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 4 | 1 | 1/10 |
-int16
-| hpta4 | drain pan temp (TA4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 5 | 1 | 1/10 |
-int16
-| hptr1 | compressor temperature (TR1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 6 | 1 | 1/10 |
-int16
-| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-int16
-| hptr4 | evaporator inlet temperature (TR4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-int16
-| hptr5 | compressor inlet temperature (TR5) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-int16
-| hptr6 | compressor outlet temperature (TR6) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-int16
-| hptl2 | air inlet temperature (TL2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 11 | 1 | 1/10 |
-int16
-| hppl1 | low pressure side temperature (PL1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-int16
-| hpph1 | high pressure side temperature (PH1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 14 | 1 | 1 |
-uint8
-| hpcompspd | compressor speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 15 | 1 | 1 |
+| airhumidity | relative air humidity | uint8 | % | false | DEVICE_DATA | 0 | 1 | 1 |
+| dewtemperature | dew point temperature | uint8 | C | false | DEVICE_DATA | 1 | 1 | 1 |
+| curflowtemp | current flow temperature | int16 | C | false | DEVICE_DATA | 2 | 1 | 1/10 |
+| rettemp | return temperature | int16 | C | false | DEVICE_DATA | 3 | 1 | 1/10 |
+| sysrettemp | system return temperature | int16 | C | false | DEVICE_DATA | 4 | 1 | 1/10 |
+| hpta4 | drain pan temp (TA4) | int16 | C | false | DEVICE_DATA | 5 | 1 | 1/10 |
+| hptr1 | compressor temperature (TR1) | int16 | C | false | DEVICE_DATA | 6 | 1 | 1/10 |
+| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| hptr4 | evaporator inlet temperature (TR4) | int16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| hptr5 | compressor inlet temperature (TR5) | int16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| hptr6 | compressor outlet temperature (TR6) | int16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| hptl2 | air inlet temperature (TL2) | int16 | C | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| hppl1 | low pressure side temperature (PL1) | int16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| hpph1 | high pressure side temperature (PH1) | int16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 14 | 1 | 1 |
+| hpcompspd | compressor speed | uint8 | % | false | DEVICE_DATA | 15 | 1 | 1 |
 | hpactivity | compressor activity | enum |   | false | DEVICE_DATA | 16 | 1 | 1 |
-uint16
-| hppower | compressor power output | uint16 (>=0<=31999) | W | false | DEVICE_DATA | 17 | 1 | 1 |
-uint16
-| hpcurrpower | compressor current power | uint16 (>=0<=31999) | W | false | DEVICE_DATA | 18 | 1 | 1 |
+| hppower | compressor power output | uint16 | W | false | DEVICE_DATA | 17 | 1 | 1 |
+| hpcurrpower | compressor current power | uint16 | W | false | DEVICE_DATA | 18 | 1 | 1 |
 | hybridstrategy | hybrid control strategy | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | lownoisemode | low noise mode | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -9296,95 +7777,61 @@ uint8
 | lownoisestop | low noise stoptime | uint8 (>=0<=23) | hours | true | DEVICE_DATA | 22 | 1 | 1 |
 | dhw.hybriddhw | hybrid DHW | enum |   | true | DHW | 0 | 1 | 1 |
 uint8
-| energypricegas | energy price gas | uint8 (>=0<=254) | ct/kWh | true | DEVICE_DATA | 23 | 1 | 1 |
+| energypricegas | energy price gas | uint8 (>=0<=0) | ct/kWh | true | DEVICE_DATA | 23 | 1 | 1 |
 uint8
-| energypriceel | energy price electric | uint8 (>=0<=254) | ct/kWh | true | DEVICE_DATA | 24 | 1 | 1 |
+| energypriceel | energy price electric | uint8 (>=0<=0) | ct/kWh | true | DEVICE_DATA | 24 | 1 | 1 |
 uint8
-| energyfeedpv | feed in PV | uint8 (>=0<=254) | ct/kWh | true | DEVICE_DATA | 25 | 1 | 1 |
+| energyfeedpv | feed in PV | uint8 (>=0<=0) | ct/kWh | true | DEVICE_DATA | 25 | 1 | 1 |
 int8
-| switchovertemp | outside switchover temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 26 | 1 | 1 |
+| switchovertemp | outside switchover temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 26 | 1 | 1 |
 | airpurgemode | air purge mode | boolean |   | true | DEVICE_DATA | 27 | 1 | 1 |
 uint8
-| heatpumpoutput | heatpump output | uint8 (>=0<=100) | % | true | DEVICE_DATA | 28 | 1 | 1 |
+| heatpumpoutput | heatpump output | uint8 (>=0<=0) | % | true | DEVICE_DATA | 28 | 1 | 1 |
 | coolingcircuit | cooling circuit | boolean |   | true | DEVICE_DATA | 29 | 1 | 1 |
 uint8
-| compstartmod | compressor start modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 30 | 1 | 1 |
+| compstartmod | compressor start modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 30 | 1 | 1 |
 | heatdrainpan | heat drain pan | boolean |   | true | DEVICE_DATA | 31 | 1 | 1 |
 | heatcable | heating cable | boolean |   | true | DEVICE_DATA | 32 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 33 | 2 | 1/100 |
-uint24
-| dhw.nrg | energy | uint24 (>=0<=167772) | kWh | false | DHW | 1 | 2 | 1/100 |
-uint24
-| nrgheat | energy heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 35 | 2 | 1/100 |
-uint24
-| metertotal | meter total | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 37 | 2 | 1/100 |
-uint24
-| metercomp | meter compressor | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 39 | 2 | 1/100 |
-uint24
-| metereheat | meter e-heater | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 41 | 2 | 1/100 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 43 | 2 | 1/100 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=167772) | kWh | false | DHW | 3 | 2 | 1/100 |
-uint24
-| heatingstarts | heating control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 45 | 2 | 1 |
-uint24
-| dhw.startshp | starts hp | uint24 (>=0<=16777214) |   | false | DHW | 5 | 2 | 1 |
-uint32
-| fuelheat | fuel consumption heating | uint32 (>=0<=1677721) | kWh | false | DEVICE_DATA | 47 | 2 | 1/10 |
-uint32
-| dhw.fueldhw | fuel consumption | uint32 (>=0<=1677721) | kWh | false | DHW | 7 | 2 | 1/10 |
-uint32
-| elheat | el. consumption heating | uint32 (>=0<=1677721) | kWh | false | DEVICE_DATA | 49 | 2 | 1/10 |
-uint32
-| dhw.eldhw | el. consumption | uint32 (>=0<=1677721) | kWh | false | DHW | 9 | 2 | 1/10 |
-uint32
-| elgenheat | el. generation heating | uint32 (>=0<=1677721) | kWh | false | DEVICE_DATA | 51 | 2 | 1/10 |
-uint32
-| dhw.elgendhw | el generation | uint32 (>=0<=1677721) | kWh | false | DHW | 11 | 2 | 1/10 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 33 | 2 | 1/100 |
+| dhw.nrg | energy | uint24 | kWh | false | DHW | 1 | 2 | 1/100 |
+| nrgheat | energy heating | uint24 | kWh | false | DEVICE_DATA | 35 | 2 | 1/100 |
+| metertotal | meter total | uint24 | kWh | false | DEVICE_DATA | 37 | 2 | 1/100 |
+| metercomp | meter compressor | uint24 | kWh | false | DEVICE_DATA | 39 | 2 | 1/100 |
+| metereheat | meter e-heater | uint24 | kWh | false | DEVICE_DATA | 41 | 2 | 1/100 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 43 | 2 | 1/100 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 3 | 2 | 1/100 |
+| heatingstarts | heating control starts | uint24 |   | false | DEVICE_DATA | 45 | 2 | 1 |
+| dhw.startshp | starts hp | uint24 |   | false | DHW | 5 | 2 | 1 |
+| fuelheat | fuel consumption heating | uint32 | kWh | false | DEVICE_DATA | 47 | 2 | 1/10 |
+| dhw.fueldhw | fuel consumption | uint32 | kWh | false | DHW | 7 | 2 | 1/10 |
+| elheat | el. consumption heating | uint32 | kWh | false | DEVICE_DATA | 49 | 2 | 1/10 |
+| dhw.eldhw | el. consumption | uint32 | kWh | false | DHW | 9 | 2 | 1/10 |
+| elgenheat | el. generation heating | uint32 | kWh | false | DEVICE_DATA | 51 | 2 | 1/10 |
+| dhw.elgendhw | el generation | uint32 | kWh | false | DHW | 11 | 2 | 1/10 |
 
 ### Hybrid Manager HM200
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint8
-| airhumidity | relative air humidity | uint8 (>=0<=100) | % | false | DEVICE_DATA | 0 | 1 | 1 |
-uint8
-| dewtemperature | dew point temperature | uint8 (>=0<=254) | C | false | DEVICE_DATA | 1 | 1 | 1 |
-int16
-| curflowtemp | current flow temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 2 | 1 | 1/10 |
-int16
-| rettemp | return temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 3 | 1 | 1/10 |
-int16
-| sysrettemp | system return temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 4 | 1 | 1/10 |
-int16
-| hpta4 | drain pan temp (TA4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 5 | 1 | 1/10 |
-int16
-| hptr1 | compressor temperature (TR1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 6 | 1 | 1/10 |
-int16
-| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-int16
-| hptr4 | evaporator inlet temperature (TR4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-int16
-| hptr5 | compressor inlet temperature (TR5) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-int16
-| hptr6 | compressor outlet temperature (TR6) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-int16
-| hptl2 | air inlet temperature (TL2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 11 | 1 | 1/10 |
-int16
-| hppl1 | low pressure side temperature (PL1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-int16
-| hpph1 | high pressure side temperature (PH1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 14 | 1 | 1 |
-uint8
-| hpcompspd | compressor speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 15 | 1 | 1 |
+| airhumidity | relative air humidity | uint8 | % | false | DEVICE_DATA | 0 | 1 | 1 |
+| dewtemperature | dew point temperature | uint8 | C | false | DEVICE_DATA | 1 | 1 | 1 |
+| curflowtemp | current flow temperature | int16 | C | false | DEVICE_DATA | 2 | 1 | 1/10 |
+| rettemp | return temperature | int16 | C | false | DEVICE_DATA | 3 | 1 | 1/10 |
+| sysrettemp | system return temperature | int16 | C | false | DEVICE_DATA | 4 | 1 | 1/10 |
+| hpta4 | drain pan temp (TA4) | int16 | C | false | DEVICE_DATA | 5 | 1 | 1/10 |
+| hptr1 | compressor temperature (TR1) | int16 | C | false | DEVICE_DATA | 6 | 1 | 1/10 |
+| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| hptr4 | evaporator inlet temperature (TR4) | int16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| hptr5 | compressor inlet temperature (TR5) | int16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| hptr6 | compressor outlet temperature (TR6) | int16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| hptl2 | air inlet temperature (TL2) | int16 | C | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| hppl1 | low pressure side temperature (PL1) | int16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| hpph1 | high pressure side temperature (PH1) | int16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 14 | 1 | 1 |
+| hpcompspd | compressor speed | uint8 | % | false | DEVICE_DATA | 15 | 1 | 1 |
 | hpactivity | compressor activity | enum |   | false | DEVICE_DATA | 16 | 1 | 1 |
-uint16
-| hppower | compressor power output | uint16 (>=0<=31999) | W | false | DEVICE_DATA | 17 | 1 | 1 |
-uint16
-| hpcurrpower | compressor current power | uint16 (>=0<=31999) | W | false | DEVICE_DATA | 18 | 1 | 1 |
+| hppower | compressor power output | uint16 | W | false | DEVICE_DATA | 17 | 1 | 1 |
+| hpcurrpower | compressor current power | uint16 | W | false | DEVICE_DATA | 18 | 1 | 1 |
 | hybridstrategy | hybrid control strategy | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | lownoisemode | low noise mode | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -9393,95 +7840,61 @@ uint8
 | lownoisestop | low noise stoptime | uint8 (>=0<=23) | hours | true | DEVICE_DATA | 22 | 1 | 1 |
 | dhw.hybriddhw | hybrid DHW | enum |   | true | DHW | 0 | 1 | 1 |
 uint8
-| energypricegas | energy price gas | uint8 (>=0<=254) | ct/kWh | true | DEVICE_DATA | 23 | 1 | 1 |
+| energypricegas | energy price gas | uint8 (>=0<=0) | ct/kWh | true | DEVICE_DATA | 23 | 1 | 1 |
 uint8
-| energypriceel | energy price electric | uint8 (>=0<=254) | ct/kWh | true | DEVICE_DATA | 24 | 1 | 1 |
+| energypriceel | energy price electric | uint8 (>=0<=0) | ct/kWh | true | DEVICE_DATA | 24 | 1 | 1 |
 uint8
-| energyfeedpv | feed in PV | uint8 (>=0<=254) | ct/kWh | true | DEVICE_DATA | 25 | 1 | 1 |
+| energyfeedpv | feed in PV | uint8 (>=0<=0) | ct/kWh | true | DEVICE_DATA | 25 | 1 | 1 |
 int8
-| switchovertemp | outside switchover temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 26 | 1 | 1 |
+| switchovertemp | outside switchover temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 26 | 1 | 1 |
 | airpurgemode | air purge mode | boolean |   | true | DEVICE_DATA | 27 | 1 | 1 |
 uint8
-| heatpumpoutput | heatpump output | uint8 (>=0<=100) | % | true | DEVICE_DATA | 28 | 1 | 1 |
+| heatpumpoutput | heatpump output | uint8 (>=0<=0) | % | true | DEVICE_DATA | 28 | 1 | 1 |
 | coolingcircuit | cooling circuit | boolean |   | true | DEVICE_DATA | 29 | 1 | 1 |
 uint8
-| compstartmod | compressor start modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 30 | 1 | 1 |
+| compstartmod | compressor start modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 30 | 1 | 1 |
 | heatdrainpan | heat drain pan | boolean |   | true | DEVICE_DATA | 31 | 1 | 1 |
 | heatcable | heating cable | boolean |   | true | DEVICE_DATA | 32 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 33 | 2 | 1/100 |
-uint24
-| dhw.nrg | energy | uint24 (>=0<=167772) | kWh | false | DHW | 1 | 2 | 1/100 |
-uint24
-| nrgheat | energy heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 35 | 2 | 1/100 |
-uint24
-| metertotal | meter total | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 37 | 2 | 1/100 |
-uint24
-| metercomp | meter compressor | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 39 | 2 | 1/100 |
-uint24
-| metereheat | meter e-heater | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 41 | 2 | 1/100 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 43 | 2 | 1/100 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=167772) | kWh | false | DHW | 3 | 2 | 1/100 |
-uint24
-| heatingstarts | heating control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 45 | 2 | 1 |
-uint24
-| dhw.startshp | starts hp | uint24 (>=0<=16777214) |   | false | DHW | 5 | 2 | 1 |
-uint32
-| fuelheat | fuel consumption heating | uint32 (>=0<=1677721) | kWh | false | DEVICE_DATA | 47 | 2 | 1/10 |
-uint32
-| dhw.fueldhw | fuel consumption | uint32 (>=0<=1677721) | kWh | false | DHW | 7 | 2 | 1/10 |
-uint32
-| elheat | el. consumption heating | uint32 (>=0<=1677721) | kWh | false | DEVICE_DATA | 49 | 2 | 1/10 |
-uint32
-| dhw.eldhw | el. consumption | uint32 (>=0<=1677721) | kWh | false | DHW | 9 | 2 | 1/10 |
-uint32
-| elgenheat | el. generation heating | uint32 (>=0<=1677721) | kWh | false | DEVICE_DATA | 51 | 2 | 1/10 |
-uint32
-| dhw.elgendhw | el generation | uint32 (>=0<=1677721) | kWh | false | DHW | 11 | 2 | 1/10 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 33 | 2 | 1/100 |
+| dhw.nrg | energy | uint24 | kWh | false | DHW | 1 | 2 | 1/100 |
+| nrgheat | energy heating | uint24 | kWh | false | DEVICE_DATA | 35 | 2 | 1/100 |
+| metertotal | meter total | uint24 | kWh | false | DEVICE_DATA | 37 | 2 | 1/100 |
+| metercomp | meter compressor | uint24 | kWh | false | DEVICE_DATA | 39 | 2 | 1/100 |
+| metereheat | meter e-heater | uint24 | kWh | false | DEVICE_DATA | 41 | 2 | 1/100 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 43 | 2 | 1/100 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 3 | 2 | 1/100 |
+| heatingstarts | heating control starts | uint24 |   | false | DEVICE_DATA | 45 | 2 | 1 |
+| dhw.startshp | starts hp | uint24 |   | false | DHW | 5 | 2 | 1 |
+| fuelheat | fuel consumption heating | uint32 | kWh | false | DEVICE_DATA | 47 | 2 | 1/10 |
+| dhw.fueldhw | fuel consumption | uint32 | kWh | false | DHW | 7 | 2 | 1/10 |
+| elheat | el. consumption heating | uint32 | kWh | false | DEVICE_DATA | 49 | 2 | 1/10 |
+| dhw.eldhw | el. consumption | uint32 | kWh | false | DHW | 9 | 2 | 1/10 |
+| elgenheat | el. generation heating | uint32 | kWh | false | DEVICE_DATA | 51 | 2 | 1/10 |
+| dhw.elgendhw | el generation | uint32 | kWh | false | DHW | 11 | 2 | 1/10 |
 
 ### CSH5800iG
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint8
-| airhumidity | relative air humidity | uint8 (>=0<=100) | % | false | DEVICE_DATA | 0 | 1 | 1 |
-uint8
-| dewtemperature | dew point temperature | uint8 (>=0<=254) | C | false | DEVICE_DATA | 1 | 1 | 1 |
-int16
-| curflowtemp | current flow temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 2 | 1 | 1/10 |
-int16
-| rettemp | return temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 3 | 1 | 1/10 |
-int16
-| sysrettemp | system return temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 4 | 1 | 1/10 |
-int16
-| hpta4 | drain pan temp (TA4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 5 | 1 | 1/10 |
-int16
-| hptr1 | compressor temperature (TR1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 6 | 1 | 1/10 |
-int16
-| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
-int16
-| hptr4 | evaporator inlet temperature (TR4) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
-int16
-| hptr5 | compressor inlet temperature (TR5) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
-int16
-| hptr6 | compressor outlet temperature (TR6) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
-int16
-| hptl2 | air inlet temperature (TL2) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 11 | 1 | 1/10 |
-int16
-| hppl1 | low pressure side temperature (PL1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
-int16
-| hpph1 | high pressure side temperature (PH1) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-uint8
-| heatingpumpmod | heating pump modulation | uint8 (>=0<=100) | % | false | DEVICE_DATA | 14 | 1 | 1 |
-uint8
-| hpcompspd | compressor speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 15 | 1 | 1 |
+| airhumidity | relative air humidity | uint8 | % | false | DEVICE_DATA | 0 | 1 | 1 |
+| dewtemperature | dew point temperature | uint8 | C | false | DEVICE_DATA | 1 | 1 | 1 |
+| curflowtemp | current flow temperature | int16 | C | false | DEVICE_DATA | 2 | 1 | 1/10 |
+| rettemp | return temperature | int16 | C | false | DEVICE_DATA | 3 | 1 | 1/10 |
+| sysrettemp | system return temperature | int16 | C | false | DEVICE_DATA | 4 | 1 | 1/10 |
+| hpta4 | drain pan temp (TA4) | int16 | C | false | DEVICE_DATA | 5 | 1 | 1/10 |
+| hptr1 | compressor temperature (TR1) | int16 | C | false | DEVICE_DATA | 6 | 1 | 1/10 |
+| hptr3 | refrigerant temperature liquid side (condenser output) (TR3) | int16 | C | false | DEVICE_DATA | 7 | 1 | 1/10 |
+| hptr4 | evaporator inlet temperature (TR4) | int16 | C | false | DEVICE_DATA | 8 | 1 | 1/10 |
+| hptr5 | compressor inlet temperature (TR5) | int16 | C | false | DEVICE_DATA | 9 | 1 | 1/10 |
+| hptr6 | compressor outlet temperature (TR6) | int16 | C | false | DEVICE_DATA | 10 | 1 | 1/10 |
+| hptl2 | air inlet temperature (TL2) | int16 | C | false | DEVICE_DATA | 11 | 1 | 1/10 |
+| hppl1 | low pressure side temperature (PL1) | int16 | C | false | DEVICE_DATA | 12 | 1 | 1/10 |
+| hpph1 | high pressure side temperature (PH1) | int16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| heatingpumpmod | heating pump modulation | uint8 | % | false | DEVICE_DATA | 14 | 1 | 1 |
+| hpcompspd | compressor speed | uint8 | % | false | DEVICE_DATA | 15 | 1 | 1 |
 | hpactivity | compressor activity | enum |   | false | DEVICE_DATA | 16 | 1 | 1 |
-uint16
-| hppower | compressor power output | uint16 (>=0<=31999) | W | false | DEVICE_DATA | 17 | 1 | 1 |
-uint16
-| hpcurrpower | compressor current power | uint16 (>=0<=31999) | W | false | DEVICE_DATA | 18 | 1 | 1 |
+| hppower | compressor power output | uint16 | W | false | DEVICE_DATA | 17 | 1 | 1 |
+| hpcurrpower | compressor current power | uint16 | W | false | DEVICE_DATA | 18 | 1 | 1 |
 | hybridstrategy | hybrid control strategy | enum |   | true | DEVICE_DATA | 19 | 1 | 1 |
 | lownoisemode | low noise mode | enum |   | true | DEVICE_DATA | 20 | 1 | 1 |
 uint8
@@ -9490,53 +7903,37 @@ uint8
 | lownoisestop | low noise stoptime | uint8 (>=0<=23) | hours | true | DEVICE_DATA | 22 | 1 | 1 |
 | dhw.hybriddhw | hybrid DHW | enum |   | true | DHW | 0 | 1 | 1 |
 uint8
-| energypricegas | energy price gas | uint8 (>=0<=254) | ct/kWh | true | DEVICE_DATA | 23 | 1 | 1 |
+| energypricegas | energy price gas | uint8 (>=0<=0) | ct/kWh | true | DEVICE_DATA | 23 | 1 | 1 |
 uint8
-| energypriceel | energy price electric | uint8 (>=0<=254) | ct/kWh | true | DEVICE_DATA | 24 | 1 | 1 |
+| energypriceel | energy price electric | uint8 (>=0<=0) | ct/kWh | true | DEVICE_DATA | 24 | 1 | 1 |
 uint8
-| energyfeedpv | feed in PV | uint8 (>=0<=254) | ct/kWh | true | DEVICE_DATA | 25 | 1 | 1 |
+| energyfeedpv | feed in PV | uint8 (>=0<=0) | ct/kWh | true | DEVICE_DATA | 25 | 1 | 1 |
 int8
-| switchovertemp | outside switchover temperature | int8 (>=-126<=126) | C | true | DEVICE_DATA | 26 | 1 | 1 |
+| switchovertemp | outside switchover temperature | int8 (>=0<=0) | C | true | DEVICE_DATA | 26 | 1 | 1 |
 | airpurgemode | air purge mode | boolean |   | true | DEVICE_DATA | 27 | 1 | 1 |
 uint8
-| heatpumpoutput | heatpump output | uint8 (>=0<=100) | % | true | DEVICE_DATA | 28 | 1 | 1 |
+| heatpumpoutput | heatpump output | uint8 (>=0<=0) | % | true | DEVICE_DATA | 28 | 1 | 1 |
 | coolingcircuit | cooling circuit | boolean |   | true | DEVICE_DATA | 29 | 1 | 1 |
 uint8
-| compstartmod | compressor start modulation | uint8 (>=0<=100) | % | true | DEVICE_DATA | 30 | 1 | 1 |
+| compstartmod | compressor start modulation | uint8 (>=0<=0) | % | true | DEVICE_DATA | 30 | 1 | 1 |
 | heatdrainpan | heat drain pan | boolean |   | true | DEVICE_DATA | 31 | 1 | 1 |
 | heatcable | heating cable | boolean |   | true | DEVICE_DATA | 32 | 1 | 1 |
-uint24
-| nrgtotal | total energy | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 33 | 2 | 1/100 |
-uint24
-| dhw.nrg | energy | uint24 (>=0<=167772) | kWh | false | DHW | 1 | 2 | 1/100 |
-uint24
-| nrgheat | energy heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 35 | 2 | 1/100 |
-uint24
-| metertotal | meter total | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 37 | 2 | 1/100 |
-uint24
-| metercomp | meter compressor | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 39 | 2 | 1/100 |
-uint24
-| metereheat | meter e-heater | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 41 | 2 | 1/100 |
-uint24
-| meterheat | meter heating | uint24 (>=0<=167772) | kWh | false | DEVICE_DATA | 43 | 2 | 1/100 |
-uint24
-| dhw.meter | meter | uint24 (>=0<=167772) | kWh | false | DHW | 3 | 2 | 1/100 |
-uint24
-| heatingstarts | heating control starts | uint24 (>=0<=16777214) |   | false | DEVICE_DATA | 45 | 2 | 1 |
-uint24
-| dhw.startshp | starts hp | uint24 (>=0<=16777214) |   | false | DHW | 5 | 2 | 1 |
-uint32
-| fuelheat | fuel consumption heating | uint32 (>=0<=1677721) | kWh | false | DEVICE_DATA | 47 | 2 | 1/10 |
-uint32
-| dhw.fueldhw | fuel consumption | uint32 (>=0<=1677721) | kWh | false | DHW | 7 | 2 | 1/10 |
-uint32
-| elheat | el. consumption heating | uint32 (>=0<=1677721) | kWh | false | DEVICE_DATA | 49 | 2 | 1/10 |
-uint32
-| dhw.eldhw | el. consumption | uint32 (>=0<=1677721) | kWh | false | DHW | 9 | 2 | 1/10 |
-uint32
-| elgenheat | el. generation heating | uint32 (>=0<=1677721) | kWh | false | DEVICE_DATA | 51 | 2 | 1/10 |
-uint32
-| dhw.elgendhw | el generation | uint32 (>=0<=1677721) | kWh | false | DHW | 11 | 2 | 1/10 |
+| nrgtotal | total energy | uint24 | kWh | false | DEVICE_DATA | 33 | 2 | 1/100 |
+| dhw.nrg | energy | uint24 | kWh | false | DHW | 1 | 2 | 1/100 |
+| nrgheat | energy heating | uint24 | kWh | false | DEVICE_DATA | 35 | 2 | 1/100 |
+| metertotal | meter total | uint24 | kWh | false | DEVICE_DATA | 37 | 2 | 1/100 |
+| metercomp | meter compressor | uint24 | kWh | false | DEVICE_DATA | 39 | 2 | 1/100 |
+| metereheat | meter e-heater | uint24 | kWh | false | DEVICE_DATA | 41 | 2 | 1/100 |
+| meterheat | meter heating | uint24 | kWh | false | DEVICE_DATA | 43 | 2 | 1/100 |
+| dhw.meter | meter | uint24 | kWh | false | DHW | 3 | 2 | 1/100 |
+| heatingstarts | heating control starts | uint24 |   | false | DEVICE_DATA | 45 | 2 | 1 |
+| dhw.startshp | starts hp | uint24 |   | false | DHW | 5 | 2 | 1 |
+| fuelheat | fuel consumption heating | uint32 | kWh | false | DEVICE_DATA | 47 | 2 | 1/10 |
+| dhw.fueldhw | fuel consumption | uint32 | kWh | false | DHW | 7 | 2 | 1/10 |
+| elheat | el. consumption heating | uint32 | kWh | false | DEVICE_DATA | 49 | 2 | 1/10 |
+| dhw.eldhw | el. consumption | uint32 | kWh | false | DHW | 9 | 2 | 1/10 |
+| elgenheat | el. generation heating | uint32 | kWh | false | DEVICE_DATA | 51 | 2 | 1/10 |
+| dhw.elgendhw | el generation | uint32 | kWh | false | DHW | 11 | 2 | 1/10 |
 
 ## Devices of type \_switch
 
@@ -9545,10 +7942,8 @@ uint32
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
 | activated | activated | boolean |   | false | DEVICE_DATA | 0 | 1 | 1 |
-uint16
-| flowtemphc | flow temperature (TC1) | uint16 (>=0<=3199) | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
-int8
-| status | status | int8 (>=-126<=126) |   | false | DEVICE_DATA | 2 | 1 | 1 |
+| flowtemphc | flow temperature (TC1) | uint16 | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| status | status | int8 |   | false | DEVICE_DATA | 2 | 1 | 1 |
 
 ## Devices of type \_controller
 
@@ -9565,14 +7960,10 @@ int8
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
 | datetime | date/time | string |   | false | DEVICE_DATA | 0 | 13 | 1 |
-int16
-| outdoortemp | outside temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
-int16
-| src1.currtemp | current room temperature | int16 (>=-3199<=3199) | C | false | SRC | 0 | 1 | 1/10 |
-int8
-| src1.airhumidity | relative air humidity | int8 (>=-100<=100) | % | false | SRC | 1 | 1 | 1 |
-int16
-| src1.dewtemperature | dew point temperature | int16 (>=-3199<=3199) | C | false | SRC | 2 | 1 | 1/10 |
+| outdoortemp | outside temperature | int16 | C | false | DEVICE_DATA | 13 | 1 | 1/10 |
+| src1.currtemp | current room temperature | int16 | C | false | SRC | 0 | 1 | 1/10 |
+| src1.airhumidity | relative air humidity | int8 | % | false | SRC | 1 | 1 | 1 |
+| src1.dewtemperature | dew point temperature | int16 | C | false | SRC | 2 | 1 | 1/10 |
 uint8
 | src1.seltemp | selected room temperature | uint8 (>=5<=30) | C | true | SRC | 3 | 1 | 1/2 |
 | src1.mode | operating mode | enum |   | true | SRC | 4 | 1 | 1 |
@@ -9586,10 +7977,8 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint8
-| setflowtemp | set flow temperature | uint8 (>=0<=254) | C | false | DEVICE_DATA | 0 | 1 | 1 |
-uint8
-| setburnpow | burner set power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 1 | 1 | 1 |
+| setflowtemp | set flow temperature | uint8 | C | false | DEVICE_DATA | 0 | 1 | 1 |
+| setburnpow | burner set power | uint8 | % | false | DEVICE_DATA | 1 | 1 | 1 |
 
 ## Devices of type \_extension
 
@@ -9597,51 +7986,39 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-int16
-| flowtempvf | flow temperature in header (T0/Vf) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
+| flowtempvf | flow temperature in header (T0/Vf) | int16 | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
+| input | input | uint8 | V | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| outpow | output IO1 | uint8 | % | false | DEVICE_DATA | 2 | 1 | 1 |
+| setpower | request power | uint8 | % | false | DEVICE_DATA | 3 | 1 | 1 |
+| setpoint | set temp. | uint8 | C | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
-| input | input | uint8 (>=0<=25) | V | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| minv | min volt. | uint8 (>=0<=0) | V | true | DEVICE_DATA | 5 | 1 | 1/10 |
 uint8
-| outpow | output IO1 | uint8 (>=0<=100) | % | false | DEVICE_DATA | 2 | 1 | 1 |
+| maxv | max volt. | uint8 (>=0<=0) | V | true | DEVICE_DATA | 6 | 1 | 1/10 |
 uint8
-| setpower | request power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 3 | 1 | 1 |
+| mint | min temp. | uint8 (>=0<=0) | C | true | DEVICE_DATA | 7 | 1 | 1 |
 uint8
-| setpoint | set temp. | uint8 (>=0<=254) | C | false | DEVICE_DATA | 4 | 1 | 1 |
-uint8
-| minv | min volt. | uint8 (>=0<=25) | V | true | DEVICE_DATA | 5 | 1 | 1/10 |
-uint8
-| maxv | max volt. | uint8 (>=0<=25) | V | true | DEVICE_DATA | 6 | 1 | 1/10 |
-uint8
-| mint | min temp. | uint8 (>=0<=254) | C | true | DEVICE_DATA | 7 | 1 | 1 |
-uint8
-| maxt | max temp. | uint8 (>=0<=254) | C | true | DEVICE_DATA | 8 | 1 | 1 |
-uint8
-| mode | operating mode | uint8 (>=0<=254) |   | false | DEVICE_DATA | 9 | 1 | 1 |
+| maxt | max temp. | uint8 (>=0<=0) | C | true | DEVICE_DATA | 8 | 1 | 1 |
+| mode | operating mode | uint8 |   | false | DEVICE_DATA | 9 | 1 | 1 |
 
 ### T1RF
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-int16
-| flowtempvf | flow temperature in header (T0/Vf) | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
+| flowtempvf | flow temperature in header (T0/Vf) | int16 | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
+| input | input | uint8 | V | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| outpow | output IO1 | uint8 | % | false | DEVICE_DATA | 2 | 1 | 1 |
+| setpower | request power | uint8 | % | false | DEVICE_DATA | 3 | 1 | 1 |
+| setpoint | set temp. | uint8 | C | false | DEVICE_DATA | 4 | 1 | 1 |
 uint8
-| input | input | uint8 (>=0<=25) | V | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| minv | min volt. | uint8 (>=0<=0) | V | true | DEVICE_DATA | 5 | 1 | 1/10 |
 uint8
-| outpow | output IO1 | uint8 (>=0<=100) | % | false | DEVICE_DATA | 2 | 1 | 1 |
+| maxv | max volt. | uint8 (>=0<=0) | V | true | DEVICE_DATA | 6 | 1 | 1/10 |
 uint8
-| setpower | request power | uint8 (>=0<=100) | % | false | DEVICE_DATA | 3 | 1 | 1 |
+| mint | min temp. | uint8 (>=0<=0) | C | true | DEVICE_DATA | 7 | 1 | 1 |
 uint8
-| setpoint | set temp. | uint8 (>=0<=254) | C | false | DEVICE_DATA | 4 | 1 | 1 |
-uint8
-| minv | min volt. | uint8 (>=0<=25) | V | true | DEVICE_DATA | 5 | 1 | 1/10 |
-uint8
-| maxv | max volt. | uint8 (>=0<=25) | V | true | DEVICE_DATA | 6 | 1 | 1/10 |
-uint8
-| mint | min temp. | uint8 (>=0<=254) | C | true | DEVICE_DATA | 7 | 1 | 1 |
-uint8
-| maxt | max temp. | uint8 (>=0<=254) | C | true | DEVICE_DATA | 8 | 1 | 1 |
-uint8
-| mode | operating mode | uint8 (>=0<=254) |   | false | DEVICE_DATA | 9 | 1 | 1 |
+| maxt | max temp. | uint8 (>=0<=0) | C | true | DEVICE_DATA | 8 | 1 | 1 |
+| mode | operating mode | uint8 |   | false | DEVICE_DATA | 9 | 1 | 1 |
 
 ## Devices of type \_heatsource
 
@@ -9649,28 +8026,17 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-int16
-| ahs1.sysflowtemp | system flow temperature | int16 (>=-3199<=3199) | C | false | AHS | 0 | 1 | 1/10 |
-int16
-| ahs1.sysrettemp | system return temperature | int16 (>=-3199<=3199) | C | false | AHS | 1 | 1 | 1/10 |
-int16
-| ahs1.altflowtemp | alternative hs flow temperature | int16 (>=-3199<=3199) | C | false | AHS | 2 | 1 | 1/10 |
-int16
-| ahs1.altrettemp | alternative hs return temperature | int16 (>=-3199<=3199) | C | false | AHS | 3 | 1 | 1/10 |
-int16
-| ahs1.cyltoptemp | cylinder top temperature | int16 (>=-3199<=3199) | C | false | AHS | 4 | 1 | 1/10 |
-int16
-| ahs1.cylcentertemp | cylinder center temperature | int16 (>=-3199<=3199) | C | false | AHS | 5 | 1 | 1/10 |
-int16
-| ahs1.cylbottomtemp | cylinder bottom temperature | int16 (>=-3199<=3199) | C | false | AHS | 6 | 1 | 1/10 |
-int16
-| ahs1.fluegastemp | flue gas temperature | int16 (>=-3199<=3199) | C | false | AHS | 7 | 1 | 1/10 |
-uint8
-| ahs1.valvebuffer | buffer valve | uint8 (>=0<=100) | % | false | AHS | 8 | 1 | 1 |
-uint8
-| ahs1.valvereturn | return valve | uint8 (>=0<=100) | % | false | AHS | 9 | 1 | 1 |
-uint8
-| ahs1.apumpmod | alternative hs pump modulation | uint8 (>=0<=100) | % | false | AHS | 10 | 1 | 1 |
+| ahs1.sysflowtemp | system flow temperature | int16 | C | false | AHS | 0 | 1 | 1/10 |
+| ahs1.sysrettemp | system return temperature | int16 | C | false | AHS | 1 | 1 | 1/10 |
+| ahs1.altflowtemp | alternative hs flow temperature | int16 | C | false | AHS | 2 | 1 | 1/10 |
+| ahs1.altrettemp | alternative hs return temperature | int16 | C | false | AHS | 3 | 1 | 1/10 |
+| ahs1.cyltoptemp | cylinder top temperature | int16 | C | false | AHS | 4 | 1 | 1/10 |
+| ahs1.cylcentertemp | cylinder center temperature | int16 | C | false | AHS | 5 | 1 | 1/10 |
+| ahs1.cylbottomtemp | cylinder bottom temperature | int16 | C | false | AHS | 6 | 1 | 1/10 |
+| ahs1.fluegastemp | flue gas temperature | int16 | C | false | AHS | 7 | 1 | 1/10 |
+| ahs1.valvebuffer | buffer valve | uint8 | % | false | AHS | 8 | 1 | 1 |
+| ahs1.valvereturn | return valve | uint8 | % | false | AHS | 9 | 1 | 1 |
+| ahs1.apumpmod | alternative hs pump modulation | uint8 | % | false | AHS | 10 | 1 | 1 |
 | ahs1.vr2config | vr2 configuration | enum |   | true | AHS | 11 | 1 | 1 |
 | ahs1.ahsactivated | alternate heat source activation | boolean |   | true | AHS | 12 | 1 | 1 |
 | ahs1.apumpconfig | primary pump config | boolean |   | true | AHS | 13 | 1 | 1 |
@@ -9696,12 +8062,9 @@ uint8
 | ahs1.releasewait | boiler release wait time | uint8 (>=0<=240) | minutes | true | AHS | 26 | 1 | 1 |
 | ahs1.burner | burner | boolean |   | false | AHS | 27 | 1 | 1 |
 | ahs1.apump | alternative hs pump | boolean |   | false | AHS | 28 | 1 | 1 |
-uint8
-| ahs1.heatrequest | heat request | uint8 (>=0<=100) | % | false | AHS | 29 | 1 | 1 |
-uint8
-| ahs1.blockremain | remaining blocktime | uint8 (>=0<=254) | minutes | false | AHS | 30 | 1 | 1 |
-uint8
-| ahs1.blockremaindhw | remaining blocktime dhw | uint8 (>=0<=254) | minutes | false | AHS | 31 | 1 | 1 |
+| ahs1.heatrequest | heat request | uint8 | % | false | AHS | 29 | 1 | 1 |
+| ahs1.blockremain | remaining blocktime | uint8 | minutes | false | AHS | 30 | 1 | 1 |
+| ahs1.blockremaindhw | remaining blocktime dhw | uint8 | minutes | false | AHS | 31 | 1 | 1 |
 
 ## Devices of type \_ventilation
 
@@ -9709,23 +8072,15 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-int16
-| outfresh | outdoor fresh air | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
-int16
-| infresh | indoor fresh air | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
-int16
-| outexhaust | outdoor exhaust air | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 2 | 1 | 1/10 |
-int16
-| inexhaust | indoor exhaust air | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | 3 | 1 | 1/10 |
-uint8
-| ventinspeed | in blower speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 4 | 1 | 1 |
-uint8
-| ventoutspeed | out blower speed | uint8 (>=0<=100) | % | false | DEVICE_DATA | 5 | 1 | 1 |
+| outfresh | outdoor fresh air | int16 | C | false | DEVICE_DATA | 0 | 1 | 1/10 |
+| infresh | indoor fresh air | int16 | C | false | DEVICE_DATA | 1 | 1 | 1/10 |
+| outexhaust | outdoor exhaust air | int16 | C | false | DEVICE_DATA | 2 | 1 | 1/10 |
+| inexhaust | indoor exhaust air | int16 | C | false | DEVICE_DATA | 3 | 1 | 1/10 |
+| ventinspeed | in blower speed | uint8 | % | false | DEVICE_DATA | 4 | 1 | 1 |
+| ventoutspeed | out blower speed | uint8 | % | false | DEVICE_DATA | 5 | 1 | 1 |
 | ventmode | ventilation mode | enum |   | true | DEVICE_DATA | 6 | 1 | 1 |
-uint16
-| airquality | air quality (voc) | uint16 (>=0<=31999) |   | false | DEVICE_DATA | 7 | 1 | 1 |
-uint8
-| airhumidity | relative air humidity | uint8 (>=0<=100) | % | false | DEVICE_DATA | 8 | 1 | 1 |
+| airquality | air quality (voc) | uint16 |   | false | DEVICE_DATA | 7 | 1 | 1 |
+| airhumidity | relative air humidity | uint8 | % | false | DEVICE_DATA | 8 | 1 | 1 |
 | bypass | bypass | boolean |   | true | DEVICE_DATA | 9 | 1 | 1 |
 
 ## Devices of type \_water
@@ -9735,22 +8090,19 @@ uint8
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 0 | 1 | 1 |
-uint16
-| dhw.temp | current temperature | uint16 (>=0<=3199) | C | false | DHW | 1 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 2 | 1 | 1/10 |
-uint16
-| dhw.hydrTemp | hydraulic header temperature | uint16 (>=0<=3199) | C | false | DHW | 3 | 1 | 1/10 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 0 | 1 | 1 |
+| dhw.temp | current temperature | uint16 | C | false | DHW | 1 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 2 | 1 | 1/10 |
+| dhw.hydrTemp | hydraulic header temperature | uint16 | C | false | DHW | 3 | 1 | 1/10 |
 | dhw.pump | pump | boolean |   | false | DHW | 4 | 1 | 1 |
 uint8
-| dhw.flowtempoffset | flow temperature offset | uint8 (>=0<=254) | C | true | DHW | 5 | 1 | 1 |
+| dhw.flowtempoffset | flow temperature offset | uint8 (>=0<=0) | C | true | DHW | 5 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 6 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 6 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 7 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 7 | 1 | 1 |
 uint8
-| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=254) | C | true | DHW | 8 | 1 | 1 |
+| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=0) | C | true | DHW | 8 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 9 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 10 | 1 | 1 |
 
@@ -9759,22 +8111,19 @@ uint8
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 0 | 1 | 1 |
-uint16
-| dhw.temp | current temperature | uint16 (>=0<=3199) | C | false | DHW | 1 | 1 | 1/10 |
-uint16
-| dhw.curtemp2 | current extern temperature | uint16 (>=0<=3199) | C | false | DHW | 2 | 1 | 1/10 |
-uint16
-| dhw.hydrTemp | hydraulic header temperature | uint16 (>=0<=3199) | C | false | DHW | 3 | 1 | 1/10 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 0 | 1 | 1 |
+| dhw.temp | current temperature | uint16 | C | false | DHW | 1 | 1 | 1/10 |
+| dhw.curtemp2 | current extern temperature | uint16 | C | false | DHW | 2 | 1 | 1/10 |
+| dhw.hydrTemp | hydraulic header temperature | uint16 | C | false | DHW | 3 | 1 | 1/10 |
 | dhw.pump | pump | boolean |   | false | DHW | 4 | 1 | 1 |
 uint8
-| dhw.flowtempoffset | flow temperature offset | uint8 (>=0<=254) | C | true | DHW | 5 | 1 | 1 |
+| dhw.flowtempoffset | flow temperature offset | uint8 (>=0<=0) | C | true | DHW | 5 | 1 | 1 |
 int8
-| dhw.hyston | hysteresis on temperature | int8 (>=-126<=126) | C | true | DHW | 6 | 1 | 1 |
+| dhw.hyston | hysteresis on temperature | int8 (>=0<=0) | C | true | DHW | 6 | 1 | 1 |
 int8
-| dhw.hystoff | hysteresis off temperature | int8 (>=-126<=126) | C | true | DHW | 7 | 1 | 1 |
+| dhw.hystoff | hysteresis off temperature | int8 (>=0<=0) | C | true | DHW | 7 | 1 | 1 |
 uint8
-| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=254) | C | true | DHW | 8 | 1 | 1 |
+| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=0) | C | true | DHW | 8 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 9 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 10 | 1 | 1 |
 
@@ -9782,21 +8131,19 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| dhw.temp | current temperature | uint16 (>=0<=3199) | C | false | DHW | 1 | 1 | 1/10 |
-int8
-| dhw.tempstatus | temperature switch in assigned dhw (MC1) | int8 (>=-126<=126) |   | false | DHW | 11 | 1 | 1 |
+| dhw.temp | current temperature | uint16 | C | false | DHW | 1 | 1 | 1/10 |
+| dhw.tempstatus | temperature switch in assigned dhw (MC1) | int8 |   | false | DHW | 11 | 1 | 1 |
 | dhw.pump | pump | boolean |   | false | DHW | 4 | 1 | 1 |
 uint8
-| dhw.maxtemp | maximum temperature | uint8 (>=0<=254) | C | true | DHW | 12 | 1 | 1 |
+| dhw.maxtemp | maximum temperature | uint8 (>=0<=0) | C | true | DHW | 12 | 1 | 1 |
 int8
-| dhw.difftemp | start differential temperature | int8 (>=-126<=126) | C | true | DHW | 13 | 1 | 1 |
+| dhw.difftemp | start differential temperature | int8 (>=0<=0) | C | true | DHW | 13 | 1 | 1 |
 uint8
-| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=254) | C | true | DHW | 8 | 1 | 1 |
+| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=0) | C | true | DHW | 8 | 1 | 1 |
 uint8
-| dhw.redtemp | reduced temperature | uint8 (>=0<=254) | C | true | DHW | 14 | 1 | 1 |
+| dhw.redtemp | reduced temperature | uint8 (>=0<=0) | C | true | DHW | 14 | 1 | 1 |
 uint8
-| dhw.requiredtemp | required temperature | uint8 (>=0<=254) | C | true | DHW | 15 | 1 | 1 |
+| dhw.requiredtemp | required temperature | uint8 (>=0<=0) | C | true | DHW | 15 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 9 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 10 | 1 | 1 |
 
@@ -9804,21 +8151,19 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| dhw.temp | current temperature | uint16 (>=0<=3199) | C | false | DHW | 1 | 1 | 1/10 |
-int8
-| dhw.tempstatus | temperature switch in assigned dhw (MC1) | int8 (>=-126<=126) |   | false | DHW | 11 | 1 | 1 |
+| dhw.temp | current temperature | uint16 | C | false | DHW | 1 | 1 | 1/10 |
+| dhw.tempstatus | temperature switch in assigned dhw (MC1) | int8 |   | false | DHW | 11 | 1 | 1 |
 | dhw.pump | pump | boolean |   | false | DHW | 4 | 1 | 1 |
 uint8
-| dhw.maxtemp | maximum temperature | uint8 (>=0<=254) | C | true | DHW | 12 | 1 | 1 |
+| dhw.maxtemp | maximum temperature | uint8 (>=0<=0) | C | true | DHW | 12 | 1 | 1 |
 int8
-| dhw.difftemp | start differential temperature | int8 (>=-126<=126) | C | true | DHW | 13 | 1 | 1 |
+| dhw.difftemp | start differential temperature | int8 (>=0<=0) | C | true | DHW | 13 | 1 | 1 |
 uint8
-| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=254) | C | true | DHW | 8 | 1 | 1 |
+| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=0) | C | true | DHW | 8 | 1 | 1 |
 uint8
-| dhw.redtemp | reduced temperature | uint8 (>=0<=254) | C | true | DHW | 14 | 1 | 1 |
+| dhw.redtemp | reduced temperature | uint8 (>=0<=0) | C | true | DHW | 14 | 1 | 1 |
 uint8
-| dhw.requiredtemp | required temperature | uint8 (>=0<=254) | C | true | DHW | 15 | 1 | 1 |
+| dhw.requiredtemp | required temperature | uint8 (>=0<=0) | C | true | DHW | 15 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 9 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 10 | 1 | 1 |
 
@@ -9826,84 +8171,70 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| dhw.temp | current temperature | uint16 (>=0<=3199) | C | false | DHW | 1 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 16 | 1 | 1/10 |
-uint16
-| dhw.coldtemp | cold water | uint16 (>=0<=3199) | C | false | DHW | 17 | 1 | 1/10 |
-uint16
-| dhw.temp5 | temperature 5 | uint16 (>=0<=3199) | C | false | DHW | 18 | 1 | 1/10 |
-uint16
-| dhw.rettemp | return temperature | uint16 (>=0<=3199) | C | false | DHW | 19 | 1 | 1/10 |
+| dhw.temp | current temperature | uint16 | C | false | DHW | 1 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 16 | 1 | 1/10 |
+| dhw.coldtemp | cold water | uint16 | C | false | DHW | 17 | 1 | 1/10 |
+| dhw.temp5 | temperature 5 | uint16 | C | false | DHW | 18 | 1 | 1/10 |
+| dhw.rettemp | return temperature | uint16 | C | false | DHW | 19 | 1 | 1/10 |
 | dhw.pump | pump | boolean |   | false | DHW | 4 | 1 | 1 |
 uint8
-| dhw.maxtemp | maximum temperature | uint8 (>=0<=254) | C | true | DHW | 12 | 1 | 1 |
+| dhw.maxtemp | maximum temperature | uint8 (>=0<=0) | C | true | DHW | 12 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 0 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 0 | 1 | 1 |
 uint8
-| dhw.redtemp | reduced temperature | uint8 (>=0<=254) | C | true | DHW | 14 | 1 | 1 |
+| dhw.redtemp | reduced temperature | uint8 (>=0<=0) | C | true | DHW | 14 | 1 | 1 |
 uint8
-| dhw.hottemp | extra hot temperature | uint8 (>=0<=254) | C | true | DHW | 20 | 1 | 1 |
+| dhw.hottemp | extra hot temperature | uint8 (>=0<=0) | C | true | DHW | 20 | 1 | 1 |
 uint8
-| dhw.dailytemp | daily temperature | uint8 (>=0<=254) | C | true | DHW | 21 | 1 | 1 |
+| dhw.dailytemp | daily temperature | uint8 (>=0<=0) | C | true | DHW | 21 | 1 | 1 |
 uint8
-| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=254) | C | true | DHW | 8 | 1 | 1 |
+| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=0) | C | true | DHW | 8 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 9 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 10 | 1 | 1 |
 | dhw.circtc | circulation time controlled | boolean |   | true | DHW | 22 | 1 | 1 |
 | dhw.keepwarm | keep warm | boolean |   | true | DHW | 23 | 1 | 1 |
 | dhw.status2 | status 2 | enum |   | false | DHW | 24 | 1 | 1 |
+| dhw.pumpmod | pump modulation | uint8 | % | false | DHW | 25 | 1 | 1 |
+| dhw.flow | flow rate | uint16 | l/min | false | DHW | 26 | 1 | 1/10 |
 uint8
-| dhw.pumpmod | pump modulation | uint8 (>=0<=100) | % | false | DHW | 25 | 1 | 1 |
-uint16
-| dhw.flow | flow rate | uint16 (>=0<=3199) | l/min | false | DHW | 26 | 1 | 1/10 |
+| dhw.valvereturn | return valve | uint8 (>=0<=0) | % | true | DHW | 27 | 1 | 1 |
 uint8
-| dhw.valvereturn | return valve | uint8 (>=0<=100) | % | true | DHW | 27 | 1 | 1 |
-uint8
-| dhw.deltatret | temp. diff. return valve | uint8 (>=0<=254) | K | true | DHW | 28 | 1 | 1 |
+| dhw.deltatret | temp. diff. return valve | uint8 (>=0<=0) | K | true | DHW | 28 | 1 | 1 |
 | dhw.errordisp | error display | enum |   | true | DHW | 29 | 1 | 1 |
 
 ### SM200, MS200
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-uint16
-| dhw.temp | current temperature | uint16 (>=0<=3199) | C | false | DHW | 1 | 1 | 1/10 |
-uint16
-| dhw.storagetemp1 | storage intern temperature | uint16 (>=0<=3199) | C | false | DHW | 16 | 1 | 1/10 |
-uint16
-| dhw.coldtemp | cold water | uint16 (>=0<=3199) | C | false | DHW | 17 | 1 | 1/10 |
-uint16
-| dhw.temp5 | temperature 5 | uint16 (>=0<=3199) | C | false | DHW | 18 | 1 | 1/10 |
-uint16
-| dhw.rettemp | return temperature | uint16 (>=0<=3199) | C | false | DHW | 19 | 1 | 1/10 |
+| dhw.temp | current temperature | uint16 | C | false | DHW | 1 | 1 | 1/10 |
+| dhw.storagetemp1 | storage intern temperature | uint16 | C | false | DHW | 16 | 1 | 1/10 |
+| dhw.coldtemp | cold water | uint16 | C | false | DHW | 17 | 1 | 1/10 |
+| dhw.temp5 | temperature 5 | uint16 | C | false | DHW | 18 | 1 | 1/10 |
+| dhw.rettemp | return temperature | uint16 | C | false | DHW | 19 | 1 | 1/10 |
 | dhw.pump | pump | boolean |   | false | DHW | 4 | 1 | 1 |
 uint8
-| dhw.maxtemp | maximum temperature | uint8 (>=0<=254) | C | true | DHW | 12 | 1 | 1 |
+| dhw.maxtemp | maximum temperature | uint8 (>=0<=0) | C | true | DHW | 12 | 1 | 1 |
 uint8
-| dhw.seltemp | selected temperature | uint8 (>=0<=254) | C | true | DHW | 0 | 1 | 1 |
+| dhw.seltemp | selected temperature | uint8 (>=0<=0) | C | true | DHW | 0 | 1 | 1 |
 uint8
-| dhw.redtemp | reduced temperature | uint8 (>=0<=254) | C | true | DHW | 14 | 1 | 1 |
+| dhw.redtemp | reduced temperature | uint8 (>=0<=0) | C | true | DHW | 14 | 1 | 1 |
 uint8
-| dhw.hottemp | extra hot temperature | uint8 (>=0<=254) | C | true | DHW | 20 | 1 | 1 |
+| dhw.hottemp | extra hot temperature | uint8 (>=0<=0) | C | true | DHW | 20 | 1 | 1 |
 uint8
-| dhw.dailytemp | daily temperature | uint8 (>=0<=254) | C | true | DHW | 21 | 1 | 1 |
+| dhw.dailytemp | daily temperature | uint8 (>=0<=0) | C | true | DHW | 21 | 1 | 1 |
 uint8
-| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=254) | C | true | DHW | 8 | 1 | 1 |
+| dhw.disinfectiontemp | disinfection temperature | uint8 (>=0<=0) | C | true | DHW | 8 | 1 | 1 |
 | dhw.circ | circulation active | boolean |   | true | DHW | 9 | 1 | 1 |
 | dhw.circmode | circulation pump mode | enum |   | true | DHW | 10 | 1 | 1 |
 | dhw.circtc | circulation time controlled | boolean |   | true | DHW | 22 | 1 | 1 |
 | dhw.keepwarm | keep warm | boolean |   | true | DHW | 23 | 1 | 1 |
 | dhw.status2 | status 2 | enum |   | false | DHW | 24 | 1 | 1 |
+| dhw.pumpmod | pump modulation | uint8 | % | false | DHW | 25 | 1 | 1 |
+| dhw.flow | flow rate | uint16 | l/min | false | DHW | 26 | 1 | 1/10 |
 uint8
-| dhw.pumpmod | pump modulation | uint8 (>=0<=100) | % | false | DHW | 25 | 1 | 1 |
-uint16
-| dhw.flow | flow rate | uint16 (>=0<=3199) | l/min | false | DHW | 26 | 1 | 1/10 |
+| dhw.valvereturn | return valve | uint8 (>=0<=0) | % | true | DHW | 27 | 1 | 1 |
 uint8
-| dhw.valvereturn | return valve | uint8 (>=0<=100) | % | true | DHW | 27 | 1 | 1 |
-uint8
-| dhw.deltatret | temp. diff. return valve | uint8 (>=0<=254) | K | true | DHW | 28 | 1 | 1 |
+| dhw.deltatret | temp. diff. return valve | uint8 (>=0<=0) | K | true | DHW | 28 | 1 | 1 |
 | dhw.errordisp | error display | enum |   | true | DHW | 29 | 1 | 1 |
 
 ## Devices of type \_pool
@@ -9912,9 +8243,7 @@ uint8
 
 | shortname | fullname | type | uom | writeable | tag type | register offset | register count | scale factor |
 |-|-|-|-|-|-|-|-|-|
-int16
-| pooltemp | pool temperature | int16 (>=-3199<=3199) | C | false | DEVICE_DATA | -1 | 1 | 1/10 |
+| pooltemp | pool temperature | int16 | C | false | DEVICE_DATA | -1 | 1 | 1/10 |
 | poolshuntstatus | pool shunt status opening/closing | enum |   | false | DEVICE_DATA | -1 | 1 | 1 |
-uint8
-| poolshunt | pool shunt open/close (0% = pool / 100% = heat) | uint8 (>=0<=100) | % | false | DEVICE_DATA | -1 | 1 | 1 |
+| poolshunt | pool shunt open/close (0% = pool / 100% = heat) | uint8 | % | false | DEVICE_DATA | -1 | 1 | 1 |
 
diff --git a/docs/dump_entities.csv b/docs/dump_entities.csv
index 6656356c8..6711ca04c 100644
--- a/docs/dump_entities.csv
+++ b/docs/dump_entities.csv
@@ -1,165 +1,165 @@
 device name,device type,product id,shortname,fullname,type [options...] \| (min/max),uom,writeable,discovery entityid v3.4,discovery entityid,modbus unit identifier,modbus block,modbus scale factor,modbus offset,modbus count
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,mandefrost,manual defrost,cmd [off\|on], ,true,sensor.boiler_manual_defrost,sensor.boiler_mandefrost,5,0,1,84,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.nrg,energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_dhw_energy,sensor.boiler_dhw_nrg,5,9,1/100,0,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgheat,energy heating,uint24 (>=0<=167772),kWh,false,sensor.boiler_energy_heating,sensor.boiler_nrgheat,5,0,1/100,87,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgcool,energy cooling,uint24 (>=0<=167772),kWh,false,sensor.boiler_energy_cooling,sensor.boiler_nrgcool,5,0,1/100,89,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,metertotal,meter total,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_total,sensor.boiler_metertotal,5,0,1/100,91,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,metercomp,meter compressor,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_compressor,sensor.boiler_metercomp,5,0,1/100,93,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,metereheat,meter e-heater,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_e-heater,sensor.boiler_metereheat,5,0,1/100,95,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,meterheat,meter heating,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/100,97,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,metercool,meter cooling,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_cooling,sensor.boiler_metercool,5,0,1/100,99,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.meter,meter,uint24 (>=0<=167772),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/100,2,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,uptimetotal,heatpump total uptime,time (>=0<=279620),minutes,false,sensor.boiler_heatpump_total_uptime,sensor.boiler_uptimetotal,5,0,1/60,101,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,uptimecontrol,total operating time heat,time (>=0<=279620),minutes,false,sensor.boiler_total_operating_time_heat,sensor.boiler_uptimecontrol,5,0,1/60,103,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,uptimecompheating,operating time compressor heating,time (>=0<=279620),minutes,false,sensor.boiler_operating_time_compressor_heating,sensor.boiler_uptimecompheating,5,0,1/60,105,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,uptimecompcooling,operating time compressor cooling,time (>=0<=279620),minutes,false,sensor.boiler_operating_time_compressor_cooling,sensor.boiler_uptimecompcooling,5,0,1/60,107,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.uptimecomp,operating time compressor,time (>=0<=279620),minutes,false,sensor.boiler_dhw_operating_time_compressor,sensor.boiler_dhw_uptimecomp,5,9,1/60,4,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,uptimecomppool,operating time compressor pool,time (>=0<=279620),minutes,false,sensor.boiler_operating_time_compressor_pool,sensor.boiler_uptimecomppool,5,0,1/60,109,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,totalcompstarts,total compressor control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_total_compressor_control_starts,sensor.boiler_totalcompstarts,5,0,1,111,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatingstarts,heating control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_heating_control_starts,sensor.boiler_heatingstarts,5,0,1,113,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,coolingstarts,cooling control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_cooling_control_starts,sensor.boiler_coolingstarts,5,0,1,115,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.startshp,starts hp,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts_hp,sensor.boiler_dhw_startshp,5,9,1,6,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,poolstarts,pool control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_pool_control_starts,sensor.boiler_poolstarts,5,0,1,117,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgconstotal,total energy consumption,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_consumption,sensor.boiler_nrgconstotal,5,0,1,119,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgconscomptotal,total energy consumption compressor,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_consumption_compressor,sensor.boiler_nrgconscomptotal,5,0,1,121,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgconscompheating,energy consumption compressor heating,uint24 (>=0<=16777214),kWh,false,sensor.boiler_energy_consumption_compressor_heating,sensor.boiler_nrgconscompheating,5,0,1,123,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.nrgconscomp,energy consumption compressor,uint24 (>=0<=16777214),kWh,false,sensor.boiler_dhw_energy_consumption_compressor,sensor.boiler_dhw_nrgconscomp,5,9,1,8,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgconscompcooling,energy consumption compressor cooling,uint24 (>=0<=16777214),kWh,false,sensor.boiler_energy_consumption_compressor_cooling,sensor.boiler_nrgconscompcooling,5,0,1,125,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgconscomppool,energy consumption compressor pool,uint24 (>=0<=16777214),kWh,false,sensor.boiler_energy_consumption_compressor_pool,sensor.boiler_nrgconscomppool,5,0,1,127,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxelecheatnrgconstotal,total aux elec. heater energy consumption,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_aux_elec._heater_energy_consumption,sensor.boiler_auxelecheatnrgconstotal,5,0,1,129,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxelecheatnrgconsheating,aux elec. heater energy consumption heating,uint24 (>=0<=16777214),kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_heating,sensor.boiler_auxelecheatnrgconsheating,5,0,1,131,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.auxelecheatnrgcons,aux elec. heater energy consumption,uint24 (>=0<=16777214),kWh,false,sensor.boiler_dhw_aux_elec._heater_energy_consumption,sensor.boiler_dhw_auxelecheatnrgcons,5,9,1,10,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxelecheatnrgconspool,aux elec. heater energy consumption pool,uint24 (>=0<=16777214),kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_pool,sensor.boiler_auxelecheatnrgconspool,5,0,1,133,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgsupptotal,total energy supplied,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied,sensor.boiler_nrgsupptotal,5,0,1,135,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgsuppheating,total energy supplied heating,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied_heating,sensor.boiler_nrgsuppheating,5,0,1,137,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.nrgsupp,total energy warm supplied,uint24 (>=0<=16777214),kWh,false,sensor.boiler_dhw_total_energy_warm_supplied,sensor.boiler_dhw_nrgsupp,5,9,1,12,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgsuppcooling,total energy supplied cooling,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied_cooling,sensor.boiler_nrgsuppcooling,5,0,1,139,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgsupppool,total energy supplied pool,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied_pool,sensor.boiler_nrgsupppool,5,0,1,141,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hppower,compressor power output,uint16 (>=0<=3199),kW,false,sensor.boiler_compressor_power_output,sensor.boiler_hppower,5,0,1/10,143,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpmaxpower,compressor max power,uint8 (>=0<=100),%,true,number.boiler_compressor_max_power,number.boiler_hpmaxpower,5,0,1,144,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pvmaxcomp,pv compressor max power,uint8 (>=0<=25),kW,true,number.boiler_pv_compressor_max_power,number.boiler_pvmaxcomp,5,0,1/10,145,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,mandefrost,manual defrost,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_manual_defrost,sensor.boiler_mandefrost,5,0,1,84,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.nrg,energy,uint24,kWh,false,sensor.boiler_dhw_energy,sensor.boiler_dhw_nrg,5,9,1/100,0,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgheat,energy heating,uint24,kWh,false,sensor.boiler_energy_heating,sensor.boiler_nrgheat,5,0,1/100,87,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgcool,energy cooling,uint24,kWh,false,sensor.boiler_energy_cooling,sensor.boiler_nrgcool,5,0,1/100,89,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,metertotal,meter total,uint24,kWh,false,sensor.boiler_meter_total,sensor.boiler_metertotal,5,0,1/100,91,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,metercomp,meter compressor,uint24,kWh,false,sensor.boiler_meter_compressor,sensor.boiler_metercomp,5,0,1/100,93,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,metereheat,meter e-heater,uint24,kWh,false,sensor.boiler_meter_e-heater,sensor.boiler_metereheat,5,0,1/100,95,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/100,97,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,metercool,meter cooling,uint24,kWh,false,sensor.boiler_meter_cooling,sensor.boiler_metercool,5,0,1/100,99,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/100,2,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,uptimetotal,heatpump total uptime,time,minutes,false,sensor.boiler_heatpump_total_uptime,sensor.boiler_uptimetotal,5,0,1/60,101,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,uptimecontrol,total operating time heat,time,minutes,false,sensor.boiler_total_operating_time_heat,sensor.boiler_uptimecontrol,5,0,1/60,103,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,uptimecompheating,operating time compressor heating,time,minutes,false,sensor.boiler_operating_time_compressor_heating,sensor.boiler_uptimecompheating,5,0,1/60,105,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,uptimecompcooling,operating time compressor cooling,time,minutes,false,sensor.boiler_operating_time_compressor_cooling,sensor.boiler_uptimecompcooling,5,0,1/60,107,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.uptimecomp,operating time compressor,time,minutes,false,sensor.boiler_dhw_operating_time_compressor,sensor.boiler_dhw_uptimecomp,5,9,1/60,4,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,uptimecomppool,operating time compressor pool,time,minutes,false,sensor.boiler_operating_time_compressor_pool,sensor.boiler_uptimecomppool,5,0,1/60,109,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,totalcompstarts,total compressor control starts,uint24, ,false,sensor.boiler_total_compressor_control_starts,sensor.boiler_totalcompstarts,5,0,1,111,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatingstarts,heating control starts,uint24, ,false,sensor.boiler_heating_control_starts,sensor.boiler_heatingstarts,5,0,1,113,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,coolingstarts,cooling control starts,uint24, ,false,sensor.boiler_cooling_control_starts,sensor.boiler_coolingstarts,5,0,1,115,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.startshp,starts hp,uint24, ,false,sensor.boiler_dhw_starts_hp,sensor.boiler_dhw_startshp,5,9,1,6,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,poolstarts,pool control starts,uint24, ,false,sensor.boiler_pool_control_starts,sensor.boiler_poolstarts,5,0,1,117,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgconstotal,total energy consumption,uint24,kWh,false,sensor.boiler_total_energy_consumption,sensor.boiler_nrgconstotal,5,0,1,119,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgconscomptotal,total energy consumption compressor,uint24,kWh,false,sensor.boiler_total_energy_consumption_compressor,sensor.boiler_nrgconscomptotal,5,0,1,121,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgconscompheating,energy consumption compressor heating,uint24,kWh,false,sensor.boiler_energy_consumption_compressor_heating,sensor.boiler_nrgconscompheating,5,0,1,123,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.nrgconscomp,energy consumption compressor,uint24,kWh,false,sensor.boiler_dhw_energy_consumption_compressor,sensor.boiler_dhw_nrgconscomp,5,9,1,8,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgconscompcooling,energy consumption compressor cooling,uint24,kWh,false,sensor.boiler_energy_consumption_compressor_cooling,sensor.boiler_nrgconscompcooling,5,0,1,125,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgconscomppool,energy consumption compressor pool,uint24,kWh,false,sensor.boiler_energy_consumption_compressor_pool,sensor.boiler_nrgconscomppool,5,0,1,127,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxelecheatnrgconstotal,total aux elec. heater energy consumption,uint24,kWh,false,sensor.boiler_total_aux_elec._heater_energy_consumption,sensor.boiler_auxelecheatnrgconstotal,5,0,1,129,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxelecheatnrgconsheating,aux elec. heater energy consumption heating,uint24,kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_heating,sensor.boiler_auxelecheatnrgconsheating,5,0,1,131,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.auxelecheatnrgcons,aux elec. heater energy consumption,uint24,kWh,false,sensor.boiler_dhw_aux_elec._heater_energy_consumption,sensor.boiler_dhw_auxelecheatnrgcons,5,9,1,10,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxelecheatnrgconspool,aux elec. heater energy consumption pool,uint24,kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_pool,sensor.boiler_auxelecheatnrgconspool,5,0,1,133,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgsupptotal,total energy supplied,uint24,kWh,false,sensor.boiler_total_energy_supplied,sensor.boiler_nrgsupptotal,5,0,1,135,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgsuppheating,total energy supplied heating,uint24,kWh,false,sensor.boiler_total_energy_supplied_heating,sensor.boiler_nrgsuppheating,5,0,1,137,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.nrgsupp,total energy warm supplied,uint24,kWh,false,sensor.boiler_dhw_total_energy_warm_supplied,sensor.boiler_dhw_nrgsupp,5,9,1,12,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgsuppcooling,total energy supplied cooling,uint24,kWh,false,sensor.boiler_total_energy_supplied_cooling,sensor.boiler_nrgsuppcooling,5,0,1,139,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,nrgsupppool,total energy supplied pool,uint24,kWh,false,sensor.boiler_total_energy_supplied_pool,sensor.boiler_nrgsupppool,5,0,1,141,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hppower,compressor power output,uint16,kW,false,sensor.boiler_compressor_power_output,sensor.boiler_hppower,5,0,1/10,143,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpmaxpower,compressor max power,uint8 (>=0<=0),%,true,number.boiler_compressor_max_power,number.boiler_hpmaxpower,5,0,1,144,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pvmaxcomp,pv compressor max power,uint8 (>=0<=0),kW,true,number.boiler_pv_compressor_max_power,number.boiler_pvmaxcomp,5,0,1/10,145,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,powerreduction,power reduction,uint8 (>=30<=60),%,true,number.boiler_power_reduction,number.boiler_powerreduction,5,0,10,146,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpsetdiffpress,set differential pressure,uint8 (>=150<=750),mbar,true,number.boiler_set_differential_pressure,number.boiler_hpsetdiffpress,5,0,50,147,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpcompon,hp compressor,boolean, ,false,binary_sensor.boiler_hp_compressor,binary_sensor.boiler_hpcompon,5,0,1,148,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpactivity,compressor activity,enum [off\|heating\|cooling\|hot water\|pool\|pool heating\|defrost\|compressor alarm], ,false,sensor.boiler_compressor_activity,sensor.boiler_hpactivity,5,0,1,149,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpbrinepumpspd,brine pump speed,uint8 (>=0<=100),%,false,sensor.boiler_brine_pump_speed,sensor.boiler_hpbrinepumpspd,5,0,1,150,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpbrinepumpspd,brine pump speed,uint8,%,false,sensor.boiler_brine_pump_speed,sensor.boiler_hpbrinepumpspd,5,0,1,150,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpswitchvalve,switch valve,boolean, ,false,binary_sensor.boiler_switch_valve,binary_sensor.boiler_hpswitchvalve,5,0,1,151,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpcompspd,compressor speed,uint8 (>=0<=100),%,false,sensor.boiler_compressor_speed,sensor.boiler_hpcompspd,5,0,1,152,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptargetspd,compressor target speed,uint8 (>=0<=100),%,false,sensor.boiler_compressor_target_speed,sensor.boiler_hptargetspd,5,0,1,153,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpcircspd,circulation pump speed,uint8 (>=0<=100),%,false,sensor.boiler_circulation_pump_speed,sensor.boiler_hpcircspd,5,0,1,154,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,recvalve,receiver valve VR0,uint8 (>=0<=100),%,false,sensor.boiler_receiver_valve_VR0,sensor.boiler_recvalve,5,0,1,155,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,expvalve,expansion valve VR1,uint8 (>=0<=100),%,false,sensor.boiler_expansion_valve_VR1,sensor.boiler_expvalve,5,0,1,156,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpbrinein,brine in/evaporator,int16 (>=-3199<=3199),C,false,sensor.boiler_brine_in/evaporator,sensor.boiler_hpbrinein,5,0,1/10,157,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpbrineout,brine out/condenser,int16 (>=-3199<=3199),C,false,sensor.boiler_brine_out/condenser,sensor.boiler_hpbrineout,5,0,1/10,158,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptc0,heat carrier return (TC0),int16 (>=-3199<=3199),C,false,sensor.boiler_heat_carrier_return_(TC0),sensor.boiler_hptc0,5,0,1/10,159,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptc1,heat carrier forward (TC1),int16 (>=-3199<=3199),C,false,sensor.boiler_heat_carrier_forward_(TC1),sensor.boiler_hptc1,5,0,1/10,160,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptc3,condenser temperature (TC3),int16 (>=-3199<=3199),C,false,sensor.boiler_condenser_temperature_(TC3),sensor.boiler_hptc3,5,0,1/10,161,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr1,compressor temperature (TR1),int16 (>=-3199<=3199),C,false,sensor.boiler_compressor_temperature_(TR1),sensor.boiler_hptr1,5,0,1/10,162,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16 (>=-3199<=3199),C,false,sensor.boiler_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.boiler_hptr3,5,0,1/10,163,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr4,evaporator inlet temperature (TR4),int16 (>=-3199<=3199),C,false,sensor.boiler_evaporator_inlet_temperature_(TR4),sensor.boiler_hptr4,5,0,1/10,164,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr5,compressor inlet temperature (TR5),int16 (>=-3199<=3199),C,false,sensor.boiler_compressor_inlet_temperature_(TR5),sensor.boiler_hptr5,5,0,1/10,165,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr6,compressor outlet temperature (TR6),int16 (>=-3199<=3199),C,false,sensor.boiler_compressor_outlet_temperature_(TR6),sensor.boiler_hptr6,5,0,1/10,166,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr7,refrigerant temperature gas side (condenser input) (TR7),int16 (>=-3199<=3199),C,false,sensor.boiler_refrigerant_temperature_gas_side_(condenser_input)_(TR7),sensor.boiler_hptr7,5,0,1/10,167,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptl2,air inlet temperature (TL2),int16 (>=-3199<=3199),C,false,sensor.boiler_air_inlet_temperature_(TL2),sensor.boiler_hptl2,5,0,1/10,168,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hppl1,low pressure side temperature (PL1),int16 (>=-3199<=3199),C,false,sensor.boiler_low_pressure_side_temperature_(PL1),sensor.boiler_hppl1,5,0,1/10,169,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpph1,high pressure side temperature (PH1),int16 (>=-3199<=3199),C,false,sensor.boiler_high_pressure_side_temperature_(PH1),sensor.boiler_hpph1,5,0,1/10,170,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpta4,drain pan temp (TA4),int16 (>=-3199<=3199),C,false,sensor.boiler_drain_pan_temp_(TA4),sensor.boiler_hpta4,5,0,1/10,171,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptw1,reservoir temp (TW1),int16 (>=-3199<=3199),C,false,sensor.boiler_reservoir_temp_(TW1),sensor.boiler_hptw1,5,0,1/10,172,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,poolsettemp,pool set temperature,uint8 (>=0<=127),C,true,number.boiler_pool_set_temperature,number.boiler_poolsettemp,5,0,1/2,173,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpcompspd,compressor speed,uint8,%,false,sensor.boiler_compressor_speed,sensor.boiler_hpcompspd,5,0,1,152,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptargetspd,compressor target speed,uint8,%,false,sensor.boiler_compressor_target_speed,sensor.boiler_hptargetspd,5,0,1,153,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpcircspd,circulation pump speed,uint8,%,false,sensor.boiler_circulation_pump_speed,sensor.boiler_hpcircspd,5,0,1,154,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,recvalve,receiver valve VR0,uint8,%,false,sensor.boiler_receiver_valve_VR0,sensor.boiler_recvalve,5,0,1,155,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,expvalve,expansion valve VR1,uint8,%,false,sensor.boiler_expansion_valve_VR1,sensor.boiler_expvalve,5,0,1,156,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpbrinein,brine in/evaporator,int16,C,false,sensor.boiler_brine_in/evaporator,sensor.boiler_hpbrinein,5,0,1/10,157,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpbrineout,brine out/condenser,int16,C,false,sensor.boiler_brine_out/condenser,sensor.boiler_hpbrineout,5,0,1/10,158,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptc0,heat carrier return (TC0),int16,C,false,sensor.boiler_heat_carrier_return_(TC0),sensor.boiler_hptc0,5,0,1/10,159,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptc1,heat carrier forward (TC1),int16,C,false,sensor.boiler_heat_carrier_forward_(TC1),sensor.boiler_hptc1,5,0,1/10,160,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptc3,condenser temperature (TC3),int16,C,false,sensor.boiler_condenser_temperature_(TC3),sensor.boiler_hptc3,5,0,1/10,161,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr1,compressor temperature (TR1),int16,C,false,sensor.boiler_compressor_temperature_(TR1),sensor.boiler_hptr1,5,0,1/10,162,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16,C,false,sensor.boiler_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.boiler_hptr3,5,0,1/10,163,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr4,evaporator inlet temperature (TR4),int16,C,false,sensor.boiler_evaporator_inlet_temperature_(TR4),sensor.boiler_hptr4,5,0,1/10,164,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr5,compressor inlet temperature (TR5),int16,C,false,sensor.boiler_compressor_inlet_temperature_(TR5),sensor.boiler_hptr5,5,0,1/10,165,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr6,compressor outlet temperature (TR6),int16,C,false,sensor.boiler_compressor_outlet_temperature_(TR6),sensor.boiler_hptr6,5,0,1/10,166,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptr7,refrigerant temperature gas side (condenser input) (TR7),int16,C,false,sensor.boiler_refrigerant_temperature_gas_side_(condenser_input)_(TR7),sensor.boiler_hptr7,5,0,1/10,167,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptl2,air inlet temperature (TL2),int16,C,false,sensor.boiler_air_inlet_temperature_(TL2),sensor.boiler_hptl2,5,0,1/10,168,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hppl1,low pressure side temperature (PL1),int16,C,false,sensor.boiler_low_pressure_side_temperature_(PL1),sensor.boiler_hppl1,5,0,1/10,169,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpph1,high pressure side temperature (PH1),int16,C,false,sensor.boiler_high_pressure_side_temperature_(PH1),sensor.boiler_hpph1,5,0,1/10,170,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpta4,drain pan temp (TA4),int16,C,false,sensor.boiler_drain_pan_temp_(TA4),sensor.boiler_hpta4,5,0,1/10,171,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hptw1,reservoir temp (TW1),int16,C,false,sensor.boiler_reservoir_temp_(TW1),sensor.boiler_hptw1,5,0,1/10,172,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,poolsettemp,pool set temperature,uint8 (>=0<=0),C,true,number.boiler_pool_set_temperature,number.boiler_poolsettemp,5,0,1/2,173,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin1,input 1 state,boolean, ,false,binary_sensor.boiler_input_1_state,binary_sensor.boiler_hpin1,5,0,1,174,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin1opt,input 1 options,string, ,true,sensor.boiler_input_1_options,sensor.boiler_hpin1opt,5,0,1,175,8
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin1opt,input 1 options,string (>=0<=0), ,true,sensor.boiler_input_1_options,sensor.boiler_hpin1opt,5,0,1,175,8
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin2,input 2 state,boolean, ,false,binary_sensor.boiler_input_2_state,binary_sensor.boiler_hpin2,5,0,1,183,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin2opt,input 2 options,string, ,true,sensor.boiler_input_2_options,sensor.boiler_hpin2opt,5,0,1,184,8
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin2opt,input 2 options,string (>=0<=0), ,true,sensor.boiler_input_2_options,sensor.boiler_hpin2opt,5,0,1,184,8
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin3,input 3 state,boolean, ,false,binary_sensor.boiler_input_3_state,binary_sensor.boiler_hpin3,5,0,1,192,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin3opt,input 3 options,string, ,true,sensor.boiler_input_3_options,sensor.boiler_hpin3opt,5,0,1,193,8
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin3opt,input 3 options,string (>=0<=0), ,true,sensor.boiler_input_3_options,sensor.boiler_hpin3opt,5,0,1,193,8
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin4,input 4 state,boolean, ,false,binary_sensor.boiler_input_4_state,binary_sensor.boiler_hpin4,5,0,1,201,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin4opt,input 4 options,string, ,true,sensor.boiler_input_4_options,sensor.boiler_hpin4opt,5,0,1,202,8
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,maxheatcomp,heat limit compressor,enum [0 kW\|3 kW\|6 kW\|9 kW], ,true,select.boiler_heat_limit_compressor,select.boiler_maxheatcomp,5,0,1,210,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,maxheatheat,heat limit heating,enum [3 kW\|6 kW\|9 kW], ,true,select.boiler_heat_limit_heating,select.boiler_maxheatheat,5,0,1,211,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.maxheat,heat limit,enum [3 kW\|6 kW\|9 kW], ,true,select.boiler_dhw_heat_limit,select.boiler_dhw_maxheat,5,9,1,14,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheatersource,aux heater source,enum [not installed\|electric heater\|exclusive\|parallel\|hybrid], ,true,select.boiler_aux_heater_source,select.boiler_auxheatersource,5,0,1,212,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pvcooling,cooling only with PV,boolean, ,true,switch.boiler_cooling_only_with_PV,switch.boiler_pvcooling,5,0,1,213,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheateronly,aux heater only,boolean, ,true,switch.boiler_aux_heater_only,switch.boiler_auxheateronly,5,0,1,214,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheateroff,disable aux heater,boolean, ,true,switch.boiler_disable_aux_heater,switch.boiler_auxheateroff,5,0,1,215,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpin4opt,input 4 options,string (>=0<=0), ,true,sensor.boiler_input_4_options,sensor.boiler_hpin4opt,5,0,1,202,8
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,maxheatcomp,heat limit compressor,enum [0 kW\|3 kW\|6 kW\|9 kW] (>=0<=0), ,true,select.boiler_heat_limit_compressor,select.boiler_maxheatcomp,5,0,1,210,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,maxheatheat,heat limit heating,enum [3 kW\|6 kW\|9 kW] (>=0<=0), ,true,select.boiler_heat_limit_heating,select.boiler_maxheatheat,5,0,1,211,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.maxheat,heat limit,enum [3 kW\|6 kW\|9 kW] (>=0<=0), ,true,select.boiler_dhw_heat_limit,select.boiler_dhw_maxheat,5,9,1,14,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheatersource,aux heater source,enum [not installed\|electric heater\|exclusive\|parallel\|hybrid] (>=0<=0), ,true,select.boiler_aux_heater_source,select.boiler_auxheatersource,5,0,1,212,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,pvcooling,cooling only with PV,boolean (>=0<=0), ,true,switch.boiler_cooling_only_with_PV,switch.boiler_pvcooling,5,0,1,213,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheateronly,aux heater only,boolean (>=0<=0), ,true,switch.boiler_aux_heater_only,switch.boiler_auxheateronly,5,0,1,214,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheateroff,disable aux heater,boolean (>=0<=0), ,true,switch.boiler_disable_aux_heater,switch.boiler_auxheateroff,5,0,1,215,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheaterstatus,aux heater status,enum [off\|heating\|cooling\|hot water\|pool\|pool heating\|defrost\|compressor alarm], ,false,sensor.boiler_aux_heater_status,sensor.boiler_auxheaterstatus,5,0,1,216,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheaterlevel,aux heater level,uint8 (>=0<=100),%,false,sensor.boiler_aux_heater_level,sensor.boiler_auxheaterlevel,5,0,1,217,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheaterlevel,aux heater level,uint8,%,false,sensor.boiler_aux_heater_level,sensor.boiler_auxheaterlevel,5,0,1,217,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheaterdelay,aux heater on delay,uint16 (>=10<=1000),K*min,true,number.boiler_aux_heater_on_delay,number.boiler_auxheaterdelay,5,0,10,218,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxmaxlimit,aux heater max limit,uint8 (>=0<=10),K,true,number.boiler_aux_heater_max_limit,number.boiler_auxmaxlimit,5,0,1/10,219,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxlimitstart,aux heater limit start,uint8 (>=0<=10),K,true,number.boiler_aux_heater_limit_start,number.boiler_auxlimitstart,5,0,1/10,220,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheatrmode,aux heater mode,enum [eco\|comfort], ,true,select.boiler_aux_heater_mode,select.boiler_auxheatrmode,5,0,1,221,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheatrmode,aux heater mode,enum [eco\|comfort] (>=0<=0), ,true,select.boiler_aux_heater_mode,select.boiler_auxheatrmode,5,0,1,221,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hphystheat,on/off hyst heat,uint16 (>=50<=1500),K*min,true,number.boiler_on/off_hyst_heat,number.boiler_hphystheat,5,0,5,222,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hphystcool,on/off hyst cool,uint16 (>=50<=1500),K*min,true,number.boiler_on/off_hyst_cool,number.boiler_hphystcool,5,0,5,223,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hphystpool,on/off hyst pool,uint16 (>=50<=1500),K*min,true,number.boiler_on/off_hyst_pool,number.boiler_hphystpool,5,0,5,224,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,silentmode,silent mode,enum [off\|auto\|on], ,true,select.boiler_silent_mode,select.boiler_silentmode,5,0,1,225,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,silentfrom,silent mode from,uint8 (>=0<=3810),minutes,true,number.boiler_silent_mode_from,number.boiler_silentfrom,5,0,15,226,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,silentto,silent mode to,uint8 (>=0<=3810),minutes,true,number.boiler_silent_mode_to,number.boiler_silentto,5,0,15,227,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,mintempsilent,min outside temp for silent mode,int8 (>=-126<=126),C,true,number.boiler_min_outside_temp_for_silent_mode,number.boiler_mintempsilent,5,0,1,228,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,tempparmode,outside temp parallel mode,int8 (>=-126<=126),C,true,number.boiler_outside_temp_parallel_mode,number.boiler_tempparmode,5,0,1,229,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheatmix,aux heater mixing valve,int8 (>=-100<=100),%,false,sensor.boiler_aux_heater_mixing_valve,sensor.boiler_auxheatmix,5,0,1,230,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,silentmode,silent mode,enum [off\|auto\|on] (>=0<=0), ,true,select.boiler_silent_mode,select.boiler_silentmode,5,0,1,225,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,silentfrom,silent mode from,uint8 (>=0<=0),minutes,true,number.boiler_silent_mode_from,number.boiler_silentfrom,5,0,15,226,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,silentto,silent mode to,uint8 (>=0<=0),minutes,true,number.boiler_silent_mode_to,number.boiler_silentto,5,0,15,227,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,mintempsilent,min outside temp for silent mode,int8 (>=0<=0),C,true,number.boiler_min_outside_temp_for_silent_mode,number.boiler_mintempsilent,5,0,1,228,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,tempparmode,outside temp parallel mode,int8 (>=0<=0),C,true,number.boiler_outside_temp_parallel_mode,number.boiler_tempparmode,5,0,1,229,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,auxheatmix,aux heater mixing valve,int8,%,false,sensor.boiler_aux_heater_mixing_valve,sensor.boiler_auxheatmix,5,0,1,230,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,tempdiffheat,temp diff TC3/TC0 heat,uint8 (>=2<=10),K,true,number.boiler_temp_diff_TC3/TC0_heat,number.boiler_tempdiffheat,5,0,1/10,231,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,tempdiffcool,temp diff TC3/TC0 cool,uint8 (>=2<=10),K,true,number.boiler_temp_diff_TC3/TC0_cool,number.boiler_tempdiffcool,5,0,1/10,232,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,vpcooling,valve/pump cooling,boolean, ,true,switch.boiler_valve/pump_cooling,switch.boiler_vpcooling,5,0,1,233,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatcable,heating cable,boolean, ,true,switch.boiler_heating_cable,switch.boiler_heatcable,5,0,1,234,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,vc0valve,VC0 valve,boolean, ,true,switch.boiler_VC0_valve,switch.boiler_vc0valve,5,0,1,235,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,primepump,primary heatpump,boolean, ,true,switch.boiler_primary_heatpump,switch.boiler_primepump,5,0,1,236,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,primepumpmod,primary heatpump modulation,uint8 (>=0<=100),%,true,number.boiler_primary_heatpump_modulation,number.boiler_primepumpmod,5,0,1,237,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hp3way,3-way valve,boolean, ,true,switch.boiler_3-way_valve,switch.boiler_hp3way,5,0,1,238,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,elheatstep1,el. heater step 1,boolean, ,true,switch.boiler_el._heater_step_1,switch.boiler_elheatstep1,5,0,1,239,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,elheatstep2,el. heater step 2,boolean, ,true,switch.boiler_el._heater_step_2,switch.boiler_elheatstep2,5,0,1,240,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,elheatstep3,el. heater step 3,boolean, ,true,switch.boiler_el._heater_step_3,switch.boiler_elheatstep3,5,0,1,241,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,vpcooling,valve/pump cooling,boolean (>=0<=0), ,true,switch.boiler_valve/pump_cooling,switch.boiler_vpcooling,5,0,1,233,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,heatcable,heating cable,boolean (>=0<=0), ,true,switch.boiler_heating_cable,switch.boiler_heatcable,5,0,1,234,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,vc0valve,VC0 valve,boolean (>=0<=0), ,true,switch.boiler_VC0_valve,switch.boiler_vc0valve,5,0,1,235,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,primepump,primary heatpump,boolean (>=0<=0), ,true,switch.boiler_primary_heatpump,switch.boiler_primepump,5,0,1,236,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,primepumpmod,primary heatpump modulation,uint8 (>=0<=0),%,true,number.boiler_primary_heatpump_modulation,number.boiler_primepumpmod,5,0,1,237,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hp3way,3-way valve,boolean (>=0<=0), ,true,switch.boiler_3-way_valve,switch.boiler_hp3way,5,0,1,238,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,elheatstep1,el. heater step 1,boolean (>=0<=0), ,true,switch.boiler_el._heater_step_1,switch.boiler_elheatstep1,5,0,1,239,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,elheatstep2,el. heater step 2,boolean (>=0<=0), ,true,switch.boiler_el._heater_step_2,switch.boiler_elheatstep2,5,0,1,240,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,elheatstep3,el. heater step 3,boolean (>=0<=0), ,true,switch.boiler_el._heater_step_3,switch.boiler_elheatstep3,5,0,1,241,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpea0,condensate reservoir heating (EA0),boolean, ,false,binary_sensor.boiler_condensate_reservoir_heating_(EA0),binary_sensor.boiler_hpea0,5,0,1,242,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hppumpmode,primary heatpump mode,enum [auto\|continuous], ,true,select.boiler_primary_heatpump_mode,select.boiler_hppumpmode,5,0,1,243,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hppumpmode,primary heatpump mode,enum [auto\|continuous] (>=0<=0), ,true,select.boiler_primary_heatpump_mode,select.boiler_hppumpmode,5,0,1,243,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,fan,fan,uint8 (>=20<=100),%,true,number.boiler_fan,number.boiler_fan,5,0,1,244,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,fanspd,fan speed,uint8 (>=0<=100),%,false,sensor.boiler_fan_speed,sensor.boiler_fanspd,5,0,1,245,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,shutdown,shutdown,cmd [off\|on], ,true,sensor.boiler_shutdown,sensor.boiler_shutdown,5,0,1,246,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpcurrpower,compressor current power,uint16 (>=0<=31999),W,false,sensor.boiler_compressor_current_power,sensor.boiler_hpcurrpower,5,0,1,247,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hppowerlimit,power limit,uint16 (>=0<=31999),W,true,number.boiler_power_limit,number.boiler_hppowerlimit,5,0,1,248,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.alternatingop,alternating operation,boolean, ,true,switch.boiler_dhw_alternating_operation,switch.boiler_dhw_alternatingop,5,9,1,15,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,fanspd,fan speed,uint8,%,false,sensor.boiler_fan_speed,sensor.boiler_fanspd,5,0,1,245,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,shutdown,shutdown,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_shutdown,sensor.boiler_shutdown,5,0,1,246,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hpcurrpower,compressor current power,uint16,W,false,sensor.boiler_compressor_current_power,sensor.boiler_hpcurrpower,5,0,1,247,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,hppowerlimit,power limit,uint16 (>=0<=0),W,true,number.boiler_power_limit,number.boiler_hppowerlimit,5,0,1,248,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.alternatingop,alternating operation,boolean (>=0<=0), ,true,switch.boiler_dhw_alternating_operation,switch.boiler_dhw_alternatingop,5,9,1,15,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.altopprioheat,prioritise heating during dhw,uint8 (>=20<=120),minutes,true,number.boiler_dhw_prioritise_heating_during_dhw,number.boiler_dhw_altopprioheat,5,9,1,16,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.altopprio,prioritise dhw during heating,uint8 (>=30<=120),minutes,true,number.boiler_dhw_prioritise_dhw_during_heating,number.boiler_dhw_altopprio,5,9,1,17,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.comfoff,comfort switch off,uint8 (>=15<=65),C,true,number.boiler_dhw_comfort_switch_off,number.boiler_dhw_comfoff,5,9,1,18,1
@@ -168,2552 +168,2552 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.comfdiff,comfort diff,uint8 (>=4<=15),K,true,number.boiler_dhw_comfort_diff,number.boiler_dhw_comfdiff,5,9,1,21,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.ecodiff,eco diff,uint8 (>=4<=15),K,true,number.boiler_dhw_eco_diff,number.boiler_dhw_ecodiff,5,9,1,22,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.ecoplusdiff,eco+ diff,uint8 (>=4<=15),K,true,number.boiler_dhw_eco+_diff,number.boiler_dhw_ecoplusdiff,5,9,1,23,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.comfstop,comfort stop temp,uint8 (>=0<=254),C,true,number.boiler_dhw_comfort_stop_temp,number.boiler_dhw_comfstop,5,9,1,24,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.ecostop,eco stop temp,uint8 (>=0<=254),C,true,number.boiler_dhw_eco_stop_temp,number.boiler_dhw_ecostop,5,9,1,25,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.ecoplusstop,eco+ stop temp,uint8 (>=0<=254),C,true,number.boiler_dhw_eco+_stop_temp,number.boiler_dhw_ecoplusstop,5,9,1,26,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.hpcircpump,circulation pump available during dhw,boolean, ,true,switch.boiler_dhw_circulation_pump_available_during_dhw,switch.boiler_dhw_hpcircpump,5,9,1,27,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.comfstop,comfort stop temp,uint8 (>=0<=0),C,true,number.boiler_dhw_comfort_stop_temp,number.boiler_dhw_comfstop,5,9,1,24,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.ecostop,eco stop temp,uint8 (>=0<=0),C,true,number.boiler_dhw_eco_stop_temp,number.boiler_dhw_ecostop,5,9,1,25,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.ecoplusstop,eco+ stop temp,uint8 (>=0<=0),C,true,number.boiler_dhw_eco+_stop_temp,number.boiler_dhw_ecoplusstop,5,9,1,26,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.hpcircpump,circulation pump available during dhw,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available_during_dhw,switch.boiler_dhw_hpcircpump,5,9,1,27,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Greenstar 2000",boiler,11,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Greenstar 2000",boiler,11,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Greenstar 2000",boiler,11,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"CS5800i, CS6800i, WLW176i, WLW186i",boiler,8,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Greenstar 2000",boiler,11,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Greenstar 2000",boiler,11,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Greenstar 2000",boiler,11,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Greenstar 2000",boiler,11,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Greenstar 2000",boiler,11,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Greenstar 2000",boiler,11,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Greenstar 2000",boiler,11,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Greenstar 2000",boiler,11,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Greenstar 2000",boiler,11,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Greenstar 2000",boiler,11,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Greenstar 2000",boiler,11,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Greenstar 2000",boiler,11,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Greenstar 2000",boiler,11,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Greenstar 2000",boiler,11,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Greenstar 2000",boiler,11,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Greenstar 2000",boiler,11,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Greenstar 2000",boiler,11,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Greenstar 2000",boiler,11,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Greenstar 2000",boiler,11,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Greenstar 2000",boiler,11,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Greenstar 2000",boiler,11,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Greenstar 2000",boiler,11,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Greenstar 2000",boiler,11,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Greenstar 2000",boiler,11,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Greenstar 2000",boiler,11,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Greenstar 2000",boiler,11,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Greenstar 2000",boiler,11,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Greenstar 2000",boiler,11,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Greenstar 2000",boiler,11,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Greenstar 2000",boiler,11,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Greenstar 2000",boiler,11,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Greenstar 2000",boiler,11,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Greenstar 2000",boiler,11,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Greenstar 2000",boiler,11,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Greenstar 2000",boiler,11,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Greenstar 2000",boiler,11,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Greenstar 2000",boiler,11,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Greenstar 2000",boiler,11,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Greenstar 2000",boiler,11,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Greenstar 2000",boiler,11,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Greenstar 2000",boiler,11,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Greenstar 2000",boiler,11,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Greenstar 2000",boiler,11,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Greenstar 2000",boiler,11,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Greenstar 2000",boiler,11,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Greenstar 2000",boiler,11,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Greenstar 2000",boiler,11,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Greenstar 2000",boiler,11,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Greenstar 2000",boiler,11,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Greenstar 2000",boiler,11,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Greenstar 2000",boiler,11,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Greenstar 2000",boiler,11,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Greenstar 2000",boiler,11,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Greenstar 2000",boiler,11,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Greenstar 2000",boiler,11,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Greenstar 2000",boiler,11,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Greenstar 2000",boiler,11,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Greenstar 2000",boiler,11,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Greenstar 2000",boiler,11,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Greenstar 2000",boiler,11,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Greenstar 2000",boiler,11,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Greenstar 2000",boiler,11,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Greenstar 2000",boiler,11,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Greenstar 2000",boiler,11,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Greenstar 2000",boiler,11,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Greenstar 2000",boiler,11,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Greenstar 2000",boiler,11,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Greenstar 2000",boiler,11,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Greenstar 2000",boiler,11,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Greenstar 2000",boiler,11,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Greenstar 2000",boiler,11,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Greenstar 2000",boiler,11,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Greenstar 2000",boiler,11,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Greenstar 2000",boiler,11,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Greenstar 2000",boiler,11,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Greenstar 2000",boiler,11,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Greenstar 2000",boiler,11,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Greenstar 2000",boiler,11,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Greenstar 2000",boiler,11,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Greenstar 2000",boiler,11,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Greenstar 2000",boiler,11,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Greenstar 2000",boiler,11,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Greenstar 2000",boiler,11,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Greenstar 2000",boiler,11,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Greenstar 2000",boiler,11,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Greenstar 2000",boiler,11,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Greenstar 2000",boiler,11,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Greenstar 2000",boiler,11,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Greenstar 2000",boiler,11,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Greenstar 2000",boiler,11,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Greenstar 2000",boiler,11,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Greenstar 2000",boiler,11,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Greenstar 2000",boiler,11,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Greenstar 2000",boiler,11,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Greenstar 2000",boiler,11,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Greenstar 2000",boiler,11,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Greenstar 2000",boiler,11,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Greenstar 2000",boiler,11,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Greenstar 2000",boiler,11,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Greenstar 2000",boiler,11,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Greenstar 2000",boiler,11,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Greenstar 2000",boiler,11,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Greenstar 2000",boiler,11,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Greenstar 2000",boiler,11,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Greenstar 2000",boiler,11,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Greenstar 2000",boiler,11,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Greenstar 2000",boiler,11,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Greenstar 2000",boiler,11,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Greenstar 2000",boiler,11,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Greenstar 2000",boiler,11,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Greenstar 2000",boiler,11,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Greenstar 2000",boiler,11,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Greenstar 2000",boiler,11,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Greenstar 2000",boiler,11,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Greenstar 2000",boiler,11,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Greenstar 2000",boiler,11,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Greenstar 2000",boiler,11,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Greenstar 2000",boiler,11,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Greenstar 2000",boiler,11,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Greenstar 2000",boiler,11,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Greenstar 2000",boiler,11,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Greenstar 2000",boiler,11,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Greenstar 2000",boiler,11,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Greenstar 2000",boiler,11,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Greenstar 2000",boiler,11,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Greenstar 2000",boiler,11,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Greenstar 2000",boiler,11,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Greenstar 2000",boiler,11,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Greenstar 2000",boiler,11,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Greenstar 2000",boiler,11,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Greenstar 2000",boiler,11,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Greenstar 2000",boiler,11,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Greenstar 2000",boiler,11,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Greenstar 2000",boiler,11,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Greenstar 2000",boiler,11,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Greenstar 2000",boiler,11,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Greenstar 2000",boiler,11,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Greenstar 2000",boiler,11,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Greenstar 2000",boiler,11,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Greenstar 2000",boiler,11,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Greenstar 2000",boiler,11,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Greenstar 2000",boiler,11,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Greenstar 2000",boiler,11,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Greenstar 2000",boiler,11,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Greenstar 2000",boiler,11,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Greenstar 2000",boiler,11,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Greenstar 2000",boiler,11,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Greenstar 2000",boiler,11,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Greenstar 2000",boiler,11,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Greenstar 2000",boiler,11,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Greenstar 2000",boiler,11,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Greenstar 2000",boiler,11,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Greenstar 2000",boiler,11,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Greenstar 2000",boiler,11,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Greenstar 2000",boiler,11,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Greenstar 2000",boiler,11,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Greenstar 2000",boiler,11,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Greenstar 2000",boiler,11,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Greenstar 2000",boiler,11,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Greenstar 2000",boiler,11,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Greenstar 2000",boiler,11,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Greenstar 2000",boiler,11,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Greenstar 2000",boiler,11,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Greenstar 2000",boiler,11,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Greenstar 2000",boiler,11,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Greenstar 2000",boiler,11,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Greenstar 2000",boiler,11,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Greenstar 2000",boiler,11,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Greenstar 2000",boiler,11,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Greenstar 2000",boiler,11,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Greenstar 2000",boiler,11,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Greenstar 2000",boiler,11,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Greenstar 2000",boiler,11,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Greenstar 2000",boiler,11,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Greenstar 2000",boiler,11,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Greenstar 2000",boiler,11,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Greenstar 2000",boiler,11,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Greenstar 2000",boiler,11,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Greenstar 2000",boiler,11,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Greenstar 2000",boiler,11,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Greenstar 2000",boiler,11,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Greenstar 2000",boiler,11,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Greenstar 2000",boiler,11,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Greenstar 2000",boiler,11,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Greenstar 2000",boiler,11,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Greenstar 2000",boiler,11,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Greenstar 2000",boiler,11,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Greenstar 2000",boiler,11,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Greenstar 2000",boiler,11,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"C1200W",boiler,12,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"C1200W",boiler,12,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"C1200W",boiler,12,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"C1200W",boiler,12,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"C1200W",boiler,12,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"C1200W",boiler,12,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "C1200W",boiler,12,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "C1200W",boiler,12,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "C1200W",boiler,12,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"C1200W",boiler,12,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"C1200W",boiler,12,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"C1200W",boiler,12,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"C1200W",boiler,12,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"C1200W",boiler,12,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"C1200W",boiler,12,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"C1200W",boiler,12,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"C1200W",boiler,12,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"C1200W",boiler,12,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"C1200W",boiler,12,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"C1200W",boiler,12,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"C1200W",boiler,12,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"C1200W",boiler,12,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"C1200W",boiler,12,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"C1200W",boiler,12,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"C1200W",boiler,12,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"C1200W",boiler,12,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"C1200W",boiler,12,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "C1200W",boiler,12,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "C1200W",boiler,12,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"C1200W",boiler,12,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"C1200W",boiler,12,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "C1200W",boiler,12,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "C1200W",boiler,12,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "C1200W",boiler,12,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"C1200W",boiler,12,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"C1200W",boiler,12,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "C1200W",boiler,12,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "C1200W",boiler,12,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"C1200W",boiler,12,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"C1200W",boiler,12,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"C1200W",boiler,12,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"C1200W",boiler,12,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "C1200W",boiler,12,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "C1200W",boiler,12,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "C1200W",boiler,12,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "C1200W",boiler,12,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"C1200W",boiler,12,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"C1200W",boiler,12,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "C1200W",boiler,12,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "C1200W",boiler,12,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "C1200W",boiler,12,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"C1200W",boiler,12,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"C1200W",boiler,12,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "C1200W",boiler,12,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"C1200W",boiler,12,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"C1200W",boiler,12,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "C1200W",boiler,12,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "C1200W",boiler,12,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"C1200W",boiler,12,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"C1200W",boiler,12,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"C1200W",boiler,12,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"C1200W",boiler,12,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"C1200W",boiler,12,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"C1200W",boiler,12,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"C1200W",boiler,12,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"C1200W",boiler,12,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "C1200W",boiler,12,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "C1200W",boiler,12,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "C1200W",boiler,12,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"C1200W",boiler,12,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"C1200W",boiler,12,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"C1200W",boiler,12,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"C1200W",boiler,12,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"C1200W",boiler,12,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"C1200W",boiler,12,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"C1200W",boiler,12,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"C1200W",boiler,12,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"C1200W",boiler,12,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"C1200W",boiler,12,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"C1200W",boiler,12,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"C1200W",boiler,12,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"C1200W",boiler,12,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"C1200W",boiler,12,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "C1200W",boiler,12,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "C1200W",boiler,12,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"C1200W",boiler,12,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"C1200W",boiler,12,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "C1200W",boiler,12,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"C1200W",boiler,12,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"C1200W",boiler,12,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"C1200W",boiler,12,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"C1200W",boiler,12,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"C1200W",boiler,12,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"C1200W",boiler,12,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"C1200W",boiler,12,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"C1200W",boiler,12,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "C1200W",boiler,12,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"C1200W",boiler,12,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"C1200W",boiler,12,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"C1200W",boiler,12,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"C1200W",boiler,12,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "C1200W",boiler,12,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"C1200W",boiler,12,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"C1200W",boiler,12,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"C1200W",boiler,12,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"C1200W",boiler,12,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"C1200W",boiler,12,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"C1200W",boiler,12,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"C1200W",boiler,12,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"C1200W",boiler,12,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"C1200W",boiler,12,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"C1200W",boiler,12,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"C1200W",boiler,12,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"C1200W",boiler,12,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"C1200W",boiler,12,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"C1200W",boiler,12,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"C1200W",boiler,12,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"C1200W",boiler,12,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"C1200W",boiler,12,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"C1200W",boiler,12,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"C1200W",boiler,12,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"C1200W",boiler,12,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"C1200W",boiler,12,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"C1200W",boiler,12,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"C1200W",boiler,12,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"C1200W",boiler,12,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"C1200W",boiler,12,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"C1200W",boiler,12,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"C1200W",boiler,12,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"C1200W",boiler,12,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"C1200W",boiler,12,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"C1200W",boiler,12,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "C1200W",boiler,12,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"C1200W",boiler,12,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"C1200W",boiler,12,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"C1200W",boiler,12,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"C1200W",boiler,12,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "C1200W",boiler,12,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"C1200W",boiler,12,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"C1200W",boiler,12,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "C1200W",boiler,12,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "C1200W",boiler,12,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"C1200W",boiler,12,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"C1200W",boiler,12,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "C1200W",boiler,12,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"C1200W",boiler,12,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"C1200W",boiler,12,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"C1200W",boiler,12,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"C1200W",boiler,12,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "C1200W",boiler,12,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"C1200W",boiler,12,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"C1200W",boiler,12,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"C1200W",boiler,12,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"C1200W",boiler,12,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"C1200W",boiler,12,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"C1200W",boiler,12,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"C1200W",boiler,12,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"C1200W",boiler,12,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"C1200W",boiler,12,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"C1200W",boiler,12,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"C1200W",boiler,12,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"C1200W",boiler,12,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"C1200W",boiler,12,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"C1200W",boiler,12,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"C1200W",boiler,12,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"C1200W",boiler,12,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"C1200W",boiler,12,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"C1200W",boiler,12,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"C1200W",boiler,12,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"C1200W",boiler,12,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "C1200W",boiler,12,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "C1200W",boiler,12,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "C1200W",boiler,12,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "C1200W",boiler,12,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "C1200W",boiler,12,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "C1200W",boiler,12,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"C1200W",boiler,12,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"C1200W",boiler,12,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"C1200W",boiler,12,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"C1200W",boiler,12,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"C1200W",boiler,12,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"C1200W",boiler,12,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"C1200W",boiler,12,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"C1200W",boiler,12,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"C1200W",boiler,12,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"C1200W",boiler,12,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"C1200W",boiler,12,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"C1200W",boiler,12,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"C1200W",boiler,12,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"C1200W",boiler,12,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "C1200W",boiler,12,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "C1200W",boiler,12,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"CS5800iG",boiler,16,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"CS5800iG",boiler,16,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"CS5800iG",boiler,16,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"CS5800iG",boiler,16,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"CS5800iG",boiler,16,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"CS5800iG",boiler,16,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "CS5800iG",boiler,16,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "CS5800iG",boiler,16,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "CS5800iG",boiler,16,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"CS5800iG",boiler,16,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"CS5800iG",boiler,16,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"CS5800iG",boiler,16,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"CS5800iG",boiler,16,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"CS5800iG",boiler,16,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"CS5800iG",boiler,16,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"CS5800iG",boiler,16,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"CS5800iG",boiler,16,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"CS5800iG",boiler,16,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"CS5800iG",boiler,16,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"CS5800iG",boiler,16,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"CS5800iG",boiler,16,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"CS5800iG",boiler,16,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"CS5800iG",boiler,16,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"CS5800iG",boiler,16,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"CS5800iG",boiler,16,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"CS5800iG",boiler,16,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"CS5800iG",boiler,16,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "CS5800iG",boiler,16,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "CS5800iG",boiler,16,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"CS5800iG",boiler,16,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"CS5800iG",boiler,16,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "CS5800iG",boiler,16,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "CS5800iG",boiler,16,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "CS5800iG",boiler,16,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"CS5800iG",boiler,16,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"CS5800iG",boiler,16,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "CS5800iG",boiler,16,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "CS5800iG",boiler,16,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"CS5800iG",boiler,16,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"CS5800iG",boiler,16,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"CS5800iG",boiler,16,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"CS5800iG",boiler,16,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "CS5800iG",boiler,16,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "CS5800iG",boiler,16,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "CS5800iG",boiler,16,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "CS5800iG",boiler,16,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"CS5800iG",boiler,16,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"CS5800iG",boiler,16,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "CS5800iG",boiler,16,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "CS5800iG",boiler,16,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "CS5800iG",boiler,16,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"CS5800iG",boiler,16,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"CS5800iG",boiler,16,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "CS5800iG",boiler,16,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"CS5800iG",boiler,16,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"CS5800iG",boiler,16,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "CS5800iG",boiler,16,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "CS5800iG",boiler,16,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"CS5800iG",boiler,16,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"CS5800iG",boiler,16,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"CS5800iG",boiler,16,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"CS5800iG",boiler,16,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"CS5800iG",boiler,16,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"CS5800iG",boiler,16,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"CS5800iG",boiler,16,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"CS5800iG",boiler,16,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "CS5800iG",boiler,16,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "CS5800iG",boiler,16,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "CS5800iG",boiler,16,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"CS5800iG",boiler,16,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"CS5800iG",boiler,16,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"CS5800iG",boiler,16,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"CS5800iG",boiler,16,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"CS5800iG",boiler,16,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"CS5800iG",boiler,16,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"CS5800iG",boiler,16,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"CS5800iG",boiler,16,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"CS5800iG",boiler,16,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"CS5800iG",boiler,16,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"CS5800iG",boiler,16,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"CS5800iG",boiler,16,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"CS5800iG",boiler,16,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"CS5800iG",boiler,16,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "CS5800iG",boiler,16,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "CS5800iG",boiler,16,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"CS5800iG",boiler,16,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"CS5800iG",boiler,16,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "CS5800iG",boiler,16,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"CS5800iG",boiler,16,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"CS5800iG",boiler,16,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"CS5800iG",boiler,16,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"CS5800iG",boiler,16,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"CS5800iG",boiler,16,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"CS5800iG",boiler,16,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"CS5800iG",boiler,16,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"CS5800iG",boiler,16,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "CS5800iG",boiler,16,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"CS5800iG",boiler,16,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"CS5800iG",boiler,16,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"CS5800iG",boiler,16,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"CS5800iG",boiler,16,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "CS5800iG",boiler,16,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"CS5800iG",boiler,16,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"CS5800iG",boiler,16,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"CS5800iG",boiler,16,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"CS5800iG",boiler,16,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"CS5800iG",boiler,16,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"CS5800iG",boiler,16,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"CS5800iG",boiler,16,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"CS5800iG",boiler,16,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"CS5800iG",boiler,16,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"CS5800iG",boiler,16,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"CS5800iG",boiler,16,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"CS5800iG",boiler,16,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"CS5800iG",boiler,16,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"CS5800iG",boiler,16,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"CS5800iG",boiler,16,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"CS5800iG",boiler,16,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"CS5800iG",boiler,16,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"CS5800iG",boiler,16,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"CS5800iG",boiler,16,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"CS5800iG",boiler,16,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"CS5800iG",boiler,16,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"CS5800iG",boiler,16,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"CS5800iG",boiler,16,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"CS5800iG",boiler,16,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"CS5800iG",boiler,16,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"CS5800iG",boiler,16,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"CS5800iG",boiler,16,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"CS5800iG",boiler,16,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"CS5800iG",boiler,16,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"CS5800iG",boiler,16,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "CS5800iG",boiler,16,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"CS5800iG",boiler,16,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"CS5800iG",boiler,16,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"CS5800iG",boiler,16,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"CS5800iG",boiler,16,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "CS5800iG",boiler,16,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"CS5800iG",boiler,16,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"CS5800iG",boiler,16,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "CS5800iG",boiler,16,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "CS5800iG",boiler,16,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"CS5800iG",boiler,16,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"CS5800iG",boiler,16,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "CS5800iG",boiler,16,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"CS5800iG",boiler,16,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"CS5800iG",boiler,16,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"CS5800iG",boiler,16,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"CS5800iG",boiler,16,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "CS5800iG",boiler,16,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"CS5800iG",boiler,16,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"CS5800iG",boiler,16,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"CS5800iG",boiler,16,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"CS5800iG",boiler,16,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"CS5800iG",boiler,16,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"CS5800iG",boiler,16,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"CS5800iG",boiler,16,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"CS5800iG",boiler,16,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"CS5800iG",boiler,16,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"CS5800iG",boiler,16,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"CS5800iG",boiler,16,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"CS5800iG",boiler,16,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"CS5800iG",boiler,16,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"CS5800iG",boiler,16,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"CS5800iG",boiler,16,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"CS5800iG",boiler,16,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"CS5800iG",boiler,16,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"CS5800iG",boiler,16,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"CS5800iG",boiler,16,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"CS5800iG",boiler,16,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "CS5800iG",boiler,16,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "CS5800iG",boiler,16,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "CS5800iG",boiler,16,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "CS5800iG",boiler,16,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "CS5800iG",boiler,16,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "CS5800iG",boiler,16,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"CS5800iG",boiler,16,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"CS5800iG",boiler,16,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"CS5800iG",boiler,16,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"CS5800iG",boiler,16,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"CS5800iG",boiler,16,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"CS5800iG",boiler,16,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"CS5800iG",boiler,16,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"CS5800iG",boiler,16,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"CS5800iG",boiler,16,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"CS5800iG",boiler,16,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"CS5800iG",boiler,16,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"CS5800iG",boiler,16,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"CS5800iG",boiler,16,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"CS5800iG",boiler,16,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "CS5800iG",boiler,16,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "CS5800iG",boiler,16,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "BK13/BK15, Smartline, GB1*2",boiler,64,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "BK13/BK15, Smartline, GB1*2",boiler,64,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"BK13/BK15, Smartline, GB1*2",boiler,64,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"BK13/BK15, Smartline, GB1*2",boiler,64,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"BK13/BK15, Smartline, GB1*2",boiler,64,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"BK13/BK15, Smartline, GB1*2",boiler,64,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"BK13/BK15, Smartline, GB1*2",boiler,64,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"BK13/BK15, Smartline, GB1*2",boiler,64,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "BK13/BK15, Smartline, GB1*2",boiler,64,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "BK13/BK15, Smartline, GB1*2",boiler,64,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Logano GB1*5, Logamatic MC10",boiler,72,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Logano GB1*5, Logamatic MC10",boiler,72,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Logano GB1*5, Logamatic MC10",boiler,72,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Logano GB1*5, Logamatic MC10",boiler,72,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Logano GB1*5, Logamatic MC10",boiler,72,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Logano GB1*5, Logamatic MC10",boiler,72,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Logano GB1*5, Logamatic MC10",boiler,72,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Logano GB1*5, Logamatic MC10",boiler,72,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Logano GB1*5, Logamatic MC10",boiler,72,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Logano GB1*5, Logamatic MC10",boiler,72,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Logano GB1*5, Logamatic MC10",boiler,72,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Logano GB1*5, Logamatic MC10",boiler,72,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Logano GB1*5, Logamatic MC10",boiler,72,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Logano GB1*5, Logamatic MC10",boiler,72,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Logano GB1*5, Logamatic MC10",boiler,72,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Logano GB1*5, Logamatic MC10",boiler,72,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Logano GB1*5, Logamatic MC10",boiler,72,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Logano GB1*5, Logamatic MC10",boiler,72,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Logano GB1*5, Logamatic MC10",boiler,72,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Logano GB1*5, Logamatic MC10",boiler,72,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Logano GB1*5, Logamatic MC10",boiler,72,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Logano GB1*5, Logamatic MC10",boiler,72,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Logano GB1*5, Logamatic MC10",boiler,72,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Logano GB1*5, Logamatic MC10",boiler,72,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Logano GB1*5, Logamatic MC10",boiler,72,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Logano GB1*5, Logamatic MC10",boiler,72,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Logano GB1*5, Logamatic MC10",boiler,72,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Logano GB1*5, Logamatic MC10",boiler,72,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Logano GB1*5, Logamatic MC10",boiler,72,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Logano GB1*5, Logamatic MC10",boiler,72,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Logano GB1*5, Logamatic MC10",boiler,72,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Logano GB1*5, Logamatic MC10",boiler,72,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Logano GB1*5, Logamatic MC10",boiler,72,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Logano GB1*5, Logamatic MC10",boiler,72,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Logano GB1*5, Logamatic MC10",boiler,72,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Logano GB1*5, Logamatic MC10",boiler,72,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Logano GB1*5, Logamatic MC10",boiler,72,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Logano GB1*5, Logamatic MC10",boiler,72,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Logano GB1*5, Logamatic MC10",boiler,72,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Logano GB1*5, Logamatic MC10",boiler,72,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Logano GB1*5, Logamatic MC10",boiler,72,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Logano GB1*5, Logamatic MC10",boiler,72,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Logano GB1*5, Logamatic MC10",boiler,72,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Logano GB1*5, Logamatic MC10",boiler,72,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Logano GB1*5, Logamatic MC10",boiler,72,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Logano GB1*5, Logamatic MC10",boiler,72,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Logano GB1*5, Logamatic MC10",boiler,72,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Logano GB1*5, Logamatic MC10",boiler,72,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Logano GB1*5, Logamatic MC10",boiler,72,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Logano GB1*5, Logamatic MC10",boiler,72,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Logano GB1*5, Logamatic MC10",boiler,72,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Logano GB1*5, Logamatic MC10",boiler,72,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Logano GB1*5, Logamatic MC10",boiler,72,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Logano GB1*5, Logamatic MC10",boiler,72,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Logano GB1*5, Logamatic MC10",boiler,72,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Logano GB1*5, Logamatic MC10",boiler,72,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Logano GB1*5, Logamatic MC10",boiler,72,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Logano GB1*5, Logamatic MC10",boiler,72,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Logano GB1*5, Logamatic MC10",boiler,72,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Logano GB1*5, Logamatic MC10",boiler,72,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Logano GB1*5, Logamatic MC10",boiler,72,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Logano GB1*5, Logamatic MC10",boiler,72,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Logano GB1*5, Logamatic MC10",boiler,72,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Logano GB1*5, Logamatic MC10",boiler,72,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Logano GB1*5, Logamatic MC10",boiler,72,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Logano GB1*5, Logamatic MC10",boiler,72,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Logano GB1*5, Logamatic MC10",boiler,72,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Logano GB1*5, Logamatic MC10",boiler,72,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Logano GB1*5, Logamatic MC10",boiler,72,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Logano GB1*5, Logamatic MC10",boiler,72,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Logano GB1*5, Logamatic MC10",boiler,72,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Logano GB1*5, Logamatic MC10",boiler,72,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Logano GB1*5, Logamatic MC10",boiler,72,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Logano GB1*5, Logamatic MC10",boiler,72,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Logano GB1*5, Logamatic MC10",boiler,72,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Logano GB1*5, Logamatic MC10",boiler,72,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Logano GB1*5, Logamatic MC10",boiler,72,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Logano GB1*5, Logamatic MC10",boiler,72,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Logano GB1*5, Logamatic MC10",boiler,72,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Logano GB1*5, Logamatic MC10",boiler,72,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Logano GB1*5, Logamatic MC10",boiler,72,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Logano GB1*5, Logamatic MC10",boiler,72,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Logano GB1*5, Logamatic MC10",boiler,72,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Logano GB1*5, Logamatic MC10",boiler,72,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Logano GB1*5, Logamatic MC10",boiler,72,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Logano GB1*5, Logamatic MC10",boiler,72,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Logano GB1*5, Logamatic MC10",boiler,72,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Logano GB1*5, Logamatic MC10",boiler,72,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Logano GB1*5, Logamatic MC10",boiler,72,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Logano GB1*5, Logamatic MC10",boiler,72,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Logano GB1*5, Logamatic MC10",boiler,72,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Logano GB1*5, Logamatic MC10",boiler,72,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Logano GB1*5, Logamatic MC10",boiler,72,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Logano GB1*5, Logamatic MC10",boiler,72,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Logano GB1*5, Logamatic MC10",boiler,72,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Logano GB1*5, Logamatic MC10",boiler,72,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Logano GB1*5, Logamatic MC10",boiler,72,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Logano GB1*5, Logamatic MC10",boiler,72,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Logano GB1*5, Logamatic MC10",boiler,72,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Logano GB1*5, Logamatic MC10",boiler,72,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Logano GB1*5, Logamatic MC10",boiler,72,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Logano GB1*5, Logamatic MC10",boiler,72,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Logano GB1*5, Logamatic MC10",boiler,72,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Logano GB1*5, Logamatic MC10",boiler,72,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Logano GB1*5, Logamatic MC10",boiler,72,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Logano GB1*5, Logamatic MC10",boiler,72,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Logano GB1*5, Logamatic MC10",boiler,72,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Logano GB1*5, Logamatic MC10",boiler,72,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Logano GB1*5, Logamatic MC10",boiler,72,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Logano GB1*5, Logamatic MC10",boiler,72,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Logano GB1*5, Logamatic MC10",boiler,72,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Logano GB1*5, Logamatic MC10",boiler,72,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Logano GB1*5, Logamatic MC10",boiler,72,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Logano GB1*5, Logamatic MC10",boiler,72,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Logano GB1*5, Logamatic MC10",boiler,72,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Logano GB1*5, Logamatic MC10",boiler,72,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Logano GB1*5, Logamatic MC10",boiler,72,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Logano GB1*5, Logamatic MC10",boiler,72,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Cascade CM10",boiler,81,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Cascade CM10",boiler,81,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Cascade CM10",boiler,81,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Cascade CM10",boiler,81,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Cascade CM10",boiler,81,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Cascade CM10",boiler,81,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Cascade CM10",boiler,81,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Cascade CM10",boiler,81,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Cascade CM10",boiler,81,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Cascade CM10",boiler,81,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Cascade CM10",boiler,81,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Cascade CM10",boiler,81,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Cascade CM10",boiler,81,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Cascade CM10",boiler,81,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Cascade CM10",boiler,81,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Cascade CM10",boiler,81,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Cascade CM10",boiler,81,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Cascade CM10",boiler,81,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Cascade CM10",boiler,81,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Cascade CM10",boiler,81,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Cascade CM10",boiler,81,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Cascade CM10",boiler,81,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Cascade CM10",boiler,81,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Cascade CM10",boiler,81,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Cascade CM10",boiler,81,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Cascade CM10",boiler,81,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Cascade CM10",boiler,81,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Cascade CM10",boiler,81,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Cascade CM10",boiler,81,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Cascade CM10",boiler,81,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Cascade CM10",boiler,81,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Cascade CM10",boiler,81,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Cascade CM10",boiler,81,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Cascade CM10",boiler,81,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Cascade CM10",boiler,81,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Cascade CM10",boiler,81,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Cascade CM10",boiler,81,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Cascade CM10",boiler,81,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Cascade CM10",boiler,81,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Cascade CM10",boiler,81,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Cascade CM10",boiler,81,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Cascade CM10",boiler,81,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Cascade CM10",boiler,81,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Cascade CM10",boiler,81,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Cascade CM10",boiler,81,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Cascade CM10",boiler,81,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Cascade CM10",boiler,81,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Cascade CM10",boiler,81,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Cascade CM10",boiler,81,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Cascade CM10",boiler,81,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Cascade CM10",boiler,81,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Cascade CM10",boiler,81,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Cascade CM10",boiler,81,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Cascade CM10",boiler,81,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Cascade CM10",boiler,81,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Cascade CM10",boiler,81,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Cascade CM10",boiler,81,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Cascade CM10",boiler,81,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Cascade CM10",boiler,81,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Cascade CM10",boiler,81,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Cascade CM10",boiler,81,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Cascade CM10",boiler,81,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Cascade CM10",boiler,81,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Cascade CM10",boiler,81,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Cascade CM10",boiler,81,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Cascade CM10",boiler,81,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Cascade CM10",boiler,81,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Cascade CM10",boiler,81,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Cascade CM10",boiler,81,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Cascade CM10",boiler,81,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Cascade CM10",boiler,81,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Cascade CM10",boiler,81,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Cascade CM10",boiler,81,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Cascade CM10",boiler,81,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Cascade CM10",boiler,81,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Cascade CM10",boiler,81,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Cascade CM10",boiler,81,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Cascade CM10",boiler,81,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Cascade CM10",boiler,81,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Cascade CM10",boiler,81,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Cascade CM10",boiler,81,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Cascade CM10",boiler,81,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Cascade CM10",boiler,81,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Cascade CM10",boiler,81,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Cascade CM10",boiler,81,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Cascade CM10",boiler,81,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Cascade CM10",boiler,81,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Cascade CM10",boiler,81,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Cascade CM10",boiler,81,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Cascade CM10",boiler,81,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Cascade CM10",boiler,81,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Cascade CM10",boiler,81,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Cascade CM10",boiler,81,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Cascade CM10",boiler,81,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Cascade CM10",boiler,81,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Cascade CM10",boiler,81,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Cascade CM10",boiler,81,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Cascade CM10",boiler,81,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Cascade CM10",boiler,81,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Cascade CM10",boiler,81,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Cascade CM10",boiler,81,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Cascade CM10",boiler,81,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Cascade CM10",boiler,81,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Cascade CM10",boiler,81,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Cascade CM10",boiler,81,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Cascade CM10",boiler,81,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Cascade CM10",boiler,81,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Cascade CM10",boiler,81,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Cascade CM10",boiler,81,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Cascade CM10",boiler,81,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Cascade CM10",boiler,81,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Cascade CM10",boiler,81,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Cascade CM10",boiler,81,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Cascade CM10",boiler,81,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Cascade CM10",boiler,81,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Cascade CM10",boiler,81,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Cascade CM10",boiler,81,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Cascade CM10",boiler,81,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Cascade CM10",boiler,81,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Cascade CM10",boiler,81,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Cascade CM10",boiler,81,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Cascade CM10",boiler,81,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Cascade CM10",boiler,81,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Cascade CM10",boiler,81,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Cascade CM10",boiler,81,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Cascade CM10",boiler,81,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Cascade CM10",boiler,81,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Cascade CM10",boiler,81,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Cascade CM10",boiler,81,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Cascade CM10",boiler,81,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Cascade CM10",boiler,81,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Cascade CM10",boiler,81,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Cascade CM10",boiler,81,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Cascade CM10",boiler,81,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Cascade CM10",boiler,81,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Cascade CM10",boiler,81,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Cascade CM10",boiler,81,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Cascade CM10",boiler,81,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Cascade CM10",boiler,81,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Cascade CM10",boiler,81,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Cascade CM10",boiler,81,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Cascade CM10",boiler,81,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Cascade CM10",boiler,81,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Cascade CM10",boiler,81,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Cascade CM10",boiler,81,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Cascade CM10",boiler,81,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Cascade CM10",boiler,81,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Cascade CM10",boiler,81,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Cascade CM10",boiler,81,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Cascade CM10",boiler,81,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Cascade CM10",boiler,81,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Cascade CM10",boiler,81,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Cascade CM10",boiler,81,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Cascade CM10",boiler,81,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Cascade CM10",boiler,81,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Cascade CM10",boiler,81,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Cascade CM10",boiler,81,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Cascade CM10",boiler,81,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Cascade CM10",boiler,81,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Cascade CM10",boiler,81,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Cascade CM10",boiler,81,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Cascade CM10",boiler,81,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Cascade CM10",boiler,81,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Cascade CM10",boiler,81,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Cascade CM10",boiler,81,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Cascade CM10",boiler,81,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Cascade CM10",boiler,81,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Cascade CM10",boiler,81,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Cascade CM10",boiler,81,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Cascade CM10",boiler,81,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Cascade CM10",boiler,81,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Cascade CM10",boiler,81,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Cascade CM10",boiler,81,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Cascade CM10",boiler,81,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Cascade CM10",boiler,81,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Cascade CM10",boiler,81,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Cascade CM10",boiler,81,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Cascade CM10",boiler,81,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Cascade CM10",boiler,81,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Cascade CM10",boiler,81,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Cascade CM10",boiler,81,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Cascade CM10",boiler,81,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Cascade CM10",boiler,81,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Cascade CM10",boiler,81,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Cascade CM10",boiler,81,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Cascade CM10",boiler,81,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Cascade CM10",boiler,81,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Cascade CM10",boiler,81,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Cascade CM10",boiler,81,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Cascade CM10",boiler,81,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Cascade CM10",boiler,81,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Cascade CM10",boiler,81,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Logamax Plus GB022",boiler,84,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Logamax Plus GB022",boiler,84,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Logamax Plus GB022",boiler,84,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Logamax Plus GB022",boiler,84,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Logamax Plus GB022",boiler,84,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Logamax Plus GB022",boiler,84,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Logamax Plus GB022",boiler,84,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Logamax Plus GB022",boiler,84,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Logamax Plus GB022",boiler,84,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Logamax Plus GB022",boiler,84,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Logamax Plus GB022",boiler,84,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Logamax Plus GB022",boiler,84,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Logamax Plus GB022",boiler,84,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Logamax Plus GB022",boiler,84,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Logamax Plus GB022",boiler,84,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Logamax Plus GB022",boiler,84,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Logamax Plus GB022",boiler,84,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Logamax Plus GB022",boiler,84,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Logamax Plus GB022",boiler,84,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Logamax Plus GB022",boiler,84,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Logamax Plus GB022",boiler,84,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Logamax Plus GB022",boiler,84,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Logamax Plus GB022",boiler,84,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Logamax Plus GB022",boiler,84,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Logamax Plus GB022",boiler,84,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Logamax Plus GB022",boiler,84,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Logamax Plus GB022",boiler,84,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Logamax Plus GB022",boiler,84,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Logamax Plus GB022",boiler,84,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Logamax Plus GB022",boiler,84,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Logamax Plus GB022",boiler,84,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Logamax Plus GB022",boiler,84,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Logamax Plus GB022",boiler,84,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Logamax Plus GB022",boiler,84,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Logamax Plus GB022",boiler,84,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Logamax Plus GB022",boiler,84,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Logamax Plus GB022",boiler,84,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Logamax Plus GB022",boiler,84,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Logamax Plus GB022",boiler,84,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Logamax Plus GB022",boiler,84,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Logamax Plus GB022",boiler,84,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Logamax Plus GB022",boiler,84,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Logamax Plus GB022",boiler,84,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Logamax Plus GB022",boiler,84,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Logamax Plus GB022",boiler,84,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Logamax Plus GB022",boiler,84,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Logamax Plus GB022",boiler,84,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Logamax Plus GB022",boiler,84,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Logamax Plus GB022",boiler,84,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Logamax Plus GB022",boiler,84,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Logamax Plus GB022",boiler,84,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Logamax Plus GB022",boiler,84,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Logamax Plus GB022",boiler,84,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Logamax Plus GB022",boiler,84,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Logamax Plus GB022",boiler,84,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Logamax Plus GB022",boiler,84,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Logamax Plus GB022",boiler,84,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Logamax Plus GB022",boiler,84,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Logamax Plus GB022",boiler,84,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Logamax Plus GB022",boiler,84,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Logamax Plus GB022",boiler,84,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Logamax Plus GB022",boiler,84,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Logamax Plus GB022",boiler,84,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Logamax Plus GB022",boiler,84,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Logamax Plus GB022",boiler,84,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Logamax Plus GB022",boiler,84,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Logamax Plus GB022",boiler,84,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Logamax Plus GB022",boiler,84,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Logamax Plus GB022",boiler,84,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Logamax Plus GB022",boiler,84,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Logamax Plus GB022",boiler,84,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Logamax Plus GB022",boiler,84,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Logamax Plus GB022",boiler,84,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Logamax Plus GB022",boiler,84,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Logamax Plus GB022",boiler,84,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Logamax Plus GB022",boiler,84,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Logamax Plus GB022",boiler,84,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Logamax Plus GB022",boiler,84,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Logamax Plus GB022",boiler,84,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Logamax Plus GB022",boiler,84,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Logamax Plus GB022",boiler,84,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Logamax Plus GB022",boiler,84,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Logamax Plus GB022",boiler,84,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Logamax Plus GB022",boiler,84,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Logamax Plus GB022",boiler,84,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Logamax Plus GB022",boiler,84,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Logamax Plus GB022",boiler,84,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Logamax Plus GB022",boiler,84,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Logamax Plus GB022",boiler,84,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Logamax Plus GB022",boiler,84,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Logamax Plus GB022",boiler,84,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Logamax Plus GB022",boiler,84,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Logamax Plus GB022",boiler,84,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Logamax Plus GB022",boiler,84,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Logamax Plus GB022",boiler,84,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Logamax Plus GB022",boiler,84,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Logamax Plus GB022",boiler,84,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Logamax Plus GB022",boiler,84,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Logamax Plus GB022",boiler,84,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Logamax Plus GB022",boiler,84,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Logamax Plus GB022",boiler,84,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Logamax Plus GB022",boiler,84,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Logamax Plus GB022",boiler,84,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Logamax Plus GB022",boiler,84,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Logamax Plus GB022",boiler,84,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Logamax Plus GB022",boiler,84,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Logamax Plus GB022",boiler,84,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Logamax Plus GB022",boiler,84,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Logamax Plus GB022",boiler,84,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Logamax Plus GB022",boiler,84,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Logamax Plus GB022",boiler,84,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Logamax Plus GB022",boiler,84,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Logamax Plus GB022",boiler,84,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Logamax Plus GB022",boiler,84,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Logamax Plus GB022",boiler,84,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Logamax Plus GB022",boiler,84,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Logamax Plus GB022",boiler,84,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Logamax Plus GB022",boiler,84,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Logamax Plus GB022",boiler,84,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Logamax Plus GB022",boiler,84,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Logamax Plus GB022",boiler,84,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Logamax Plus GB022",boiler,84,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Logamax Plus GB022",boiler,84,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Logamax Plus GB022",boiler,84,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Logamax Plus GB022",boiler,84,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Logamax Plus GB022",boiler,84,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Logamax Plus GB022",boiler,84,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Logamax Plus GB022",boiler,84,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Logamax Plus GB022",boiler,84,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Logamax Plus GB022",boiler,84,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Logamax Plus GB022",boiler,84,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Logamax Plus GB022",boiler,84,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Logamax Plus GB022",boiler,84,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Logamax Plus GB022",boiler,84,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Logamax Plus GB022",boiler,84,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Logamax Plus GB022",boiler,84,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Logamax Plus GB022",boiler,84,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Logamax Plus GB022",boiler,84,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Logamax Plus GB022",boiler,84,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Logamax Plus GB022",boiler,84,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Logamax Plus GB022",boiler,84,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Logamax Plus GB022",boiler,84,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Logamax Plus GB022",boiler,84,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Logamax Plus GB022",boiler,84,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Logamax Plus GB022",boiler,84,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Logamax Plus GB022",boiler,84,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Logamax Plus GB022",boiler,84,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Logamax Plus GB022",boiler,84,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Logamax Plus GB022",boiler,84,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Logamax Plus GB022",boiler,84,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Logamax Plus GB022",boiler,84,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Logamax Plus GB022",boiler,84,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Logamax Plus GB022",boiler,84,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Logamax Plus GB022",boiler,84,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Logamax Plus GB022",boiler,84,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Logamax Plus GB022",boiler,84,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Logamax Plus GB022",boiler,84,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Logamax Plus GB022",boiler,84,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Logamax Plus GB022",boiler,84,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Logamax Plus GB022",boiler,84,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Logamax Plus GB022",boiler,84,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Logamax Plus GB022",boiler,84,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Logamax Plus GB022",boiler,84,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Logamax Plus GB022",boiler,84,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Logamax Plus GB022",boiler,84,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Logamax Plus GB022",boiler,84,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Logamax Plus GB022",boiler,84,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Logamax Plus GB022",boiler,84,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Logamax Plus GB022",boiler,84,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Logamax Plus GB022",boiler,84,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Logamax Plus GB022",boiler,84,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Logamax Plus GB022",boiler,84,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Logamax Plus GB022",boiler,84,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Logamax Plus GB022",boiler,84,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Logamax Plus GB022",boiler,84,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Logamax Plus GB022",boiler,84,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Logamax Plus GB022",boiler,84,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Logamax Plus GB022",boiler,84,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Logamax Plus GB022",boiler,84,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Logamax Plus GB022",boiler,84,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Logamax Plus GB022",boiler,84,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Logamax Plus GB022",boiler,84,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Logamax Plus GB022",boiler,84,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Logamax Plus GB022",boiler,84,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Logamax Plus GB022",boiler,84,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Logamax Plus GB022",boiler,84,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Logamax Plus GB022",boiler,84,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Logamax Plus GB022",boiler,84,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Logamax Plus GB022",boiler,84,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Logamax Plus GB022",boiler,84,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Logamax Plus GB022",boiler,84,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Logamax Plus GB022",boiler,84,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pumpmode,boiler pump mode,enum [pumpstep\|const.high\|const.medium\|const.low\|prop.high\|propo.low], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pumpmode,boiler pump mode,enum [pumpstep\|const.high\|const.medium\|const.low\|prop.high\|propo.low] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Condens, Logamax/Logomatic, Cerapur Top, Greenstar, Generic HT3",boiler,95,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Topline, GB162",boiler,115,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Topline, GB162",boiler,115,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Topline, GB162",boiler,115,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Topline, GB162",boiler,115,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Topline, GB162",boiler,115,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Topline, GB162",boiler,115,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Topline, GB162",boiler,115,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Topline, GB162",boiler,115,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Topline, GB162",boiler,115,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Topline, GB162",boiler,115,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Topline, GB162",boiler,115,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Topline, GB162",boiler,115,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Topline, GB162",boiler,115,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Topline, GB162",boiler,115,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Topline, GB162",boiler,115,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Topline, GB162",boiler,115,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Topline, GB162",boiler,115,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Topline, GB162",boiler,115,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Topline, GB162",boiler,115,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Topline, GB162",boiler,115,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Topline, GB162",boiler,115,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Topline, GB162",boiler,115,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Topline, GB162",boiler,115,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Topline, GB162",boiler,115,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Topline, GB162",boiler,115,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Topline, GB162",boiler,115,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Topline, GB162",boiler,115,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Topline, GB162",boiler,115,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Topline, GB162",boiler,115,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Topline, GB162",boiler,115,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Topline, GB162",boiler,115,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Topline, GB162",boiler,115,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Topline, GB162",boiler,115,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Topline, GB162",boiler,115,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Topline, GB162",boiler,115,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Topline, GB162",boiler,115,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Topline, GB162",boiler,115,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Topline, GB162",boiler,115,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Topline, GB162",boiler,115,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Topline, GB162",boiler,115,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Topline, GB162",boiler,115,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Topline, GB162",boiler,115,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Topline, GB162",boiler,115,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Topline, GB162",boiler,115,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Topline, GB162",boiler,115,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Topline, GB162",boiler,115,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Topline, GB162",boiler,115,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Topline, GB162",boiler,115,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Topline, GB162",boiler,115,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Topline, GB162",boiler,115,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Topline, GB162",boiler,115,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Topline, GB162",boiler,115,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Topline, GB162",boiler,115,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Topline, GB162",boiler,115,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Topline, GB162",boiler,115,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Topline, GB162",boiler,115,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Topline, GB162",boiler,115,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Topline, GB162",boiler,115,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Topline, GB162",boiler,115,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Topline, GB162",boiler,115,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Topline, GB162",boiler,115,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Topline, GB162",boiler,115,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Topline, GB162",boiler,115,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Topline, GB162",boiler,115,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Topline, GB162",boiler,115,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Topline, GB162",boiler,115,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Topline, GB162",boiler,115,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Topline, GB162",boiler,115,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Topline, GB162",boiler,115,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Topline, GB162",boiler,115,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Topline, GB162",boiler,115,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Topline, GB162",boiler,115,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Topline, GB162",boiler,115,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Topline, GB162",boiler,115,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Topline, GB162",boiler,115,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Topline, GB162",boiler,115,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Topline, GB162",boiler,115,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Topline, GB162",boiler,115,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Topline, GB162",boiler,115,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Topline, GB162",boiler,115,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Topline, GB162",boiler,115,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Topline, GB162",boiler,115,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Topline, GB162",boiler,115,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Topline, GB162",boiler,115,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Topline, GB162",boiler,115,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Topline, GB162",boiler,115,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Topline, GB162",boiler,115,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Topline, GB162",boiler,115,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Topline, GB162",boiler,115,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Topline, GB162",boiler,115,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Topline, GB162",boiler,115,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Topline, GB162",boiler,115,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Topline, GB162",boiler,115,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Topline, GB162",boiler,115,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Topline, GB162",boiler,115,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Topline, GB162",boiler,115,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Topline, GB162",boiler,115,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Topline, GB162",boiler,115,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Topline, GB162",boiler,115,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Topline, GB162",boiler,115,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Topline, GB162",boiler,115,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Topline, GB162",boiler,115,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Topline, GB162",boiler,115,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Topline, GB162",boiler,115,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Topline, GB162",boiler,115,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Topline, GB162",boiler,115,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Topline, GB162",boiler,115,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Topline, GB162",boiler,115,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Topline, GB162",boiler,115,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Topline, GB162",boiler,115,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Topline, GB162",boiler,115,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Topline, GB162",boiler,115,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Topline, GB162",boiler,115,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Topline, GB162",boiler,115,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Topline, GB162",boiler,115,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Topline, GB162",boiler,115,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Topline, GB162",boiler,115,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Topline, GB162",boiler,115,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Topline, GB162",boiler,115,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Topline, GB162",boiler,115,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Topline, GB162",boiler,115,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Topline, GB162",boiler,115,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Topline, GB162",boiler,115,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Topline, GB162",boiler,115,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Topline, GB162",boiler,115,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Topline, GB162",boiler,115,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Topline, GB162",boiler,115,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Topline, GB162",boiler,115,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Topline, GB162",boiler,115,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Topline, GB162",boiler,115,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Topline, GB162",boiler,115,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Topline, GB162",boiler,115,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Topline, GB162",boiler,115,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Topline, GB162",boiler,115,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Topline, GB162",boiler,115,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Topline, GB162",boiler,115,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Topline, GB162",boiler,115,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Topline, GB162",boiler,115,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Topline, GB162",boiler,115,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Topline, GB162",boiler,115,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Topline, GB162",boiler,115,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Topline, GB162",boiler,115,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Topline, GB162",boiler,115,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Topline, GB162",boiler,115,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Topline, GB162",boiler,115,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Topline, GB162",boiler,115,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Topline, GB162",boiler,115,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Topline, GB162",boiler,115,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Topline, GB162",boiler,115,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Topline, GB162",boiler,115,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Topline, GB162",boiler,115,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Topline, GB162",boiler,115,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Topline, GB162",boiler,115,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Topline, GB162",boiler,115,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Topline, GB162",boiler,115,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Topline, GB162",boiler,115,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Topline, GB162",boiler,115,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Topline, GB162",boiler,115,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Topline, GB162",boiler,115,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Topline, GB162",boiler,115,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Topline, GB162",boiler,115,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Topline, GB162",boiler,115,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Topline, GB162",boiler,115,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Topline, GB162",boiler,115,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Topline, GB162",boiler,115,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Topline, GB162",boiler,115,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Topline, GB162",boiler,115,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Topline, GB162",boiler,115,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Topline, GB162",boiler,115,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Topline, GB162",boiler,115,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Topline, GB162",boiler,115,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Topline, GB162",boiler,115,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Topline, GB162",boiler,115,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Topline, GB162",boiler,115,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Topline, GB162",boiler,115,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Topline, GB162",boiler,115,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Topline, GB162",boiler,115,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Topline, GB162",boiler,115,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Topline, GB162",boiler,115,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Topline, GB162",boiler,115,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Topline, GB162",boiler,115,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Topline, GB162",boiler,115,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Topline, GB162",boiler,115,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Topline, GB162",boiler,115,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Topline, GB162",boiler,115,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Topline, GB162",boiler,115,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Topline, GB162",boiler,115,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Topline, GB162",boiler,115,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Topline, GB162",boiler,115,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Topline, GB162",boiler,115,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Topline, GB162",boiler,115,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Topline, GB162",boiler,115,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Cascade MCM10",boiler,121,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Cascade MCM10",boiler,121,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Cascade MCM10",boiler,121,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Cascade MCM10",boiler,121,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Cascade MCM10",boiler,121,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Cascade MCM10",boiler,121,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Cascade MCM10",boiler,121,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Cascade MCM10",boiler,121,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Cascade MCM10",boiler,121,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Cascade MCM10",boiler,121,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Cascade MCM10",boiler,121,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Cascade MCM10",boiler,121,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Cascade MCM10",boiler,121,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Cascade MCM10",boiler,121,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Cascade MCM10",boiler,121,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Cascade MCM10",boiler,121,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Cascade MCM10",boiler,121,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Cascade MCM10",boiler,121,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Cascade MCM10",boiler,121,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Cascade MCM10",boiler,121,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Cascade MCM10",boiler,121,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Cascade MCM10",boiler,121,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Cascade MCM10",boiler,121,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Cascade MCM10",boiler,121,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Cascade MCM10",boiler,121,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Cascade MCM10",boiler,121,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Cascade MCM10",boiler,121,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Cascade MCM10",boiler,121,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Cascade MCM10",boiler,121,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Cascade MCM10",boiler,121,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Cascade MCM10",boiler,121,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Cascade MCM10",boiler,121,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Cascade MCM10",boiler,121,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Cascade MCM10",boiler,121,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Cascade MCM10",boiler,121,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Cascade MCM10",boiler,121,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Cascade MCM10",boiler,121,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Cascade MCM10",boiler,121,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Cascade MCM10",boiler,121,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Cascade MCM10",boiler,121,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Cascade MCM10",boiler,121,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Cascade MCM10",boiler,121,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Cascade MCM10",boiler,121,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Cascade MCM10",boiler,121,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Cascade MCM10",boiler,121,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Cascade MCM10",boiler,121,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Cascade MCM10",boiler,121,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Cascade MCM10",boiler,121,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Cascade MCM10",boiler,121,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Cascade MCM10",boiler,121,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Cascade MCM10",boiler,121,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Cascade MCM10",boiler,121,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Cascade MCM10",boiler,121,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Cascade MCM10",boiler,121,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Cascade MCM10",boiler,121,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Cascade MCM10",boiler,121,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Cascade MCM10",boiler,121,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Cascade MCM10",boiler,121,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Cascade MCM10",boiler,121,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Cascade MCM10",boiler,121,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Cascade MCM10",boiler,121,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Cascade MCM10",boiler,121,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Cascade MCM10",boiler,121,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Cascade MCM10",boiler,121,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Cascade MCM10",boiler,121,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Cascade MCM10",boiler,121,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Cascade MCM10",boiler,121,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Cascade MCM10",boiler,121,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Cascade MCM10",boiler,121,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Cascade MCM10",boiler,121,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Cascade MCM10",boiler,121,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Cascade MCM10",boiler,121,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Cascade MCM10",boiler,121,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Cascade MCM10",boiler,121,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Cascade MCM10",boiler,121,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Cascade MCM10",boiler,121,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Cascade MCM10",boiler,121,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Cascade MCM10",boiler,121,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Cascade MCM10",boiler,121,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Cascade MCM10",boiler,121,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Cascade MCM10",boiler,121,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Cascade MCM10",boiler,121,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Cascade MCM10",boiler,121,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Cascade MCM10",boiler,121,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Cascade MCM10",boiler,121,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Cascade MCM10",boiler,121,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Cascade MCM10",boiler,121,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Cascade MCM10",boiler,121,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Cascade MCM10",boiler,121,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Cascade MCM10",boiler,121,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Cascade MCM10",boiler,121,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Cascade MCM10",boiler,121,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Cascade MCM10",boiler,121,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Cascade MCM10",boiler,121,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Cascade MCM10",boiler,121,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Cascade MCM10",boiler,121,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Cascade MCM10",boiler,121,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Cascade MCM10",boiler,121,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Cascade MCM10",boiler,121,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Cascade MCM10",boiler,121,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Cascade MCM10",boiler,121,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Cascade MCM10",boiler,121,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Cascade MCM10",boiler,121,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Cascade MCM10",boiler,121,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Cascade MCM10",boiler,121,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Cascade MCM10",boiler,121,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Cascade MCM10",boiler,121,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Cascade MCM10",boiler,121,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Cascade MCM10",boiler,121,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Cascade MCM10",boiler,121,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Cascade MCM10",boiler,121,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Cascade MCM10",boiler,121,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Cascade MCM10",boiler,121,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Cascade MCM10",boiler,121,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Cascade MCM10",boiler,121,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Cascade MCM10",boiler,121,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Cascade MCM10",boiler,121,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Cascade MCM10",boiler,121,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Cascade MCM10",boiler,121,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Cascade MCM10",boiler,121,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Cascade MCM10",boiler,121,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Cascade MCM10",boiler,121,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Cascade MCM10",boiler,121,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Cascade MCM10",boiler,121,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Cascade MCM10",boiler,121,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Cascade MCM10",boiler,121,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Cascade MCM10",boiler,121,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Cascade MCM10",boiler,121,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Cascade MCM10",boiler,121,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Cascade MCM10",boiler,121,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Cascade MCM10",boiler,121,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Cascade MCM10",boiler,121,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Cascade MCM10",boiler,121,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Cascade MCM10",boiler,121,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Cascade MCM10",boiler,121,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Cascade MCM10",boiler,121,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Cascade MCM10",boiler,121,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Cascade MCM10",boiler,121,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Cascade MCM10",boiler,121,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Cascade MCM10",boiler,121,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Cascade MCM10",boiler,121,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Cascade MCM10",boiler,121,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Cascade MCM10",boiler,121,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Cascade MCM10",boiler,121,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Cascade MCM10",boiler,121,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Cascade MCM10",boiler,121,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Cascade MCM10",boiler,121,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Cascade MCM10",boiler,121,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Cascade MCM10",boiler,121,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Cascade MCM10",boiler,121,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Cascade MCM10",boiler,121,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Cascade MCM10",boiler,121,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Cascade MCM10",boiler,121,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Cascade MCM10",boiler,121,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Cascade MCM10",boiler,121,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Cascade MCM10",boiler,121,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Cascade MCM10",boiler,121,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Cascade MCM10",boiler,121,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Cascade MCM10",boiler,121,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Cascade MCM10",boiler,121,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Cascade MCM10",boiler,121,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Cascade MCM10",boiler,121,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Cascade MCM10",boiler,121,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Cascade MCM10",boiler,121,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Cascade MCM10",boiler,121,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Cascade MCM10",boiler,121,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Cascade MCM10",boiler,121,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Cascade MCM10",boiler,121,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Cascade MCM10",boiler,121,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Cascade MCM10",boiler,121,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Cascade MCM10",boiler,121,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Cascade MCM10",boiler,121,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Cascade MCM10",boiler,121,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Cascade MCM10",boiler,121,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Cascade MCM10",boiler,121,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Cascade MCM10",boiler,121,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Cascade MCM10",boiler,121,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Cascade MCM10",boiler,121,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Cascade MCM10",boiler,121,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Cascade MCM10",boiler,121,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Cascade MCM10",boiler,121,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Cascade MCM10",boiler,121,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Cascade MCM10",boiler,121,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Cascade MCM10",boiler,121,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Cascade MCM10",boiler,121,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Cascade MCM10",boiler,121,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Cascade MCM10",boiler,121,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Cascade MCM10",boiler,121,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Cascade MCM10",boiler,121,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Cascade MCM10",boiler,121,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Cascade MCM10",boiler,121,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Cascade MCM10",boiler,121,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Proline",boiler,122,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Proline",boiler,122,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Proline",boiler,122,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Proline",boiler,122,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Proline",boiler,122,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Proline",boiler,122,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Proline",boiler,122,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Proline",boiler,122,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Proline",boiler,122,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Proline",boiler,122,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Proline",boiler,122,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Proline",boiler,122,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Proline",boiler,122,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Proline",boiler,122,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Proline",boiler,122,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Proline",boiler,122,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Proline",boiler,122,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Proline",boiler,122,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Proline",boiler,122,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Proline",boiler,122,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Proline",boiler,122,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Proline",boiler,122,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Proline",boiler,122,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Proline",boiler,122,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Proline",boiler,122,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Proline",boiler,122,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Proline",boiler,122,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Proline",boiler,122,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Proline",boiler,122,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Proline",boiler,122,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Proline",boiler,122,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Proline",boiler,122,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Proline",boiler,122,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Proline",boiler,122,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Proline",boiler,122,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Proline",boiler,122,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Proline",boiler,122,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Proline",boiler,122,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Proline",boiler,122,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Proline",boiler,122,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Proline",boiler,122,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Proline",boiler,122,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Proline",boiler,122,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Proline",boiler,122,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Proline",boiler,122,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Proline",boiler,122,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Proline",boiler,122,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Proline",boiler,122,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Proline",boiler,122,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Proline",boiler,122,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Proline",boiler,122,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Proline",boiler,122,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Proline",boiler,122,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Proline",boiler,122,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Proline",boiler,122,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Proline",boiler,122,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Proline",boiler,122,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Proline",boiler,122,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Proline",boiler,122,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Proline",boiler,122,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Proline",boiler,122,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Proline",boiler,122,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Proline",boiler,122,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Proline",boiler,122,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Proline",boiler,122,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Proline",boiler,122,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Proline",boiler,122,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Proline",boiler,122,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Proline",boiler,122,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Proline",boiler,122,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Proline",boiler,122,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Proline",boiler,122,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Proline",boiler,122,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Proline",boiler,122,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Proline",boiler,122,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Proline",boiler,122,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Proline",boiler,122,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Proline",boiler,122,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Proline",boiler,122,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Proline",boiler,122,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Proline",boiler,122,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Proline",boiler,122,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Proline",boiler,122,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Proline",boiler,122,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Proline",boiler,122,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Proline",boiler,122,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Proline",boiler,122,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Proline",boiler,122,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Proline",boiler,122,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Proline",boiler,122,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Proline",boiler,122,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Proline",boiler,122,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Proline",boiler,122,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Proline",boiler,122,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Proline",boiler,122,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Proline",boiler,122,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Proline",boiler,122,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Proline",boiler,122,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Proline",boiler,122,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Proline",boiler,122,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Proline",boiler,122,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Proline",boiler,122,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Proline",boiler,122,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Proline",boiler,122,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Proline",boiler,122,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Proline",boiler,122,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Proline",boiler,122,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Proline",boiler,122,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Proline",boiler,122,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Proline",boiler,122,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Proline",boiler,122,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Proline",boiler,122,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Proline",boiler,122,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Proline",boiler,122,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Proline",boiler,122,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Proline",boiler,122,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Proline",boiler,122,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Proline",boiler,122,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Proline",boiler,122,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Proline",boiler,122,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Proline",boiler,122,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Proline",boiler,122,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Proline",boiler,122,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Proline",boiler,122,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Proline",boiler,122,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Proline",boiler,122,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Proline",boiler,122,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Proline",boiler,122,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Proline",boiler,122,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Proline",boiler,122,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Proline",boiler,122,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Proline",boiler,122,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Proline",boiler,122,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Proline",boiler,122,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Proline",boiler,122,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Proline",boiler,122,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Proline",boiler,122,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Proline",boiler,122,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Proline",boiler,122,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Proline",boiler,122,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Proline",boiler,122,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Proline",boiler,122,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Proline",boiler,122,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Proline",boiler,122,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Proline",boiler,122,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Proline",boiler,122,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Proline",boiler,122,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Proline",boiler,122,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Proline",boiler,122,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Proline",boiler,122,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Proline",boiler,122,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Proline",boiler,122,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Proline",boiler,122,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Proline",boiler,122,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Proline",boiler,122,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Proline",boiler,122,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Proline",boiler,122,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Proline",boiler,122,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Proline",boiler,122,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Proline",boiler,122,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Proline",boiler,122,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Proline",boiler,122,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Proline",boiler,122,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Proline",boiler,122,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Proline",boiler,122,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Proline",boiler,122,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Proline",boiler,122,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Proline",boiler,122,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Proline",boiler,122,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Proline",boiler,122,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Proline",boiler,122,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Proline",boiler,122,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Proline",boiler,122,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Proline",boiler,122,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Proline",boiler,122,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Proline",boiler,122,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Proline",boiler,122,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Proline",boiler,122,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Proline",boiler,122,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Proline",boiler,122,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Proline",boiler,122,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Proline",boiler,122,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Proline",boiler,122,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Proline",boiler,122,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Proline",boiler,122,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Proline",boiler,122,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Proline",boiler,122,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Proline",boiler,122,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Proline",boiler,122,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Proline",boiler,122,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Proline",boiler,122,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Proline",boiler,122,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "GB*72, Trendline, Cerapur, Greenstar Si",boiler,123,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"GB212",boiler,131,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"GB212",boiler,131,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"GB212",boiler,131,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"GB212",boiler,131,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"GB212",boiler,131,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"GB212",boiler,131,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "GB212",boiler,131,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "GB212",boiler,131,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "GB212",boiler,131,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"GB212",boiler,131,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"GB212",boiler,131,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"GB212",boiler,131,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"GB212",boiler,131,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"GB212",boiler,131,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"GB212",boiler,131,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"GB212",boiler,131,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"GB212",boiler,131,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"GB212",boiler,131,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"GB212",boiler,131,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"GB212",boiler,131,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"GB212",boiler,131,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"GB212",boiler,131,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"GB212",boiler,131,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"GB212",boiler,131,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"GB212",boiler,131,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"GB212",boiler,131,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"GB212",boiler,131,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "GB212",boiler,131,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "GB212",boiler,131,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"GB212",boiler,131,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"GB212",boiler,131,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "GB212",boiler,131,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "GB212",boiler,131,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "GB212",boiler,131,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"GB212",boiler,131,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"GB212",boiler,131,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "GB212",boiler,131,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "GB212",boiler,131,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"GB212",boiler,131,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"GB212",boiler,131,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"GB212",boiler,131,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"GB212",boiler,131,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "GB212",boiler,131,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "GB212",boiler,131,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "GB212",boiler,131,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "GB212",boiler,131,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"GB212",boiler,131,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"GB212",boiler,131,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "GB212",boiler,131,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "GB212",boiler,131,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "GB212",boiler,131,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"GB212",boiler,131,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"GB212",boiler,131,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "GB212",boiler,131,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"GB212",boiler,131,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"GB212",boiler,131,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "GB212",boiler,131,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "GB212",boiler,131,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"GB212",boiler,131,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"GB212",boiler,131,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"GB212",boiler,131,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"GB212",boiler,131,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"GB212",boiler,131,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"GB212",boiler,131,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"GB212",boiler,131,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"GB212",boiler,131,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "GB212",boiler,131,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "GB212",boiler,131,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "GB212",boiler,131,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"GB212",boiler,131,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"GB212",boiler,131,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"GB212",boiler,131,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"GB212",boiler,131,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"GB212",boiler,131,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"GB212",boiler,131,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"GB212",boiler,131,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"GB212",boiler,131,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"GB212",boiler,131,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"GB212",boiler,131,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"GB212",boiler,131,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"GB212",boiler,131,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"GB212",boiler,131,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"GB212",boiler,131,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "GB212",boiler,131,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "GB212",boiler,131,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"GB212",boiler,131,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"GB212",boiler,131,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "GB212",boiler,131,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"GB212",boiler,131,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"GB212",boiler,131,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"GB212",boiler,131,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"GB212",boiler,131,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"GB212",boiler,131,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"GB212",boiler,131,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"GB212",boiler,131,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"GB212",boiler,131,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "GB212",boiler,131,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"GB212",boiler,131,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"GB212",boiler,131,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"GB212",boiler,131,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"GB212",boiler,131,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "GB212",boiler,131,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"GB212",boiler,131,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"GB212",boiler,131,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"GB212",boiler,131,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"GB212",boiler,131,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"GB212",boiler,131,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"GB212",boiler,131,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"GB212",boiler,131,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"GB212",boiler,131,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"GB212",boiler,131,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"GB212",boiler,131,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"GB212",boiler,131,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"GB212",boiler,131,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"GB212",boiler,131,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"GB212",boiler,131,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"GB212",boiler,131,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"GB212",boiler,131,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"GB212",boiler,131,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"GB212",boiler,131,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"GB212",boiler,131,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"GB212",boiler,131,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"GB212",boiler,131,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"GB212",boiler,131,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"GB212",boiler,131,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"GB212",boiler,131,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"GB212",boiler,131,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"GB212",boiler,131,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"GB212",boiler,131,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"GB212",boiler,131,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"GB212",boiler,131,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"GB212",boiler,131,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "GB212",boiler,131,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"GB212",boiler,131,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"GB212",boiler,131,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"GB212",boiler,131,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"GB212",boiler,131,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "GB212",boiler,131,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"GB212",boiler,131,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"GB212",boiler,131,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "GB212",boiler,131,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "GB212",boiler,131,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"GB212",boiler,131,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"GB212",boiler,131,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "GB212",boiler,131,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"GB212",boiler,131,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"GB212",boiler,131,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"GB212",boiler,131,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"GB212",boiler,131,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "GB212",boiler,131,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"GB212",boiler,131,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"GB212",boiler,131,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"GB212",boiler,131,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"GB212",boiler,131,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"GB212",boiler,131,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"GB212",boiler,131,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"GB212",boiler,131,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"GB212",boiler,131,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"GB212",boiler,131,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"GB212",boiler,131,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"GB212",boiler,131,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"GB212",boiler,131,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"GB212",boiler,131,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"GB212",boiler,131,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"GB212",boiler,131,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"GB212",boiler,131,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"GB212",boiler,131,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"GB212",boiler,131,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"GB212",boiler,131,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"GB212",boiler,131,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "GB212",boiler,131,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "GB212",boiler,131,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "GB212",boiler,131,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "GB212",boiler,131,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "GB212",boiler,131,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "GB212",boiler,131,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"GB212",boiler,131,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"GB212",boiler,131,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"GB212",boiler,131,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"GB212",boiler,131,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"GB212",boiler,131,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"GB212",boiler,131,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"GB212",boiler,131,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"GB212",boiler,131,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"GB212",boiler,131,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"GB212",boiler,131,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"GB212",boiler,131,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"GB212",boiler,131,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"GB212",boiler,131,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"GB212",boiler,131,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "GB212",boiler,131,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "GB212",boiler,131,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"GC7000F",boiler,132,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"GC7000F",boiler,132,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"GC7000F",boiler,132,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"GC7000F",boiler,132,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"GC7000F",boiler,132,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"GC7000F",boiler,132,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "GC7000F",boiler,132,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "GC7000F",boiler,132,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "GC7000F",boiler,132,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"GC7000F",boiler,132,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"GC7000F",boiler,132,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"GC7000F",boiler,132,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"GC7000F",boiler,132,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"GC7000F",boiler,132,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"GC7000F",boiler,132,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"GC7000F",boiler,132,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"GC7000F",boiler,132,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"GC7000F",boiler,132,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"GC7000F",boiler,132,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"GC7000F",boiler,132,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"GC7000F",boiler,132,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"GC7000F",boiler,132,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"GC7000F",boiler,132,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"GC7000F",boiler,132,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"GC7000F",boiler,132,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"GC7000F",boiler,132,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"GC7000F",boiler,132,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "GC7000F",boiler,132,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "GC7000F",boiler,132,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"GC7000F",boiler,132,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"GC7000F",boiler,132,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "GC7000F",boiler,132,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "GC7000F",boiler,132,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "GC7000F",boiler,132,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"GC7000F",boiler,132,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"GC7000F",boiler,132,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "GC7000F",boiler,132,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "GC7000F",boiler,132,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"GC7000F",boiler,132,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"GC7000F",boiler,132,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"GC7000F",boiler,132,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"GC7000F",boiler,132,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "GC7000F",boiler,132,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "GC7000F",boiler,132,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "GC7000F",boiler,132,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "GC7000F",boiler,132,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"GC7000F",boiler,132,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"GC7000F",boiler,132,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "GC7000F",boiler,132,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "GC7000F",boiler,132,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "GC7000F",boiler,132,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"GC7000F",boiler,132,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"GC7000F",boiler,132,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "GC7000F",boiler,132,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"GC7000F",boiler,132,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"GC7000F",boiler,132,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "GC7000F",boiler,132,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "GC7000F",boiler,132,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"GC7000F",boiler,132,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"GC7000F",boiler,132,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"GC7000F",boiler,132,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"GC7000F",boiler,132,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"GC7000F",boiler,132,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"GC7000F",boiler,132,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"GC7000F",boiler,132,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"GC7000F",boiler,132,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "GC7000F",boiler,132,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "GC7000F",boiler,132,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "GC7000F",boiler,132,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"GC7000F",boiler,132,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"GC7000F",boiler,132,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"GC7000F",boiler,132,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"GC7000F",boiler,132,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"GC7000F",boiler,132,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"GC7000F",boiler,132,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"GC7000F",boiler,132,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"GC7000F",boiler,132,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"GC7000F",boiler,132,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"GC7000F",boiler,132,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"GC7000F",boiler,132,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"GC7000F",boiler,132,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"GC7000F",boiler,132,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"GC7000F",boiler,132,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "GC7000F",boiler,132,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "GC7000F",boiler,132,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"GC7000F",boiler,132,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"GC7000F",boiler,132,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "GC7000F",boiler,132,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"GC7000F",boiler,132,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"GC7000F",boiler,132,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"GC7000F",boiler,132,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"GC7000F",boiler,132,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"GC7000F",boiler,132,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"GC7000F",boiler,132,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"GC7000F",boiler,132,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"GC7000F",boiler,132,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "GC7000F",boiler,132,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"GC7000F",boiler,132,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"GC7000F",boiler,132,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"GC7000F",boiler,132,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"GC7000F",boiler,132,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "GC7000F",boiler,132,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"GC7000F",boiler,132,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"GC7000F",boiler,132,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"GC7000F",boiler,132,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"GC7000F",boiler,132,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"GC7000F",boiler,132,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"GC7000F",boiler,132,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"GC7000F",boiler,132,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"GC7000F",boiler,132,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"GC7000F",boiler,132,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"GC7000F",boiler,132,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"GC7000F",boiler,132,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"GC7000F",boiler,132,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"GC7000F",boiler,132,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"GC7000F",boiler,132,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"GC7000F",boiler,132,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"GC7000F",boiler,132,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"GC7000F",boiler,132,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"GC7000F",boiler,132,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"GC7000F",boiler,132,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"GC7000F",boiler,132,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"GC7000F",boiler,132,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"GC7000F",boiler,132,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"GC7000F",boiler,132,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"GC7000F",boiler,132,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"GC7000F",boiler,132,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"GC7000F",boiler,132,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"GC7000F",boiler,132,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"GC7000F",boiler,132,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"GC7000F",boiler,132,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"GC7000F",boiler,132,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "GC7000F",boiler,132,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"GC7000F",boiler,132,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"GC7000F",boiler,132,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"GC7000F",boiler,132,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"GC7000F",boiler,132,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "GC7000F",boiler,132,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"GC7000F",boiler,132,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"GC7000F",boiler,132,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "GC7000F",boiler,132,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "GC7000F",boiler,132,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"GC7000F",boiler,132,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"GC7000F",boiler,132,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "GC7000F",boiler,132,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"GC7000F",boiler,132,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"GC7000F",boiler,132,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"GC7000F",boiler,132,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"GC7000F",boiler,132,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "GC7000F",boiler,132,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"GC7000F",boiler,132,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"GC7000F",boiler,132,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"GC7000F",boiler,132,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"GC7000F",boiler,132,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"GC7000F",boiler,132,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"GC7000F",boiler,132,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"GC7000F",boiler,132,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"GC7000F",boiler,132,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"GC7000F",boiler,132,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"GC7000F",boiler,132,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"GC7000F",boiler,132,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"GC7000F",boiler,132,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"GC7000F",boiler,132,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"GC7000F",boiler,132,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"GC7000F",boiler,132,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"GC7000F",boiler,132,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"GC7000F",boiler,132,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"GC7000F",boiler,132,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"GC7000F",boiler,132,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"GC7000F",boiler,132,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "GC7000F",boiler,132,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "GC7000F",boiler,132,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "GC7000F",boiler,132,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "GC7000F",boiler,132,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "GC7000F",boiler,132,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "GC7000F",boiler,132,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"GC7000F",boiler,132,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"GC7000F",boiler,132,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"GC7000F",boiler,132,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"GC7000F",boiler,132,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"GC7000F",boiler,132,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"GC7000F",boiler,132,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"GC7000F",boiler,132,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"GC7000F",boiler,132,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"GC7000F",boiler,132,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"GC7000F",boiler,132,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"GC7000F",boiler,132,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"GC7000F",boiler,132,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"GC7000F",boiler,132,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"GC7000F",boiler,132,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "GC7000F",boiler,132,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "GC7000F",boiler,132,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Logano GB125/KB195i, Logamatic MC110",boiler,133,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Logano GB125/KB195i, Logamatic MC110",boiler,133,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Logano GB125/KB195i, Logamatic MC110",boiler,133,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Greenstar 30Ri Compact",boiler,154,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Greenstar 30Ri Compact",boiler,154,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Greenstar 30Ri Compact",boiler,154,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Greenstar 30Ri Compact",boiler,154,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Greenstar 30Ri Compact",boiler,154,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Greenstar 30Ri Compact",boiler,154,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Greenstar 30Ri Compact",boiler,154,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Greenstar 30Ri Compact",boiler,154,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Greenstar 30Ri Compact",boiler,154,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Greenstar 30Ri Compact",boiler,154,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Greenstar 30Ri Compact",boiler,154,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Greenstar 30Ri Compact",boiler,154,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Greenstar 30Ri Compact",boiler,154,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Greenstar 30Ri Compact",boiler,154,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Greenstar 30Ri Compact",boiler,154,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Greenstar 30Ri Compact",boiler,154,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Greenstar 30Ri Compact",boiler,154,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Greenstar 30Ri Compact",boiler,154,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Greenstar 30Ri Compact",boiler,154,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Greenstar 30Ri Compact",boiler,154,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Greenstar 30Ri Compact",boiler,154,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Greenstar 30Ri Compact",boiler,154,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Greenstar 30Ri Compact",boiler,154,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Greenstar 30Ri Compact",boiler,154,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Greenstar 30Ri Compact",boiler,154,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Greenstar 30Ri Compact",boiler,154,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Greenstar 30Ri Compact",boiler,154,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Greenstar 30Ri Compact",boiler,154,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Greenstar 30Ri Compact",boiler,154,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Greenstar 30Ri Compact",boiler,154,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Greenstar 30Ri Compact",boiler,154,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Greenstar 30Ri Compact",boiler,154,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Greenstar 30Ri Compact",boiler,154,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Greenstar 30Ri Compact",boiler,154,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Greenstar 30Ri Compact",boiler,154,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Greenstar 30Ri Compact",boiler,154,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Greenstar 30Ri Compact",boiler,154,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Greenstar 30Ri Compact",boiler,154,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Greenstar 30Ri Compact",boiler,154,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Greenstar 30Ri Compact",boiler,154,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Greenstar 30Ri Compact",boiler,154,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Greenstar 30Ri Compact",boiler,154,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Greenstar 30Ri Compact",boiler,154,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Greenstar 30Ri Compact",boiler,154,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Greenstar 30Ri Compact",boiler,154,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Greenstar 30Ri Compact",boiler,154,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Greenstar 30Ri Compact",boiler,154,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Greenstar 30Ri Compact",boiler,154,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Greenstar 30Ri Compact",boiler,154,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Greenstar 30Ri Compact",boiler,154,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Greenstar 30Ri Compact",boiler,154,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Greenstar 30Ri Compact",boiler,154,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Greenstar 30Ri Compact",boiler,154,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Greenstar 30Ri Compact",boiler,154,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Greenstar 30Ri Compact",boiler,154,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Greenstar 30Ri Compact",boiler,154,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Greenstar 30Ri Compact",boiler,154,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Greenstar 30Ri Compact",boiler,154,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Greenstar 30Ri Compact",boiler,154,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Greenstar 30Ri Compact",boiler,154,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Greenstar 30Ri Compact",boiler,154,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Greenstar 30Ri Compact",boiler,154,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Greenstar 30Ri Compact",boiler,154,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Greenstar 30Ri Compact",boiler,154,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Greenstar 30Ri Compact",boiler,154,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Greenstar 30Ri Compact",boiler,154,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Greenstar 30Ri Compact",boiler,154,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Greenstar 30Ri Compact",boiler,154,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Greenstar 30Ri Compact",boiler,154,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Greenstar 30Ri Compact",boiler,154,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Greenstar 30Ri Compact",boiler,154,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Greenstar 30Ri Compact",boiler,154,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Greenstar 30Ri Compact",boiler,154,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Greenstar 30Ri Compact",boiler,154,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Greenstar 30Ri Compact",boiler,154,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Greenstar 30Ri Compact",boiler,154,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Greenstar 30Ri Compact",boiler,154,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Greenstar 30Ri Compact",boiler,154,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Greenstar 30Ri Compact",boiler,154,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Greenstar 30Ri Compact",boiler,154,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Greenstar 30Ri Compact",boiler,154,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Greenstar 30Ri Compact",boiler,154,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Greenstar 30Ri Compact",boiler,154,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Greenstar 30Ri Compact",boiler,154,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Greenstar 30Ri Compact",boiler,154,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Greenstar 30Ri Compact",boiler,154,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Greenstar 30Ri Compact",boiler,154,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Greenstar 30Ri Compact",boiler,154,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Greenstar 30Ri Compact",boiler,154,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Greenstar 30Ri Compact",boiler,154,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Greenstar 30Ri Compact",boiler,154,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Greenstar 30Ri Compact",boiler,154,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Greenstar 30Ri Compact",boiler,154,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Greenstar 30Ri Compact",boiler,154,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Greenstar 30Ri Compact",boiler,154,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Greenstar 30Ri Compact",boiler,154,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Greenstar 30Ri Compact",boiler,154,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Greenstar 30Ri Compact",boiler,154,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Greenstar 30Ri Compact",boiler,154,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Greenstar 30Ri Compact",boiler,154,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Greenstar 30Ri Compact",boiler,154,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Greenstar 30Ri Compact",boiler,154,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Greenstar 30Ri Compact",boiler,154,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Greenstar 30Ri Compact",boiler,154,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Greenstar 30Ri Compact",boiler,154,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Greenstar 30Ri Compact",boiler,154,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Greenstar 30Ri Compact",boiler,154,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Greenstar 30Ri Compact",boiler,154,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Greenstar 30Ri Compact",boiler,154,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Greenstar 30Ri Compact",boiler,154,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Greenstar 30Ri Compact",boiler,154,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Greenstar 30Ri Compact",boiler,154,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Greenstar 30Ri Compact",boiler,154,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Greenstar 30Ri Compact",boiler,154,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Greenstar 30Ri Compact",boiler,154,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Greenstar 30Ri Compact",boiler,154,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Greenstar 30Ri Compact",boiler,154,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Greenstar 30Ri Compact",boiler,154,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Greenstar 30Ri Compact",boiler,154,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Greenstar 30Ri Compact",boiler,154,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Greenstar 30Ri Compact",boiler,154,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Greenstar 30Ri Compact",boiler,154,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Greenstar 30Ri Compact",boiler,154,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Greenstar 30Ri Compact",boiler,154,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Greenstar 30Ri Compact",boiler,154,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Greenstar 30Ri Compact",boiler,154,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Greenstar 30Ri Compact",boiler,154,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Greenstar 30Ri Compact",boiler,154,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Greenstar 30Ri Compact",boiler,154,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Greenstar 30Ri Compact",boiler,154,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Greenstar 30Ri Compact",boiler,154,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Greenstar 30Ri Compact",boiler,154,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Greenstar 30Ri Compact",boiler,154,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Greenstar 30Ri Compact",boiler,154,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Greenstar 30Ri Compact",boiler,154,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Greenstar 30Ri Compact",boiler,154,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Greenstar 30Ri Compact",boiler,154,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Greenstar 30Ri Compact",boiler,154,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Greenstar 30Ri Compact",boiler,154,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Greenstar 30Ri Compact",boiler,154,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Greenstar 30Ri Compact",boiler,154,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Greenstar 30Ri Compact",boiler,154,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Greenstar 30Ri Compact",boiler,154,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Greenstar 30Ri Compact",boiler,154,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Greenstar 30Ri Compact",boiler,154,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Greenstar 30Ri Compact",boiler,154,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Greenstar 30Ri Compact",boiler,154,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Greenstar 30Ri Compact",boiler,154,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Greenstar 30Ri Compact",boiler,154,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Greenstar 30Ri Compact",boiler,154,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Greenstar 30Ri Compact",boiler,154,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Greenstar 30Ri Compact",boiler,154,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Greenstar 30Ri Compact",boiler,154,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Greenstar 30Ri Compact",boiler,154,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Greenstar 30Ri Compact",boiler,154,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Greenstar 30Ri Compact",boiler,154,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Greenstar 30Ri Compact",boiler,154,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Greenstar 30Ri Compact",boiler,154,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Greenstar 30Ri Compact",boiler,154,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Greenstar 30Ri Compact",boiler,154,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Greenstar 30Ri Compact",boiler,154,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Greenstar 30Ri Compact",boiler,154,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Greenstar 30Ri Compact",boiler,154,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Greenstar 30Ri Compact",boiler,154,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Greenstar 30Ri Compact",boiler,154,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Greenstar 30Ri Compact",boiler,154,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Greenstar 30Ri Compact",boiler,154,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Greenstar 30Ri Compact",boiler,154,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Greenstar 30Ri Compact",boiler,154,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Greenstar 30Ri Compact",boiler,154,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Greenstar 30Ri Compact",boiler,154,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Greenstar 30Ri Compact",boiler,154,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Greenstar 30Ri Compact",boiler,154,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Greenstar 30Ri Compact",boiler,154,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Greenstar 30Ri Compact",boiler,154,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Greenstar 30Ri Compact",boiler,154,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Greenstar 30Ri Compact",boiler,154,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Greenstar 30Ri Compact",boiler,154,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Greenstar 30Ri Compact",boiler,154,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Greenstar 30Ri Compact",boiler,154,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Greenstar 30Ri Compact",boiler,154,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Greenstar 30Ri Compact",boiler,154,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Greenstar 30Ri Compact",boiler,154,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Greenstar 30Ri Compact",boiler,154,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Greenstar 30Ri Compact",boiler,154,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Greenstar 30Ri Compact",boiler,154,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Greenstar 30Ri Compact",boiler,154,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Greenstar 30Ri Compact",boiler,154,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Greenstar 30Ri Compact",boiler,154,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Greenstar 30Ri Compact",boiler,154,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Greenstar 30Ri Compact",boiler,154,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Greenstar 30Ri Compact",boiler,154,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Suprapur-o",boiler,155,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Suprapur-o",boiler,155,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Suprapur-o",boiler,155,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Suprapur-o",boiler,155,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Suprapur-o",boiler,155,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Suprapur-o",boiler,155,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Suprapur-o",boiler,155,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Suprapur-o",boiler,155,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Suprapur-o",boiler,155,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Suprapur-o",boiler,155,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Suprapur-o",boiler,155,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Suprapur-o",boiler,155,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Suprapur-o",boiler,155,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Suprapur-o",boiler,155,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Suprapur-o",boiler,155,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Suprapur-o",boiler,155,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Suprapur-o",boiler,155,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Suprapur-o",boiler,155,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Suprapur-o",boiler,155,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Suprapur-o",boiler,155,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Suprapur-o",boiler,155,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Suprapur-o",boiler,155,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Suprapur-o",boiler,155,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Suprapur-o",boiler,155,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Suprapur-o",boiler,155,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Suprapur-o",boiler,155,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Suprapur-o",boiler,155,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Suprapur-o",boiler,155,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Suprapur-o",boiler,155,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Suprapur-o",boiler,155,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Suprapur-o",boiler,155,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Suprapur-o",boiler,155,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Suprapur-o",boiler,155,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Suprapur-o",boiler,155,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Suprapur-o",boiler,155,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Suprapur-o",boiler,155,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Suprapur-o",boiler,155,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Suprapur-o",boiler,155,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Suprapur-o",boiler,155,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Suprapur-o",boiler,155,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Suprapur-o",boiler,155,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Suprapur-o",boiler,155,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Suprapur-o",boiler,155,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Suprapur-o",boiler,155,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Suprapur-o",boiler,155,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Suprapur-o",boiler,155,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Suprapur-o",boiler,155,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Suprapur-o",boiler,155,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Suprapur-o",boiler,155,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Suprapur-o",boiler,155,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Suprapur-o",boiler,155,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Suprapur-o",boiler,155,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Suprapur-o",boiler,155,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Suprapur-o",boiler,155,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Suprapur-o",boiler,155,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Suprapur-o",boiler,155,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Suprapur-o",boiler,155,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Suprapur-o",boiler,155,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Suprapur-o",boiler,155,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Suprapur-o",boiler,155,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Suprapur-o",boiler,155,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Suprapur-o",boiler,155,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Suprapur-o",boiler,155,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Suprapur-o",boiler,155,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Suprapur-o",boiler,155,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Suprapur-o",boiler,155,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Suprapur-o",boiler,155,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Suprapur-o",boiler,155,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Suprapur-o",boiler,155,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Suprapur-o",boiler,155,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Suprapur-o",boiler,155,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Suprapur-o",boiler,155,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Suprapur-o",boiler,155,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Suprapur-o",boiler,155,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Suprapur-o",boiler,155,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Suprapur-o",boiler,155,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Suprapur-o",boiler,155,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Suprapur-o",boiler,155,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Suprapur-o",boiler,155,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Suprapur-o",boiler,155,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Suprapur-o",boiler,155,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Suprapur-o",boiler,155,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Suprapur-o",boiler,155,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Suprapur-o",boiler,155,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Suprapur-o",boiler,155,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Suprapur-o",boiler,155,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Suprapur-o",boiler,155,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Suprapur-o",boiler,155,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Suprapur-o",boiler,155,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Suprapur-o",boiler,155,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Suprapur-o",boiler,155,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Suprapur-o",boiler,155,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Suprapur-o",boiler,155,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Suprapur-o",boiler,155,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Suprapur-o",boiler,155,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Suprapur-o",boiler,155,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Suprapur-o",boiler,155,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Suprapur-o",boiler,155,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Suprapur-o",boiler,155,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Suprapur-o",boiler,155,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Suprapur-o",boiler,155,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Suprapur-o",boiler,155,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Suprapur-o",boiler,155,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Suprapur-o",boiler,155,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Suprapur-o",boiler,155,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Suprapur-o",boiler,155,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Suprapur-o",boiler,155,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Suprapur-o",boiler,155,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Suprapur-o",boiler,155,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Suprapur-o",boiler,155,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Suprapur-o",boiler,155,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Suprapur-o",boiler,155,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Suprapur-o",boiler,155,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Suprapur-o",boiler,155,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Suprapur-o",boiler,155,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Suprapur-o",boiler,155,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Suprapur-o",boiler,155,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Suprapur-o",boiler,155,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Suprapur-o",boiler,155,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Suprapur-o",boiler,155,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Suprapur-o",boiler,155,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Suprapur-o",boiler,155,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Suprapur-o",boiler,155,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Suprapur-o",boiler,155,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Suprapur-o",boiler,155,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Suprapur-o",boiler,155,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Suprapur-o",boiler,155,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Suprapur-o",boiler,155,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Suprapur-o",boiler,155,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Suprapur-o",boiler,155,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Suprapur-o",boiler,155,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Suprapur-o",boiler,155,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Suprapur-o",boiler,155,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Suprapur-o",boiler,155,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Suprapur-o",boiler,155,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Suprapur-o",boiler,155,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Suprapur-o",boiler,155,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Suprapur-o",boiler,155,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Suprapur-o",boiler,155,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Suprapur-o",boiler,155,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Suprapur-o",boiler,155,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Suprapur-o",boiler,155,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Suprapur-o",boiler,155,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Suprapur-o",boiler,155,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Suprapur-o",boiler,155,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Suprapur-o",boiler,155,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Suprapur-o",boiler,155,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Suprapur-o",boiler,155,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Suprapur-o",boiler,155,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Suprapur-o",boiler,155,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Suprapur-o",boiler,155,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Suprapur-o",boiler,155,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Suprapur-o",boiler,155,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Suprapur-o",boiler,155,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Suprapur-o",boiler,155,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Suprapur-o",boiler,155,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Suprapur-o",boiler,155,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Suprapur-o",boiler,155,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Suprapur-o",boiler,155,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Suprapur-o",boiler,155,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Suprapur-o",boiler,155,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Suprapur-o",boiler,155,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Suprapur-o",boiler,155,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Suprapur-o",boiler,155,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Suprapur-o",boiler,155,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Suprapur-o",boiler,155,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Suprapur-o",boiler,155,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Suprapur-o",boiler,155,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Suprapur-o",boiler,155,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Suprapur-o",boiler,155,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Suprapur-o",boiler,155,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Suprapur-o",boiler,155,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Suprapur-o",boiler,155,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Suprapur-o",boiler,155,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Suprapur-o",boiler,155,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Suprapur-o",boiler,155,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Suprapur-o",boiler,155,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Suprapur-o",boiler,155,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Suprapur-o",boiler,155,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Suprapur-o",boiler,155,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Suprapur-o",boiler,155,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Suprapur-o",boiler,155,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Suprapur-o",boiler,155,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Suprapur-o",boiler,155,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Suprapur-o",boiler,155,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Suprapur-o",boiler,155,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Suprapur-o",boiler,155,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Suprapur-o",boiler,155,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Suprapur-o",boiler,155,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Suprapur-o",boiler,155,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Suprapur-o",boiler,155,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Suprapur-o",boiler,155,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Cerapur Aero",boiler,167,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Cerapur Aero",boiler,167,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Cerapur Aero",boiler,167,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Cerapur Aero",boiler,167,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Cerapur Aero",boiler,167,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Cerapur Aero",boiler,167,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Cerapur Aero",boiler,167,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Cerapur Aero",boiler,167,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Cerapur Aero",boiler,167,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Cerapur Aero",boiler,167,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Cerapur Aero",boiler,167,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Cerapur Aero",boiler,167,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Cerapur Aero",boiler,167,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Cerapur Aero",boiler,167,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Cerapur Aero",boiler,167,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Cerapur Aero",boiler,167,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Cerapur Aero",boiler,167,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Cerapur Aero",boiler,167,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Cerapur Aero",boiler,167,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Cerapur Aero",boiler,167,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Cerapur Aero",boiler,167,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Cerapur Aero",boiler,167,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Cerapur Aero",boiler,167,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Cerapur Aero",boiler,167,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Cerapur Aero",boiler,167,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Cerapur Aero",boiler,167,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Cerapur Aero",boiler,167,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Cerapur Aero",boiler,167,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Cerapur Aero",boiler,167,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Cerapur Aero",boiler,167,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Cerapur Aero",boiler,167,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Cerapur Aero",boiler,167,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Cerapur Aero",boiler,167,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Cerapur Aero",boiler,167,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Cerapur Aero",boiler,167,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Cerapur Aero",boiler,167,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Cerapur Aero",boiler,167,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Cerapur Aero",boiler,167,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Cerapur Aero",boiler,167,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Cerapur Aero",boiler,167,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Cerapur Aero",boiler,167,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Cerapur Aero",boiler,167,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Cerapur Aero",boiler,167,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Cerapur Aero",boiler,167,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Cerapur Aero",boiler,167,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Cerapur Aero",boiler,167,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Cerapur Aero",boiler,167,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Cerapur Aero",boiler,167,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Cerapur Aero",boiler,167,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Cerapur Aero",boiler,167,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Cerapur Aero",boiler,167,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Cerapur Aero",boiler,167,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Cerapur Aero",boiler,167,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Cerapur Aero",boiler,167,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Cerapur Aero",boiler,167,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Cerapur Aero",boiler,167,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Cerapur Aero",boiler,167,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Cerapur Aero",boiler,167,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Cerapur Aero",boiler,167,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Cerapur Aero",boiler,167,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Cerapur Aero",boiler,167,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Cerapur Aero",boiler,167,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Cerapur Aero",boiler,167,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Cerapur Aero",boiler,167,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Cerapur Aero",boiler,167,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Cerapur Aero",boiler,167,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Cerapur Aero",boiler,167,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Cerapur Aero",boiler,167,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Cerapur Aero",boiler,167,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Cerapur Aero",boiler,167,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Cerapur Aero",boiler,167,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Cerapur Aero",boiler,167,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Cerapur Aero",boiler,167,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Cerapur Aero",boiler,167,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Cerapur Aero",boiler,167,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Cerapur Aero",boiler,167,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Cerapur Aero",boiler,167,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Cerapur Aero",boiler,167,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Cerapur Aero",boiler,167,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Cerapur Aero",boiler,167,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Cerapur Aero",boiler,167,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Cerapur Aero",boiler,167,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Cerapur Aero",boiler,167,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Cerapur Aero",boiler,167,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Cerapur Aero",boiler,167,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Cerapur Aero",boiler,167,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Cerapur Aero",boiler,167,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Cerapur Aero",boiler,167,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Cerapur Aero",boiler,167,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Cerapur Aero",boiler,167,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Cerapur Aero",boiler,167,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Cerapur Aero",boiler,167,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Cerapur Aero",boiler,167,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Cerapur Aero",boiler,167,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Cerapur Aero",boiler,167,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Cerapur Aero",boiler,167,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Cerapur Aero",boiler,167,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Cerapur Aero",boiler,167,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Cerapur Aero",boiler,167,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Cerapur Aero",boiler,167,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Cerapur Aero",boiler,167,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Cerapur Aero",boiler,167,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Cerapur Aero",boiler,167,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Cerapur Aero",boiler,167,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Cerapur Aero",boiler,167,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Cerapur Aero",boiler,167,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Cerapur Aero",boiler,167,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Cerapur Aero",boiler,167,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Cerapur Aero",boiler,167,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Cerapur Aero",boiler,167,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Cerapur Aero",boiler,167,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Cerapur Aero",boiler,167,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Cerapur Aero",boiler,167,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Cerapur Aero",boiler,167,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Cerapur Aero",boiler,167,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Cerapur Aero",boiler,167,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Cerapur Aero",boiler,167,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Cerapur Aero",boiler,167,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Cerapur Aero",boiler,167,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Cerapur Aero",boiler,167,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Cerapur Aero",boiler,167,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Cerapur Aero",boiler,167,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Cerapur Aero",boiler,167,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Cerapur Aero",boiler,167,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Cerapur Aero",boiler,167,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Cerapur Aero",boiler,167,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Cerapur Aero",boiler,167,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Cerapur Aero",boiler,167,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Cerapur Aero",boiler,167,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Cerapur Aero",boiler,167,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Cerapur Aero",boiler,167,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Cerapur Aero",boiler,167,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Cerapur Aero",boiler,167,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Cerapur Aero",boiler,167,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Cerapur Aero",boiler,167,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Cerapur Aero",boiler,167,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Cerapur Aero",boiler,167,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Cerapur Aero",boiler,167,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Cerapur Aero",boiler,167,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Cerapur Aero",boiler,167,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Cerapur Aero",boiler,167,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Cerapur Aero",boiler,167,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Cerapur Aero",boiler,167,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Cerapur Aero",boiler,167,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Cerapur Aero",boiler,167,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Cerapur Aero",boiler,167,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Cerapur Aero",boiler,167,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Cerapur Aero",boiler,167,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Cerapur Aero",boiler,167,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Cerapur Aero",boiler,167,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Cerapur Aero",boiler,167,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Cerapur Aero",boiler,167,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Cerapur Aero",boiler,167,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Cerapur Aero",boiler,167,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Cerapur Aero",boiler,167,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Cerapur Aero",boiler,167,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Cerapur Aero",boiler,167,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Cerapur Aero",boiler,167,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Cerapur Aero",boiler,167,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Cerapur Aero",boiler,167,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Cerapur Aero",boiler,167,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Cerapur Aero",boiler,167,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Cerapur Aero",boiler,167,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Cerapur Aero",boiler,167,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Cerapur Aero",boiler,167,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Cerapur Aero",boiler,167,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Cerapur Aero",boiler,167,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Cerapur Aero",boiler,167,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Cerapur Aero",boiler,167,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Cerapur Aero",boiler,167,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Cerapur Aero",boiler,167,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Cerapur Aero",boiler,167,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Cerapur Aero",boiler,167,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Cerapur Aero",boiler,167,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Cerapur Aero",boiler,167,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Cerapur Aero",boiler,167,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Cerapur Aero",boiler,167,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Cerapur Aero",boiler,167,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Cerapur Aero",boiler,167,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Cerapur Aero",boiler,167,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Cerapur Aero",boiler,167,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Cerapur Aero",boiler,167,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Cerapur Aero",boiler,167,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Cerapur Aero",boiler,167,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Cerapur Aero",boiler,167,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Cerapur Aero",boiler,167,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Cerapur Aero",boiler,167,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Cerapur Aero",boiler,167,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Cerapur Aero",boiler,167,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Cerapur Aero",boiler,167,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Cerapur Aero",boiler,167,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Cerapur Aero",boiler,167,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Hybrid Heatpump",boiler,168,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Hybrid Heatpump",boiler,168,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Hybrid Heatpump",boiler,168,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Hybrid Heatpump",boiler,168,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Hybrid Heatpump",boiler,168,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Hybrid Heatpump",boiler,168,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Hybrid Heatpump",boiler,168,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Hybrid Heatpump",boiler,168,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Hybrid Heatpump",boiler,168,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Hybrid Heatpump",boiler,168,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Hybrid Heatpump",boiler,168,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Hybrid Heatpump",boiler,168,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Hybrid Heatpump",boiler,168,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Hybrid Heatpump",boiler,168,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Hybrid Heatpump",boiler,168,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Hybrid Heatpump",boiler,168,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Hybrid Heatpump",boiler,168,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Hybrid Heatpump",boiler,168,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Hybrid Heatpump",boiler,168,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Hybrid Heatpump",boiler,168,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Hybrid Heatpump",boiler,168,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Hybrid Heatpump",boiler,168,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Hybrid Heatpump",boiler,168,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Hybrid Heatpump",boiler,168,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Hybrid Heatpump",boiler,168,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Hybrid Heatpump",boiler,168,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Hybrid Heatpump",boiler,168,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Hybrid Heatpump",boiler,168,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Hybrid Heatpump",boiler,168,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Hybrid Heatpump",boiler,168,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Hybrid Heatpump",boiler,168,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Hybrid Heatpump",boiler,168,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Hybrid Heatpump",boiler,168,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Hybrid Heatpump",boiler,168,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Hybrid Heatpump",boiler,168,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Hybrid Heatpump",boiler,168,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Hybrid Heatpump",boiler,168,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Hybrid Heatpump",boiler,168,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Hybrid Heatpump",boiler,168,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Hybrid Heatpump",boiler,168,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Hybrid Heatpump",boiler,168,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Hybrid Heatpump",boiler,168,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Hybrid Heatpump",boiler,168,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Hybrid Heatpump",boiler,168,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Hybrid Heatpump",boiler,168,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Hybrid Heatpump",boiler,168,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Hybrid Heatpump",boiler,168,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Hybrid Heatpump",boiler,168,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Hybrid Heatpump",boiler,168,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Hybrid Heatpump",boiler,168,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Hybrid Heatpump",boiler,168,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Hybrid Heatpump",boiler,168,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Hybrid Heatpump",boiler,168,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Hybrid Heatpump",boiler,168,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Hybrid Heatpump",boiler,168,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Hybrid Heatpump",boiler,168,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Hybrid Heatpump",boiler,168,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Hybrid Heatpump",boiler,168,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Hybrid Heatpump",boiler,168,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Hybrid Heatpump",boiler,168,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Hybrid Heatpump",boiler,168,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Hybrid Heatpump",boiler,168,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Hybrid Heatpump",boiler,168,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Hybrid Heatpump",boiler,168,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Hybrid Heatpump",boiler,168,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Hybrid Heatpump",boiler,168,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Hybrid Heatpump",boiler,168,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Hybrid Heatpump",boiler,168,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Hybrid Heatpump",boiler,168,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Hybrid Heatpump",boiler,168,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Hybrid Heatpump",boiler,168,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Hybrid Heatpump",boiler,168,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Hybrid Heatpump",boiler,168,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Hybrid Heatpump",boiler,168,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Hybrid Heatpump",boiler,168,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Hybrid Heatpump",boiler,168,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Hybrid Heatpump",boiler,168,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Hybrid Heatpump",boiler,168,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Hybrid Heatpump",boiler,168,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Hybrid Heatpump",boiler,168,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Hybrid Heatpump",boiler,168,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Hybrid Heatpump",boiler,168,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Hybrid Heatpump",boiler,168,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Hybrid Heatpump",boiler,168,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Hybrid Heatpump",boiler,168,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Hybrid Heatpump",boiler,168,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Hybrid Heatpump",boiler,168,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Hybrid Heatpump",boiler,168,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Hybrid Heatpump",boiler,168,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Hybrid Heatpump",boiler,168,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Hybrid Heatpump",boiler,168,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Hybrid Heatpump",boiler,168,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Hybrid Heatpump",boiler,168,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Hybrid Heatpump",boiler,168,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Hybrid Heatpump",boiler,168,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Hybrid Heatpump",boiler,168,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Hybrid Heatpump",boiler,168,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Hybrid Heatpump",boiler,168,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Hybrid Heatpump",boiler,168,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Hybrid Heatpump",boiler,168,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Hybrid Heatpump",boiler,168,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Hybrid Heatpump",boiler,168,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Hybrid Heatpump",boiler,168,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Hybrid Heatpump",boiler,168,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Hybrid Heatpump",boiler,168,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Hybrid Heatpump",boiler,168,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Hybrid Heatpump",boiler,168,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Hybrid Heatpump",boiler,168,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Hybrid Heatpump",boiler,168,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Hybrid Heatpump",boiler,168,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Hybrid Heatpump",boiler,168,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Hybrid Heatpump",boiler,168,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Hybrid Heatpump",boiler,168,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Hybrid Heatpump",boiler,168,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Hybrid Heatpump",boiler,168,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Hybrid Heatpump",boiler,168,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Hybrid Heatpump",boiler,168,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Hybrid Heatpump",boiler,168,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Hybrid Heatpump",boiler,168,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Hybrid Heatpump",boiler,168,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Hybrid Heatpump",boiler,168,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Hybrid Heatpump",boiler,168,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Hybrid Heatpump",boiler,168,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Hybrid Heatpump",boiler,168,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Hybrid Heatpump",boiler,168,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Hybrid Heatpump",boiler,168,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Hybrid Heatpump",boiler,168,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Hybrid Heatpump",boiler,168,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Hybrid Heatpump",boiler,168,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Hybrid Heatpump",boiler,168,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Hybrid Heatpump",boiler,168,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Hybrid Heatpump",boiler,168,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Hybrid Heatpump",boiler,168,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Hybrid Heatpump",boiler,168,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Hybrid Heatpump",boiler,168,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Hybrid Heatpump",boiler,168,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Hybrid Heatpump",boiler,168,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Hybrid Heatpump",boiler,168,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Hybrid Heatpump",boiler,168,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Hybrid Heatpump",boiler,168,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Hybrid Heatpump",boiler,168,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Hybrid Heatpump",boiler,168,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Hybrid Heatpump",boiler,168,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Hybrid Heatpump",boiler,168,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Hybrid Heatpump",boiler,168,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Hybrid Heatpump",boiler,168,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Hybrid Heatpump",boiler,168,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Hybrid Heatpump",boiler,168,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Hybrid Heatpump",boiler,168,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Hybrid Heatpump",boiler,168,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Hybrid Heatpump",boiler,168,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Hybrid Heatpump",boiler,168,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Hybrid Heatpump",boiler,168,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Hybrid Heatpump",boiler,168,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Hybrid Heatpump",boiler,168,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Hybrid Heatpump",boiler,168,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Hybrid Heatpump",boiler,168,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Hybrid Heatpump",boiler,168,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Hybrid Heatpump",boiler,168,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Hybrid Heatpump",boiler,168,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Hybrid Heatpump",boiler,168,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Hybrid Heatpump",boiler,168,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Hybrid Heatpump",boiler,168,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Hybrid Heatpump",boiler,168,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Hybrid Heatpump",boiler,168,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Hybrid Heatpump",boiler,168,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Hybrid Heatpump",boiler,168,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Hybrid Heatpump",boiler,168,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Hybrid Heatpump",boiler,168,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Hybrid Heatpump",boiler,168,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Hybrid Heatpump",boiler,168,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Hybrid Heatpump",boiler,168,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Hybrid Heatpump",boiler,168,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Hybrid Heatpump",boiler,168,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Hybrid Heatpump",boiler,168,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Hybrid Heatpump",boiler,168,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Hybrid Heatpump",boiler,168,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Hybrid Heatpump",boiler,168,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Hybrid Heatpump",boiler,168,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Hybrid Heatpump",boiler,168,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Hybrid Heatpump",boiler,168,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Hybrid Heatpump",boiler,168,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Hybrid Heatpump",boiler,168,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Hybrid Heatpump",boiler,168,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Hybrid Heatpump",boiler,168,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Hybrid Heatpump",boiler,168,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Hybrid Heatpump",boiler,168,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Hybrid Heatpump",boiler,168,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Hybrid Heatpump",boiler,168,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Hybrid Heatpump",boiler,168,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Hybrid Heatpump",boiler,168,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Hybrid Heatpump",boiler,168,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Logano GB212",boiler,170,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Logano GB212",boiler,170,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Logano GB212",boiler,170,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Logano GB212",boiler,170,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Logano GB212",boiler,170,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Logano GB212",boiler,170,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Logano GB212",boiler,170,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Logano GB212",boiler,170,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Logano GB212",boiler,170,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Logano GB212",boiler,170,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Logano GB212",boiler,170,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Logano GB212",boiler,170,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Logano GB212",boiler,170,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Logano GB212",boiler,170,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Logano GB212",boiler,170,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Logano GB212",boiler,170,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Logano GB212",boiler,170,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Logano GB212",boiler,170,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Logano GB212",boiler,170,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Logano GB212",boiler,170,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Logano GB212",boiler,170,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Logano GB212",boiler,170,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Logano GB212",boiler,170,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Logano GB212",boiler,170,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Logano GB212",boiler,170,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Logano GB212",boiler,170,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Logano GB212",boiler,170,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Logano GB212",boiler,170,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Logano GB212",boiler,170,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Logano GB212",boiler,170,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Logano GB212",boiler,170,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Logano GB212",boiler,170,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Logano GB212",boiler,170,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Logano GB212",boiler,170,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Logano GB212",boiler,170,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Logano GB212",boiler,170,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Logano GB212",boiler,170,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Logano GB212",boiler,170,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Logano GB212",boiler,170,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Logano GB212",boiler,170,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Logano GB212",boiler,170,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Logano GB212",boiler,170,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Logano GB212",boiler,170,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Logano GB212",boiler,170,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Logano GB212",boiler,170,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Logano GB212",boiler,170,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Logano GB212",boiler,170,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Logano GB212",boiler,170,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Logano GB212",boiler,170,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Logano GB212",boiler,170,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Logano GB212",boiler,170,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Logano GB212",boiler,170,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Logano GB212",boiler,170,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Logano GB212",boiler,170,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Logano GB212",boiler,170,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Logano GB212",boiler,170,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Logano GB212",boiler,170,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Logano GB212",boiler,170,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Logano GB212",boiler,170,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Logano GB212",boiler,170,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Logano GB212",boiler,170,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Logano GB212",boiler,170,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Logano GB212",boiler,170,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Logano GB212",boiler,170,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Logano GB212",boiler,170,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Logano GB212",boiler,170,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Logano GB212",boiler,170,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Logano GB212",boiler,170,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Logano GB212",boiler,170,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Logano GB212",boiler,170,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Logano GB212",boiler,170,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Logano GB212",boiler,170,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Logano GB212",boiler,170,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Logano GB212",boiler,170,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Logano GB212",boiler,170,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Logano GB212",boiler,170,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Logano GB212",boiler,170,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Logano GB212",boiler,170,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Logano GB212",boiler,170,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Logano GB212",boiler,170,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Logano GB212",boiler,170,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Logano GB212",boiler,170,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Logano GB212",boiler,170,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Logano GB212",boiler,170,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Logano GB212",boiler,170,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Logano GB212",boiler,170,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Logano GB212",boiler,170,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Logano GB212",boiler,170,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Logano GB212",boiler,170,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Logano GB212",boiler,170,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Logano GB212",boiler,170,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Logano GB212",boiler,170,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Logano GB212",boiler,170,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Logano GB212",boiler,170,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Logano GB212",boiler,170,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Logano GB212",boiler,170,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Logano GB212",boiler,170,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Logano GB212",boiler,170,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Logano GB212",boiler,170,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Logano GB212",boiler,170,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Logano GB212",boiler,170,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Logano GB212",boiler,170,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Logano GB212",boiler,170,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Logano GB212",boiler,170,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Logano GB212",boiler,170,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Logano GB212",boiler,170,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Logano GB212",boiler,170,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Logano GB212",boiler,170,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Logano GB212",boiler,170,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Logano GB212",boiler,170,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Logano GB212",boiler,170,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Logano GB212",boiler,170,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Logano GB212",boiler,170,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Logano GB212",boiler,170,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Logano GB212",boiler,170,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Logano GB212",boiler,170,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Logano GB212",boiler,170,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Logano GB212",boiler,170,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Logano GB212",boiler,170,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Logano GB212",boiler,170,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Logano GB212",boiler,170,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Logano GB212",boiler,170,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Logano GB212",boiler,170,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Logano GB212",boiler,170,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Logano GB212",boiler,170,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Logano GB212",boiler,170,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Logano GB212",boiler,170,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Logano GB212",boiler,170,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Logano GB212",boiler,170,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Logano GB212",boiler,170,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Logano GB212",boiler,170,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Logano GB212",boiler,170,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Logano GB212",boiler,170,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Logano GB212",boiler,170,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Logano GB212",boiler,170,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Logano GB212",boiler,170,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Logano GB212",boiler,170,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Logano GB212",boiler,170,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Logano GB212",boiler,170,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Logano GB212",boiler,170,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Logano GB212",boiler,170,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Logano GB212",boiler,170,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Logano GB212",boiler,170,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Logano GB212",boiler,170,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Logano GB212",boiler,170,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Logano GB212",boiler,170,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Logano GB212",boiler,170,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Logano GB212",boiler,170,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Logano GB212",boiler,170,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Logano GB212",boiler,170,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Logano GB212",boiler,170,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Logano GB212",boiler,170,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Logano GB212",boiler,170,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Logano GB212",boiler,170,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Logano GB212",boiler,170,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Logano GB212",boiler,170,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Logano GB212",boiler,170,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Logano GB212",boiler,170,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Logano GB212",boiler,170,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Logano GB212",boiler,170,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Logano GB212",boiler,170,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Logano GB212",boiler,170,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Logano GB212",boiler,170,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Logano GB212",boiler,170,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Logano GB212",boiler,170,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Logano GB212",boiler,170,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Logano GB212",boiler,170,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Logano GB212",boiler,170,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Logano GB212",boiler,170,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Logano GB212",boiler,170,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Logano GB212",boiler,170,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Logano GB212",boiler,170,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Logano GB212",boiler,170,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Logano GB212",boiler,170,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Logano GB212",boiler,170,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Logano GB212",boiler,170,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Logano GB212",boiler,170,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Logano GB212",boiler,170,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Logano GB212",boiler,170,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Logano GB212",boiler,170,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Logano GB212",boiler,170,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Logano GB212",boiler,170,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Logano GB212",boiler,170,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Logano GB212",boiler,170,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Logano GB212",boiler,170,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Logano GB212",boiler,170,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Logano GB212",boiler,170,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Logano GB212",boiler,170,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Logano GB212",boiler,170,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Logano GB212",boiler,170,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Logano GB212",boiler,170,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Logano GB212",boiler,170,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,mandefrost,manual defrost,cmd [off\|on], ,true,sensor.boiler_manual_defrost,sensor.boiler_mandefrost,5,0,1,84,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.nrg,energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_dhw_energy,sensor.boiler_dhw_nrg,5,9,1/100,0,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgheat,energy heating,uint24 (>=0<=167772),kWh,false,sensor.boiler_energy_heating,sensor.boiler_nrgheat,5,0,1/100,87,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgcool,energy cooling,uint24 (>=0<=167772),kWh,false,sensor.boiler_energy_cooling,sensor.boiler_nrgcool,5,0,1/100,89,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,metertotal,meter total,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_total,sensor.boiler_metertotal,5,0,1/100,91,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,metercomp,meter compressor,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_compressor,sensor.boiler_metercomp,5,0,1/100,93,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,metereheat,meter e-heater,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_e-heater,sensor.boiler_metereheat,5,0,1/100,95,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,meterheat,meter heating,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/100,97,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,metercool,meter cooling,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_cooling,sensor.boiler_metercool,5,0,1/100,99,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.meter,meter,uint24 (>=0<=167772),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/100,2,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,uptimetotal,heatpump total uptime,time (>=0<=279620),minutes,false,sensor.boiler_heatpump_total_uptime,sensor.boiler_uptimetotal,5,0,1/60,101,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,uptimecontrol,total operating time heat,time (>=0<=279620),minutes,false,sensor.boiler_total_operating_time_heat,sensor.boiler_uptimecontrol,5,0,1/60,103,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,uptimecompheating,operating time compressor heating,time (>=0<=279620),minutes,false,sensor.boiler_operating_time_compressor_heating,sensor.boiler_uptimecompheating,5,0,1/60,105,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,uptimecompcooling,operating time compressor cooling,time (>=0<=279620),minutes,false,sensor.boiler_operating_time_compressor_cooling,sensor.boiler_uptimecompcooling,5,0,1/60,107,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.uptimecomp,operating time compressor,time (>=0<=279620),minutes,false,sensor.boiler_dhw_operating_time_compressor,sensor.boiler_dhw_uptimecomp,5,9,1/60,4,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,uptimecomppool,operating time compressor pool,time (>=0<=279620),minutes,false,sensor.boiler_operating_time_compressor_pool,sensor.boiler_uptimecomppool,5,0,1/60,109,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,totalcompstarts,total compressor control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_total_compressor_control_starts,sensor.boiler_totalcompstarts,5,0,1,111,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatingstarts,heating control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_heating_control_starts,sensor.boiler_heatingstarts,5,0,1,113,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,coolingstarts,cooling control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_cooling_control_starts,sensor.boiler_coolingstarts,5,0,1,115,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.startshp,starts hp,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts_hp,sensor.boiler_dhw_startshp,5,9,1,6,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,poolstarts,pool control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_pool_control_starts,sensor.boiler_poolstarts,5,0,1,117,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgconstotal,total energy consumption,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_consumption,sensor.boiler_nrgconstotal,5,0,1,119,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgconscomptotal,total energy consumption compressor,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_consumption_compressor,sensor.boiler_nrgconscomptotal,5,0,1,121,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgconscompheating,energy consumption compressor heating,uint24 (>=0<=16777214),kWh,false,sensor.boiler_energy_consumption_compressor_heating,sensor.boiler_nrgconscompheating,5,0,1,123,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.nrgconscomp,energy consumption compressor,uint24 (>=0<=16777214),kWh,false,sensor.boiler_dhw_energy_consumption_compressor,sensor.boiler_dhw_nrgconscomp,5,9,1,8,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgconscompcooling,energy consumption compressor cooling,uint24 (>=0<=16777214),kWh,false,sensor.boiler_energy_consumption_compressor_cooling,sensor.boiler_nrgconscompcooling,5,0,1,125,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgconscomppool,energy consumption compressor pool,uint24 (>=0<=16777214),kWh,false,sensor.boiler_energy_consumption_compressor_pool,sensor.boiler_nrgconscomppool,5,0,1,127,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxelecheatnrgconstotal,total aux elec. heater energy consumption,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_aux_elec._heater_energy_consumption,sensor.boiler_auxelecheatnrgconstotal,5,0,1,129,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxelecheatnrgconsheating,aux elec. heater energy consumption heating,uint24 (>=0<=16777214),kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_heating,sensor.boiler_auxelecheatnrgconsheating,5,0,1,131,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.auxelecheatnrgcons,aux elec. heater energy consumption,uint24 (>=0<=16777214),kWh,false,sensor.boiler_dhw_aux_elec._heater_energy_consumption,sensor.boiler_dhw_auxelecheatnrgcons,5,9,1,10,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxelecheatnrgconspool,aux elec. heater energy consumption pool,uint24 (>=0<=16777214),kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_pool,sensor.boiler_auxelecheatnrgconspool,5,0,1,133,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgsupptotal,total energy supplied,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied,sensor.boiler_nrgsupptotal,5,0,1,135,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgsuppheating,total energy supplied heating,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied_heating,sensor.boiler_nrgsuppheating,5,0,1,137,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.nrgsupp,total energy warm supplied,uint24 (>=0<=16777214),kWh,false,sensor.boiler_dhw_total_energy_warm_supplied,sensor.boiler_dhw_nrgsupp,5,9,1,12,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgsuppcooling,total energy supplied cooling,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied_cooling,sensor.boiler_nrgsuppcooling,5,0,1,139,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgsupppool,total energy supplied pool,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied_pool,sensor.boiler_nrgsupppool,5,0,1,141,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hppower,compressor power output,uint16 (>=0<=3199),kW,false,sensor.boiler_compressor_power_output,sensor.boiler_hppower,5,0,1/10,143,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpmaxpower,compressor max power,uint8 (>=0<=100),%,true,number.boiler_compressor_max_power,number.boiler_hpmaxpower,5,0,1,144,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pvmaxcomp,pv compressor max power,uint8 (>=0<=25),kW,true,number.boiler_pv_compressor_max_power,number.boiler_pvmaxcomp,5,0,1/10,145,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,mandefrost,manual defrost,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_manual_defrost,sensor.boiler_mandefrost,5,0,1,84,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.nrg,energy,uint24,kWh,false,sensor.boiler_dhw_energy,sensor.boiler_dhw_nrg,5,9,1/100,0,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgheat,energy heating,uint24,kWh,false,sensor.boiler_energy_heating,sensor.boiler_nrgheat,5,0,1/100,87,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgcool,energy cooling,uint24,kWh,false,sensor.boiler_energy_cooling,sensor.boiler_nrgcool,5,0,1/100,89,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,metertotal,meter total,uint24,kWh,false,sensor.boiler_meter_total,sensor.boiler_metertotal,5,0,1/100,91,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,metercomp,meter compressor,uint24,kWh,false,sensor.boiler_meter_compressor,sensor.boiler_metercomp,5,0,1/100,93,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,metereheat,meter e-heater,uint24,kWh,false,sensor.boiler_meter_e-heater,sensor.boiler_metereheat,5,0,1/100,95,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/100,97,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,metercool,meter cooling,uint24,kWh,false,sensor.boiler_meter_cooling,sensor.boiler_metercool,5,0,1/100,99,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/100,2,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,uptimetotal,heatpump total uptime,time,minutes,false,sensor.boiler_heatpump_total_uptime,sensor.boiler_uptimetotal,5,0,1/60,101,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,uptimecontrol,total operating time heat,time,minutes,false,sensor.boiler_total_operating_time_heat,sensor.boiler_uptimecontrol,5,0,1/60,103,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,uptimecompheating,operating time compressor heating,time,minutes,false,sensor.boiler_operating_time_compressor_heating,sensor.boiler_uptimecompheating,5,0,1/60,105,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,uptimecompcooling,operating time compressor cooling,time,minutes,false,sensor.boiler_operating_time_compressor_cooling,sensor.boiler_uptimecompcooling,5,0,1/60,107,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.uptimecomp,operating time compressor,time,minutes,false,sensor.boiler_dhw_operating_time_compressor,sensor.boiler_dhw_uptimecomp,5,9,1/60,4,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,uptimecomppool,operating time compressor pool,time,minutes,false,sensor.boiler_operating_time_compressor_pool,sensor.boiler_uptimecomppool,5,0,1/60,109,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,totalcompstarts,total compressor control starts,uint24, ,false,sensor.boiler_total_compressor_control_starts,sensor.boiler_totalcompstarts,5,0,1,111,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatingstarts,heating control starts,uint24, ,false,sensor.boiler_heating_control_starts,sensor.boiler_heatingstarts,5,0,1,113,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,coolingstarts,cooling control starts,uint24, ,false,sensor.boiler_cooling_control_starts,sensor.boiler_coolingstarts,5,0,1,115,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.startshp,starts hp,uint24, ,false,sensor.boiler_dhw_starts_hp,sensor.boiler_dhw_startshp,5,9,1,6,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,poolstarts,pool control starts,uint24, ,false,sensor.boiler_pool_control_starts,sensor.boiler_poolstarts,5,0,1,117,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgconstotal,total energy consumption,uint24,kWh,false,sensor.boiler_total_energy_consumption,sensor.boiler_nrgconstotal,5,0,1,119,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgconscomptotal,total energy consumption compressor,uint24,kWh,false,sensor.boiler_total_energy_consumption_compressor,sensor.boiler_nrgconscomptotal,5,0,1,121,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgconscompheating,energy consumption compressor heating,uint24,kWh,false,sensor.boiler_energy_consumption_compressor_heating,sensor.boiler_nrgconscompheating,5,0,1,123,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.nrgconscomp,energy consumption compressor,uint24,kWh,false,sensor.boiler_dhw_energy_consumption_compressor,sensor.boiler_dhw_nrgconscomp,5,9,1,8,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgconscompcooling,energy consumption compressor cooling,uint24,kWh,false,sensor.boiler_energy_consumption_compressor_cooling,sensor.boiler_nrgconscompcooling,5,0,1,125,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgconscomppool,energy consumption compressor pool,uint24,kWh,false,sensor.boiler_energy_consumption_compressor_pool,sensor.boiler_nrgconscomppool,5,0,1,127,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxelecheatnrgconstotal,total aux elec. heater energy consumption,uint24,kWh,false,sensor.boiler_total_aux_elec._heater_energy_consumption,sensor.boiler_auxelecheatnrgconstotal,5,0,1,129,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxelecheatnrgconsheating,aux elec. heater energy consumption heating,uint24,kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_heating,sensor.boiler_auxelecheatnrgconsheating,5,0,1,131,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.auxelecheatnrgcons,aux elec. heater energy consumption,uint24,kWh,false,sensor.boiler_dhw_aux_elec._heater_energy_consumption,sensor.boiler_dhw_auxelecheatnrgcons,5,9,1,10,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxelecheatnrgconspool,aux elec. heater energy consumption pool,uint24,kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_pool,sensor.boiler_auxelecheatnrgconspool,5,0,1,133,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgsupptotal,total energy supplied,uint24,kWh,false,sensor.boiler_total_energy_supplied,sensor.boiler_nrgsupptotal,5,0,1,135,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgsuppheating,total energy supplied heating,uint24,kWh,false,sensor.boiler_total_energy_supplied_heating,sensor.boiler_nrgsuppheating,5,0,1,137,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.nrgsupp,total energy warm supplied,uint24,kWh,false,sensor.boiler_dhw_total_energy_warm_supplied,sensor.boiler_dhw_nrgsupp,5,9,1,12,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgsuppcooling,total energy supplied cooling,uint24,kWh,false,sensor.boiler_total_energy_supplied_cooling,sensor.boiler_nrgsuppcooling,5,0,1,139,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,nrgsupppool,total energy supplied pool,uint24,kWh,false,sensor.boiler_total_energy_supplied_pool,sensor.boiler_nrgsupppool,5,0,1,141,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hppower,compressor power output,uint16,kW,false,sensor.boiler_compressor_power_output,sensor.boiler_hppower,5,0,1/10,143,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpmaxpower,compressor max power,uint8 (>=0<=0),%,true,number.boiler_compressor_max_power,number.boiler_hpmaxpower,5,0,1,144,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pvmaxcomp,pv compressor max power,uint8 (>=0<=0),kW,true,number.boiler_pv_compressor_max_power,number.boiler_pvmaxcomp,5,0,1/10,145,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,powerreduction,power reduction,uint8 (>=30<=60),%,true,number.boiler_power_reduction,number.boiler_powerreduction,5,0,10,146,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpsetdiffpress,set differential pressure,uint8 (>=150<=750),mbar,true,number.boiler_set_differential_pressure,number.boiler_hpsetdiffpress,5,0,50,147,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpcompon,hp compressor,boolean, ,false,binary_sensor.boiler_hp_compressor,binary_sensor.boiler_hpcompon,5,0,1,148,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpactivity,compressor activity,enum [off\|heating\|cooling\|hot water\|pool\|pool heating\|defrost\|compressor alarm], ,false,sensor.boiler_compressor_activity,sensor.boiler_hpactivity,5,0,1,149,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpbrinepumpspd,brine pump speed,uint8 (>=0<=100),%,false,sensor.boiler_brine_pump_speed,sensor.boiler_hpbrinepumpspd,5,0,1,150,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpbrinepumpspd,brine pump speed,uint8,%,false,sensor.boiler_brine_pump_speed,sensor.boiler_hpbrinepumpspd,5,0,1,150,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpswitchvalve,switch valve,boolean, ,false,binary_sensor.boiler_switch_valve,binary_sensor.boiler_hpswitchvalve,5,0,1,151,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpcompspd,compressor speed,uint8 (>=0<=100),%,false,sensor.boiler_compressor_speed,sensor.boiler_hpcompspd,5,0,1,152,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptargetspd,compressor target speed,uint8 (>=0<=100),%,false,sensor.boiler_compressor_target_speed,sensor.boiler_hptargetspd,5,0,1,153,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpcircspd,circulation pump speed,uint8 (>=0<=100),%,false,sensor.boiler_circulation_pump_speed,sensor.boiler_hpcircspd,5,0,1,154,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,recvalve,receiver valve VR0,uint8 (>=0<=100),%,false,sensor.boiler_receiver_valve_VR0,sensor.boiler_recvalve,5,0,1,155,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,expvalve,expansion valve VR1,uint8 (>=0<=100),%,false,sensor.boiler_expansion_valve_VR1,sensor.boiler_expvalve,5,0,1,156,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpbrinein,brine in/evaporator,int16 (>=-3199<=3199),C,false,sensor.boiler_brine_in/evaporator,sensor.boiler_hpbrinein,5,0,1/10,157,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpbrineout,brine out/condenser,int16 (>=-3199<=3199),C,false,sensor.boiler_brine_out/condenser,sensor.boiler_hpbrineout,5,0,1/10,158,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptc0,heat carrier return (TC0),int16 (>=-3199<=3199),C,false,sensor.boiler_heat_carrier_return_(TC0),sensor.boiler_hptc0,5,0,1/10,159,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptc1,heat carrier forward (TC1),int16 (>=-3199<=3199),C,false,sensor.boiler_heat_carrier_forward_(TC1),sensor.boiler_hptc1,5,0,1/10,160,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptc3,condenser temperature (TC3),int16 (>=-3199<=3199),C,false,sensor.boiler_condenser_temperature_(TC3),sensor.boiler_hptc3,5,0,1/10,161,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr1,compressor temperature (TR1),int16 (>=-3199<=3199),C,false,sensor.boiler_compressor_temperature_(TR1),sensor.boiler_hptr1,5,0,1/10,162,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16 (>=-3199<=3199),C,false,sensor.boiler_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.boiler_hptr3,5,0,1/10,163,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr4,evaporator inlet temperature (TR4),int16 (>=-3199<=3199),C,false,sensor.boiler_evaporator_inlet_temperature_(TR4),sensor.boiler_hptr4,5,0,1/10,164,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr5,compressor inlet temperature (TR5),int16 (>=-3199<=3199),C,false,sensor.boiler_compressor_inlet_temperature_(TR5),sensor.boiler_hptr5,5,0,1/10,165,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr6,compressor outlet temperature (TR6),int16 (>=-3199<=3199),C,false,sensor.boiler_compressor_outlet_temperature_(TR6),sensor.boiler_hptr6,5,0,1/10,166,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr7,refrigerant temperature gas side (condenser input) (TR7),int16 (>=-3199<=3199),C,false,sensor.boiler_refrigerant_temperature_gas_side_(condenser_input)_(TR7),sensor.boiler_hptr7,5,0,1/10,167,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptl2,air inlet temperature (TL2),int16 (>=-3199<=3199),C,false,sensor.boiler_air_inlet_temperature_(TL2),sensor.boiler_hptl2,5,0,1/10,168,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hppl1,low pressure side temperature (PL1),int16 (>=-3199<=3199),C,false,sensor.boiler_low_pressure_side_temperature_(PL1),sensor.boiler_hppl1,5,0,1/10,169,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpph1,high pressure side temperature (PH1),int16 (>=-3199<=3199),C,false,sensor.boiler_high_pressure_side_temperature_(PH1),sensor.boiler_hpph1,5,0,1/10,170,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpta4,drain pan temp (TA4),int16 (>=-3199<=3199),C,false,sensor.boiler_drain_pan_temp_(TA4),sensor.boiler_hpta4,5,0,1/10,171,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptw1,reservoir temp (TW1),int16 (>=-3199<=3199),C,false,sensor.boiler_reservoir_temp_(TW1),sensor.boiler_hptw1,5,0,1/10,172,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,poolsettemp,pool set temperature,uint8 (>=0<=127),C,true,number.boiler_pool_set_temperature,number.boiler_poolsettemp,5,0,1/2,173,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpcompspd,compressor speed,uint8,%,false,sensor.boiler_compressor_speed,sensor.boiler_hpcompspd,5,0,1,152,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptargetspd,compressor target speed,uint8,%,false,sensor.boiler_compressor_target_speed,sensor.boiler_hptargetspd,5,0,1,153,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpcircspd,circulation pump speed,uint8,%,false,sensor.boiler_circulation_pump_speed,sensor.boiler_hpcircspd,5,0,1,154,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,recvalve,receiver valve VR0,uint8,%,false,sensor.boiler_receiver_valve_VR0,sensor.boiler_recvalve,5,0,1,155,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,expvalve,expansion valve VR1,uint8,%,false,sensor.boiler_expansion_valve_VR1,sensor.boiler_expvalve,5,0,1,156,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpbrinein,brine in/evaporator,int16,C,false,sensor.boiler_brine_in/evaporator,sensor.boiler_hpbrinein,5,0,1/10,157,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpbrineout,brine out/condenser,int16,C,false,sensor.boiler_brine_out/condenser,sensor.boiler_hpbrineout,5,0,1/10,158,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptc0,heat carrier return (TC0),int16,C,false,sensor.boiler_heat_carrier_return_(TC0),sensor.boiler_hptc0,5,0,1/10,159,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptc1,heat carrier forward (TC1),int16,C,false,sensor.boiler_heat_carrier_forward_(TC1),sensor.boiler_hptc1,5,0,1/10,160,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptc3,condenser temperature (TC3),int16,C,false,sensor.boiler_condenser_temperature_(TC3),sensor.boiler_hptc3,5,0,1/10,161,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr1,compressor temperature (TR1),int16,C,false,sensor.boiler_compressor_temperature_(TR1),sensor.boiler_hptr1,5,0,1/10,162,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16,C,false,sensor.boiler_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.boiler_hptr3,5,0,1/10,163,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr4,evaporator inlet temperature (TR4),int16,C,false,sensor.boiler_evaporator_inlet_temperature_(TR4),sensor.boiler_hptr4,5,0,1/10,164,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr5,compressor inlet temperature (TR5),int16,C,false,sensor.boiler_compressor_inlet_temperature_(TR5),sensor.boiler_hptr5,5,0,1/10,165,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr6,compressor outlet temperature (TR6),int16,C,false,sensor.boiler_compressor_outlet_temperature_(TR6),sensor.boiler_hptr6,5,0,1/10,166,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptr7,refrigerant temperature gas side (condenser input) (TR7),int16,C,false,sensor.boiler_refrigerant_temperature_gas_side_(condenser_input)_(TR7),sensor.boiler_hptr7,5,0,1/10,167,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptl2,air inlet temperature (TL2),int16,C,false,sensor.boiler_air_inlet_temperature_(TL2),sensor.boiler_hptl2,5,0,1/10,168,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hppl1,low pressure side temperature (PL1),int16,C,false,sensor.boiler_low_pressure_side_temperature_(PL1),sensor.boiler_hppl1,5,0,1/10,169,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpph1,high pressure side temperature (PH1),int16,C,false,sensor.boiler_high_pressure_side_temperature_(PH1),sensor.boiler_hpph1,5,0,1/10,170,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpta4,drain pan temp (TA4),int16,C,false,sensor.boiler_drain_pan_temp_(TA4),sensor.boiler_hpta4,5,0,1/10,171,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hptw1,reservoir temp (TW1),int16,C,false,sensor.boiler_reservoir_temp_(TW1),sensor.boiler_hptw1,5,0,1/10,172,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,poolsettemp,pool set temperature,uint8 (>=0<=0),C,true,number.boiler_pool_set_temperature,number.boiler_poolsettemp,5,0,1/2,173,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin1,input 1 state,boolean, ,false,binary_sensor.boiler_input_1_state,binary_sensor.boiler_hpin1,5,0,1,174,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin1opt,input 1 options,string, ,true,sensor.boiler_input_1_options,sensor.boiler_hpin1opt,5,0,1,175,8
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin1opt,input 1 options,string (>=0<=0), ,true,sensor.boiler_input_1_options,sensor.boiler_hpin1opt,5,0,1,175,8
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin2,input 2 state,boolean, ,false,binary_sensor.boiler_input_2_state,binary_sensor.boiler_hpin2,5,0,1,183,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin2opt,input 2 options,string, ,true,sensor.boiler_input_2_options,sensor.boiler_hpin2opt,5,0,1,184,8
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin2opt,input 2 options,string (>=0<=0), ,true,sensor.boiler_input_2_options,sensor.boiler_hpin2opt,5,0,1,184,8
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin3,input 3 state,boolean, ,false,binary_sensor.boiler_input_3_state,binary_sensor.boiler_hpin3,5,0,1,192,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin3opt,input 3 options,string, ,true,sensor.boiler_input_3_options,sensor.boiler_hpin3opt,5,0,1,193,8
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin3opt,input 3 options,string (>=0<=0), ,true,sensor.boiler_input_3_options,sensor.boiler_hpin3opt,5,0,1,193,8
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin4,input 4 state,boolean, ,false,binary_sensor.boiler_input_4_state,binary_sensor.boiler_hpin4,5,0,1,201,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin4opt,input 4 options,string, ,true,sensor.boiler_input_4_options,sensor.boiler_hpin4opt,5,0,1,202,8
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,maxheatcomp,heat limit compressor,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW], ,true,select.boiler_heat_limit_compressor,select.boiler_maxheatcomp,5,0,1,210,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,maxheatheat,heat limit heating,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW], ,true,select.boiler_heat_limit_heating,select.boiler_maxheatheat,5,0,1,211,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.maxheat,heat limit,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW], ,true,select.boiler_dhw_heat_limit,select.boiler_dhw_maxheat,5,9,1,14,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheatersource,aux heater source,enum [not installed\|electric heater\|exclusive\|parallel\|hybrid], ,true,select.boiler_aux_heater_source,select.boiler_auxheatersource,5,0,1,212,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pvcooling,cooling only with PV,boolean, ,true,switch.boiler_cooling_only_with_PV,switch.boiler_pvcooling,5,0,1,213,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheateronly,aux heater only,boolean, ,true,switch.boiler_aux_heater_only,switch.boiler_auxheateronly,5,0,1,214,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheateroff,disable aux heater,boolean, ,true,switch.boiler_disable_aux_heater,switch.boiler_auxheateroff,5,0,1,215,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpin4opt,input 4 options,string (>=0<=0), ,true,sensor.boiler_input_4_options,sensor.boiler_hpin4opt,5,0,1,202,8
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,maxheatcomp,heat limit compressor,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW] (>=0<=0), ,true,select.boiler_heat_limit_compressor,select.boiler_maxheatcomp,5,0,1,210,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,maxheatheat,heat limit heating,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW] (>=0<=0), ,true,select.boiler_heat_limit_heating,select.boiler_maxheatheat,5,0,1,211,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.maxheat,heat limit,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW] (>=0<=0), ,true,select.boiler_dhw_heat_limit,select.boiler_dhw_maxheat,5,9,1,14,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheatersource,aux heater source,enum [not installed\|electric heater\|exclusive\|parallel\|hybrid] (>=0<=0), ,true,select.boiler_aux_heater_source,select.boiler_auxheatersource,5,0,1,212,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,pvcooling,cooling only with PV,boolean (>=0<=0), ,true,switch.boiler_cooling_only_with_PV,switch.boiler_pvcooling,5,0,1,213,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheateronly,aux heater only,boolean (>=0<=0), ,true,switch.boiler_aux_heater_only,switch.boiler_auxheateronly,5,0,1,214,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheateroff,disable aux heater,boolean (>=0<=0), ,true,switch.boiler_disable_aux_heater,switch.boiler_auxheateroff,5,0,1,215,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheaterstatus,aux heater status,enum [off\|heating\|cooling\|hot water\|pool\|pool heating\|defrost\|compressor alarm], ,false,sensor.boiler_aux_heater_status,sensor.boiler_auxheaterstatus,5,0,1,216,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheaterlevel,aux heater level,uint8 (>=0<=100),%,false,sensor.boiler_aux_heater_level,sensor.boiler_auxheaterlevel,5,0,1,217,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheaterlevel,aux heater level,uint8,%,false,sensor.boiler_aux_heater_level,sensor.boiler_auxheaterlevel,5,0,1,217,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheaterdelay,aux heater on delay,uint16 (>=10<=1000),K*min,true,number.boiler_aux_heater_on_delay,number.boiler_auxheaterdelay,5,0,10,218,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxmaxlimit,aux heater max limit,uint8 (>=0<=10),K,true,number.boiler_aux_heater_max_limit,number.boiler_auxmaxlimit,5,0,1/10,219,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxlimitstart,aux heater limit start,uint8 (>=0<=10),K,true,number.boiler_aux_heater_limit_start,number.boiler_auxlimitstart,5,0,1/10,220,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheatrmode,aux heater mode,enum [eco\|comfort], ,true,select.boiler_aux_heater_mode,select.boiler_auxheatrmode,5,0,1,221,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheatrmode,aux heater mode,enum [eco\|comfort] (>=0<=0), ,true,select.boiler_aux_heater_mode,select.boiler_auxheatrmode,5,0,1,221,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hphystheat,on/off hyst heat,uint16 (>=50<=1500),K*min,true,number.boiler_on/off_hyst_heat,number.boiler_hphystheat,5,0,5,222,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hphystcool,on/off hyst cool,uint16 (>=50<=1500),K*min,true,number.boiler_on/off_hyst_cool,number.boiler_hphystcool,5,0,5,223,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hphystpool,on/off hyst pool,uint16 (>=50<=1500),K*min,true,number.boiler_on/off_hyst_pool,number.boiler_hphystpool,5,0,5,224,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,silentmode,silent mode,enum [off\|auto\|on], ,true,select.boiler_silent_mode,select.boiler_silentmode,5,0,1,225,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,silentfrom,silent mode from,uint8 (>=0<=3810),minutes,true,number.boiler_silent_mode_from,number.boiler_silentfrom,5,0,15,226,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,silentto,silent mode to,uint8 (>=0<=3810),minutes,true,number.boiler_silent_mode_to,number.boiler_silentto,5,0,15,227,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,mintempsilent,min outside temp for silent mode,int8 (>=-126<=126),C,true,number.boiler_min_outside_temp_for_silent_mode,number.boiler_mintempsilent,5,0,1,228,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,tempparmode,outside temp parallel mode,int8 (>=-126<=126),C,true,number.boiler_outside_temp_parallel_mode,number.boiler_tempparmode,5,0,1,229,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheatmix,aux heater mixing valve,int8 (>=-100<=100),%,false,sensor.boiler_aux_heater_mixing_valve,sensor.boiler_auxheatmix,5,0,1,230,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,silentmode,silent mode,enum [off\|auto\|on] (>=0<=0), ,true,select.boiler_silent_mode,select.boiler_silentmode,5,0,1,225,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,silentfrom,silent mode from,uint8 (>=0<=0),minutes,true,number.boiler_silent_mode_from,number.boiler_silentfrom,5,0,15,226,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,silentto,silent mode to,uint8 (>=0<=0),minutes,true,number.boiler_silent_mode_to,number.boiler_silentto,5,0,15,227,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,mintempsilent,min outside temp for silent mode,int8 (>=0<=0),C,true,number.boiler_min_outside_temp_for_silent_mode,number.boiler_mintempsilent,5,0,1,228,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,tempparmode,outside temp parallel mode,int8 (>=0<=0),C,true,number.boiler_outside_temp_parallel_mode,number.boiler_tempparmode,5,0,1,229,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,auxheatmix,aux heater mixing valve,int8,%,false,sensor.boiler_aux_heater_mixing_valve,sensor.boiler_auxheatmix,5,0,1,230,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,tempdiffheat,temp diff TC3/TC0 heat,uint8 (>=2<=10),K,true,number.boiler_temp_diff_TC3/TC0_heat,number.boiler_tempdiffheat,5,0,1/10,231,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,tempdiffcool,temp diff TC3/TC0 cool,uint8 (>=2<=10),K,true,number.boiler_temp_diff_TC3/TC0_cool,number.boiler_tempdiffcool,5,0,1/10,232,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,vpcooling,valve/pump cooling,boolean, ,true,switch.boiler_valve/pump_cooling,switch.boiler_vpcooling,5,0,1,233,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatcable,heating cable,boolean, ,true,switch.boiler_heating_cable,switch.boiler_heatcable,5,0,1,234,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,vc0valve,VC0 valve,boolean, ,true,switch.boiler_VC0_valve,switch.boiler_vc0valve,5,0,1,235,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,primepump,primary heatpump,boolean, ,true,switch.boiler_primary_heatpump,switch.boiler_primepump,5,0,1,236,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,primepumpmod,primary heatpump modulation,uint8 (>=0<=100),%,true,number.boiler_primary_heatpump_modulation,number.boiler_primepumpmod,5,0,1,237,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hp3way,3-way valve,boolean, ,true,switch.boiler_3-way_valve,switch.boiler_hp3way,5,0,1,238,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,elheatstep1,el. heater step 1,boolean, ,true,switch.boiler_el._heater_step_1,switch.boiler_elheatstep1,5,0,1,239,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,elheatstep2,el. heater step 2,boolean, ,true,switch.boiler_el._heater_step_2,switch.boiler_elheatstep2,5,0,1,240,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,elheatstep3,el. heater step 3,boolean, ,true,switch.boiler_el._heater_step_3,switch.boiler_elheatstep3,5,0,1,241,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,vpcooling,valve/pump cooling,boolean (>=0<=0), ,true,switch.boiler_valve/pump_cooling,switch.boiler_vpcooling,5,0,1,233,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,heatcable,heating cable,boolean (>=0<=0), ,true,switch.boiler_heating_cable,switch.boiler_heatcable,5,0,1,234,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,vc0valve,VC0 valve,boolean (>=0<=0), ,true,switch.boiler_VC0_valve,switch.boiler_vc0valve,5,0,1,235,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,primepump,primary heatpump,boolean (>=0<=0), ,true,switch.boiler_primary_heatpump,switch.boiler_primepump,5,0,1,236,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,primepumpmod,primary heatpump modulation,uint8 (>=0<=0),%,true,number.boiler_primary_heatpump_modulation,number.boiler_primepumpmod,5,0,1,237,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hp3way,3-way valve,boolean (>=0<=0), ,true,switch.boiler_3-way_valve,switch.boiler_hp3way,5,0,1,238,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,elheatstep1,el. heater step 1,boolean (>=0<=0), ,true,switch.boiler_el._heater_step_1,switch.boiler_elheatstep1,5,0,1,239,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,elheatstep2,el. heater step 2,boolean (>=0<=0), ,true,switch.boiler_el._heater_step_2,switch.boiler_elheatstep2,5,0,1,240,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,elheatstep3,el. heater step 3,boolean (>=0<=0), ,true,switch.boiler_el._heater_step_3,switch.boiler_elheatstep3,5,0,1,241,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpea0,condensate reservoir heating (EA0),boolean, ,false,binary_sensor.boiler_condensate_reservoir_heating_(EA0),binary_sensor.boiler_hpea0,5,0,1,242,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hppumpmode,primary heatpump mode,enum [auto\|continuous], ,true,select.boiler_primary_heatpump_mode,select.boiler_hppumpmode,5,0,1,243,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hppumpmode,primary heatpump mode,enum [auto\|continuous] (>=0<=0), ,true,select.boiler_primary_heatpump_mode,select.boiler_hppumpmode,5,0,1,243,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,fan,fan,uint8 (>=20<=100),%,true,number.boiler_fan,number.boiler_fan,5,0,1,244,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,fanspd,fan speed,uint8 (>=0<=100),%,false,sensor.boiler_fan_speed,sensor.boiler_fanspd,5,0,1,245,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,shutdown,shutdown,cmd [off\|on], ,true,sensor.boiler_shutdown,sensor.boiler_shutdown,5,0,1,246,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpcurrpower,compressor current power,uint16 (>=0<=31999),W,false,sensor.boiler_compressor_current_power,sensor.boiler_hpcurrpower,5,0,1,247,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hppowerlimit,power limit,uint16 (>=0<=31999),W,true,number.boiler_power_limit,number.boiler_hppowerlimit,5,0,1,248,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.alternatingop,alternating operation,boolean, ,true,switch.boiler_dhw_alternating_operation,switch.boiler_dhw_alternatingop,5,9,1,15,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,fanspd,fan speed,uint8,%,false,sensor.boiler_fan_speed,sensor.boiler_fanspd,5,0,1,245,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,shutdown,shutdown,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_shutdown,sensor.boiler_shutdown,5,0,1,246,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hpcurrpower,compressor current power,uint16,W,false,sensor.boiler_compressor_current_power,sensor.boiler_hpcurrpower,5,0,1,247,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,hppowerlimit,power limit,uint16 (>=0<=0),W,true,number.boiler_power_limit,number.boiler_hppowerlimit,5,0,1,248,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.alternatingop,alternating operation,boolean (>=0<=0), ,true,switch.boiler_dhw_alternating_operation,switch.boiler_dhw_alternatingop,5,9,1,15,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.altopprioheat,prioritise heating during dhw,uint8 (>=20<=120),minutes,true,number.boiler_dhw_prioritise_heating_during_dhw,number.boiler_dhw_altopprioheat,5,9,1,16,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.altopprio,prioritise dhw during heating,uint8 (>=30<=120),minutes,true,number.boiler_dhw_prioritise_dhw_during_heating,number.boiler_dhw_altopprio,5,9,1,17,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.comfoff,comfort switch off,uint8 (>=15<=65),C,true,number.boiler_dhw_comfort_switch_off,number.boiler_dhw_comfoff,5,9,1,18,1
@@ -2722,212 +2722,212 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.comfdiff,comfort diff,uint8 (>=4<=15),K,true,number.boiler_dhw_comfort_diff,number.boiler_dhw_comfdiff,5,9,1,21,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.ecodiff,eco diff,uint8 (>=4<=15),K,true,number.boiler_dhw_eco_diff,number.boiler_dhw_ecodiff,5,9,1,22,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.ecoplusdiff,eco+ diff,uint8 (>=4<=15),K,true,number.boiler_dhw_eco+_diff,number.boiler_dhw_ecoplusdiff,5,9,1,23,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.comfstop,comfort stop temp,uint8 (>=0<=254),C,true,number.boiler_dhw_comfort_stop_temp,number.boiler_dhw_comfstop,5,9,1,24,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.ecostop,eco stop temp,uint8 (>=0<=254),C,true,number.boiler_dhw_eco_stop_temp,number.boiler_dhw_ecostop,5,9,1,25,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.ecoplusstop,eco+ stop temp,uint8 (>=0<=254),C,true,number.boiler_dhw_eco+_stop_temp,number.boiler_dhw_ecoplusstop,5,9,1,26,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.hpcircpump,circulation pump available during dhw,boolean, ,true,switch.boiler_dhw_circulation_pump_available_during_dhw,switch.boiler_dhw_hpcircpump,5,9,1,27,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.comfstop,comfort stop temp,uint8 (>=0<=0),C,true,number.boiler_dhw_comfort_stop_temp,number.boiler_dhw_comfstop,5,9,1,24,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.ecostop,eco stop temp,uint8 (>=0<=0),C,true,number.boiler_dhw_eco_stop_temp,number.boiler_dhw_ecostop,5,9,1,25,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.ecoplusstop,eco+ stop temp,uint8 (>=0<=0),C,true,number.boiler_dhw_eco+_stop_temp,number.boiler_dhw_ecoplusstop,5,9,1,26,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.hpcircpump,circulation pump available during dhw,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available_during_dhw,switch.boiler_dhw_hpcircpump,5,9,1,27,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Geo 5xx",boiler,173,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Geo 5xx",boiler,173,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Geo 5xx",boiler,173,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Enviline, Compress 6000AW, Hybrid 3000-7000iAW, SupraEco/Geo 5xx, WLW196i/WSW196i",boiler,172,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Geo 5xx",boiler,173,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Geo 5xx",boiler,173,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Geo 5xx",boiler,173,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Geo 5xx",boiler,173,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Geo 5xx",boiler,173,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Geo 5xx",boiler,173,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Geo 5xx",boiler,173,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Geo 5xx",boiler,173,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Geo 5xx",boiler,173,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Geo 5xx",boiler,173,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Geo 5xx",boiler,173,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Geo 5xx",boiler,173,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Geo 5xx",boiler,173,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Geo 5xx",boiler,173,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Geo 5xx",boiler,173,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Geo 5xx",boiler,173,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Geo 5xx",boiler,173,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Geo 5xx",boiler,173,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Geo 5xx",boiler,173,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Geo 5xx",boiler,173,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Geo 5xx",boiler,173,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Geo 5xx",boiler,173,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Geo 5xx",boiler,173,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Geo 5xx",boiler,173,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Geo 5xx",boiler,173,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Geo 5xx",boiler,173,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Geo 5xx",boiler,173,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Geo 5xx",boiler,173,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Geo 5xx",boiler,173,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Geo 5xx",boiler,173,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Geo 5xx",boiler,173,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Geo 5xx",boiler,173,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Geo 5xx",boiler,173,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Geo 5xx",boiler,173,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Geo 5xx",boiler,173,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Geo 5xx",boiler,173,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Geo 5xx",boiler,173,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Geo 5xx",boiler,173,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Geo 5xx",boiler,173,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Geo 5xx",boiler,173,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Geo 5xx",boiler,173,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Geo 5xx",boiler,173,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Geo 5xx",boiler,173,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Geo 5xx",boiler,173,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Geo 5xx",boiler,173,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Geo 5xx",boiler,173,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Geo 5xx",boiler,173,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Geo 5xx",boiler,173,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Geo 5xx",boiler,173,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Geo 5xx",boiler,173,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Geo 5xx",boiler,173,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Geo 5xx",boiler,173,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Geo 5xx",boiler,173,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Geo 5xx",boiler,173,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Geo 5xx",boiler,173,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Geo 5xx",boiler,173,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Geo 5xx",boiler,173,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Geo 5xx",boiler,173,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Geo 5xx",boiler,173,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Geo 5xx",boiler,173,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Geo 5xx",boiler,173,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Geo 5xx",boiler,173,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Geo 5xx",boiler,173,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Geo 5xx",boiler,173,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Geo 5xx",boiler,173,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Geo 5xx",boiler,173,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Geo 5xx",boiler,173,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Geo 5xx",boiler,173,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Geo 5xx",boiler,173,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Geo 5xx",boiler,173,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Geo 5xx",boiler,173,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Geo 5xx",boiler,173,mandefrost,manual defrost,cmd [off\|on], ,true,sensor.boiler_manual_defrost,sensor.boiler_mandefrost,5,0,1,84,1
-"Geo 5xx",boiler,173,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
-"Geo 5xx",boiler,173,dhw.nrg,energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_dhw_energy,sensor.boiler_dhw_nrg,5,9,1/100,0,2
-"Geo 5xx",boiler,173,nrgheat,energy heating,uint24 (>=0<=167772),kWh,false,sensor.boiler_energy_heating,sensor.boiler_nrgheat,5,0,1/100,87,2
-"Geo 5xx",boiler,173,nrgcool,energy cooling,uint24 (>=0<=167772),kWh,false,sensor.boiler_energy_cooling,sensor.boiler_nrgcool,5,0,1/100,89,2
-"Geo 5xx",boiler,173,metertotal,meter total,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_total,sensor.boiler_metertotal,5,0,1/100,91,2
-"Geo 5xx",boiler,173,metercomp,meter compressor,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_compressor,sensor.boiler_metercomp,5,0,1/100,93,2
-"Geo 5xx",boiler,173,metereheat,meter e-heater,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_e-heater,sensor.boiler_metereheat,5,0,1/100,95,2
-"Geo 5xx",boiler,173,meterheat,meter heating,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/100,97,2
-"Geo 5xx",boiler,173,metercool,meter cooling,uint24 (>=0<=167772),kWh,false,sensor.boiler_meter_cooling,sensor.boiler_metercool,5,0,1/100,99,2
-"Geo 5xx",boiler,173,dhw.meter,meter,uint24 (>=0<=167772),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/100,2,2
-"Geo 5xx",boiler,173,uptimetotal,heatpump total uptime,time (>=0<=279620),minutes,false,sensor.boiler_heatpump_total_uptime,sensor.boiler_uptimetotal,5,0,1/60,101,2
-"Geo 5xx",boiler,173,uptimecontrol,total operating time heat,time (>=0<=279620),minutes,false,sensor.boiler_total_operating_time_heat,sensor.boiler_uptimecontrol,5,0,1/60,103,2
-"Geo 5xx",boiler,173,uptimecompheating,operating time compressor heating,time (>=0<=279620),minutes,false,sensor.boiler_operating_time_compressor_heating,sensor.boiler_uptimecompheating,5,0,1/60,105,2
-"Geo 5xx",boiler,173,uptimecompcooling,operating time compressor cooling,time (>=0<=279620),minutes,false,sensor.boiler_operating_time_compressor_cooling,sensor.boiler_uptimecompcooling,5,0,1/60,107,2
-"Geo 5xx",boiler,173,dhw.uptimecomp,operating time compressor,time (>=0<=279620),minutes,false,sensor.boiler_dhw_operating_time_compressor,sensor.boiler_dhw_uptimecomp,5,9,1/60,4,2
-"Geo 5xx",boiler,173,uptimecomppool,operating time compressor pool,time (>=0<=279620),minutes,false,sensor.boiler_operating_time_compressor_pool,sensor.boiler_uptimecomppool,5,0,1/60,109,2
-"Geo 5xx",boiler,173,totalcompstarts,total compressor control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_total_compressor_control_starts,sensor.boiler_totalcompstarts,5,0,1,111,2
-"Geo 5xx",boiler,173,heatingstarts,heating control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_heating_control_starts,sensor.boiler_heatingstarts,5,0,1,113,2
-"Geo 5xx",boiler,173,coolingstarts,cooling control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_cooling_control_starts,sensor.boiler_coolingstarts,5,0,1,115,2
-"Geo 5xx",boiler,173,dhw.startshp,starts hp,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts_hp,sensor.boiler_dhw_startshp,5,9,1,6,2
-"Geo 5xx",boiler,173,poolstarts,pool control starts,uint24 (>=0<=16777214), ,false,sensor.boiler_pool_control_starts,sensor.boiler_poolstarts,5,0,1,117,2
-"Geo 5xx",boiler,173,nrgconstotal,total energy consumption,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_consumption,sensor.boiler_nrgconstotal,5,0,1,119,2
-"Geo 5xx",boiler,173,nrgconscomptotal,total energy consumption compressor,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_consumption_compressor,sensor.boiler_nrgconscomptotal,5,0,1,121,2
-"Geo 5xx",boiler,173,nrgconscompheating,energy consumption compressor heating,uint24 (>=0<=16777214),kWh,false,sensor.boiler_energy_consumption_compressor_heating,sensor.boiler_nrgconscompheating,5,0,1,123,2
-"Geo 5xx",boiler,173,dhw.nrgconscomp,energy consumption compressor,uint24 (>=0<=16777214),kWh,false,sensor.boiler_dhw_energy_consumption_compressor,sensor.boiler_dhw_nrgconscomp,5,9,1,8,2
-"Geo 5xx",boiler,173,nrgconscompcooling,energy consumption compressor cooling,uint24 (>=0<=16777214),kWh,false,sensor.boiler_energy_consumption_compressor_cooling,sensor.boiler_nrgconscompcooling,5,0,1,125,2
-"Geo 5xx",boiler,173,nrgconscomppool,energy consumption compressor pool,uint24 (>=0<=16777214),kWh,false,sensor.boiler_energy_consumption_compressor_pool,sensor.boiler_nrgconscomppool,5,0,1,127,2
-"Geo 5xx",boiler,173,auxelecheatnrgconstotal,total aux elec. heater energy consumption,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_aux_elec._heater_energy_consumption,sensor.boiler_auxelecheatnrgconstotal,5,0,1,129,2
-"Geo 5xx",boiler,173,auxelecheatnrgconsheating,aux elec. heater energy consumption heating,uint24 (>=0<=16777214),kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_heating,sensor.boiler_auxelecheatnrgconsheating,5,0,1,131,2
-"Geo 5xx",boiler,173,dhw.auxelecheatnrgcons,aux elec. heater energy consumption,uint24 (>=0<=16777214),kWh,false,sensor.boiler_dhw_aux_elec._heater_energy_consumption,sensor.boiler_dhw_auxelecheatnrgcons,5,9,1,10,2
-"Geo 5xx",boiler,173,auxelecheatnrgconspool,aux elec. heater energy consumption pool,uint24 (>=0<=16777214),kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_pool,sensor.boiler_auxelecheatnrgconspool,5,0,1,133,2
-"Geo 5xx",boiler,173,nrgsupptotal,total energy supplied,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied,sensor.boiler_nrgsupptotal,5,0,1,135,2
-"Geo 5xx",boiler,173,nrgsuppheating,total energy supplied heating,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied_heating,sensor.boiler_nrgsuppheating,5,0,1,137,2
-"Geo 5xx",boiler,173,dhw.nrgsupp,total energy warm supplied,uint24 (>=0<=16777214),kWh,false,sensor.boiler_dhw_total_energy_warm_supplied,sensor.boiler_dhw_nrgsupp,5,9,1,12,2
-"Geo 5xx",boiler,173,nrgsuppcooling,total energy supplied cooling,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied_cooling,sensor.boiler_nrgsuppcooling,5,0,1,139,2
-"Geo 5xx",boiler,173,nrgsupppool,total energy supplied pool,uint24 (>=0<=16777214),kWh,false,sensor.boiler_total_energy_supplied_pool,sensor.boiler_nrgsupppool,5,0,1,141,2
-"Geo 5xx",boiler,173,hppower,compressor power output,uint16 (>=0<=3199),kW,false,sensor.boiler_compressor_power_output,sensor.boiler_hppower,5,0,1/10,143,1
-"Geo 5xx",boiler,173,hpmaxpower,compressor max power,uint8 (>=0<=100),%,true,number.boiler_compressor_max_power,number.boiler_hpmaxpower,5,0,1,144,1
-"Geo 5xx",boiler,173,pvmaxcomp,pv compressor max power,uint8 (>=0<=25),kW,true,number.boiler_pv_compressor_max_power,number.boiler_pvmaxcomp,5,0,1/10,145,1
+"Geo 5xx",boiler,173,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Geo 5xx",boiler,173,mandefrost,manual defrost,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_manual_defrost,sensor.boiler_mandefrost,5,0,1,84,1
+"Geo 5xx",boiler,173,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Geo 5xx",boiler,173,dhw.nrg,energy,uint24,kWh,false,sensor.boiler_dhw_energy,sensor.boiler_dhw_nrg,5,9,1/100,0,2
+"Geo 5xx",boiler,173,nrgheat,energy heating,uint24,kWh,false,sensor.boiler_energy_heating,sensor.boiler_nrgheat,5,0,1/100,87,2
+"Geo 5xx",boiler,173,nrgcool,energy cooling,uint24,kWh,false,sensor.boiler_energy_cooling,sensor.boiler_nrgcool,5,0,1/100,89,2
+"Geo 5xx",boiler,173,metertotal,meter total,uint24,kWh,false,sensor.boiler_meter_total,sensor.boiler_metertotal,5,0,1/100,91,2
+"Geo 5xx",boiler,173,metercomp,meter compressor,uint24,kWh,false,sensor.boiler_meter_compressor,sensor.boiler_metercomp,5,0,1/100,93,2
+"Geo 5xx",boiler,173,metereheat,meter e-heater,uint24,kWh,false,sensor.boiler_meter_e-heater,sensor.boiler_metereheat,5,0,1/100,95,2
+"Geo 5xx",boiler,173,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/100,97,2
+"Geo 5xx",boiler,173,metercool,meter cooling,uint24,kWh,false,sensor.boiler_meter_cooling,sensor.boiler_metercool,5,0,1/100,99,2
+"Geo 5xx",boiler,173,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/100,2,2
+"Geo 5xx",boiler,173,uptimetotal,heatpump total uptime,time,minutes,false,sensor.boiler_heatpump_total_uptime,sensor.boiler_uptimetotal,5,0,1/60,101,2
+"Geo 5xx",boiler,173,uptimecontrol,total operating time heat,time,minutes,false,sensor.boiler_total_operating_time_heat,sensor.boiler_uptimecontrol,5,0,1/60,103,2
+"Geo 5xx",boiler,173,uptimecompheating,operating time compressor heating,time,minutes,false,sensor.boiler_operating_time_compressor_heating,sensor.boiler_uptimecompheating,5,0,1/60,105,2
+"Geo 5xx",boiler,173,uptimecompcooling,operating time compressor cooling,time,minutes,false,sensor.boiler_operating_time_compressor_cooling,sensor.boiler_uptimecompcooling,5,0,1/60,107,2
+"Geo 5xx",boiler,173,dhw.uptimecomp,operating time compressor,time,minutes,false,sensor.boiler_dhw_operating_time_compressor,sensor.boiler_dhw_uptimecomp,5,9,1/60,4,2
+"Geo 5xx",boiler,173,uptimecomppool,operating time compressor pool,time,minutes,false,sensor.boiler_operating_time_compressor_pool,sensor.boiler_uptimecomppool,5,0,1/60,109,2
+"Geo 5xx",boiler,173,totalcompstarts,total compressor control starts,uint24, ,false,sensor.boiler_total_compressor_control_starts,sensor.boiler_totalcompstarts,5,0,1,111,2
+"Geo 5xx",boiler,173,heatingstarts,heating control starts,uint24, ,false,sensor.boiler_heating_control_starts,sensor.boiler_heatingstarts,5,0,1,113,2
+"Geo 5xx",boiler,173,coolingstarts,cooling control starts,uint24, ,false,sensor.boiler_cooling_control_starts,sensor.boiler_coolingstarts,5,0,1,115,2
+"Geo 5xx",boiler,173,dhw.startshp,starts hp,uint24, ,false,sensor.boiler_dhw_starts_hp,sensor.boiler_dhw_startshp,5,9,1,6,2
+"Geo 5xx",boiler,173,poolstarts,pool control starts,uint24, ,false,sensor.boiler_pool_control_starts,sensor.boiler_poolstarts,5,0,1,117,2
+"Geo 5xx",boiler,173,nrgconstotal,total energy consumption,uint24,kWh,false,sensor.boiler_total_energy_consumption,sensor.boiler_nrgconstotal,5,0,1,119,2
+"Geo 5xx",boiler,173,nrgconscomptotal,total energy consumption compressor,uint24,kWh,false,sensor.boiler_total_energy_consumption_compressor,sensor.boiler_nrgconscomptotal,5,0,1,121,2
+"Geo 5xx",boiler,173,nrgconscompheating,energy consumption compressor heating,uint24,kWh,false,sensor.boiler_energy_consumption_compressor_heating,sensor.boiler_nrgconscompheating,5,0,1,123,2
+"Geo 5xx",boiler,173,dhw.nrgconscomp,energy consumption compressor,uint24,kWh,false,sensor.boiler_dhw_energy_consumption_compressor,sensor.boiler_dhw_nrgconscomp,5,9,1,8,2
+"Geo 5xx",boiler,173,nrgconscompcooling,energy consumption compressor cooling,uint24,kWh,false,sensor.boiler_energy_consumption_compressor_cooling,sensor.boiler_nrgconscompcooling,5,0,1,125,2
+"Geo 5xx",boiler,173,nrgconscomppool,energy consumption compressor pool,uint24,kWh,false,sensor.boiler_energy_consumption_compressor_pool,sensor.boiler_nrgconscomppool,5,0,1,127,2
+"Geo 5xx",boiler,173,auxelecheatnrgconstotal,total aux elec. heater energy consumption,uint24,kWh,false,sensor.boiler_total_aux_elec._heater_energy_consumption,sensor.boiler_auxelecheatnrgconstotal,5,0,1,129,2
+"Geo 5xx",boiler,173,auxelecheatnrgconsheating,aux elec. heater energy consumption heating,uint24,kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_heating,sensor.boiler_auxelecheatnrgconsheating,5,0,1,131,2
+"Geo 5xx",boiler,173,dhw.auxelecheatnrgcons,aux elec. heater energy consumption,uint24,kWh,false,sensor.boiler_dhw_aux_elec._heater_energy_consumption,sensor.boiler_dhw_auxelecheatnrgcons,5,9,1,10,2
+"Geo 5xx",boiler,173,auxelecheatnrgconspool,aux elec. heater energy consumption pool,uint24,kWh,false,sensor.boiler_aux_elec._heater_energy_consumption_pool,sensor.boiler_auxelecheatnrgconspool,5,0,1,133,2
+"Geo 5xx",boiler,173,nrgsupptotal,total energy supplied,uint24,kWh,false,sensor.boiler_total_energy_supplied,sensor.boiler_nrgsupptotal,5,0,1,135,2
+"Geo 5xx",boiler,173,nrgsuppheating,total energy supplied heating,uint24,kWh,false,sensor.boiler_total_energy_supplied_heating,sensor.boiler_nrgsuppheating,5,0,1,137,2
+"Geo 5xx",boiler,173,dhw.nrgsupp,total energy warm supplied,uint24,kWh,false,sensor.boiler_dhw_total_energy_warm_supplied,sensor.boiler_dhw_nrgsupp,5,9,1,12,2
+"Geo 5xx",boiler,173,nrgsuppcooling,total energy supplied cooling,uint24,kWh,false,sensor.boiler_total_energy_supplied_cooling,sensor.boiler_nrgsuppcooling,5,0,1,139,2
+"Geo 5xx",boiler,173,nrgsupppool,total energy supplied pool,uint24,kWh,false,sensor.boiler_total_energy_supplied_pool,sensor.boiler_nrgsupppool,5,0,1,141,2
+"Geo 5xx",boiler,173,hppower,compressor power output,uint16,kW,false,sensor.boiler_compressor_power_output,sensor.boiler_hppower,5,0,1/10,143,1
+"Geo 5xx",boiler,173,hpmaxpower,compressor max power,uint8 (>=0<=0),%,true,number.boiler_compressor_max_power,number.boiler_hpmaxpower,5,0,1,144,1
+"Geo 5xx",boiler,173,pvmaxcomp,pv compressor max power,uint8 (>=0<=0),kW,true,number.boiler_pv_compressor_max_power,number.boiler_pvmaxcomp,5,0,1/10,145,1
 "Geo 5xx",boiler,173,powerreduction,power reduction,uint8 (>=30<=60),%,true,number.boiler_power_reduction,number.boiler_powerreduction,5,0,10,146,1
 "Geo 5xx",boiler,173,hpsetdiffpress,set differential pressure,uint8 (>=150<=750),mbar,true,number.boiler_set_differential_pressure,number.boiler_hpsetdiffpress,5,0,50,147,1
 "Geo 5xx",boiler,173,hpcompon,hp compressor,boolean, ,false,binary_sensor.boiler_hp_compressor,binary_sensor.boiler_hpcompon,5,0,1,148,1
 "Geo 5xx",boiler,173,hpactivity,compressor activity,enum [off\|heating\|cooling\|hot water\|pool\|pool heating\|defrost\|compressor alarm], ,false,sensor.boiler_compressor_activity,sensor.boiler_hpactivity,5,0,1,149,1
-"Geo 5xx",boiler,173,hpbrinepumpspd,brine pump speed,uint8 (>=0<=100),%,false,sensor.boiler_brine_pump_speed,sensor.boiler_hpbrinepumpspd,5,0,1,150,1
+"Geo 5xx",boiler,173,hpbrinepumpspd,brine pump speed,uint8,%,false,sensor.boiler_brine_pump_speed,sensor.boiler_hpbrinepumpspd,5,0,1,150,1
 "Geo 5xx",boiler,173,hpswitchvalve,switch valve,boolean, ,false,binary_sensor.boiler_switch_valve,binary_sensor.boiler_hpswitchvalve,5,0,1,151,1
-"Geo 5xx",boiler,173,hpcompspd,compressor speed,uint8 (>=0<=100),%,false,sensor.boiler_compressor_speed,sensor.boiler_hpcompspd,5,0,1,152,1
-"Geo 5xx",boiler,173,hptargetspd,compressor target speed,uint8 (>=0<=100),%,false,sensor.boiler_compressor_target_speed,sensor.boiler_hptargetspd,5,0,1,153,1
-"Geo 5xx",boiler,173,hpcircspd,circulation pump speed,uint8 (>=0<=100),%,false,sensor.boiler_circulation_pump_speed,sensor.boiler_hpcircspd,5,0,1,154,1
-"Geo 5xx",boiler,173,recvalve,receiver valve VR0,uint8 (>=0<=100),%,false,sensor.boiler_receiver_valve_VR0,sensor.boiler_recvalve,5,0,1,155,1
-"Geo 5xx",boiler,173,expvalve,expansion valve VR1,uint8 (>=0<=100),%,false,sensor.boiler_expansion_valve_VR1,sensor.boiler_expvalve,5,0,1,156,1
-"Geo 5xx",boiler,173,hpbrinein,brine in/evaporator,int16 (>=-3199<=3199),C,false,sensor.boiler_brine_in/evaporator,sensor.boiler_hpbrinein,5,0,1/10,157,1
-"Geo 5xx",boiler,173,hpbrineout,brine out/condenser,int16 (>=-3199<=3199),C,false,sensor.boiler_brine_out/condenser,sensor.boiler_hpbrineout,5,0,1/10,158,1
-"Geo 5xx",boiler,173,hptc0,heat carrier return (TC0),int16 (>=-3199<=3199),C,false,sensor.boiler_heat_carrier_return_(TC0),sensor.boiler_hptc0,5,0,1/10,159,1
-"Geo 5xx",boiler,173,hptc1,heat carrier forward (TC1),int16 (>=-3199<=3199),C,false,sensor.boiler_heat_carrier_forward_(TC1),sensor.boiler_hptc1,5,0,1/10,160,1
-"Geo 5xx",boiler,173,hptc3,condenser temperature (TC3),int16 (>=-3199<=3199),C,false,sensor.boiler_condenser_temperature_(TC3),sensor.boiler_hptc3,5,0,1/10,161,1
-"Geo 5xx",boiler,173,hptr1,compressor temperature (TR1),int16 (>=-3199<=3199),C,false,sensor.boiler_compressor_temperature_(TR1),sensor.boiler_hptr1,5,0,1/10,162,1
-"Geo 5xx",boiler,173,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16 (>=-3199<=3199),C,false,sensor.boiler_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.boiler_hptr3,5,0,1/10,163,1
-"Geo 5xx",boiler,173,hptr4,evaporator inlet temperature (TR4),int16 (>=-3199<=3199),C,false,sensor.boiler_evaporator_inlet_temperature_(TR4),sensor.boiler_hptr4,5,0,1/10,164,1
-"Geo 5xx",boiler,173,hptr5,compressor inlet temperature (TR5),int16 (>=-3199<=3199),C,false,sensor.boiler_compressor_inlet_temperature_(TR5),sensor.boiler_hptr5,5,0,1/10,165,1
-"Geo 5xx",boiler,173,hptr6,compressor outlet temperature (TR6),int16 (>=-3199<=3199),C,false,sensor.boiler_compressor_outlet_temperature_(TR6),sensor.boiler_hptr6,5,0,1/10,166,1
-"Geo 5xx",boiler,173,hptr7,refrigerant temperature gas side (condenser input) (TR7),int16 (>=-3199<=3199),C,false,sensor.boiler_refrigerant_temperature_gas_side_(condenser_input)_(TR7),sensor.boiler_hptr7,5,0,1/10,167,1
-"Geo 5xx",boiler,173,hptl2,air inlet temperature (TL2),int16 (>=-3199<=3199),C,false,sensor.boiler_air_inlet_temperature_(TL2),sensor.boiler_hptl2,5,0,1/10,168,1
-"Geo 5xx",boiler,173,hppl1,low pressure side temperature (PL1),int16 (>=-3199<=3199),C,false,sensor.boiler_low_pressure_side_temperature_(PL1),sensor.boiler_hppl1,5,0,1/10,169,1
-"Geo 5xx",boiler,173,hpph1,high pressure side temperature (PH1),int16 (>=-3199<=3199),C,false,sensor.boiler_high_pressure_side_temperature_(PH1),sensor.boiler_hpph1,5,0,1/10,170,1
-"Geo 5xx",boiler,173,hpta4,drain pan temp (TA4),int16 (>=-3199<=3199),C,false,sensor.boiler_drain_pan_temp_(TA4),sensor.boiler_hpta4,5,0,1/10,171,1
-"Geo 5xx",boiler,173,hptw1,reservoir temp (TW1),int16 (>=-3199<=3199),C,false,sensor.boiler_reservoir_temp_(TW1),sensor.boiler_hptw1,5,0,1/10,172,1
-"Geo 5xx",boiler,173,poolsettemp,pool set temperature,uint8 (>=0<=127),C,true,number.boiler_pool_set_temperature,number.boiler_poolsettemp,5,0,1/2,173,1
+"Geo 5xx",boiler,173,hpcompspd,compressor speed,uint8,%,false,sensor.boiler_compressor_speed,sensor.boiler_hpcompspd,5,0,1,152,1
+"Geo 5xx",boiler,173,hptargetspd,compressor target speed,uint8,%,false,sensor.boiler_compressor_target_speed,sensor.boiler_hptargetspd,5,0,1,153,1
+"Geo 5xx",boiler,173,hpcircspd,circulation pump speed,uint8,%,false,sensor.boiler_circulation_pump_speed,sensor.boiler_hpcircspd,5,0,1,154,1
+"Geo 5xx",boiler,173,recvalve,receiver valve VR0,uint8,%,false,sensor.boiler_receiver_valve_VR0,sensor.boiler_recvalve,5,0,1,155,1
+"Geo 5xx",boiler,173,expvalve,expansion valve VR1,uint8,%,false,sensor.boiler_expansion_valve_VR1,sensor.boiler_expvalve,5,0,1,156,1
+"Geo 5xx",boiler,173,hpbrinein,brine in/evaporator,int16,C,false,sensor.boiler_brine_in/evaporator,sensor.boiler_hpbrinein,5,0,1/10,157,1
+"Geo 5xx",boiler,173,hpbrineout,brine out/condenser,int16,C,false,sensor.boiler_brine_out/condenser,sensor.boiler_hpbrineout,5,0,1/10,158,1
+"Geo 5xx",boiler,173,hptc0,heat carrier return (TC0),int16,C,false,sensor.boiler_heat_carrier_return_(TC0),sensor.boiler_hptc0,5,0,1/10,159,1
+"Geo 5xx",boiler,173,hptc1,heat carrier forward (TC1),int16,C,false,sensor.boiler_heat_carrier_forward_(TC1),sensor.boiler_hptc1,5,0,1/10,160,1
+"Geo 5xx",boiler,173,hptc3,condenser temperature (TC3),int16,C,false,sensor.boiler_condenser_temperature_(TC3),sensor.boiler_hptc3,5,0,1/10,161,1
+"Geo 5xx",boiler,173,hptr1,compressor temperature (TR1),int16,C,false,sensor.boiler_compressor_temperature_(TR1),sensor.boiler_hptr1,5,0,1/10,162,1
+"Geo 5xx",boiler,173,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16,C,false,sensor.boiler_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.boiler_hptr3,5,0,1/10,163,1
+"Geo 5xx",boiler,173,hptr4,evaporator inlet temperature (TR4),int16,C,false,sensor.boiler_evaporator_inlet_temperature_(TR4),sensor.boiler_hptr4,5,0,1/10,164,1
+"Geo 5xx",boiler,173,hptr5,compressor inlet temperature (TR5),int16,C,false,sensor.boiler_compressor_inlet_temperature_(TR5),sensor.boiler_hptr5,5,0,1/10,165,1
+"Geo 5xx",boiler,173,hptr6,compressor outlet temperature (TR6),int16,C,false,sensor.boiler_compressor_outlet_temperature_(TR6),sensor.boiler_hptr6,5,0,1/10,166,1
+"Geo 5xx",boiler,173,hptr7,refrigerant temperature gas side (condenser input) (TR7),int16,C,false,sensor.boiler_refrigerant_temperature_gas_side_(condenser_input)_(TR7),sensor.boiler_hptr7,5,0,1/10,167,1
+"Geo 5xx",boiler,173,hptl2,air inlet temperature (TL2),int16,C,false,sensor.boiler_air_inlet_temperature_(TL2),sensor.boiler_hptl2,5,0,1/10,168,1
+"Geo 5xx",boiler,173,hppl1,low pressure side temperature (PL1),int16,C,false,sensor.boiler_low_pressure_side_temperature_(PL1),sensor.boiler_hppl1,5,0,1/10,169,1
+"Geo 5xx",boiler,173,hpph1,high pressure side temperature (PH1),int16,C,false,sensor.boiler_high_pressure_side_temperature_(PH1),sensor.boiler_hpph1,5,0,1/10,170,1
+"Geo 5xx",boiler,173,hpta4,drain pan temp (TA4),int16,C,false,sensor.boiler_drain_pan_temp_(TA4),sensor.boiler_hpta4,5,0,1/10,171,1
+"Geo 5xx",boiler,173,hptw1,reservoir temp (TW1),int16,C,false,sensor.boiler_reservoir_temp_(TW1),sensor.boiler_hptw1,5,0,1/10,172,1
+"Geo 5xx",boiler,173,poolsettemp,pool set temperature,uint8 (>=0<=0),C,true,number.boiler_pool_set_temperature,number.boiler_poolsettemp,5,0,1/2,173,1
 "Geo 5xx",boiler,173,hpin1,input 1 state,boolean, ,false,binary_sensor.boiler_input_1_state,binary_sensor.boiler_hpin1,5,0,1,174,1
-"Geo 5xx",boiler,173,hpin1opt,input 1 options,string, ,true,sensor.boiler_input_1_options,sensor.boiler_hpin1opt,5,0,1,175,8
+"Geo 5xx",boiler,173,hpin1opt,input 1 options,string (>=0<=0), ,true,sensor.boiler_input_1_options,sensor.boiler_hpin1opt,5,0,1,175,8
 "Geo 5xx",boiler,173,hpin2,input 2 state,boolean, ,false,binary_sensor.boiler_input_2_state,binary_sensor.boiler_hpin2,5,0,1,183,1
-"Geo 5xx",boiler,173,hpin2opt,input 2 options,string, ,true,sensor.boiler_input_2_options,sensor.boiler_hpin2opt,5,0,1,184,8
+"Geo 5xx",boiler,173,hpin2opt,input 2 options,string (>=0<=0), ,true,sensor.boiler_input_2_options,sensor.boiler_hpin2opt,5,0,1,184,8
 "Geo 5xx",boiler,173,hpin3,input 3 state,boolean, ,false,binary_sensor.boiler_input_3_state,binary_sensor.boiler_hpin3,5,0,1,192,1
-"Geo 5xx",boiler,173,hpin3opt,input 3 options,string, ,true,sensor.boiler_input_3_options,sensor.boiler_hpin3opt,5,0,1,193,8
+"Geo 5xx",boiler,173,hpin3opt,input 3 options,string (>=0<=0), ,true,sensor.boiler_input_3_options,sensor.boiler_hpin3opt,5,0,1,193,8
 "Geo 5xx",boiler,173,hpin4,input 4 state,boolean, ,false,binary_sensor.boiler_input_4_state,binary_sensor.boiler_hpin4,5,0,1,201,1
-"Geo 5xx",boiler,173,hpin4opt,input 4 options,string, ,true,sensor.boiler_input_4_options,sensor.boiler_hpin4opt,5,0,1,202,8
-"Geo 5xx",boiler,173,maxheatcomp,heat limit compressor,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW], ,true,select.boiler_heat_limit_compressor,select.boiler_maxheatcomp,5,0,1,210,1
-"Geo 5xx",boiler,173,maxheatheat,heat limit heating,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW], ,true,select.boiler_heat_limit_heating,select.boiler_maxheatheat,5,0,1,211,1
-"Geo 5xx",boiler,173,dhw.maxheat,heat limit,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW], ,true,select.boiler_dhw_heat_limit,select.boiler_dhw_maxheat,5,9,1,14,1
-"Geo 5xx",boiler,173,auxheatersource,aux heater source,enum [not installed\|electric heater\|exclusive\|parallel\|hybrid], ,true,select.boiler_aux_heater_source,select.boiler_auxheatersource,5,0,1,212,1
-"Geo 5xx",boiler,173,pvcooling,cooling only with PV,boolean, ,true,switch.boiler_cooling_only_with_PV,switch.boiler_pvcooling,5,0,1,213,1
-"Geo 5xx",boiler,173,auxheateronly,aux heater only,boolean, ,true,switch.boiler_aux_heater_only,switch.boiler_auxheateronly,5,0,1,214,1
-"Geo 5xx",boiler,173,auxheateroff,disable aux heater,boolean, ,true,switch.boiler_disable_aux_heater,switch.boiler_auxheateroff,5,0,1,215,1
+"Geo 5xx",boiler,173,hpin4opt,input 4 options,string (>=0<=0), ,true,sensor.boiler_input_4_options,sensor.boiler_hpin4opt,5,0,1,202,8
+"Geo 5xx",boiler,173,maxheatcomp,heat limit compressor,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW] (>=0<=0), ,true,select.boiler_heat_limit_compressor,select.boiler_maxheatcomp,5,0,1,210,1
+"Geo 5xx",boiler,173,maxheatheat,heat limit heating,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW] (>=0<=0), ,true,select.boiler_heat_limit_heating,select.boiler_maxheatheat,5,0,1,211,1
+"Geo 5xx",boiler,173,dhw.maxheat,heat limit,enum [0 kW\|2 kW\|3 kW\|4 kW\|6 kW\|9 kW] (>=0<=0), ,true,select.boiler_dhw_heat_limit,select.boiler_dhw_maxheat,5,9,1,14,1
+"Geo 5xx",boiler,173,auxheatersource,aux heater source,enum [not installed\|electric heater\|exclusive\|parallel\|hybrid] (>=0<=0), ,true,select.boiler_aux_heater_source,select.boiler_auxheatersource,5,0,1,212,1
+"Geo 5xx",boiler,173,pvcooling,cooling only with PV,boolean (>=0<=0), ,true,switch.boiler_cooling_only_with_PV,switch.boiler_pvcooling,5,0,1,213,1
+"Geo 5xx",boiler,173,auxheateronly,aux heater only,boolean (>=0<=0), ,true,switch.boiler_aux_heater_only,switch.boiler_auxheateronly,5,0,1,214,1
+"Geo 5xx",boiler,173,auxheateroff,disable aux heater,boolean (>=0<=0), ,true,switch.boiler_disable_aux_heater,switch.boiler_auxheateroff,5,0,1,215,1
 "Geo 5xx",boiler,173,auxheaterstatus,aux heater status,enum [off\|heating\|cooling\|hot water\|pool\|pool heating\|defrost\|compressor alarm], ,false,sensor.boiler_aux_heater_status,sensor.boiler_auxheaterstatus,5,0,1,216,1
-"Geo 5xx",boiler,173,auxheaterlevel,aux heater level,uint8 (>=0<=100),%,false,sensor.boiler_aux_heater_level,sensor.boiler_auxheaterlevel,5,0,1,217,1
+"Geo 5xx",boiler,173,auxheaterlevel,aux heater level,uint8,%,false,sensor.boiler_aux_heater_level,sensor.boiler_auxheaterlevel,5,0,1,217,1
 "Geo 5xx",boiler,173,auxheaterdelay,aux heater on delay,uint16 (>=10<=1000),K*min,true,number.boiler_aux_heater_on_delay,number.boiler_auxheaterdelay,5,0,10,218,1
 "Geo 5xx",boiler,173,auxmaxlimit,aux heater max limit,uint8 (>=0<=10),K,true,number.boiler_aux_heater_max_limit,number.boiler_auxmaxlimit,5,0,1/10,219,1
 "Geo 5xx",boiler,173,auxlimitstart,aux heater limit start,uint8 (>=0<=10),K,true,number.boiler_aux_heater_limit_start,number.boiler_auxlimitstart,5,0,1/10,220,1
-"Geo 5xx",boiler,173,auxheatrmode,aux heater mode,enum [eco\|comfort], ,true,select.boiler_aux_heater_mode,select.boiler_auxheatrmode,5,0,1,221,1
+"Geo 5xx",boiler,173,auxheatrmode,aux heater mode,enum [eco\|comfort] (>=0<=0), ,true,select.boiler_aux_heater_mode,select.boiler_auxheatrmode,5,0,1,221,1
 "Geo 5xx",boiler,173,hphystheat,on/off hyst heat,uint16 (>=50<=1500),K*min,true,number.boiler_on/off_hyst_heat,number.boiler_hphystheat,5,0,5,222,1
 "Geo 5xx",boiler,173,hphystcool,on/off hyst cool,uint16 (>=50<=1500),K*min,true,number.boiler_on/off_hyst_cool,number.boiler_hphystcool,5,0,5,223,1
 "Geo 5xx",boiler,173,hphystpool,on/off hyst pool,uint16 (>=50<=1500),K*min,true,number.boiler_on/off_hyst_pool,number.boiler_hphystpool,5,0,5,224,1
-"Geo 5xx",boiler,173,silentmode,silent mode,enum [off\|auto\|on], ,true,select.boiler_silent_mode,select.boiler_silentmode,5,0,1,225,1
-"Geo 5xx",boiler,173,silentfrom,silent mode from,uint8 (>=0<=3810),minutes,true,number.boiler_silent_mode_from,number.boiler_silentfrom,5,0,15,226,1
-"Geo 5xx",boiler,173,silentto,silent mode to,uint8 (>=0<=3810),minutes,true,number.boiler_silent_mode_to,number.boiler_silentto,5,0,15,227,1
-"Geo 5xx",boiler,173,mintempsilent,min outside temp for silent mode,int8 (>=-126<=126),C,true,number.boiler_min_outside_temp_for_silent_mode,number.boiler_mintempsilent,5,0,1,228,1
-"Geo 5xx",boiler,173,tempparmode,outside temp parallel mode,int8 (>=-126<=126),C,true,number.boiler_outside_temp_parallel_mode,number.boiler_tempparmode,5,0,1,229,1
-"Geo 5xx",boiler,173,auxheatmix,aux heater mixing valve,int8 (>=-100<=100),%,false,sensor.boiler_aux_heater_mixing_valve,sensor.boiler_auxheatmix,5,0,1,230,1
+"Geo 5xx",boiler,173,silentmode,silent mode,enum [off\|auto\|on] (>=0<=0), ,true,select.boiler_silent_mode,select.boiler_silentmode,5,0,1,225,1
+"Geo 5xx",boiler,173,silentfrom,silent mode from,uint8 (>=0<=0),minutes,true,number.boiler_silent_mode_from,number.boiler_silentfrom,5,0,15,226,1
+"Geo 5xx",boiler,173,silentto,silent mode to,uint8 (>=0<=0),minutes,true,number.boiler_silent_mode_to,number.boiler_silentto,5,0,15,227,1
+"Geo 5xx",boiler,173,mintempsilent,min outside temp for silent mode,int8 (>=0<=0),C,true,number.boiler_min_outside_temp_for_silent_mode,number.boiler_mintempsilent,5,0,1,228,1
+"Geo 5xx",boiler,173,tempparmode,outside temp parallel mode,int8 (>=0<=0),C,true,number.boiler_outside_temp_parallel_mode,number.boiler_tempparmode,5,0,1,229,1
+"Geo 5xx",boiler,173,auxheatmix,aux heater mixing valve,int8,%,false,sensor.boiler_aux_heater_mixing_valve,sensor.boiler_auxheatmix,5,0,1,230,1
 "Geo 5xx",boiler,173,tempdiffheat,temp diff TC3/TC0 heat,uint8 (>=2<=10),K,true,number.boiler_temp_diff_TC3/TC0_heat,number.boiler_tempdiffheat,5,0,1/10,231,1
 "Geo 5xx",boiler,173,tempdiffcool,temp diff TC3/TC0 cool,uint8 (>=2<=10),K,true,number.boiler_temp_diff_TC3/TC0_cool,number.boiler_tempdiffcool,5,0,1/10,232,1
-"Geo 5xx",boiler,173,vpcooling,valve/pump cooling,boolean, ,true,switch.boiler_valve/pump_cooling,switch.boiler_vpcooling,5,0,1,233,1
-"Geo 5xx",boiler,173,heatcable,heating cable,boolean, ,true,switch.boiler_heating_cable,switch.boiler_heatcable,5,0,1,234,1
-"Geo 5xx",boiler,173,vc0valve,VC0 valve,boolean, ,true,switch.boiler_VC0_valve,switch.boiler_vc0valve,5,0,1,235,1
-"Geo 5xx",boiler,173,primepump,primary heatpump,boolean, ,true,switch.boiler_primary_heatpump,switch.boiler_primepump,5,0,1,236,1
-"Geo 5xx",boiler,173,primepumpmod,primary heatpump modulation,uint8 (>=0<=100),%,true,number.boiler_primary_heatpump_modulation,number.boiler_primepumpmod,5,0,1,237,1
-"Geo 5xx",boiler,173,hp3way,3-way valve,boolean, ,true,switch.boiler_3-way_valve,switch.boiler_hp3way,5,0,1,238,1
-"Geo 5xx",boiler,173,elheatstep1,el. heater step 1,boolean, ,true,switch.boiler_el._heater_step_1,switch.boiler_elheatstep1,5,0,1,239,1
-"Geo 5xx",boiler,173,elheatstep2,el. heater step 2,boolean, ,true,switch.boiler_el._heater_step_2,switch.boiler_elheatstep2,5,0,1,240,1
-"Geo 5xx",boiler,173,elheatstep3,el. heater step 3,boolean, ,true,switch.boiler_el._heater_step_3,switch.boiler_elheatstep3,5,0,1,241,1
+"Geo 5xx",boiler,173,vpcooling,valve/pump cooling,boolean (>=0<=0), ,true,switch.boiler_valve/pump_cooling,switch.boiler_vpcooling,5,0,1,233,1
+"Geo 5xx",boiler,173,heatcable,heating cable,boolean (>=0<=0), ,true,switch.boiler_heating_cable,switch.boiler_heatcable,5,0,1,234,1
+"Geo 5xx",boiler,173,vc0valve,VC0 valve,boolean (>=0<=0), ,true,switch.boiler_VC0_valve,switch.boiler_vc0valve,5,0,1,235,1
+"Geo 5xx",boiler,173,primepump,primary heatpump,boolean (>=0<=0), ,true,switch.boiler_primary_heatpump,switch.boiler_primepump,5,0,1,236,1
+"Geo 5xx",boiler,173,primepumpmod,primary heatpump modulation,uint8 (>=0<=0),%,true,number.boiler_primary_heatpump_modulation,number.boiler_primepumpmod,5,0,1,237,1
+"Geo 5xx",boiler,173,hp3way,3-way valve,boolean (>=0<=0), ,true,switch.boiler_3-way_valve,switch.boiler_hp3way,5,0,1,238,1
+"Geo 5xx",boiler,173,elheatstep1,el. heater step 1,boolean (>=0<=0), ,true,switch.boiler_el._heater_step_1,switch.boiler_elheatstep1,5,0,1,239,1
+"Geo 5xx",boiler,173,elheatstep2,el. heater step 2,boolean (>=0<=0), ,true,switch.boiler_el._heater_step_2,switch.boiler_elheatstep2,5,0,1,240,1
+"Geo 5xx",boiler,173,elheatstep3,el. heater step 3,boolean (>=0<=0), ,true,switch.boiler_el._heater_step_3,switch.boiler_elheatstep3,5,0,1,241,1
 "Geo 5xx",boiler,173,hpea0,condensate reservoir heating (EA0),boolean, ,false,binary_sensor.boiler_condensate_reservoir_heating_(EA0),binary_sensor.boiler_hpea0,5,0,1,242,1
-"Geo 5xx",boiler,173,hppumpmode,primary heatpump mode,enum [auto\|continuous], ,true,select.boiler_primary_heatpump_mode,select.boiler_hppumpmode,5,0,1,243,1
+"Geo 5xx",boiler,173,hppumpmode,primary heatpump mode,enum [auto\|continuous] (>=0<=0), ,true,select.boiler_primary_heatpump_mode,select.boiler_hppumpmode,5,0,1,243,1
 "Geo 5xx",boiler,173,fan,fan,uint8 (>=20<=100),%,true,number.boiler_fan,number.boiler_fan,5,0,1,244,1
-"Geo 5xx",boiler,173,fanspd,fan speed,uint8 (>=0<=100),%,false,sensor.boiler_fan_speed,sensor.boiler_fanspd,5,0,1,245,1
-"Geo 5xx",boiler,173,shutdown,shutdown,cmd [off\|on], ,true,sensor.boiler_shutdown,sensor.boiler_shutdown,5,0,1,246,1
-"Geo 5xx",boiler,173,hpcurrpower,compressor current power,uint16 (>=0<=31999),W,false,sensor.boiler_compressor_current_power,sensor.boiler_hpcurrpower,5,0,1,247,1
-"Geo 5xx",boiler,173,hppowerlimit,power limit,uint16 (>=0<=31999),W,true,number.boiler_power_limit,number.boiler_hppowerlimit,5,0,1,248,1
-"Geo 5xx",boiler,173,dhw.alternatingop,alternating operation,boolean, ,true,switch.boiler_dhw_alternating_operation,switch.boiler_dhw_alternatingop,5,9,1,15,1
+"Geo 5xx",boiler,173,fanspd,fan speed,uint8,%,false,sensor.boiler_fan_speed,sensor.boiler_fanspd,5,0,1,245,1
+"Geo 5xx",boiler,173,shutdown,shutdown,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_shutdown,sensor.boiler_shutdown,5,0,1,246,1
+"Geo 5xx",boiler,173,hpcurrpower,compressor current power,uint16,W,false,sensor.boiler_compressor_current_power,sensor.boiler_hpcurrpower,5,0,1,247,1
+"Geo 5xx",boiler,173,hppowerlimit,power limit,uint16 (>=0<=0),W,true,number.boiler_power_limit,number.boiler_hppowerlimit,5,0,1,248,1
+"Geo 5xx",boiler,173,dhw.alternatingop,alternating operation,boolean (>=0<=0), ,true,switch.boiler_dhw_alternating_operation,switch.boiler_dhw_alternatingop,5,9,1,15,1
 "Geo 5xx",boiler,173,dhw.altopprioheat,prioritise heating during dhw,uint8 (>=20<=120),minutes,true,number.boiler_dhw_prioritise_heating_during_dhw,number.boiler_dhw_altopprioheat,5,9,1,16,1
 "Geo 5xx",boiler,173,dhw.altopprio,prioritise dhw during heating,uint8 (>=30<=120),minutes,true,number.boiler_dhw_prioritise_dhw_during_heating,number.boiler_dhw_altopprio,5,9,1,17,1
 "Geo 5xx",boiler,173,dhw.comfoff,comfort switch off,uint8 (>=15<=65),C,true,number.boiler_dhw_comfort_switch_off,number.boiler_dhw_comfoff,5,9,1,18,1
@@ -2936,1951 +2936,1951 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "Geo 5xx",boiler,173,dhw.comfdiff,comfort diff,uint8 (>=4<=15),K,true,number.boiler_dhw_comfort_diff,number.boiler_dhw_comfdiff,5,9,1,21,1
 "Geo 5xx",boiler,173,dhw.ecodiff,eco diff,uint8 (>=4<=15),K,true,number.boiler_dhw_eco_diff,number.boiler_dhw_ecodiff,5,9,1,22,1
 "Geo 5xx",boiler,173,dhw.ecoplusdiff,eco+ diff,uint8 (>=4<=15),K,true,number.boiler_dhw_eco+_diff,number.boiler_dhw_ecoplusdiff,5,9,1,23,1
-"Geo 5xx",boiler,173,dhw.comfstop,comfort stop temp,uint8 (>=0<=254),C,true,number.boiler_dhw_comfort_stop_temp,number.boiler_dhw_comfstop,5,9,1,24,1
-"Geo 5xx",boiler,173,dhw.ecostop,eco stop temp,uint8 (>=0<=254),C,true,number.boiler_dhw_eco_stop_temp,number.boiler_dhw_ecostop,5,9,1,25,1
-"Geo 5xx",boiler,173,dhw.ecoplusstop,eco+ stop temp,uint8 (>=0<=254),C,true,number.boiler_dhw_eco+_stop_temp,number.boiler_dhw_ecoplusstop,5,9,1,26,1
-"Geo 5xx",boiler,173,dhw.hpcircpump,circulation pump available during dhw,boolean, ,true,switch.boiler_dhw_circulation_pump_available_during_dhw,switch.boiler_dhw_hpcircpump,5,9,1,27,1
-"Geo 5xx",boiler,173,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Geo 5xx",boiler,173,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Geo 5xx",boiler,173,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Geo 5xx",boiler,173,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Geo 5xx",boiler,173,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Geo 5xx",boiler,173,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Geo 5xx",boiler,173,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Geo 5xx",boiler,173,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Geo 5xx",boiler,173,dhw.comfstop,comfort stop temp,uint8 (>=0<=0),C,true,number.boiler_dhw_comfort_stop_temp,number.boiler_dhw_comfstop,5,9,1,24,1
+"Geo 5xx",boiler,173,dhw.ecostop,eco stop temp,uint8 (>=0<=0),C,true,number.boiler_dhw_eco_stop_temp,number.boiler_dhw_ecostop,5,9,1,25,1
+"Geo 5xx",boiler,173,dhw.ecoplusstop,eco+ stop temp,uint8 (>=0<=0),C,true,number.boiler_dhw_eco+_stop_temp,number.boiler_dhw_ecoplusstop,5,9,1,26,1
+"Geo 5xx",boiler,173,dhw.hpcircpump,circulation pump available during dhw,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available_during_dhw,switch.boiler_dhw_hpcircpump,5,9,1,27,1
+"Geo 5xx",boiler,173,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Geo 5xx",boiler,173,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Geo 5xx",boiler,173,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Geo 5xx",boiler,173,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Geo 5xx",boiler,173,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Geo 5xx",boiler,173,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Geo 5xx",boiler,173,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Geo 5xx",boiler,173,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Geo 5xx",boiler,173,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Geo 5xx",boiler,173,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Geo 5xx",boiler,173,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Geo 5xx",boiler,173,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Geo 5xx",boiler,173,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Geo 5xx",boiler,173,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Geo 5xx",boiler,173,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Geo 5xx",boiler,173,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Geo 5xx",boiler,173,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Geo 5xx",boiler,173,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Geo 5xx",boiler,173,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Geo 5xx",boiler,173,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Geo 5xx",boiler,173,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Geo 5xx",boiler,173,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Geo 5xx",boiler,173,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Geo 5xx",boiler,173,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Geo 5xx",boiler,173,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Geo 5xx",boiler,173,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Geo 5xx",boiler,173,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Geo 5xx",boiler,173,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Geo 5xx",boiler,173,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Geo 5xx",boiler,173,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Geo 5xx",boiler,173,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Geo 5xx",boiler,173,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Geo 5xx",boiler,173,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Geo 5xx",boiler,173,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Geo 5xx",boiler,173,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Geo 5xx",boiler,173,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Geo 5xx",boiler,173,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Geo 5xx",boiler,173,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Geo 5xx",boiler,173,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Geo 5xx",boiler,173,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Geo 5xx",boiler,173,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Geo 5xx",boiler,173,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Geo 5xx",boiler,173,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Geo 5xx",boiler,173,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Geo 5xx",boiler,173,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Geo 5xx",boiler,173,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Geo 5xx",boiler,173,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Geo 5xx",boiler,173,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Geo 5xx",boiler,173,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Geo 5xx",boiler,173,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Geo 5xx",boiler,173,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Geo 5xx",boiler,173,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Geo 5xx",boiler,173,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Geo 5xx",boiler,173,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Geo 5xx",boiler,173,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Geo 5xx",boiler,173,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Geo 5xx",boiler,173,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Geo 5xx",boiler,173,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Geo 5xx",boiler,173,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Geo 5xx",boiler,173,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Geo 5xx",boiler,173,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Geo 5xx",boiler,173,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Condens 5000i, Greenstar 8000/GC9800IW, GB192i*2",boiler,195,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Logamax U122, Cerapur",boiler,203,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Logamax U122, Cerapur",boiler,203,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Logamax U122, Cerapur",boiler,203,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Logamax U122, Cerapur",boiler,203,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Logamax U122, Cerapur",boiler,203,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Logamax U122, Cerapur",boiler,203,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Logamax U122, Cerapur",boiler,203,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Logamax U122, Cerapur",boiler,203,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Logamax U122, Cerapur",boiler,203,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Logamax U122, Cerapur",boiler,203,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Logamax U122, Cerapur",boiler,203,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Logamax U122, Cerapur",boiler,203,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Logamax U122, Cerapur",boiler,203,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Logamax U122, Cerapur",boiler,203,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Logamax U122, Cerapur",boiler,203,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Logamax U122, Cerapur",boiler,203,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Logamax U122, Cerapur",boiler,203,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Logamax U122, Cerapur",boiler,203,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Logamax U122, Cerapur",boiler,203,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Logamax U122, Cerapur",boiler,203,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Logamax U122, Cerapur",boiler,203,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Logamax U122, Cerapur",boiler,203,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Logamax U122, Cerapur",boiler,203,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Logamax U122, Cerapur",boiler,203,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Logamax U122, Cerapur",boiler,203,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Logamax U122, Cerapur",boiler,203,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Logamax U122, Cerapur",boiler,203,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Logamax U122, Cerapur",boiler,203,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Logamax U122, Cerapur",boiler,203,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Logamax U122, Cerapur",boiler,203,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Logamax U122, Cerapur",boiler,203,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Logamax U122, Cerapur",boiler,203,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Logamax U122, Cerapur",boiler,203,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Logamax U122, Cerapur",boiler,203,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Logamax U122, Cerapur",boiler,203,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Logamax U122, Cerapur",boiler,203,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Logamax U122, Cerapur",boiler,203,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Logamax U122, Cerapur",boiler,203,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Logamax U122, Cerapur",boiler,203,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Logamax U122, Cerapur",boiler,203,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Logamax U122, Cerapur",boiler,203,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Logamax U122, Cerapur",boiler,203,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Logamax U122, Cerapur",boiler,203,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Logamax U122, Cerapur",boiler,203,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Logamax U122, Cerapur",boiler,203,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Logamax U122, Cerapur",boiler,203,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Logamax U122, Cerapur",boiler,203,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Logamax U122, Cerapur",boiler,203,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Logamax U122, Cerapur",boiler,203,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Logamax U122, Cerapur",boiler,203,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Logamax U122, Cerapur",boiler,203,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Logamax U122, Cerapur",boiler,203,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Logamax U122, Cerapur",boiler,203,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Logamax U122, Cerapur",boiler,203,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Logamax U122, Cerapur",boiler,203,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Logamax U122, Cerapur",boiler,203,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Logamax U122, Cerapur",boiler,203,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Logamax U122, Cerapur",boiler,203,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Logamax U122, Cerapur",boiler,203,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Logamax U122, Cerapur",boiler,203,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Logamax U122, Cerapur",boiler,203,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Logamax U122, Cerapur",boiler,203,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Logamax U122, Cerapur",boiler,203,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Logamax U122, Cerapur",boiler,203,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Logamax U122, Cerapur",boiler,203,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Logamax U122, Cerapur",boiler,203,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Logamax U122, Cerapur",boiler,203,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Logamax U122, Cerapur",boiler,203,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Logamax U122, Cerapur",boiler,203,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Logamax U122, Cerapur",boiler,203,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Logamax U122, Cerapur",boiler,203,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Logamax U122, Cerapur",boiler,203,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Logamax U122, Cerapur",boiler,203,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Logamax U122, Cerapur",boiler,203,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Logamax U122, Cerapur",boiler,203,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Logamax U122, Cerapur",boiler,203,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Logamax U122, Cerapur",boiler,203,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Logamax U122, Cerapur",boiler,203,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Logamax U122, Cerapur",boiler,203,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Logamax U122, Cerapur",boiler,203,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Logamax U122, Cerapur",boiler,203,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Logamax U122, Cerapur",boiler,203,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Logamax U122, Cerapur",boiler,203,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Logamax U122, Cerapur",boiler,203,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Logamax U122, Cerapur",boiler,203,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Logamax U122, Cerapur",boiler,203,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Logamax U122, Cerapur",boiler,203,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Logamax U122, Cerapur",boiler,203,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Logamax U122, Cerapur",boiler,203,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Logamax U122, Cerapur",boiler,203,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Logamax U122, Cerapur",boiler,203,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Logamax U122, Cerapur",boiler,203,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Logamax U122, Cerapur",boiler,203,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Logamax U122, Cerapur",boiler,203,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Logamax U122, Cerapur",boiler,203,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Logamax U122, Cerapur",boiler,203,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Logamax U122, Cerapur",boiler,203,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Logamax U122, Cerapur",boiler,203,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Logamax U122, Cerapur",boiler,203,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Logamax U122, Cerapur",boiler,203,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Logamax U122, Cerapur",boiler,203,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Logamax U122, Cerapur",boiler,203,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Logamax U122, Cerapur",boiler,203,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Logamax U122, Cerapur",boiler,203,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Logamax U122, Cerapur",boiler,203,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Logamax U122, Cerapur",boiler,203,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Logamax U122, Cerapur",boiler,203,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Logamax U122, Cerapur",boiler,203,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Logamax U122, Cerapur",boiler,203,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Logamax U122, Cerapur",boiler,203,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Logamax U122, Cerapur",boiler,203,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Logamax U122, Cerapur",boiler,203,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Logamax U122, Cerapur",boiler,203,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Logamax U122, Cerapur",boiler,203,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Logamax U122, Cerapur",boiler,203,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Logamax U122, Cerapur",boiler,203,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Logamax U122, Cerapur",boiler,203,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Logamax U122, Cerapur",boiler,203,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Logamax U122, Cerapur",boiler,203,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Logamax U122, Cerapur",boiler,203,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Logamax U122, Cerapur",boiler,203,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Logamax U122, Cerapur",boiler,203,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Logamax U122, Cerapur",boiler,203,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Logamax U122, Cerapur",boiler,203,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Logamax U122, Cerapur",boiler,203,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Logamax U122, Cerapur",boiler,203,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Logamax U122, Cerapur",boiler,203,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Logamax U122, Cerapur",boiler,203,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Logamax U122, Cerapur",boiler,203,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Logamax U122, Cerapur",boiler,203,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Logamax U122, Cerapur",boiler,203,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Logamax U122, Cerapur",boiler,203,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Logamax U122, Cerapur",boiler,203,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Logamax U122, Cerapur",boiler,203,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Logamax U122, Cerapur",boiler,203,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Logamax U122, Cerapur",boiler,203,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Logamax U122, Cerapur",boiler,203,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Logamax U122, Cerapur",boiler,203,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Logamax U122, Cerapur",boiler,203,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Logamax U122, Cerapur",boiler,203,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Logamax U122, Cerapur",boiler,203,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Logamax U122, Cerapur",boiler,203,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Logamax U122, Cerapur",boiler,203,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Logamax U122, Cerapur",boiler,203,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Logamax U122, Cerapur",boiler,203,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Logamax U122, Cerapur",boiler,203,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Logamax U122, Cerapur",boiler,203,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Logamax U122, Cerapur",boiler,203,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Logamax U122, Cerapur",boiler,203,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Logamax U122, Cerapur",boiler,203,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Logamax U122, Cerapur",boiler,203,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Logamax U122, Cerapur",boiler,203,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Logamax U122, Cerapur",boiler,203,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Logamax U122, Cerapur",boiler,203,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Logamax U122, Cerapur",boiler,203,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Logamax U122, Cerapur",boiler,203,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Logamax U122, Cerapur",boiler,203,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Logamax U122, Cerapur",boiler,203,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Logamax U122, Cerapur",boiler,203,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Logamax U122, Cerapur",boiler,203,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Logamax U122, Cerapur",boiler,203,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Logamax U122, Cerapur",boiler,203,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Logamax U122, Cerapur",boiler,203,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Logamax U122, Cerapur",boiler,203,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Logamax U122, Cerapur",boiler,203,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Logamax U122, Cerapur",boiler,203,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Logamax U122, Cerapur",boiler,203,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Logamax U122, Cerapur",boiler,203,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Logamax U122, Cerapur",boiler,203,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Logamax U122, Cerapur",boiler,203,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Logamax U122, Cerapur",boiler,203,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Logamax U122, Cerapur",boiler,203,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Logamax U122, Cerapur",boiler,203,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Logamax U122, Cerapur",boiler,203,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Logamax U122, Cerapur",boiler,203,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Logamax U122, Cerapur",boiler,203,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Logamax U122, Cerapur",boiler,203,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Logamax U122, Cerapur",boiler,203,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Logamax U122, Cerapur",boiler,203,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Logamax U122, Cerapur",boiler,203,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Logamax U122, Cerapur",boiler,203,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Logamax U122, Cerapur",boiler,203,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Logamax U122, Cerapur",boiler,203,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Logamax U122, Cerapur",boiler,203,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Logamax U122, Cerapur",boiler,203,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Logamax U122, Cerapur",boiler,203,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Logamax U122, Cerapur",boiler,203,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Logamax U122, Cerapur",boiler,203,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Logamax U122, Cerapur",boiler,203,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Logamax U122, Cerapur",boiler,203,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Logamax U122, Cerapur",boiler,203,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Logamax U122, Cerapur",boiler,203,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Ecomline Excellent",boiler,206,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Ecomline Excellent",boiler,206,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Ecomline Excellent",boiler,206,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Ecomline Excellent",boiler,206,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Ecomline Excellent",boiler,206,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Ecomline Excellent",boiler,206,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Ecomline Excellent",boiler,206,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Ecomline Excellent",boiler,206,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Ecomline Excellent",boiler,206,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Ecomline Excellent",boiler,206,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Ecomline Excellent",boiler,206,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Ecomline Excellent",boiler,206,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Ecomline Excellent",boiler,206,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Ecomline Excellent",boiler,206,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Ecomline Excellent",boiler,206,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Ecomline Excellent",boiler,206,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Ecomline Excellent",boiler,206,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Ecomline Excellent",boiler,206,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Ecomline Excellent",boiler,206,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Ecomline Excellent",boiler,206,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Ecomline Excellent",boiler,206,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Ecomline Excellent",boiler,206,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Ecomline Excellent",boiler,206,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Ecomline Excellent",boiler,206,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Ecomline Excellent",boiler,206,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Ecomline Excellent",boiler,206,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Ecomline Excellent",boiler,206,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Ecomline Excellent",boiler,206,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Ecomline Excellent",boiler,206,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Ecomline Excellent",boiler,206,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Ecomline Excellent",boiler,206,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Ecomline Excellent",boiler,206,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Ecomline Excellent",boiler,206,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Ecomline Excellent",boiler,206,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Ecomline Excellent",boiler,206,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Ecomline Excellent",boiler,206,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Ecomline Excellent",boiler,206,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Ecomline Excellent",boiler,206,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Ecomline Excellent",boiler,206,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Ecomline Excellent",boiler,206,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Ecomline Excellent",boiler,206,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Ecomline Excellent",boiler,206,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Ecomline Excellent",boiler,206,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Ecomline Excellent",boiler,206,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Ecomline Excellent",boiler,206,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Ecomline Excellent",boiler,206,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Ecomline Excellent",boiler,206,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Ecomline Excellent",boiler,206,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Ecomline Excellent",boiler,206,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Ecomline Excellent",boiler,206,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Ecomline Excellent",boiler,206,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Ecomline Excellent",boiler,206,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Ecomline Excellent",boiler,206,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Ecomline Excellent",boiler,206,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Ecomline Excellent",boiler,206,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Ecomline Excellent",boiler,206,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Ecomline Excellent",boiler,206,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Ecomline Excellent",boiler,206,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Ecomline Excellent",boiler,206,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Ecomline Excellent",boiler,206,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Ecomline Excellent",boiler,206,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Ecomline Excellent",boiler,206,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Ecomline Excellent",boiler,206,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Ecomline Excellent",boiler,206,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Ecomline Excellent",boiler,206,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Ecomline Excellent",boiler,206,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Ecomline Excellent",boiler,206,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Ecomline Excellent",boiler,206,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Ecomline Excellent",boiler,206,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Ecomline Excellent",boiler,206,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Ecomline Excellent",boiler,206,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Ecomline Excellent",boiler,206,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Ecomline Excellent",boiler,206,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Ecomline Excellent",boiler,206,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Ecomline Excellent",boiler,206,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Ecomline Excellent",boiler,206,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Ecomline Excellent",boiler,206,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Ecomline Excellent",boiler,206,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Ecomline Excellent",boiler,206,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Ecomline Excellent",boiler,206,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Ecomline Excellent",boiler,206,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Ecomline Excellent",boiler,206,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Ecomline Excellent",boiler,206,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Ecomline Excellent",boiler,206,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Ecomline Excellent",boiler,206,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Ecomline Excellent",boiler,206,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Ecomline Excellent",boiler,206,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Ecomline Excellent",boiler,206,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Ecomline Excellent",boiler,206,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Ecomline Excellent",boiler,206,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Ecomline Excellent",boiler,206,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Ecomline Excellent",boiler,206,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Ecomline Excellent",boiler,206,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Ecomline Excellent",boiler,206,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Ecomline Excellent",boiler,206,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Ecomline Excellent",boiler,206,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Ecomline Excellent",boiler,206,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Ecomline Excellent",boiler,206,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Ecomline Excellent",boiler,206,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Ecomline Excellent",boiler,206,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Ecomline Excellent",boiler,206,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Ecomline Excellent",boiler,206,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Ecomline Excellent",boiler,206,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Ecomline Excellent",boiler,206,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Ecomline Excellent",boiler,206,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Ecomline Excellent",boiler,206,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Ecomline Excellent",boiler,206,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Ecomline Excellent",boiler,206,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Ecomline Excellent",boiler,206,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Ecomline Excellent",boiler,206,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Ecomline Excellent",boiler,206,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Ecomline Excellent",boiler,206,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Ecomline Excellent",boiler,206,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Ecomline Excellent",boiler,206,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Ecomline Excellent",boiler,206,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Ecomline Excellent",boiler,206,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Ecomline Excellent",boiler,206,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Ecomline Excellent",boiler,206,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Ecomline Excellent",boiler,206,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Ecomline Excellent",boiler,206,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Ecomline Excellent",boiler,206,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Ecomline Excellent",boiler,206,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Ecomline Excellent",boiler,206,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Ecomline Excellent",boiler,206,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Ecomline Excellent",boiler,206,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Ecomline Excellent",boiler,206,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Ecomline Excellent",boiler,206,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Ecomline Excellent",boiler,206,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Ecomline Excellent",boiler,206,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Ecomline Excellent",boiler,206,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Ecomline Excellent",boiler,206,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Ecomline Excellent",boiler,206,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Ecomline Excellent",boiler,206,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Ecomline Excellent",boiler,206,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Ecomline Excellent",boiler,206,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Ecomline Excellent",boiler,206,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Ecomline Excellent",boiler,206,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Ecomline Excellent",boiler,206,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Ecomline Excellent",boiler,206,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Ecomline Excellent",boiler,206,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Ecomline Excellent",boiler,206,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Ecomline Excellent",boiler,206,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Ecomline Excellent",boiler,206,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Ecomline Excellent",boiler,206,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Ecomline Excellent",boiler,206,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Ecomline Excellent",boiler,206,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Ecomline Excellent",boiler,206,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Ecomline Excellent",boiler,206,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Ecomline Excellent",boiler,206,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Ecomline Excellent",boiler,206,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Ecomline Excellent",boiler,206,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Ecomline Excellent",boiler,206,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Ecomline Excellent",boiler,206,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Ecomline Excellent",boiler,206,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Ecomline Excellent",boiler,206,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Ecomline Excellent",boiler,206,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Ecomline Excellent",boiler,206,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Ecomline Excellent",boiler,206,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Ecomline Excellent",boiler,206,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Ecomline Excellent",boiler,206,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Ecomline Excellent",boiler,206,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Ecomline Excellent",boiler,206,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Ecomline Excellent",boiler,206,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Ecomline Excellent",boiler,206,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Ecomline Excellent",boiler,206,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Ecomline Excellent",boiler,206,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Ecomline Excellent",boiler,206,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Ecomline Excellent",boiler,206,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Ecomline Excellent",boiler,206,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Ecomline Excellent",boiler,206,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Ecomline Excellent",boiler,206,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Ecomline Excellent",boiler,206,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Ecomline Excellent",boiler,206,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Ecomline Excellent",boiler,206,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Ecomline Excellent",boiler,206,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Ecomline Excellent",boiler,206,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Ecomline Excellent",boiler,206,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Ecomline Excellent",boiler,206,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Ecomline Excellent",boiler,206,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Ecomline Excellent",boiler,206,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Ecomline Excellent",boiler,206,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Ecomline Excellent",boiler,206,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Ecomline Excellent",boiler,206,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Ecomline Excellent",boiler,206,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Ecomline Excellent",boiler,206,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Ecomline Excellent",boiler,206,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Ecomline Excellent",boiler,206,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Ecomline Excellent",boiler,206,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Ecomline Excellent",boiler,206,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Ecomline Excellent",boiler,206,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Ecomline Excellent",boiler,206,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Ecomline Excellent",boiler,206,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Logamax Plus, GB192, Condens GC9000, Greenstar ErP",boiler,208,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Cascade MC400",boiler,210,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Cascade MC400",boiler,210,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Cascade MC400",boiler,210,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Cascade MC400",boiler,210,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Cascade MC400",boiler,210,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Cascade MC400",boiler,210,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Cascade MC400",boiler,210,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Cascade MC400",boiler,210,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Cascade MC400",boiler,210,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Cascade MC400",boiler,210,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Cascade MC400",boiler,210,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Cascade MC400",boiler,210,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Cascade MC400",boiler,210,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Cascade MC400",boiler,210,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Cascade MC400",boiler,210,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Cascade MC400",boiler,210,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Cascade MC400",boiler,210,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Cascade MC400",boiler,210,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Cascade MC400",boiler,210,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Cascade MC400",boiler,210,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Cascade MC400",boiler,210,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Cascade MC400",boiler,210,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Cascade MC400",boiler,210,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Cascade MC400",boiler,210,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Cascade MC400",boiler,210,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Cascade MC400",boiler,210,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Cascade MC400",boiler,210,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Cascade MC400",boiler,210,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Cascade MC400",boiler,210,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Cascade MC400",boiler,210,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Cascade MC400",boiler,210,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Cascade MC400",boiler,210,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Cascade MC400",boiler,210,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Cascade MC400",boiler,210,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Cascade MC400",boiler,210,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Cascade MC400",boiler,210,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Cascade MC400",boiler,210,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Cascade MC400",boiler,210,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Cascade MC400",boiler,210,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Cascade MC400",boiler,210,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Cascade MC400",boiler,210,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Cascade MC400",boiler,210,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Cascade MC400",boiler,210,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Cascade MC400",boiler,210,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Cascade MC400",boiler,210,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Cascade MC400",boiler,210,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Cascade MC400",boiler,210,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Cascade MC400",boiler,210,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Cascade MC400",boiler,210,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Cascade MC400",boiler,210,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Cascade MC400",boiler,210,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Cascade MC400",boiler,210,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Cascade MC400",boiler,210,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Cascade MC400",boiler,210,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Cascade MC400",boiler,210,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Cascade MC400",boiler,210,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Cascade MC400",boiler,210,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Cascade MC400",boiler,210,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Cascade MC400",boiler,210,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Cascade MC400",boiler,210,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Cascade MC400",boiler,210,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Cascade MC400",boiler,210,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Cascade MC400",boiler,210,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Cascade MC400",boiler,210,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Cascade MC400",boiler,210,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Cascade MC400",boiler,210,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Cascade MC400",boiler,210,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Cascade MC400",boiler,210,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Cascade MC400",boiler,210,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Cascade MC400",boiler,210,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Cascade MC400",boiler,210,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Cascade MC400",boiler,210,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Cascade MC400",boiler,210,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Cascade MC400",boiler,210,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Cascade MC400",boiler,210,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Cascade MC400",boiler,210,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Cascade MC400",boiler,210,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Cascade MC400",boiler,210,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Cascade MC400",boiler,210,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Cascade MC400",boiler,210,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Cascade MC400",boiler,210,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Cascade MC400",boiler,210,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Cascade MC400",boiler,210,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Cascade MC400",boiler,210,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Cascade MC400",boiler,210,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Cascade MC400",boiler,210,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Cascade MC400",boiler,210,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Cascade MC400",boiler,210,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Cascade MC400",boiler,210,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Cascade MC400",boiler,210,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Cascade MC400",boiler,210,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Cascade MC400",boiler,210,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Cascade MC400",boiler,210,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Cascade MC400",boiler,210,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Cascade MC400",boiler,210,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Cascade MC400",boiler,210,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Cascade MC400",boiler,210,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Cascade MC400",boiler,210,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Cascade MC400",boiler,210,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Cascade MC400",boiler,210,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Cascade MC400",boiler,210,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Cascade MC400",boiler,210,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Cascade MC400",boiler,210,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Cascade MC400",boiler,210,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Cascade MC400",boiler,210,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Cascade MC400",boiler,210,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Cascade MC400",boiler,210,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Cascade MC400",boiler,210,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Cascade MC400",boiler,210,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Cascade MC400",boiler,210,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Cascade MC400",boiler,210,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Cascade MC400",boiler,210,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Cascade MC400",boiler,210,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Cascade MC400",boiler,210,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Cascade MC400",boiler,210,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Cascade MC400",boiler,210,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Cascade MC400",boiler,210,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Cascade MC400",boiler,210,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Cascade MC400",boiler,210,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Cascade MC400",boiler,210,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Cascade MC400",boiler,210,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Cascade MC400",boiler,210,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Cascade MC400",boiler,210,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Cascade MC400",boiler,210,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Cascade MC400",boiler,210,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Cascade MC400",boiler,210,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Cascade MC400",boiler,210,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Cascade MC400",boiler,210,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Cascade MC400",boiler,210,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Cascade MC400",boiler,210,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Cascade MC400",boiler,210,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Cascade MC400",boiler,210,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Cascade MC400",boiler,210,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Cascade MC400",boiler,210,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Cascade MC400",boiler,210,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Cascade MC400",boiler,210,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Cascade MC400",boiler,210,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Cascade MC400",boiler,210,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Cascade MC400",boiler,210,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Cascade MC400",boiler,210,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Cascade MC400",boiler,210,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Cascade MC400",boiler,210,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Cascade MC400",boiler,210,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Cascade MC400",boiler,210,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Cascade MC400",boiler,210,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Cascade MC400",boiler,210,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Cascade MC400",boiler,210,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Cascade MC400",boiler,210,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Cascade MC400",boiler,210,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Cascade MC400",boiler,210,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Cascade MC400",boiler,210,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Cascade MC400",boiler,210,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Cascade MC400",boiler,210,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Cascade MC400",boiler,210,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Cascade MC400",boiler,210,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Cascade MC400",boiler,210,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Cascade MC400",boiler,210,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Cascade MC400",boiler,210,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Cascade MC400",boiler,210,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Cascade MC400",boiler,210,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Cascade MC400",boiler,210,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Cascade MC400",boiler,210,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Cascade MC400",boiler,210,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Cascade MC400",boiler,210,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Cascade MC400",boiler,210,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Cascade MC400",boiler,210,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Cascade MC400",boiler,210,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Cascade MC400",boiler,210,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Cascade MC400",boiler,210,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Cascade MC400",boiler,210,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Cascade MC400",boiler,210,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Cascade MC400",boiler,210,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Cascade MC400",boiler,210,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Cascade MC400",boiler,210,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Cascade MC400",boiler,210,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Cascade MC400",boiler,210,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Cascade MC400",boiler,210,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Cascade MC400",boiler,210,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Cascade MC400",boiler,210,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Cascade MC400",boiler,210,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Cascade MC400",boiler,210,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Cascade MC400",boiler,210,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Cascade MC400",boiler,210,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Cascade MC400",boiler,210,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Cascade MC400",boiler,210,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Cascade MC400",boiler,210,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Cascade MC400",boiler,210,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Cascade MC400",boiler,210,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Cascade MC400",boiler,210,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Cascade MC400",boiler,210,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Cascade MC400",boiler,210,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Cascade MC400",boiler,210,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"EasyControl Adapter",boiler,211,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"EasyControl Adapter",boiler,211,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"EasyControl Adapter",boiler,211,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"EasyControl Adapter",boiler,211,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"EasyControl Adapter",boiler,211,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"EasyControl Adapter",boiler,211,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "EasyControl Adapter",boiler,211,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "EasyControl Adapter",boiler,211,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "EasyControl Adapter",boiler,211,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"EasyControl Adapter",boiler,211,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"EasyControl Adapter",boiler,211,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"EasyControl Adapter",boiler,211,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"EasyControl Adapter",boiler,211,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"EasyControl Adapter",boiler,211,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"EasyControl Adapter",boiler,211,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"EasyControl Adapter",boiler,211,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"EasyControl Adapter",boiler,211,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"EasyControl Adapter",boiler,211,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"EasyControl Adapter",boiler,211,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"EasyControl Adapter",boiler,211,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"EasyControl Adapter",boiler,211,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"EasyControl Adapter",boiler,211,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"EasyControl Adapter",boiler,211,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"EasyControl Adapter",boiler,211,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"EasyControl Adapter",boiler,211,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"EasyControl Adapter",boiler,211,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"EasyControl Adapter",boiler,211,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "EasyControl Adapter",boiler,211,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "EasyControl Adapter",boiler,211,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"EasyControl Adapter",boiler,211,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"EasyControl Adapter",boiler,211,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "EasyControl Adapter",boiler,211,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "EasyControl Adapter",boiler,211,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "EasyControl Adapter",boiler,211,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"EasyControl Adapter",boiler,211,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"EasyControl Adapter",boiler,211,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "EasyControl Adapter",boiler,211,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "EasyControl Adapter",boiler,211,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"EasyControl Adapter",boiler,211,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"EasyControl Adapter",boiler,211,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"EasyControl Adapter",boiler,211,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"EasyControl Adapter",boiler,211,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "EasyControl Adapter",boiler,211,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "EasyControl Adapter",boiler,211,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "EasyControl Adapter",boiler,211,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "EasyControl Adapter",boiler,211,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"EasyControl Adapter",boiler,211,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"EasyControl Adapter",boiler,211,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "EasyControl Adapter",boiler,211,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "EasyControl Adapter",boiler,211,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "EasyControl Adapter",boiler,211,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"EasyControl Adapter",boiler,211,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"EasyControl Adapter",boiler,211,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "EasyControl Adapter",boiler,211,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"EasyControl Adapter",boiler,211,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"EasyControl Adapter",boiler,211,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "EasyControl Adapter",boiler,211,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "EasyControl Adapter",boiler,211,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"EasyControl Adapter",boiler,211,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"EasyControl Adapter",boiler,211,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"EasyControl Adapter",boiler,211,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"EasyControl Adapter",boiler,211,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"EasyControl Adapter",boiler,211,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"EasyControl Adapter",boiler,211,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"EasyControl Adapter",boiler,211,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"EasyControl Adapter",boiler,211,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "EasyControl Adapter",boiler,211,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "EasyControl Adapter",boiler,211,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "EasyControl Adapter",boiler,211,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"EasyControl Adapter",boiler,211,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"EasyControl Adapter",boiler,211,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"EasyControl Adapter",boiler,211,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"EasyControl Adapter",boiler,211,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"EasyControl Adapter",boiler,211,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"EasyControl Adapter",boiler,211,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"EasyControl Adapter",boiler,211,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"EasyControl Adapter",boiler,211,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"EasyControl Adapter",boiler,211,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"EasyControl Adapter",boiler,211,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"EasyControl Adapter",boiler,211,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"EasyControl Adapter",boiler,211,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"EasyControl Adapter",boiler,211,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"EasyControl Adapter",boiler,211,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "EasyControl Adapter",boiler,211,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "EasyControl Adapter",boiler,211,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"EasyControl Adapter",boiler,211,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"EasyControl Adapter",boiler,211,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "EasyControl Adapter",boiler,211,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"EasyControl Adapter",boiler,211,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"EasyControl Adapter",boiler,211,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"EasyControl Adapter",boiler,211,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"EasyControl Adapter",boiler,211,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"EasyControl Adapter",boiler,211,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"EasyControl Adapter",boiler,211,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"EasyControl Adapter",boiler,211,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"EasyControl Adapter",boiler,211,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "EasyControl Adapter",boiler,211,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"EasyControl Adapter",boiler,211,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"EasyControl Adapter",boiler,211,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"EasyControl Adapter",boiler,211,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"EasyControl Adapter",boiler,211,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "EasyControl Adapter",boiler,211,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"EasyControl Adapter",boiler,211,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"EasyControl Adapter",boiler,211,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"EasyControl Adapter",boiler,211,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"EasyControl Adapter",boiler,211,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"EasyControl Adapter",boiler,211,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"EasyControl Adapter",boiler,211,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"EasyControl Adapter",boiler,211,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"EasyControl Adapter",boiler,211,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"EasyControl Adapter",boiler,211,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"EasyControl Adapter",boiler,211,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"EasyControl Adapter",boiler,211,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"EasyControl Adapter",boiler,211,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"EasyControl Adapter",boiler,211,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"EasyControl Adapter",boiler,211,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"EasyControl Adapter",boiler,211,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"EasyControl Adapter",boiler,211,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"EasyControl Adapter",boiler,211,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"EasyControl Adapter",boiler,211,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"EasyControl Adapter",boiler,211,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"EasyControl Adapter",boiler,211,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"EasyControl Adapter",boiler,211,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"EasyControl Adapter",boiler,211,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"EasyControl Adapter",boiler,211,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"EasyControl Adapter",boiler,211,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"EasyControl Adapter",boiler,211,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"EasyControl Adapter",boiler,211,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"EasyControl Adapter",boiler,211,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"EasyControl Adapter",boiler,211,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"EasyControl Adapter",boiler,211,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"EasyControl Adapter",boiler,211,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "EasyControl Adapter",boiler,211,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"EasyControl Adapter",boiler,211,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"EasyControl Adapter",boiler,211,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"EasyControl Adapter",boiler,211,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"EasyControl Adapter",boiler,211,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "EasyControl Adapter",boiler,211,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"EasyControl Adapter",boiler,211,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"EasyControl Adapter",boiler,211,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "EasyControl Adapter",boiler,211,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "EasyControl Adapter",boiler,211,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"EasyControl Adapter",boiler,211,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"EasyControl Adapter",boiler,211,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "EasyControl Adapter",boiler,211,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"EasyControl Adapter",boiler,211,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"EasyControl Adapter",boiler,211,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"EasyControl Adapter",boiler,211,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"EasyControl Adapter",boiler,211,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "EasyControl Adapter",boiler,211,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"EasyControl Adapter",boiler,211,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"EasyControl Adapter",boiler,211,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"EasyControl Adapter",boiler,211,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"EasyControl Adapter",boiler,211,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"EasyControl Adapter",boiler,211,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"EasyControl Adapter",boiler,211,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"EasyControl Adapter",boiler,211,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"EasyControl Adapter",boiler,211,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"EasyControl Adapter",boiler,211,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"EasyControl Adapter",boiler,211,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"EasyControl Adapter",boiler,211,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"EasyControl Adapter",boiler,211,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"EasyControl Adapter",boiler,211,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"EasyControl Adapter",boiler,211,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"EasyControl Adapter",boiler,211,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"EasyControl Adapter",boiler,211,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"EasyControl Adapter",boiler,211,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"EasyControl Adapter",boiler,211,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"EasyControl Adapter",boiler,211,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"EasyControl Adapter",boiler,211,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "EasyControl Adapter",boiler,211,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "EasyControl Adapter",boiler,211,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "EasyControl Adapter",boiler,211,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "EasyControl Adapter",boiler,211,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "EasyControl Adapter",boiler,211,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "EasyControl Adapter",boiler,211,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"EasyControl Adapter",boiler,211,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"EasyControl Adapter",boiler,211,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"EasyControl Adapter",boiler,211,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"EasyControl Adapter",boiler,211,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"EasyControl Adapter",boiler,211,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"EasyControl Adapter",boiler,211,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"EasyControl Adapter",boiler,211,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"EasyControl Adapter",boiler,211,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"EasyControl Adapter",boiler,211,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"EasyControl Adapter",boiler,211,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"EasyControl Adapter",boiler,211,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"EasyControl Adapter",boiler,211,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"EasyControl Adapter",boiler,211,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"EasyControl Adapter",boiler,211,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "EasyControl Adapter",boiler,211,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "EasyControl Adapter",boiler,211,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,netflowtemp,heat network flow temp,uint16 (>=0<=3199),C,false,sensor.boiler_heat_network_flow_temp,sensor.boiler_netflowtemp,5,0,1/10,276,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatvalve,heating valve,uint8 (>=0<=100),%,false,sensor.boiler_heating_valve,sensor.boiler_heatvalve,5,0,1,277,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.dhwvalve,valve,uint8 (>=0<=100),%,false,sensor.boiler_dhw_valve,sensor.boiler_dhw_dhwvalve,5,9,1,75,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,keepwarmtemp,keep warm temperature,uint8 (>=0<=254),C,true,number.boiler_keep_warm_temperature,number.boiler_keepwarmtemp,5,0,1,278,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,setreturntemp,set temp return,uint8 (>=0<=254),C,true,number.boiler_set_temp_return,number.boiler_setreturntemp,5,0,1,279,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,netflowtemp,heat network flow temp,uint16,C,false,sensor.boiler_heat_network_flow_temp,sensor.boiler_netflowtemp,5,0,1/10,276,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatvalve,heating valve,uint8,%,false,sensor.boiler_heating_valve,sensor.boiler_heatvalve,5,0,1,277,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.dhwvalve,valve,uint8,%,false,sensor.boiler_dhw_valve,sensor.boiler_dhw_dhwvalve,5,9,1,75,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,keepwarmtemp,keep warm temperature,uint8 (>=0<=0),C,true,number.boiler_keep_warm_temperature,number.boiler_keepwarmtemp,5,0,1,278,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,setreturntemp,set temp return,uint8 (>=0<=0),C,true,number.boiler_set_temp_return,number.boiler_setreturntemp,5,0,1,279,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,heating,heating,boolean, ,false,binary_sensor.boiler_heating,binary_sensor.boiler_heating,5,0,1,280,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,reset,reset,cmd [-\|maintenance\|error\|history\|message], ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,chimneysweeper,chimney sweeper,cmd [off\|on], ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatingoff,force heating off,boolean, ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Greenstar HIU, Logamax kompakt WS170",boiler,219,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,reset,reset,cmd [-\|maintenance\|error\|history\|message] (>=0<=0), ,true,sensor.boiler_reset,sensor.boiler_reset,5,0,1,0,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,chimneysweeper,chimney sweeper,cmd [off\|on] (>=0<=0), ,true,sensor.boiler_chimney_sweeper,sensor.boiler_chimneysweeper,5,0,1,1,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatingoff,force heating off,boolean (>=0<=0), ,true,switch.boiler_force_heating_off,switch.boiler_heatingoff,5,0,1,2,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatingactive,heating active,boolean, ,false,binary_sensor.boiler_heating_active,binary_sensor.boiler_heatingactive,5,0,1,3,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,tapwateractive,tapwater active,boolean, ,false,binary_sensor.boiler_tapwater_active,binary_sensor.boiler_tapwateractive,5,0,1,4,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,selflowtemp,selected flow temperature,uint8 (>=0<=90),C,true,number.boiler_selected_flow_temperature,number.boiler_selflowtemp,5,0,1,5,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,curflowtemp,current flow temperature,uint16 (>=0<=3199),C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,switchtemp,mixing switch temperature,uint16 (>=0<=3199),C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,syspress,system pressure,uint8 (>=0<=25),bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,boiltemp,actual boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,headertemp,low loss header,uint16 (>=0<=3199),C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,exhausttemp,exhaust temperature,uint16 (>=0<=3199),C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.boiler_heating_pump_modulation,sensor.boiler_heatingpumpmod,5,0,1,6,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,outdoortemp,outside temperature,int16,C,false,sensor.boiler_outside_temperature,sensor.boiler_outdoortemp,5,0,1/10,7,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,curflowtemp,current flow temperature,uint16,C,false,sensor.boiler_current_flow_temperature,sensor.boiler_curflowtemp,5,0,1/10,8,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,rettemp,return temperature,uint16,C,false,sensor.boiler_return_temperature,sensor.boiler_rettemp,5,0,1/10,9,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,switchtemp,mixing switch temperature,uint16,C,false,sensor.boiler_mixing_switch_temperature,sensor.boiler_switchtemp,5,0,1/10,10,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,syspress,system pressure,uint8,bar,false,sensor.boiler_system_pressure,sensor.boiler_syspress,5,0,1/10,11,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,boiltemp,actual boiler temperature,uint16,C,false,sensor.boiler_actual_boiler_temperature,sensor.boiler_boiltemp,5,0,1/10,12,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,headertemp,low loss header,uint16,C,false,sensor.boiler_low_loss_header,sensor.boiler_headertemp,5,0,1/10,13,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,exhausttemp,exhaust temperature,uint16,C,false,sensor.boiler_exhaust_temperature,sensor.boiler_exhausttemp,5,0,1/10,249,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burngas,gas,boolean, ,false,binary_sensor.boiler_gas,binary_sensor.boiler_burngas,5,0,1,250,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burngas2,gas stage 2,boolean, ,false,binary_sensor.boiler_gas_stage_2,binary_sensor.boiler_burngas2,5,0,1,251,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,flamecurr,flame current,uint16 (>=0<=3199),µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,flamecurr,flame current,uint16,µA,false,sensor.boiler_flame_current,sensor.boiler_flamecurr,5,0,1/10,252,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,fanwork,fan,boolean, ,false,binary_sensor.boiler_fan,binary_sensor.boiler_fanwork,5,0,1,253,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,ignwork,ignition,boolean, ,false,binary_sensor.boiler_ignition,binary_sensor.boiler_ignwork,5,0,1,254,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,oilpreheat,oil preheating,boolean, ,false,binary_sensor.boiler_oil_preheating,binary_sensor.boiler_oilpreheat,5,0,1,255,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burnminpower,burner min power,uint8 (>=0<=100),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burnminpower,burner min power,uint8 (>=0<=0),%,true,number.boiler_burner_min_power,number.boiler_burnminpower,5,0,1,256,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burnmaxpower,burner max power,uint8 (>=0<=254),%,true,number.boiler_burner_max_power,number.boiler_burnmaxpower,5,0,1,257,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burnminperiod,burner min period,uint8 (>=0<=120),minutes,true,number.boiler_burner_min_period,number.boiler_burnminperiod,5,0,1,258,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,absburnpow,burner current power (absolute),uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatblock,heating block,uint16 (>=0<=3199),C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,absburnpow,burner current power (absolute),uint8,%,false,sensor.boiler_burner_current_power_(absolute),sensor.boiler_absburnpow,5,0,1,259,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatblock,heating block,uint16,C,false,sensor.boiler_heating_block,sensor.boiler_heatblock,5,0,1/10,260,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,boilhyston,hysteresis on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_on_temperature,number.boiler_boilhyston,5,0,1,261,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,boilhystoff,hysteresis off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_off_temperature,number.boiler_boilhystoff,5,0,1,262,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,boil2hyston,hysteresis stage 2 on temperature,int8 (>=-20<=0),C,true,number.boiler_hysteresis_stage_2_on_temperature,number.boiler_boil2hyston,5,0,1,263,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,boil2hystoff,hysteresis stage 2 off temperature,int8 (>=0<=20),C,true,number.boiler_hysteresis_stage_2_off_temperature,number.boiler_boil2hystoff,5,0,1,264,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,curveon,heatingcurve on,boolean, ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,curveon,heatingcurve on,boolean (>=0<=0), ,true,switch.boiler_heatingcurve_on,switch.boiler_curveon,5,0,1,265,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,curvebase,heatingcurve base,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_base,number.boiler_curvebase,5,0,1,266,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,curveend,heatingcurve end,uint8 (>=20<=90),C,true,number.boiler_heatingcurve_end,number.boiler_curveend,5,0,1,267,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,summertemp,summer temperature,uint8 (>=0<=45),C,true,number.boiler_summer_temperature,number.boiler_summertemp,5,0,1,268,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,nofrostmode,nofrost mode,boolean, ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,nofrostmode,nofrost mode,boolean (>=0<=0), ,true,switch.boiler_nofrost_mode,switch.boiler_nofrostmode,5,0,1,269,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,nofrosttemp,nofrost temperature,uint8 (>=0<=10),C,true,number.boiler_nofrost_temperature,number.boiler_nofrosttemp,5,0,1,270,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatingactivated,heating activated,boolean, ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatingactivated,heating activated,boolean (>=0<=0), ,true,switch.boiler_heating_activated,switch.boiler_heatingactivated,5,0,1,14,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatingtemp,heating temperature,uint8 (>=0<=90),C,true,number.boiler_heating_temperature,number.boiler_heatingtemp,5,0,1,15,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatingpump,heating pump,boolean, ,false,binary_sensor.boiler_heating_pump,binary_sensor.boiler_heatingpump,5,0,1,16,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pumpmodmax,boiler pump max power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pumpmodmin,boiler pump min power,uint8 (>=0<=100),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4], ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar], ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pumpmodmax,boiler pump max power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_max_power,number.boiler_pumpmodmax,5,0,1,17,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pumpmodmin,boiler pump min power,uint8 (>=0<=0),%,true,number.boiler_boiler_pump_min_power,number.boiler_pumpmodmin,5,0,1,18,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pumpmode,boiler pump mode,enum [proportional\|deltaP-1\|deltaP-2\|deltaP-3\|deltaP-4] (>=0<=0), ,true,select.boiler_boiler_pump_mode,select.boiler_pumpmode,5,0,1,19,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pumpcharacter,boiler pump characteristic,enum [proportional\|150mbar\|200mbar\|250mbar\|300mbar\|350mbar\|400mbar] (>=0<=0), ,true,select.boiler_boiler_pump_characteristic,select.boiler_pumpcharacter,5,0,1,20,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pumpdelay,pump delay,uint8 (>=0<=60),minutes,true,number.boiler_pump_delay,number.boiler_pumpdelay,5,0,1,21,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pumpontemp,pump logic temperature,uint8 (>=0<=60),C,true,number.boiler_pump_logic_temperature,number.boiler_pumpontemp,5,0,1,22,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,selburnpow,burner selected max power,uint8 (>=0<=254),%,true,number.boiler_burner_selected_max_power,number.boiler_selburnpow,5,0,1,23,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,curburnpow,burner current power,uint8 (>=0<=100),%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burnstarts,burner starts,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burnworkmin,total burner operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burn2workmin,burner stage 2 operating time,time (>=0<=16777214),minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatworkmin,total heat operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatstarts,burner starts heating,uint24 (>=0<=16777214), ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,ubauptime,total UBA operating time,time (>=0<=16777214),minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,curburnpow,burner current power,uint8,%,false,sensor.boiler_burner_current_power,sensor.boiler_curburnpow,5,0,1,24,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burnstarts,burner starts,uint24, ,false,sensor.boiler_burner_starts,sensor.boiler_burnstarts,5,0,1,25,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burnworkmin,total burner operating time,time,minutes,false,sensor.boiler_total_burner_operating_time,sensor.boiler_burnworkmin,5,0,1,27,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,burn2workmin,burner stage 2 operating time,time,minutes,false,sensor.boiler_burner_stage_2_operating_time,sensor.boiler_burn2workmin,5,0,1,29,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatworkmin,total heat operating time,time,minutes,false,sensor.boiler_total_heat_operating_time,sensor.boiler_heatworkmin,5,0,1,31,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,heatstarts,burner starts heating,uint24, ,false,sensor.boiler_burner_starts_heating,sensor.boiler_heatstarts,5,0,1,33,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,ubauptime,total UBA operating time,time,minutes,false,sensor.boiler_total_UBA_operating_time,sensor.boiler_ubauptime,5,0,1,35,2
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,lastcode,last error code,string, ,false,sensor.boiler_last_error_code,sensor.boiler_lastcode,5,0,1,37,28
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,servicecode,service code,string, ,false,sensor.boiler_service_code,sensor.boiler_servicecode,5,0,1,65,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,servicecodenumber,service code number,uint16 (>=0<=31999), ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,servicecodenumber,service code number,uint16, ,false,sensor.boiler_service_code_number,sensor.boiler_servicecodenumber,5,0,1,67,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,maintenancemessage,maintenance message,string, ,false,sensor.boiler_maintenance_message,sensor.boiler_maintenancemessage,5,0,1,68,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,maintenance,maintenance scheduled,enum [off\|time\|date\|manual], ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,maintenancetime,time to next maintenance,uint16 (>=0<=31999),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,maintenancedate,next maintenance date,string, ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,emergencyops,emergency operation,boolean, ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,maintenance,maintenance scheduled,enum [off\|time\|date\|manual] (>=0<=0), ,true,select.boiler_maintenance_scheduled,select.boiler_maintenance,5,0,1,70,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,maintenancetime,time to next maintenance,uint16 (>=0<=0),hours,true,number.boiler_time_to_next_maintenance,number.boiler_maintenancetime,5,0,1,71,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,maintenancedate,next maintenance date,string (>=0<=0), ,true,sensor.boiler_next_maintenance_date,sensor.boiler_maintenancedate,5,0,1,72,6
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,emergencyops,emergency operation,boolean (>=0<=0), ,true,switch.boiler_emergency_operation,switch.boiler_emergencyops,5,0,1,78,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,emergencytemp,emergency temperature,uint8 (>=15<=70),C,true,number.boiler_emergency_temperature,number.boiler_emergencytemp,5,0,1,79,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pc0flow,Flow PC0,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pc1flow,Flow PC1,int16 (>=-31999<=31999),l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pc0flow,Flow PC0,int16,l/h,false,sensor.boiler_Flow_PC0,sensor.boiler_pc0flow,5,0,1,80,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pc1flow,Flow PC1,int16,l/h,false,sensor.boiler_Flow_PC1,sensor.boiler_pc1flow,5,0,1,81,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pc1on,PC1,boolean, ,false,binary_sensor.boiler_PC1,binary_sensor.boiler_pc1on,5,0,1,82,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pc1rate,PC1 rate,uint8 (>=0<=100),%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,meterheat,meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.meter,meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,gasmeterheat,gas meter heating,uint24 (>=0<=1677721),kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.gasmeter,gas meter,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,nrgheat2,energy heating 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.nrg2,energy 2,uint24 (>=0<=1677721),kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.tapactivated,turn on/off,boolean, ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.settemp,set temperature,uint8 (>=0<=254),C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.seltemplow,selected lower temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.seltempoff,selected temperature for off,uint8 (>=0<=254),C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.seltempsingle,single charge temperature,uint8 (>=0<=254),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.solartemp,solar boiler temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,pc1rate,PC1 rate,uint8,%,false,sensor.boiler_PC1_rate,sensor.boiler_pc1rate,5,0,1,83,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,meterheat,meter heating,uint24,kWh,false,sensor.boiler_meter_heating,sensor.boiler_meterheat,5,0,1/10,97,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.meter,meter,uint24,kWh,false,sensor.boiler_dhw_meter,sensor.boiler_dhw_meter,5,9,1/10,2,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,gasmeterheat,gas meter heating,uint24,kWh,false,sensor.boiler_gas_meter_heating,sensor.boiler_gasmeterheat,5,0,1/10,271,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.gasmeter,gas meter,uint24,kWh,false,sensor.boiler_dhw_gas_meter,sensor.boiler_dhw_gasmeter,5,9,1/10,71,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,nrgheat2,energy heating 2,uint24,kWh,false,sensor.boiler_energy_heating_2,sensor.boiler_nrgheat2,5,0,1/10,273,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.nrg2,energy 2,uint24,kWh,false,sensor.boiler_dhw_energy_2,sensor.boiler_dhw_nrg2,5,9,1/10,73,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.tapactivated,turn on/off,boolean (>=0<=0), ,true,switch.boiler_dhw_turn_on/off,switch.boiler_dhw_tapactivated,5,9,1,28,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.settemp,set temperature,uint8,C,false,sensor.boiler_dhw_set_temperature,sensor.boiler_dhw_settemp,5,9,1,29,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_temperature,number.boiler_dhw_seltemp,5,9,1,30,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.seltemplow,selected lower temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_lower_temperature,number.boiler_dhw_seltemplow,5,9,1,31,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.tempecoplus,selected eco+ temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_selected_eco+_temperature,number.boiler_dhw_tempecoplus,5,9,1,32,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.seltempoff,selected temperature for off,uint8,C,false,sensor.boiler_dhw_selected_temperature_for_off,sensor.boiler_dhw_seltempoff,5,9,1,33,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.seltempsingle,single charge temperature,uint8 (>=0<=0),C,true,number.boiler_dhw_single_charge_temperature,number.boiler_dhw_seltempsingle,5,9,1,34,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.solartemp,solar boiler temperature,uint16,C,false,sensor.boiler_dhw_solar_boiler_temperature,sensor.boiler_dhw_solartemp,5,9,1/10,35,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.type,type,enum [off\|flow\|buffered flow\|buffer\|layered buffer], ,false,sensor.boiler_dhw_type,sensor.boiler_dhw_type,5,9,1,36,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.comfort,comfort,enum [hot\|eco\|intelligent], ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.comfort1,comfort mode,enum [high comfort\|eco], ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.comfort,comfort,enum [hot\|eco\|intelligent] (>=0<=0), ,true,select.boiler_dhw_comfort,select.boiler_dhw_comfort,5,9,1,37,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.comfort1,comfort mode,enum [high comfort\|eco] (>=0<=0), ,true,select.boiler_dhw_comfort_mode,select.boiler_dhw_comfort1,5,9,1,38,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=100),C,true,number.boiler_dhw_flow_temperature_offset,number.boiler_dhw_flowtempoffset,5,9,1,39,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.chargeoptimization,charge optimization,boolean, ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.chargeoptimization,charge optimization,boolean (>=0<=0), ,true,switch.boiler_dhw_charge_optimization,switch.boiler_dhw_chargeoptimization,5,9,1,40,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.maxpower,max power,uint8 (>=0<=254),%,true,number.boiler_dhw_max_power,number.boiler_dhw_maxpower,5,9,1,41,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.maxtemp,maximum temperature,uint8 (>=0<=80),C,true,number.boiler_dhw_maximum_temperature,number.boiler_dhw_maxtemp,5,9,1,42,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.circpump,circulation pump available,boolean, ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.circpump,circulation pump available,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_pump_available,switch.boiler_dhw_circpump,5,9,1,43,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.chargetype,charging type,enum [chargepump\|3-way valve], ,false,sensor.boiler_dhw_charging_type,sensor.boiler_dhw_chargetype,5,9,1,44,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_on_temperature,number.boiler_dhw_hyston,5,9,1,45,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.boiler_dhw_hysteresis_off_temperature,number.boiler_dhw_hystoff,5,9,1,46,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.disinfectiontemp,disinfection temperature,uint8 (>=60<=80),C,true,number.boiler_dhw_disinfection_temperature,number.boiler_dhw_disinfectiontemp,5,9,1,47,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.circ,circulation active,boolean, ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.curtemp,current intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.curflow,current tap water flow,uint8 (>=0<=25),l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.storagetemp2,storage extern temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.activated,activated,boolean, ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.onetime,one time charging,boolean, ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.disinfecting,disinfecting,boolean, ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.boiler_dhw_circulation_pump_mode,select.boiler_dhw_circmode,5,9,1,48,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.boiler_dhw_circulation_active,switch.boiler_dhw_circ,5,9,1,49,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.curtemp,current intern temperature,uint16,C,false,sensor.boiler_dhw_current_intern_temperature,sensor.boiler_dhw_curtemp,5,9,1/10,50,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.boiler_dhw_current_extern_temperature,sensor.boiler_dhw_curtemp2,5,9,1/10,51,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.curflow,current tap water flow,uint8,l/min,false,sensor.boiler_dhw_current_tap_water_flow,sensor.boiler_dhw_curflow,5,9,1/10,52,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.boiler_dhw_storage_intern_temperature,sensor.boiler_dhw_storagetemp1,5,9,1/10,53,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.storagetemp2,storage extern temperature,uint16,C,false,sensor.boiler_dhw_storage_extern_temperature,sensor.boiler_dhw_storagetemp2,5,9,1/10,54,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.activated,activated,boolean (>=0<=0), ,true,switch.boiler_dhw_activated,switch.boiler_dhw_activated,5,9,1,55,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.onetime,one time charging,boolean (>=0<=0), ,true,switch.boiler_dhw_one_time_charging,switch.boiler_dhw_onetime,5,9,1,56,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.boiler_dhw_disinfecting,switch.boiler_dhw_disinfecting,5,9,1,57,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.charging,charging,boolean, ,false,binary_sensor.boiler_dhw_charging,binary_sensor.boiler_dhw_charging,5,9,1,58,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.recharging,recharging,boolean, ,false,binary_sensor.boiler_dhw_recharging,binary_sensor.boiler_dhw_recharging,5,9,1,59,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.tempok,temperature ok,boolean, ,false,binary_sensor.boiler_dhw_temperature_ok,binary_sensor.boiler_dhw_tempok,5,9,1,60,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.active,active,boolean, ,false,binary_sensor.boiler_dhw_active,binary_sensor.boiler_dhw_active,5,9,1,61,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.3wayvalve,3-way valve active,boolean, ,false,binary_sensor.boiler_dhw_3-way_valve_active,binary_sensor.boiler_dhw_3wayvalve,5,9,1,62,1
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.chargepump,charge pump,boolean, ,false,binary_sensor.boiler_dhw_charge_pump,binary_sensor.boiler_dhw_chargepump,5,9,1,63,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.mixertemp,mixer temperature,uint16 (>=0<=3199),C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16 (>=0<=3199),C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.dhwprio,dhw priority,boolean, ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.starts,starts,uint24 (>=0<=16777214), ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.workm,active time,time (>=0<=16777214),minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,nompower,nominal Power,uint8 (>=0<=254),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
-"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.mixertemp,mixer temperature,uint16,C,false,sensor.boiler_dhw_mixer_temperature,sensor.boiler_dhw_mixertemp,5,9,1/10,64,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.cylmiddletemp,cylinder middle temperature (TS3),uint16,C,false,sensor.boiler_dhw_cylinder_middle_temperature_(TS3),sensor.boiler_dhw_cylmiddletemp,5,9,1/10,65,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.boiler_dhw_dhw_priority,switch.boiler_dhw_dhwprio,5,9,1,66,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.starts,starts,uint24, ,false,sensor.boiler_dhw_starts,sensor.boiler_dhw_starts,5,9,1,67,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.workm,active time,time,minutes,false,sensor.boiler_dhw_active_time,sensor.boiler_dhw_workm,5,9,1,69,2
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,nompower,nominal Power,uint8 (>=0<=0),kW,true,number.boiler_nominal_Power,number.boiler_nompower,5,0,1,275,1
+"Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,nrgtotal,total energy,uint24,kWh,false,sensor.boiler_total_energy,sensor.boiler_nrgtotal,5,0,1/100,85,2
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,nrgheat,energy heating,uint24 (>=0<=10000000),kWh,true,number.boiler_energy_heating,number.boiler_nrgheat,5,0,1/100,87,2
 "Logamax Plus GB122, Condense 2300, Junkers Cerapur GC2200W",boiler,234,dhw.nrg,energy,uint24 (>=0<=10000000),kWh,true,number.boiler_dhw_energy,number.boiler_dhw_nrg,5,9,1/100,0,2
 "Logamatic TC100, Moduline Easy",thermostat,202,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "Logamatic TC100, Moduline Easy",thermostat,202,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "Logamatic TC100, Moduline Easy",thermostat,202,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"Logamatic TC100, Moduline Easy",thermostat,202,hc1.seltemp,selected room temperature,int16 (>=-319<=319),C,false,sensor.thermostat_hc1_selected_room_temperature,sensor.thermostat_hc1_seltemp,6,1,1/100,0,1
-"Logamatic TC100, Moduline Easy",thermostat,202,hc1.currtemp,current room temperature,int16 (>=-319<=319),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/100,1,1
-"Logamatic TC100, Moduline Easy",thermostat,202,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"Logamatic TC100, Moduline Easy",thermostat,202,hc1.seltemp,selected room temperature,int16,C,false,sensor.thermostat_hc1_selected_room_temperature,sensor.thermostat_hc1_seltemp,6,1,1/100,0,1
+"Logamatic TC100, Moduline Easy",thermostat,202,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/100,1,1
+"Logamatic TC100, Moduline Easy",thermostat,202,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
 "EasyControl, CT200",thermostat,203,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "EasyControl, CT200",thermostat,203,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "EasyControl, CT200",thermostat,203,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"EasyControl, CT200",thermostat,203,hc1.seltemp,selected room temperature,int16 (>=-319<=319),C,false,sensor.thermostat_hc1_selected_room_temperature,sensor.thermostat_hc1_seltemp,6,1,1/100,0,1
-"EasyControl, CT200",thermostat,203,hc1.currtemp,current room temperature,int16 (>=-319<=319),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/100,1,1
-"EasyControl, CT200",thermostat,203,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"EasyControl, CT200",thermostat,203,hc1.seltemp,selected room temperature,int16,C,false,sensor.thermostat_hc1_selected_room_temperature,sensor.thermostat_hc1_seltemp,6,1,1/100,0,1
+"EasyControl, CT200",thermostat,203,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/100,1,1
+"EasyControl, CT200",thermostat,203,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
 "UI800, BC400",thermostat,4,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "UI800, BC400",thermostat,4,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"UI800, BC400",thermostat,4,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"UI800, BC400",thermostat,4,intoffset,internal temperature offset,int8 (>=-12<=12),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
+"UI800, BC400",thermostat,4,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"UI800, BC400",thermostat,4,intoffset,internal temperature offset,int8 (>=0<=0),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
 "UI800, BC400",thermostat,4,floordry,floor drying,enum [off\|start\|heat\|hold\|cool\|end], ,false,sensor.thermostat_floor_drying,sensor.thermostat_floordry,6,0,1,47,1
-"UI800, BC400",thermostat,4,dampedoutdoortemp,damped outdoor temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1/10,48,1
-"UI800, BC400",thermostat,4,floordrytemp,floor drying temperature,uint8 (>=0<=254),C,false,sensor.thermostat_floor_drying_temperature,sensor.thermostat_floordrytemp,6,0,1,49,1
-"UI800, BC400",thermostat,4,building,building type,enum [light\|medium\|heavy], ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
-"UI800, BC400",thermostat,4,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
-"UI800, BC400",thermostat,4,damping,damping outdoor temperature,boolean, ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
-"UI800, BC400",thermostat,4,solar,solar,boolean, ,true,switch.thermostat_solar,switch.thermostat_solar,6,0,1,53,1
-"UI800, BC400",thermostat,4,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"UI800, BC400",thermostat,4,dampedoutdoortemp,damped outdoor temperature,int16,C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1/10,48,1
+"UI800, BC400",thermostat,4,floordrytemp,floor drying temperature,uint8,C,false,sensor.thermostat_floor_drying_temperature,sensor.thermostat_floordrytemp,6,0,1,49,1
+"UI800, BC400",thermostat,4,building,building type,enum [light\|medium\|heavy] (>=0<=0), ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
+"UI800, BC400",thermostat,4,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"UI800, BC400",thermostat,4,damping,damping outdoor temperature,boolean (>=0<=0), ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
+"UI800, BC400",thermostat,4,solar,solar,boolean (>=0<=0), ,true,switch.thermostat_solar,switch.thermostat_solar,6,0,1,53,1
+"UI800, BC400",thermostat,4,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "UI800, BC400",thermostat,4,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "UI800, BC400",thermostat,4,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "UI800, BC400",thermostat,4,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
 "UI800, BC400",thermostat,4,electricfactor,electric energy factor,uint8 (>=0<=5), ,true,number.thermostat_electric_energy_factor,number.thermostat_electricfactor,6,0,1/10,58,1
 "UI800, BC400",thermostat,4,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "UI800, BC400",thermostat,4,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
-"UI800, BC400",thermostat,4,pvenabledhw,enable raise dhw,boolean, ,true,switch.thermostat_enable_raise_dhw,switch.thermostat_pvenabledhw,6,0,1,61,1
+"UI800, BC400",thermostat,4,pvenabledhw,enable raise dhw,boolean (>=0<=0), ,true,switch.thermostat_enable_raise_dhw,switch.thermostat_pvenabledhw,6,0,1,61,1
 "UI800, BC400",thermostat,4,pvraiseheat,raise heating with PV,int8 (>=0<=5),K,true,number.thermostat_raise_heating_with_PV,number.thermostat_pvraiseheat,6,0,1,62,1
 "UI800, BC400",thermostat,4,pvlowercool,lower cooling with PV,int8 (>=-5<=0),K,true,number.thermostat_lower_cooling_with_PV,number.thermostat_pvlowercool,6,0,1,63,1
-"UI800, BC400",thermostat,4,absent,absent,boolean, ,true,switch.thermostat_absent,switch.thermostat_absent,6,0,1,64,1
+"UI800, BC400",thermostat,4,absent,absent,boolean (>=0<=0), ,true,switch.thermostat_absent,switch.thermostat_absent,6,0,1,64,1
 "UI800, BC400",thermostat,4,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"UI800, BC400",thermostat,4,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"UI800, BC400",thermostat,4,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"UI800, BC400",thermostat,4,hc1.mode,operating mode,enum [off\|manual\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"UI800, BC400",thermostat,4,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"UI800, BC400",thermostat,4,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"UI800, BC400",thermostat,4,hc1.mode,operating mode,enum [off\|manual\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "UI800, BC400",thermostat,4,hc1.modetype,mode type,enum [eco\|comfort], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"UI800, BC400",thermostat,4,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"UI800, BC400",thermostat,4,hc1.manualtemp,manual temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
-"UI800, BC400",thermostat,4,hc1.comforttemp,comfort temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_comfort_temperature,number.thermostat_hc1_comforttemp,6,1,1/2,7,1
+"UI800, BC400",thermostat,4,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"UI800, BC400",thermostat,4,hc1.manualtemp,manual temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
+"UI800, BC400",thermostat,4,hc1.comforttemp,comfort temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_comfort_temperature,number.thermostat_hc1_comforttemp,6,1,1/2,7,1
 "UI800, BC400",thermostat,4,hc1.summertemp,summer temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
-"UI800, BC400",thermostat,4,hc1.designtemp,design temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"UI800, BC400",thermostat,4,hc1.offsettemp,offset temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1,10,1
-"UI800, BC400",thermostat,4,hc1.minflowtemp,min flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
-"UI800, BC400",thermostat,4,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
-"UI800, BC400",thermostat,4,hc1.roominfluence,room influence,uint8 (>=0<=254),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
-"UI800, BC400",thermostat,4,hc1.roominflfactor,room influence factor,uint8 (>=0<=25), ,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,1/10,14,1
-"UI800, BC400",thermostat,4,hc1.curroominfl,current room influence,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_influence,sensor.thermostat_hc1_curroominfl,6,1,1/10,15,1
-"UI800, BC400",thermostat,4,hc1.nofrostmode,nofrost mode,enum [room\|outdoor\|room outdoor], ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
-"UI800, BC400",thermostat,4,hc1.nofrosttemp,nofrost temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
-"UI800, BC400",thermostat,4,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
-"UI800, BC400",thermostat,4,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"UI800, BC400",thermostat,4,hc1.summersetmode,set summer mode,enum [summer\|auto\|winter], ,true,select.thermostat_hc1_set_summer_mode,select.thermostat_hc1_summersetmode,6,1,1,20,1
-"UI800, BC400",thermostat,4,hc1.hpoperatingmode,heatpump operating mode,enum [off\|auto\|heating\|cooling], ,true,select.thermostat_hc1_heatpump_operating_mode,select.thermostat_hc1_hpoperatingmode,6,1,1,21,1
+"UI800, BC400",thermostat,4,hc1.designtemp,design temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
+"UI800, BC400",thermostat,4,hc1.offsettemp,offset temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1,10,1
+"UI800, BC400",thermostat,4,hc1.minflowtemp,min flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
+"UI800, BC400",thermostat,4,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
+"UI800, BC400",thermostat,4,hc1.roominfluence,room influence,uint8 (>=0<=0),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
+"UI800, BC400",thermostat,4,hc1.roominflfactor,room influence factor,uint8 (>=0<=0), ,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,1/10,14,1
+"UI800, BC400",thermostat,4,hc1.curroominfl,current room influence,int16,C,false,sensor.thermostat_hc1_current_room_influence,sensor.thermostat_hc1_curroominfl,6,1,1/10,15,1
+"UI800, BC400",thermostat,4,hc1.nofrostmode,nofrost mode,enum [room\|outdoor\|room outdoor] (>=0<=0), ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
+"UI800, BC400",thermostat,4,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
+"UI800, BC400",thermostat,4,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"UI800, BC400",thermostat,4,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"UI800, BC400",thermostat,4,hc1.summersetmode,set summer mode,enum [summer\|auto\|winter] (>=0<=0), ,true,select.thermostat_hc1_set_summer_mode,select.thermostat_hc1_summersetmode,6,1,1,20,1
+"UI800, BC400",thermostat,4,hc1.hpoperatingmode,heatpump operating mode,enum [off\|auto\|heating\|cooling] (>=0<=0), ,true,select.thermostat_hc1_heatpump_operating_mode,select.thermostat_hc1_hpoperatingmode,6,1,1,21,1
 "UI800, BC400",thermostat,4,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "UI800, BC400",thermostat,4,hc1.hpoperatingstate,heatpump operating state,enum [heating\|off\|cooling], ,false,sensor.thermostat_hc1_heatpump_operating_state,sensor.thermostat_hc1_hpoperatingstate,6,1,1,23,1
 "UI800, BC400",thermostat,4,hc1.vacationmode,vacation mode,boolean, ,false,binary_sensor.thermostat_hc1_vacation_mode,binary_sensor.thermostat_hc1_vacationmode,6,1,1,24,1
-"UI800, BC400",thermostat,4,hc1.controlmode,control mode,enum [weather compensated\|outside basepoint\|n/a\|room\|power\|constant], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"UI800, BC400",thermostat,4,hc1.program,program,enum [prog 1\|prog 2], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"UI800, BC400",thermostat,4,hc1.controlmode,control mode,enum [weather compensated\|outside basepoint\|n/a\|room\|power\|constant] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"UI800, BC400",thermostat,4,hc1.program,program,enum [prog 1\|prog 2] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "UI800, BC400",thermostat,4,hc1.tempautotemp,temporary set temperature automode,int8 (>=-1<=30),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
 "UI800, BC400",thermostat,4,hc1.cooltemp,cooling temperature,int8 (>=-1<=30),C,true,number.thermostat_hc1_cooling_temperature,number.thermostat_hc1_cooltemp,6,1,1/2,28,1
-"UI800, BC400",thermostat,4,hc1.fastheatup,fast heatup,uint8 (>=0<=100),%,true,number.thermostat_hc1_fast_heatup,number.thermostat_hc1_fastheatup,6,1,1,29,1
-"UI800, BC400",thermostat,4,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"UI800, BC400",thermostat,4,hc1.reducemode,reduce mode,enum [outdoor\|room\|reduce], ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
-"UI800, BC400",thermostat,4,hc1.noreducetemp,no reduce below temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
-"UI800, BC400",thermostat,4,hc1.reducetemp,off/reduce switch temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
-"UI800, BC400",thermostat,4,hc1.dhwprio,dhw priority,boolean, ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
-"UI800, BC400",thermostat,4,hc1.hpcooling,hp cooling,boolean, ,true,switch.thermostat_hc1_hp_cooling,switch.thermostat_hc1_hpcooling,6,1,1,35,1
+"UI800, BC400",thermostat,4,hc1.fastheatup,fast heatup,uint8 (>=0<=0),%,true,number.thermostat_hc1_fast_heatup,number.thermostat_hc1_fastheatup,6,1,1,29,1
+"UI800, BC400",thermostat,4,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"UI800, BC400",thermostat,4,hc1.reducemode,reduce mode,enum [outdoor\|room\|reduce] (>=0<=0), ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
+"UI800, BC400",thermostat,4,hc1.noreducetemp,no reduce below temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
+"UI800, BC400",thermostat,4,hc1.reducetemp,off/reduce switch temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
+"UI800, BC400",thermostat,4,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
+"UI800, BC400",thermostat,4,hc1.hpcooling,hp cooling,boolean (>=0<=0), ,true,switch.thermostat_hc1_hp_cooling,switch.thermostat_hc1_hpcooling,6,1,1,35,1
 "UI800, BC400",thermostat,4,hc1.coolingon,cooling on,boolean, ,false,binary_sensor.thermostat_hc1_cooling_on,binary_sensor.thermostat_hc1_coolingon,6,1,1,36,1
-"UI800, BC400",thermostat,4,hc1.hpmode,HP Mode,enum [heating\|cooling\|heating & cooling], ,true,select.thermostat_hc1_HP_Mode,select.thermostat_hc1_hpmode,6,1,1,37,1
+"UI800, BC400",thermostat,4,hc1.hpmode,HP Mode,enum [heating\|cooling\|heating & cooling] (>=0<=0), ,true,select.thermostat_hc1_HP_Mode,select.thermostat_hc1_hpmode,6,1,1,37,1
 "UI800, BC400",thermostat,4,hc1.dewoffset,dew point offset,uint8 (>=2<=10),K,true,number.thermostat_hc1_dew_point_offset,number.thermostat_hc1_dewoffset,6,1,1,38,1
-"UI800, BC400",thermostat,4,hc1.roomtempdiff,room temp difference,uint8 (>=0<=254),K,true,number.thermostat_hc1_room_temp_difference,number.thermostat_hc1_roomtempdiff,6,1,1,39,1
-"UI800, BC400",thermostat,4,hc1.hpminflowtemp,HP min. flow temp.,uint8 (>=0<=254),C,true,number.thermostat_hc1_HP_min._flow_temp.,number.thermostat_hc1_hpminflowtemp,6,1,1,40,1
-"UI800, BC400",thermostat,4,hc1.control,control device,enum [off\|-\|RC100\|RC100H\|-\|RC120RF\|RC220/RT800\|single], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"UI800, BC400",thermostat,4,hc1.roomtempdiff,room temp difference,uint8 (>=0<=0),K,true,number.thermostat_hc1_room_temp_difference,number.thermostat_hc1_roomtempdiff,6,1,1,39,1
+"UI800, BC400",thermostat,4,hc1.hpminflowtemp,HP min. flow temp.,uint8 (>=0<=0),C,true,number.thermostat_hc1_HP_min._flow_temp.,number.thermostat_hc1_hpminflowtemp,6,1,1,40,1
+"UI800, BC400",thermostat,4,hc1.control,control device,enum [off\|-\|RC100\|RC100H\|-\|RC120RF\|RC220/RT800\|single] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
 "UI800, BC400",thermostat,4,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
 "UI800, BC400",thermostat,4,hc1.remotehum,room humidity from remote,cmd [] (>=-1<=101),%,true,sensor.thermostat_hc1_room_humidity_from_remote,sensor.thermostat_hc1_remotehum,6,1,1,43,1
 "UI800, BC400",thermostat,4,hc1.heatondelay,heat-on delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_heat-on_delay,number.thermostat_hc1_heatondelay,6,1,1,44,1
 "UI800, BC400",thermostat,4,hc1.heatoffdelay,heat-off delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_heat-off_delay,number.thermostat_hc1_heatoffdelay,6,1,1,45,1
 "UI800, BC400",thermostat,4,hc1.instantstart,instant start,uint8 (>=1<=10),K,true,number.thermostat_hc1_instant_start,number.thermostat_hc1_instantstart,6,1,1,46,1
-"UI800, BC400",thermostat,4,hc1.boost,boost mode,boolean, ,true,switch.thermostat_hc1_boost_mode,switch.thermostat_hc1_boost,6,1,1,47,1
-"UI800, BC400",thermostat,4,hc1.boosttime,boost time,uint8 (>=0<=254),hours,true,number.thermostat_hc1_boost_time,number.thermostat_hc1_boosttime,6,1,1,48,1
+"UI800, BC400",thermostat,4,hc1.boost,boost mode,boolean (>=0<=0), ,true,switch.thermostat_hc1_boost_mode,switch.thermostat_hc1_boost,6,1,1,47,1
+"UI800, BC400",thermostat,4,hc1.boosttime,boost time,uint8 (>=0<=0),hours,true,number.thermostat_hc1_boost_time,number.thermostat_hc1_boosttime,6,1,1,48,1
 "UI800, BC400",thermostat,4,hc1.coolstart,cooling starttemp,uint8 (>=20<=35),C,true,number.thermostat_hc1_cooling_starttemp,number.thermostat_hc1_coolstart,6,1,1,49,1
 "UI800, BC400",thermostat,4,hc1.coolondelay,cooling on delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_cooling_on_delay,number.thermostat_hc1_coolondelay,6,1,1,50,1
 "UI800, BC400",thermostat,4,hc1.cooloffdelay,cooling off delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_cooling_off_delay,number.thermostat_hc1_cooloffdelay,6,1,1,51,1
-"UI800, BC400",thermostat,4,hc1.switchprogmode,switch program mode,enum [level\|absolute], ,true,select.thermostat_hc1_switch_program_mode,select.thermostat_hc1_switchprogmode,6,1,1,52,1
+"UI800, BC400",thermostat,4,hc1.switchprogmode,switch program mode,enum [level\|absolute] (>=0<=0), ,true,select.thermostat_hc1_switch_program_mode,select.thermostat_hc1_switchprogmode,6,1,1,52,1
 "UI800, BC400",thermostat,4,hc1.redthreshold,reduction threshold,int8 (>=12<=22),C,true,number.thermostat_hc1_reduction_threshold,number.thermostat_hc1_redthreshold,6,1,1/2,53,1
 "UI800, BC400",thermostat,4,hc1.solarinfl,solar influence,uint8 (>=-5<=4294967295),C,true,number.thermostat_hc1_solar_influence,number.thermostat_hc1_solarinfl,6,1,1,54,1
-"UI800, BC400",thermostat,4,hc1.currsolarinfl,current solar influence,uint8 (>=0<=25),C,false,sensor.thermostat_hc1_current_solar_influence,sensor.thermostat_hc1_currsolarinfl,6,1,1/10,55,1
-"UI800, BC400",thermostat,4,hc1.heatingpid,heating PID,enum [fast\|medium\|slow], ,true,select.thermostat_hc1_heating_PID,select.thermostat_hc1_heatingpid,6,1,1,56,1
-"UI800, BC400",thermostat,4,hc1.pumpopt,pump optimization,boolean, ,true,switch.thermostat_hc1_pump_optimization,switch.thermostat_hc1_pumpopt,6,1,1,57,1
+"UI800, BC400",thermostat,4,hc1.currsolarinfl,current solar influence,uint8,C,false,sensor.thermostat_hc1_current_solar_influence,sensor.thermostat_hc1_currsolarinfl,6,1,1/10,55,1
+"UI800, BC400",thermostat,4,hc1.heatingpid,heating PID,enum [fast\|medium\|slow] (>=0<=0), ,true,select.thermostat_hc1_heating_PID,select.thermostat_hc1_heatingpid,6,1,1,56,1
+"UI800, BC400",thermostat,4,hc1.pumpopt,pump optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_pump_optimization,switch.thermostat_hc1_pumpopt,6,1,1,57,1
 "UI800, BC400",thermostat,4,hc1.inttimefloor,integral time floor,uint8 (>=160<=320),minutes,true,number.thermostat_hc1_integral_time_floor,number.thermostat_hc1_inttimefloor,6,1,10,58,1
 "UI800, BC400",thermostat,4,hc1.inttime,integral time,uint8 (>=3<=80),minutes,true,number.thermostat_hc1_integral_time,number.thermostat_hc1_inttime,6,1,1,59,1
-"UI800, BC400",thermostat,4,dhw.mode,operating mode,enum [off\|eco+\|eco\|comfort\|auto], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"UI800, BC400",thermostat,4,dhw.mode,operating mode,enum [off\|eco+\|eco\|comfort\|auto] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
 "UI800, BC400",thermostat,4,dhw.modetype,mode type,enum [off\|eco\|comfort\|eco+], ,false,sensor.thermostat_dhw_mode_type,sensor.thermostat_dhw_modetype,6,9,1,1,1
-"UI800, BC400",thermostat,4,dhw.settemp,set temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_set_temperature,number.thermostat_dhw_settemp,6,9,1,2,1
-"UI800, BC400",thermostat,4,dhw.settemplow,set low temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_set_low_temperature,number.thermostat_dhw_settemplow,6,9,1,3,1
-"UI800, BC400",thermostat,4,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog], ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
-"UI800, BC400",thermostat,4,dhw.chargeduration,charge duration,uint8 (>=0<=3810),minutes,true,number.thermostat_dhw_charge_duration,number.thermostat_dhw_chargeduration,6,9,15,5,1
-"UI800, BC400",thermostat,4,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"UI800, BC400",thermostat,4,dhw.settemp,set temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_set_temperature,number.thermostat_dhw_settemp,6,9,1,2,1
+"UI800, BC400",thermostat,4,dhw.settemplow,set low temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_set_low_temperature,number.thermostat_dhw_settemplow,6,9,1,3,1
+"UI800, BC400",thermostat,4,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog] (>=0<=0), ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
+"UI800, BC400",thermostat,4,dhw.chargeduration,charge duration,uint8 (>=0<=0),minutes,true,number.thermostat_dhw_charge_duration,number.thermostat_dhw_chargeduration,6,9,15,5,1
+"UI800, BC400",thermostat,4,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "UI800, BC400",thermostat,4,dhw.extra,extra,boolean, ,false,binary_sensor.thermostat_dhw_extra,binary_sensor.thermostat_dhw_extra,6,9,1,7,1
-"UI800, BC400",thermostat,4,dhw.disinfecting,disinfecting,boolean, ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
-"UI800, BC400",thermostat,4,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all], ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
+"UI800, BC400",thermostat,4,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
+"UI800, BC400",thermostat,4,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all] (>=0<=0), ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
 "UI800, BC400",thermostat,4,dhw.disinfecttime,disinfection time,uint8 (>=0<=1431),minutes,true,number.thermostat_dhw_disinfection_time,number.thermostat_dhw_disinfecttime,6,9,15,10,1
-"UI800, BC400",thermostat,4,dhw.dailyheating,daily heating,boolean, ,true,switch.thermostat_dhw_daily_heating,switch.thermostat_dhw_dailyheating,6,9,1,11,1
+"UI800, BC400",thermostat,4,dhw.dailyheating,daily heating,boolean (>=0<=0), ,true,switch.thermostat_dhw_daily_heating,switch.thermostat_dhw_dailyheating,6,9,1,11,1
 "UI800, BC400",thermostat,4,dhw.dailyheattime,daily heating time,uint8 (>=0<=1431),minutes,true,number.thermostat_dhw_daily_heating_time,number.thermostat_dhw_dailyheattime,6,9,15,12,1
 "CR11",thermostat,10,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "CR11",thermostat,10,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "CR11",thermostat,10,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"CR11",thermostat,10,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"CR11",thermostat,10,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"CR11",thermostat,10,hc1.mode,operating mode,enum [off\|manual], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
-"CR11",thermostat,10,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
-"CR11",thermostat,10,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"CR11",thermostat,10,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"CR11",thermostat,10,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"CR11",thermostat,10,hc1.mode,operating mode,enum [off\|manual] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"CR11",thermostat,10,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"CR11",thermostat,10,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
 "RC10",thermostat,65,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC10",thermostat,65,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "RC10",thermostat,65,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"RC10",thermostat,65,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"RC10",thermostat,65,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
 "RC10",thermostat,65,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC10",thermostat,65,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC10",thermostat,65,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"RC10",thermostat,65,hc1.mode,operating mode,enum [night\|day\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"RC10",thermostat,65,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC10",thermostat,65,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC10",thermostat,65,hc1.mode,operating mode,enum [night\|day\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "RC10",thermostat,65,hc1.modetype,mode type,enum [night\|day], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"RC10",thermostat,65,hc1.daytemp,day temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
-"RC10",thermostat,65,hc1.nighttemp,night temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
-"RC10",thermostat,65,hc1.program,program,enum [family\|morning\|evening\|am\|pm\|midday\|singles\|seniors], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
-"RC10",thermostat,65,hc1.minflowtemp,min flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
-"RC10",thermostat,65,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
-"RC10",thermostat,65,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=127),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
-"RC10",thermostat,65,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"RC10",thermostat,65,hc1.daytemp,day temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
+"RC10",thermostat,65,hc1.nighttemp,night temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
+"RC10",thermostat,65,hc1.program,program,enum [family\|morning\|evening\|am\|pm\|midday\|singles\|seniors] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"RC10",thermostat,65,hc1.minflowtemp,min flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
+"RC10",thermostat,65,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
+"RC10",thermostat,65,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=0),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
+"RC10",thermostat,65,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
 "RC10",thermostat,65,hc1.summertemp,summer temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
 "RC10",thermostat,65,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "RC30",thermostat,67,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC30",thermostat,67,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "RC30",thermostat,67,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"RC30",thermostat,67,display,display,enum [internal temperature\|internal setpoint\|external temperature\|burner temperature\|dhw temperature\|functioning mode\|time\|date\|smoke temperature], ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
+"RC30",thermostat,67,display,display,enum [internal temperature\|internal setpoint\|external temperature\|burner temperature\|dhw temperature\|functioning mode\|time\|date\|smoke temperature] (>=0<=0), ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
 "RC30",thermostat,67,language,language,enum [german\|dutch\|french\|italian], ,false,sensor.thermostat_language,sensor.thermostat_language,6,0,1,66,1
-"RC30",thermostat,67,clockoffset,clock offset,int8 (>=-126<=126),seconds,true,number.thermostat_clock_offset,number.thermostat_clockoffset,6,0,1,67,1
-"RC30",thermostat,67,intoffset,internal temperature offset,int8 (>=-12<=12),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
-"RC30",thermostat,67,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
-"RC30",thermostat,67,inttemp1,temperature sensor 1,int16 (>=-3199<=3199),C,false,sensor.thermostat_temperature_sensor_1,sensor.thermostat_inttemp1,6,0,1/10,68,1
-"RC30",thermostat,67,inttemp2,temperature sensor 2,int16 (>=-3199<=3199),C,false,sensor.thermostat_temperature_sensor_2,sensor.thermostat_inttemp2,6,0,1/10,69,1
-"RC30",thermostat,67,damping,damping outdoor temperature,boolean, ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
-"RC30",thermostat,67,dampedoutdoortemp,damped outdoor temperature,int8 (>=-126<=126),C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1,48,1
-"RC30",thermostat,67,building,building type,enum [light\|medium\|heavy], ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
+"RC30",thermostat,67,clockoffset,clock offset,int8 (>=0<=0),seconds,true,number.thermostat_clock_offset,number.thermostat_clockoffset,6,0,1,67,1
+"RC30",thermostat,67,intoffset,internal temperature offset,int8 (>=0<=0),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
+"RC30",thermostat,67,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"RC30",thermostat,67,inttemp1,temperature sensor 1,int16,C,false,sensor.thermostat_temperature_sensor_1,sensor.thermostat_inttemp1,6,0,1/10,68,1
+"RC30",thermostat,67,inttemp2,temperature sensor 2,int16,C,false,sensor.thermostat_temperature_sensor_2,sensor.thermostat_inttemp2,6,0,1/10,69,1
+"RC30",thermostat,67,damping,damping outdoor temperature,boolean (>=0<=0), ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
+"RC30",thermostat,67,dampedoutdoortemp,damped outdoor temperature,int8,C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1,48,1
+"RC30",thermostat,67,building,building type,enum [light\|medium\|heavy] (>=0<=0), ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
 "RC30",thermostat,67,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC30",thermostat,67,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC30",thermostat,67,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"RC30",thermostat,67,hc1.mode,operating mode,enum [night\|day\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"RC30",thermostat,67,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC30",thermostat,67,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC30",thermostat,67,hc1.mode,operating mode,enum [night\|day\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "RC30",thermostat,67,hc1.modetype,mode type,enum [night\|day], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
 "RC30",thermostat,67,hc1.daytemp,day temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
 "RC30",thermostat,67,hc1.nighttemp,night temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
 "RC30",thermostat,67,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
 "RC30",thermostat,67,hc1.offsettemp,offset temperature,int8 (>=-5<=5),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1/2,10,1
 "RC30",thermostat,67,hc1.holidaytemp,holiday temperature,uint8 (>=5<=30),C,true,number.thermostat_hc1_holiday_temperature,number.thermostat_hc1_holidaytemp,6,1,1/2,62,1
-"RC30",thermostat,67,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"RC30",thermostat,67,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "RC30",thermostat,67,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
 "RC30",thermostat,67,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "RC30",thermostat,67,hc1.holidaymode,holiday mode,boolean, ,false,binary_sensor.thermostat_hc1_holiday_mode,binary_sensor.thermostat_hc1_holidaymode,6,1,1,63,1
 "RC30",thermostat,67,hc1.nofrosttemp,nofrost temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
-"RC30",thermostat,67,hc1.nofrostmode,nofrost mode,enum [off\|outdoor\|room], ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
+"RC30",thermostat,67,hc1.nofrostmode,nofrost mode,enum [off\|outdoor\|room] (>=0<=0), ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
 "RC30",thermostat,67,hc1.roominfluence,room influence,uint8 (>=0<=10),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
 "RC30",thermostat,67,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "RC30",thermostat,67,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "RC30",thermostat,67,hc1.flowtempoffset,flow temperature offset for mixer,uint8 (>=0<=20),C,true,number.thermostat_hc1_flow_temperature_offset_for_mixer,number.thermostat_hc1_flowtempoffset,6,1,1,64,1
-"RC30",thermostat,67,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"RC30",thermostat,67,hc1.reducemode,reduce mode,enum [nofrost\|reduce\|room\|outdoor], ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
-"RC30",thermostat,67,hc1.controlmode,control mode,enum [outdoor\|room], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"RC30",thermostat,67,hc1.control,control device,enum [off\|RC20\|RC3x], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"RC30",thermostat,67,hc1.holidays,holiday dates,string, ,true,sensor.thermostat_hc1_holiday_dates,sensor.thermostat_hc1_holidays,6,1,1,65,13
-"RC30",thermostat,67,hc1.vacations,vacation dates,string, ,true,sensor.thermostat_hc1_vacation_dates,sensor.thermostat_hc1_vacations,6,1,1,78,13
-"RC30",thermostat,67,hc1.program,program,enum [own 1\|family\|morning\|evening\|am\|pm\|midday\|singles\|seniors\|new\|own 2], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"RC30",thermostat,67,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"RC30",thermostat,67,hc1.reducemode,reduce mode,enum [nofrost\|reduce\|room\|outdoor] (>=0<=0), ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
+"RC30",thermostat,67,hc1.controlmode,control mode,enum [outdoor\|room] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"RC30",thermostat,67,hc1.control,control device,enum [off\|RC20\|RC3x] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"RC30",thermostat,67,hc1.holidays,holiday dates,string (>=0<=0), ,true,sensor.thermostat_hc1_holiday_dates,sensor.thermostat_hc1_holidays,6,1,1,65,13
+"RC30",thermostat,67,hc1.vacations,vacation dates,string (>=0<=0), ,true,sensor.thermostat_hc1_vacation_dates,sensor.thermostat_hc1_vacations,6,1,1,78,13
+"RC30",thermostat,67,hc1.program,program,enum [own 1\|family\|morning\|evening\|am\|pm\|midday\|singles\|seniors\|new\|own 2] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "RC30",thermostat,67,hc1.pause,pause time,uint8 (>=0<=99),hours,true,number.thermostat_hc1_pause_time,number.thermostat_hc1_pause,6,1,1,91,1
 "RC30",thermostat,67,hc1.party,party time,uint8 (>=0<=99),hours,true,number.thermostat_hc1_party_time,number.thermostat_hc1_party,6,1,1,92,1
 "RC30",thermostat,67,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=30),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
 "RC30",thermostat,67,hc1.noreducetemp,no reduce below temperature,int8 (>=-31<=10),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
 "RC30",thermostat,67,hc1.reducetemp,off/reduce switch temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
 "RC30",thermostat,67,hc1.vacreducetemp,vacations off/reduce switch temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_vacations_off/reduce_switch_temperature,number.thermostat_hc1_vacreducetemp,6,1,1,93,1
-"RC30",thermostat,67,hc1.vacreducemode,vacations reduce mode,enum [nofrost\|reduce\|room\|outdoor], ,true,select.thermostat_hc1_vacations_reduce_mode,select.thermostat_hc1_vacreducemode,6,1,1,94,1
+"RC30",thermostat,67,hc1.vacreducemode,vacations reduce mode,enum [nofrost\|reduce\|room\|outdoor] (>=0<=0), ,true,select.thermostat_hc1_vacations_reduce_mode,select.thermostat_hc1_vacreducemode,6,1,1,94,1
 "RC30",thermostat,67,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"RC30",thermostat,67,hc1.dhwprio,dhw priority,boolean, ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
-"RC30",thermostat,67,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"RC30",thermostat,67,hc1.switchtime1,own1 program switchtime,string, ,true,sensor.thermostat_hc1_own1_program_switchtime,sensor.thermostat_hc1_switchtime1,6,1,1,95,8
-"RC30",thermostat,67,hc1.switchtime2,own2 program switchtime,string, ,true,sensor.thermostat_hc1_own2_program_switchtime,sensor.thermostat_hc1_switchtime2,6,1,1,103,8
-"RC30",thermostat,67,dhw.mode,operating mode,enum [off\|on\|auto], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
-"RC30",thermostat,67,dhw.circmode,circulation pump mode,enum [off\|on\|auto], ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
-"RC30",thermostat,67,dhw.progmode,program,enum [std prog\|own prog], ,true,select.thermostat_dhw_program,select.thermostat_dhw_progmode,6,9,1,13,1
-"RC30",thermostat,67,dhw.circprog,circulation program,enum [std prog\|own prog], ,true,select.thermostat_dhw_circulation_program,select.thermostat_dhw_circprog,6,9,1,14,1
-"RC30",thermostat,67,dhw.disinfecting,disinfecting,boolean, ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
-"RC30",thermostat,67,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all], ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
+"RC30",thermostat,67,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
+"RC30",thermostat,67,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"RC30",thermostat,67,hc1.switchtime1,own1 program switchtime,string (>=0<=0), ,true,sensor.thermostat_hc1_own1_program_switchtime,sensor.thermostat_hc1_switchtime1,6,1,1,95,8
+"RC30",thermostat,67,hc1.switchtime2,own2 program switchtime,string (>=0<=0), ,true,sensor.thermostat_hc1_own2_program_switchtime,sensor.thermostat_hc1_switchtime2,6,1,1,103,8
+"RC30",thermostat,67,dhw.mode,operating mode,enum [off\|on\|auto] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"RC30",thermostat,67,dhw.circmode,circulation pump mode,enum [off\|on\|auto] (>=0<=0), ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
+"RC30",thermostat,67,dhw.progmode,program,enum [std prog\|own prog] (>=0<=0), ,true,select.thermostat_dhw_program,select.thermostat_dhw_progmode,6,9,1,13,1
+"RC30",thermostat,67,dhw.circprog,circulation program,enum [std prog\|own prog] (>=0<=0), ,true,select.thermostat_dhw_circulation_program,select.thermostat_dhw_circprog,6,9,1,14,1
+"RC30",thermostat,67,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
+"RC30",thermostat,67,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all] (>=0<=0), ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
 "RC30",thermostat,67,dhw.disinfecthour,disinfection hour,uint8 (>=0<=23), ,true,number.thermostat_dhw_disinfection_hour,number.thermostat_dhw_disinfecthour,6,9,1,15,1
-"RC30",thermostat,67,dhw.maxtemp,maximum temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_maximum_temperature,number.thermostat_dhw_maxtemp,6,9,1,16,1
-"RC30",thermostat,67,dhw.onetimekey,one time key function,boolean, ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,17,1
-"RC30",thermostat,67,dhw.switchtime,program switchtime,string, ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,18,8
-"RC30",thermostat,67,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,26,8
-"RC30",thermostat,67,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,34,13
-"RC30",thermostat,67,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,47,13
+"RC30",thermostat,67,dhw.maxtemp,maximum temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_maximum_temperature,number.thermostat_dhw_maxtemp,6,9,1,16,1
+"RC30",thermostat,67,dhw.onetimekey,one time key function,boolean (>=0<=0), ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,17,1
+"RC30",thermostat,67,dhw.switchtime,program switchtime,string (>=0<=0), ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,18,8
+"RC30",thermostat,67,dhw.circswitchtime,circulation program switchtime,string (>=0<=0), ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,26,8
+"RC30",thermostat,67,dhw.holidays,holiday dates,string (>=0<=0), ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,34,13
+"RC30",thermostat,67,dhw.vacations,vacation dates,string (>=0<=0), ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,47,13
 "RC20, Moduline 300",thermostat,77,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC20, Moduline 300",thermostat,77,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "RC20, Moduline 300",thermostat,77,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
 "RC20, Moduline 300",thermostat,77,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC20, Moduline 300",thermostat,77,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC20, Moduline 300",thermostat,77,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"RC20, Moduline 300",thermostat,77,hc1.mode,operating mode,enum [off\|manual\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
-"RC20, Moduline 300",thermostat,77,hc1.manualtemp,manual temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
-"RC20, Moduline 300",thermostat,77,hc1.offtemp,temperature when mode is off,uint8 (>=0<=127),C,true,number.thermostat_hc1_temperature_when_mode_is_off,number.thermostat_hc1_offtemp,6,1,1/2,111,1
-"RC20, Moduline 300",thermostat,77,hc1.daytemp2,day temperature T2,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature_T2,number.thermostat_hc1_daytemp2,6,1,1/2,112,1
-"RC20, Moduline 300",thermostat,77,hc1.daytemp3,day temperature T3,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature_T3,number.thermostat_hc1_daytemp3,6,1,1/2,113,1
-"RC20, Moduline 300",thermostat,77,hc1.daytemp4,day temperature T4,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature_T4,number.thermostat_hc1_daytemp4,6,1,1/2,114,1
-"RC20, Moduline 300",thermostat,77,hc1.nighttemp,night temperature T1,uint8 (>=0<=127),C,true,number.thermostat_hc1_night_temperature_T1,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
-"RC20, Moduline 300",thermostat,77,hc1.switchtime,program switchtime,string, ,true,sensor.thermostat_hc1_program_switchtime,sensor.thermostat_hc1_switchtime,6,1,1,115,8
+"RC20, Moduline 300",thermostat,77,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC20, Moduline 300",thermostat,77,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC20, Moduline 300",thermostat,77,hc1.mode,operating mode,enum [off\|manual\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"RC20, Moduline 300",thermostat,77,hc1.manualtemp,manual temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
+"RC20, Moduline 300",thermostat,77,hc1.offtemp,temperature when mode is off,uint8 (>=0<=0),C,true,number.thermostat_hc1_temperature_when_mode_is_off,number.thermostat_hc1_offtemp,6,1,1/2,111,1
+"RC20, Moduline 300",thermostat,77,hc1.daytemp2,day temperature T2,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature_T2,number.thermostat_hc1_daytemp2,6,1,1/2,112,1
+"RC20, Moduline 300",thermostat,77,hc1.daytemp3,day temperature T3,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature_T3,number.thermostat_hc1_daytemp3,6,1,1/2,113,1
+"RC20, Moduline 300",thermostat,77,hc1.daytemp4,day temperature T4,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature_T4,number.thermostat_hc1_daytemp4,6,1,1/2,114,1
+"RC20, Moduline 300",thermostat,77,hc1.nighttemp,night temperature T1,uint8 (>=0<=0),C,true,number.thermostat_hc1_night_temperature_T1,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
+"RC20, Moduline 300",thermostat,77,hc1.switchtime,program switchtime,string (>=0<=0), ,true,sensor.thermostat_hc1_program_switchtime,sensor.thermostat_hc1_switchtime,6,1,1,115,8
 "Moduline 400",thermostat,78,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "Moduline 400",thermostat,78,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "Moduline 400",thermostat,78,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"Moduline 400",thermostat,78,clockoffset,clock offset,int8 (>=-126<=126),seconds,true,number.thermostat_clock_offset,number.thermostat_clockoffset,6,0,1,67,1
-"Moduline 400",thermostat,78,autodst,automatic change daylight saving time,boolean, ,true,switch.thermostat_automatic_change_daylight_saving_time,switch.thermostat_autodst,6,0,1,70,1
-"Moduline 400",thermostat,78,language,language,enum [german\|dutch], ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
-"Moduline 400",thermostat,78,backlight,key backlight,boolean, ,true,switch.thermostat_key_backlight,switch.thermostat_backlight,6,0,1,71,1
+"Moduline 400",thermostat,78,clockoffset,clock offset,int8 (>=0<=0),seconds,true,number.thermostat_clock_offset,number.thermostat_clockoffset,6,0,1,67,1
+"Moduline 400",thermostat,78,autodst,automatic change daylight saving time,boolean (>=0<=0), ,true,switch.thermostat_automatic_change_daylight_saving_time,switch.thermostat_autodst,6,0,1,70,1
+"Moduline 400",thermostat,78,language,language,enum [german\|dutch] (>=0<=0), ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
+"Moduline 400",thermostat,78,backlight,key backlight,boolean (>=0<=0), ,true,switch.thermostat_key_backlight,switch.thermostat_backlight,6,0,1,71,1
 "Moduline 400",thermostat,78,brightness,screen brightness,int8 (>=-15<=15), ,true,number.thermostat_screen_brightness,number.thermostat_brightness,6,0,1,72,1
 "Moduline 400",thermostat,78,mixingvalves,mixing valves,uint8 (>=0<=2), ,true,number.thermostat_mixing_valves,number.thermostat_mixingvalves,6,0,1,73,1
-"Moduline 400",thermostat,78,building,building type,enum [light\|medium\|heavy], ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
-"Moduline 400",thermostat,78,heatingpid,heating PID,enum [fast\|medium\|slow], ,true,select.thermostat_heating_PID,select.thermostat_heatingpid,6,0,1,74,1
-"Moduline 400",thermostat,78,preheating,preheating in the clock program,boolean, ,true,switch.thermostat_preheating_in_the_clock_program,switch.thermostat_preheating,6,0,1,75,1
-"Moduline 400",thermostat,78,intoffset,internal temperature offset,int8 (>=-12<=12),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
+"Moduline 400",thermostat,78,building,building type,enum [light\|medium\|heavy] (>=0<=0), ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
+"Moduline 400",thermostat,78,heatingpid,heating PID,enum [fast\|medium\|slow] (>=0<=0), ,true,select.thermostat_heating_PID,select.thermostat_heatingpid,6,0,1,74,1
+"Moduline 400",thermostat,78,preheating,preheating in the clock program,boolean (>=0<=0), ,true,switch.thermostat_preheating_in_the_clock_program,switch.thermostat_preheating,6,0,1,75,1
+"Moduline 400",thermostat,78,intoffset,internal temperature offset,int8 (>=0<=0),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
 "Moduline 400",thermostat,78,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"Moduline 400",thermostat,78,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"Moduline 400",thermostat,78,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"Moduline 400",thermostat,78,hc1.mode,operating mode,enum [off\|manual\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
-"Moduline 400",thermostat,78,hc1.pause,pause time,uint8 (>=0<=254),hours,true,number.thermostat_hc1_pause_time,number.thermostat_hc1_pause,6,1,1,91,1
-"Moduline 400",thermostat,78,hc1.party,party time,uint8 (>=0<=254),hours,true,number.thermostat_hc1_party_time,number.thermostat_hc1_party,6,1,1,92,1
-"Moduline 400",thermostat,78,hc1.vacations1,vacation dates 1,string, ,true,sensor.thermostat_hc1_vacation_dates_1,sensor.thermostat_hc1_vacations1,6,1,1,123,11
-"Moduline 400",thermostat,78,hc1.vacations2,vacation dates 2,string, ,true,sensor.thermostat_hc1_vacation_dates_2,sensor.thermostat_hc1_vacations2,6,1,1,134,11
-"Moduline 400",thermostat,78,hc1.vacations3,vacation dates 3,string, ,true,sensor.thermostat_hc1_vacation_dates_3,sensor.thermostat_hc1_vacations3,6,1,1,145,11
-"Moduline 400",thermostat,78,hc1.vacations4,vacation dates 4,string, ,true,sensor.thermostat_hc1_vacation_dates_4,sensor.thermostat_hc1_vacations4,6,1,1,156,11
-"Moduline 400",thermostat,78,hc1.vacations5,vacation dates 5,string, ,true,sensor.thermostat_hc1_vacation_dates_5,sensor.thermostat_hc1_vacations5,6,1,1,167,11
-"Moduline 400",thermostat,78,hc1.vacations6,vacation dates 6,string, ,true,sensor.thermostat_hc1_vacation_dates_6,sensor.thermostat_hc1_vacations6,6,1,1,178,11
-"Moduline 400",thermostat,78,hc1.vacations7,vacation dates 7,string, ,true,sensor.thermostat_hc1_vacation_dates_7,sensor.thermostat_hc1_vacations7,6,1,1,189,11
-"Moduline 400",thermostat,78,hc1.program,program,enum [own 1\|family\|morning\|evening\|am\|pm\|midday\|singles\|seniors\|new\|own 2], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
-"Moduline 400",thermostat,78,hc1.switchtime1,own1 program switchtime,string, ,true,sensor.thermostat_hc1_own1_program_switchtime,sensor.thermostat_hc1_switchtime1,6,1,1,95,8
-"Moduline 400",thermostat,78,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"Moduline 400",thermostat,78,hc1.controlmode,control mode,enum [outdoor\|room], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"Moduline 400",thermostat,78,hc1.holidaytemp,holiday temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_holiday_temperature,number.thermostat_hc1_holidaytemp,6,1,1/2,62,1
-"Moduline 400",thermostat,78,hc1.nighttemp,night temperature T1,uint8 (>=0<=127),C,true,number.thermostat_hc1_night_temperature_T1,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
-"Moduline 400",thermostat,78,hc1.daytemp2,day temperature T2,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature_T2,number.thermostat_hc1_daytemp2,6,1,1/2,112,1
-"Moduline 400",thermostat,78,hc1.daytemp3,day temperature T3,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature_T3,number.thermostat_hc1_daytemp3,6,1,1/2,113,1
-"Moduline 400",thermostat,78,hc1.daytemp4,day temperature T4,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature_T4,number.thermostat_hc1_daytemp4,6,1,1/2,114,1
-"Moduline 400",thermostat,78,hc1.manualtemp,manual temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
-"Moduline 400",thermostat,78,hc1.offtemp,temperature when mode is off,uint8 (>=0<=127),C,true,number.thermostat_hc1_temperature_when_mode_is_off,number.thermostat_hc1_offtemp,6,1,1/2,111,1
-"Moduline 400",thermostat,78,dhw.mode,operating mode,enum [on\|off\|auto], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
-"Moduline 400",thermostat,78,dhw.whenmodeoff,when thermostat mode off,boolean, ,true,switch.thermostat_dhw_when_thermostat_mode_off,switch.thermostat_dhw_whenmodeoff,6,9,1,60,1
-"Moduline 400",thermostat,78,dhw.disinfecting,disinfecting,boolean, ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
-"Moduline 400",thermostat,78,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all], ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
+"Moduline 400",thermostat,78,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"Moduline 400",thermostat,78,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"Moduline 400",thermostat,78,hc1.mode,operating mode,enum [off\|manual\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"Moduline 400",thermostat,78,hc1.pause,pause time,uint8 (>=0<=0),hours,true,number.thermostat_hc1_pause_time,number.thermostat_hc1_pause,6,1,1,91,1
+"Moduline 400",thermostat,78,hc1.party,party time,uint8 (>=0<=0),hours,true,number.thermostat_hc1_party_time,number.thermostat_hc1_party,6,1,1,92,1
+"Moduline 400",thermostat,78,hc1.vacations1,vacation dates 1,string (>=0<=0), ,true,sensor.thermostat_hc1_vacation_dates_1,sensor.thermostat_hc1_vacations1,6,1,1,123,11
+"Moduline 400",thermostat,78,hc1.vacations2,vacation dates 2,string (>=0<=0), ,true,sensor.thermostat_hc1_vacation_dates_2,sensor.thermostat_hc1_vacations2,6,1,1,134,11
+"Moduline 400",thermostat,78,hc1.vacations3,vacation dates 3,string (>=0<=0), ,true,sensor.thermostat_hc1_vacation_dates_3,sensor.thermostat_hc1_vacations3,6,1,1,145,11
+"Moduline 400",thermostat,78,hc1.vacations4,vacation dates 4,string (>=0<=0), ,true,sensor.thermostat_hc1_vacation_dates_4,sensor.thermostat_hc1_vacations4,6,1,1,156,11
+"Moduline 400",thermostat,78,hc1.vacations5,vacation dates 5,string (>=0<=0), ,true,sensor.thermostat_hc1_vacation_dates_5,sensor.thermostat_hc1_vacations5,6,1,1,167,11
+"Moduline 400",thermostat,78,hc1.vacations6,vacation dates 6,string (>=0<=0), ,true,sensor.thermostat_hc1_vacation_dates_6,sensor.thermostat_hc1_vacations6,6,1,1,178,11
+"Moduline 400",thermostat,78,hc1.vacations7,vacation dates 7,string (>=0<=0), ,true,sensor.thermostat_hc1_vacation_dates_7,sensor.thermostat_hc1_vacations7,6,1,1,189,11
+"Moduline 400",thermostat,78,hc1.program,program,enum [own 1\|family\|morning\|evening\|am\|pm\|midday\|singles\|seniors\|new\|own 2] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"Moduline 400",thermostat,78,hc1.switchtime1,own1 program switchtime,string (>=0<=0), ,true,sensor.thermostat_hc1_own1_program_switchtime,sensor.thermostat_hc1_switchtime1,6,1,1,95,8
+"Moduline 400",thermostat,78,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"Moduline 400",thermostat,78,hc1.controlmode,control mode,enum [outdoor\|room] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"Moduline 400",thermostat,78,hc1.holidaytemp,holiday temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_holiday_temperature,number.thermostat_hc1_holidaytemp,6,1,1/2,62,1
+"Moduline 400",thermostat,78,hc1.nighttemp,night temperature T1,uint8 (>=0<=0),C,true,number.thermostat_hc1_night_temperature_T1,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
+"Moduline 400",thermostat,78,hc1.daytemp2,day temperature T2,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature_T2,number.thermostat_hc1_daytemp2,6,1,1/2,112,1
+"Moduline 400",thermostat,78,hc1.daytemp3,day temperature T3,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature_T3,number.thermostat_hc1_daytemp3,6,1,1/2,113,1
+"Moduline 400",thermostat,78,hc1.daytemp4,day temperature T4,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature_T4,number.thermostat_hc1_daytemp4,6,1,1/2,114,1
+"Moduline 400",thermostat,78,hc1.manualtemp,manual temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
+"Moduline 400",thermostat,78,hc1.offtemp,temperature when mode is off,uint8 (>=0<=0),C,true,number.thermostat_hc1_temperature_when_mode_is_off,number.thermostat_hc1_offtemp,6,1,1/2,111,1
+"Moduline 400",thermostat,78,dhw.mode,operating mode,enum [on\|off\|auto] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"Moduline 400",thermostat,78,dhw.whenmodeoff,when thermostat mode off,boolean (>=0<=0), ,true,switch.thermostat_dhw_when_thermostat_mode_off,switch.thermostat_dhw_whenmodeoff,6,9,1,60,1
+"Moduline 400",thermostat,78,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
+"Moduline 400",thermostat,78,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all] (>=0<=0), ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
 "Moduline 400",thermostat,78,dhw.disinfecthour,disinfection hour,uint8 (>=0<=23), ,true,number.thermostat_dhw_disinfection_hour,number.thermostat_dhw_disinfecthour,6,9,1,15,1
 "RC10, Moduline 100",thermostat,79,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC10, Moduline 100",thermostat,79,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"RC10, Moduline 100",thermostat,79,intoffset,internal temperature offset,int8 (>=-12<=12),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
-"RC10, Moduline 100",thermostat,79,heatingpid,heating PID,enum [fast\|medium\|slow], ,true,select.thermostat_heating_PID,select.thermostat_heatingpid,6,0,1,74,1
-"RC10, Moduline 100",thermostat,79,backlight,key backlight,boolean, ,true,switch.thermostat_key_backlight,switch.thermostat_backlight,6,0,1,71,1
+"RC10, Moduline 100",thermostat,79,intoffset,internal temperature offset,int8 (>=0<=0),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
+"RC10, Moduline 100",thermostat,79,heatingpid,heating PID,enum [fast\|medium\|slow] (>=0<=0), ,true,select.thermostat_heating_PID,select.thermostat_heatingpid,6,0,1,74,1
+"RC10, Moduline 100",thermostat,79,backlight,key backlight,boolean (>=0<=0), ,true,switch.thermostat_key_backlight,switch.thermostat_backlight,6,0,1,71,1
 "RC10, Moduline 100",thermostat,79,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC10, Moduline 100",thermostat,79,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC10, Moduline 100",thermostat,79,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"RC10, Moduline 100",thermostat,79,hc1.mode,operating mode,enum [nofrost\|night\|day], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
-"RC10, Moduline 100",thermostat,79,hc1.daytemp,day temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
-"RC10, Moduline 100",thermostat,79,hc1.nighttemp,night temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
-"RC10, Moduline 100",thermostat,79,hc1.reducehours,duration for nighttemp,uint8 (>=0<=254),hours,true,number.thermostat_hc1_duration_for_nighttemp,number.thermostat_hc1_reducehours,6,1,1,200,1
-"RC10, Moduline 100",thermostat,79,hc1.reduceminutes,remaining time for nightmode,uint16 (>=0<=31999),minutes,false,sensor.thermostat_hc1_remaining_time_for_nightmode,sensor.thermostat_hc1_reduceminutes,6,1,1,201,1
-"RC10, Moduline 100",thermostat,79,dhw.mode,operating mode,enum [on\|off\|auto], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"RC10, Moduline 100",thermostat,79,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC10, Moduline 100",thermostat,79,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC10, Moduline 100",thermostat,79,hc1.mode,operating mode,enum [nofrost\|night\|day] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"RC10, Moduline 100",thermostat,79,hc1.daytemp,day temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
+"RC10, Moduline 100",thermostat,79,hc1.nighttemp,night temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
+"RC10, Moduline 100",thermostat,79,hc1.reducehours,duration for nighttemp,uint8 (>=0<=0),hours,true,number.thermostat_hc1_duration_for_nighttemp,number.thermostat_hc1_reducehours,6,1,1,200,1
+"RC10, Moduline 100",thermostat,79,hc1.reduceminutes,remaining time for nightmode,uint16,minutes,false,sensor.thermostat_hc1_remaining_time_for_nightmode,sensor.thermostat_hc1_reduceminutes,6,1,1,201,1
+"RC10, Moduline 100",thermostat,79,dhw.mode,operating mode,enum [on\|off\|auto] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
 "Moduline 200",thermostat,80,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "Moduline 200",thermostat,80,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"Moduline 200",thermostat,80,intoffset,internal temperature offset,int8 (>=-12<=12),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
-"Moduline 200",thermostat,80,heatingpid,heating PID,enum [fast\|medium\|slow], ,true,select.thermostat_heating_PID,select.thermostat_heatingpid,6,0,1,74,1
-"Moduline 200",thermostat,80,backlight,key backlight,boolean, ,true,switch.thermostat_key_backlight,switch.thermostat_backlight,6,0,1,71,1
+"Moduline 200",thermostat,80,intoffset,internal temperature offset,int8 (>=0<=0),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
+"Moduline 200",thermostat,80,heatingpid,heating PID,enum [fast\|medium\|slow] (>=0<=0), ,true,select.thermostat_heating_PID,select.thermostat_heatingpid,6,0,1,74,1
+"Moduline 200",thermostat,80,backlight,key backlight,boolean (>=0<=0), ,true,switch.thermostat_key_backlight,switch.thermostat_backlight,6,0,1,71,1
 "Moduline 200",thermostat,80,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"Moduline 200",thermostat,80,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"Moduline 200",thermostat,80,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"Moduline 200",thermostat,80,hc1.mode,operating mode,enum [nofrost\|night\|day], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
-"Moduline 200",thermostat,80,hc1.daytemp,day temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
-"Moduline 200",thermostat,80,hc1.nighttemp,night temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
-"Moduline 200",thermostat,80,hc1.reducehours,duration for nighttemp,uint8 (>=0<=254),hours,true,number.thermostat_hc1_duration_for_nighttemp,number.thermostat_hc1_reducehours,6,1,1,200,1
-"Moduline 200",thermostat,80,hc1.reduceminutes,remaining time for nightmode,uint16 (>=0<=31999),minutes,false,sensor.thermostat_hc1_remaining_time_for_nightmode,sensor.thermostat_hc1_reduceminutes,6,1,1,201,1
-"Moduline 200",thermostat,80,dhw.mode,operating mode,enum [on\|off\|auto], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"Moduline 200",thermostat,80,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"Moduline 200",thermostat,80,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"Moduline 200",thermostat,80,hc1.mode,operating mode,enum [nofrost\|night\|day] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"Moduline 200",thermostat,80,hc1.daytemp,day temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
+"Moduline 200",thermostat,80,hc1.nighttemp,night temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
+"Moduline 200",thermostat,80,hc1.reducehours,duration for nighttemp,uint8 (>=0<=0),hours,true,number.thermostat_hc1_duration_for_nighttemp,number.thermostat_hc1_reducehours,6,1,1,200,1
+"Moduline 200",thermostat,80,hc1.reduceminutes,remaining time for nightmode,uint16,minutes,false,sensor.thermostat_hc1_remaining_time_for_nightmode,sensor.thermostat_hc1_reduceminutes,6,1,1,201,1
+"Moduline 200",thermostat,80,dhw.mode,operating mode,enum [on\|off\|auto] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
 "RC35",thermostat,86,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC35",thermostat,86,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"RC35",thermostat,86,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"RC35",thermostat,86,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
 "RC35",thermostat,86,intoffset,internal temperature offset,int8 (>=-5<=5),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
 "RC35",thermostat,86,minexttemp,minimal external temperature,int8 (>=-30<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
-"RC35",thermostat,86,inttemp1,temperature sensor 1,int16 (>=-3199<=3199),C,false,sensor.thermostat_temperature_sensor_1,sensor.thermostat_inttemp1,6,0,1/10,68,1
-"RC35",thermostat,86,inttemp2,temperature sensor 2,int16 (>=-3199<=3199),C,false,sensor.thermostat_temperature_sensor_2,sensor.thermostat_inttemp2,6,0,1/10,69,1
-"RC35",thermostat,86,damping,damping outdoor temperature,boolean, ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
-"RC35",thermostat,86,dampedoutdoortemp,damped outdoor temperature,int8 (>=-126<=126),C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1,48,1
-"RC35",thermostat,86,building,building type,enum [light\|medium\|heavy], ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
+"RC35",thermostat,86,inttemp1,temperature sensor 1,int16,C,false,sensor.thermostat_temperature_sensor_1,sensor.thermostat_inttemp1,6,0,1/10,68,1
+"RC35",thermostat,86,inttemp2,temperature sensor 2,int16,C,false,sensor.thermostat_temperature_sensor_2,sensor.thermostat_inttemp2,6,0,1/10,69,1
+"RC35",thermostat,86,damping,damping outdoor temperature,boolean (>=0<=0), ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
+"RC35",thermostat,86,dampedoutdoortemp,damped outdoor temperature,int8,C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1,48,1
+"RC35",thermostat,86,building,building type,enum [light\|medium\|heavy] (>=0<=0), ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
 "RC35",thermostat,86,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC35",thermostat,86,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC35",thermostat,86,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"RC35",thermostat,86,hc1.mode,operating mode,enum [night\|day\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"RC35",thermostat,86,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC35",thermostat,86,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC35",thermostat,86,hc1.mode,operating mode,enum [night\|day\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "RC35",thermostat,86,hc1.modetype,mode type,enum [night\|day], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
 "RC35",thermostat,86,hc1.daytemp,day temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
 "RC35",thermostat,86,hc1.nighttemp,night temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
 "RC35",thermostat,86,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
 "RC35",thermostat,86,hc1.offsettemp,offset temperature,int8 (>=-5<=5),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1/2,10,1
 "RC35",thermostat,86,hc1.holidaytemp,holiday temperature,uint8 (>=5<=30),C,true,number.thermostat_hc1_holiday_temperature,number.thermostat_hc1_holidaytemp,6,1,1/2,62,1
-"RC35",thermostat,86,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"RC35",thermostat,86,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "RC35",thermostat,86,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
 "RC35",thermostat,86,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "RC35",thermostat,86,hc1.holidaymode,holiday mode,boolean, ,false,binary_sensor.thermostat_hc1_holiday_mode,binary_sensor.thermostat_hc1_holidaymode,6,1,1,63,1
 "RC35",thermostat,86,hc1.nofrosttemp,nofrost temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
-"RC35",thermostat,86,hc1.nofrostmode,nofrost mode,enum [off\|outdoor\|room], ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
+"RC35",thermostat,86,hc1.nofrostmode,nofrost mode,enum [off\|outdoor\|room] (>=0<=0), ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
 "RC35",thermostat,86,hc1.roominfluence,room influence,uint8 (>=0<=10),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
 "RC35",thermostat,86,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "RC35",thermostat,86,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "RC35",thermostat,86,hc1.flowtempoffset,flow temperature offset for mixer,uint8 (>=0<=20),C,true,number.thermostat_hc1_flow_temperature_offset_for_mixer,number.thermostat_hc1_flowtempoffset,6,1,1,64,1
-"RC35",thermostat,86,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"RC35",thermostat,86,hc1.reducemode,reduce mode,enum [nofrost\|reduce\|room\|outdoor], ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
-"RC35",thermostat,86,hc1.controlmode,control mode,enum [outdoor\|room], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"RC35",thermostat,86,hc1.control,control device,enum [off\|RC20\|RC3x], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"RC35",thermostat,86,hc1.holidays,holiday dates,string, ,true,sensor.thermostat_hc1_holiday_dates,sensor.thermostat_hc1_holidays,6,1,1,65,13
-"RC35",thermostat,86,hc1.vacations,vacation dates,string, ,true,sensor.thermostat_hc1_vacation_dates,sensor.thermostat_hc1_vacations,6,1,1,78,13
-"RC35",thermostat,86,hc1.program,program,enum [own 1\|family\|morning\|evening\|am\|pm\|midday\|singles\|seniors\|new\|own 2], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"RC35",thermostat,86,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"RC35",thermostat,86,hc1.reducemode,reduce mode,enum [nofrost\|reduce\|room\|outdoor] (>=0<=0), ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
+"RC35",thermostat,86,hc1.controlmode,control mode,enum [outdoor\|room] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"RC35",thermostat,86,hc1.control,control device,enum [off\|RC20\|RC3x] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"RC35",thermostat,86,hc1.holidays,holiday dates,string (>=0<=0), ,true,sensor.thermostat_hc1_holiday_dates,sensor.thermostat_hc1_holidays,6,1,1,65,13
+"RC35",thermostat,86,hc1.vacations,vacation dates,string (>=0<=0), ,true,sensor.thermostat_hc1_vacation_dates,sensor.thermostat_hc1_vacations,6,1,1,78,13
+"RC35",thermostat,86,hc1.program,program,enum [own 1\|family\|morning\|evening\|am\|pm\|midday\|singles\|seniors\|new\|own 2] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "RC35",thermostat,86,hc1.pause,pause time,uint8 (>=0<=99),hours,true,number.thermostat_hc1_pause_time,number.thermostat_hc1_pause,6,1,1,91,1
 "RC35",thermostat,86,hc1.party,party time,uint8 (>=0<=99),hours,true,number.thermostat_hc1_party_time,number.thermostat_hc1_party,6,1,1,92,1
 "RC35",thermostat,86,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=30),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
 "RC35",thermostat,86,hc1.noreducetemp,no reduce below temperature,int8 (>=-31<=10),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
 "RC35",thermostat,86,hc1.reducetemp,off/reduce switch temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
 "RC35",thermostat,86,hc1.vacreducetemp,vacations off/reduce switch temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_vacations_off/reduce_switch_temperature,number.thermostat_hc1_vacreducetemp,6,1,1,93,1
-"RC35",thermostat,86,hc1.vacreducemode,vacations reduce mode,enum [nofrost\|reduce\|room\|outdoor], ,true,select.thermostat_hc1_vacations_reduce_mode,select.thermostat_hc1_vacreducemode,6,1,1,94,1
+"RC35",thermostat,86,hc1.vacreducemode,vacations reduce mode,enum [nofrost\|reduce\|room\|outdoor] (>=0<=0), ,true,select.thermostat_hc1_vacations_reduce_mode,select.thermostat_hc1_vacreducemode,6,1,1,94,1
 "RC35",thermostat,86,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"RC35",thermostat,86,hc1.dhwprio,dhw priority,boolean, ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
-"RC35",thermostat,86,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"RC35",thermostat,86,hc1.switchtime1,own1 program switchtime,string, ,true,sensor.thermostat_hc1_own1_program_switchtime,sensor.thermostat_hc1_switchtime1,6,1,1,95,8
-"RC35",thermostat,86,hc1.switchtime2,own2 program switchtime,string, ,true,sensor.thermostat_hc1_own2_program_switchtime,sensor.thermostat_hc1_switchtime2,6,1,1,103,8
-"RC35",thermostat,86,dhw.mode,operating mode,enum [off\|on\|auto], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
-"RC35",thermostat,86,dhw.circmode,circulation pump mode,enum [off\|on\|auto], ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
-"RC35",thermostat,86,dhw.progmode,program,enum [std prog\|own prog], ,true,select.thermostat_dhw_program,select.thermostat_dhw_progmode,6,9,1,13,1
-"RC35",thermostat,86,dhw.circprog,circulation program,enum [std prog\|own prog], ,true,select.thermostat_dhw_circulation_program,select.thermostat_dhw_circprog,6,9,1,14,1
-"RC35",thermostat,86,dhw.disinfecting,disinfecting,boolean, ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
-"RC35",thermostat,86,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all], ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
+"RC35",thermostat,86,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
+"RC35",thermostat,86,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"RC35",thermostat,86,hc1.switchtime1,own1 program switchtime,string (>=0<=0), ,true,sensor.thermostat_hc1_own1_program_switchtime,sensor.thermostat_hc1_switchtime1,6,1,1,95,8
+"RC35",thermostat,86,hc1.switchtime2,own2 program switchtime,string (>=0<=0), ,true,sensor.thermostat_hc1_own2_program_switchtime,sensor.thermostat_hc1_switchtime2,6,1,1,103,8
+"RC35",thermostat,86,dhw.mode,operating mode,enum [off\|on\|auto] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"RC35",thermostat,86,dhw.circmode,circulation pump mode,enum [off\|on\|auto] (>=0<=0), ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
+"RC35",thermostat,86,dhw.progmode,program,enum [std prog\|own prog] (>=0<=0), ,true,select.thermostat_dhw_program,select.thermostat_dhw_progmode,6,9,1,13,1
+"RC35",thermostat,86,dhw.circprog,circulation program,enum [std prog\|own prog] (>=0<=0), ,true,select.thermostat_dhw_circulation_program,select.thermostat_dhw_circprog,6,9,1,14,1
+"RC35",thermostat,86,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
+"RC35",thermostat,86,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all] (>=0<=0), ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
 "RC35",thermostat,86,dhw.disinfecthour,disinfection hour,uint8 (>=0<=23), ,true,number.thermostat_dhw_disinfection_hour,number.thermostat_dhw_disinfecthour,6,9,1,15,1
 "RC35",thermostat,86,dhw.maxtemp,maximum temperature,uint8 (>=60<=80),C,true,number.thermostat_dhw_maximum_temperature,number.thermostat_dhw_maxtemp,6,9,1,16,1
-"RC35",thermostat,86,dhw.onetimekey,one time key function,boolean, ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,17,1
-"RC35",thermostat,86,dhw.switchtime,program switchtime,string, ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,18,8
-"RC35",thermostat,86,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,26,8
-"RC35",thermostat,86,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,34,13
-"RC35",thermostat,86,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,47,13
+"RC35",thermostat,86,dhw.onetimekey,one time key function,boolean (>=0<=0), ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,17,1
+"RC35",thermostat,86,dhw.switchtime,program switchtime,string (>=0<=0), ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,18,8
+"RC35",thermostat,86,dhw.circswitchtime,circulation program switchtime,string (>=0<=0), ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,26,8
+"RC35",thermostat,86,dhw.holidays,holiday dates,string (>=0<=0), ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,34,13
+"RC35",thermostat,86,dhw.vacations,vacation dates,string (>=0<=0), ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,47,13
 "RC10, Moduline 100",thermostat,90,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC10, Moduline 100",thermostat,90,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "RC10, Moduline 100",thermostat,90,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"RC10, Moduline 100",thermostat,90,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"RC10, Moduline 100",thermostat,90,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
 "RC10, Moduline 100",thermostat,90,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC10, Moduline 100",thermostat,90,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC10, Moduline 100",thermostat,90,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"RC10, Moduline 100",thermostat,90,hc1.mode,operating mode,enum [night\|day\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"RC10, Moduline 100",thermostat,90,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC10, Moduline 100",thermostat,90,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC10, Moduline 100",thermostat,90,hc1.mode,operating mode,enum [night\|day\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "RC10, Moduline 100",thermostat,90,hc1.modetype,mode type,enum [night\|day], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"RC10, Moduline 100",thermostat,90,hc1.daytemp,day temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
-"RC10, Moduline 100",thermostat,90,hc1.nighttemp,night temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
-"RC10, Moduline 100",thermostat,90,hc1.program,program,enum [family\|morning\|evening\|am\|pm\|midday\|singles\|seniors], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
-"RC10, Moduline 100",thermostat,90,hc1.minflowtemp,min flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
-"RC10, Moduline 100",thermostat,90,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
-"RC10, Moduline 100",thermostat,90,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=127),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
-"RC10, Moduline 100",thermostat,90,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"RC10, Moduline 100",thermostat,90,hc1.daytemp,day temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
+"RC10, Moduline 100",thermostat,90,hc1.nighttemp,night temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
+"RC10, Moduline 100",thermostat,90,hc1.program,program,enum [family\|morning\|evening\|am\|pm\|midday\|singles\|seniors] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"RC10, Moduline 100",thermostat,90,hc1.minflowtemp,min flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
+"RC10, Moduline 100",thermostat,90,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
+"RC10, Moduline 100",thermostat,90,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=0),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
+"RC10, Moduline 100",thermostat,90,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
 "RC10, Moduline 100",thermostat,90,hc1.summertemp,summer temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
 "RC10, Moduline 100",thermostat,90,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "RC20RF",thermostat,93,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC20RF",thermostat,93,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "RC20RF",thermostat,93,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
 "RC20RF",thermostat,93,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC20RF",thermostat,93,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC20RF",thermostat,93,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"RC20RF",thermostat,93,hc1.mode,operating mode,enum [off\|manual\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
-"RC20RF",thermostat,93,hc1.manualtemp,manual temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
-"RC20RF",thermostat,93,hc1.offtemp,temperature when mode is off,uint8 (>=0<=127),C,true,number.thermostat_hc1_temperature_when_mode_is_off,number.thermostat_hc1_offtemp,6,1,1/2,111,1
-"RC20RF",thermostat,93,hc1.daytemp2,day temperature T2,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature_T2,number.thermostat_hc1_daytemp2,6,1,1/2,112,1
-"RC20RF",thermostat,93,hc1.daytemp3,day temperature T3,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature_T3,number.thermostat_hc1_daytemp3,6,1,1/2,113,1
-"RC20RF",thermostat,93,hc1.daytemp4,day temperature T4,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature_T4,number.thermostat_hc1_daytemp4,6,1,1/2,114,1
-"RC20RF",thermostat,93,hc1.nighttemp,night temperature T1,uint8 (>=0<=127),C,true,number.thermostat_hc1_night_temperature_T1,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
-"RC20RF",thermostat,93,hc1.switchtime,program switchtime,string, ,true,sensor.thermostat_hc1_program_switchtime,sensor.thermostat_hc1_switchtime,6,1,1,115,8
+"RC20RF",thermostat,93,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC20RF",thermostat,93,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC20RF",thermostat,93,hc1.mode,operating mode,enum [off\|manual\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"RC20RF",thermostat,93,hc1.manualtemp,manual temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
+"RC20RF",thermostat,93,hc1.offtemp,temperature when mode is off,uint8 (>=0<=0),C,true,number.thermostat_hc1_temperature_when_mode_is_off,number.thermostat_hc1_offtemp,6,1,1/2,111,1
+"RC20RF",thermostat,93,hc1.daytemp2,day temperature T2,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature_T2,number.thermostat_hc1_daytemp2,6,1,1/2,112,1
+"RC20RF",thermostat,93,hc1.daytemp3,day temperature T3,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature_T3,number.thermostat_hc1_daytemp3,6,1,1/2,113,1
+"RC20RF",thermostat,93,hc1.daytemp4,day temperature T4,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature_T4,number.thermostat_hc1_daytemp4,6,1,1/2,114,1
+"RC20RF",thermostat,93,hc1.nighttemp,night temperature T1,uint8 (>=0<=0),C,true,number.thermostat_hc1_night_temperature_T1,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
+"RC20RF",thermostat,93,hc1.switchtime,program switchtime,string (>=0<=0), ,true,sensor.thermostat_hc1_program_switchtime,sensor.thermostat_hc1_switchtime,6,1,1,115,8
 "RFM20 Remote",thermostat,94,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RFM20 Remote",thermostat,94,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "RFM20 Remote",thermostat,94,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
 "RFM20 Remote",thermostat,94,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RFM20 Remote",thermostat,94,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RFM20 Remote",thermostat,94,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RFM20 Remote",thermostat,94,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RFM20 Remote",thermostat,94,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
 "RC25",thermostat,151,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC25",thermostat,151,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "RC25",thermostat,151,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"RC25",thermostat,151,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"RC25",thermostat,151,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
 "RC25",thermostat,151,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC25",thermostat,151,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC25",thermostat,151,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"RC25",thermostat,151,hc1.mode,operating mode,enum [night\|day\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"RC25",thermostat,151,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC25",thermostat,151,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC25",thermostat,151,hc1.mode,operating mode,enum [night\|day\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "RC25",thermostat,151,hc1.modetype,mode type,enum [night\|day], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"RC25",thermostat,151,hc1.daytemp,day temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
-"RC25",thermostat,151,hc1.nighttemp,night temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
-"RC25",thermostat,151,hc1.program,program,enum [family\|morning\|evening\|am\|pm\|midday\|singles\|seniors], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
-"RC25",thermostat,151,hc1.minflowtemp,min flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
-"RC25",thermostat,151,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
-"RC25",thermostat,151,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=127),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
-"RC25",thermostat,151,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"RC25",thermostat,151,hc1.daytemp,day temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
+"RC25",thermostat,151,hc1.nighttemp,night temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
+"RC25",thermostat,151,hc1.program,program,enum [family\|morning\|evening\|am\|pm\|midday\|singles\|seniors] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"RC25",thermostat,151,hc1.minflowtemp,min flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
+"RC25",thermostat,151,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
+"RC25",thermostat,151,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=0),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
+"RC25",thermostat,151,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
 "RC25",thermostat,151,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
 "RC25",thermostat,151,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "RC200, CW100, CR120, CR50",thermostat,157,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC200, CW100, CR120, CR50",thermostat,157,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"RC200, CW100, CR120, CR50",thermostat,157,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"RC200, CW100, CR120, CR50",thermostat,157,intoffset,internal temperature offset,int8 (>=-12<=12),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
+"RC200, CW100, CR120, CR50",thermostat,157,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"RC200, CW100, CR120, CR50",thermostat,157,intoffset,internal temperature offset,int8 (>=0<=0),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
 "RC200, CW100, CR120, CR50",thermostat,157,floordry,floor drying,enum [off\|start\|heat\|hold\|cool\|end], ,false,sensor.thermostat_floor_drying,sensor.thermostat_floordry,6,0,1,47,1
-"RC200, CW100, CR120, CR50",thermostat,157,dampedoutdoortemp,damped outdoor temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1/10,48,1
-"RC200, CW100, CR120, CR50",thermostat,157,floordrytemp,floor drying temperature,uint8 (>=0<=254),C,false,sensor.thermostat_floor_drying_temperature,sensor.thermostat_floordrytemp,6,0,1,49,1
-"RC200, CW100, CR120, CR50",thermostat,157,building,building type,enum [light\|medium\|heavy], ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
-"RC200, CW100, CR120, CR50",thermostat,157,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
-"RC200, CW100, CR120, CR50",thermostat,157,damping,damping outdoor temperature,boolean, ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
-"RC200, CW100, CR120, CR50",thermostat,157,solar,solar,boolean, ,true,switch.thermostat_solar,switch.thermostat_solar,6,0,1,53,1
-"RC200, CW100, CR120, CR50",thermostat,157,vacations,vacation dates,string, ,true,sensor.thermostat_vacation_dates,sensor.thermostat_vacations,6,0,1,76,13
-"RC200, CW100, CR120, CR50",thermostat,157,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"RC200, CW100, CR120, CR50",thermostat,157,dampedoutdoortemp,damped outdoor temperature,int16,C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1/10,48,1
+"RC200, CW100, CR120, CR50",thermostat,157,floordrytemp,floor drying temperature,uint8,C,false,sensor.thermostat_floor_drying_temperature,sensor.thermostat_floordrytemp,6,0,1,49,1
+"RC200, CW100, CR120, CR50",thermostat,157,building,building type,enum [light\|medium\|heavy] (>=0<=0), ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
+"RC200, CW100, CR120, CR50",thermostat,157,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"RC200, CW100, CR120, CR50",thermostat,157,damping,damping outdoor temperature,boolean (>=0<=0), ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
+"RC200, CW100, CR120, CR50",thermostat,157,solar,solar,boolean (>=0<=0), ,true,switch.thermostat_solar,switch.thermostat_solar,6,0,1,53,1
+"RC200, CW100, CR120, CR50",thermostat,157,vacations,vacation dates,string (>=0<=0), ,true,sensor.thermostat_vacation_dates,sensor.thermostat_vacations,6,0,1,76,13
+"RC200, CW100, CR120, CR50",thermostat,157,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "RC200, CW100, CR120, CR50",thermostat,157,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "RC200, CW100, CR120, CR50",thermostat,157,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "RC200, CW100, CR120, CR50",thermostat,157,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
 "RC200, CW100, CR120, CR50",thermostat,157,electricfactor,electric energy factor,uint8 (>=0<=5), ,true,number.thermostat_electric_energy_factor,number.thermostat_electricfactor,6,0,1/10,58,1
 "RC200, CW100, CR120, CR50",thermostat,157,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "RC200, CW100, CR120, CR50",thermostat,157,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
-"RC200, CW100, CR120, CR50",thermostat,157,pvenabledhw,enable raise dhw,boolean, ,true,switch.thermostat_enable_raise_dhw,switch.thermostat_pvenabledhw,6,0,1,61,1
+"RC200, CW100, CR120, CR50",thermostat,157,pvenabledhw,enable raise dhw,boolean (>=0<=0), ,true,switch.thermostat_enable_raise_dhw,switch.thermostat_pvenabledhw,6,0,1,61,1
 "RC200, CW100, CR120, CR50",thermostat,157,pvraiseheat,raise heating with PV,int8 (>=0<=5),K,true,number.thermostat_raise_heating_with_PV,number.thermostat_pvraiseheat,6,0,1,62,1
 "RC200, CW100, CR120, CR50",thermostat,157,pvlowercool,lower cooling with PV,int8 (>=-5<=0),K,true,number.thermostat_lower_cooling_with_PV,number.thermostat_pvlowercool,6,0,1,63,1
-"RC200, CW100, CR120, CR50",thermostat,157,absent,absent,boolean, ,true,switch.thermostat_absent,switch.thermostat_absent,6,0,1,64,1
+"RC200, CW100, CR120, CR50",thermostat,157,absent,absent,boolean (>=0<=0), ,true,switch.thermostat_absent,switch.thermostat_absent,6,0,1,64,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.mode,operating mode,enum [manual\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.mode,operating mode,enum [manual\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.modetype,mode type,enum [eco\|comfort], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.manualtemp,manual temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.comforttemp,comfort temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_comfort_temperature,number.thermostat_hc1_comforttemp,6,1,1/2,7,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.manualtemp,manual temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.comforttemp,comfort temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_comfort_temperature,number.thermostat_hc1_comforttemp,6,1,1/2,7,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.summertemp,summer temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.designtemp,design temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.offsettemp,offset temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1,10,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.minflowtemp,min flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.roominfluence,room influence,uint8 (>=0<=254),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.roominflfactor,room influence factor,uint8 (>=0<=25), ,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,1/10,14,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.curroominfl,current room influence,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_influence,sensor.thermostat_hc1_curroominfl,6,1,1/10,15,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.nofrostmode,nofrost mode,enum [room\|outdoor\|room outdoor], ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.nofrosttemp,nofrost temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.summersetmode,set summer mode,enum [summer\|auto\|winter], ,true,select.thermostat_hc1_set_summer_mode,select.thermostat_hc1_summersetmode,6,1,1,20,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.hpoperatingmode,heatpump operating mode,enum [off\|auto\|heating\|cooling], ,true,select.thermostat_hc1_heatpump_operating_mode,select.thermostat_hc1_hpoperatingmode,6,1,1,21,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.designtemp,design temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.offsettemp,offset temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1,10,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.minflowtemp,min flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.roominfluence,room influence,uint8 (>=0<=0),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.roominflfactor,room influence factor,uint8 (>=0<=0), ,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,1/10,14,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.curroominfl,current room influence,int16,C,false,sensor.thermostat_hc1_current_room_influence,sensor.thermostat_hc1_curroominfl,6,1,1/10,15,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.nofrostmode,nofrost mode,enum [room\|outdoor\|room outdoor] (>=0<=0), ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.summersetmode,set summer mode,enum [summer\|auto\|winter] (>=0<=0), ,true,select.thermostat_hc1_set_summer_mode,select.thermostat_hc1_summersetmode,6,1,1,20,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.hpoperatingmode,heatpump operating mode,enum [off\|auto\|heating\|cooling] (>=0<=0), ,true,select.thermostat_hc1_heatpump_operating_mode,select.thermostat_hc1_hpoperatingmode,6,1,1,21,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.hpoperatingstate,heatpump operating state,enum [heating\|off\|cooling], ,false,sensor.thermostat_hc1_heatpump_operating_state,sensor.thermostat_hc1_hpoperatingstate,6,1,1,23,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.vacationmode,vacation mode,boolean, ,false,binary_sensor.thermostat_hc1_vacation_mode,binary_sensor.thermostat_hc1_vacationmode,6,1,1,24,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.controlmode,control mode,enum [optimized\|simple\|n/a\|room\|power], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.program,program,enum [prog 1\|prog 2], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.controlmode,control mode,enum [optimized\|simple\|n/a\|room\|power] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.program,program,enum [prog 1\|prog 2] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.tempautotemp,temporary set temperature automode,int8 (>=-1<=30),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.cooltemp,cooling temperature,int8 (>=-1<=30),C,true,number.thermostat_hc1_cooling_temperature,number.thermostat_hc1_cooltemp,6,1,1/2,28,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.fastheatup,fast heatup,uint8 (>=0<=100),%,true,number.thermostat_hc1_fast_heatup,number.thermostat_hc1_fastheatup,6,1,1,29,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.reducemode,reduce mode,enum [outdoor\|room\|reduce], ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.noreducetemp,no reduce below temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.reducetemp,off/reduce switch temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.dhwprio,dhw priority,boolean, ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.hpcooling,hp cooling,boolean, ,true,switch.thermostat_hc1_hp_cooling,switch.thermostat_hc1_hpcooling,6,1,1,35,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.fastheatup,fast heatup,uint8 (>=0<=0),%,true,number.thermostat_hc1_fast_heatup,number.thermostat_hc1_fastheatup,6,1,1,29,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.reducemode,reduce mode,enum [outdoor\|room\|reduce] (>=0<=0), ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.noreducetemp,no reduce below temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.reducetemp,off/reduce switch temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.hpcooling,hp cooling,boolean (>=0<=0), ,true,switch.thermostat_hc1_hp_cooling,switch.thermostat_hc1_hpcooling,6,1,1,35,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.coolingon,cooling on,boolean, ,false,binary_sensor.thermostat_hc1_cooling_on,binary_sensor.thermostat_hc1_coolingon,6,1,1,36,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.hpmode,HP Mode,enum [heating\|cooling\|heating & cooling], ,true,select.thermostat_hc1_HP_Mode,select.thermostat_hc1_hpmode,6,1,1,37,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.hpmode,HP Mode,enum [heating\|cooling\|heating & cooling] (>=0<=0), ,true,select.thermostat_hc1_HP_Mode,select.thermostat_hc1_hpmode,6,1,1,37,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.dewoffset,dew point offset,uint8 (>=2<=10),K,true,number.thermostat_hc1_dew_point_offset,number.thermostat_hc1_dewoffset,6,1,1,38,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.roomtempdiff,room temp difference,uint8 (>=0<=254),K,true,number.thermostat_hc1_room_temp_difference,number.thermostat_hc1_roomtempdiff,6,1,1,39,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.hpminflowtemp,HP min. flow temp.,uint8 (>=0<=254),C,true,number.thermostat_hc1_HP_min._flow_temp.,number.thermostat_hc1_hpminflowtemp,6,1,1,40,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.control,control device,enum [RC310\|RC200\|RC100\|RC100H\|TC100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.roomtempdiff,room temp difference,uint8 (>=0<=0),K,true,number.thermostat_hc1_room_temp_difference,number.thermostat_hc1_roomtempdiff,6,1,1,39,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.hpminflowtemp,HP min. flow temp.,uint8 (>=0<=0),C,true,number.thermostat_hc1_HP_min._flow_temp.,number.thermostat_hc1_hpminflowtemp,6,1,1,40,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.control,control device,enum [RC310\|RC200\|RC100\|RC100H\|TC100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.heatondelay,heat-on delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_heat-on_delay,number.thermostat_hc1_heatondelay,6,1,1,44,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.heatoffdelay,heat-off delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_heat-off_delay,number.thermostat_hc1_heatoffdelay,6,1,1,45,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.instantstart,instant start,uint8 (>=1<=10),K,true,number.thermostat_hc1_instant_start,number.thermostat_hc1_instantstart,6,1,1,46,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.boost,boost mode,boolean, ,true,switch.thermostat_hc1_boost_mode,switch.thermostat_hc1_boost,6,1,1,47,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.boosttime,boost time,uint8 (>=0<=254),hours,true,number.thermostat_hc1_boost_time,number.thermostat_hc1_boosttime,6,1,1,48,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.boost,boost mode,boolean (>=0<=0), ,true,switch.thermostat_hc1_boost_mode,switch.thermostat_hc1_boost,6,1,1,47,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.boosttime,boost time,uint8 (>=0<=0),hours,true,number.thermostat_hc1_boost_time,number.thermostat_hc1_boosttime,6,1,1,48,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.coolstart,cooling starttemp,uint8 (>=20<=35),C,true,number.thermostat_hc1_cooling_starttemp,number.thermostat_hc1_coolstart,6,1,1,49,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.coolondelay,cooling on delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_cooling_on_delay,number.thermostat_hc1_coolondelay,6,1,1,50,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.cooloffdelay,cooling off delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_cooling_off_delay,number.thermostat_hc1_cooloffdelay,6,1,1,51,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.switchprogmode,switch program mode,enum [level\|absolute], ,true,select.thermostat_hc1_switch_program_mode,select.thermostat_hc1_switchprogmode,6,1,1,52,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.switchprogmode,switch program mode,enum [level\|absolute] (>=0<=0), ,true,select.thermostat_hc1_switch_program_mode,select.thermostat_hc1_switchprogmode,6,1,1,52,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.redthreshold,reduction threshold,int8 (>=12<=22),C,true,number.thermostat_hc1_reduction_threshold,number.thermostat_hc1_redthreshold,6,1,1/2,53,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.solarinfl,solar influence,uint8 (>=-5<=4294967295),C,true,number.thermostat_hc1_solar_influence,number.thermostat_hc1_solarinfl,6,1,1,54,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.currsolarinfl,current solar influence,uint8 (>=0<=25),C,false,sensor.thermostat_hc1_current_solar_influence,sensor.thermostat_hc1_currsolarinfl,6,1,1/10,55,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.heatingpid,heating PID,enum [fast\|medium\|slow], ,true,select.thermostat_hc1_heating_PID,select.thermostat_hc1_heatingpid,6,1,1,56,1
-"RC200, CW100, CR120, CR50",thermostat,157,hc1.pumpopt,pump optimization,boolean, ,true,switch.thermostat_hc1_pump_optimization,switch.thermostat_hc1_pumpopt,6,1,1,57,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.currsolarinfl,current solar influence,uint8,C,false,sensor.thermostat_hc1_current_solar_influence,sensor.thermostat_hc1_currsolarinfl,6,1,1/10,55,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.heatingpid,heating PID,enum [fast\|medium\|slow] (>=0<=0), ,true,select.thermostat_hc1_heating_PID,select.thermostat_hc1_heatingpid,6,1,1,56,1
+"RC200, CW100, CR120, CR50",thermostat,157,hc1.pumpopt,pump optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_pump_optimization,switch.thermostat_hc1_pumpopt,6,1,1,57,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.inttimefloor,integral time floor,uint8 (>=160<=320),minutes,true,number.thermostat_hc1_integral_time_floor,number.thermostat_hc1_inttimefloor,6,1,10,58,1
 "RC200, CW100, CR120, CR50",thermostat,157,hc1.inttime,integral time,uint8 (>=3<=80),minutes,true,number.thermostat_hc1_integral_time,number.thermostat_hc1_inttime,6,1,1,59,1
-"RC200, CW100, CR120, CR50",thermostat,157,dhw.mode,operating mode,enum [off\|on\|auto], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"RC200, CW100, CR120, CR50",thermostat,157,dhw.mode,operating mode,enum [off\|on\|auto] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
 "RC200, CW100, CR120, CR50",thermostat,157,dhw.modetype,mode type,enum [off\|eco\|comfort\|eco+], ,false,sensor.thermostat_dhw_mode_type,sensor.thermostat_dhw_modetype,6,9,1,1,1
-"RC200, CW100, CR120, CR50",thermostat,157,dhw.settemp,set temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_set_temperature,number.thermostat_dhw_settemp,6,9,1,2,1
-"RC200, CW100, CR120, CR50",thermostat,157,dhw.settemplow,set low temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_set_low_temperature,number.thermostat_dhw_settemplow,6,9,1,3,1
-"RC200, CW100, CR120, CR50",thermostat,157,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog], ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
-"RC200, CW100, CR120, CR50",thermostat,157,dhw.chargeduration,charge duration,uint8 (>=0<=3810),minutes,true,number.thermostat_dhw_charge_duration,number.thermostat_dhw_chargeduration,6,9,15,5,1
-"RC200, CW100, CR120, CR50",thermostat,157,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"RC200, CW100, CR120, CR50",thermostat,157,dhw.settemp,set temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_set_temperature,number.thermostat_dhw_settemp,6,9,1,2,1
+"RC200, CW100, CR120, CR50",thermostat,157,dhw.settemplow,set low temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_set_low_temperature,number.thermostat_dhw_settemplow,6,9,1,3,1
+"RC200, CW100, CR120, CR50",thermostat,157,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog] (>=0<=0), ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
+"RC200, CW100, CR120, CR50",thermostat,157,dhw.chargeduration,charge duration,uint8 (>=0<=0),minutes,true,number.thermostat_dhw_charge_duration,number.thermostat_dhw_chargeduration,6,9,15,5,1
+"RC200, CW100, CR120, CR50",thermostat,157,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "RC200, CW100, CR120, CR50",thermostat,157,dhw.extra,extra,boolean, ,false,binary_sensor.thermostat_dhw_extra,binary_sensor.thermostat_dhw_extra,6,9,1,7,1
-"RC200, CW100, CR120, CR50",thermostat,157,dhw.disinfecting,disinfecting,boolean, ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
-"RC200, CW100, CR120, CR50",thermostat,157,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all], ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
+"RC200, CW100, CR120, CR50",thermostat,157,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
+"RC200, CW100, CR120, CR50",thermostat,157,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all] (>=0<=0), ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
 "RC200, CW100, CR120, CR50",thermostat,157,dhw.disinfecttime,disinfection time,uint8 (>=0<=1431),minutes,true,number.thermostat_dhw_disinfection_time,number.thermostat_dhw_disinfecttime,6,9,15,10,1
-"RC200, CW100, CR120, CR50",thermostat,157,dhw.dailyheating,daily heating,boolean, ,true,switch.thermostat_dhw_daily_heating,switch.thermostat_dhw_dailyheating,6,9,1,11,1
+"RC200, CW100, CR120, CR50",thermostat,157,dhw.dailyheating,daily heating,boolean (>=0<=0), ,true,switch.thermostat_dhw_daily_heating,switch.thermostat_dhw_dailyheating,6,9,1,11,1
 "RC200, CW100, CR120, CR50",thermostat,157,dhw.dailyheattime,daily heating time,uint8 (>=0<=1431),minutes,true,number.thermostat_dhw_daily_heating_time,number.thermostat_dhw_dailyheattime,6,9,15,12,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,intoffset,internal temperature offset,int8 (>=-12<=12),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,intoffset,internal temperature offset,int8 (>=0<=0),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,floordry,floor drying,enum [off\|start\|heat\|hold\|cool\|end], ,false,sensor.thermostat_floor_drying,sensor.thermostat_floordry,6,0,1,47,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dampedoutdoortemp,damped outdoor temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1/10,48,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,floordrytemp,floor drying temperature,uint8 (>=0<=254),C,false,sensor.thermostat_floor_drying_temperature,sensor.thermostat_floordrytemp,6,0,1,49,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,building,building type,enum [light\|medium\|heavy], ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,damping,damping outdoor temperature,boolean, ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,solar,solar,boolean, ,true,switch.thermostat_solar,switch.thermostat_solar,6,0,1,53,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dampedoutdoortemp,damped outdoor temperature,int16,C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1/10,48,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,floordrytemp,floor drying temperature,uint8,C,false,sensor.thermostat_floor_drying_temperature,sensor.thermostat_floordrytemp,6,0,1,49,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,building,building type,enum [light\|medium\|heavy] (>=0<=0), ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,damping,damping outdoor temperature,boolean (>=0<=0), ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,solar,solar,boolean (>=0<=0), ,true,switch.thermostat_solar,switch.thermostat_solar,6,0,1,53,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,electricfactor,electric energy factor,uint8 (>=0<=5), ,true,number.thermostat_electric_energy_factor,number.thermostat_electricfactor,6,0,1/10,58,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,pvenabledhw,enable raise dhw,boolean, ,true,switch.thermostat_enable_raise_dhw,switch.thermostat_pvenabledhw,6,0,1,61,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,pvenabledhw,enable raise dhw,boolean (>=0<=0), ,true,switch.thermostat_enable_raise_dhw,switch.thermostat_pvenabledhw,6,0,1,61,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,pvraiseheat,raise heating with PV,int8 (>=0<=5),K,true,number.thermostat_raise_heating_with_PV,number.thermostat_pvraiseheat,6,0,1,62,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,pvlowercool,lower cooling with PV,int8 (>=-5<=0),K,true,number.thermostat_lower_cooling_with_PV,number.thermostat_pvlowercool,6,0,1,63,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,absent,absent,boolean, ,true,switch.thermostat_absent,switch.thermostat_absent,6,0,1,64,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,absent,absent,boolean (>=0<=0), ,true,switch.thermostat_absent,switch.thermostat_absent,6,0,1,64,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.mode,operating mode,enum [manual\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.mode,operating mode,enum [manual\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.modetype,mode type,enum [eco\|comfort], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.manualtemp,manual temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.comforttemp,comfort temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_comfort_temperature,number.thermostat_hc1_comforttemp,6,1,1/2,7,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.manualtemp,manual temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.comforttemp,comfort temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_comfort_temperature,number.thermostat_hc1_comforttemp,6,1,1/2,7,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.summertemp,summer temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.designtemp,design temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.offsettemp,offset temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1,10,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.minflowtemp,min flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.roominfluence,room influence,uint8 (>=0<=254),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.roominflfactor,room influence factor,uint8 (>=0<=25), ,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,1/10,14,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.curroominfl,current room influence,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_influence,sensor.thermostat_hc1_curroominfl,6,1,1/10,15,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.nofrostmode,nofrost mode,enum [room\|outdoor\|room outdoor], ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.nofrosttemp,nofrost temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.summersetmode,set summer mode,enum [summer\|auto\|winter], ,true,select.thermostat_hc1_set_summer_mode,select.thermostat_hc1_summersetmode,6,1,1,20,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.hpoperatingmode,heatpump operating mode,enum [off\|auto\|heating\|cooling], ,true,select.thermostat_hc1_heatpump_operating_mode,select.thermostat_hc1_hpoperatingmode,6,1,1,21,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.designtemp,design temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.offsettemp,offset temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1,10,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.minflowtemp,min flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.roominfluence,room influence,uint8 (>=0<=0),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.roominflfactor,room influence factor,uint8 (>=0<=0), ,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,1/10,14,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.curroominfl,current room influence,int16,C,false,sensor.thermostat_hc1_current_room_influence,sensor.thermostat_hc1_curroominfl,6,1,1/10,15,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.nofrostmode,nofrost mode,enum [room\|outdoor\|room outdoor] (>=0<=0), ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.summersetmode,set summer mode,enum [summer\|auto\|winter] (>=0<=0), ,true,select.thermostat_hc1_set_summer_mode,select.thermostat_hc1_summersetmode,6,1,1,20,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.hpoperatingmode,heatpump operating mode,enum [off\|auto\|heating\|cooling] (>=0<=0), ,true,select.thermostat_hc1_heatpump_operating_mode,select.thermostat_hc1_hpoperatingmode,6,1,1,21,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.hpoperatingstate,heatpump operating state,enum [heating\|off\|cooling], ,false,sensor.thermostat_hc1_heatpump_operating_state,sensor.thermostat_hc1_hpoperatingstate,6,1,1,23,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.vacationmode,vacation mode,boolean, ,false,binary_sensor.thermostat_hc1_vacation_mode,binary_sensor.thermostat_hc1_vacationmode,6,1,1,24,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.controlmode,control mode,enum [weather compensated\|outside basepoint\|n/a\|room\|power\|constant], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.program,program,enum [prog 1\|prog 2], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.controlmode,control mode,enum [weather compensated\|outside basepoint\|n/a\|room\|power\|constant] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.program,program,enum [prog 1\|prog 2] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.tempautotemp,temporary set temperature automode,int8 (>=-1<=30),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.cooltemp,cooling temperature,int8 (>=-1<=30),C,true,number.thermostat_hc1_cooling_temperature,number.thermostat_hc1_cooltemp,6,1,1/2,28,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.fastheatup,fast heatup,uint8 (>=0<=100),%,true,number.thermostat_hc1_fast_heatup,number.thermostat_hc1_fastheatup,6,1,1,29,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.reducemode,reduce mode,enum [outdoor\|room\|reduce], ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.noreducetemp,no reduce below temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.reducetemp,off/reduce switch temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.dhwprio,dhw priority,boolean, ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.hpcooling,hp cooling,boolean, ,true,switch.thermostat_hc1_hp_cooling,switch.thermostat_hc1_hpcooling,6,1,1,35,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.fastheatup,fast heatup,uint8 (>=0<=0),%,true,number.thermostat_hc1_fast_heatup,number.thermostat_hc1_fastheatup,6,1,1,29,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.reducemode,reduce mode,enum [outdoor\|room\|reduce] (>=0<=0), ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.noreducetemp,no reduce below temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.reducetemp,off/reduce switch temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.hpcooling,hp cooling,boolean (>=0<=0), ,true,switch.thermostat_hc1_hp_cooling,switch.thermostat_hc1_hpcooling,6,1,1,35,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.coolingon,cooling on,boolean, ,false,binary_sensor.thermostat_hc1_cooling_on,binary_sensor.thermostat_hc1_coolingon,6,1,1,36,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.hpmode,HP Mode,enum [heating\|cooling\|heating & cooling], ,true,select.thermostat_hc1_HP_Mode,select.thermostat_hc1_hpmode,6,1,1,37,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.hpmode,HP Mode,enum [heating\|cooling\|heating & cooling] (>=0<=0), ,true,select.thermostat_hc1_HP_Mode,select.thermostat_hc1_hpmode,6,1,1,37,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.dewoffset,dew point offset,uint8 (>=2<=10),K,true,number.thermostat_hc1_dew_point_offset,number.thermostat_hc1_dewoffset,6,1,1,38,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.roomtempdiff,room temp difference,uint8 (>=0<=254),K,true,number.thermostat_hc1_room_temp_difference,number.thermostat_hc1_roomtempdiff,6,1,1,39,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.hpminflowtemp,HP min. flow temp.,uint8 (>=0<=254),C,true,number.thermostat_hc1_HP_min._flow_temp.,number.thermostat_hc1_hpminflowtemp,6,1,1,40,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.control,control device,enum [RC310\|RC200\|RC100\|RC100H\|TC100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.roomtempdiff,room temp difference,uint8 (>=0<=0),K,true,number.thermostat_hc1_room_temp_difference,number.thermostat_hc1_roomtempdiff,6,1,1,39,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.hpminflowtemp,HP min. flow temp.,uint8 (>=0<=0),C,true,number.thermostat_hc1_HP_min._flow_temp.,number.thermostat_hc1_hpminflowtemp,6,1,1,40,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.control,control device,enum [RC310\|RC200\|RC100\|RC100H\|TC100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.remotehum,room humidity from remote,cmd [] (>=-1<=101),%,true,sensor.thermostat_hc1_room_humidity_from_remote,sensor.thermostat_hc1_remotehum,6,1,1,43,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.heatondelay,heat-on delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_heat-on_delay,number.thermostat_hc1_heatondelay,6,1,1,44,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.heatoffdelay,heat-off delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_heat-off_delay,number.thermostat_hc1_heatoffdelay,6,1,1,45,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.instantstart,instant start,uint8 (>=1<=10),K,true,number.thermostat_hc1_instant_start,number.thermostat_hc1_instantstart,6,1,1,46,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.boost,boost mode,boolean, ,true,switch.thermostat_hc1_boost_mode,switch.thermostat_hc1_boost,6,1,1,47,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.boosttime,boost time,uint8 (>=0<=254),hours,true,number.thermostat_hc1_boost_time,number.thermostat_hc1_boosttime,6,1,1,48,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.boost,boost mode,boolean (>=0<=0), ,true,switch.thermostat_hc1_boost_mode,switch.thermostat_hc1_boost,6,1,1,47,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.boosttime,boost time,uint8 (>=0<=0),hours,true,number.thermostat_hc1_boost_time,number.thermostat_hc1_boosttime,6,1,1,48,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.coolstart,cooling starttemp,uint8 (>=20<=35),C,true,number.thermostat_hc1_cooling_starttemp,number.thermostat_hc1_coolstart,6,1,1,49,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.coolondelay,cooling on delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_cooling_on_delay,number.thermostat_hc1_coolondelay,6,1,1,50,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.cooloffdelay,cooling off delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_cooling_off_delay,number.thermostat_hc1_cooloffdelay,6,1,1,51,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.switchprogmode,switch program mode,enum [level\|absolute], ,true,select.thermostat_hc1_switch_program_mode,select.thermostat_hc1_switchprogmode,6,1,1,52,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.switchprogmode,switch program mode,enum [level\|absolute] (>=0<=0), ,true,select.thermostat_hc1_switch_program_mode,select.thermostat_hc1_switchprogmode,6,1,1,52,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.redthreshold,reduction threshold,int8 (>=12<=22),C,true,number.thermostat_hc1_reduction_threshold,number.thermostat_hc1_redthreshold,6,1,1/2,53,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.solarinfl,solar influence,uint8 (>=-5<=4294967295),C,true,number.thermostat_hc1_solar_influence,number.thermostat_hc1_solarinfl,6,1,1,54,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.currsolarinfl,current solar influence,uint8 (>=0<=25),C,false,sensor.thermostat_hc1_current_solar_influence,sensor.thermostat_hc1_currsolarinfl,6,1,1/10,55,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.heatingpid,heating PID,enum [fast\|medium\|slow], ,true,select.thermostat_hc1_heating_PID,select.thermostat_hc1_heatingpid,6,1,1,56,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.pumpopt,pump optimization,boolean, ,true,switch.thermostat_hc1_pump_optimization,switch.thermostat_hc1_pumpopt,6,1,1,57,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.currsolarinfl,current solar influence,uint8,C,false,sensor.thermostat_hc1_current_solar_influence,sensor.thermostat_hc1_currsolarinfl,6,1,1/10,55,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.heatingpid,heating PID,enum [fast\|medium\|slow] (>=0<=0), ,true,select.thermostat_hc1_heating_PID,select.thermostat_hc1_heatingpid,6,1,1,56,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.pumpopt,pump optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_pump_optimization,switch.thermostat_hc1_pumpopt,6,1,1,57,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.inttimefloor,integral time floor,uint8 (>=160<=320),minutes,true,number.thermostat_hc1_integral_time_floor,number.thermostat_hc1_inttimefloor,6,1,10,58,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,hc1.inttime,integral time,uint8 (>=3<=80),minutes,true,number.thermostat_hc1_integral_time,number.thermostat_hc1_inttime,6,1,1,59,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.mode,operating mode,enum [off\|normal\|comfort\|auto\|own prog], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.mode,operating mode,enum [off\|normal\|comfort\|auto\|own prog] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.modetype,mode type,enum [off\|eco\|comfort\|eco+], ,false,sensor.thermostat_dhw_mode_type,sensor.thermostat_dhw_modetype,6,9,1,1,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.settemp,set temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_set_temperature,number.thermostat_dhw_settemp,6,9,1,2,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.settemplow,set low temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_set_low_temperature,number.thermostat_dhw_settemplow,6,9,1,3,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog], ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.chargeduration,charge duration,uint8 (>=0<=3810),minutes,true,number.thermostat_dhw_charge_duration,number.thermostat_dhw_chargeduration,6,9,15,5,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.settemp,set temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_set_temperature,number.thermostat_dhw_settemp,6,9,1,2,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.settemplow,set low temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_set_low_temperature,number.thermostat_dhw_settemplow,6,9,1,3,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog] (>=0<=0), ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.chargeduration,charge duration,uint8 (>=0<=0),minutes,true,number.thermostat_dhw_charge_duration,number.thermostat_dhw_chargeduration,6,9,15,5,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.extra,extra,boolean, ,false,binary_sensor.thermostat_dhw_extra,binary_sensor.thermostat_dhw_extra,6,9,1,7,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.disinfecting,disinfecting,boolean, ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all], ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all] (>=0<=0), ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.disinfecttime,disinfection time,uint8 (>=0<=1431),minutes,true,number.thermostat_dhw_disinfection_time,number.thermostat_dhw_disinfecttime,6,9,15,10,1
-"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.dailyheating,daily heating,boolean, ,true,switch.thermostat_dhw_daily_heating,switch.thermostat_dhw_dailyheating,6,9,1,11,1
+"RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.dailyheating,daily heating,boolean (>=0<=0), ,true,switch.thermostat_dhw_daily_heating,switch.thermostat_dhw_dailyheating,6,9,1,11,1
 "RC3*0, Moduline 3000/1010H, CW400, Sense II, HPC410",thermostat,158,dhw.dailyheattime,daily heating time,uint8 (>=0<=1431),minutes,true,number.thermostat_dhw_daily_heating_time,number.thermostat_dhw_dailyheattime,6,9,15,12,1
 "RC100, CR10, Moduline 1000/1010",thermostat,165,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC100, CR10, Moduline 1000/1010",thermostat,165,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "RC100, CR10, Moduline 1000/1010",thermostat,165,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC100, CR10, Moduline 1000/1010",thermostat,165,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC100, CR10, Moduline 1000/1010",thermostat,165,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"RC100, CR10, Moduline 1000/1010",thermostat,165,hc1.mode,operating mode,enum [off\|manual], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
-"RC100, CR10, Moduline 1000/1010",thermostat,165,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
-"RC100, CR10, Moduline 1000/1010",thermostat,165,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"RC100, CR10, Moduline 1000/1010",thermostat,165,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC100, CR10, Moduline 1000/1010",thermostat,165,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC100, CR10, Moduline 1000/1010",thermostat,165,hc1.mode,operating mode,enum [off\|manual] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"RC100, CR10, Moduline 1000/1010",thermostat,165,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"RC100, CR10, Moduline 1000/1010",thermostat,165,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
 "Rego 2000/3000",thermostat,172,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "Rego 2000/3000",thermostat,172,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"Rego 2000/3000",thermostat,172,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"Rego 2000/3000",thermostat,172,intoffset,internal temperature offset,int8 (>=-12<=12),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
+"Rego 2000/3000",thermostat,172,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"Rego 2000/3000",thermostat,172,intoffset,internal temperature offset,int8 (>=0<=0),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
 "Rego 2000/3000",thermostat,172,floordry,floor drying,enum [off\|start\|heat\|hold\|cool\|end], ,false,sensor.thermostat_floor_drying,sensor.thermostat_floordry,6,0,1,47,1
-"Rego 2000/3000",thermostat,172,dampedoutdoortemp,damped outdoor temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1/10,48,1
-"Rego 2000/3000",thermostat,172,floordrytemp,floor drying temperature,uint8 (>=0<=254),C,false,sensor.thermostat_floor_drying_temperature,sensor.thermostat_floordrytemp,6,0,1,49,1
-"Rego 2000/3000",thermostat,172,building,building type,enum [light\|medium\|heavy], ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
-"Rego 2000/3000",thermostat,172,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
-"Rego 2000/3000",thermostat,172,damping,damping outdoor temperature,boolean, ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
-"Rego 2000/3000",thermostat,172,solar,solar,boolean, ,true,switch.thermostat_solar,switch.thermostat_solar,6,0,1,53,1
-"Rego 2000/3000",thermostat,172,vacations,vacation dates,string, ,true,sensor.thermostat_vacation_dates,sensor.thermostat_vacations,6,0,1,76,13
-"Rego 2000/3000",thermostat,172,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"Rego 2000/3000",thermostat,172,dampedoutdoortemp,damped outdoor temperature,int16,C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1/10,48,1
+"Rego 2000/3000",thermostat,172,floordrytemp,floor drying temperature,uint8,C,false,sensor.thermostat_floor_drying_temperature,sensor.thermostat_floordrytemp,6,0,1,49,1
+"Rego 2000/3000",thermostat,172,building,building type,enum [light\|medium\|heavy] (>=0<=0), ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
+"Rego 2000/3000",thermostat,172,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"Rego 2000/3000",thermostat,172,damping,damping outdoor temperature,boolean (>=0<=0), ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
+"Rego 2000/3000",thermostat,172,solar,solar,boolean (>=0<=0), ,true,switch.thermostat_solar,switch.thermostat_solar,6,0,1,53,1
+"Rego 2000/3000",thermostat,172,vacations,vacation dates,string (>=0<=0), ,true,sensor.thermostat_vacation_dates,sensor.thermostat_vacations,6,0,1,76,13
+"Rego 2000/3000",thermostat,172,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "Rego 2000/3000",thermostat,172,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "Rego 2000/3000",thermostat,172,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "Rego 2000/3000",thermostat,172,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
 "Rego 2000/3000",thermostat,172,electricfactor,electric energy factor,uint8 (>=0<=5), ,true,number.thermostat_electric_energy_factor,number.thermostat_electricfactor,6,0,1/10,58,1
 "Rego 2000/3000",thermostat,172,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "Rego 2000/3000",thermostat,172,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
-"Rego 2000/3000",thermostat,172,pvenabledhw,enable raise dhw,boolean, ,true,switch.thermostat_enable_raise_dhw,switch.thermostat_pvenabledhw,6,0,1,61,1
+"Rego 2000/3000",thermostat,172,pvenabledhw,enable raise dhw,boolean (>=0<=0), ,true,switch.thermostat_enable_raise_dhw,switch.thermostat_pvenabledhw,6,0,1,61,1
 "Rego 2000/3000",thermostat,172,pvraiseheat,raise heating with PV,int8 (>=0<=5),K,true,number.thermostat_raise_heating_with_PV,number.thermostat_pvraiseheat,6,0,1,62,1
 "Rego 2000/3000",thermostat,172,pvlowercool,lower cooling with PV,int8 (>=-5<=0),K,true,number.thermostat_lower_cooling_with_PV,number.thermostat_pvlowercool,6,0,1,63,1
-"Rego 2000/3000",thermostat,172,absent,absent,boolean, ,true,switch.thermostat_absent,switch.thermostat_absent,6,0,1,64,1
+"Rego 2000/3000",thermostat,172,absent,absent,boolean (>=0<=0), ,true,switch.thermostat_absent,switch.thermostat_absent,6,0,1,64,1
 "Rego 2000/3000",thermostat,172,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"Rego 2000/3000",thermostat,172,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"Rego 2000/3000",thermostat,172,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"Rego 2000/3000",thermostat,172,hc1.mode,operating mode,enum [manual\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"Rego 2000/3000",thermostat,172,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"Rego 2000/3000",thermostat,172,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"Rego 2000/3000",thermostat,172,hc1.mode,operating mode,enum [manual\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "Rego 2000/3000",thermostat,172,hc1.modetype,mode type,enum [eco\|comfort], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"Rego 2000/3000",thermostat,172,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"Rego 2000/3000",thermostat,172,hc1.manualtemp,manual temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
-"Rego 2000/3000",thermostat,172,hc1.comforttemp,comfort temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_comfort_temperature,number.thermostat_hc1_comforttemp,6,1,1/2,7,1
+"Rego 2000/3000",thermostat,172,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"Rego 2000/3000",thermostat,172,hc1.manualtemp,manual temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
+"Rego 2000/3000",thermostat,172,hc1.comforttemp,comfort temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_comfort_temperature,number.thermostat_hc1_comforttemp,6,1,1/2,7,1
 "Rego 2000/3000",thermostat,172,hc1.summertemp,summer temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
-"Rego 2000/3000",thermostat,172,hc1.designtemp,design temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"Rego 2000/3000",thermostat,172,hc1.offsettemp,offset temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1,10,1
-"Rego 2000/3000",thermostat,172,hc1.minflowtemp,min flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
-"Rego 2000/3000",thermostat,172,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
-"Rego 2000/3000",thermostat,172,hc1.roominfluence,room influence,uint8 (>=0<=254),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
-"Rego 2000/3000",thermostat,172,hc1.roominflfactor,room influence factor,uint8 (>=0<=25), ,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,1/10,14,1
-"Rego 2000/3000",thermostat,172,hc1.curroominfl,current room influence,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_influence,sensor.thermostat_hc1_curroominfl,6,1,1/10,15,1
-"Rego 2000/3000",thermostat,172,hc1.nofrostmode,nofrost mode,enum [room\|outdoor\|room outdoor], ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
-"Rego 2000/3000",thermostat,172,hc1.nofrosttemp,nofrost temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
-"Rego 2000/3000",thermostat,172,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
-"Rego 2000/3000",thermostat,172,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"Rego 2000/3000",thermostat,172,hc1.summersetmode,set summer mode,enum [summer\|auto\|winter], ,true,select.thermostat_hc1_set_summer_mode,select.thermostat_hc1_summersetmode,6,1,1,20,1
-"Rego 2000/3000",thermostat,172,hc1.hpoperatingmode,heatpump operating mode,enum [off\|auto\|heating\|cooling], ,true,select.thermostat_hc1_heatpump_operating_mode,select.thermostat_hc1_hpoperatingmode,6,1,1,21,1
+"Rego 2000/3000",thermostat,172,hc1.designtemp,design temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
+"Rego 2000/3000",thermostat,172,hc1.offsettemp,offset temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1,10,1
+"Rego 2000/3000",thermostat,172,hc1.minflowtemp,min flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
+"Rego 2000/3000",thermostat,172,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
+"Rego 2000/3000",thermostat,172,hc1.roominfluence,room influence,uint8 (>=0<=0),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
+"Rego 2000/3000",thermostat,172,hc1.roominflfactor,room influence factor,uint8 (>=0<=0), ,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,1/10,14,1
+"Rego 2000/3000",thermostat,172,hc1.curroominfl,current room influence,int16,C,false,sensor.thermostat_hc1_current_room_influence,sensor.thermostat_hc1_curroominfl,6,1,1/10,15,1
+"Rego 2000/3000",thermostat,172,hc1.nofrostmode,nofrost mode,enum [room\|outdoor\|room outdoor] (>=0<=0), ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
+"Rego 2000/3000",thermostat,172,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
+"Rego 2000/3000",thermostat,172,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"Rego 2000/3000",thermostat,172,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"Rego 2000/3000",thermostat,172,hc1.summersetmode,set summer mode,enum [summer\|auto\|winter] (>=0<=0), ,true,select.thermostat_hc1_set_summer_mode,select.thermostat_hc1_summersetmode,6,1,1,20,1
+"Rego 2000/3000",thermostat,172,hc1.hpoperatingmode,heatpump operating mode,enum [off\|auto\|heating\|cooling] (>=0<=0), ,true,select.thermostat_hc1_heatpump_operating_mode,select.thermostat_hc1_hpoperatingmode,6,1,1,21,1
 "Rego 2000/3000",thermostat,172,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "Rego 2000/3000",thermostat,172,hc1.hpoperatingstate,heatpump operating state,enum [heating\|off\|cooling], ,false,sensor.thermostat_hc1_heatpump_operating_state,sensor.thermostat_hc1_hpoperatingstate,6,1,1,23,1
 "Rego 2000/3000",thermostat,172,hc1.vacationmode,vacation mode,boolean, ,false,binary_sensor.thermostat_hc1_vacation_mode,binary_sensor.thermostat_hc1_vacationmode,6,1,1,24,1
-"Rego 2000/3000",thermostat,172,hc1.controlmode,control mode,enum [weather compensated\|outside basepoint\|n/a\|room\|power\|constant], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"Rego 2000/3000",thermostat,172,hc1.program,program,enum [prog 1\|prog 2], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"Rego 2000/3000",thermostat,172,hc1.controlmode,control mode,enum [weather compensated\|outside basepoint\|n/a\|room\|power\|constant] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"Rego 2000/3000",thermostat,172,hc1.program,program,enum [prog 1\|prog 2] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "Rego 2000/3000",thermostat,172,hc1.tempautotemp,temporary set temperature automode,int8 (>=-1<=30),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
 "Rego 2000/3000",thermostat,172,hc1.cooltemp,cooling temperature,int8 (>=-1<=30),C,true,number.thermostat_hc1_cooling_temperature,number.thermostat_hc1_cooltemp,6,1,1/2,28,1
-"Rego 2000/3000",thermostat,172,hc1.fastheatup,fast heatup,uint8 (>=0<=100),%,true,number.thermostat_hc1_fast_heatup,number.thermostat_hc1_fastheatup,6,1,1,29,1
-"Rego 2000/3000",thermostat,172,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"Rego 2000/3000",thermostat,172,hc1.reducemode,reduce mode,enum [outdoor\|room\|reduce], ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
-"Rego 2000/3000",thermostat,172,hc1.noreducetemp,no reduce below temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
-"Rego 2000/3000",thermostat,172,hc1.reducetemp,off/reduce switch temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
-"Rego 2000/3000",thermostat,172,hc1.dhwprio,dhw priority,boolean, ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
-"Rego 2000/3000",thermostat,172,hc1.hpcooling,hp cooling,boolean, ,true,switch.thermostat_hc1_hp_cooling,switch.thermostat_hc1_hpcooling,6,1,1,35,1
+"Rego 2000/3000",thermostat,172,hc1.fastheatup,fast heatup,uint8 (>=0<=0),%,true,number.thermostat_hc1_fast_heatup,number.thermostat_hc1_fastheatup,6,1,1,29,1
+"Rego 2000/3000",thermostat,172,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"Rego 2000/3000",thermostat,172,hc1.reducemode,reduce mode,enum [outdoor\|room\|reduce] (>=0<=0), ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
+"Rego 2000/3000",thermostat,172,hc1.noreducetemp,no reduce below temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
+"Rego 2000/3000",thermostat,172,hc1.reducetemp,off/reduce switch temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
+"Rego 2000/3000",thermostat,172,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
+"Rego 2000/3000",thermostat,172,hc1.hpcooling,hp cooling,boolean (>=0<=0), ,true,switch.thermostat_hc1_hp_cooling,switch.thermostat_hc1_hpcooling,6,1,1,35,1
 "Rego 2000/3000",thermostat,172,hc1.coolingon,cooling on,boolean, ,false,binary_sensor.thermostat_hc1_cooling_on,binary_sensor.thermostat_hc1_coolingon,6,1,1,36,1
-"Rego 2000/3000",thermostat,172,hc1.hpmode,HP Mode,enum [heating\|cooling\|heating & cooling], ,true,select.thermostat_hc1_HP_Mode,select.thermostat_hc1_hpmode,6,1,1,37,1
+"Rego 2000/3000",thermostat,172,hc1.hpmode,HP Mode,enum [heating\|cooling\|heating & cooling] (>=0<=0), ,true,select.thermostat_hc1_HP_Mode,select.thermostat_hc1_hpmode,6,1,1,37,1
 "Rego 2000/3000",thermostat,172,hc1.dewoffset,dew point offset,uint8 (>=2<=10),K,true,number.thermostat_hc1_dew_point_offset,number.thermostat_hc1_dewoffset,6,1,1,38,1
-"Rego 2000/3000",thermostat,172,hc1.roomtempdiff,room temp difference,uint8 (>=0<=254),K,true,number.thermostat_hc1_room_temp_difference,number.thermostat_hc1_roomtempdiff,6,1,1,39,1
-"Rego 2000/3000",thermostat,172,hc1.hpminflowtemp,HP min. flow temp.,uint8 (>=0<=254),C,true,number.thermostat_hc1_HP_min._flow_temp.,number.thermostat_hc1_hpminflowtemp,6,1,1,40,1
-"Rego 2000/3000",thermostat,172,hc1.control,control device,enum [RC310\|RC200\|RC100\|RC100H\|TC100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"Rego 2000/3000",thermostat,172,hc1.roomtempdiff,room temp difference,uint8 (>=0<=0),K,true,number.thermostat_hc1_room_temp_difference,number.thermostat_hc1_roomtempdiff,6,1,1,39,1
+"Rego 2000/3000",thermostat,172,hc1.hpminflowtemp,HP min. flow temp.,uint8 (>=0<=0),C,true,number.thermostat_hc1_HP_min._flow_temp.,number.thermostat_hc1_hpminflowtemp,6,1,1,40,1
+"Rego 2000/3000",thermostat,172,hc1.control,control device,enum [RC310\|RC200\|RC100\|RC100H\|TC100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
 "Rego 2000/3000",thermostat,172,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
 "Rego 2000/3000",thermostat,172,hc1.remotehum,room humidity from remote,cmd [] (>=-1<=101),%,true,sensor.thermostat_hc1_room_humidity_from_remote,sensor.thermostat_hc1_remotehum,6,1,1,43,1
 "Rego 2000/3000",thermostat,172,hc1.heatondelay,heat-on delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_heat-on_delay,number.thermostat_hc1_heatondelay,6,1,1,44,1
 "Rego 2000/3000",thermostat,172,hc1.heatoffdelay,heat-off delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_heat-off_delay,number.thermostat_hc1_heatoffdelay,6,1,1,45,1
 "Rego 2000/3000",thermostat,172,hc1.instantstart,instant start,uint8 (>=1<=10),K,true,number.thermostat_hc1_instant_start,number.thermostat_hc1_instantstart,6,1,1,46,1
-"Rego 2000/3000",thermostat,172,hc1.boost,boost mode,boolean, ,true,switch.thermostat_hc1_boost_mode,switch.thermostat_hc1_boost,6,1,1,47,1
-"Rego 2000/3000",thermostat,172,hc1.boosttime,boost time,uint8 (>=0<=254),hours,true,number.thermostat_hc1_boost_time,number.thermostat_hc1_boosttime,6,1,1,48,1
+"Rego 2000/3000",thermostat,172,hc1.boost,boost mode,boolean (>=0<=0), ,true,switch.thermostat_hc1_boost_mode,switch.thermostat_hc1_boost,6,1,1,47,1
+"Rego 2000/3000",thermostat,172,hc1.boosttime,boost time,uint8 (>=0<=0),hours,true,number.thermostat_hc1_boost_time,number.thermostat_hc1_boosttime,6,1,1,48,1
 "Rego 2000/3000",thermostat,172,hc1.coolstart,cooling starttemp,uint8 (>=20<=35),C,true,number.thermostat_hc1_cooling_starttemp,number.thermostat_hc1_coolstart,6,1,1,49,1
 "Rego 2000/3000",thermostat,172,hc1.coolondelay,cooling on delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_cooling_on_delay,number.thermostat_hc1_coolondelay,6,1,1,50,1
 "Rego 2000/3000",thermostat,172,hc1.cooloffdelay,cooling off delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_cooling_off_delay,number.thermostat_hc1_cooloffdelay,6,1,1,51,1
-"Rego 2000/3000",thermostat,172,hc1.switchprogmode,switch program mode,enum [level\|absolute], ,true,select.thermostat_hc1_switch_program_mode,select.thermostat_hc1_switchprogmode,6,1,1,52,1
+"Rego 2000/3000",thermostat,172,hc1.switchprogmode,switch program mode,enum [level\|absolute] (>=0<=0), ,true,select.thermostat_hc1_switch_program_mode,select.thermostat_hc1_switchprogmode,6,1,1,52,1
 "Rego 2000/3000",thermostat,172,hc1.redthreshold,reduction threshold,int8 (>=12<=22),C,true,number.thermostat_hc1_reduction_threshold,number.thermostat_hc1_redthreshold,6,1,1/2,53,1
 "Rego 2000/3000",thermostat,172,hc1.solarinfl,solar influence,uint8 (>=-5<=4294967295),C,true,number.thermostat_hc1_solar_influence,number.thermostat_hc1_solarinfl,6,1,1,54,1
-"Rego 2000/3000",thermostat,172,hc1.currsolarinfl,current solar influence,uint8 (>=0<=25),C,false,sensor.thermostat_hc1_current_solar_influence,sensor.thermostat_hc1_currsolarinfl,6,1,1/10,55,1
-"Rego 2000/3000",thermostat,172,hc1.heatingpid,heating PID,enum [fast\|medium\|slow], ,true,select.thermostat_hc1_heating_PID,select.thermostat_hc1_heatingpid,6,1,1,56,1
-"Rego 2000/3000",thermostat,172,hc1.pumpopt,pump optimization,boolean, ,true,switch.thermostat_hc1_pump_optimization,switch.thermostat_hc1_pumpopt,6,1,1,57,1
+"Rego 2000/3000",thermostat,172,hc1.currsolarinfl,current solar influence,uint8,C,false,sensor.thermostat_hc1_current_solar_influence,sensor.thermostat_hc1_currsolarinfl,6,1,1/10,55,1
+"Rego 2000/3000",thermostat,172,hc1.heatingpid,heating PID,enum [fast\|medium\|slow] (>=0<=0), ,true,select.thermostat_hc1_heating_PID,select.thermostat_hc1_heatingpid,6,1,1,56,1
+"Rego 2000/3000",thermostat,172,hc1.pumpopt,pump optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_pump_optimization,switch.thermostat_hc1_pumpopt,6,1,1,57,1
 "Rego 2000/3000",thermostat,172,hc1.inttimefloor,integral time floor,uint8 (>=160<=320),minutes,true,number.thermostat_hc1_integral_time_floor,number.thermostat_hc1_inttimefloor,6,1,10,58,1
 "Rego 2000/3000",thermostat,172,hc1.inttime,integral time,uint8 (>=3<=80),minutes,true,number.thermostat_hc1_integral_time,number.thermostat_hc1_inttime,6,1,1,59,1
-"Rego 2000/3000",thermostat,172,dhw.mode,operating mode,enum [normal\|comfort\|eco+], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"Rego 2000/3000",thermostat,172,dhw.mode,operating mode,enum [normal\|comfort\|eco+] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
 "Rego 2000/3000",thermostat,172,dhw.modetype,mode type,enum [off\|eco\|comfort\|eco+], ,false,sensor.thermostat_dhw_mode_type,sensor.thermostat_dhw_modetype,6,9,1,1,1
-"Rego 2000/3000",thermostat,172,dhw.settemp,set temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_set_temperature,number.thermostat_dhw_settemp,6,9,1,2,1
-"Rego 2000/3000",thermostat,172,dhw.settemplow,set low temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_set_low_temperature,number.thermostat_dhw_settemplow,6,9,1,3,1
-"Rego 2000/3000",thermostat,172,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog], ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
-"Rego 2000/3000",thermostat,172,dhw.chargeduration,charge duration,uint8 (>=0<=3810),minutes,true,number.thermostat_dhw_charge_duration,number.thermostat_dhw_chargeduration,6,9,15,5,1
-"Rego 2000/3000",thermostat,172,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"Rego 2000/3000",thermostat,172,dhw.settemp,set temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_set_temperature,number.thermostat_dhw_settemp,6,9,1,2,1
+"Rego 2000/3000",thermostat,172,dhw.settemplow,set low temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_set_low_temperature,number.thermostat_dhw_settemplow,6,9,1,3,1
+"Rego 2000/3000",thermostat,172,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog] (>=0<=0), ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
+"Rego 2000/3000",thermostat,172,dhw.chargeduration,charge duration,uint8 (>=0<=0),minutes,true,number.thermostat_dhw_charge_duration,number.thermostat_dhw_chargeduration,6,9,15,5,1
+"Rego 2000/3000",thermostat,172,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "Rego 2000/3000",thermostat,172,dhw.extra,extra,boolean, ,false,binary_sensor.thermostat_dhw_extra,binary_sensor.thermostat_dhw_extra,6,9,1,7,1
-"Rego 2000/3000",thermostat,172,dhw.disinfecting,disinfecting,boolean, ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
-"Rego 2000/3000",thermostat,172,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all], ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
+"Rego 2000/3000",thermostat,172,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
+"Rego 2000/3000",thermostat,172,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all] (>=0<=0), ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
 "Rego 2000/3000",thermostat,172,dhw.disinfecttime,disinfection time,uint8 (>=0<=1431),minutes,true,number.thermostat_dhw_disinfection_time,number.thermostat_dhw_disinfecttime,6,9,15,10,1
-"Rego 2000/3000",thermostat,172,dhw.dailyheating,daily heating,boolean, ,true,switch.thermostat_dhw_daily_heating,switch.thermostat_dhw_dailyheating,6,9,1,11,1
+"Rego 2000/3000",thermostat,172,dhw.dailyheating,daily heating,boolean (>=0<=0), ,true,switch.thermostat_dhw_daily_heating,switch.thermostat_dhw_dailyheating,6,9,1,11,1
 "Rego 2000/3000",thermostat,172,dhw.dailyheattime,daily heating time,uint8 (>=0<=1431),minutes,true,number.thermostat_dhw_daily_heating_time,number.thermostat_dhw_dailyheattime,6,9,15,12,1
 "Comfort RF",thermostat,215,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "Comfort RF",thermostat,215,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "Comfort RF",thermostat,215,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"Comfort RF",thermostat,215,hc1.seltemp,selected room temperature,int16 (>=-15999<=15999),C,false,sensor.thermostat_hc1_selected_room_temperature,sensor.thermostat_hc1_seltemp,6,1,1/2,0,1
-"Comfort RF",thermostat,215,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"Comfort RF",thermostat,215,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"Comfort RF",thermostat,215,hc1.seltemp,selected room temperature,int16,C,false,sensor.thermostat_hc1_selected_room_temperature,sensor.thermostat_hc1_seltemp,6,1,1/2,0,1
+"Comfort RF",thermostat,215,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"Comfort RF",thermostat,215,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
 "Comfort RF",thermostat,215,hc1.mode,operating mode,enum [auto\|off], ,false,sensor.thermostat_hc1_operating_mode,sensor.thermostat_hc1_mode,6,1,1,3,1
 "Comfort RF",thermostat,215,hc1.modetype,mode type,enum [off\|on], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"Comfort RF",thermostat,215,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"Comfort RF",thermostat,215,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "CRF200S",thermostat,216,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "CRF200S",thermostat,216,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "CRF200S",thermostat,216,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"CRF200S",thermostat,216,hc1.seltemp,selected room temperature,int16 (>=-15999<=15999),C,false,sensor.thermostat_hc1_selected_room_temperature,sensor.thermostat_hc1_seltemp,6,1,1/2,0,1
-"CRF200S",thermostat,216,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"CRF200S",thermostat,216,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"CRF200S",thermostat,216,hc1.seltemp,selected room temperature,int16,C,false,sensor.thermostat_hc1_selected_room_temperature,sensor.thermostat_hc1_seltemp,6,1,1/2,0,1
+"CRF200S",thermostat,216,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"CRF200S",thermostat,216,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
 "CRF200S",thermostat,216,hc1.mode,operating mode,enum [auto\|off], ,false,sensor.thermostat_hc1_operating_mode,sensor.thermostat_hc1_mode,6,1,1,3,1
 "CRF200S",thermostat,216,hc1.modetype,mode type,enum [off\|on], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"CRF200S",thermostat,216,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"CRF200S",thermostat,216,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "Comfort+2RF",thermostat,246,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "Comfort+2RF",thermostat,246,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "Comfort+2RF",thermostat,246,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"Comfort+2RF",thermostat,246,hc1.seltemp,selected room temperature,int16 (>=-15999<=15999),C,false,sensor.thermostat_hc1_selected_room_temperature,sensor.thermostat_hc1_seltemp,6,1,1/2,0,1
-"Comfort+2RF",thermostat,246,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"Comfort+2RF",thermostat,246,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"Comfort+2RF",thermostat,246,hc1.seltemp,selected room temperature,int16,C,false,sensor.thermostat_hc1_selected_room_temperature,sensor.thermostat_hc1_seltemp,6,1,1/2,0,1
+"Comfort+2RF",thermostat,246,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"Comfort+2RF",thermostat,246,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
 "Comfort+2RF",thermostat,246,hc1.mode,operating mode,enum [auto\|off], ,false,sensor.thermostat_hc1_operating_mode,sensor.thermostat_hc1_mode,6,1,1,3,1
 "Comfort+2RF",thermostat,246,hc1.modetype,mode type,enum [off\|on], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"Comfort+2RF",thermostat,246,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"Comfort+2RF",thermostat,246,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,intoffset,internal temperature offset,int8 (>=-12<=12),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,intoffset,internal temperature offset,int8 (>=0<=0),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,floordry,floor drying,enum [off\|start\|heat\|hold\|cool\|end], ,false,sensor.thermostat_floor_drying,sensor.thermostat_floordry,6,0,1,47,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,dampedoutdoortemp,damped outdoor temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1/10,48,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,floordrytemp,floor drying temperature,uint8 (>=0<=254),C,false,sensor.thermostat_floor_drying_temperature,sensor.thermostat_floordrytemp,6,0,1,49,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,building,building type,enum [light\|medium\|heavy], ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,damping,damping outdoor temperature,boolean, ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,solar,solar,boolean, ,true,switch.thermostat_solar,switch.thermostat_solar,6,0,1,53,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,dampedoutdoortemp,damped outdoor temperature,int16,C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1/10,48,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,floordrytemp,floor drying temperature,uint8,C,false,sensor.thermostat_floor_drying_temperature,sensor.thermostat_floordrytemp,6,0,1,49,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,building,building type,enum [light\|medium\|heavy] (>=0<=0), ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,damping,damping outdoor temperature,boolean (>=0<=0), ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,solar,solar,boolean (>=0<=0), ,true,switch.thermostat_solar,switch.thermostat_solar,6,0,1,53,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,electricfactor,electric energy factor,uint8 (>=0<=5), ,true,number.thermostat_electric_energy_factor,number.thermostat_electricfactor,6,0,1/10,58,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,pvenabledhw,enable raise dhw,boolean, ,true,switch.thermostat_enable_raise_dhw,switch.thermostat_pvenabledhw,6,0,1,61,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,pvenabledhw,enable raise dhw,boolean (>=0<=0), ,true,switch.thermostat_enable_raise_dhw,switch.thermostat_pvenabledhw,6,0,1,61,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,pvraiseheat,raise heating with PV,int8 (>=0<=5),K,true,number.thermostat_raise_heating_with_PV,number.thermostat_pvraiseheat,6,0,1,62,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,pvlowercool,lower cooling with PV,int8 (>=-5<=0),K,true,number.thermostat_lower_cooling_with_PV,number.thermostat_pvlowercool,6,0,1,63,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,absent,absent,boolean, ,true,switch.thermostat_absent,switch.thermostat_absent,6,0,1,64,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,absent,absent,boolean (>=0<=0), ,true,switch.thermostat_absent,switch.thermostat_absent,6,0,1,64,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.mode,operating mode,enum [off\|manual\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.mode,operating mode,enum [off\|manual\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.modetype,mode type,enum [eco\|comfort], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.manualtemp,manual temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.comforttemp,comfort temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_comfort_temperature,number.thermostat_hc1_comforttemp,6,1,1/2,7,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.manualtemp,manual temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_manual_temperature,number.thermostat_hc1_manualtemp,6,1,1/2,6,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.comforttemp,comfort temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_comfort_temperature,number.thermostat_hc1_comforttemp,6,1,1/2,7,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.summertemp,summer temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.designtemp,design temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.offsettemp,offset temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1,10,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.minflowtemp,min flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.roominfluence,room influence,uint8 (>=0<=254),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.roominflfactor,room influence factor,uint8 (>=0<=25), ,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,1/10,14,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.curroominfl,current room influence,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_influence,sensor.thermostat_hc1_curroominfl,6,1,1/10,15,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.nofrostmode,nofrost mode,enum [room\|outdoor\|room outdoor], ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.nofrosttemp,nofrost temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.summersetmode,set summer mode,enum [summer\|auto\|winter], ,true,select.thermostat_hc1_set_summer_mode,select.thermostat_hc1_summersetmode,6,1,1,20,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.hpoperatingmode,heatpump operating mode,enum [off\|auto\|heating\|cooling], ,true,select.thermostat_hc1_heatpump_operating_mode,select.thermostat_hc1_hpoperatingmode,6,1,1,21,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.designtemp,design temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.offsettemp,offset temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1,10,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.minflowtemp,min flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.roominfluence,room influence,uint8 (>=0<=0),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.roominflfactor,room influence factor,uint8 (>=0<=0), ,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,1/10,14,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.curroominfl,current room influence,int16,C,false,sensor.thermostat_hc1_current_room_influence,sensor.thermostat_hc1_curroominfl,6,1,1/10,15,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.nofrostmode,nofrost mode,enum [room\|outdoor\|room outdoor] (>=0<=0), ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.summersetmode,set summer mode,enum [summer\|auto\|winter] (>=0<=0), ,true,select.thermostat_hc1_set_summer_mode,select.thermostat_hc1_summersetmode,6,1,1,20,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.hpoperatingmode,heatpump operating mode,enum [off\|auto\|heating\|cooling] (>=0<=0), ,true,select.thermostat_hc1_heatpump_operating_mode,select.thermostat_hc1_hpoperatingmode,6,1,1,21,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.hpoperatingstate,heatpump operating state,enum [heating\|off\|cooling], ,false,sensor.thermostat_hc1_heatpump_operating_state,sensor.thermostat_hc1_hpoperatingstate,6,1,1,23,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.vacationmode,vacation mode,boolean, ,false,binary_sensor.thermostat_hc1_vacation_mode,binary_sensor.thermostat_hc1_vacationmode,6,1,1,24,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.controlmode,control mode,enum [weather compensated\|outside basepoint\|n/a\|room\|power\|constant], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.program,program,enum [prog 1\|prog 2], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.controlmode,control mode,enum [weather compensated\|outside basepoint\|n/a\|room\|power\|constant] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.program,program,enum [prog 1\|prog 2] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.tempautotemp,temporary set temperature automode,int8 (>=-1<=30),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.cooltemp,cooling temperature,int8 (>=-1<=30),C,true,number.thermostat_hc1_cooling_temperature,number.thermostat_hc1_cooltemp,6,1,1/2,28,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.fastheatup,fast heatup,uint8 (>=0<=100),%,true,number.thermostat_hc1_fast_heatup,number.thermostat_hc1_fastheatup,6,1,1,29,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.reducemode,reduce mode,enum [outdoor\|room\|reduce], ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.noreducetemp,no reduce below temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.reducetemp,off/reduce switch temperature,int8 (>=-126<=126),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.dhwprio,dhw priority,boolean, ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.hpcooling,hp cooling,boolean, ,true,switch.thermostat_hc1_hp_cooling,switch.thermostat_hc1_hpcooling,6,1,1,35,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.fastheatup,fast heatup,uint8 (>=0<=0),%,true,number.thermostat_hc1_fast_heatup,number.thermostat_hc1_fastheatup,6,1,1,29,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.reducemode,reduce mode,enum [outdoor\|room\|reduce] (>=0<=0), ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.noreducetemp,no reduce below temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.reducetemp,off/reduce switch temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.hpcooling,hp cooling,boolean (>=0<=0), ,true,switch.thermostat_hc1_hp_cooling,switch.thermostat_hc1_hpcooling,6,1,1,35,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.coolingon,cooling on,boolean, ,false,binary_sensor.thermostat_hc1_cooling_on,binary_sensor.thermostat_hc1_coolingon,6,1,1,36,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.hpmode,HP Mode,enum [heating\|cooling\|heating & cooling], ,true,select.thermostat_hc1_HP_Mode,select.thermostat_hc1_hpmode,6,1,1,37,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.hpmode,HP Mode,enum [heating\|cooling\|heating & cooling] (>=0<=0), ,true,select.thermostat_hc1_HP_Mode,select.thermostat_hc1_hpmode,6,1,1,37,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.dewoffset,dew point offset,uint8 (>=2<=10),K,true,number.thermostat_hc1_dew_point_offset,number.thermostat_hc1_dewoffset,6,1,1,38,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.roomtempdiff,room temp difference,uint8 (>=0<=254),K,true,number.thermostat_hc1_room_temp_difference,number.thermostat_hc1_roomtempdiff,6,1,1,39,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.hpminflowtemp,HP min. flow temp.,uint8 (>=0<=254),C,true,number.thermostat_hc1_HP_min._flow_temp.,number.thermostat_hc1_hpminflowtemp,6,1,1,40,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.control,control device,enum [off\|-\|RC100\|RC100H\|-\|RC120RF\|RC220/RT800\|single], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.roomtempdiff,room temp difference,uint8 (>=0<=0),K,true,number.thermostat_hc1_room_temp_difference,number.thermostat_hc1_roomtempdiff,6,1,1,39,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.hpminflowtemp,HP min. flow temp.,uint8 (>=0<=0),C,true,number.thermostat_hc1_HP_min._flow_temp.,number.thermostat_hc1_hpminflowtemp,6,1,1,40,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.control,control device,enum [off\|-\|RC100\|RC100H\|-\|RC120RF\|RC220/RT800\|single] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.remotehum,room humidity from remote,cmd [] (>=-1<=101),%,true,sensor.thermostat_hc1_room_humidity_from_remote,sensor.thermostat_hc1_remotehum,6,1,1,43,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.heatondelay,heat-on delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_heat-on_delay,number.thermostat_hc1_heatondelay,6,1,1,44,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.heatoffdelay,heat-off delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_heat-off_delay,number.thermostat_hc1_heatoffdelay,6,1,1,45,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.instantstart,instant start,uint8 (>=1<=10),K,true,number.thermostat_hc1_instant_start,number.thermostat_hc1_instantstart,6,1,1,46,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.boost,boost mode,boolean, ,true,switch.thermostat_hc1_boost_mode,switch.thermostat_hc1_boost,6,1,1,47,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.boosttime,boost time,uint8 (>=0<=254),hours,true,number.thermostat_hc1_boost_time,number.thermostat_hc1_boosttime,6,1,1,48,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.boost,boost mode,boolean (>=0<=0), ,true,switch.thermostat_hc1_boost_mode,switch.thermostat_hc1_boost,6,1,1,47,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.boosttime,boost time,uint8 (>=0<=0),hours,true,number.thermostat_hc1_boost_time,number.thermostat_hc1_boosttime,6,1,1,48,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.coolstart,cooling starttemp,uint8 (>=20<=35),C,true,number.thermostat_hc1_cooling_starttemp,number.thermostat_hc1_coolstart,6,1,1,49,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.coolondelay,cooling on delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_cooling_on_delay,number.thermostat_hc1_coolondelay,6,1,1,50,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.cooloffdelay,cooling off delay,uint8 (>=1<=48),hours,true,number.thermostat_hc1_cooling_off_delay,number.thermostat_hc1_cooloffdelay,6,1,1,51,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.switchprogmode,switch program mode,enum [level\|absolute], ,true,select.thermostat_hc1_switch_program_mode,select.thermostat_hc1_switchprogmode,6,1,1,52,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.switchprogmode,switch program mode,enum [level\|absolute] (>=0<=0), ,true,select.thermostat_hc1_switch_program_mode,select.thermostat_hc1_switchprogmode,6,1,1,52,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.redthreshold,reduction threshold,int8 (>=12<=22),C,true,number.thermostat_hc1_reduction_threshold,number.thermostat_hc1_redthreshold,6,1,1/2,53,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.solarinfl,solar influence,uint8 (>=-5<=4294967295),C,true,number.thermostat_hc1_solar_influence,number.thermostat_hc1_solarinfl,6,1,1,54,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.currsolarinfl,current solar influence,uint8 (>=0<=25),C,false,sensor.thermostat_hc1_current_solar_influence,sensor.thermostat_hc1_currsolarinfl,6,1,1/10,55,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.heatingpid,heating PID,enum [fast\|medium\|slow], ,true,select.thermostat_hc1_heating_PID,select.thermostat_hc1_heatingpid,6,1,1,56,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.pumpopt,pump optimization,boolean, ,true,switch.thermostat_hc1_pump_optimization,switch.thermostat_hc1_pumpopt,6,1,1,57,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.currsolarinfl,current solar influence,uint8,C,false,sensor.thermostat_hc1_current_solar_influence,sensor.thermostat_hc1_currsolarinfl,6,1,1/10,55,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.heatingpid,heating PID,enum [fast\|medium\|slow] (>=0<=0), ,true,select.thermostat_hc1_heating_PID,select.thermostat_hc1_heatingpid,6,1,1,56,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.pumpopt,pump optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_pump_optimization,switch.thermostat_hc1_pumpopt,6,1,1,57,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.inttimefloor,integral time floor,uint8 (>=160<=320),minutes,true,number.thermostat_hc1_integral_time_floor,number.thermostat_hc1_inttimefloor,6,1,10,58,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,hc1.inttime,integral time,uint8 (>=3<=80),minutes,true,number.thermostat_hc1_integral_time,number.thermostat_hc1_inttime,6,1,1,59,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.mode,operating mode,enum [off\|eco+\|eco\|comfort\|auto], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.mode,operating mode,enum [off\|eco+\|eco\|comfort\|auto] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.modetype,mode type,enum [off\|eco\|comfort\|eco+], ,false,sensor.thermostat_dhw_mode_type,sensor.thermostat_dhw_modetype,6,9,1,1,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.settemp,set temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_set_temperature,number.thermostat_dhw_settemp,6,9,1,2,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.settemplow,set low temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_set_low_temperature,number.thermostat_dhw_settemplow,6,9,1,3,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog], ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.chargeduration,charge duration,uint8 (>=0<=3810),minutes,true,number.thermostat_dhw_charge_duration,number.thermostat_dhw_chargeduration,6,9,15,5,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.settemp,set temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_set_temperature,number.thermostat_dhw_settemp,6,9,1,2,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.settemplow,set low temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_set_low_temperature,number.thermostat_dhw_settemplow,6,9,1,3,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog] (>=0<=0), ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.chargeduration,charge duration,uint8 (>=0<=0),minutes,true,number.thermostat_dhw_charge_duration,number.thermostat_dhw_chargeduration,6,9,15,5,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.extra,extra,boolean, ,false,binary_sensor.thermostat_dhw_extra,binary_sensor.thermostat_dhw_extra,6,9,1,7,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.disinfecting,disinfecting,boolean, ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all], ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all] (>=0<=0), ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.disinfecttime,disinfection time,uint8 (>=0<=1431),minutes,true,number.thermostat_dhw_disinfection_time,number.thermostat_dhw_disinfecttime,6,9,15,10,1
-"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.dailyheating,daily heating,boolean, ,true,switch.thermostat_dhw_daily_heating,switch.thermostat_dhw_dailyheating,6,9,1,11,1
+"Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.dailyheating,daily heating,boolean (>=0<=0), ,true,switch.thermostat_dhw_daily_heating,switch.thermostat_dhw_dailyheating,6,9,1,11,1
 "Rego 3000, UI800, Logamatic BC400",thermostat,253,dhw.dailyheattime,daily heating time,uint8 (>=0<=1431),minutes,true,number.thermostat_dhw_daily_heating_time,number.thermostat_dhw_dailyheattime,6,9,15,12,1
 "ES72, RC20",thermostat,66,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "ES72, RC20",thermostat,66,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "ES72, RC20",thermostat,66,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"ES72, RC20",thermostat,66,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"ES72, RC20",thermostat,66,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
 "ES72, RC20",thermostat,66,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"ES72, RC20",thermostat,66,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"ES72, RC20",thermostat,66,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"ES72, RC20",thermostat,66,hc1.mode,operating mode,enum [night\|day\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"ES72, RC20",thermostat,66,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"ES72, RC20",thermostat,66,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"ES72, RC20",thermostat,66,hc1.mode,operating mode,enum [night\|day\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "ES72, RC20",thermostat,66,hc1.modetype,mode type,enum [night\|day], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"ES72, RC20",thermostat,66,hc1.daytemp,day temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
-"ES72, RC20",thermostat,66,hc1.nighttemp,night temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
-"ES72, RC20",thermostat,66,hc1.program,program,enum [family\|morning\|evening\|am\|pm\|midday\|singles\|seniors], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
-"ES72, RC20",thermostat,66,hc1.minflowtemp,min flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
-"ES72, RC20",thermostat,66,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
-"ES72, RC20",thermostat,66,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=127),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
-"ES72, RC20",thermostat,66,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"ES72, RC20",thermostat,66,hc1.daytemp,day temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
+"ES72, RC20",thermostat,66,hc1.nighttemp,night temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
+"ES72, RC20",thermostat,66,hc1.program,program,enum [family\|morning\|evening\|am\|pm\|midday\|singles\|seniors] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"ES72, RC20",thermostat,66,hc1.minflowtemp,min flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
+"ES72, RC20",thermostat,66,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
+"ES72, RC20",thermostat,66,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=0),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
+"ES72, RC20",thermostat,66,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
 "ES72, RC20",thermostat,66,hc1.summertemp,summer temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
 "ES72, RC20",thermostat,66,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "ES73",thermostat,76,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "ES73",thermostat,76,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "ES73",thermostat,76,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"ES73",thermostat,76,display,display,enum [internal temperature\|internal setpoint\|external temperature\|burner temperature\|dhw temperature\|functioning mode\|time\|date\|smoke temperature], ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
+"ES73",thermostat,76,display,display,enum [internal temperature\|internal setpoint\|external temperature\|burner temperature\|dhw temperature\|functioning mode\|time\|date\|smoke temperature] (>=0<=0), ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
 "ES73",thermostat,76,language,language,enum [german\|dutch\|french\|italian], ,false,sensor.thermostat_language,sensor.thermostat_language,6,0,1,66,1
-"ES73",thermostat,76,clockoffset,clock offset,int8 (>=-126<=126),seconds,true,number.thermostat_clock_offset,number.thermostat_clockoffset,6,0,1,67,1
-"ES73",thermostat,76,intoffset,internal temperature offset,int8 (>=-12<=12),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
-"ES73",thermostat,76,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
-"ES73",thermostat,76,inttemp1,temperature sensor 1,int16 (>=-3199<=3199),C,false,sensor.thermostat_temperature_sensor_1,sensor.thermostat_inttemp1,6,0,1/10,68,1
-"ES73",thermostat,76,inttemp2,temperature sensor 2,int16 (>=-3199<=3199),C,false,sensor.thermostat_temperature_sensor_2,sensor.thermostat_inttemp2,6,0,1/10,69,1
-"ES73",thermostat,76,damping,damping outdoor temperature,boolean, ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
-"ES73",thermostat,76,dampedoutdoortemp,damped outdoor temperature,int8 (>=-126<=126),C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1,48,1
-"ES73",thermostat,76,building,building type,enum [light\|medium\|heavy], ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
+"ES73",thermostat,76,clockoffset,clock offset,int8 (>=0<=0),seconds,true,number.thermostat_clock_offset,number.thermostat_clockoffset,6,0,1,67,1
+"ES73",thermostat,76,intoffset,internal temperature offset,int8 (>=0<=0),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
+"ES73",thermostat,76,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"ES73",thermostat,76,inttemp1,temperature sensor 1,int16,C,false,sensor.thermostat_temperature_sensor_1,sensor.thermostat_inttemp1,6,0,1/10,68,1
+"ES73",thermostat,76,inttemp2,temperature sensor 2,int16,C,false,sensor.thermostat_temperature_sensor_2,sensor.thermostat_inttemp2,6,0,1/10,69,1
+"ES73",thermostat,76,damping,damping outdoor temperature,boolean (>=0<=0), ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
+"ES73",thermostat,76,dampedoutdoortemp,damped outdoor temperature,int8,C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1,48,1
+"ES73",thermostat,76,building,building type,enum [light\|medium\|heavy] (>=0<=0), ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
 "ES73",thermostat,76,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"ES73",thermostat,76,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"ES73",thermostat,76,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"ES73",thermostat,76,hc1.mode,operating mode,enum [night\|day\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"ES73",thermostat,76,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"ES73",thermostat,76,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"ES73",thermostat,76,hc1.mode,operating mode,enum [night\|day\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "ES73",thermostat,76,hc1.modetype,mode type,enum [night\|day], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
 "ES73",thermostat,76,hc1.daytemp,day temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
 "ES73",thermostat,76,hc1.nighttemp,night temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
 "ES73",thermostat,76,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
 "ES73",thermostat,76,hc1.offsettemp,offset temperature,int8 (>=-5<=5),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1/2,10,1
 "ES73",thermostat,76,hc1.holidaytemp,holiday temperature,uint8 (>=5<=30),C,true,number.thermostat_hc1_holiday_temperature,number.thermostat_hc1_holidaytemp,6,1,1/2,62,1
-"ES73",thermostat,76,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"ES73",thermostat,76,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "ES73",thermostat,76,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
 "ES73",thermostat,76,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "ES73",thermostat,76,hc1.holidaymode,holiday mode,boolean, ,false,binary_sensor.thermostat_hc1_holiday_mode,binary_sensor.thermostat_hc1_holidaymode,6,1,1,63,1
 "ES73",thermostat,76,hc1.nofrosttemp,nofrost temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
-"ES73",thermostat,76,hc1.nofrostmode,nofrost mode,enum [off\|outdoor\|room], ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
+"ES73",thermostat,76,hc1.nofrostmode,nofrost mode,enum [off\|outdoor\|room] (>=0<=0), ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
 "ES73",thermostat,76,hc1.roominfluence,room influence,uint8 (>=0<=10),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
 "ES73",thermostat,76,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "ES73",thermostat,76,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "ES73",thermostat,76,hc1.flowtempoffset,flow temperature offset for mixer,uint8 (>=0<=20),C,true,number.thermostat_hc1_flow_temperature_offset_for_mixer,number.thermostat_hc1_flowtempoffset,6,1,1,64,1
-"ES73",thermostat,76,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"ES73",thermostat,76,hc1.reducemode,reduce mode,enum [nofrost\|reduce\|room\|outdoor], ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
-"ES73",thermostat,76,hc1.controlmode,control mode,enum [outdoor\|room], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"ES73",thermostat,76,hc1.control,control device,enum [off\|RC20\|RC3x], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"ES73",thermostat,76,hc1.holidays,holiday dates,string, ,true,sensor.thermostat_hc1_holiday_dates,sensor.thermostat_hc1_holidays,6,1,1,65,13
-"ES73",thermostat,76,hc1.vacations,vacation dates,string, ,true,sensor.thermostat_hc1_vacation_dates,sensor.thermostat_hc1_vacations,6,1,1,78,13
-"ES73",thermostat,76,hc1.program,program,enum [own 1\|family\|morning\|evening\|am\|pm\|midday\|singles\|seniors\|new\|own 2], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"ES73",thermostat,76,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"ES73",thermostat,76,hc1.reducemode,reduce mode,enum [nofrost\|reduce\|room\|outdoor] (>=0<=0), ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
+"ES73",thermostat,76,hc1.controlmode,control mode,enum [outdoor\|room] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"ES73",thermostat,76,hc1.control,control device,enum [off\|RC20\|RC3x] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"ES73",thermostat,76,hc1.holidays,holiday dates,string (>=0<=0), ,true,sensor.thermostat_hc1_holiday_dates,sensor.thermostat_hc1_holidays,6,1,1,65,13
+"ES73",thermostat,76,hc1.vacations,vacation dates,string (>=0<=0), ,true,sensor.thermostat_hc1_vacation_dates,sensor.thermostat_hc1_vacations,6,1,1,78,13
+"ES73",thermostat,76,hc1.program,program,enum [own 1\|family\|morning\|evening\|am\|pm\|midday\|singles\|seniors\|new\|own 2] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "ES73",thermostat,76,hc1.pause,pause time,uint8 (>=0<=99),hours,true,number.thermostat_hc1_pause_time,number.thermostat_hc1_pause,6,1,1,91,1
 "ES73",thermostat,76,hc1.party,party time,uint8 (>=0<=99),hours,true,number.thermostat_hc1_party_time,number.thermostat_hc1_party,6,1,1,92,1
 "ES73",thermostat,76,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=30),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
 "ES73",thermostat,76,hc1.noreducetemp,no reduce below temperature,int8 (>=-31<=10),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
 "ES73",thermostat,76,hc1.reducetemp,off/reduce switch temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
 "ES73",thermostat,76,hc1.vacreducetemp,vacations off/reduce switch temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_vacations_off/reduce_switch_temperature,number.thermostat_hc1_vacreducetemp,6,1,1,93,1
-"ES73",thermostat,76,hc1.vacreducemode,vacations reduce mode,enum [nofrost\|reduce\|room\|outdoor], ,true,select.thermostat_hc1_vacations_reduce_mode,select.thermostat_hc1_vacreducemode,6,1,1,94,1
+"ES73",thermostat,76,hc1.vacreducemode,vacations reduce mode,enum [nofrost\|reduce\|room\|outdoor] (>=0<=0), ,true,select.thermostat_hc1_vacations_reduce_mode,select.thermostat_hc1_vacreducemode,6,1,1,94,1
 "ES73",thermostat,76,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"ES73",thermostat,76,hc1.dhwprio,dhw priority,boolean, ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
-"ES73",thermostat,76,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"ES73",thermostat,76,hc1.switchtime1,own1 program switchtime,string, ,true,sensor.thermostat_hc1_own1_program_switchtime,sensor.thermostat_hc1_switchtime1,6,1,1,95,8
-"ES73",thermostat,76,hc1.switchtime2,own2 program switchtime,string, ,true,sensor.thermostat_hc1_own2_program_switchtime,sensor.thermostat_hc1_switchtime2,6,1,1,103,8
-"ES73",thermostat,76,dhw.mode,operating mode,enum [off\|on\|auto], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
-"ES73",thermostat,76,dhw.circmode,circulation pump mode,enum [off\|on\|auto], ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
-"ES73",thermostat,76,dhw.progmode,program,enum [std prog\|own prog], ,true,select.thermostat_dhw_program,select.thermostat_dhw_progmode,6,9,1,13,1
-"ES73",thermostat,76,dhw.circprog,circulation program,enum [std prog\|own prog], ,true,select.thermostat_dhw_circulation_program,select.thermostat_dhw_circprog,6,9,1,14,1
-"ES73",thermostat,76,dhw.disinfecting,disinfecting,boolean, ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
-"ES73",thermostat,76,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all], ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
+"ES73",thermostat,76,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
+"ES73",thermostat,76,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"ES73",thermostat,76,hc1.switchtime1,own1 program switchtime,string (>=0<=0), ,true,sensor.thermostat_hc1_own1_program_switchtime,sensor.thermostat_hc1_switchtime1,6,1,1,95,8
+"ES73",thermostat,76,hc1.switchtime2,own2 program switchtime,string (>=0<=0), ,true,sensor.thermostat_hc1_own2_program_switchtime,sensor.thermostat_hc1_switchtime2,6,1,1,103,8
+"ES73",thermostat,76,dhw.mode,operating mode,enum [off\|on\|auto] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"ES73",thermostat,76,dhw.circmode,circulation pump mode,enum [off\|on\|auto] (>=0<=0), ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
+"ES73",thermostat,76,dhw.progmode,program,enum [std prog\|own prog] (>=0<=0), ,true,select.thermostat_dhw_program,select.thermostat_dhw_progmode,6,9,1,13,1
+"ES73",thermostat,76,dhw.circprog,circulation program,enum [std prog\|own prog] (>=0<=0), ,true,select.thermostat_dhw_circulation_program,select.thermostat_dhw_circprog,6,9,1,14,1
+"ES73",thermostat,76,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
+"ES73",thermostat,76,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all] (>=0<=0), ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
 "ES73",thermostat,76,dhw.disinfecthour,disinfection hour,uint8 (>=0<=23), ,true,number.thermostat_dhw_disinfection_hour,number.thermostat_dhw_disinfecthour,6,9,1,15,1
-"ES73",thermostat,76,dhw.maxtemp,maximum temperature,uint8 (>=0<=254),C,true,number.thermostat_dhw_maximum_temperature,number.thermostat_dhw_maxtemp,6,9,1,16,1
-"ES73",thermostat,76,dhw.onetimekey,one time key function,boolean, ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,17,1
-"ES73",thermostat,76,dhw.switchtime,program switchtime,string, ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,18,8
-"ES73",thermostat,76,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,26,8
-"ES73",thermostat,76,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,34,13
-"ES73",thermostat,76,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,47,13
+"ES73",thermostat,76,dhw.maxtemp,maximum temperature,uint8 (>=0<=0),C,true,number.thermostat_dhw_maximum_temperature,number.thermostat_dhw_maxtemp,6,9,1,16,1
+"ES73",thermostat,76,dhw.onetimekey,one time key function,boolean (>=0<=0), ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,17,1
+"ES73",thermostat,76,dhw.switchtime,program switchtime,string (>=0<=0), ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,18,8
+"ES73",thermostat,76,dhw.circswitchtime,circulation program switchtime,string (>=0<=0), ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,26,8
+"ES73",thermostat,76,dhw.holidays,holiday dates,string (>=0<=0), ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,34,13
+"ES73",thermostat,76,dhw.vacations,vacation dates,string (>=0<=0), ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,47,13
 "ES72, RC20",thermostat,113,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "ES72, RC20",thermostat,113,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "ES72, RC20",thermostat,113,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"ES72, RC20",thermostat,113,minexttemp,minimal external temperature,int8 (>=-126<=126),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
+"ES72, RC20",thermostat,113,minexttemp,minimal external temperature,int8 (>=0<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
 "ES72, RC20",thermostat,113,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"ES72, RC20",thermostat,113,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"ES72, RC20",thermostat,113,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"ES72, RC20",thermostat,113,hc1.mode,operating mode,enum [night\|day\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"ES72, RC20",thermostat,113,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"ES72, RC20",thermostat,113,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"ES72, RC20",thermostat,113,hc1.mode,operating mode,enum [night\|day\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "ES72, RC20",thermostat,113,hc1.modetype,mode type,enum [night\|day], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"ES72, RC20",thermostat,113,hc1.daytemp,day temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
-"ES72, RC20",thermostat,113,hc1.nighttemp,night temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
-"ES72, RC20",thermostat,113,hc1.program,program,enum [family\|morning\|evening\|am\|pm\|midday\|singles\|seniors], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
-"ES72, RC20",thermostat,113,hc1.minflowtemp,min flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
-"ES72, RC20",thermostat,113,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=254),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
-"ES72, RC20",thermostat,113,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=127),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
-"ES72, RC20",thermostat,113,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"ES72, RC20",thermostat,113,hc1.daytemp,day temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
+"ES72, RC20",thermostat,113,hc1.nighttemp,night temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
+"ES72, RC20",thermostat,113,hc1.program,program,enum [family\|morning\|evening\|am\|pm\|midday\|singles\|seniors] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"ES72, RC20",thermostat,113,hc1.minflowtemp,min flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
+"ES72, RC20",thermostat,113,hc1.maxflowtemp,max flow temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
+"ES72, RC20",thermostat,113,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=0),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
+"ES72, RC20",thermostat,113,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
 "ES72, RC20",thermostat,113,hc1.summertemp,summer temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
 "ES72, RC20",thermostat,113,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "ES79",thermostat,156,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "ES79",thermostat,156,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"ES79",thermostat,156,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"ES79",thermostat,156,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
 "ES79",thermostat,156,intoffset,internal temperature offset,int8 (>=-5<=5),C,true,number.thermostat_internal_temperature_offset,number.thermostat_intoffset,6,0,1/10,46,1
 "ES79",thermostat,156,minexttemp,minimal external temperature,int8 (>=-30<=0),C,true,number.thermostat_minimal_external_temperature,number.thermostat_minexttemp,6,0,1,51,1
-"ES79",thermostat,156,inttemp1,temperature sensor 1,int16 (>=-3199<=3199),C,false,sensor.thermostat_temperature_sensor_1,sensor.thermostat_inttemp1,6,0,1/10,68,1
-"ES79",thermostat,156,inttemp2,temperature sensor 2,int16 (>=-3199<=3199),C,false,sensor.thermostat_temperature_sensor_2,sensor.thermostat_inttemp2,6,0,1/10,69,1
-"ES79",thermostat,156,damping,damping outdoor temperature,boolean, ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
-"ES79",thermostat,156,dampedoutdoortemp,damped outdoor temperature,int8 (>=-126<=126),C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1,48,1
-"ES79",thermostat,156,building,building type,enum [light\|medium\|heavy], ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
+"ES79",thermostat,156,inttemp1,temperature sensor 1,int16,C,false,sensor.thermostat_temperature_sensor_1,sensor.thermostat_inttemp1,6,0,1/10,68,1
+"ES79",thermostat,156,inttemp2,temperature sensor 2,int16,C,false,sensor.thermostat_temperature_sensor_2,sensor.thermostat_inttemp2,6,0,1/10,69,1
+"ES79",thermostat,156,damping,damping outdoor temperature,boolean (>=0<=0), ,true,switch.thermostat_damping_outdoor_temperature,switch.thermostat_damping,6,0,1,52,1
+"ES79",thermostat,156,dampedoutdoortemp,damped outdoor temperature,int8,C,false,sensor.thermostat_damped_outdoor_temperature,sensor.thermostat_dampedoutdoortemp,6,0,1,48,1
+"ES79",thermostat,156,building,building type,enum [light\|medium\|heavy] (>=0<=0), ,true,select.thermostat_building_type,select.thermostat_building,6,0,1,50,1
 "ES79",thermostat,156,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"ES79",thermostat,156,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"ES79",thermostat,156,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"ES79",thermostat,156,hc1.mode,operating mode,enum [night\|day\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"ES79",thermostat,156,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"ES79",thermostat,156,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"ES79",thermostat,156,hc1.mode,operating mode,enum [night\|day\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "ES79",thermostat,156,hc1.modetype,mode type,enum [night\|day], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
 "ES79",thermostat,156,hc1.daytemp,day temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_day_temperature,number.thermostat_hc1_daytemp,6,1,1/2,60,1
 "ES79",thermostat,156,hc1.nighttemp,night temperature,uint8 (>=10<=30),C,true,number.thermostat_hc1_night_temperature,number.thermostat_hc1_nighttemp,6,1,1/2,61,1
 "ES79",thermostat,156,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
 "ES79",thermostat,156,hc1.offsettemp,offset temperature,int8 (>=-5<=5),C,true,number.thermostat_hc1_offset_temperature,number.thermostat_hc1_offsettemp,6,1,1/2,10,1
 "ES79",thermostat,156,hc1.holidaytemp,holiday temperature,uint8 (>=5<=30),C,true,number.thermostat_hc1_holiday_temperature,number.thermostat_hc1_holidaytemp,6,1,1/2,62,1
-"ES79",thermostat,156,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"ES79",thermostat,156,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "ES79",thermostat,156,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1,8,1
 "ES79",thermostat,156,hc1.summermode,summer mode,enum [winter\|summer], ,false,sensor.thermostat_hc1_summer_mode,sensor.thermostat_hc1_summermode,6,1,1,22,1
 "ES79",thermostat,156,hc1.holidaymode,holiday mode,boolean, ,false,binary_sensor.thermostat_hc1_holiday_mode,binary_sensor.thermostat_hc1_holidaymode,6,1,1,63,1
 "ES79",thermostat,156,hc1.nofrosttemp,nofrost temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1,17,1
-"ES79",thermostat,156,hc1.nofrostmode,nofrost mode,enum [off\|outdoor\|room], ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
+"ES79",thermostat,156,hc1.nofrostmode,nofrost mode,enum [off\|outdoor\|room] (>=0<=0), ,true,select.thermostat_hc1_nofrost_mode,select.thermostat_hc1_nofrostmode,6,1,1,16,1
 "ES79",thermostat,156,hc1.roominfluence,room influence,uint8 (>=0<=10),C,true,number.thermostat_hc1_room_influence,number.thermostat_hc1_roominfluence,6,1,1,13,1
 "ES79",thermostat,156,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "ES79",thermostat,156,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "ES79",thermostat,156,hc1.flowtempoffset,flow temperature offset for mixer,uint8 (>=0<=20),C,true,number.thermostat_hc1_flow_temperature_offset_for_mixer,number.thermostat_hc1_flowtempoffset,6,1,1,64,1
-"ES79",thermostat,156,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"ES79",thermostat,156,hc1.reducemode,reduce mode,enum [nofrost\|reduce\|room\|outdoor], ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
-"ES79",thermostat,156,hc1.controlmode,control mode,enum [outdoor\|room], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"ES79",thermostat,156,hc1.control,control device,enum [off\|RC20\|RC3x], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"ES79",thermostat,156,hc1.holidays,holiday dates,string, ,true,sensor.thermostat_hc1_holiday_dates,sensor.thermostat_hc1_holidays,6,1,1,65,13
-"ES79",thermostat,156,hc1.vacations,vacation dates,string, ,true,sensor.thermostat_hc1_vacation_dates,sensor.thermostat_hc1_vacations,6,1,1,78,13
-"ES79",thermostat,156,hc1.program,program,enum [own 1\|family\|morning\|evening\|am\|pm\|midday\|singles\|seniors\|new\|own 2], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"ES79",thermostat,156,hc1.heatingtype,heating type,enum [off\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"ES79",thermostat,156,hc1.reducemode,reduce mode,enum [nofrost\|reduce\|room\|outdoor] (>=0<=0), ,true,select.thermostat_hc1_reduce_mode,select.thermostat_hc1_reducemode,6,1,1,31,1
+"ES79",thermostat,156,hc1.controlmode,control mode,enum [outdoor\|room] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"ES79",thermostat,156,hc1.control,control device,enum [off\|RC20\|RC3x] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"ES79",thermostat,156,hc1.holidays,holiday dates,string (>=0<=0), ,true,sensor.thermostat_hc1_holiday_dates,sensor.thermostat_hc1_holidays,6,1,1,65,13
+"ES79",thermostat,156,hc1.vacations,vacation dates,string (>=0<=0), ,true,sensor.thermostat_hc1_vacation_dates,sensor.thermostat_hc1_vacations,6,1,1,78,13
+"ES79",thermostat,156,hc1.program,program,enum [own 1\|family\|morning\|evening\|am\|pm\|midday\|singles\|seniors\|new\|own 2] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "ES79",thermostat,156,hc1.pause,pause time,uint8 (>=0<=99),hours,true,number.thermostat_hc1_pause_time,number.thermostat_hc1_pause,6,1,1,91,1
 "ES79",thermostat,156,hc1.party,party time,uint8 (>=0<=99),hours,true,number.thermostat_hc1_party_time,number.thermostat_hc1_party,6,1,1,92,1
 "ES79",thermostat,156,hc1.tempautotemp,temporary set temperature automode,uint8 (>=0<=30),C,true,number.thermostat_hc1_temporary_set_temperature_automode,number.thermostat_hc1_tempautotemp,6,1,1/2,27,1
 "ES79",thermostat,156,hc1.noreducetemp,no reduce below temperature,int8 (>=-31<=10),C,true,number.thermostat_hc1_no_reduce_below_temperature,number.thermostat_hc1_noreducetemp,6,1,1,32,1
 "ES79",thermostat,156,hc1.reducetemp,off/reduce switch temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_off/reduce_switch_temperature,number.thermostat_hc1_reducetemp,6,1,1,33,1
 "ES79",thermostat,156,hc1.vacreducetemp,vacations off/reduce switch temperature,int8 (>=-20<=10),C,true,number.thermostat_hc1_vacations_off/reduce_switch_temperature,number.thermostat_hc1_vacreducetemp,6,1,1,93,1
-"ES79",thermostat,156,hc1.vacreducemode,vacations reduce mode,enum [nofrost\|reduce\|room\|outdoor], ,true,select.thermostat_hc1_vacations_reduce_mode,select.thermostat_hc1_vacreducemode,6,1,1,94,1
+"ES79",thermostat,156,hc1.vacreducemode,vacations reduce mode,enum [nofrost\|reduce\|room\|outdoor] (>=0<=0), ,true,select.thermostat_hc1_vacations_reduce_mode,select.thermostat_hc1_vacreducemode,6,1,1,94,1
 "ES79",thermostat,156,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"ES79",thermostat,156,hc1.dhwprio,dhw priority,boolean, ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
-"ES79",thermostat,156,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"ES79",thermostat,156,hc1.switchtime1,own1 program switchtime,string, ,true,sensor.thermostat_hc1_own1_program_switchtime,sensor.thermostat_hc1_switchtime1,6,1,1,95,8
-"ES79",thermostat,156,hc1.switchtime2,own2 program switchtime,string, ,true,sensor.thermostat_hc1_own2_program_switchtime,sensor.thermostat_hc1_switchtime2,6,1,1,103,8
-"ES79",thermostat,156,dhw.mode,operating mode,enum [off\|on\|auto], ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
-"ES79",thermostat,156,dhw.circmode,circulation pump mode,enum [off\|on\|auto], ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
-"ES79",thermostat,156,dhw.progmode,program,enum [std prog\|own prog], ,true,select.thermostat_dhw_program,select.thermostat_dhw_progmode,6,9,1,13,1
-"ES79",thermostat,156,dhw.circprog,circulation program,enum [std prog\|own prog], ,true,select.thermostat_dhw_circulation_program,select.thermostat_dhw_circprog,6,9,1,14,1
-"ES79",thermostat,156,dhw.disinfecting,disinfecting,boolean, ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
-"ES79",thermostat,156,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all], ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
+"ES79",thermostat,156,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.thermostat_hc1_dhw_priority,switch.thermostat_hc1_dhwprio,6,1,1,34,1
+"ES79",thermostat,156,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"ES79",thermostat,156,hc1.switchtime1,own1 program switchtime,string (>=0<=0), ,true,sensor.thermostat_hc1_own1_program_switchtime,sensor.thermostat_hc1_switchtime1,6,1,1,95,8
+"ES79",thermostat,156,hc1.switchtime2,own2 program switchtime,string (>=0<=0), ,true,sensor.thermostat_hc1_own2_program_switchtime,sensor.thermostat_hc1_switchtime2,6,1,1,103,8
+"ES79",thermostat,156,dhw.mode,operating mode,enum [off\|on\|auto] (>=0<=0), ,true,select.thermostat_dhw_operating_mode,select.thermostat_dhw_mode,6,9,1,0,1
+"ES79",thermostat,156,dhw.circmode,circulation pump mode,enum [off\|on\|auto] (>=0<=0), ,true,select.thermostat_dhw_circulation_pump_mode,select.thermostat_dhw_circmode,6,9,1,4,1
+"ES79",thermostat,156,dhw.progmode,program,enum [std prog\|own prog] (>=0<=0), ,true,select.thermostat_dhw_program,select.thermostat_dhw_progmode,6,9,1,13,1
+"ES79",thermostat,156,dhw.circprog,circulation program,enum [std prog\|own prog] (>=0<=0), ,true,select.thermostat_dhw_circulation_program,select.thermostat_dhw_circprog,6,9,1,14,1
+"ES79",thermostat,156,dhw.disinfecting,disinfecting,boolean (>=0<=0), ,true,switch.thermostat_dhw_disinfecting,switch.thermostat_dhw_disinfecting,6,9,1,8,1
+"ES79",thermostat,156,dhw.disinfectday,disinfection day,enum [mo\|tu\|we\|th\|fr\|sa\|su\|all] (>=0<=0), ,true,select.thermostat_dhw_disinfection_day,select.thermostat_dhw_disinfectday,6,9,1,9,1
 "ES79",thermostat,156,dhw.disinfecthour,disinfection hour,uint8 (>=0<=23), ,true,number.thermostat_dhw_disinfection_hour,number.thermostat_dhw_disinfecthour,6,9,1,15,1
 "ES79",thermostat,156,dhw.maxtemp,maximum temperature,uint8 (>=60<=80),C,true,number.thermostat_dhw_maximum_temperature,number.thermostat_dhw_maxtemp,6,9,1,16,1
-"ES79",thermostat,156,dhw.onetimekey,one time key function,boolean, ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,17,1
-"ES79",thermostat,156,dhw.switchtime,program switchtime,string, ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,18,8
-"ES79",thermostat,156,dhw.circswitchtime,circulation program switchtime,string, ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,26,8
-"ES79",thermostat,156,dhw.holidays,holiday dates,string, ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,34,13
-"ES79",thermostat,156,dhw.vacations,vacation dates,string, ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,47,13
+"ES79",thermostat,156,dhw.onetimekey,one time key function,boolean (>=0<=0), ,true,switch.thermostat_dhw_one_time_key_function,switch.thermostat_dhw_onetimekey,6,9,1,17,1
+"ES79",thermostat,156,dhw.switchtime,program switchtime,string (>=0<=0), ,true,sensor.thermostat_dhw_program_switchtime,sensor.thermostat_dhw_switchtime,6,9,1,18,8
+"ES79",thermostat,156,dhw.circswitchtime,circulation program switchtime,string (>=0<=0), ,true,sensor.thermostat_dhw_circulation_program_switchtime,sensor.thermostat_dhw_circswitchtime,6,9,1,26,8
+"ES79",thermostat,156,dhw.holidays,holiday dates,string (>=0<=0), ,true,sensor.thermostat_dhw_holiday_dates,sensor.thermostat_dhw_holidays,6,9,1,34,13
+"ES79",thermostat,156,dhw.vacations,vacation dates,string (>=0<=0), ,true,sensor.thermostat_dhw_vacation_dates,sensor.thermostat_dhw_vacations,6,9,1,47,13
 "FW100",thermostat,105,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "FW100",thermostat,105,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"FW100",thermostat,105,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"FW100",thermostat,105,display,display,enum [dhw temperature\|date\|external temperature], ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
-"FW100",thermostat,105,language,language,enum [german\|italian\|french\|dutch], ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
-"FW100",thermostat,105,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"FW100",thermostat,105,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"FW100",thermostat,105,display,display,enum [dhw temperature\|date\|external temperature] (>=0<=0), ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
+"FW100",thermostat,105,language,language,enum [german\|italian\|french\|dutch] (>=0<=0), ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
+"FW100",thermostat,105,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "FW100",thermostat,105,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "FW100",thermostat,105,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "FW100",thermostat,105,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
@@ -4888,36 +4888,36 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "FW100",thermostat,105,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "FW100",thermostat,105,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
 "FW100",thermostat,105,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/10,0,1
-"FW100",thermostat,105,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"FW100",thermostat,105,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"FW100",thermostat,105,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"FW100",thermostat,105,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"FW100",thermostat,105,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"FW100",thermostat,105,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "FW100",thermostat,105,hc1.modetype,mode type,enum [nofrost\|eco\|heat], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"FW100",thermostat,105,hc1.heattemp,heat temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
-"FW100",thermostat,105,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"FW100",thermostat,105,hc1.nofrosttemp,nofrost temperature,int8 (>=-63<=63),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
-"FW100",thermostat,105,hc1.control,control device,enum [off\|FB10\|FB100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"FW100",thermostat,105,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"FW100",thermostat,105,hc1.heattemp,heat temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
+"FW100",thermostat,105,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"FW100",thermostat,105,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
+"FW100",thermostat,105,hc1.control,control device,enum [off\|FB10\|FB100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"FW100",thermostat,105,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "FW100",thermostat,105,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"FW100",thermostat,105,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"FW100",thermostat,105,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "FW100",thermostat,105,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1/2,8,1
-"FW100",thermostat,105,hc1.roomsensor,room sensor,enum [extern\|intern\|auto], ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
-"FW100",thermostat,105,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
-"FW100",thermostat,105,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"FW100",thermostat,105,hc1.heatup,heatup,enum [slow\|medium\|fast], ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
+"FW100",thermostat,105,hc1.roomsensor,room sensor,enum [extern\|intern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
+"FW100",thermostat,105,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
+"FW100",thermostat,105,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"FW100",thermostat,105,hc1.heatup,heatup,enum [slow\|medium\|fast] (>=0<=0), ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
 "FW100",thermostat,105,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "FW100",thermostat,105,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "FW100",thermostat,105,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"FW100",thermostat,105,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto], ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
-"FW100",thermostat,105,hc1.roominflfactor,room influence factor,uint8 (>=0<=100),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
-"FW100",thermostat,105,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"FW100",thermostat,105,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"FW100",thermostat,105,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"FW100",thermostat,105,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
+"FW100",thermostat,105,hc1.roominflfactor,room influence factor,uint8 (>=0<=0),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
+"FW100",thermostat,105,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"FW100",thermostat,105,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"FW100",thermostat,105,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "FW200",thermostat,106,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "FW200",thermostat,106,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"FW200",thermostat,106,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"FW200",thermostat,106,display,display,enum [dhw temperature\|date\|external temperature], ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
-"FW200",thermostat,106,language,language,enum [german\|italian\|french\|dutch], ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
-"FW200",thermostat,106,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"FW200",thermostat,106,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"FW200",thermostat,106,display,display,enum [dhw temperature\|date\|external temperature] (>=0<=0), ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
+"FW200",thermostat,106,language,language,enum [german\|italian\|french\|dutch] (>=0<=0), ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
+"FW200",thermostat,106,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "FW200",thermostat,106,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "FW200",thermostat,106,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "FW200",thermostat,106,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
@@ -4925,34 +4925,34 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "FW200",thermostat,106,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "FW200",thermostat,106,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
 "FW200",thermostat,106,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/10,0,1
-"FW200",thermostat,106,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"FW200",thermostat,106,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"FW200",thermostat,106,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"FW200",thermostat,106,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"FW200",thermostat,106,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"FW200",thermostat,106,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "FW200",thermostat,106,hc1.modetype,mode type,enum [nofrost\|eco\|heat], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"FW200",thermostat,106,hc1.heattemp,heat temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
-"FW200",thermostat,106,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"FW200",thermostat,106,hc1.nofrosttemp,nofrost temperature,int8 (>=-63<=63),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
-"FW200",thermostat,106,hc1.control,control device,enum [off\|FB10\|FB100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"FW200",thermostat,106,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"FW200",thermostat,106,hc1.heattemp,heat temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
+"FW200",thermostat,106,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"FW200",thermostat,106,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
+"FW200",thermostat,106,hc1.control,control device,enum [off\|FB10\|FB100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"FW200",thermostat,106,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "FW200",thermostat,106,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"FW200",thermostat,106,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"FW200",thermostat,106,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "FW200",thermostat,106,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1/2,8,1
-"FW200",thermostat,106,hc1.roomsensor,room sensor,enum [extern\|intern\|auto], ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
-"FW200",thermostat,106,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
-"FW200",thermostat,106,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"FW200",thermostat,106,hc1.heatup,heatup,enum [slow\|medium\|fast], ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
+"FW200",thermostat,106,hc1.roomsensor,room sensor,enum [extern\|intern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
+"FW200",thermostat,106,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
+"FW200",thermostat,106,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"FW200",thermostat,106,hc1.heatup,heatup,enum [slow\|medium\|fast] (>=0<=0), ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
 "FW200",thermostat,106,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "FW200",thermostat,106,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "FW200",thermostat,106,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"FW200",thermostat,106,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto], ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
-"FW200",thermostat,106,hc1.roominflfactor,room influence factor,uint8 (>=0<=100),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
-"FW200",thermostat,106,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"FW200",thermostat,106,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"FW200",thermostat,106,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"FW200",thermostat,106,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
+"FW200",thermostat,106,hc1.roominflfactor,room influence factor,uint8 (>=0<=0),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
+"FW200",thermostat,106,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"FW200",thermostat,106,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"FW200",thermostat,106,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "FR100",thermostat,107,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "FR100",thermostat,107,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "FR100",thermostat,107,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"FR100",thermostat,107,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"FR100",thermostat,107,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "FR100",thermostat,107,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "FR100",thermostat,107,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "FR100",thermostat,107,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
@@ -4960,34 +4960,34 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "FR100",thermostat,107,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "FR100",thermostat,107,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
 "FR100",thermostat,107,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/10,0,1
-"FR100",thermostat,107,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"FR100",thermostat,107,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"FR100",thermostat,107,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"FR100",thermostat,107,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"FR100",thermostat,107,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"FR100",thermostat,107,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "FR100",thermostat,107,hc1.modetype,mode type,enum [nofrost\|eco\|heat], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"FR100",thermostat,107,hc1.heattemp,heat temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
-"FR100",thermostat,107,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"FR100",thermostat,107,hc1.nofrosttemp,nofrost temperature,int8 (>=-63<=63),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
-"FR100",thermostat,107,hc1.control,control device,enum [off\|FB10\|FB100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"FR100",thermostat,107,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"FR100",thermostat,107,hc1.heattemp,heat temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
+"FR100",thermostat,107,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"FR100",thermostat,107,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
+"FR100",thermostat,107,hc1.control,control device,enum [off\|FB10\|FB100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"FR100",thermostat,107,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "FR100",thermostat,107,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"FR100",thermostat,107,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"FR100",thermostat,107,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "FR100",thermostat,107,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1/2,8,1
-"FR100",thermostat,107,hc1.roomsensor,room sensor,enum [extern\|intern\|auto], ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
-"FR100",thermostat,107,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
-"FR100",thermostat,107,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"FR100",thermostat,107,hc1.heatup,heatup,enum [slow\|medium\|fast], ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
+"FR100",thermostat,107,hc1.roomsensor,room sensor,enum [extern\|intern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
+"FR100",thermostat,107,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
+"FR100",thermostat,107,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"FR100",thermostat,107,hc1.heatup,heatup,enum [slow\|medium\|fast] (>=0<=0), ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
 "FR100",thermostat,107,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "FR100",thermostat,107,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "FR100",thermostat,107,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"FR100",thermostat,107,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto], ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
-"FR100",thermostat,107,hc1.roominflfactor,room influence factor,uint8 (>=0<=100),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
-"FR100",thermostat,107,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"FR100",thermostat,107,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"FR100",thermostat,107,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"FR100",thermostat,107,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
+"FR100",thermostat,107,hc1.roominflfactor,room influence factor,uint8 (>=0<=0),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
+"FR100",thermostat,107,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"FR100",thermostat,107,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"FR100",thermostat,107,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "FR110",thermostat,108,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "FR110",thermostat,108,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "FR110",thermostat,108,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"FR110",thermostat,108,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"FR110",thermostat,108,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "FR110",thermostat,108,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "FR110",thermostat,108,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "FR110",thermostat,108,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
@@ -4995,36 +4995,36 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "FR110",thermostat,108,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "FR110",thermostat,108,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
 "FR110",thermostat,108,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/10,0,1
-"FR110",thermostat,108,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"FR110",thermostat,108,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"FR110",thermostat,108,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"FR110",thermostat,108,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"FR110",thermostat,108,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"FR110",thermostat,108,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "FR110",thermostat,108,hc1.modetype,mode type,enum [nofrost\|eco\|heat], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"FR110",thermostat,108,hc1.heattemp,heat temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
-"FR110",thermostat,108,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"FR110",thermostat,108,hc1.nofrosttemp,nofrost temperature,int8 (>=-63<=63),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
-"FR110",thermostat,108,hc1.control,control device,enum [off\|FB10\|FB100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"FR110",thermostat,108,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"FR110",thermostat,108,hc1.heattemp,heat temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
+"FR110",thermostat,108,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"FR110",thermostat,108,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
+"FR110",thermostat,108,hc1.control,control device,enum [off\|FB10\|FB100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"FR110",thermostat,108,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "FR110",thermostat,108,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"FR110",thermostat,108,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"FR110",thermostat,108,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "FR110",thermostat,108,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1/2,8,1
-"FR110",thermostat,108,hc1.roomsensor,room sensor,enum [extern\|intern\|auto], ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
-"FR110",thermostat,108,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
-"FR110",thermostat,108,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"FR110",thermostat,108,hc1.heatup,heatup,enum [slow\|medium\|fast], ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
+"FR110",thermostat,108,hc1.roomsensor,room sensor,enum [extern\|intern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
+"FR110",thermostat,108,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
+"FR110",thermostat,108,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"FR110",thermostat,108,hc1.heatup,heatup,enum [slow\|medium\|fast] (>=0<=0), ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
 "FR110",thermostat,108,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "FR110",thermostat,108,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "FR110",thermostat,108,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"FR110",thermostat,108,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto], ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
-"FR110",thermostat,108,hc1.roominflfactor,room influence factor,uint8 (>=0<=100),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
-"FR110",thermostat,108,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"FR110",thermostat,108,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"FR110",thermostat,108,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"FR110",thermostat,108,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
+"FR110",thermostat,108,hc1.roominflfactor,room influence factor,uint8 (>=0<=0),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
+"FR110",thermostat,108,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"FR110",thermostat,108,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"FR110",thermostat,108,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "FB10",thermostat,109,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "FB10",thermostat,109,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"FB10",thermostat,109,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"FB10",thermostat,109,display,display,enum [dhw temperature\|date\|external temperature], ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
-"FB10",thermostat,109,language,language,enum [german\|italian\|french\|dutch], ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
-"FB10",thermostat,109,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"FB10",thermostat,109,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"FB10",thermostat,109,display,display,enum [dhw temperature\|date\|external temperature] (>=0<=0), ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
+"FB10",thermostat,109,language,language,enum [german\|italian\|french\|dutch] (>=0<=0), ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
+"FB10",thermostat,109,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "FB10",thermostat,109,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "FB10",thermostat,109,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "FB10",thermostat,109,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
@@ -5032,36 +5032,36 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "FB10",thermostat,109,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "FB10",thermostat,109,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
 "FB10",thermostat,109,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/10,0,1
-"FB10",thermostat,109,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"FB10",thermostat,109,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"FB10",thermostat,109,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"FB10",thermostat,109,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"FB10",thermostat,109,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"FB10",thermostat,109,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "FB10",thermostat,109,hc1.modetype,mode type,enum [nofrost\|eco\|heat], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"FB10",thermostat,109,hc1.heattemp,heat temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
-"FB10",thermostat,109,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"FB10",thermostat,109,hc1.nofrosttemp,nofrost temperature,int8 (>=-63<=63),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
-"FB10",thermostat,109,hc1.control,control device,enum [off\|FB10\|FB100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"FB10",thermostat,109,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"FB10",thermostat,109,hc1.heattemp,heat temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
+"FB10",thermostat,109,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"FB10",thermostat,109,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
+"FB10",thermostat,109,hc1.control,control device,enum [off\|FB10\|FB100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"FB10",thermostat,109,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "FB10",thermostat,109,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"FB10",thermostat,109,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"FB10",thermostat,109,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "FB10",thermostat,109,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1/2,8,1
-"FB10",thermostat,109,hc1.roomsensor,room sensor,enum [extern\|intern\|auto], ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
-"FB10",thermostat,109,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
-"FB10",thermostat,109,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"FB10",thermostat,109,hc1.heatup,heatup,enum [slow\|medium\|fast], ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
+"FB10",thermostat,109,hc1.roomsensor,room sensor,enum [extern\|intern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
+"FB10",thermostat,109,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
+"FB10",thermostat,109,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"FB10",thermostat,109,hc1.heatup,heatup,enum [slow\|medium\|fast] (>=0<=0), ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
 "FB10",thermostat,109,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "FB10",thermostat,109,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "FB10",thermostat,109,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"FB10",thermostat,109,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto], ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
-"FB10",thermostat,109,hc1.roominflfactor,room influence factor,uint8 (>=0<=100),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
-"FB10",thermostat,109,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"FB10",thermostat,109,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"FB10",thermostat,109,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"FB10",thermostat,109,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
+"FB10",thermostat,109,hc1.roominflfactor,room influence factor,uint8 (>=0<=0),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
+"FB10",thermostat,109,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"FB10",thermostat,109,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"FB10",thermostat,109,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "FB100",thermostat,110,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "FB100",thermostat,110,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"FB100",thermostat,110,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"FB100",thermostat,110,display,display,enum [dhw temperature\|date\|external temperature], ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
-"FB100",thermostat,110,language,language,enum [german\|italian\|french\|dutch], ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
-"FB100",thermostat,110,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"FB100",thermostat,110,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"FB100",thermostat,110,display,display,enum [dhw temperature\|date\|external temperature] (>=0<=0), ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
+"FB100",thermostat,110,language,language,enum [german\|italian\|french\|dutch] (>=0<=0), ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
+"FB100",thermostat,110,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "FB100",thermostat,110,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "FB100",thermostat,110,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "FB100",thermostat,110,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
@@ -5069,34 +5069,34 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "FB100",thermostat,110,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "FB100",thermostat,110,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
 "FB100",thermostat,110,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/10,0,1
-"FB100",thermostat,110,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"FB100",thermostat,110,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"FB100",thermostat,110,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"FB100",thermostat,110,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"FB100",thermostat,110,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"FB100",thermostat,110,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "FB100",thermostat,110,hc1.modetype,mode type,enum [nofrost\|eco\|heat], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"FB100",thermostat,110,hc1.heattemp,heat temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
-"FB100",thermostat,110,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"FB100",thermostat,110,hc1.nofrosttemp,nofrost temperature,int8 (>=-63<=63),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
-"FB100",thermostat,110,hc1.control,control device,enum [off\|FB10\|FB100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"FB100",thermostat,110,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"FB100",thermostat,110,hc1.heattemp,heat temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
+"FB100",thermostat,110,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"FB100",thermostat,110,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
+"FB100",thermostat,110,hc1.control,control device,enum [off\|FB10\|FB100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"FB100",thermostat,110,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "FB100",thermostat,110,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"FB100",thermostat,110,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"FB100",thermostat,110,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "FB100",thermostat,110,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1/2,8,1
-"FB100",thermostat,110,hc1.roomsensor,room sensor,enum [extern\|intern\|auto], ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
-"FB100",thermostat,110,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
-"FB100",thermostat,110,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"FB100",thermostat,110,hc1.heatup,heatup,enum [slow\|medium\|fast], ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
+"FB100",thermostat,110,hc1.roomsensor,room sensor,enum [extern\|intern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
+"FB100",thermostat,110,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
+"FB100",thermostat,110,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"FB100",thermostat,110,hc1.heatup,heatup,enum [slow\|medium\|fast] (>=0<=0), ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
 "FB100",thermostat,110,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "FB100",thermostat,110,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "FB100",thermostat,110,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"FB100",thermostat,110,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto], ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
-"FB100",thermostat,110,hc1.roominflfactor,room influence factor,uint8 (>=0<=100),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
-"FB100",thermostat,110,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"FB100",thermostat,110,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"FB100",thermostat,110,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"FB100",thermostat,110,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
+"FB100",thermostat,110,hc1.roominflfactor,room influence factor,uint8 (>=0<=0),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
+"FB100",thermostat,110,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"FB100",thermostat,110,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"FB100",thermostat,110,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "FR10",thermostat,111,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "FR10",thermostat,111,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "FR10",thermostat,111,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"FR10",thermostat,111,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"FR10",thermostat,111,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "FR10",thermostat,111,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "FR10",thermostat,111,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "FR10",thermostat,111,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
@@ -5104,36 +5104,36 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "FR10",thermostat,111,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "FR10",thermostat,111,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
 "FR10",thermostat,111,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/10,0,1
-"FR10",thermostat,111,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"FR10",thermostat,111,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"FR10",thermostat,111,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"FR10",thermostat,111,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"FR10",thermostat,111,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"FR10",thermostat,111,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "FR10",thermostat,111,hc1.modetype,mode type,enum [nofrost\|eco\|heat], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"FR10",thermostat,111,hc1.heattemp,heat temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
-"FR10",thermostat,111,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"FR10",thermostat,111,hc1.nofrosttemp,nofrost temperature,int8 (>=-63<=63),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
-"FR10",thermostat,111,hc1.control,control device,enum [off\|FB10\|FB100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"FR10",thermostat,111,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"FR10",thermostat,111,hc1.heattemp,heat temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
+"FR10",thermostat,111,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"FR10",thermostat,111,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
+"FR10",thermostat,111,hc1.control,control device,enum [off\|FB10\|FB100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"FR10",thermostat,111,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "FR10",thermostat,111,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"FR10",thermostat,111,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"FR10",thermostat,111,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "FR10",thermostat,111,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1/2,8,1
-"FR10",thermostat,111,hc1.roomsensor,room sensor,enum [extern\|intern\|auto], ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
-"FR10",thermostat,111,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
-"FR10",thermostat,111,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"FR10",thermostat,111,hc1.heatup,heatup,enum [slow\|medium\|fast], ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
+"FR10",thermostat,111,hc1.roomsensor,room sensor,enum [extern\|intern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
+"FR10",thermostat,111,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
+"FR10",thermostat,111,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"FR10",thermostat,111,hc1.heatup,heatup,enum [slow\|medium\|fast] (>=0<=0), ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
 "FR10",thermostat,111,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "FR10",thermostat,111,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "FR10",thermostat,111,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"FR10",thermostat,111,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto], ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
-"FR10",thermostat,111,hc1.roominflfactor,room influence factor,uint8 (>=0<=100),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
-"FR10",thermostat,111,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"FR10",thermostat,111,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"FR10",thermostat,111,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"FR10",thermostat,111,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
+"FR10",thermostat,111,hc1.roominflfactor,room influence factor,uint8 (>=0<=0),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
+"FR10",thermostat,111,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"FR10",thermostat,111,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"FR10",thermostat,111,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "FW500",thermostat,116,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "FW500",thermostat,116,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"FW500",thermostat,116,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"FW500",thermostat,116,display,display,enum [dhw temperature\|date\|external temperature], ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
-"FW500",thermostat,116,language,language,enum [german\|italian\|french\|dutch], ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
-"FW500",thermostat,116,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"FW500",thermostat,116,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"FW500",thermostat,116,display,display,enum [dhw temperature\|date\|external temperature] (>=0<=0), ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
+"FW500",thermostat,116,language,language,enum [german\|italian\|french\|dutch] (>=0<=0), ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
+"FW500",thermostat,116,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "FW500",thermostat,116,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "FW500",thermostat,116,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "FW500",thermostat,116,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
@@ -5141,34 +5141,34 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "FW500",thermostat,116,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "FW500",thermostat,116,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
 "FW500",thermostat,116,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/10,0,1
-"FW500",thermostat,116,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"FW500",thermostat,116,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"FW500",thermostat,116,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"FW500",thermostat,116,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"FW500",thermostat,116,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"FW500",thermostat,116,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "FW500",thermostat,116,hc1.modetype,mode type,enum [nofrost\|eco\|heat], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"FW500",thermostat,116,hc1.heattemp,heat temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
-"FW500",thermostat,116,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"FW500",thermostat,116,hc1.nofrosttemp,nofrost temperature,int8 (>=-63<=63),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
-"FW500",thermostat,116,hc1.control,control device,enum [off\|FB10\|FB100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"FW500",thermostat,116,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"FW500",thermostat,116,hc1.heattemp,heat temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
+"FW500",thermostat,116,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"FW500",thermostat,116,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
+"FW500",thermostat,116,hc1.control,control device,enum [off\|FB10\|FB100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"FW500",thermostat,116,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "FW500",thermostat,116,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"FW500",thermostat,116,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"FW500",thermostat,116,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "FW500",thermostat,116,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1/2,8,1
-"FW500",thermostat,116,hc1.roomsensor,room sensor,enum [extern\|intern\|auto], ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
-"FW500",thermostat,116,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
-"FW500",thermostat,116,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"FW500",thermostat,116,hc1.heatup,heatup,enum [slow\|medium\|fast], ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
+"FW500",thermostat,116,hc1.roomsensor,room sensor,enum [extern\|intern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
+"FW500",thermostat,116,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
+"FW500",thermostat,116,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"FW500",thermostat,116,hc1.heatup,heatup,enum [slow\|medium\|fast] (>=0<=0), ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
 "FW500",thermostat,116,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "FW500",thermostat,116,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "FW500",thermostat,116,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"FW500",thermostat,116,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto], ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
-"FW500",thermostat,116,hc1.roominflfactor,room influence factor,uint8 (>=0<=100),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
-"FW500",thermostat,116,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"FW500",thermostat,116,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"FW500",thermostat,116,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"FW500",thermostat,116,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
+"FW500",thermostat,116,hc1.roominflfactor,room influence factor,uint8 (>=0<=0),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
+"FW500",thermostat,116,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"FW500",thermostat,116,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"FW500",thermostat,116,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "FR50",thermostat,147,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "FR50",thermostat,147,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "FR50",thermostat,147,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"FR50",thermostat,147,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"FR50",thermostat,147,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "FR50",thermostat,147,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "FR50",thermostat,147,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "FR50",thermostat,147,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
@@ -5176,34 +5176,34 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "FR50",thermostat,147,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "FR50",thermostat,147,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
 "FR50",thermostat,147,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/10,0,1
-"FR50",thermostat,147,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"FR50",thermostat,147,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"FR50",thermostat,147,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"FR50",thermostat,147,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"FR50",thermostat,147,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"FR50",thermostat,147,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "FR50",thermostat,147,hc1.modetype,mode type,enum [nofrost\|eco\|heat], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"FR50",thermostat,147,hc1.heattemp,heat temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
-"FR50",thermostat,147,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"FR50",thermostat,147,hc1.nofrosttemp,nofrost temperature,int8 (>=-63<=63),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
-"FR50",thermostat,147,hc1.control,control device,enum [off\|FB10\|FB100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"FR50",thermostat,147,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"FR50",thermostat,147,hc1.heattemp,heat temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
+"FR50",thermostat,147,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"FR50",thermostat,147,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
+"FR50",thermostat,147,hc1.control,control device,enum [off\|FB10\|FB100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"FR50",thermostat,147,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "FR50",thermostat,147,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"FR50",thermostat,147,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"FR50",thermostat,147,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "FR50",thermostat,147,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1/2,8,1
-"FR50",thermostat,147,hc1.roomsensor,room sensor,enum [extern\|intern\|auto], ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
-"FR50",thermostat,147,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
-"FR50",thermostat,147,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"FR50",thermostat,147,hc1.heatup,heatup,enum [slow\|medium\|fast], ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
+"FR50",thermostat,147,hc1.roomsensor,room sensor,enum [extern\|intern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
+"FR50",thermostat,147,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
+"FR50",thermostat,147,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"FR50",thermostat,147,hc1.heatup,heatup,enum [slow\|medium\|fast] (>=0<=0), ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
 "FR50",thermostat,147,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "FR50",thermostat,147,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "FR50",thermostat,147,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"FR50",thermostat,147,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto], ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
-"FR50",thermostat,147,hc1.roominflfactor,room influence factor,uint8 (>=0<=100),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
-"FR50",thermostat,147,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"FR50",thermostat,147,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"FR50",thermostat,147,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"FR50",thermostat,147,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
+"FR50",thermostat,147,hc1.roominflfactor,room influence factor,uint8 (>=0<=0),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
+"FR50",thermostat,147,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"FR50",thermostat,147,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"FR50",thermostat,147,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "FR120",thermostat,191,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "FR120",thermostat,191,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "FR120",thermostat,191,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"FR120",thermostat,191,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"FR120",thermostat,191,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "FR120",thermostat,191,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "FR120",thermostat,191,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "FR120",thermostat,191,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
@@ -5211,36 +5211,36 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "FR120",thermostat,191,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "FR120",thermostat,191,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
 "FR120",thermostat,191,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/10,0,1
-"FR120",thermostat,191,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"FR120",thermostat,191,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"FR120",thermostat,191,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"FR120",thermostat,191,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"FR120",thermostat,191,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"FR120",thermostat,191,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "FR120",thermostat,191,hc1.modetype,mode type,enum [nofrost\|eco\|heat], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"FR120",thermostat,191,hc1.heattemp,heat temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
-"FR120",thermostat,191,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"FR120",thermostat,191,hc1.nofrosttemp,nofrost temperature,int8 (>=-63<=63),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
-"FR120",thermostat,191,hc1.control,control device,enum [off\|FB10\|FB100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"FR120",thermostat,191,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"FR120",thermostat,191,hc1.heattemp,heat temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
+"FR120",thermostat,191,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"FR120",thermostat,191,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
+"FR120",thermostat,191,hc1.control,control device,enum [off\|FB10\|FB100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"FR120",thermostat,191,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "FR120",thermostat,191,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"FR120",thermostat,191,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"FR120",thermostat,191,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "FR120",thermostat,191,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1/2,8,1
-"FR120",thermostat,191,hc1.roomsensor,room sensor,enum [extern\|intern\|auto], ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
-"FR120",thermostat,191,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
-"FR120",thermostat,191,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"FR120",thermostat,191,hc1.heatup,heatup,enum [slow\|medium\|fast], ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
+"FR120",thermostat,191,hc1.roomsensor,room sensor,enum [extern\|intern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
+"FR120",thermostat,191,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
+"FR120",thermostat,191,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"FR120",thermostat,191,hc1.heatup,heatup,enum [slow\|medium\|fast] (>=0<=0), ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
 "FR120",thermostat,191,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "FR120",thermostat,191,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "FR120",thermostat,191,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"FR120",thermostat,191,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto], ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
-"FR120",thermostat,191,hc1.roominflfactor,room influence factor,uint8 (>=0<=100),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
-"FR120",thermostat,191,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"FR120",thermostat,191,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"FR120",thermostat,191,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"FR120",thermostat,191,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
+"FR120",thermostat,191,hc1.roominflfactor,room influence factor,uint8 (>=0<=0),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
+"FR120",thermostat,191,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"FR120",thermostat,191,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"FR120",thermostat,191,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "FW120",thermostat,192,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "FW120",thermostat,192,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
-"FW120",thermostat,192,datetime,date/time,string, ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
-"FW120",thermostat,192,display,display,enum [dhw temperature\|date\|external temperature], ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
-"FW120",thermostat,192,language,language,enum [german\|italian\|french\|dutch], ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
-"FW120",thermostat,192,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix], ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
+"FW120",thermostat,192,datetime,date/time,string (>=0<=0), ,true,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
+"FW120",thermostat,192,display,display,enum [dhw temperature\|date\|external temperature] (>=0<=0), ,true,select.thermostat_display,select.thermostat_display,6,0,1,65,1
+"FW120",thermostat,192,language,language,enum [german\|italian\|french\|dutch] (>=0<=0), ,true,select.thermostat_language,select.thermostat_language,6,0,1,66,1
+"FW120",thermostat,192,hybridstrategy,hybrid control strategy,enum [co2 optimized\|cost optimized\|outside temp switched\|co2 cost mix] (>=0<=0), ,true,select.thermostat_hybrid_control_strategy,select.thermostat_hybridstrategy,6,0,1,54,1
 "FW120",thermostat,192,switchovertemp,outside switchover temperature,int8 (>=-20<=20),C,true,number.thermostat_outside_switchover_temperature,number.thermostat_switchovertemp,6,0,1,55,1
 "FW120",thermostat,192,energycostratio,energy cost ratio,uint8 (>=0<=20), ,true,number.thermostat_energy_cost_ratio,number.thermostat_energycostratio,6,0,1/10,56,1
 "FW120",thermostat,192,fossilefactor,fossile energy factor,uint8 (>=0<=5), ,true,number.thermostat_fossile_energy_factor,number.thermostat_fossilefactor,6,0,1/10,57,1
@@ -5248,665 +5248,665 @@ device name,device type,product id,shortname,fullname,type [options...] \| (min/
 "FW120",thermostat,192,delayboiler,delay boiler support,uint8 (>=5<=120),minutes,true,number.thermostat_delay_boiler_support,number.thermostat_delayboiler,6,0,1,59,1
 "FW120",thermostat,192,tempdiffboiler,temp diff boiler support,uint8 (>=1<=99),C,true,number.thermostat_temp_diff_boiler_support,number.thermostat_tempdiffboiler,6,0,1,60,1
 "FW120",thermostat,192,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/10,0,1
-"FW120",thermostat,192,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"FW120",thermostat,192,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"FW120",thermostat,192,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
+"FW120",thermostat,192,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"FW120",thermostat,192,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"FW120",thermostat,192,hc1.mode,operating mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_operating_mode,select.thermostat_hc1_mode,6,1,1,3,1
 "FW120",thermostat,192,hc1.modetype,mode type,enum [nofrost\|eco\|heat], ,false,sensor.thermostat_hc1_mode_type,sensor.thermostat_hc1_modetype,6,1,1,4,1
-"FW120",thermostat,192,hc1.heattemp,heat temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
-"FW120",thermostat,192,hc1.ecotemp,eco temperature,uint8 (>=0<=127),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
-"FW120",thermostat,192,hc1.nofrosttemp,nofrost temperature,int8 (>=-63<=63),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
-"FW120",thermostat,192,hc1.control,control device,enum [off\|FB10\|FB100], ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
-"FW120",thermostat,192,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f], ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
+"FW120",thermostat,192,hc1.heattemp,heat temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_heat_temperature,number.thermostat_hc1_heattemp,6,1,1/2,202,1
+"FW120",thermostat,192,hc1.ecotemp,eco temperature,uint8 (>=0<=0),C,true,number.thermostat_hc1_eco_temperature,number.thermostat_hc1_ecotemp,6,1,1/2,5,1
+"FW120",thermostat,192,hc1.nofrosttemp,nofrost temperature,int8 (>=0<=0),C,true,number.thermostat_hc1_nofrost_temperature,number.thermostat_hc1_nofrosttemp,6,1,1/2,17,1
+"FW120",thermostat,192,hc1.control,control device,enum [off\|FB10\|FB100] (>=0<=0), ,true,select.thermostat_hc1_control_device,select.thermostat_hc1_control,6,1,1,41,1
+"FW120",thermostat,192,hc1.program,program,enum [prog a\|prog b\|prog c\|prog d\|prog e\|prog f] (>=0<=0), ,true,select.thermostat_hc1_program,select.thermostat_hc1_program,6,1,1,26,1
 "FW120",thermostat,192,hc1.remotetemp,room temperature from remote,cmd [] (>=-1<=101),C,true,sensor.thermostat_hc1_room_temperature_from_remote,sensor.thermostat_hc1_remotetemp,6,1,1/10,42,1
-"FW120",thermostat,192,hc1.targetflowtemp,target flow temperature,uint8 (>=0<=254),C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
+"FW120",thermostat,192,hc1.targetflowtemp,target flow temperature,uint8,C,false,sensor.thermostat_hc1_target_flow_temperature,sensor.thermostat_hc1_targetflowtemp,6,1,1,18,1
 "FW120",thermostat,192,hc1.summertemp,summer temperature,uint8 (>=9<=25),C,true,number.thermostat_hc1_summer_temperature,number.thermostat_hc1_summertemp,6,1,1/2,8,1
-"FW120",thermostat,192,hc1.roomsensor,room sensor,enum [extern\|intern\|auto], ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
-"FW120",thermostat,192,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto], ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
-"FW120",thermostat,192,hc1.switchonoptimization,switch-on optimization,boolean, ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
-"FW120",thermostat,192,hc1.heatup,heatup,enum [slow\|medium\|fast], ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
+"FW120",thermostat,192,hc1.roomsensor,room sensor,enum [extern\|intern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_sensor,select.thermostat_hc1_roomsensor,6,1,1,203,1
+"FW120",thermostat,192,hc1.holidaymode,holiday mode,enum [nofrost\|eco\|heat\|auto] (>=0<=0), ,true,select.thermostat_hc1_holiday_mode,select.thermostat_hc1_holidaymode,6,1,1,63,1
+"FW120",thermostat,192,hc1.switchonoptimization,switch-on optimization,boolean (>=0<=0), ,true,switch.thermostat_hc1_switch-on_optimization,switch.thermostat_hc1_switchonoptimization,6,1,1,30,1
+"FW120",thermostat,192,hc1.heatup,heatup,enum [slow\|medium\|fast] (>=0<=0), ,true,select.thermostat_hc1_heatup,select.thermostat_hc1_heatup,6,1,1,204,1
 "FW120",thermostat,192,hc1.minflowtemp,min flow temperature,uint8 (>=5<=70),C,true,number.thermostat_hc1_min_flow_temperature,number.thermostat_hc1_minflowtemp,6,1,1,11,1
 "FW120",thermostat,192,hc1.maxflowtemp,max flow temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_max_flow_temperature,number.thermostat_hc1_maxflowtemp,6,1,1,12,1
 "FW120",thermostat,192,hc1.designtemp,design temperature,uint8 (>=30<=90),C,true,number.thermostat_hc1_design_temperature,number.thermostat_hc1_designtemp,6,1,1,9,1
-"FW120",thermostat,192,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto], ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
-"FW120",thermostat,192,hc1.roominflfactor,room influence factor,uint8 (>=0<=100),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
-"FW120",thermostat,192,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor], ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
-"FW120",thermostat,192,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM], ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
-"FW120",thermostat,192,dhw.charge,charge,boolean, ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
+"FW120",thermostat,192,hc1.roominfluence,room influence,enum [off\|intern\|extern\|auto] (>=0<=0), ,true,select.thermostat_hc1_room_influence,select.thermostat_hc1_roominfluence,6,1,1,13,1
+"FW120",thermostat,192,hc1.roominflfactor,room influence factor,uint8 (>=0<=0),%,true,number.thermostat_hc1_room_influence_factor,number.thermostat_hc1_roominflfactor,6,1,10,14,1
+"FW120",thermostat,192,hc1.heatingtype,heating type,enum [off\|heatingcurve\|radiator\|convector\|floor] (>=0<=0), ,true,select.thermostat_hc1_heating_type,select.thermostat_hc1_heatingtype,6,1,1,19,1
+"FW120",thermostat,192,hc1.controlmode,control mode,enum [off\|unmixed\|unmixed IPM\|mixed IPM] (>=0<=0), ,true,select.thermostat_hc1_control_mode,select.thermostat_hc1_controlmode,6,1,1,25,1
+"FW120",thermostat,192,dhw.charge,charge,boolean (>=0<=0), ,true,switch.thermostat_dhw_charge,switch.thermostat_dhw_charge,6,9,1,6,1
 "RT800, RC220",thermostat,3,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RT800, RC220",thermostat,3,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "RT800, RC220",thermostat,3,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
 "RT800, RC220",thermostat,3,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RT800, RC220",thermostat,3,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RT800, RC220",thermostat,3,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RT800, RC220",thermostat,3,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RT800, RC220",thermostat,3,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
 "RC100H, CR10H",thermostat,200,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC100H, CR10H",thermostat,200,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "RC100H, CR10H",thermostat,200,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
 "RC100H, CR10H",thermostat,200,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC100H, CR10H",thermostat,200,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC100H, CR10H",thermostat,200,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"RC100H, CR10H",thermostat,200,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC100H, CR10H",thermostat,200,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
 "RC120RF, TR120RF, CR20RF",thermostat,249,errorcode,error code,string, ,false,sensor.thermostat_error_code,sensor.thermostat_errorcode,6,0,1,0,8
 "RC120RF, TR120RF, CR20RF",thermostat,249,lastcode,last error code,string, ,false,sensor.thermostat_last_error_code,sensor.thermostat_lastcode,6,0,1,8,25
 "RC120RF, TR120RF, CR20RF",thermostat,249,datetime,date/time,string, ,false,sensor.thermostat_date/time,sensor.thermostat_datetime,6,0,1,33,13
 "RC120RF, TR120RF, CR20RF",thermostat,249,hc1.seltemp,selected room temperature,int16 (>=0<=30),C,true,number.thermostat_hc1_selected_room_temperature,number.thermostat_hc1_seltemp,6,1,1/2,0,1
-"RC120RF, TR120RF, CR20RF",thermostat,249,hc1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
-"RC120RF, TR120RF, CR20RF",thermostat,249,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp] (>=5<=30), ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
-"XCUMixer",mixer,8,hc1.flowtemphc,flow temperature (TC1),uint16 (>=0<=3199),C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
-"XCUMixer",mixer,8,hc1.valvestatus,mixing valve actuator (VC1),uint8 (>=0<=100),%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
-"XCUMixer",mixer,8,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=254),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
-"XCUMixer",mixer,8,hc1.pumpstatus,pump status (PC1),boolean, ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
-"XCUMixer",mixer,8,hc1.activated,activated,boolean, ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
-"XCUMixer",mixer,8,hc1.flow,Durchfluss,uint16 (>=0<=31999),l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
-"XCUMixer",mixer,8,hc1.setdiffpress,set differential pressure,uint8 (>=0<=12700),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
+"RC120RF, TR120RF, CR20RF",thermostat,249,hc1.currtemp,current room temperature,int16,C,false,sensor.thermostat_hc1_current_room_temperature,sensor.thermostat_hc1_currtemp,6,1,1/10,1,1
+"RC120RF, TR120RF, CR20RF",thermostat,249,hc1.haclimate,mqtt discovery current room temperature,enum [selTemp\|roomTemp], ,false,sensor.thermostat_hc1_mqtt_discovery_current_room_temperature,sensor.thermostat_hc1_haclimate,6,1,1,2,1
+"XCUMixer",mixer,8,hc1.flowtemphc,flow temperature (TC1),uint16,C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
+"XCUMixer",mixer,8,hc1.valvestatus,mixing valve actuator (VC1),uint8,%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
+"XCUMixer",mixer,8,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=0),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
+"XCUMixer",mixer,8,hc1.pumpstatus,pump status (PC1),boolean (>=0<=0), ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
+"XCUMixer",mixer,8,hc1.activated,activated,boolean (>=0<=0), ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
+"XCUMixer",mixer,8,hc1.flow,Durchfluss,uint16,l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
+"XCUMixer",mixer,8,hc1.setdiffpress,set differential pressure,uint8 (>=0<=0),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
 "XCUMixer",mixer,8,hc1.valvesettime,time to set valve,uint8 (>=10<=600),seconds,true,number.mixer_hc1_time_to_set_valve,number.mixer_hc1_valvesettime,7,1,10,7,1
 "XCUMixer",mixer,8,hc1.flowtempoffset,flow temperature offset for mixer,uint8 (>=0<=20),K,true,number.mixer_hc1_flow_temperature_offset_for_mixer,number.mixer_hc1_flowtempoffset,7,1,1,8,1
-"XCUMixer",mixer,8,hc1.dhwprio,dhw priority,boolean, ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
-"MM10",mixer,69,hc1.flowtemphc,flow temperature (TC1),uint16 (>=0<=3199),C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
-"MM10",mixer,69,hc1.valvestatus,mixing valve actuator (VC1),int8 (>=-100<=100),%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
-"MM10",mixer,69,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=254),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
-"MM10",mixer,69,hc1.pumpstatus,pump status (PC1),boolean, ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
-"MM10",mixer,69,hc1.activated,activated,boolean, ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
+"XCUMixer",mixer,8,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
+"MM10",mixer,69,hc1.flowtemphc,flow temperature (TC1),uint16,C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
+"MM10",mixer,69,hc1.valvestatus,mixing valve actuator (VC1),int8,%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
+"MM10",mixer,69,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=0),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
+"MM10",mixer,69,hc1.pumpstatus,pump status (PC1),boolean (>=0<=0), ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
+"MM10",mixer,69,hc1.activated,activated,boolean (>=0<=0), ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
 "MM10",mixer,69,hc1.valvesettime,time to set valve,uint8 (>=10<=600),seconds,true,number.mixer_hc1_time_to_set_valve,number.mixer_hc1_valvesettime,7,1,10,7,1
-"IPM",mixer,100,hc1.flowtemphc,flow temperature (TC1),uint16 (>=0<=3199),C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
-"IPM",mixer,100,hc1.valvestatus,mixing valve actuator (VC1),uint8 (>=0<=100),%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
-"IPM",mixer,100,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=254),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
-"IPM",mixer,100,hc1.pumpstatus,pump status (PC1),boolean, ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
-"IPM",mixer,100,hc1.flowtempvf,flow temperature in header (T0/Vf),uint16 (>=0<=3199),C,false,sensor.mixer_hc1_flow_temperature_in_header_(T0/Vf),sensor.mixer_hc1_flowtempvf,7,1,1/10,10,1
-"IPM2",mixer,102,hc1.flowtemphc,flow temperature (TC1),uint16 (>=0<=3199),C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
-"IPM2",mixer,102,hc1.valvestatus,mixing valve actuator (VC1),uint8 (>=0<=100),%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
-"IPM2",mixer,102,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=254),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
-"IPM2",mixer,102,hc1.pumpstatus,pump status (PC1),boolean, ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
-"IPM2",mixer,102,hc1.flowtempvf,flow temperature in header (T0/Vf),uint16 (>=0<=3199),C,false,sensor.mixer_hc1_flow_temperature_in_header_(T0/Vf),sensor.mixer_hc1_flowtempvf,7,1,1/10,10,1
-"MM50",mixer,159,hc1.flowtemphc,flow temperature (TC1),uint16 (>=0<=3199),C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
-"MM50",mixer,159,hc1.valvestatus,mixing valve actuator (VC1),uint8 (>=0<=100),%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
-"MM50",mixer,159,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=254),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
-"MM50",mixer,159,hc1.pumpstatus,pump status (PC1),boolean, ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
-"MM50",mixer,159,hc1.activated,activated,boolean, ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
-"MM50",mixer,159,hc1.flow,Durchfluss,uint16 (>=0<=31999),l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
-"MM50",mixer,159,hc1.setdiffpress,set differential pressure,uint8 (>=0<=12700),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
+"IPM",mixer,100,hc1.flowtemphc,flow temperature (TC1),uint16,C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
+"IPM",mixer,100,hc1.valvestatus,mixing valve actuator (VC1),uint8,%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
+"IPM",mixer,100,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=0),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
+"IPM",mixer,100,hc1.pumpstatus,pump status (PC1),boolean (>=0<=0), ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
+"IPM",mixer,100,hc1.flowtempvf,flow temperature in header (T0/Vf),uint16,C,false,sensor.mixer_hc1_flow_temperature_in_header_(T0/Vf),sensor.mixer_hc1_flowtempvf,7,1,1/10,10,1
+"IPM2",mixer,102,hc1.flowtemphc,flow temperature (TC1),uint16,C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
+"IPM2",mixer,102,hc1.valvestatus,mixing valve actuator (VC1),uint8,%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
+"IPM2",mixer,102,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=0),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
+"IPM2",mixer,102,hc1.pumpstatus,pump status (PC1),boolean (>=0<=0), ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
+"IPM2",mixer,102,hc1.flowtempvf,flow temperature in header (T0/Vf),uint16,C,false,sensor.mixer_hc1_flow_temperature_in_header_(T0/Vf),sensor.mixer_hc1_flowtempvf,7,1,1/10,10,1
+"MM50",mixer,159,hc1.flowtemphc,flow temperature (TC1),uint16,C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
+"MM50",mixer,159,hc1.valvestatus,mixing valve actuator (VC1),uint8,%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
+"MM50",mixer,159,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=0),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
+"MM50",mixer,159,hc1.pumpstatus,pump status (PC1),boolean (>=0<=0), ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
+"MM50",mixer,159,hc1.activated,activated,boolean (>=0<=0), ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
+"MM50",mixer,159,hc1.flow,Durchfluss,uint16,l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
+"MM50",mixer,159,hc1.setdiffpress,set differential pressure,uint8 (>=0<=0),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
 "MM50",mixer,159,hc1.valvesettime,time to set valve,uint8 (>=10<=600),seconds,true,number.mixer_hc1_time_to_set_valve,number.mixer_hc1_valvesettime,7,1,10,7,1
 "MM50",mixer,159,hc1.flowtempoffset,flow temperature offset for mixer,uint8 (>=0<=20),K,true,number.mixer_hc1_flow_temperature_offset_for_mixer,number.mixer_hc1_flowtempoffset,7,1,1,8,1
-"MM50",mixer,159,hc1.dhwprio,dhw priority,boolean, ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
-"MM100",mixer,160,hc1.flowtemphc,flow temperature (TC1),uint16 (>=0<=3199),C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
-"MM100",mixer,160,hc1.valvestatus,mixing valve actuator (VC1),uint8 (>=0<=100),%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
-"MM100",mixer,160,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=254),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
-"MM100",mixer,160,hc1.pumpstatus,pump status (PC1),boolean, ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
-"MM100",mixer,160,hc1.activated,activated,boolean, ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
-"MM100",mixer,160,hc1.flow,Durchfluss,uint16 (>=0<=31999),l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
-"MM100",mixer,160,hc1.setdiffpress,set differential pressure,uint8 (>=0<=12700),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
+"MM50",mixer,159,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
+"MM100",mixer,160,hc1.flowtemphc,flow temperature (TC1),uint16,C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
+"MM100",mixer,160,hc1.valvestatus,mixing valve actuator (VC1),uint8,%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
+"MM100",mixer,160,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=0),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
+"MM100",mixer,160,hc1.pumpstatus,pump status (PC1),boolean (>=0<=0), ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
+"MM100",mixer,160,hc1.activated,activated,boolean (>=0<=0), ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
+"MM100",mixer,160,hc1.flow,Durchfluss,uint16,l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
+"MM100",mixer,160,hc1.setdiffpress,set differential pressure,uint8 (>=0<=0),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
 "MM100",mixer,160,hc1.valvesettime,time to set valve,uint8 (>=10<=600),seconds,true,number.mixer_hc1_time_to_set_valve,number.mixer_hc1_valvesettime,7,1,10,7,1
 "MM100",mixer,160,hc1.flowtempoffset,flow temperature offset for mixer,uint8 (>=0<=20),K,true,number.mixer_hc1_flow_temperature_offset_for_mixer,number.mixer_hc1_flowtempoffset,7,1,1,8,1
-"MM100",mixer,160,hc1.dhwprio,dhw priority,boolean, ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
-"MM200",mixer,161,hc1.flowtemphc,flow temperature (TC1),uint16 (>=0<=3199),C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
-"MM200",mixer,161,hc1.valvestatus,mixing valve actuator (VC1),uint8 (>=0<=100),%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
-"MM200",mixer,161,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=254),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
-"MM200",mixer,161,hc1.pumpstatus,pump status (PC1),boolean, ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
-"MM200",mixer,161,hc1.activated,activated,boolean, ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
-"MM200",mixer,161,hc1.flow,Durchfluss,uint16 (>=0<=31999),l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
-"MM200",mixer,161,hc1.setdiffpress,set differential pressure,uint8 (>=0<=12700),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
+"MM100",mixer,160,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
+"MM200",mixer,161,hc1.flowtemphc,flow temperature (TC1),uint16,C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
+"MM200",mixer,161,hc1.valvestatus,mixing valve actuator (VC1),uint8,%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
+"MM200",mixer,161,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=0),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
+"MM200",mixer,161,hc1.pumpstatus,pump status (PC1),boolean (>=0<=0), ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
+"MM200",mixer,161,hc1.activated,activated,boolean (>=0<=0), ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
+"MM200",mixer,161,hc1.flow,Durchfluss,uint16,l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
+"MM200",mixer,161,hc1.setdiffpress,set differential pressure,uint8 (>=0<=0),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
 "MM200",mixer,161,hc1.valvesettime,time to set valve,uint8 (>=10<=600),seconds,true,number.mixer_hc1_time_to_set_valve,number.mixer_hc1_valvesettime,7,1,10,7,1
 "MM200",mixer,161,hc1.flowtempoffset,flow temperature offset for mixer,uint8 (>=0<=20),K,true,number.mixer_hc1_flow_temperature_offset_for_mixer,number.mixer_hc1_flowtempoffset,7,1,1,8,1
-"MM200",mixer,161,hc1.dhwprio,dhw priority,boolean, ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
-"MZ100",mixer,193,hc1.flowtemphc,flow temperature (TC1),uint16 (>=0<=3199),C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
-"MZ100",mixer,193,hc1.valvestatus,mixing valve actuator (VC1),uint8 (>=0<=100),%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
-"MZ100",mixer,193,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=254),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
-"MZ100",mixer,193,hc1.pumpstatus,pump status (PC1),boolean, ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
-"MZ100",mixer,193,hc1.activated,activated,boolean, ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
-"MZ100",mixer,193,hc1.flow,Durchfluss,uint16 (>=0<=31999),l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
-"MZ100",mixer,193,hc1.setdiffpress,set differential pressure,uint8 (>=0<=12700),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
+"MM200",mixer,161,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
+"MZ100",mixer,193,hc1.flowtemphc,flow temperature (TC1),uint16,C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
+"MZ100",mixer,193,hc1.valvestatus,mixing valve actuator (VC1),uint8,%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
+"MZ100",mixer,193,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=0),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
+"MZ100",mixer,193,hc1.pumpstatus,pump status (PC1),boolean (>=0<=0), ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
+"MZ100",mixer,193,hc1.activated,activated,boolean (>=0<=0), ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
+"MZ100",mixer,193,hc1.flow,Durchfluss,uint16,l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
+"MZ100",mixer,193,hc1.setdiffpress,set differential pressure,uint8 (>=0<=0),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
 "MZ100",mixer,193,hc1.valvesettime,time to set valve,uint8 (>=10<=600),seconds,true,number.mixer_hc1_time_to_set_valve,number.mixer_hc1_valvesettime,7,1,10,7,1
 "MZ100",mixer,193,hc1.flowtempoffset,flow temperature offset for mixer,uint8 (>=0<=20),K,true,number.mixer_hc1_flow_temperature_offset_for_mixer,number.mixer_hc1_flowtempoffset,7,1,1,8,1
-"MZ100",mixer,193,hc1.dhwprio,dhw priority,boolean, ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
-"HM210",mixer,248,hc1.flowtemphc,flow temperature (TC1),uint16 (>=0<=3199),C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
-"HM210",mixer,248,hc1.valvestatus,mixing valve actuator (VC1),uint8 (>=0<=100),%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
-"HM210",mixer,248,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=254),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
-"HM210",mixer,248,hc1.pumpstatus,pump status (PC1),boolean, ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
-"HM210",mixer,248,hc1.activated,activated,boolean, ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
-"HM210",mixer,248,hc1.flow,Durchfluss,uint16 (>=0<=31999),l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
-"HM210",mixer,248,hc1.setdiffpress,set differential pressure,uint8 (>=0<=12700),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
+"MZ100",mixer,193,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
+"HM210",mixer,248,hc1.flowtemphc,flow temperature (TC1),uint16,C,false,sensor.mixer_hc1_flow_temperature_(TC1),sensor.mixer_hc1_flowtemphc,7,1,1/10,0,1
+"HM210",mixer,248,hc1.valvestatus,mixing valve actuator (VC1),uint8,%,false,sensor.mixer_hc1_mixing_valve_actuator_(VC1),sensor.mixer_hc1_valvestatus,7,1,1,1,1
+"HM210",mixer,248,hc1.flowsettemp,setpoint flow temperature,uint8 (>=0<=0),C,true,number.mixer_hc1_setpoint_flow_temperature,number.mixer_hc1_flowsettemp,7,1,1,2,1
+"HM210",mixer,248,hc1.pumpstatus,pump status (PC1),boolean (>=0<=0), ,true,switch.mixer_hc1_pump_status_(PC1),switch.mixer_hc1_pumpstatus,7,1,1,3,1
+"HM210",mixer,248,hc1.activated,activated,boolean (>=0<=0), ,true,switch.mixer_hc1_activated,switch.mixer_hc1_activated,7,1,1,4,1
+"HM210",mixer,248,hc1.flow,Durchfluss,uint16,l/h,false,sensor.mixer_hc1_Durchfluss,sensor.mixer_hc1_flow,7,1,1,5,1
+"HM210",mixer,248,hc1.setdiffpress,set differential pressure,uint8 (>=0<=0),mbar,true,number.mixer_hc1_set_differential_pressure,number.mixer_hc1_setdiffpress,7,1,50,6,1
 "HM210",mixer,248,hc1.valvesettime,time to set valve,uint8 (>=10<=600),seconds,true,number.mixer_hc1_time_to_set_valve,number.mixer_hc1_valvesettime,7,1,10,7,1
 "HM210",mixer,248,hc1.flowtempoffset,flow temperature offset for mixer,uint8 (>=0<=20),K,true,number.mixer_hc1_flow_temperature_offset_for_mixer,number.mixer_hc1_flowtempoffset,7,1,1,8,1
-"HM210",mixer,248,hc1.dhwprio,dhw priority,boolean, ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
-"SM10",solar,73,collectortemp,collector temperature (TS1),int16 (>=-3199<=3199),C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
-"SM10",solar,73,cylbottomtemp,cylinder bottom temperature (TS2),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
+"HM210",mixer,248,hc1.dhwprio,dhw priority,boolean (>=0<=0), ,true,switch.mixer_hc1_dhw_priority,switch.mixer_hc1_dhwprio,7,1,1,9,1
+"SM10",solar,73,collectortemp,collector temperature (TS1),int16,C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
+"SM10",solar,73,cylbottomtemp,cylinder bottom temperature (TS2),int16,C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
 "SM10",solar,73,solarpump,pump (PS1),boolean, ,false,binary_sensor.solar_pump_(PS1),binary_sensor.solar_solarpump,8,0,1,2,1
-"SM10",solar,73,pumpworktime,pump working time,time (>=0<=16777214),minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
-"SM10",solar,73,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=254),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
+"SM10",solar,73,pumpworktime,pump working time,time,minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
+"SM10",solar,73,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=0),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
 "SM10",solar,73,collectorshutdown,collector shutdown,boolean, ,false,binary_sensor.solar_collector_shutdown,binary_sensor.solar_collectorshutdown,8,0,1,6,1
 "SM10",solar,73,cylheated,cyl heated,boolean, ,false,binary_sensor.solar_cyl_heated,binary_sensor.solar_cylheated,8,0,1,7,1
-"SM10",solar,73,solarpumpmod,pump modulation (PS1),uint8 (>=0<=100),%,false,sensor.solar_pump_modulation_(PS1),sensor.solar_solarpumpmod,8,0,1,8,1
-"SM10",solar,73,pumpminmod,minimum pump modulation,uint8 (>=0<=100),%,true,number.solar_minimum_pump_modulation,number.solar_pumpminmod,8,0,1,9,1
-"SM10",solar,73,turnondiff,pump turn on difference,uint8 (>=0<=254),C,true,number.solar_pump_turn_on_difference,number.solar_turnondiff,8,0,1,10,1
-"SM10",solar,73,turnoffdiff,pump turn off difference,uint8 (>=0<=254),C,true,number.solar_pump_turn_off_difference,number.solar_turnoffdiff,8,0,1,11,1
-"SM10",solar,73,solarpower,actual solar power,int16 (>=-31999<=31999),W,false,sensor.solar_actual_solar_power,sensor.solar_solarpower,8,0,1,12,1
-"SM10",solar,73,energylasthour,energy last hour,uint24 (>=0<=1677721),Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
-"SM10",solar,73,maxflow,maximum solar flow,uint8 (>=0<=25),l/min,true,number.solar_maximum_solar_flow,number.solar_maxflow,8,0,1/10,15,1
-"SM10",solar,73,dhw.mintemp,minimum temperature,uint8 (>=0<=254),C,true,number.solar_dhw_minimum_temperature,number.solar_dhw_mintemp,8,9,1,0,1
-"SM10",solar,73,solarenabled,solarmodule enabled,boolean, ,true,switch.solar_solarmodule_enabled,switch.solar_solarenabled,8,0,1,16,1
-"ISM1",solar,101,collectortemp,collector temperature (TS1),int16 (>=-3199<=3199),C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
-"ISM1",solar,101,cylbottomtemp,cylinder bottom temperature (TS2),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
+"SM10",solar,73,solarpumpmod,pump modulation (PS1),uint8,%,false,sensor.solar_pump_modulation_(PS1),sensor.solar_solarpumpmod,8,0,1,8,1
+"SM10",solar,73,pumpminmod,minimum pump modulation,uint8 (>=0<=0),%,true,number.solar_minimum_pump_modulation,number.solar_pumpminmod,8,0,1,9,1
+"SM10",solar,73,turnondiff,pump turn on difference,uint8 (>=0<=0),C,true,number.solar_pump_turn_on_difference,number.solar_turnondiff,8,0,1,10,1
+"SM10",solar,73,turnoffdiff,pump turn off difference,uint8 (>=0<=0),C,true,number.solar_pump_turn_off_difference,number.solar_turnoffdiff,8,0,1,11,1
+"SM10",solar,73,solarpower,actual solar power,int16,W,false,sensor.solar_actual_solar_power,sensor.solar_solarpower,8,0,1,12,1
+"SM10",solar,73,energylasthour,energy last hour,uint24,Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
+"SM10",solar,73,maxflow,maximum solar flow,uint8 (>=0<=0),l/min,true,number.solar_maximum_solar_flow,number.solar_maxflow,8,0,1/10,15,1
+"SM10",solar,73,dhw.mintemp,minimum temperature,uint8 (>=0<=0),C,true,number.solar_dhw_minimum_temperature,number.solar_dhw_mintemp,8,9,1,0,1
+"SM10",solar,73,solarenabled,solarmodule enabled,boolean (>=0<=0), ,true,switch.solar_solarmodule_enabled,switch.solar_solarenabled,8,0,1,16,1
+"ISM1",solar,101,collectortemp,collector temperature (TS1),int16,C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
+"ISM1",solar,101,cylbottomtemp,cylinder bottom temperature (TS2),int16,C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
 "ISM1",solar,101,solarpump,pump (PS1),boolean, ,false,binary_sensor.solar_pump_(PS1),binary_sensor.solar_solarpump,8,0,1,2,1
-"ISM1",solar,101,pumpworktime,pump working time,time (>=0<=16777214),minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
-"ISM1",solar,101,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=254),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
+"ISM1",solar,101,pumpworktime,pump working time,time,minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
+"ISM1",solar,101,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=0),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
 "ISM1",solar,101,collectorshutdown,collector shutdown,boolean, ,false,binary_sensor.solar_collector_shutdown,binary_sensor.solar_collectorshutdown,8,0,1,6,1
 "ISM1",solar,101,cylheated,cyl heated,boolean, ,false,binary_sensor.solar_cyl_heated,binary_sensor.solar_cylheated,8,0,1,7,1
-"ISM1",solar,101,cylmiddletemp,cylinder middle temperature (TS3),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_middle_temperature_(TS3),sensor.solar_cylmiddletemp,8,0,1/10,17,1
-"ISM1",solar,101,retheatassist,return temperature heat assistance (TS4),int16 (>=-3199<=3199),C,false,sensor.solar_return_temperature_heat_assistance_(TS4),sensor.solar_retheatassist,8,0,1/10,18,1
+"ISM1",solar,101,cylmiddletemp,cylinder middle temperature (TS3),int16,C,false,sensor.solar_cylinder_middle_temperature_(TS3),sensor.solar_cylmiddletemp,8,0,1/10,17,1
+"ISM1",solar,101,retheatassist,return temperature heat assistance (TS4),int16,C,false,sensor.solar_return_temperature_heat_assistance_(TS4),sensor.solar_retheatassist,8,0,1/10,18,1
 "ISM1",solar,101,heatassistvalve,heat assistance valve (M1),boolean, ,false,binary_sensor.solar_heat_assistance_valve_(M1),binary_sensor.solar_heatassistvalve,8,0,1,19,1
-"ISM1",solar,101,energylasthour,energy last hour,uint24 (>=0<=1677721),Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
-"ISM2",solar,103,collectortemp,collector temperature (TS1),int16 (>=-3199<=3199),C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
-"ISM2",solar,103,cylbottomtemp,cylinder bottom temperature (TS2),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
+"ISM1",solar,101,energylasthour,energy last hour,uint24,Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
+"ISM2",solar,103,collectortemp,collector temperature (TS1),int16,C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
+"ISM2",solar,103,cylbottomtemp,cylinder bottom temperature (TS2),int16,C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
 "ISM2",solar,103,solarpump,pump (PS1),boolean, ,false,binary_sensor.solar_pump_(PS1),binary_sensor.solar_solarpump,8,0,1,2,1
-"ISM2",solar,103,pumpworktime,pump working time,time (>=0<=16777214),minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
-"ISM2",solar,103,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=254),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
+"ISM2",solar,103,pumpworktime,pump working time,time,minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
+"ISM2",solar,103,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=0),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
 "ISM2",solar,103,collectorshutdown,collector shutdown,boolean, ,false,binary_sensor.solar_collector_shutdown,binary_sensor.solar_collectorshutdown,8,0,1,6,1
 "ISM2",solar,103,cylheated,cyl heated,boolean, ,false,binary_sensor.solar_cyl_heated,binary_sensor.solar_cylheated,8,0,1,7,1
-"ISM2",solar,103,cylmiddletemp,cylinder middle temperature (TS3),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_middle_temperature_(TS3),sensor.solar_cylmiddletemp,8,0,1/10,17,1
-"ISM2",solar,103,retheatassist,return temperature heat assistance (TS4),int16 (>=-3199<=3199),C,false,sensor.solar_return_temperature_heat_assistance_(TS4),sensor.solar_retheatassist,8,0,1/10,18,1
+"ISM2",solar,103,cylmiddletemp,cylinder middle temperature (TS3),int16,C,false,sensor.solar_cylinder_middle_temperature_(TS3),sensor.solar_cylmiddletemp,8,0,1/10,17,1
+"ISM2",solar,103,retheatassist,return temperature heat assistance (TS4),int16,C,false,sensor.solar_return_temperature_heat_assistance_(TS4),sensor.solar_retheatassist,8,0,1/10,18,1
 "ISM2",solar,103,heatassistvalve,heat assistance valve (M1),boolean, ,false,binary_sensor.solar_heat_assistance_valve_(M1),binary_sensor.solar_heatassistvalve,8,0,1,19,1
-"ISM2",solar,103,energylasthour,energy last hour,uint24 (>=0<=1677721),Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
-"SM50",solar,162,collectortemp,collector temperature (TS1),int16 (>=-3199<=3199),C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
-"SM50",solar,162,cylbottomtemp,cylinder bottom temperature (TS2),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
+"ISM2",solar,103,energylasthour,energy last hour,uint24,Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
+"SM50",solar,162,collectortemp,collector temperature (TS1),int16,C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
+"SM50",solar,162,cylbottomtemp,cylinder bottom temperature (TS2),int16,C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
 "SM50",solar,162,solarpump,pump (PS1),boolean, ,false,binary_sensor.solar_pump_(PS1),binary_sensor.solar_solarpump,8,0,1,2,1
-"SM50",solar,162,pumpworktime,pump working time,time (>=0<=16777214),minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
-"SM50",solar,162,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=254),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
+"SM50",solar,162,pumpworktime,pump working time,time,minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
+"SM50",solar,162,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=0),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
 "SM50",solar,162,collectorshutdown,collector shutdown,boolean, ,false,binary_sensor.solar_collector_shutdown,binary_sensor.solar_collectorshutdown,8,0,1,6,1
 "SM50",solar,162,cylheated,cyl heated,boolean, ,false,binary_sensor.solar_cyl_heated,binary_sensor.solar_cylheated,8,0,1,7,1
-"SM50",solar,162,solarpumpmod,pump modulation (PS1),uint8 (>=0<=100),%,false,sensor.solar_pump_modulation_(PS1),sensor.solar_solarpumpmod,8,0,1,8,1
-"SM50",solar,162,pumpminmod,minimum pump modulation,uint8 (>=0<=100),%,true,number.solar_minimum_pump_modulation,number.solar_pumpminmod,8,0,5,9,1
-"SM50",solar,162,turnondiff,pump turn on difference,uint8 (>=0<=25),C,true,number.solar_pump_turn_on_difference,number.solar_turnondiff,8,0,1/10,10,1
-"SM50",solar,162,turnoffdiff,pump turn off difference,uint8 (>=0<=25),C,true,number.solar_pump_turn_off_difference,number.solar_turnoffdiff,8,0,1/10,11,1
-"SM50",solar,162,collector2temp,collector 2 temperature (TS7),int16 (>=-3199<=3199),C,false,sensor.solar_collector_2_temperature_(TS7),sensor.solar_collector2temp,8,0,1/10,20,1
-"SM50",solar,162,cylmiddletemp,cylinder middle temperature (TS3),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_middle_temperature_(TS3),sensor.solar_cylmiddletemp,8,0,1/10,17,1
-"SM50",solar,162,retheatassist,return temperature heat assistance (TS4),int16 (>=-3199<=3199),C,false,sensor.solar_return_temperature_heat_assistance_(TS4),sensor.solar_retheatassist,8,0,1/10,18,1
-"SM50",solar,162,ts8,(TS8),int16 (>=-3199<=3199),C,false,sensor.solar_(TS8),sensor.solar_ts8,8,0,1/10,21,1
-"SM50",solar,162,ts16,(TS16),int16 (>=-3199<=3199),C,false,sensor.solar_(TS16),sensor.solar_ts16,8,0,1/10,22,1
+"SM50",solar,162,solarpumpmod,pump modulation (PS1),uint8,%,false,sensor.solar_pump_modulation_(PS1),sensor.solar_solarpumpmod,8,0,1,8,1
+"SM50",solar,162,pumpminmod,minimum pump modulation,uint8 (>=0<=0),%,true,number.solar_minimum_pump_modulation,number.solar_pumpminmod,8,0,5,9,1
+"SM50",solar,162,turnondiff,pump turn on difference,uint8 (>=0<=0),C,true,number.solar_pump_turn_on_difference,number.solar_turnondiff,8,0,1/10,10,1
+"SM50",solar,162,turnoffdiff,pump turn off difference,uint8 (>=0<=0),C,true,number.solar_pump_turn_off_difference,number.solar_turnoffdiff,8,0,1/10,11,1
+"SM50",solar,162,collector2temp,collector 2 temperature (TS7),int16,C,false,sensor.solar_collector_2_temperature_(TS7),sensor.solar_collector2temp,8,0,1/10,20,1
+"SM50",solar,162,cylmiddletemp,cylinder middle temperature (TS3),int16,C,false,sensor.solar_cylinder_middle_temperature_(TS3),sensor.solar_cylmiddletemp,8,0,1/10,17,1
+"SM50",solar,162,retheatassist,return temperature heat assistance (TS4),int16,C,false,sensor.solar_return_temperature_heat_assistance_(TS4),sensor.solar_retheatassist,8,0,1/10,18,1
+"SM50",solar,162,ts8,(TS8),int16,C,false,sensor.solar_(TS8),sensor.solar_ts8,8,0,1/10,21,1
+"SM50",solar,162,ts16,(TS16),int16,C,false,sensor.solar_(TS16),sensor.solar_ts16,8,0,1/10,22,1
 "SM50",solar,162,heatassistvalve,heat assistance valve (M1),boolean, ,false,binary_sensor.solar_heat_assistance_valve_(M1),binary_sensor.solar_heatassistvalve,8,0,1,19,1
-"SM50",solar,162,heatassistpower,heat assistance valve power (M1),uint8 (>=0<=100),%,false,sensor.solar_heat_assistance_valve_power_(M1),sensor.solar_heatassistpower,8,0,1,23,1
+"SM50",solar,162,heatassistpower,heat assistance valve power (M1),uint8,%,false,sensor.solar_heat_assistance_valve_power_(M1),sensor.solar_heatassistpower,8,0,1,23,1
 "SM50",solar,162,solarpump2,pump 2 (PS4),boolean, ,false,binary_sensor.solar_pump_2_(PS4),binary_sensor.solar_solarpump2,8,0,1,24,1
-"SM50",solar,162,solarpump2mod,pump 2 modulation (PS4),uint8 (>=0<=100),%,false,sensor.solar_pump_2_modulation_(PS4),sensor.solar_solarpump2mod,8,0,1,25,1
-"SM50",solar,162,cyl2bottomtemp,second cylinder bottom temperature (TS5),int16 (>=-3199<=3199),C,false,sensor.solar_second_cylinder_bottom_temperature_(TS5),sensor.solar_cyl2bottomtemp,8,0,1/10,26,1
-"SM50",solar,162,cyl3bottomtemp,third cylinder bottom temperature (TS11),int16 (>=-3199<=3199),C,false,sensor.solar_third_cylinder_bottom_temperature_(TS11),sensor.solar_cyl3bottomtemp,8,0,1/10,27,1
-"SM50",solar,162,cyltoptemp,cylinder top temperature (TS10),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_top_temperature_(TS10),sensor.solar_cyltoptemp,8,0,1/10,28,1
-"SM50",solar,162,heatexchangertemp,heat exchanger temperature (TS6),int16 (>=-3199<=3199),C,false,sensor.solar_heat_exchanger_temperature_(TS6),sensor.solar_heatexchangertemp,8,0,1/10,29,1
-"SM50",solar,162,cylpumpmod,cylinder pump modulation (PS5),uint8 (>=0<=100),%,false,sensor.solar_cylinder_pump_modulation_(PS5),sensor.solar_cylpumpmod,8,0,1,30,1
+"SM50",solar,162,solarpump2mod,pump 2 modulation (PS4),uint8,%,false,sensor.solar_pump_2_modulation_(PS4),sensor.solar_solarpump2mod,8,0,1,25,1
+"SM50",solar,162,cyl2bottomtemp,second cylinder bottom temperature (TS5),int16,C,false,sensor.solar_second_cylinder_bottom_temperature_(TS5),sensor.solar_cyl2bottomtemp,8,0,1/10,26,1
+"SM50",solar,162,cyl3bottomtemp,third cylinder bottom temperature (TS11),int16,C,false,sensor.solar_third_cylinder_bottom_temperature_(TS11),sensor.solar_cyl3bottomtemp,8,0,1/10,27,1
+"SM50",solar,162,cyltoptemp,cylinder top temperature (TS10),int16,C,false,sensor.solar_cylinder_top_temperature_(TS10),sensor.solar_cyltoptemp,8,0,1/10,28,1
+"SM50",solar,162,heatexchangertemp,heat exchanger temperature (TS6),int16,C,false,sensor.solar_heat_exchanger_temperature_(TS6),sensor.solar_heatexchangertemp,8,0,1/10,29,1
+"SM50",solar,162,cylpumpmod,cylinder pump modulation (PS5),uint8,%,false,sensor.solar_cylinder_pump_modulation_(PS5),sensor.solar_cylpumpmod,8,0,1,30,1
 "SM50",solar,162,valvestatus,valve status,boolean, ,false,binary_sensor.solar_valve_status,binary_sensor.solar_valvestatus,8,0,1,31,1
 "SM50",solar,162,vs1status,valve status VS1,boolean, ,false,binary_sensor.solar_valve_status_VS1,binary_sensor.solar_vs1status,8,0,1,32,1
 "SM50",solar,162,vs3status,valve status VS3,boolean, ,false,binary_sensor.solar_valve_status_VS3,binary_sensor.solar_vs3status,8,0,1,33,1
 "SM50",solar,162,transferpump,transfer pump,boolean, ,false,binary_sensor.solar_transfer_pump,binary_sensor.solar_transferpump,8,0,1,34,1
-"SM50",solar,162,transferpumpmod,transfer pump modulation,uint8 (>=0<=100),%,false,sensor.solar_transfer_pump_modulation,sensor.solar_transferpumpmod,8,0,1,35,1
-"SM50",solar,162,collectormaxtemp,maximum collector temperature,uint8 (>=0<=254),C,true,number.solar_maximum_collector_temperature,number.solar_collectormaxtemp,8,0,1,36,1
-"SM50",solar,162,collectormintemp,minimum collector temperature,uint8 (>=0<=254),C,true,number.solar_minimum_collector_temperature,number.solar_collectormintemp,8,0,1,37,1
-"SM50",solar,162,energylasthour,energy last hour,uint24 (>=0<=1677721),Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
-"SM50",solar,162,energytoday,total energy today,uint24 (>=0<=16777214),Wh,false,sensor.solar_total_energy_today,sensor.solar_energytoday,8,0,1,38,2
-"SM50",solar,162,energytotal,total energy,uint24 (>=0<=1677721),kWh,false,sensor.solar_total_energy,sensor.solar_energytotal,8,0,1/10,40,2
-"SM50",solar,162,pump2worktime,pump 2 working time,time (>=0<=16777214),minutes,false,sensor.solar_pump_2_working_time,sensor.solar_pump2worktime,8,0,1,42,2
-"SM50",solar,162,m1worktime,differential control working time,time (>=0<=16777214),minutes,false,sensor.solar_differential_control_working_time,sensor.solar_m1worktime,8,0,1,44,2
-"SM50",solar,162,heattransfersystem,heattransfer system,boolean, ,true,switch.solar_heattransfer_system,switch.solar_heattransfersystem,8,0,1,46,1
-"SM50",solar,162,externalcyl,external cylinder,boolean, ,true,switch.solar_external_cylinder,switch.solar_externalcyl,8,0,1,47,1
-"SM50",solar,162,thermaldisinfect,thermal disinfection,boolean, ,true,switch.solar_thermal_disinfection,switch.solar_thermaldisinfect,8,0,1,48,1
-"SM50",solar,162,heatmetering,heatmetering,boolean, ,true,switch.solar_heatmetering,switch.solar_heatmetering,8,0,1,49,1
-"SM50",solar,162,activated,activated,boolean, ,true,switch.solar_activated,switch.solar_activated,8,0,1,50,1
-"SM50",solar,162,solarpumpmode,solar pump mode,enum [constant\|pwm\|analog], ,true,select.solar_solar_pump_mode,select.solar_solarpumpmode,8,0,1,51,1
-"SM50",solar,162,solarpumpkick,solar pump kick,boolean, ,true,switch.solar_solar_pump_kick,switch.solar_solarpumpkick,8,0,1,52,1
-"SM50",solar,162,plainwatermode,plain water mode,boolean, ,true,switch.solar_plain_water_mode,switch.solar_plainwatermode,8,0,1,53,1
-"SM50",solar,162,doublematchflow,doublematchflow,boolean, ,true,switch.solar_doublematchflow,switch.solar_doublematchflow,8,0,1,54,1
-"SM50",solar,162,pump2minmod,minimum pump 2 modulation,uint8 (>=0<=100),%,true,number.solar_minimum_pump_2_modulation,number.solar_pump2minmod,8,0,1,55,1
-"SM50",solar,162,turnondiff2,pump 2 turn on difference,uint8 (>=0<=25),C,true,number.solar_pump_2_turn_on_difference,number.solar_turnondiff2,8,0,1/10,56,1
-"SM50",solar,162,turnoffdiff2,pump 2 turn off difference,uint8 (>=0<=25),C,true,number.solar_pump_2_turn_off_difference,number.solar_turnoffdiff2,8,0,1/10,57,1
-"SM50",solar,162,pump2kick,pump kick 2,boolean, ,true,switch.solar_pump_kick_2,switch.solar_pump2kick,8,0,1,58,1
-"SM50",solar,162,climatezone,climate zone,uint8 (>=0<=254), ,true,number.solar_climate_zone,number.solar_climatezone,8,0,1,59,1
-"SM50",solar,162,collector1area,collector 1 area,uint16 (>=0<=3199),m²,true,number.solar_collector_1_area,number.solar_collector1area,8,0,1/10,60,1
-"SM50",solar,162,collector1type,collector 1 type,enum [flat\|vacuum], ,true,select.solar_collector_1_type,select.solar_collector1type,8,0,1,61,1
-"SM50",solar,162,collector2area,collector 2 area,uint16 (>=0<=3199),m²,true,number.solar_collector_2_area,number.solar_collector2area,8,0,1/10,62,1
-"SM50",solar,162,collector2type,collector 2 type,enum [flat\|vacuum], ,true,select.solar_collector_2_type,select.solar_collector2type,8,0,1,63,1
-"SM50",solar,162,cylpriority,cylinder priority,enum [cyl 1\|cyl 2], ,true,select.solar_cylinder_priority,select.solar_cylpriority,8,0,1,64,1
-"SM50",solar,162,heatcntflowtemp,heat counter flow temperature,uint16 (>=0<=3199),C,false,sensor.solar_heat_counter_flow_temperature,sensor.solar_heatcntflowtemp,8,0,1/10,65,1
-"SM50",solar,162,heatcntrettemp,heat counter return temperature,uint16 (>=0<=3199),C,false,sensor.solar_heat_counter_return_temperature,sensor.solar_heatcntrettemp,8,0,1/10,66,1
-"SM50",solar,162,heatcnt,heat counter impulses,uint8 (>=0<=254), ,false,sensor.solar_heat_counter_impulses,sensor.solar_heatcnt,8,0,1,67,1
-"SM50",solar,162,swapflowtemp,swap flow temperature (TS14),uint16 (>=0<=3199),C,false,sensor.solar_swap_flow_temperature_(TS14),sensor.solar_swapflowtemp,8,0,1/10,68,1
-"SM50",solar,162,swaprettemp,swap return temperature (TS15),uint16 (>=0<=3199),C,false,sensor.solar_swap_return_temperature_(TS15),sensor.solar_swaprettemp,8,0,1/10,69,1
-"SM50",solar,162,heatassiston,heat assistance on,int8 (>=-12<=12),K,true,number.solar_heat_assistance_on,number.solar_heatassiston,8,0,1/10,70,1
-"SM50",solar,162,heatassistoff,heat assistance off,int8 (>=-12<=12),K,true,number.solar_heat_assistance_off,number.solar_heatassistoff,8,0,1/10,71,1
-"SM100, MS100",solar,163,collectortemp,collector temperature (TS1),int16 (>=-3199<=3199),C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
-"SM100, MS100",solar,163,cylbottomtemp,cylinder bottom temperature (TS2),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
+"SM50",solar,162,transferpumpmod,transfer pump modulation,uint8,%,false,sensor.solar_transfer_pump_modulation,sensor.solar_transferpumpmod,8,0,1,35,1
+"SM50",solar,162,collectormaxtemp,maximum collector temperature,uint8 (>=0<=0),C,true,number.solar_maximum_collector_temperature,number.solar_collectormaxtemp,8,0,1,36,1
+"SM50",solar,162,collectormintemp,minimum collector temperature,uint8 (>=0<=0),C,true,number.solar_minimum_collector_temperature,number.solar_collectormintemp,8,0,1,37,1
+"SM50",solar,162,energylasthour,energy last hour,uint24,Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
+"SM50",solar,162,energytoday,total energy today,uint24,Wh,false,sensor.solar_total_energy_today,sensor.solar_energytoday,8,0,1,38,2
+"SM50",solar,162,energytotal,total energy,uint24,kWh,false,sensor.solar_total_energy,sensor.solar_energytotal,8,0,1/10,40,2
+"SM50",solar,162,pump2worktime,pump 2 working time,time,minutes,false,sensor.solar_pump_2_working_time,sensor.solar_pump2worktime,8,0,1,42,2
+"SM50",solar,162,m1worktime,differential control working time,time,minutes,false,sensor.solar_differential_control_working_time,sensor.solar_m1worktime,8,0,1,44,2
+"SM50",solar,162,heattransfersystem,heattransfer system,boolean (>=0<=0), ,true,switch.solar_heattransfer_system,switch.solar_heattransfersystem,8,0,1,46,1
+"SM50",solar,162,externalcyl,external cylinder,boolean (>=0<=0), ,true,switch.solar_external_cylinder,switch.solar_externalcyl,8,0,1,47,1
+"SM50",solar,162,thermaldisinfect,thermal disinfection,boolean (>=0<=0), ,true,switch.solar_thermal_disinfection,switch.solar_thermaldisinfect,8,0,1,48,1
+"SM50",solar,162,heatmetering,heatmetering,boolean (>=0<=0), ,true,switch.solar_heatmetering,switch.solar_heatmetering,8,0,1,49,1
+"SM50",solar,162,activated,activated,boolean (>=0<=0), ,true,switch.solar_activated,switch.solar_activated,8,0,1,50,1
+"SM50",solar,162,solarpumpmode,solar pump mode,enum [constant\|pwm\|analog] (>=0<=0), ,true,select.solar_solar_pump_mode,select.solar_solarpumpmode,8,0,1,51,1
+"SM50",solar,162,solarpumpkick,solar pump kick,boolean (>=0<=0), ,true,switch.solar_solar_pump_kick,switch.solar_solarpumpkick,8,0,1,52,1
+"SM50",solar,162,plainwatermode,plain water mode,boolean (>=0<=0), ,true,switch.solar_plain_water_mode,switch.solar_plainwatermode,8,0,1,53,1
+"SM50",solar,162,doublematchflow,doublematchflow,boolean (>=0<=0), ,true,switch.solar_doublematchflow,switch.solar_doublematchflow,8,0,1,54,1
+"SM50",solar,162,pump2minmod,minimum pump 2 modulation,uint8 (>=0<=0),%,true,number.solar_minimum_pump_2_modulation,number.solar_pump2minmod,8,0,1,55,1
+"SM50",solar,162,turnondiff2,pump 2 turn on difference,uint8 (>=0<=0),C,true,number.solar_pump_2_turn_on_difference,number.solar_turnondiff2,8,0,1/10,56,1
+"SM50",solar,162,turnoffdiff2,pump 2 turn off difference,uint8 (>=0<=0),C,true,number.solar_pump_2_turn_off_difference,number.solar_turnoffdiff2,8,0,1/10,57,1
+"SM50",solar,162,pump2kick,pump kick 2,boolean (>=0<=0), ,true,switch.solar_pump_kick_2,switch.solar_pump2kick,8,0,1,58,1
+"SM50",solar,162,climatezone,climate zone,uint8 (>=0<=0), ,true,number.solar_climate_zone,number.solar_climatezone,8,0,1,59,1
+"SM50",solar,162,collector1area,collector 1 area,uint16 (>=0<=0),m²,true,number.solar_collector_1_area,number.solar_collector1area,8,0,1/10,60,1
+"SM50",solar,162,collector1type,collector 1 type,enum [flat\|vacuum] (>=0<=0), ,true,select.solar_collector_1_type,select.solar_collector1type,8,0,1,61,1
+"SM50",solar,162,collector2area,collector 2 area,uint16 (>=0<=0),m²,true,number.solar_collector_2_area,number.solar_collector2area,8,0,1/10,62,1
+"SM50",solar,162,collector2type,collector 2 type,enum [flat\|vacuum] (>=0<=0), ,true,select.solar_collector_2_type,select.solar_collector2type,8,0,1,63,1
+"SM50",solar,162,cylpriority,cylinder priority,enum [cyl 1\|cyl 2] (>=0<=0), ,true,select.solar_cylinder_priority,select.solar_cylpriority,8,0,1,64,1
+"SM50",solar,162,heatcntflowtemp,heat counter flow temperature,uint16,C,false,sensor.solar_heat_counter_flow_temperature,sensor.solar_heatcntflowtemp,8,0,1/10,65,1
+"SM50",solar,162,heatcntrettemp,heat counter return temperature,uint16,C,false,sensor.solar_heat_counter_return_temperature,sensor.solar_heatcntrettemp,8,0,1/10,66,1
+"SM50",solar,162,heatcnt,heat counter impulses,uint8, ,false,sensor.solar_heat_counter_impulses,sensor.solar_heatcnt,8,0,1,67,1
+"SM50",solar,162,swapflowtemp,swap flow temperature (TS14),uint16,C,false,sensor.solar_swap_flow_temperature_(TS14),sensor.solar_swapflowtemp,8,0,1/10,68,1
+"SM50",solar,162,swaprettemp,swap return temperature (TS15),uint16,C,false,sensor.solar_swap_return_temperature_(TS15),sensor.solar_swaprettemp,8,0,1/10,69,1
+"SM50",solar,162,heatassiston,heat assistance on,int8 (>=0<=0),K,true,number.solar_heat_assistance_on,number.solar_heatassiston,8,0,1/10,70,1
+"SM50",solar,162,heatassistoff,heat assistance off,int8 (>=0<=0),K,true,number.solar_heat_assistance_off,number.solar_heatassistoff,8,0,1/10,71,1
+"SM100, MS100",solar,163,collectortemp,collector temperature (TS1),int16,C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
+"SM100, MS100",solar,163,cylbottomtemp,cylinder bottom temperature (TS2),int16,C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
 "SM100, MS100",solar,163,solarpump,pump (PS1),boolean, ,false,binary_sensor.solar_pump_(PS1),binary_sensor.solar_solarpump,8,0,1,2,1
-"SM100, MS100",solar,163,pumpworktime,pump working time,time (>=0<=16777214),minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
-"SM100, MS100",solar,163,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=254),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
+"SM100, MS100",solar,163,pumpworktime,pump working time,time,minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
+"SM100, MS100",solar,163,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=0),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
 "SM100, MS100",solar,163,collectorshutdown,collector shutdown,boolean, ,false,binary_sensor.solar_collector_shutdown,binary_sensor.solar_collectorshutdown,8,0,1,6,1
 "SM100, MS100",solar,163,cylheated,cyl heated,boolean, ,false,binary_sensor.solar_cyl_heated,binary_sensor.solar_cylheated,8,0,1,7,1
-"SM100, MS100",solar,163,solarpumpmod,pump modulation (PS1),uint8 (>=0<=100),%,false,sensor.solar_pump_modulation_(PS1),sensor.solar_solarpumpmod,8,0,1,8,1
-"SM100, MS100",solar,163,pumpminmod,minimum pump modulation,uint8 (>=0<=100),%,true,number.solar_minimum_pump_modulation,number.solar_pumpminmod,8,0,5,9,1
-"SM100, MS100",solar,163,turnondiff,pump turn on difference,uint8 (>=0<=25),C,true,number.solar_pump_turn_on_difference,number.solar_turnondiff,8,0,1/10,10,1
-"SM100, MS100",solar,163,turnoffdiff,pump turn off difference,uint8 (>=0<=25),C,true,number.solar_pump_turn_off_difference,number.solar_turnoffdiff,8,0,1/10,11,1
-"SM100, MS100",solar,163,collector2temp,collector 2 temperature (TS7),int16 (>=-3199<=3199),C,false,sensor.solar_collector_2_temperature_(TS7),sensor.solar_collector2temp,8,0,1/10,20,1
-"SM100, MS100",solar,163,cylmiddletemp,cylinder middle temperature (TS3),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_middle_temperature_(TS3),sensor.solar_cylmiddletemp,8,0,1/10,17,1
-"SM100, MS100",solar,163,retheatassist,return temperature heat assistance (TS4),int16 (>=-3199<=3199),C,false,sensor.solar_return_temperature_heat_assistance_(TS4),sensor.solar_retheatassist,8,0,1/10,18,1
-"SM100, MS100",solar,163,ts8,(TS8),int16 (>=-3199<=3199),C,false,sensor.solar_(TS8),sensor.solar_ts8,8,0,1/10,21,1
-"SM100, MS100",solar,163,ts16,(TS16),int16 (>=-3199<=3199),C,false,sensor.solar_(TS16),sensor.solar_ts16,8,0,1/10,22,1
+"SM100, MS100",solar,163,solarpumpmod,pump modulation (PS1),uint8,%,false,sensor.solar_pump_modulation_(PS1),sensor.solar_solarpumpmod,8,0,1,8,1
+"SM100, MS100",solar,163,pumpminmod,minimum pump modulation,uint8 (>=0<=0),%,true,number.solar_minimum_pump_modulation,number.solar_pumpminmod,8,0,5,9,1
+"SM100, MS100",solar,163,turnondiff,pump turn on difference,uint8 (>=0<=0),C,true,number.solar_pump_turn_on_difference,number.solar_turnondiff,8,0,1/10,10,1
+"SM100, MS100",solar,163,turnoffdiff,pump turn off difference,uint8 (>=0<=0),C,true,number.solar_pump_turn_off_difference,number.solar_turnoffdiff,8,0,1/10,11,1
+"SM100, MS100",solar,163,collector2temp,collector 2 temperature (TS7),int16,C,false,sensor.solar_collector_2_temperature_(TS7),sensor.solar_collector2temp,8,0,1/10,20,1
+"SM100, MS100",solar,163,cylmiddletemp,cylinder middle temperature (TS3),int16,C,false,sensor.solar_cylinder_middle_temperature_(TS3),sensor.solar_cylmiddletemp,8,0,1/10,17,1
+"SM100, MS100",solar,163,retheatassist,return temperature heat assistance (TS4),int16,C,false,sensor.solar_return_temperature_heat_assistance_(TS4),sensor.solar_retheatassist,8,0,1/10,18,1
+"SM100, MS100",solar,163,ts8,(TS8),int16,C,false,sensor.solar_(TS8),sensor.solar_ts8,8,0,1/10,21,1
+"SM100, MS100",solar,163,ts16,(TS16),int16,C,false,sensor.solar_(TS16),sensor.solar_ts16,8,0,1/10,22,1
 "SM100, MS100",solar,163,heatassistvalve,heat assistance valve (M1),boolean, ,false,binary_sensor.solar_heat_assistance_valve_(M1),binary_sensor.solar_heatassistvalve,8,0,1,19,1
-"SM100, MS100",solar,163,heatassistpower,heat assistance valve power (M1),uint8 (>=0<=100),%,false,sensor.solar_heat_assistance_valve_power_(M1),sensor.solar_heatassistpower,8,0,1,23,1
+"SM100, MS100",solar,163,heatassistpower,heat assistance valve power (M1),uint8,%,false,sensor.solar_heat_assistance_valve_power_(M1),sensor.solar_heatassistpower,8,0,1,23,1
 "SM100, MS100",solar,163,solarpump2,pump 2 (PS4),boolean, ,false,binary_sensor.solar_pump_2_(PS4),binary_sensor.solar_solarpump2,8,0,1,24,1
-"SM100, MS100",solar,163,solarpump2mod,pump 2 modulation (PS4),uint8 (>=0<=100),%,false,sensor.solar_pump_2_modulation_(PS4),sensor.solar_solarpump2mod,8,0,1,25,1
-"SM100, MS100",solar,163,cyl2bottomtemp,second cylinder bottom temperature (TS5),int16 (>=-3199<=3199),C,false,sensor.solar_second_cylinder_bottom_temperature_(TS5),sensor.solar_cyl2bottomtemp,8,0,1/10,26,1
-"SM100, MS100",solar,163,cyl3bottomtemp,third cylinder bottom temperature (TS11),int16 (>=-3199<=3199),C,false,sensor.solar_third_cylinder_bottom_temperature_(TS11),sensor.solar_cyl3bottomtemp,8,0,1/10,27,1
-"SM100, MS100",solar,163,cyltoptemp,cylinder top temperature (TS10),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_top_temperature_(TS10),sensor.solar_cyltoptemp,8,0,1/10,28,1
-"SM100, MS100",solar,163,heatexchangertemp,heat exchanger temperature (TS6),int16 (>=-3199<=3199),C,false,sensor.solar_heat_exchanger_temperature_(TS6),sensor.solar_heatexchangertemp,8,0,1/10,29,1
-"SM100, MS100",solar,163,cylpumpmod,cylinder pump modulation (PS5),uint8 (>=0<=100),%,false,sensor.solar_cylinder_pump_modulation_(PS5),sensor.solar_cylpumpmod,8,0,1,30,1
+"SM100, MS100",solar,163,solarpump2mod,pump 2 modulation (PS4),uint8,%,false,sensor.solar_pump_2_modulation_(PS4),sensor.solar_solarpump2mod,8,0,1,25,1
+"SM100, MS100",solar,163,cyl2bottomtemp,second cylinder bottom temperature (TS5),int16,C,false,sensor.solar_second_cylinder_bottom_temperature_(TS5),sensor.solar_cyl2bottomtemp,8,0,1/10,26,1
+"SM100, MS100",solar,163,cyl3bottomtemp,third cylinder bottom temperature (TS11),int16,C,false,sensor.solar_third_cylinder_bottom_temperature_(TS11),sensor.solar_cyl3bottomtemp,8,0,1/10,27,1
+"SM100, MS100",solar,163,cyltoptemp,cylinder top temperature (TS10),int16,C,false,sensor.solar_cylinder_top_temperature_(TS10),sensor.solar_cyltoptemp,8,0,1/10,28,1
+"SM100, MS100",solar,163,heatexchangertemp,heat exchanger temperature (TS6),int16,C,false,sensor.solar_heat_exchanger_temperature_(TS6),sensor.solar_heatexchangertemp,8,0,1/10,29,1
+"SM100, MS100",solar,163,cylpumpmod,cylinder pump modulation (PS5),uint8,%,false,sensor.solar_cylinder_pump_modulation_(PS5),sensor.solar_cylpumpmod,8,0,1,30,1
 "SM100, MS100",solar,163,valvestatus,valve status,boolean, ,false,binary_sensor.solar_valve_status,binary_sensor.solar_valvestatus,8,0,1,31,1
 "SM100, MS100",solar,163,vs1status,valve status VS1,boolean, ,false,binary_sensor.solar_valve_status_VS1,binary_sensor.solar_vs1status,8,0,1,32,1
 "SM100, MS100",solar,163,vs3status,valve status VS3,boolean, ,false,binary_sensor.solar_valve_status_VS3,binary_sensor.solar_vs3status,8,0,1,33,1
 "SM100, MS100",solar,163,transferpump,transfer pump,boolean, ,false,binary_sensor.solar_transfer_pump,binary_sensor.solar_transferpump,8,0,1,34,1
-"SM100, MS100",solar,163,transferpumpmod,transfer pump modulation,uint8 (>=0<=100),%,false,sensor.solar_transfer_pump_modulation,sensor.solar_transferpumpmod,8,0,1,35,1
-"SM100, MS100",solar,163,collectormaxtemp,maximum collector temperature,uint8 (>=0<=254),C,true,number.solar_maximum_collector_temperature,number.solar_collectormaxtemp,8,0,1,36,1
-"SM100, MS100",solar,163,collectormintemp,minimum collector temperature,uint8 (>=0<=254),C,true,number.solar_minimum_collector_temperature,number.solar_collectormintemp,8,0,1,37,1
-"SM100, MS100",solar,163,energylasthour,energy last hour,uint24 (>=0<=1677721),Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
-"SM100, MS100",solar,163,energytoday,total energy today,uint24 (>=0<=16777214),Wh,false,sensor.solar_total_energy_today,sensor.solar_energytoday,8,0,1,38,2
-"SM100, MS100",solar,163,energytotal,total energy,uint24 (>=0<=1677721),kWh,false,sensor.solar_total_energy,sensor.solar_energytotal,8,0,1/10,40,2
-"SM100, MS100",solar,163,pump2worktime,pump 2 working time,time (>=0<=16777214),minutes,false,sensor.solar_pump_2_working_time,sensor.solar_pump2worktime,8,0,1,42,2
-"SM100, MS100",solar,163,m1worktime,differential control working time,time (>=0<=16777214),minutes,false,sensor.solar_differential_control_working_time,sensor.solar_m1worktime,8,0,1,44,2
-"SM100, MS100",solar,163,heattransfersystem,heattransfer system,boolean, ,true,switch.solar_heattransfer_system,switch.solar_heattransfersystem,8,0,1,46,1
-"SM100, MS100",solar,163,externalcyl,external cylinder,boolean, ,true,switch.solar_external_cylinder,switch.solar_externalcyl,8,0,1,47,1
-"SM100, MS100",solar,163,thermaldisinfect,thermal disinfection,boolean, ,true,switch.solar_thermal_disinfection,switch.solar_thermaldisinfect,8,0,1,48,1
-"SM100, MS100",solar,163,heatmetering,heatmetering,boolean, ,true,switch.solar_heatmetering,switch.solar_heatmetering,8,0,1,49,1
-"SM100, MS100",solar,163,activated,activated,boolean, ,true,switch.solar_activated,switch.solar_activated,8,0,1,50,1
-"SM100, MS100",solar,163,solarpumpmode,solar pump mode,enum [constant\|pwm\|analog], ,true,select.solar_solar_pump_mode,select.solar_solarpumpmode,8,0,1,51,1
-"SM100, MS100",solar,163,solarpumpkick,solar pump kick,boolean, ,true,switch.solar_solar_pump_kick,switch.solar_solarpumpkick,8,0,1,52,1
-"SM100, MS100",solar,163,plainwatermode,plain water mode,boolean, ,true,switch.solar_plain_water_mode,switch.solar_plainwatermode,8,0,1,53,1
-"SM100, MS100",solar,163,doublematchflow,doublematchflow,boolean, ,true,switch.solar_doublematchflow,switch.solar_doublematchflow,8,0,1,54,1
-"SM100, MS100",solar,163,pump2minmod,minimum pump 2 modulation,uint8 (>=0<=100),%,true,number.solar_minimum_pump_2_modulation,number.solar_pump2minmod,8,0,1,55,1
-"SM100, MS100",solar,163,turnondiff2,pump 2 turn on difference,uint8 (>=0<=25),C,true,number.solar_pump_2_turn_on_difference,number.solar_turnondiff2,8,0,1/10,56,1
-"SM100, MS100",solar,163,turnoffdiff2,pump 2 turn off difference,uint8 (>=0<=25),C,true,number.solar_pump_2_turn_off_difference,number.solar_turnoffdiff2,8,0,1/10,57,1
-"SM100, MS100",solar,163,pump2kick,pump kick 2,boolean, ,true,switch.solar_pump_kick_2,switch.solar_pump2kick,8,0,1,58,1
-"SM100, MS100",solar,163,climatezone,climate zone,uint8 (>=0<=254), ,true,number.solar_climate_zone,number.solar_climatezone,8,0,1,59,1
-"SM100, MS100",solar,163,collector1area,collector 1 area,uint16 (>=0<=3199),m²,true,number.solar_collector_1_area,number.solar_collector1area,8,0,1/10,60,1
-"SM100, MS100",solar,163,collector1type,collector 1 type,enum [flat\|vacuum], ,true,select.solar_collector_1_type,select.solar_collector1type,8,0,1,61,1
-"SM100, MS100",solar,163,collector2area,collector 2 area,uint16 (>=0<=3199),m²,true,number.solar_collector_2_area,number.solar_collector2area,8,0,1/10,62,1
-"SM100, MS100",solar,163,collector2type,collector 2 type,enum [flat\|vacuum], ,true,select.solar_collector_2_type,select.solar_collector2type,8,0,1,63,1
-"SM100, MS100",solar,163,cylpriority,cylinder priority,enum [cyl 1\|cyl 2], ,true,select.solar_cylinder_priority,select.solar_cylpriority,8,0,1,64,1
-"SM100, MS100",solar,163,heatcntflowtemp,heat counter flow temperature,uint16 (>=0<=3199),C,false,sensor.solar_heat_counter_flow_temperature,sensor.solar_heatcntflowtemp,8,0,1/10,65,1
-"SM100, MS100",solar,163,heatcntrettemp,heat counter return temperature,uint16 (>=0<=3199),C,false,sensor.solar_heat_counter_return_temperature,sensor.solar_heatcntrettemp,8,0,1/10,66,1
-"SM100, MS100",solar,163,heatcnt,heat counter impulses,uint8 (>=0<=254), ,false,sensor.solar_heat_counter_impulses,sensor.solar_heatcnt,8,0,1,67,1
-"SM100, MS100",solar,163,swapflowtemp,swap flow temperature (TS14),uint16 (>=0<=3199),C,false,sensor.solar_swap_flow_temperature_(TS14),sensor.solar_swapflowtemp,8,0,1/10,68,1
-"SM100, MS100",solar,163,swaprettemp,swap return temperature (TS15),uint16 (>=0<=3199),C,false,sensor.solar_swap_return_temperature_(TS15),sensor.solar_swaprettemp,8,0,1/10,69,1
-"SM100, MS100",solar,163,heatassiston,heat assistance on,int8 (>=-12<=12),K,true,number.solar_heat_assistance_on,number.solar_heatassiston,8,0,1/10,70,1
-"SM100, MS100",solar,163,heatassistoff,heat assistance off,int8 (>=-12<=12),K,true,number.solar_heat_assistance_off,number.solar_heatassistoff,8,0,1/10,71,1
-"SM200, MS200",solar,164,collectortemp,collector temperature (TS1),int16 (>=-3199<=3199),C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
-"SM200, MS200",solar,164,cylbottomtemp,cylinder bottom temperature (TS2),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
+"SM100, MS100",solar,163,transferpumpmod,transfer pump modulation,uint8,%,false,sensor.solar_transfer_pump_modulation,sensor.solar_transferpumpmod,8,0,1,35,1
+"SM100, MS100",solar,163,collectormaxtemp,maximum collector temperature,uint8 (>=0<=0),C,true,number.solar_maximum_collector_temperature,number.solar_collectormaxtemp,8,0,1,36,1
+"SM100, MS100",solar,163,collectormintemp,minimum collector temperature,uint8 (>=0<=0),C,true,number.solar_minimum_collector_temperature,number.solar_collectormintemp,8,0,1,37,1
+"SM100, MS100",solar,163,energylasthour,energy last hour,uint24,Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
+"SM100, MS100",solar,163,energytoday,total energy today,uint24,Wh,false,sensor.solar_total_energy_today,sensor.solar_energytoday,8,0,1,38,2
+"SM100, MS100",solar,163,energytotal,total energy,uint24,kWh,false,sensor.solar_total_energy,sensor.solar_energytotal,8,0,1/10,40,2
+"SM100, MS100",solar,163,pump2worktime,pump 2 working time,time,minutes,false,sensor.solar_pump_2_working_time,sensor.solar_pump2worktime,8,0,1,42,2
+"SM100, MS100",solar,163,m1worktime,differential control working time,time,minutes,false,sensor.solar_differential_control_working_time,sensor.solar_m1worktime,8,0,1,44,2
+"SM100, MS100",solar,163,heattransfersystem,heattransfer system,boolean (>=0<=0), ,true,switch.solar_heattransfer_system,switch.solar_heattransfersystem,8,0,1,46,1
+"SM100, MS100",solar,163,externalcyl,external cylinder,boolean (>=0<=0), ,true,switch.solar_external_cylinder,switch.solar_externalcyl,8,0,1,47,1
+"SM100, MS100",solar,163,thermaldisinfect,thermal disinfection,boolean (>=0<=0), ,true,switch.solar_thermal_disinfection,switch.solar_thermaldisinfect,8,0,1,48,1
+"SM100, MS100",solar,163,heatmetering,heatmetering,boolean (>=0<=0), ,true,switch.solar_heatmetering,switch.solar_heatmetering,8,0,1,49,1
+"SM100, MS100",solar,163,activated,activated,boolean (>=0<=0), ,true,switch.solar_activated,switch.solar_activated,8,0,1,50,1
+"SM100, MS100",solar,163,solarpumpmode,solar pump mode,enum [constant\|pwm\|analog] (>=0<=0), ,true,select.solar_solar_pump_mode,select.solar_solarpumpmode,8,0,1,51,1
+"SM100, MS100",solar,163,solarpumpkick,solar pump kick,boolean (>=0<=0), ,true,switch.solar_solar_pump_kick,switch.solar_solarpumpkick,8,0,1,52,1
+"SM100, MS100",solar,163,plainwatermode,plain water mode,boolean (>=0<=0), ,true,switch.solar_plain_water_mode,switch.solar_plainwatermode,8,0,1,53,1
+"SM100, MS100",solar,163,doublematchflow,doublematchflow,boolean (>=0<=0), ,true,switch.solar_doublematchflow,switch.solar_doublematchflow,8,0,1,54,1
+"SM100, MS100",solar,163,pump2minmod,minimum pump 2 modulation,uint8 (>=0<=0),%,true,number.solar_minimum_pump_2_modulation,number.solar_pump2minmod,8,0,1,55,1
+"SM100, MS100",solar,163,turnondiff2,pump 2 turn on difference,uint8 (>=0<=0),C,true,number.solar_pump_2_turn_on_difference,number.solar_turnondiff2,8,0,1/10,56,1
+"SM100, MS100",solar,163,turnoffdiff2,pump 2 turn off difference,uint8 (>=0<=0),C,true,number.solar_pump_2_turn_off_difference,number.solar_turnoffdiff2,8,0,1/10,57,1
+"SM100, MS100",solar,163,pump2kick,pump kick 2,boolean (>=0<=0), ,true,switch.solar_pump_kick_2,switch.solar_pump2kick,8,0,1,58,1
+"SM100, MS100",solar,163,climatezone,climate zone,uint8 (>=0<=0), ,true,number.solar_climate_zone,number.solar_climatezone,8,0,1,59,1
+"SM100, MS100",solar,163,collector1area,collector 1 area,uint16 (>=0<=0),m²,true,number.solar_collector_1_area,number.solar_collector1area,8,0,1/10,60,1
+"SM100, MS100",solar,163,collector1type,collector 1 type,enum [flat\|vacuum] (>=0<=0), ,true,select.solar_collector_1_type,select.solar_collector1type,8,0,1,61,1
+"SM100, MS100",solar,163,collector2area,collector 2 area,uint16 (>=0<=0),m²,true,number.solar_collector_2_area,number.solar_collector2area,8,0,1/10,62,1
+"SM100, MS100",solar,163,collector2type,collector 2 type,enum [flat\|vacuum] (>=0<=0), ,true,select.solar_collector_2_type,select.solar_collector2type,8,0,1,63,1
+"SM100, MS100",solar,163,cylpriority,cylinder priority,enum [cyl 1\|cyl 2] (>=0<=0), ,true,select.solar_cylinder_priority,select.solar_cylpriority,8,0,1,64,1
+"SM100, MS100",solar,163,heatcntflowtemp,heat counter flow temperature,uint16,C,false,sensor.solar_heat_counter_flow_temperature,sensor.solar_heatcntflowtemp,8,0,1/10,65,1
+"SM100, MS100",solar,163,heatcntrettemp,heat counter return temperature,uint16,C,false,sensor.solar_heat_counter_return_temperature,sensor.solar_heatcntrettemp,8,0,1/10,66,1
+"SM100, MS100",solar,163,heatcnt,heat counter impulses,uint8, ,false,sensor.solar_heat_counter_impulses,sensor.solar_heatcnt,8,0,1,67,1
+"SM100, MS100",solar,163,swapflowtemp,swap flow temperature (TS14),uint16,C,false,sensor.solar_swap_flow_temperature_(TS14),sensor.solar_swapflowtemp,8,0,1/10,68,1
+"SM100, MS100",solar,163,swaprettemp,swap return temperature (TS15),uint16,C,false,sensor.solar_swap_return_temperature_(TS15),sensor.solar_swaprettemp,8,0,1/10,69,1
+"SM100, MS100",solar,163,heatassiston,heat assistance on,int8 (>=0<=0),K,true,number.solar_heat_assistance_on,number.solar_heatassiston,8,0,1/10,70,1
+"SM100, MS100",solar,163,heatassistoff,heat assistance off,int8 (>=0<=0),K,true,number.solar_heat_assistance_off,number.solar_heatassistoff,8,0,1/10,71,1
+"SM200, MS200",solar,164,collectortemp,collector temperature (TS1),int16,C,false,sensor.solar_collector_temperature_(TS1),sensor.solar_collectortemp,8,0,1/10,0,1
+"SM200, MS200",solar,164,cylbottomtemp,cylinder bottom temperature (TS2),int16,C,false,sensor.solar_cylinder_bottom_temperature_(TS2),sensor.solar_cylbottomtemp,8,0,1/10,1,1
 "SM200, MS200",solar,164,solarpump,pump (PS1),boolean, ,false,binary_sensor.solar_pump_(PS1),binary_sensor.solar_solarpump,8,0,1,2,1
-"SM200, MS200",solar,164,pumpworktime,pump working time,time (>=0<=16777214),minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
-"SM200, MS200",solar,164,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=254),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
+"SM200, MS200",solar,164,pumpworktime,pump working time,time,minutes,false,sensor.solar_pump_working_time,sensor.solar_pumpworktime,8,0,1,3,2
+"SM200, MS200",solar,164,cylmaxtemp,maximum cylinder temperature,uint8 (>=0<=0),C,true,number.solar_maximum_cylinder_temperature,number.solar_cylmaxtemp,8,0,1,5,1
 "SM200, MS200",solar,164,collectorshutdown,collector shutdown,boolean, ,false,binary_sensor.solar_collector_shutdown,binary_sensor.solar_collectorshutdown,8,0,1,6,1
 "SM200, MS200",solar,164,cylheated,cyl heated,boolean, ,false,binary_sensor.solar_cyl_heated,binary_sensor.solar_cylheated,8,0,1,7,1
-"SM200, MS200",solar,164,solarpumpmod,pump modulation (PS1),uint8 (>=0<=100),%,false,sensor.solar_pump_modulation_(PS1),sensor.solar_solarpumpmod,8,0,1,8,1
-"SM200, MS200",solar,164,pumpminmod,minimum pump modulation,uint8 (>=0<=100),%,true,number.solar_minimum_pump_modulation,number.solar_pumpminmod,8,0,5,9,1
-"SM200, MS200",solar,164,turnondiff,pump turn on difference,uint8 (>=0<=25),C,true,number.solar_pump_turn_on_difference,number.solar_turnondiff,8,0,1/10,10,1
-"SM200, MS200",solar,164,turnoffdiff,pump turn off difference,uint8 (>=0<=25),C,true,number.solar_pump_turn_off_difference,number.solar_turnoffdiff,8,0,1/10,11,1
-"SM200, MS200",solar,164,collector2temp,collector 2 temperature (TS7),int16 (>=-3199<=3199),C,false,sensor.solar_collector_2_temperature_(TS7),sensor.solar_collector2temp,8,0,1/10,20,1
-"SM200, MS200",solar,164,cylmiddletemp,cylinder middle temperature (TS3),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_middle_temperature_(TS3),sensor.solar_cylmiddletemp,8,0,1/10,17,1
-"SM200, MS200",solar,164,retheatassist,return temperature heat assistance (TS4),int16 (>=-3199<=3199),C,false,sensor.solar_return_temperature_heat_assistance_(TS4),sensor.solar_retheatassist,8,0,1/10,18,1
-"SM200, MS200",solar,164,ts8,(TS8),int16 (>=-3199<=3199),C,false,sensor.solar_(TS8),sensor.solar_ts8,8,0,1/10,21,1
-"SM200, MS200",solar,164,ts16,(TS16),int16 (>=-3199<=3199),C,false,sensor.solar_(TS16),sensor.solar_ts16,8,0,1/10,22,1
+"SM200, MS200",solar,164,solarpumpmod,pump modulation (PS1),uint8,%,false,sensor.solar_pump_modulation_(PS1),sensor.solar_solarpumpmod,8,0,1,8,1
+"SM200, MS200",solar,164,pumpminmod,minimum pump modulation,uint8 (>=0<=0),%,true,number.solar_minimum_pump_modulation,number.solar_pumpminmod,8,0,5,9,1
+"SM200, MS200",solar,164,turnondiff,pump turn on difference,uint8 (>=0<=0),C,true,number.solar_pump_turn_on_difference,number.solar_turnondiff,8,0,1/10,10,1
+"SM200, MS200",solar,164,turnoffdiff,pump turn off difference,uint8 (>=0<=0),C,true,number.solar_pump_turn_off_difference,number.solar_turnoffdiff,8,0,1/10,11,1
+"SM200, MS200",solar,164,collector2temp,collector 2 temperature (TS7),int16,C,false,sensor.solar_collector_2_temperature_(TS7),sensor.solar_collector2temp,8,0,1/10,20,1
+"SM200, MS200",solar,164,cylmiddletemp,cylinder middle temperature (TS3),int16,C,false,sensor.solar_cylinder_middle_temperature_(TS3),sensor.solar_cylmiddletemp,8,0,1/10,17,1
+"SM200, MS200",solar,164,retheatassist,return temperature heat assistance (TS4),int16,C,false,sensor.solar_return_temperature_heat_assistance_(TS4),sensor.solar_retheatassist,8,0,1/10,18,1
+"SM200, MS200",solar,164,ts8,(TS8),int16,C,false,sensor.solar_(TS8),sensor.solar_ts8,8,0,1/10,21,1
+"SM200, MS200",solar,164,ts16,(TS16),int16,C,false,sensor.solar_(TS16),sensor.solar_ts16,8,0,1/10,22,1
 "SM200, MS200",solar,164,heatassistvalve,heat assistance valve (M1),boolean, ,false,binary_sensor.solar_heat_assistance_valve_(M1),binary_sensor.solar_heatassistvalve,8,0,1,19,1
-"SM200, MS200",solar,164,heatassistpower,heat assistance valve power (M1),uint8 (>=0<=100),%,false,sensor.solar_heat_assistance_valve_power_(M1),sensor.solar_heatassistpower,8,0,1,23,1
+"SM200, MS200",solar,164,heatassistpower,heat assistance valve power (M1),uint8,%,false,sensor.solar_heat_assistance_valve_power_(M1),sensor.solar_heatassistpower,8,0,1,23,1
 "SM200, MS200",solar,164,solarpump2,pump 2 (PS4),boolean, ,false,binary_sensor.solar_pump_2_(PS4),binary_sensor.solar_solarpump2,8,0,1,24,1
-"SM200, MS200",solar,164,solarpump2mod,pump 2 modulation (PS4),uint8 (>=0<=100),%,false,sensor.solar_pump_2_modulation_(PS4),sensor.solar_solarpump2mod,8,0,1,25,1
-"SM200, MS200",solar,164,cyl2bottomtemp,second cylinder bottom temperature (TS5),int16 (>=-3199<=3199),C,false,sensor.solar_second_cylinder_bottom_temperature_(TS5),sensor.solar_cyl2bottomtemp,8,0,1/10,26,1
-"SM200, MS200",solar,164,cyl3bottomtemp,third cylinder bottom temperature (TS11),int16 (>=-3199<=3199),C,false,sensor.solar_third_cylinder_bottom_temperature_(TS11),sensor.solar_cyl3bottomtemp,8,0,1/10,27,1
-"SM200, MS200",solar,164,cyltoptemp,cylinder top temperature (TS10),int16 (>=-3199<=3199),C,false,sensor.solar_cylinder_top_temperature_(TS10),sensor.solar_cyltoptemp,8,0,1/10,28,1
-"SM200, MS200",solar,164,heatexchangertemp,heat exchanger temperature (TS6),int16 (>=-3199<=3199),C,false,sensor.solar_heat_exchanger_temperature_(TS6),sensor.solar_heatexchangertemp,8,0,1/10,29,1
-"SM200, MS200",solar,164,cylpumpmod,cylinder pump modulation (PS5),uint8 (>=0<=100),%,false,sensor.solar_cylinder_pump_modulation_(PS5),sensor.solar_cylpumpmod,8,0,1,30,1
+"SM200, MS200",solar,164,solarpump2mod,pump 2 modulation (PS4),uint8,%,false,sensor.solar_pump_2_modulation_(PS4),sensor.solar_solarpump2mod,8,0,1,25,1
+"SM200, MS200",solar,164,cyl2bottomtemp,second cylinder bottom temperature (TS5),int16,C,false,sensor.solar_second_cylinder_bottom_temperature_(TS5),sensor.solar_cyl2bottomtemp,8,0,1/10,26,1
+"SM200, MS200",solar,164,cyl3bottomtemp,third cylinder bottom temperature (TS11),int16,C,false,sensor.solar_third_cylinder_bottom_temperature_(TS11),sensor.solar_cyl3bottomtemp,8,0,1/10,27,1
+"SM200, MS200",solar,164,cyltoptemp,cylinder top temperature (TS10),int16,C,false,sensor.solar_cylinder_top_temperature_(TS10),sensor.solar_cyltoptemp,8,0,1/10,28,1
+"SM200, MS200",solar,164,heatexchangertemp,heat exchanger temperature (TS6),int16,C,false,sensor.solar_heat_exchanger_temperature_(TS6),sensor.solar_heatexchangertemp,8,0,1/10,29,1
+"SM200, MS200",solar,164,cylpumpmod,cylinder pump modulation (PS5),uint8,%,false,sensor.solar_cylinder_pump_modulation_(PS5),sensor.solar_cylpumpmod,8,0,1,30,1
 "SM200, MS200",solar,164,valvestatus,valve status,boolean, ,false,binary_sensor.solar_valve_status,binary_sensor.solar_valvestatus,8,0,1,31,1
 "SM200, MS200",solar,164,vs1status,valve status VS1,boolean, ,false,binary_sensor.solar_valve_status_VS1,binary_sensor.solar_vs1status,8,0,1,32,1
 "SM200, MS200",solar,164,vs3status,valve status VS3,boolean, ,false,binary_sensor.solar_valve_status_VS3,binary_sensor.solar_vs3status,8,0,1,33,1
 "SM200, MS200",solar,164,transferpump,transfer pump,boolean, ,false,binary_sensor.solar_transfer_pump,binary_sensor.solar_transferpump,8,0,1,34,1
-"SM200, MS200",solar,164,transferpumpmod,transfer pump modulation,uint8 (>=0<=100),%,false,sensor.solar_transfer_pump_modulation,sensor.solar_transferpumpmod,8,0,1,35,1
-"SM200, MS200",solar,164,collectormaxtemp,maximum collector temperature,uint8 (>=0<=254),C,true,number.solar_maximum_collector_temperature,number.solar_collectormaxtemp,8,0,1,36,1
-"SM200, MS200",solar,164,collectormintemp,minimum collector temperature,uint8 (>=0<=254),C,true,number.solar_minimum_collector_temperature,number.solar_collectormintemp,8,0,1,37,1
-"SM200, MS200",solar,164,energylasthour,energy last hour,uint24 (>=0<=1677721),Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
-"SM200, MS200",solar,164,energytoday,total energy today,uint24 (>=0<=16777214),Wh,false,sensor.solar_total_energy_today,sensor.solar_energytoday,8,0,1,38,2
-"SM200, MS200",solar,164,energytotal,total energy,uint24 (>=0<=1677721),kWh,false,sensor.solar_total_energy,sensor.solar_energytotal,8,0,1/10,40,2
-"SM200, MS200",solar,164,pump2worktime,pump 2 working time,time (>=0<=16777214),minutes,false,sensor.solar_pump_2_working_time,sensor.solar_pump2worktime,8,0,1,42,2
-"SM200, MS200",solar,164,m1worktime,differential control working time,time (>=0<=16777214),minutes,false,sensor.solar_differential_control_working_time,sensor.solar_m1worktime,8,0,1,44,2
-"SM200, MS200",solar,164,heattransfersystem,heattransfer system,boolean, ,true,switch.solar_heattransfer_system,switch.solar_heattransfersystem,8,0,1,46,1
-"SM200, MS200",solar,164,externalcyl,external cylinder,boolean, ,true,switch.solar_external_cylinder,switch.solar_externalcyl,8,0,1,47,1
-"SM200, MS200",solar,164,thermaldisinfect,thermal disinfection,boolean, ,true,switch.solar_thermal_disinfection,switch.solar_thermaldisinfect,8,0,1,48,1
-"SM200, MS200",solar,164,heatmetering,heatmetering,boolean, ,true,switch.solar_heatmetering,switch.solar_heatmetering,8,0,1,49,1
-"SM200, MS200",solar,164,activated,activated,boolean, ,true,switch.solar_activated,switch.solar_activated,8,0,1,50,1
-"SM200, MS200",solar,164,solarpumpmode,solar pump mode,enum [constant\|pwm\|analog], ,true,select.solar_solar_pump_mode,select.solar_solarpumpmode,8,0,1,51,1
-"SM200, MS200",solar,164,solarpumpkick,solar pump kick,boolean, ,true,switch.solar_solar_pump_kick,switch.solar_solarpumpkick,8,0,1,52,1
-"SM200, MS200",solar,164,plainwatermode,plain water mode,boolean, ,true,switch.solar_plain_water_mode,switch.solar_plainwatermode,8,0,1,53,1
-"SM200, MS200",solar,164,doublematchflow,doublematchflow,boolean, ,true,switch.solar_doublematchflow,switch.solar_doublematchflow,8,0,1,54,1
-"SM200, MS200",solar,164,pump2minmod,minimum pump 2 modulation,uint8 (>=0<=100),%,true,number.solar_minimum_pump_2_modulation,number.solar_pump2minmod,8,0,1,55,1
-"SM200, MS200",solar,164,turnondiff2,pump 2 turn on difference,uint8 (>=0<=25),C,true,number.solar_pump_2_turn_on_difference,number.solar_turnondiff2,8,0,1/10,56,1
-"SM200, MS200",solar,164,turnoffdiff2,pump 2 turn off difference,uint8 (>=0<=25),C,true,number.solar_pump_2_turn_off_difference,number.solar_turnoffdiff2,8,0,1/10,57,1
-"SM200, MS200",solar,164,pump2kick,pump kick 2,boolean, ,true,switch.solar_pump_kick_2,switch.solar_pump2kick,8,0,1,58,1
-"SM200, MS200",solar,164,climatezone,climate zone,uint8 (>=0<=254), ,true,number.solar_climate_zone,number.solar_climatezone,8,0,1,59,1
-"SM200, MS200",solar,164,collector1area,collector 1 area,uint16 (>=0<=3199),m²,true,number.solar_collector_1_area,number.solar_collector1area,8,0,1/10,60,1
-"SM200, MS200",solar,164,collector1type,collector 1 type,enum [flat\|vacuum], ,true,select.solar_collector_1_type,select.solar_collector1type,8,0,1,61,1
-"SM200, MS200",solar,164,collector2area,collector 2 area,uint16 (>=0<=3199),m²,true,number.solar_collector_2_area,number.solar_collector2area,8,0,1/10,62,1
-"SM200, MS200",solar,164,collector2type,collector 2 type,enum [flat\|vacuum], ,true,select.solar_collector_2_type,select.solar_collector2type,8,0,1,63,1
-"SM200, MS200",solar,164,cylpriority,cylinder priority,enum [cyl 1\|cyl 2], ,true,select.solar_cylinder_priority,select.solar_cylpriority,8,0,1,64,1
-"SM200, MS200",solar,164,heatcntflowtemp,heat counter flow temperature,uint16 (>=0<=3199),C,false,sensor.solar_heat_counter_flow_temperature,sensor.solar_heatcntflowtemp,8,0,1/10,65,1
-"SM200, MS200",solar,164,heatcntrettemp,heat counter return temperature,uint16 (>=0<=3199),C,false,sensor.solar_heat_counter_return_temperature,sensor.solar_heatcntrettemp,8,0,1/10,66,1
-"SM200, MS200",solar,164,heatcnt,heat counter impulses,uint8 (>=0<=254), ,false,sensor.solar_heat_counter_impulses,sensor.solar_heatcnt,8,0,1,67,1
-"SM200, MS200",solar,164,swapflowtemp,swap flow temperature (TS14),uint16 (>=0<=3199),C,false,sensor.solar_swap_flow_temperature_(TS14),sensor.solar_swapflowtemp,8,0,1/10,68,1
-"SM200, MS200",solar,164,swaprettemp,swap return temperature (TS15),uint16 (>=0<=3199),C,false,sensor.solar_swap_return_temperature_(TS15),sensor.solar_swaprettemp,8,0,1/10,69,1
-"SM200, MS200",solar,164,heatassiston,heat assistance on,int8 (>=-12<=12),K,true,number.solar_heat_assistance_on,number.solar_heatassiston,8,0,1/10,70,1
-"SM200, MS200",solar,164,heatassistoff,heat assistance off,int8 (>=-12<=12),K,true,number.solar_heat_assistance_off,number.solar_heatassistoff,8,0,1/10,71,1
-"HP Module",heatpump,252,airhumidity,relative air humidity,uint8 (>=0<=100),%,false,sensor.heatpump_relative_air_humidity,sensor.heatpump_airhumidity,9,0,1,0,1
-"HP Module",heatpump,252,dewtemperature,dew point temperature,uint8 (>=0<=254),C,false,sensor.heatpump_dew_point_temperature,sensor.heatpump_dewtemperature,9,0,1,1,1
-"HP Module",heatpump,252,curflowtemp,current flow temperature,int16 (>=-3199<=3199),C,false,sensor.heatpump_current_flow_temperature,sensor.heatpump_curflowtemp,9,0,1/10,2,1
-"HP Module",heatpump,252,rettemp,return temperature,int16 (>=-3199<=3199),C,false,sensor.heatpump_return_temperature,sensor.heatpump_rettemp,9,0,1/10,3,1
-"HP Module",heatpump,252,sysrettemp,system return temperature,int16 (>=-3199<=3199),C,false,sensor.heatpump_system_return_temperature,sensor.heatpump_sysrettemp,9,0,1/10,4,1
-"HP Module",heatpump,252,hpta4,drain pan temp (TA4),int16 (>=-3199<=3199),C,false,sensor.heatpump_drain_pan_temp_(TA4),sensor.heatpump_hpta4,9,0,1/10,5,1
-"HP Module",heatpump,252,hptr1,compressor temperature (TR1),int16 (>=-3199<=3199),C,false,sensor.heatpump_compressor_temperature_(TR1),sensor.heatpump_hptr1,9,0,1/10,6,1
-"HP Module",heatpump,252,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16 (>=-3199<=3199),C,false,sensor.heatpump_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.heatpump_hptr3,9,0,1/10,7,1
-"HP Module",heatpump,252,hptr4,evaporator inlet temperature (TR4),int16 (>=-3199<=3199),C,false,sensor.heatpump_evaporator_inlet_temperature_(TR4),sensor.heatpump_hptr4,9,0,1/10,8,1
-"HP Module",heatpump,252,hptr5,compressor inlet temperature (TR5),int16 (>=-3199<=3199),C,false,sensor.heatpump_compressor_inlet_temperature_(TR5),sensor.heatpump_hptr5,9,0,1/10,9,1
-"HP Module",heatpump,252,hptr6,compressor outlet temperature (TR6),int16 (>=-3199<=3199),C,false,sensor.heatpump_compressor_outlet_temperature_(TR6),sensor.heatpump_hptr6,9,0,1/10,10,1
-"HP Module",heatpump,252,hptl2,air inlet temperature (TL2),int16 (>=-3199<=3199),C,false,sensor.heatpump_air_inlet_temperature_(TL2),sensor.heatpump_hptl2,9,0,1/10,11,1
-"HP Module",heatpump,252,hppl1,low pressure side temperature (PL1),int16 (>=-3199<=3199),C,false,sensor.heatpump_low_pressure_side_temperature_(PL1),sensor.heatpump_hppl1,9,0,1/10,12,1
-"HP Module",heatpump,252,hpph1,high pressure side temperature (PH1),int16 (>=-3199<=3199),C,false,sensor.heatpump_high_pressure_side_temperature_(PH1),sensor.heatpump_hpph1,9,0,1/10,13,1
-"HP Module",heatpump,252,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.heatpump_heating_pump_modulation,sensor.heatpump_heatingpumpmod,9,0,1,14,1
-"HP Module",heatpump,252,hpcompspd,compressor speed,uint8 (>=0<=100),%,false,sensor.heatpump_compressor_speed,sensor.heatpump_hpcompspd,9,0,1,15,1
+"SM200, MS200",solar,164,transferpumpmod,transfer pump modulation,uint8,%,false,sensor.solar_transfer_pump_modulation,sensor.solar_transferpumpmod,8,0,1,35,1
+"SM200, MS200",solar,164,collectormaxtemp,maximum collector temperature,uint8 (>=0<=0),C,true,number.solar_maximum_collector_temperature,number.solar_collectormaxtemp,8,0,1,36,1
+"SM200, MS200",solar,164,collectormintemp,minimum collector temperature,uint8 (>=0<=0),C,true,number.solar_minimum_collector_temperature,number.solar_collectormintemp,8,0,1,37,1
+"SM200, MS200",solar,164,energylasthour,energy last hour,uint24,Wh,false,sensor.solar_energy_last_hour,sensor.solar_energylasthour,8,0,1/10,13,2
+"SM200, MS200",solar,164,energytoday,total energy today,uint24,Wh,false,sensor.solar_total_energy_today,sensor.solar_energytoday,8,0,1,38,2
+"SM200, MS200",solar,164,energytotal,total energy,uint24,kWh,false,sensor.solar_total_energy,sensor.solar_energytotal,8,0,1/10,40,2
+"SM200, MS200",solar,164,pump2worktime,pump 2 working time,time,minutes,false,sensor.solar_pump_2_working_time,sensor.solar_pump2worktime,8,0,1,42,2
+"SM200, MS200",solar,164,m1worktime,differential control working time,time,minutes,false,sensor.solar_differential_control_working_time,sensor.solar_m1worktime,8,0,1,44,2
+"SM200, MS200",solar,164,heattransfersystem,heattransfer system,boolean (>=0<=0), ,true,switch.solar_heattransfer_system,switch.solar_heattransfersystem,8,0,1,46,1
+"SM200, MS200",solar,164,externalcyl,external cylinder,boolean (>=0<=0), ,true,switch.solar_external_cylinder,switch.solar_externalcyl,8,0,1,47,1
+"SM200, MS200",solar,164,thermaldisinfect,thermal disinfection,boolean (>=0<=0), ,true,switch.solar_thermal_disinfection,switch.solar_thermaldisinfect,8,0,1,48,1
+"SM200, MS200",solar,164,heatmetering,heatmetering,boolean (>=0<=0), ,true,switch.solar_heatmetering,switch.solar_heatmetering,8,0,1,49,1
+"SM200, MS200",solar,164,activated,activated,boolean (>=0<=0), ,true,switch.solar_activated,switch.solar_activated,8,0,1,50,1
+"SM200, MS200",solar,164,solarpumpmode,solar pump mode,enum [constant\|pwm\|analog] (>=0<=0), ,true,select.solar_solar_pump_mode,select.solar_solarpumpmode,8,0,1,51,1
+"SM200, MS200",solar,164,solarpumpkick,solar pump kick,boolean (>=0<=0), ,true,switch.solar_solar_pump_kick,switch.solar_solarpumpkick,8,0,1,52,1
+"SM200, MS200",solar,164,plainwatermode,plain water mode,boolean (>=0<=0), ,true,switch.solar_plain_water_mode,switch.solar_plainwatermode,8,0,1,53,1
+"SM200, MS200",solar,164,doublematchflow,doublematchflow,boolean (>=0<=0), ,true,switch.solar_doublematchflow,switch.solar_doublematchflow,8,0,1,54,1
+"SM200, MS200",solar,164,pump2minmod,minimum pump 2 modulation,uint8 (>=0<=0),%,true,number.solar_minimum_pump_2_modulation,number.solar_pump2minmod,8,0,1,55,1
+"SM200, MS200",solar,164,turnondiff2,pump 2 turn on difference,uint8 (>=0<=0),C,true,number.solar_pump_2_turn_on_difference,number.solar_turnondiff2,8,0,1/10,56,1
+"SM200, MS200",solar,164,turnoffdiff2,pump 2 turn off difference,uint8 (>=0<=0),C,true,number.solar_pump_2_turn_off_difference,number.solar_turnoffdiff2,8,0,1/10,57,1
+"SM200, MS200",solar,164,pump2kick,pump kick 2,boolean (>=0<=0), ,true,switch.solar_pump_kick_2,switch.solar_pump2kick,8,0,1,58,1
+"SM200, MS200",solar,164,climatezone,climate zone,uint8 (>=0<=0), ,true,number.solar_climate_zone,number.solar_climatezone,8,0,1,59,1
+"SM200, MS200",solar,164,collector1area,collector 1 area,uint16 (>=0<=0),m²,true,number.solar_collector_1_area,number.solar_collector1area,8,0,1/10,60,1
+"SM200, MS200",solar,164,collector1type,collector 1 type,enum [flat\|vacuum] (>=0<=0), ,true,select.solar_collector_1_type,select.solar_collector1type,8,0,1,61,1
+"SM200, MS200",solar,164,collector2area,collector 2 area,uint16 (>=0<=0),m²,true,number.solar_collector_2_area,number.solar_collector2area,8,0,1/10,62,1
+"SM200, MS200",solar,164,collector2type,collector 2 type,enum [flat\|vacuum] (>=0<=0), ,true,select.solar_collector_2_type,select.solar_collector2type,8,0,1,63,1
+"SM200, MS200",solar,164,cylpriority,cylinder priority,enum [cyl 1\|cyl 2] (>=0<=0), ,true,select.solar_cylinder_priority,select.solar_cylpriority,8,0,1,64,1
+"SM200, MS200",solar,164,heatcntflowtemp,heat counter flow temperature,uint16,C,false,sensor.solar_heat_counter_flow_temperature,sensor.solar_heatcntflowtemp,8,0,1/10,65,1
+"SM200, MS200",solar,164,heatcntrettemp,heat counter return temperature,uint16,C,false,sensor.solar_heat_counter_return_temperature,sensor.solar_heatcntrettemp,8,0,1/10,66,1
+"SM200, MS200",solar,164,heatcnt,heat counter impulses,uint8, ,false,sensor.solar_heat_counter_impulses,sensor.solar_heatcnt,8,0,1,67,1
+"SM200, MS200",solar,164,swapflowtemp,swap flow temperature (TS14),uint16,C,false,sensor.solar_swap_flow_temperature_(TS14),sensor.solar_swapflowtemp,8,0,1/10,68,1
+"SM200, MS200",solar,164,swaprettemp,swap return temperature (TS15),uint16,C,false,sensor.solar_swap_return_temperature_(TS15),sensor.solar_swaprettemp,8,0,1/10,69,1
+"SM200, MS200",solar,164,heatassiston,heat assistance on,int8 (>=0<=0),K,true,number.solar_heat_assistance_on,number.solar_heatassiston,8,0,1/10,70,1
+"SM200, MS200",solar,164,heatassistoff,heat assistance off,int8 (>=0<=0),K,true,number.solar_heat_assistance_off,number.solar_heatassistoff,8,0,1/10,71,1
+"HP Module",heatpump,252,airhumidity,relative air humidity,uint8,%,false,sensor.heatpump_relative_air_humidity,sensor.heatpump_airhumidity,9,0,1,0,1
+"HP Module",heatpump,252,dewtemperature,dew point temperature,uint8,C,false,sensor.heatpump_dew_point_temperature,sensor.heatpump_dewtemperature,9,0,1,1,1
+"HP Module",heatpump,252,curflowtemp,current flow temperature,int16,C,false,sensor.heatpump_current_flow_temperature,sensor.heatpump_curflowtemp,9,0,1/10,2,1
+"HP Module",heatpump,252,rettemp,return temperature,int16,C,false,sensor.heatpump_return_temperature,sensor.heatpump_rettemp,9,0,1/10,3,1
+"HP Module",heatpump,252,sysrettemp,system return temperature,int16,C,false,sensor.heatpump_system_return_temperature,sensor.heatpump_sysrettemp,9,0,1/10,4,1
+"HP Module",heatpump,252,hpta4,drain pan temp (TA4),int16,C,false,sensor.heatpump_drain_pan_temp_(TA4),sensor.heatpump_hpta4,9,0,1/10,5,1
+"HP Module",heatpump,252,hptr1,compressor temperature (TR1),int16,C,false,sensor.heatpump_compressor_temperature_(TR1),sensor.heatpump_hptr1,9,0,1/10,6,1
+"HP Module",heatpump,252,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16,C,false,sensor.heatpump_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.heatpump_hptr3,9,0,1/10,7,1
+"HP Module",heatpump,252,hptr4,evaporator inlet temperature (TR4),int16,C,false,sensor.heatpump_evaporator_inlet_temperature_(TR4),sensor.heatpump_hptr4,9,0,1/10,8,1
+"HP Module",heatpump,252,hptr5,compressor inlet temperature (TR5),int16,C,false,sensor.heatpump_compressor_inlet_temperature_(TR5),sensor.heatpump_hptr5,9,0,1/10,9,1
+"HP Module",heatpump,252,hptr6,compressor outlet temperature (TR6),int16,C,false,sensor.heatpump_compressor_outlet_temperature_(TR6),sensor.heatpump_hptr6,9,0,1/10,10,1
+"HP Module",heatpump,252,hptl2,air inlet temperature (TL2),int16,C,false,sensor.heatpump_air_inlet_temperature_(TL2),sensor.heatpump_hptl2,9,0,1/10,11,1
+"HP Module",heatpump,252,hppl1,low pressure side temperature (PL1),int16,C,false,sensor.heatpump_low_pressure_side_temperature_(PL1),sensor.heatpump_hppl1,9,0,1/10,12,1
+"HP Module",heatpump,252,hpph1,high pressure side temperature (PH1),int16,C,false,sensor.heatpump_high_pressure_side_temperature_(PH1),sensor.heatpump_hpph1,9,0,1/10,13,1
+"HP Module",heatpump,252,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.heatpump_heating_pump_modulation,sensor.heatpump_heatingpumpmod,9,0,1,14,1
+"HP Module",heatpump,252,hpcompspd,compressor speed,uint8,%,false,sensor.heatpump_compressor_speed,sensor.heatpump_hpcompspd,9,0,1,15,1
 "HP Module",heatpump,252,hpactivity,compressor activity,enum [off\|heating\|hot water\|defrost\|compressor alarm], ,false,sensor.heatpump_compressor_activity,sensor.heatpump_hpactivity,9,0,1,16,1
-"HP Module",heatpump,252,hppower,compressor power output,uint16 (>=0<=31999),W,false,sensor.heatpump_compressor_power_output,sensor.heatpump_hppower,9,0,1,17,1
-"HP Module",heatpump,252,hpcurrpower,compressor current power,uint16 (>=0<=31999),W,false,sensor.heatpump_compressor_current_power,sensor.heatpump_hpcurrpower,9,0,1,18,1
-"HP Module",heatpump,252,hybridstrategy,hybrid control strategy,enum [cost optimized\|co2 optimized\|outside temperature alt.\|outside temperature parallel\|heatpump preferred\|boiler only], ,true,select.heatpump_hybrid_control_strategy,select.heatpump_hybridstrategy,9,0,1,19,1
-"HP Module",heatpump,252,lownoisemode,low noise mode,enum [off\|reduced output\|switch off hp\|perm. reduced], ,true,select.heatpump_low_noise_mode,select.heatpump_lownoisemode,9,0,1,20,1
+"HP Module",heatpump,252,hppower,compressor power output,uint16,W,false,sensor.heatpump_compressor_power_output,sensor.heatpump_hppower,9,0,1,17,1
+"HP Module",heatpump,252,hpcurrpower,compressor current power,uint16,W,false,sensor.heatpump_compressor_current_power,sensor.heatpump_hpcurrpower,9,0,1,18,1
+"HP Module",heatpump,252,hybridstrategy,hybrid control strategy,enum [cost optimized\|co2 optimized\|outside temperature alt.\|outside temperature parallel\|heatpump preferred\|boiler only] (>=0<=0), ,true,select.heatpump_hybrid_control_strategy,select.heatpump_hybridstrategy,9,0,1,19,1
+"HP Module",heatpump,252,lownoisemode,low noise mode,enum [off\|reduced output\|switch off hp\|perm. reduced] (>=0<=0), ,true,select.heatpump_low_noise_mode,select.heatpump_lownoisemode,9,0,1,20,1
 "HP Module",heatpump,252,lownoisestart,low noise starttime,uint8 (>=0<=23),hours,true,number.heatpump_low_noise_starttime,number.heatpump_lownoisestart,9,0,1,21,1
 "HP Module",heatpump,252,lownoisestop,low noise stoptime,uint8 (>=0<=23),hours,true,number.heatpump_low_noise_stoptime,number.heatpump_lownoisestop,9,0,1,22,1
-"HP Module",heatpump,252,dhw.hybriddhw,hybrid DHW,enum [eco\|high comfort], ,true,select.heatpump_dhw_hybrid_DHW,select.heatpump_dhw_hybriddhw,9,9,1,0,1
-"HP Module",heatpump,252,energypricegas,energy price gas,uint8 (>=0<=254),ct/kWh,true,number.heatpump_energy_price_gas,number.heatpump_energypricegas,9,0,1,23,1
-"HP Module",heatpump,252,energypriceel,energy price electric,uint8 (>=0<=254),ct/kWh,true,number.heatpump_energy_price_electric,number.heatpump_energypriceel,9,0,1,24,1
-"HP Module",heatpump,252,energyfeedpv,feed in PV,uint8 (>=0<=254),ct/kWh,true,number.heatpump_feed_in_PV,number.heatpump_energyfeedpv,9,0,1,25,1
-"HP Module",heatpump,252,switchovertemp,outside switchover temperature,int8 (>=-126<=126),C,true,number.heatpump_outside_switchover_temperature,number.heatpump_switchovertemp,9,0,1,26,1
-"HP Module",heatpump,252,airpurgemode,air purge mode,boolean, ,true,switch.heatpump_air_purge_mode,switch.heatpump_airpurgemode,9,0,1,27,1
-"HP Module",heatpump,252,heatpumpoutput,heatpump output,uint8 (>=0<=100),%,true,number.heatpump_heatpump_output,number.heatpump_heatpumpoutput,9,0,1,28,1
-"HP Module",heatpump,252,coolingcircuit,cooling circuit,boolean, ,true,switch.heatpump_cooling_circuit,switch.heatpump_coolingcircuit,9,0,1,29,1
-"HP Module",heatpump,252,compstartmod,compressor start modulation,uint8 (>=0<=100),%,true,number.heatpump_compressor_start_modulation,number.heatpump_compstartmod,9,0,1,30,1
-"HP Module",heatpump,252,heatdrainpan,heat drain pan,boolean, ,true,switch.heatpump_heat_drain_pan,switch.heatpump_heatdrainpan,9,0,1,31,1
-"HP Module",heatpump,252,heatcable,heating cable,boolean, ,true,switch.heatpump_heating_cable,switch.heatpump_heatcable,9,0,1,32,1
-"HP Module",heatpump,252,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.heatpump_total_energy,sensor.heatpump_nrgtotal,9,0,1/100,33,2
-"HP Module",heatpump,252,dhw.nrg,energy,uint24 (>=0<=167772),kWh,false,sensor.heatpump_dhw_energy,sensor.heatpump_dhw_nrg,9,9,1/100,1,2
-"HP Module",heatpump,252,nrgheat,energy heating,uint24 (>=0<=167772),kWh,false,sensor.heatpump_energy_heating,sensor.heatpump_nrgheat,9,0,1/100,35,2
-"HP Module",heatpump,252,metertotal,meter total,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_total,sensor.heatpump_metertotal,9,0,1/100,37,2
-"HP Module",heatpump,252,metercomp,meter compressor,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_compressor,sensor.heatpump_metercomp,9,0,1/100,39,2
-"HP Module",heatpump,252,metereheat,meter e-heater,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_e-heater,sensor.heatpump_metereheat,9,0,1/100,41,2
-"HP Module",heatpump,252,meterheat,meter heating,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_heating,sensor.heatpump_meterheat,9,0,1/100,43,2
-"HP Module",heatpump,252,dhw.meter,meter,uint24 (>=0<=167772),kWh,false,sensor.heatpump_dhw_meter,sensor.heatpump_dhw_meter,9,9,1/100,3,2
-"HP Module",heatpump,252,heatingstarts,heating control starts,uint24 (>=0<=16777214), ,false,sensor.heatpump_heating_control_starts,sensor.heatpump_heatingstarts,9,0,1,45,2
-"HP Module",heatpump,252,dhw.startshp,starts hp,uint24 (>=0<=16777214), ,false,sensor.heatpump_dhw_starts_hp,sensor.heatpump_dhw_startshp,9,9,1,5,2
-"HP Module",heatpump,252,fuelheat,fuel consumption heating,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_fuel_consumption_heating,sensor.heatpump_fuelheat,9,0,1/10,47,2
-"HP Module",heatpump,252,dhw.fueldhw,fuel consumption,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_dhw_fuel_consumption,sensor.heatpump_dhw_fueldhw,9,9,1/10,7,2
-"HP Module",heatpump,252,elheat,el. consumption heating,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_el._consumption_heating,sensor.heatpump_elheat,9,0,1/10,49,2
-"HP Module",heatpump,252,dhw.eldhw,el. consumption,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_dhw_el._consumption,sensor.heatpump_dhw_eldhw,9,9,1/10,9,2
-"HP Module",heatpump,252,elgenheat,el. generation heating,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_el._generation_heating,sensor.heatpump_elgenheat,9,0,1/10,51,2
-"HP Module",heatpump,252,dhw.elgendhw,el generation,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_dhw_el_generation,sensor.heatpump_dhw_elgendhw,9,9,1/10,11,2
-"Hybrid Manager HM200",heatpump,248,airhumidity,relative air humidity,uint8 (>=0<=100),%,false,sensor.heatpump_relative_air_humidity,sensor.heatpump_airhumidity,9,0,1,0,1
-"Hybrid Manager HM200",heatpump,248,dewtemperature,dew point temperature,uint8 (>=0<=254),C,false,sensor.heatpump_dew_point_temperature,sensor.heatpump_dewtemperature,9,0,1,1,1
-"Hybrid Manager HM200",heatpump,248,curflowtemp,current flow temperature,int16 (>=-3199<=3199),C,false,sensor.heatpump_current_flow_temperature,sensor.heatpump_curflowtemp,9,0,1/10,2,1
-"Hybrid Manager HM200",heatpump,248,rettemp,return temperature,int16 (>=-3199<=3199),C,false,sensor.heatpump_return_temperature,sensor.heatpump_rettemp,9,0,1/10,3,1
-"Hybrid Manager HM200",heatpump,248,sysrettemp,system return temperature,int16 (>=-3199<=3199),C,false,sensor.heatpump_system_return_temperature,sensor.heatpump_sysrettemp,9,0,1/10,4,1
-"Hybrid Manager HM200",heatpump,248,hpta4,drain pan temp (TA4),int16 (>=-3199<=3199),C,false,sensor.heatpump_drain_pan_temp_(TA4),sensor.heatpump_hpta4,9,0,1/10,5,1
-"Hybrid Manager HM200",heatpump,248,hptr1,compressor temperature (TR1),int16 (>=-3199<=3199),C,false,sensor.heatpump_compressor_temperature_(TR1),sensor.heatpump_hptr1,9,0,1/10,6,1
-"Hybrid Manager HM200",heatpump,248,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16 (>=-3199<=3199),C,false,sensor.heatpump_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.heatpump_hptr3,9,0,1/10,7,1
-"Hybrid Manager HM200",heatpump,248,hptr4,evaporator inlet temperature (TR4),int16 (>=-3199<=3199),C,false,sensor.heatpump_evaporator_inlet_temperature_(TR4),sensor.heatpump_hptr4,9,0,1/10,8,1
-"Hybrid Manager HM200",heatpump,248,hptr5,compressor inlet temperature (TR5),int16 (>=-3199<=3199),C,false,sensor.heatpump_compressor_inlet_temperature_(TR5),sensor.heatpump_hptr5,9,0,1/10,9,1
-"Hybrid Manager HM200",heatpump,248,hptr6,compressor outlet temperature (TR6),int16 (>=-3199<=3199),C,false,sensor.heatpump_compressor_outlet_temperature_(TR6),sensor.heatpump_hptr6,9,0,1/10,10,1
-"Hybrid Manager HM200",heatpump,248,hptl2,air inlet temperature (TL2),int16 (>=-3199<=3199),C,false,sensor.heatpump_air_inlet_temperature_(TL2),sensor.heatpump_hptl2,9,0,1/10,11,1
-"Hybrid Manager HM200",heatpump,248,hppl1,low pressure side temperature (PL1),int16 (>=-3199<=3199),C,false,sensor.heatpump_low_pressure_side_temperature_(PL1),sensor.heatpump_hppl1,9,0,1/10,12,1
-"Hybrid Manager HM200",heatpump,248,hpph1,high pressure side temperature (PH1),int16 (>=-3199<=3199),C,false,sensor.heatpump_high_pressure_side_temperature_(PH1),sensor.heatpump_hpph1,9,0,1/10,13,1
-"Hybrid Manager HM200",heatpump,248,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.heatpump_heating_pump_modulation,sensor.heatpump_heatingpumpmod,9,0,1,14,1
-"Hybrid Manager HM200",heatpump,248,hpcompspd,compressor speed,uint8 (>=0<=100),%,false,sensor.heatpump_compressor_speed,sensor.heatpump_hpcompspd,9,0,1,15,1
+"HP Module",heatpump,252,dhw.hybriddhw,hybrid DHW,enum [eco\|high comfort] (>=0<=0), ,true,select.heatpump_dhw_hybrid_DHW,select.heatpump_dhw_hybriddhw,9,9,1,0,1
+"HP Module",heatpump,252,energypricegas,energy price gas,uint8 (>=0<=0),ct/kWh,true,number.heatpump_energy_price_gas,number.heatpump_energypricegas,9,0,1,23,1
+"HP Module",heatpump,252,energypriceel,energy price electric,uint8 (>=0<=0),ct/kWh,true,number.heatpump_energy_price_electric,number.heatpump_energypriceel,9,0,1,24,1
+"HP Module",heatpump,252,energyfeedpv,feed in PV,uint8 (>=0<=0),ct/kWh,true,number.heatpump_feed_in_PV,number.heatpump_energyfeedpv,9,0,1,25,1
+"HP Module",heatpump,252,switchovertemp,outside switchover temperature,int8 (>=0<=0),C,true,number.heatpump_outside_switchover_temperature,number.heatpump_switchovertemp,9,0,1,26,1
+"HP Module",heatpump,252,airpurgemode,air purge mode,boolean (>=0<=0), ,true,switch.heatpump_air_purge_mode,switch.heatpump_airpurgemode,9,0,1,27,1
+"HP Module",heatpump,252,heatpumpoutput,heatpump output,uint8 (>=0<=0),%,true,number.heatpump_heatpump_output,number.heatpump_heatpumpoutput,9,0,1,28,1
+"HP Module",heatpump,252,coolingcircuit,cooling circuit,boolean (>=0<=0), ,true,switch.heatpump_cooling_circuit,switch.heatpump_coolingcircuit,9,0,1,29,1
+"HP Module",heatpump,252,compstartmod,compressor start modulation,uint8 (>=0<=0),%,true,number.heatpump_compressor_start_modulation,number.heatpump_compstartmod,9,0,1,30,1
+"HP Module",heatpump,252,heatdrainpan,heat drain pan,boolean (>=0<=0), ,true,switch.heatpump_heat_drain_pan,switch.heatpump_heatdrainpan,9,0,1,31,1
+"HP Module",heatpump,252,heatcable,heating cable,boolean (>=0<=0), ,true,switch.heatpump_heating_cable,switch.heatpump_heatcable,9,0,1,32,1
+"HP Module",heatpump,252,nrgtotal,total energy,uint24,kWh,false,sensor.heatpump_total_energy,sensor.heatpump_nrgtotal,9,0,1/100,33,2
+"HP Module",heatpump,252,dhw.nrg,energy,uint24,kWh,false,sensor.heatpump_dhw_energy,sensor.heatpump_dhw_nrg,9,9,1/100,1,2
+"HP Module",heatpump,252,nrgheat,energy heating,uint24,kWh,false,sensor.heatpump_energy_heating,sensor.heatpump_nrgheat,9,0,1/100,35,2
+"HP Module",heatpump,252,metertotal,meter total,uint24,kWh,false,sensor.heatpump_meter_total,sensor.heatpump_metertotal,9,0,1/100,37,2
+"HP Module",heatpump,252,metercomp,meter compressor,uint24,kWh,false,sensor.heatpump_meter_compressor,sensor.heatpump_metercomp,9,0,1/100,39,2
+"HP Module",heatpump,252,metereheat,meter e-heater,uint24,kWh,false,sensor.heatpump_meter_e-heater,sensor.heatpump_metereheat,9,0,1/100,41,2
+"HP Module",heatpump,252,meterheat,meter heating,uint24,kWh,false,sensor.heatpump_meter_heating,sensor.heatpump_meterheat,9,0,1/100,43,2
+"HP Module",heatpump,252,dhw.meter,meter,uint24,kWh,false,sensor.heatpump_dhw_meter,sensor.heatpump_dhw_meter,9,9,1/100,3,2
+"HP Module",heatpump,252,heatingstarts,heating control starts,uint24, ,false,sensor.heatpump_heating_control_starts,sensor.heatpump_heatingstarts,9,0,1,45,2
+"HP Module",heatpump,252,dhw.startshp,starts hp,uint24, ,false,sensor.heatpump_dhw_starts_hp,sensor.heatpump_dhw_startshp,9,9,1,5,2
+"HP Module",heatpump,252,fuelheat,fuel consumption heating,uint32,kWh,false,sensor.heatpump_fuel_consumption_heating,sensor.heatpump_fuelheat,9,0,1/10,47,2
+"HP Module",heatpump,252,dhw.fueldhw,fuel consumption,uint32,kWh,false,sensor.heatpump_dhw_fuel_consumption,sensor.heatpump_dhw_fueldhw,9,9,1/10,7,2
+"HP Module",heatpump,252,elheat,el. consumption heating,uint32,kWh,false,sensor.heatpump_el._consumption_heating,sensor.heatpump_elheat,9,0,1/10,49,2
+"HP Module",heatpump,252,dhw.eldhw,el. consumption,uint32,kWh,false,sensor.heatpump_dhw_el._consumption,sensor.heatpump_dhw_eldhw,9,9,1/10,9,2
+"HP Module",heatpump,252,elgenheat,el. generation heating,uint32,kWh,false,sensor.heatpump_el._generation_heating,sensor.heatpump_elgenheat,9,0,1/10,51,2
+"HP Module",heatpump,252,dhw.elgendhw,el generation,uint32,kWh,false,sensor.heatpump_dhw_el_generation,sensor.heatpump_dhw_elgendhw,9,9,1/10,11,2
+"Hybrid Manager HM200",heatpump,248,airhumidity,relative air humidity,uint8,%,false,sensor.heatpump_relative_air_humidity,sensor.heatpump_airhumidity,9,0,1,0,1
+"Hybrid Manager HM200",heatpump,248,dewtemperature,dew point temperature,uint8,C,false,sensor.heatpump_dew_point_temperature,sensor.heatpump_dewtemperature,9,0,1,1,1
+"Hybrid Manager HM200",heatpump,248,curflowtemp,current flow temperature,int16,C,false,sensor.heatpump_current_flow_temperature,sensor.heatpump_curflowtemp,9,0,1/10,2,1
+"Hybrid Manager HM200",heatpump,248,rettemp,return temperature,int16,C,false,sensor.heatpump_return_temperature,sensor.heatpump_rettemp,9,0,1/10,3,1
+"Hybrid Manager HM200",heatpump,248,sysrettemp,system return temperature,int16,C,false,sensor.heatpump_system_return_temperature,sensor.heatpump_sysrettemp,9,0,1/10,4,1
+"Hybrid Manager HM200",heatpump,248,hpta4,drain pan temp (TA4),int16,C,false,sensor.heatpump_drain_pan_temp_(TA4),sensor.heatpump_hpta4,9,0,1/10,5,1
+"Hybrid Manager HM200",heatpump,248,hptr1,compressor temperature (TR1),int16,C,false,sensor.heatpump_compressor_temperature_(TR1),sensor.heatpump_hptr1,9,0,1/10,6,1
+"Hybrid Manager HM200",heatpump,248,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16,C,false,sensor.heatpump_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.heatpump_hptr3,9,0,1/10,7,1
+"Hybrid Manager HM200",heatpump,248,hptr4,evaporator inlet temperature (TR4),int16,C,false,sensor.heatpump_evaporator_inlet_temperature_(TR4),sensor.heatpump_hptr4,9,0,1/10,8,1
+"Hybrid Manager HM200",heatpump,248,hptr5,compressor inlet temperature (TR5),int16,C,false,sensor.heatpump_compressor_inlet_temperature_(TR5),sensor.heatpump_hptr5,9,0,1/10,9,1
+"Hybrid Manager HM200",heatpump,248,hptr6,compressor outlet temperature (TR6),int16,C,false,sensor.heatpump_compressor_outlet_temperature_(TR6),sensor.heatpump_hptr6,9,0,1/10,10,1
+"Hybrid Manager HM200",heatpump,248,hptl2,air inlet temperature (TL2),int16,C,false,sensor.heatpump_air_inlet_temperature_(TL2),sensor.heatpump_hptl2,9,0,1/10,11,1
+"Hybrid Manager HM200",heatpump,248,hppl1,low pressure side temperature (PL1),int16,C,false,sensor.heatpump_low_pressure_side_temperature_(PL1),sensor.heatpump_hppl1,9,0,1/10,12,1
+"Hybrid Manager HM200",heatpump,248,hpph1,high pressure side temperature (PH1),int16,C,false,sensor.heatpump_high_pressure_side_temperature_(PH1),sensor.heatpump_hpph1,9,0,1/10,13,1
+"Hybrid Manager HM200",heatpump,248,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.heatpump_heating_pump_modulation,sensor.heatpump_heatingpumpmod,9,0,1,14,1
+"Hybrid Manager HM200",heatpump,248,hpcompspd,compressor speed,uint8,%,false,sensor.heatpump_compressor_speed,sensor.heatpump_hpcompspd,9,0,1,15,1
 "Hybrid Manager HM200",heatpump,248,hpactivity,compressor activity,enum [off\|heating\|hot water\|defrost\|compressor alarm], ,false,sensor.heatpump_compressor_activity,sensor.heatpump_hpactivity,9,0,1,16,1
-"Hybrid Manager HM200",heatpump,248,hppower,compressor power output,uint16 (>=0<=31999),W,false,sensor.heatpump_compressor_power_output,sensor.heatpump_hppower,9,0,1,17,1
-"Hybrid Manager HM200",heatpump,248,hpcurrpower,compressor current power,uint16 (>=0<=31999),W,false,sensor.heatpump_compressor_current_power,sensor.heatpump_hpcurrpower,9,0,1,18,1
-"Hybrid Manager HM200",heatpump,248,hybridstrategy,hybrid control strategy,enum [cost optimized\|co2 optimized\|outside temperature alt.\|outside temperature parallel\|heatpump preferred\|boiler only], ,true,select.heatpump_hybrid_control_strategy,select.heatpump_hybridstrategy,9,0,1,19,1
-"Hybrid Manager HM200",heatpump,248,lownoisemode,low noise mode,enum [off\|reduced output\|switch off hp\|perm. reduced], ,true,select.heatpump_low_noise_mode,select.heatpump_lownoisemode,9,0,1,20,1
+"Hybrid Manager HM200",heatpump,248,hppower,compressor power output,uint16,W,false,sensor.heatpump_compressor_power_output,sensor.heatpump_hppower,9,0,1,17,1
+"Hybrid Manager HM200",heatpump,248,hpcurrpower,compressor current power,uint16,W,false,sensor.heatpump_compressor_current_power,sensor.heatpump_hpcurrpower,9,0,1,18,1
+"Hybrid Manager HM200",heatpump,248,hybridstrategy,hybrid control strategy,enum [cost optimized\|co2 optimized\|outside temperature alt.\|outside temperature parallel\|heatpump preferred\|boiler only] (>=0<=0), ,true,select.heatpump_hybrid_control_strategy,select.heatpump_hybridstrategy,9,0,1,19,1
+"Hybrid Manager HM200",heatpump,248,lownoisemode,low noise mode,enum [off\|reduced output\|switch off hp\|perm. reduced] (>=0<=0), ,true,select.heatpump_low_noise_mode,select.heatpump_lownoisemode,9,0,1,20,1
 "Hybrid Manager HM200",heatpump,248,lownoisestart,low noise starttime,uint8 (>=0<=23),hours,true,number.heatpump_low_noise_starttime,number.heatpump_lownoisestart,9,0,1,21,1
 "Hybrid Manager HM200",heatpump,248,lownoisestop,low noise stoptime,uint8 (>=0<=23),hours,true,number.heatpump_low_noise_stoptime,number.heatpump_lownoisestop,9,0,1,22,1
-"Hybrid Manager HM200",heatpump,248,dhw.hybriddhw,hybrid DHW,enum [eco\|high comfort], ,true,select.heatpump_dhw_hybrid_DHW,select.heatpump_dhw_hybriddhw,9,9,1,0,1
-"Hybrid Manager HM200",heatpump,248,energypricegas,energy price gas,uint8 (>=0<=254),ct/kWh,true,number.heatpump_energy_price_gas,number.heatpump_energypricegas,9,0,1,23,1
-"Hybrid Manager HM200",heatpump,248,energypriceel,energy price electric,uint8 (>=0<=254),ct/kWh,true,number.heatpump_energy_price_electric,number.heatpump_energypriceel,9,0,1,24,1
-"Hybrid Manager HM200",heatpump,248,energyfeedpv,feed in PV,uint8 (>=0<=254),ct/kWh,true,number.heatpump_feed_in_PV,number.heatpump_energyfeedpv,9,0,1,25,1
-"Hybrid Manager HM200",heatpump,248,switchovertemp,outside switchover temperature,int8 (>=-126<=126),C,true,number.heatpump_outside_switchover_temperature,number.heatpump_switchovertemp,9,0,1,26,1
-"Hybrid Manager HM200",heatpump,248,airpurgemode,air purge mode,boolean, ,true,switch.heatpump_air_purge_mode,switch.heatpump_airpurgemode,9,0,1,27,1
-"Hybrid Manager HM200",heatpump,248,heatpumpoutput,heatpump output,uint8 (>=0<=100),%,true,number.heatpump_heatpump_output,number.heatpump_heatpumpoutput,9,0,1,28,1
-"Hybrid Manager HM200",heatpump,248,coolingcircuit,cooling circuit,boolean, ,true,switch.heatpump_cooling_circuit,switch.heatpump_coolingcircuit,9,0,1,29,1
-"Hybrid Manager HM200",heatpump,248,compstartmod,compressor start modulation,uint8 (>=0<=100),%,true,number.heatpump_compressor_start_modulation,number.heatpump_compstartmod,9,0,1,30,1
-"Hybrid Manager HM200",heatpump,248,heatdrainpan,heat drain pan,boolean, ,true,switch.heatpump_heat_drain_pan,switch.heatpump_heatdrainpan,9,0,1,31,1
-"Hybrid Manager HM200",heatpump,248,heatcable,heating cable,boolean, ,true,switch.heatpump_heating_cable,switch.heatpump_heatcable,9,0,1,32,1
-"Hybrid Manager HM200",heatpump,248,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.heatpump_total_energy,sensor.heatpump_nrgtotal,9,0,1/100,33,2
-"Hybrid Manager HM200",heatpump,248,dhw.nrg,energy,uint24 (>=0<=167772),kWh,false,sensor.heatpump_dhw_energy,sensor.heatpump_dhw_nrg,9,9,1/100,1,2
-"Hybrid Manager HM200",heatpump,248,nrgheat,energy heating,uint24 (>=0<=167772),kWh,false,sensor.heatpump_energy_heating,sensor.heatpump_nrgheat,9,0,1/100,35,2
-"Hybrid Manager HM200",heatpump,248,metertotal,meter total,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_total,sensor.heatpump_metertotal,9,0,1/100,37,2
-"Hybrid Manager HM200",heatpump,248,metercomp,meter compressor,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_compressor,sensor.heatpump_metercomp,9,0,1/100,39,2
-"Hybrid Manager HM200",heatpump,248,metereheat,meter e-heater,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_e-heater,sensor.heatpump_metereheat,9,0,1/100,41,2
-"Hybrid Manager HM200",heatpump,248,meterheat,meter heating,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_heating,sensor.heatpump_meterheat,9,0,1/100,43,2
-"Hybrid Manager HM200",heatpump,248,dhw.meter,meter,uint24 (>=0<=167772),kWh,false,sensor.heatpump_dhw_meter,sensor.heatpump_dhw_meter,9,9,1/100,3,2
-"Hybrid Manager HM200",heatpump,248,heatingstarts,heating control starts,uint24 (>=0<=16777214), ,false,sensor.heatpump_heating_control_starts,sensor.heatpump_heatingstarts,9,0,1,45,2
-"Hybrid Manager HM200",heatpump,248,dhw.startshp,starts hp,uint24 (>=0<=16777214), ,false,sensor.heatpump_dhw_starts_hp,sensor.heatpump_dhw_startshp,9,9,1,5,2
-"Hybrid Manager HM200",heatpump,248,fuelheat,fuel consumption heating,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_fuel_consumption_heating,sensor.heatpump_fuelheat,9,0,1/10,47,2
-"Hybrid Manager HM200",heatpump,248,dhw.fueldhw,fuel consumption,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_dhw_fuel_consumption,sensor.heatpump_dhw_fueldhw,9,9,1/10,7,2
-"Hybrid Manager HM200",heatpump,248,elheat,el. consumption heating,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_el._consumption_heating,sensor.heatpump_elheat,9,0,1/10,49,2
-"Hybrid Manager HM200",heatpump,248,dhw.eldhw,el. consumption,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_dhw_el._consumption,sensor.heatpump_dhw_eldhw,9,9,1/10,9,2
-"Hybrid Manager HM200",heatpump,248,elgenheat,el. generation heating,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_el._generation_heating,sensor.heatpump_elgenheat,9,0,1/10,51,2
-"Hybrid Manager HM200",heatpump,248,dhw.elgendhw,el generation,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_dhw_el_generation,sensor.heatpump_dhw_elgendhw,9,9,1/10,11,2
-"CSH5800iG",heatpump,16,airhumidity,relative air humidity,uint8 (>=0<=100),%,false,sensor.heatpump_relative_air_humidity,sensor.heatpump_airhumidity,9,0,1,0,1
-"CSH5800iG",heatpump,16,dewtemperature,dew point temperature,uint8 (>=0<=254),C,false,sensor.heatpump_dew_point_temperature,sensor.heatpump_dewtemperature,9,0,1,1,1
-"CSH5800iG",heatpump,16,curflowtemp,current flow temperature,int16 (>=-3199<=3199),C,false,sensor.heatpump_current_flow_temperature,sensor.heatpump_curflowtemp,9,0,1/10,2,1
-"CSH5800iG",heatpump,16,rettemp,return temperature,int16 (>=-3199<=3199),C,false,sensor.heatpump_return_temperature,sensor.heatpump_rettemp,9,0,1/10,3,1
-"CSH5800iG",heatpump,16,sysrettemp,system return temperature,int16 (>=-3199<=3199),C,false,sensor.heatpump_system_return_temperature,sensor.heatpump_sysrettemp,9,0,1/10,4,1
-"CSH5800iG",heatpump,16,hpta4,drain pan temp (TA4),int16 (>=-3199<=3199),C,false,sensor.heatpump_drain_pan_temp_(TA4),sensor.heatpump_hpta4,9,0,1/10,5,1
-"CSH5800iG",heatpump,16,hptr1,compressor temperature (TR1),int16 (>=-3199<=3199),C,false,sensor.heatpump_compressor_temperature_(TR1),sensor.heatpump_hptr1,9,0,1/10,6,1
-"CSH5800iG",heatpump,16,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16 (>=-3199<=3199),C,false,sensor.heatpump_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.heatpump_hptr3,9,0,1/10,7,1
-"CSH5800iG",heatpump,16,hptr4,evaporator inlet temperature (TR4),int16 (>=-3199<=3199),C,false,sensor.heatpump_evaporator_inlet_temperature_(TR4),sensor.heatpump_hptr4,9,0,1/10,8,1
-"CSH5800iG",heatpump,16,hptr5,compressor inlet temperature (TR5),int16 (>=-3199<=3199),C,false,sensor.heatpump_compressor_inlet_temperature_(TR5),sensor.heatpump_hptr5,9,0,1/10,9,1
-"CSH5800iG",heatpump,16,hptr6,compressor outlet temperature (TR6),int16 (>=-3199<=3199),C,false,sensor.heatpump_compressor_outlet_temperature_(TR6),sensor.heatpump_hptr6,9,0,1/10,10,1
-"CSH5800iG",heatpump,16,hptl2,air inlet temperature (TL2),int16 (>=-3199<=3199),C,false,sensor.heatpump_air_inlet_temperature_(TL2),sensor.heatpump_hptl2,9,0,1/10,11,1
-"CSH5800iG",heatpump,16,hppl1,low pressure side temperature (PL1),int16 (>=-3199<=3199),C,false,sensor.heatpump_low_pressure_side_temperature_(PL1),sensor.heatpump_hppl1,9,0,1/10,12,1
-"CSH5800iG",heatpump,16,hpph1,high pressure side temperature (PH1),int16 (>=-3199<=3199),C,false,sensor.heatpump_high_pressure_side_temperature_(PH1),sensor.heatpump_hpph1,9,0,1/10,13,1
-"CSH5800iG",heatpump,16,heatingpumpmod,heating pump modulation,uint8 (>=0<=100),%,false,sensor.heatpump_heating_pump_modulation,sensor.heatpump_heatingpumpmod,9,0,1,14,1
-"CSH5800iG",heatpump,16,hpcompspd,compressor speed,uint8 (>=0<=100),%,false,sensor.heatpump_compressor_speed,sensor.heatpump_hpcompspd,9,0,1,15,1
+"Hybrid Manager HM200",heatpump,248,dhw.hybriddhw,hybrid DHW,enum [eco\|high comfort] (>=0<=0), ,true,select.heatpump_dhw_hybrid_DHW,select.heatpump_dhw_hybriddhw,9,9,1,0,1
+"Hybrid Manager HM200",heatpump,248,energypricegas,energy price gas,uint8 (>=0<=0),ct/kWh,true,number.heatpump_energy_price_gas,number.heatpump_energypricegas,9,0,1,23,1
+"Hybrid Manager HM200",heatpump,248,energypriceel,energy price electric,uint8 (>=0<=0),ct/kWh,true,number.heatpump_energy_price_electric,number.heatpump_energypriceel,9,0,1,24,1
+"Hybrid Manager HM200",heatpump,248,energyfeedpv,feed in PV,uint8 (>=0<=0),ct/kWh,true,number.heatpump_feed_in_PV,number.heatpump_energyfeedpv,9,0,1,25,1
+"Hybrid Manager HM200",heatpump,248,switchovertemp,outside switchover temperature,int8 (>=0<=0),C,true,number.heatpump_outside_switchover_temperature,number.heatpump_switchovertemp,9,0,1,26,1
+"Hybrid Manager HM200",heatpump,248,airpurgemode,air purge mode,boolean (>=0<=0), ,true,switch.heatpump_air_purge_mode,switch.heatpump_airpurgemode,9,0,1,27,1
+"Hybrid Manager HM200",heatpump,248,heatpumpoutput,heatpump output,uint8 (>=0<=0),%,true,number.heatpump_heatpump_output,number.heatpump_heatpumpoutput,9,0,1,28,1
+"Hybrid Manager HM200",heatpump,248,coolingcircuit,cooling circuit,boolean (>=0<=0), ,true,switch.heatpump_cooling_circuit,switch.heatpump_coolingcircuit,9,0,1,29,1
+"Hybrid Manager HM200",heatpump,248,compstartmod,compressor start modulation,uint8 (>=0<=0),%,true,number.heatpump_compressor_start_modulation,number.heatpump_compstartmod,9,0,1,30,1
+"Hybrid Manager HM200",heatpump,248,heatdrainpan,heat drain pan,boolean (>=0<=0), ,true,switch.heatpump_heat_drain_pan,switch.heatpump_heatdrainpan,9,0,1,31,1
+"Hybrid Manager HM200",heatpump,248,heatcable,heating cable,boolean (>=0<=0), ,true,switch.heatpump_heating_cable,switch.heatpump_heatcable,9,0,1,32,1
+"Hybrid Manager HM200",heatpump,248,nrgtotal,total energy,uint24,kWh,false,sensor.heatpump_total_energy,sensor.heatpump_nrgtotal,9,0,1/100,33,2
+"Hybrid Manager HM200",heatpump,248,dhw.nrg,energy,uint24,kWh,false,sensor.heatpump_dhw_energy,sensor.heatpump_dhw_nrg,9,9,1/100,1,2
+"Hybrid Manager HM200",heatpump,248,nrgheat,energy heating,uint24,kWh,false,sensor.heatpump_energy_heating,sensor.heatpump_nrgheat,9,0,1/100,35,2
+"Hybrid Manager HM200",heatpump,248,metertotal,meter total,uint24,kWh,false,sensor.heatpump_meter_total,sensor.heatpump_metertotal,9,0,1/100,37,2
+"Hybrid Manager HM200",heatpump,248,metercomp,meter compressor,uint24,kWh,false,sensor.heatpump_meter_compressor,sensor.heatpump_metercomp,9,0,1/100,39,2
+"Hybrid Manager HM200",heatpump,248,metereheat,meter e-heater,uint24,kWh,false,sensor.heatpump_meter_e-heater,sensor.heatpump_metereheat,9,0,1/100,41,2
+"Hybrid Manager HM200",heatpump,248,meterheat,meter heating,uint24,kWh,false,sensor.heatpump_meter_heating,sensor.heatpump_meterheat,9,0,1/100,43,2
+"Hybrid Manager HM200",heatpump,248,dhw.meter,meter,uint24,kWh,false,sensor.heatpump_dhw_meter,sensor.heatpump_dhw_meter,9,9,1/100,3,2
+"Hybrid Manager HM200",heatpump,248,heatingstarts,heating control starts,uint24, ,false,sensor.heatpump_heating_control_starts,sensor.heatpump_heatingstarts,9,0,1,45,2
+"Hybrid Manager HM200",heatpump,248,dhw.startshp,starts hp,uint24, ,false,sensor.heatpump_dhw_starts_hp,sensor.heatpump_dhw_startshp,9,9,1,5,2
+"Hybrid Manager HM200",heatpump,248,fuelheat,fuel consumption heating,uint32,kWh,false,sensor.heatpump_fuel_consumption_heating,sensor.heatpump_fuelheat,9,0,1/10,47,2
+"Hybrid Manager HM200",heatpump,248,dhw.fueldhw,fuel consumption,uint32,kWh,false,sensor.heatpump_dhw_fuel_consumption,sensor.heatpump_dhw_fueldhw,9,9,1/10,7,2
+"Hybrid Manager HM200",heatpump,248,elheat,el. consumption heating,uint32,kWh,false,sensor.heatpump_el._consumption_heating,sensor.heatpump_elheat,9,0,1/10,49,2
+"Hybrid Manager HM200",heatpump,248,dhw.eldhw,el. consumption,uint32,kWh,false,sensor.heatpump_dhw_el._consumption,sensor.heatpump_dhw_eldhw,9,9,1/10,9,2
+"Hybrid Manager HM200",heatpump,248,elgenheat,el. generation heating,uint32,kWh,false,sensor.heatpump_el._generation_heating,sensor.heatpump_elgenheat,9,0,1/10,51,2
+"Hybrid Manager HM200",heatpump,248,dhw.elgendhw,el generation,uint32,kWh,false,sensor.heatpump_dhw_el_generation,sensor.heatpump_dhw_elgendhw,9,9,1/10,11,2
+"CSH5800iG",heatpump,16,airhumidity,relative air humidity,uint8,%,false,sensor.heatpump_relative_air_humidity,sensor.heatpump_airhumidity,9,0,1,0,1
+"CSH5800iG",heatpump,16,dewtemperature,dew point temperature,uint8,C,false,sensor.heatpump_dew_point_temperature,sensor.heatpump_dewtemperature,9,0,1,1,1
+"CSH5800iG",heatpump,16,curflowtemp,current flow temperature,int16,C,false,sensor.heatpump_current_flow_temperature,sensor.heatpump_curflowtemp,9,0,1/10,2,1
+"CSH5800iG",heatpump,16,rettemp,return temperature,int16,C,false,sensor.heatpump_return_temperature,sensor.heatpump_rettemp,9,0,1/10,3,1
+"CSH5800iG",heatpump,16,sysrettemp,system return temperature,int16,C,false,sensor.heatpump_system_return_temperature,sensor.heatpump_sysrettemp,9,0,1/10,4,1
+"CSH5800iG",heatpump,16,hpta4,drain pan temp (TA4),int16,C,false,sensor.heatpump_drain_pan_temp_(TA4),sensor.heatpump_hpta4,9,0,1/10,5,1
+"CSH5800iG",heatpump,16,hptr1,compressor temperature (TR1),int16,C,false,sensor.heatpump_compressor_temperature_(TR1),sensor.heatpump_hptr1,9,0,1/10,6,1
+"CSH5800iG",heatpump,16,hptr3,refrigerant temperature liquid side (condenser output) (TR3),int16,C,false,sensor.heatpump_refrigerant_temperature_liquid_side_(condenser_output)_(TR3),sensor.heatpump_hptr3,9,0,1/10,7,1
+"CSH5800iG",heatpump,16,hptr4,evaporator inlet temperature (TR4),int16,C,false,sensor.heatpump_evaporator_inlet_temperature_(TR4),sensor.heatpump_hptr4,9,0,1/10,8,1
+"CSH5800iG",heatpump,16,hptr5,compressor inlet temperature (TR5),int16,C,false,sensor.heatpump_compressor_inlet_temperature_(TR5),sensor.heatpump_hptr5,9,0,1/10,9,1
+"CSH5800iG",heatpump,16,hptr6,compressor outlet temperature (TR6),int16,C,false,sensor.heatpump_compressor_outlet_temperature_(TR6),sensor.heatpump_hptr6,9,0,1/10,10,1
+"CSH5800iG",heatpump,16,hptl2,air inlet temperature (TL2),int16,C,false,sensor.heatpump_air_inlet_temperature_(TL2),sensor.heatpump_hptl2,9,0,1/10,11,1
+"CSH5800iG",heatpump,16,hppl1,low pressure side temperature (PL1),int16,C,false,sensor.heatpump_low_pressure_side_temperature_(PL1),sensor.heatpump_hppl1,9,0,1/10,12,1
+"CSH5800iG",heatpump,16,hpph1,high pressure side temperature (PH1),int16,C,false,sensor.heatpump_high_pressure_side_temperature_(PH1),sensor.heatpump_hpph1,9,0,1/10,13,1
+"CSH5800iG",heatpump,16,heatingpumpmod,heating pump modulation,uint8,%,false,sensor.heatpump_heating_pump_modulation,sensor.heatpump_heatingpumpmod,9,0,1,14,1
+"CSH5800iG",heatpump,16,hpcompspd,compressor speed,uint8,%,false,sensor.heatpump_compressor_speed,sensor.heatpump_hpcompspd,9,0,1,15,1
 "CSH5800iG",heatpump,16,hpactivity,compressor activity,enum [off\|heating\|hot water\|defrost\|compressor alarm], ,false,sensor.heatpump_compressor_activity,sensor.heatpump_hpactivity,9,0,1,16,1
-"CSH5800iG",heatpump,16,hppower,compressor power output,uint16 (>=0<=31999),W,false,sensor.heatpump_compressor_power_output,sensor.heatpump_hppower,9,0,1,17,1
-"CSH5800iG",heatpump,16,hpcurrpower,compressor current power,uint16 (>=0<=31999),W,false,sensor.heatpump_compressor_current_power,sensor.heatpump_hpcurrpower,9,0,1,18,1
-"CSH5800iG",heatpump,16,hybridstrategy,hybrid control strategy,enum [cost optimized\|co2 optimized\|outside temperature alt.\|outside temperature parallel\|heatpump preferred\|boiler only], ,true,select.heatpump_hybrid_control_strategy,select.heatpump_hybridstrategy,9,0,1,19,1
-"CSH5800iG",heatpump,16,lownoisemode,low noise mode,enum [off\|reduced output\|switch off hp\|perm. reduced], ,true,select.heatpump_low_noise_mode,select.heatpump_lownoisemode,9,0,1,20,1
+"CSH5800iG",heatpump,16,hppower,compressor power output,uint16,W,false,sensor.heatpump_compressor_power_output,sensor.heatpump_hppower,9,0,1,17,1
+"CSH5800iG",heatpump,16,hpcurrpower,compressor current power,uint16,W,false,sensor.heatpump_compressor_current_power,sensor.heatpump_hpcurrpower,9,0,1,18,1
+"CSH5800iG",heatpump,16,hybridstrategy,hybrid control strategy,enum [cost optimized\|co2 optimized\|outside temperature alt.\|outside temperature parallel\|heatpump preferred\|boiler only] (>=0<=0), ,true,select.heatpump_hybrid_control_strategy,select.heatpump_hybridstrategy,9,0,1,19,1
+"CSH5800iG",heatpump,16,lownoisemode,low noise mode,enum [off\|reduced output\|switch off hp\|perm. reduced] (>=0<=0), ,true,select.heatpump_low_noise_mode,select.heatpump_lownoisemode,9,0,1,20,1
 "CSH5800iG",heatpump,16,lownoisestart,low noise starttime,uint8 (>=0<=23),hours,true,number.heatpump_low_noise_starttime,number.heatpump_lownoisestart,9,0,1,21,1
 "CSH5800iG",heatpump,16,lownoisestop,low noise stoptime,uint8 (>=0<=23),hours,true,number.heatpump_low_noise_stoptime,number.heatpump_lownoisestop,9,0,1,22,1
-"CSH5800iG",heatpump,16,dhw.hybriddhw,hybrid DHW,enum [eco\|high comfort], ,true,select.heatpump_dhw_hybrid_DHW,select.heatpump_dhw_hybriddhw,9,9,1,0,1
-"CSH5800iG",heatpump,16,energypricegas,energy price gas,uint8 (>=0<=254),ct/kWh,true,number.heatpump_energy_price_gas,number.heatpump_energypricegas,9,0,1,23,1
-"CSH5800iG",heatpump,16,energypriceel,energy price electric,uint8 (>=0<=254),ct/kWh,true,number.heatpump_energy_price_electric,number.heatpump_energypriceel,9,0,1,24,1
-"CSH5800iG",heatpump,16,energyfeedpv,feed in PV,uint8 (>=0<=254),ct/kWh,true,number.heatpump_feed_in_PV,number.heatpump_energyfeedpv,9,0,1,25,1
-"CSH5800iG",heatpump,16,switchovertemp,outside switchover temperature,int8 (>=-126<=126),C,true,number.heatpump_outside_switchover_temperature,number.heatpump_switchovertemp,9,0,1,26,1
-"CSH5800iG",heatpump,16,airpurgemode,air purge mode,boolean, ,true,switch.heatpump_air_purge_mode,switch.heatpump_airpurgemode,9,0,1,27,1
-"CSH5800iG",heatpump,16,heatpumpoutput,heatpump output,uint8 (>=0<=100),%,true,number.heatpump_heatpump_output,number.heatpump_heatpumpoutput,9,0,1,28,1
-"CSH5800iG",heatpump,16,coolingcircuit,cooling circuit,boolean, ,true,switch.heatpump_cooling_circuit,switch.heatpump_coolingcircuit,9,0,1,29,1
-"CSH5800iG",heatpump,16,compstartmod,compressor start modulation,uint8 (>=0<=100),%,true,number.heatpump_compressor_start_modulation,number.heatpump_compstartmod,9,0,1,30,1
-"CSH5800iG",heatpump,16,heatdrainpan,heat drain pan,boolean, ,true,switch.heatpump_heat_drain_pan,switch.heatpump_heatdrainpan,9,0,1,31,1
-"CSH5800iG",heatpump,16,heatcable,heating cable,boolean, ,true,switch.heatpump_heating_cable,switch.heatpump_heatcable,9,0,1,32,1
-"CSH5800iG",heatpump,16,nrgtotal,total energy,uint24 (>=0<=167772),kWh,false,sensor.heatpump_total_energy,sensor.heatpump_nrgtotal,9,0,1/100,33,2
-"CSH5800iG",heatpump,16,dhw.nrg,energy,uint24 (>=0<=167772),kWh,false,sensor.heatpump_dhw_energy,sensor.heatpump_dhw_nrg,9,9,1/100,1,2
-"CSH5800iG",heatpump,16,nrgheat,energy heating,uint24 (>=0<=167772),kWh,false,sensor.heatpump_energy_heating,sensor.heatpump_nrgheat,9,0,1/100,35,2
-"CSH5800iG",heatpump,16,metertotal,meter total,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_total,sensor.heatpump_metertotal,9,0,1/100,37,2
-"CSH5800iG",heatpump,16,metercomp,meter compressor,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_compressor,sensor.heatpump_metercomp,9,0,1/100,39,2
-"CSH5800iG",heatpump,16,metereheat,meter e-heater,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_e-heater,sensor.heatpump_metereheat,9,0,1/100,41,2
-"CSH5800iG",heatpump,16,meterheat,meter heating,uint24 (>=0<=167772),kWh,false,sensor.heatpump_meter_heating,sensor.heatpump_meterheat,9,0,1/100,43,2
-"CSH5800iG",heatpump,16,dhw.meter,meter,uint24 (>=0<=167772),kWh,false,sensor.heatpump_dhw_meter,sensor.heatpump_dhw_meter,9,9,1/100,3,2
-"CSH5800iG",heatpump,16,heatingstarts,heating control starts,uint24 (>=0<=16777214), ,false,sensor.heatpump_heating_control_starts,sensor.heatpump_heatingstarts,9,0,1,45,2
-"CSH5800iG",heatpump,16,dhw.startshp,starts hp,uint24 (>=0<=16777214), ,false,sensor.heatpump_dhw_starts_hp,sensor.heatpump_dhw_startshp,9,9,1,5,2
-"CSH5800iG",heatpump,16,fuelheat,fuel consumption heating,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_fuel_consumption_heating,sensor.heatpump_fuelheat,9,0,1/10,47,2
-"CSH5800iG",heatpump,16,dhw.fueldhw,fuel consumption,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_dhw_fuel_consumption,sensor.heatpump_dhw_fueldhw,9,9,1/10,7,2
-"CSH5800iG",heatpump,16,elheat,el. consumption heating,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_el._consumption_heating,sensor.heatpump_elheat,9,0,1/10,49,2
-"CSH5800iG",heatpump,16,dhw.eldhw,el. consumption,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_dhw_el._consumption,sensor.heatpump_dhw_eldhw,9,9,1/10,9,2
-"CSH5800iG",heatpump,16,elgenheat,el. generation heating,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_el._generation_heating,sensor.heatpump_elgenheat,9,0,1/10,51,2
-"CSH5800iG",heatpump,16,dhw.elgendhw,el generation,uint32 (>=0<=1677721),kWh,false,sensor.heatpump_dhw_el_generation,sensor.heatpump_dhw_elgendhw,9,9,1/10,11,2
+"CSH5800iG",heatpump,16,dhw.hybriddhw,hybrid DHW,enum [eco\|high comfort] (>=0<=0), ,true,select.heatpump_dhw_hybrid_DHW,select.heatpump_dhw_hybriddhw,9,9,1,0,1
+"CSH5800iG",heatpump,16,energypricegas,energy price gas,uint8 (>=0<=0),ct/kWh,true,number.heatpump_energy_price_gas,number.heatpump_energypricegas,9,0,1,23,1
+"CSH5800iG",heatpump,16,energypriceel,energy price electric,uint8 (>=0<=0),ct/kWh,true,number.heatpump_energy_price_electric,number.heatpump_energypriceel,9,0,1,24,1
+"CSH5800iG",heatpump,16,energyfeedpv,feed in PV,uint8 (>=0<=0),ct/kWh,true,number.heatpump_feed_in_PV,number.heatpump_energyfeedpv,9,0,1,25,1
+"CSH5800iG",heatpump,16,switchovertemp,outside switchover temperature,int8 (>=0<=0),C,true,number.heatpump_outside_switchover_temperature,number.heatpump_switchovertemp,9,0,1,26,1
+"CSH5800iG",heatpump,16,airpurgemode,air purge mode,boolean (>=0<=0), ,true,switch.heatpump_air_purge_mode,switch.heatpump_airpurgemode,9,0,1,27,1
+"CSH5800iG",heatpump,16,heatpumpoutput,heatpump output,uint8 (>=0<=0),%,true,number.heatpump_heatpump_output,number.heatpump_heatpumpoutput,9,0,1,28,1
+"CSH5800iG",heatpump,16,coolingcircuit,cooling circuit,boolean (>=0<=0), ,true,switch.heatpump_cooling_circuit,switch.heatpump_coolingcircuit,9,0,1,29,1
+"CSH5800iG",heatpump,16,compstartmod,compressor start modulation,uint8 (>=0<=0),%,true,number.heatpump_compressor_start_modulation,number.heatpump_compstartmod,9,0,1,30,1
+"CSH5800iG",heatpump,16,heatdrainpan,heat drain pan,boolean (>=0<=0), ,true,switch.heatpump_heat_drain_pan,switch.heatpump_heatdrainpan,9,0,1,31,1
+"CSH5800iG",heatpump,16,heatcable,heating cable,boolean (>=0<=0), ,true,switch.heatpump_heating_cable,switch.heatpump_heatcable,9,0,1,32,1
+"CSH5800iG",heatpump,16,nrgtotal,total energy,uint24,kWh,false,sensor.heatpump_total_energy,sensor.heatpump_nrgtotal,9,0,1/100,33,2
+"CSH5800iG",heatpump,16,dhw.nrg,energy,uint24,kWh,false,sensor.heatpump_dhw_energy,sensor.heatpump_dhw_nrg,9,9,1/100,1,2
+"CSH5800iG",heatpump,16,nrgheat,energy heating,uint24,kWh,false,sensor.heatpump_energy_heating,sensor.heatpump_nrgheat,9,0,1/100,35,2
+"CSH5800iG",heatpump,16,metertotal,meter total,uint24,kWh,false,sensor.heatpump_meter_total,sensor.heatpump_metertotal,9,0,1/100,37,2
+"CSH5800iG",heatpump,16,metercomp,meter compressor,uint24,kWh,false,sensor.heatpump_meter_compressor,sensor.heatpump_metercomp,9,0,1/100,39,2
+"CSH5800iG",heatpump,16,metereheat,meter e-heater,uint24,kWh,false,sensor.heatpump_meter_e-heater,sensor.heatpump_metereheat,9,0,1/100,41,2
+"CSH5800iG",heatpump,16,meterheat,meter heating,uint24,kWh,false,sensor.heatpump_meter_heating,sensor.heatpump_meterheat,9,0,1/100,43,2
+"CSH5800iG",heatpump,16,dhw.meter,meter,uint24,kWh,false,sensor.heatpump_dhw_meter,sensor.heatpump_dhw_meter,9,9,1/100,3,2
+"CSH5800iG",heatpump,16,heatingstarts,heating control starts,uint24, ,false,sensor.heatpump_heating_control_starts,sensor.heatpump_heatingstarts,9,0,1,45,2
+"CSH5800iG",heatpump,16,dhw.startshp,starts hp,uint24, ,false,sensor.heatpump_dhw_starts_hp,sensor.heatpump_dhw_startshp,9,9,1,5,2
+"CSH5800iG",heatpump,16,fuelheat,fuel consumption heating,uint32,kWh,false,sensor.heatpump_fuel_consumption_heating,sensor.heatpump_fuelheat,9,0,1/10,47,2
+"CSH5800iG",heatpump,16,dhw.fueldhw,fuel consumption,uint32,kWh,false,sensor.heatpump_dhw_fuel_consumption,sensor.heatpump_dhw_fueldhw,9,9,1/10,7,2
+"CSH5800iG",heatpump,16,elheat,el. consumption heating,uint32,kWh,false,sensor.heatpump_el._consumption_heating,sensor.heatpump_elheat,9,0,1/10,49,2
+"CSH5800iG",heatpump,16,dhw.eldhw,el. consumption,uint32,kWh,false,sensor.heatpump_dhw_el._consumption,sensor.heatpump_dhw_eldhw,9,9,1/10,9,2
+"CSH5800iG",heatpump,16,elgenheat,el. generation heating,uint32,kWh,false,sensor.heatpump_el._generation_heating,sensor.heatpump_elgenheat,9,0,1/10,51,2
+"CSH5800iG",heatpump,16,dhw.elgendhw,el generation,uint32,kWh,false,sensor.heatpump_dhw_el_generation,sensor.heatpump_dhw_elgendhw,9,9,1/10,11,2
 "WM10",switch,71,activated,activated,boolean, ,false,binary_sensor.switch_activated,binary_sensor.switch_activated,11,0,1,0,1
-"WM10",switch,71,flowtemphc,flow temperature (TC1),uint16 (>=0<=3199),C,false,sensor.switch_flow_temperature_(TC1),sensor.switch_flowtemphc,11,0,1/10,1,1
-"WM10",switch,71,status,status,int8 (>=-126<=126), ,false,sensor.switch_status,sensor.switch_status,11,0,1,2,1
+"WM10",switch,71,flowtemphc,flow temperature (TC1),uint16,C,false,sensor.switch_flow_temperature_(TC1),sensor.switch_flowtemphc,11,0,1/10,1,1
+"WM10",switch,71,status,status,int8, ,false,sensor.switch_status,sensor.switch_status,11,0,1,2,1
 "Rego 3000",controller,240,datetime,date/time,string, ,false,sensor.controller_date/time,sensor.controller_datetime,12,0,1,0,13
 "MX400",connect,17,datetime,date/time,string, ,false,sensor.connect_date/time,sensor.connect_datetime,13,0,1,0,13
-"MX400",connect,17,outdoortemp,outside temperature,int16 (>=-3199<=3199),C,false,sensor.connect_outside_temperature,sensor.connect_outdoortemp,13,0,1/10,13,1
-"MX400",connect,17,src1.currtemp,current room temperature,int16 (>=-3199<=3199),C,false,sensor.connect_src1_current_room_temperature,sensor.connect_src1_currtemp,13,36,1/10,0,1
-"MX400",connect,17,src1.airhumidity,relative air humidity,int8 (>=-100<=100),%,false,sensor.connect_src1_relative_air_humidity,sensor.connect_src1_airhumidity,13,36,1,1,1
-"MX400",connect,17,src1.dewtemperature,dew point temperature,int16 (>=-3199<=3199),C,false,sensor.connect_src1_dew_point_temperature,sensor.connect_src1_dewtemperature,13,36,1/10,2,1
+"MX400",connect,17,outdoortemp,outside temperature,int16,C,false,sensor.connect_outside_temperature,sensor.connect_outdoortemp,13,0,1/10,13,1
+"MX400",connect,17,src1.currtemp,current room temperature,int16,C,false,sensor.connect_src1_current_room_temperature,sensor.connect_src1_currtemp,13,36,1/10,0,1
+"MX400",connect,17,src1.airhumidity,relative air humidity,int8,%,false,sensor.connect_src1_relative_air_humidity,sensor.connect_src1_airhumidity,13,36,1,1,1
+"MX400",connect,17,src1.dewtemperature,dew point temperature,int16,C,false,sensor.connect_src1_dew_point_temperature,sensor.connect_src1_dewtemperature,13,36,1/10,2,1
 "MX400",connect,17,src1.seltemp,selected room temperature,uint8 (>=5<=30),C,true,number.connect_src1_selected_room_temperature,number.connect_src1_seltemp,13,36,1/2,3,1
-"MX400",connect,17,src1.mode,operating mode,enum [off\|manual\|auto], ,true,select.connect_src1_operating_mode,select.connect_src1_mode,13,36,1,4,1
-"MX400",connect,17,src1.name,name,string, ,true,sensor.connect_src1_name,sensor.connect_src1_name,13,36,1,5,26
-"MX400",connect,17,src1.childlock,child lock,boolean, ,true,switch.connect_src1_child_lock,switch.connect_src1_childlock,13,36,1,31,1
-"MX400",connect,17,src1.icon,icon,enum [none\|mdi:chef-hat\|mdi:sofa-single-outline\|mdi:bowl-mix-outline\|mdi:bed-single-outline\|mdi:bed-double-outline\|mdi:teddy-bear\|mdi:shower\|mdi:laptop\|mdi:door\|mdi:palette-outline\|mdi:washing-machine\|mdi:bookshelf], ,true,select.connect_src1_icon,select.connect_src1_icon,13,36,1,32,1
-"EM10",alert,74,setflowtemp,set flow temperature,uint8 (>=0<=254),C,false,sensor.alert_set_flow_temperature,sensor.alert_setflowtemp,14,0,1,0,1
-"EM10",alert,74,setburnpow,burner set power,uint8 (>=0<=100),%,false,sensor.alert_burner_set_power,sensor.alert_setburnpow,14,0,1,1,1
-"EM10, EM100",extension,243,flowtempvf,flow temperature in header (T0/Vf),int16 (>=-3199<=3199),C,false,sensor.extension_flow_temperature_in_header_(T0/Vf),sensor.extension_flowtempvf,15,0,1/10,0,1
-"EM10, EM100",extension,243,input,input,uint8 (>=0<=25),V,false,sensor.extension_input,sensor.extension_input,15,0,1/10,1,1
-"EM10, EM100",extension,243,outpow,output IO1,uint8 (>=0<=100),%,false,sensor.extension_output_IO1,sensor.extension_outpow,15,0,1,2,1
-"EM10, EM100",extension,243,setpower,request power,uint8 (>=0<=100),%,false,sensor.extension_request_power,sensor.extension_setpower,15,0,1,3,1
-"EM10, EM100",extension,243,setpoint,set temp.,uint8 (>=0<=254),C,false,sensor.extension_set_temp.,sensor.extension_setpoint,15,0,1,4,1
-"EM10, EM100",extension,243,minv,min volt.,uint8 (>=0<=25),V,true,number.extension_min_volt.,number.extension_minv,15,0,1/10,5,1
-"EM10, EM100",extension,243,maxv,max volt.,uint8 (>=0<=25),V,true,number.extension_max_volt.,number.extension_maxv,15,0,1/10,6,1
-"EM10, EM100",extension,243,mint,min temp.,uint8 (>=0<=254),C,true,number.extension_min_temp.,number.extension_mint,15,0,1,7,1
-"EM10, EM100",extension,243,maxt,max temp.,uint8 (>=0<=254),C,true,number.extension_max_temp.,number.extension_maxt,15,0,1,8,1
-"EM10, EM100",extension,243,mode,operating mode,uint8 (>=0<=254), ,false,sensor.extension_operating_mode,sensor.extension_mode,15,0,1,9,1
-"T1RF",extension,220,flowtempvf,flow temperature in header (T0/Vf),int16 (>=-3199<=3199),C,false,sensor.extension_flow_temperature_in_header_(T0/Vf),sensor.extension_flowtempvf,15,0,1/10,0,1
-"T1RF",extension,220,input,input,uint8 (>=0<=25),V,false,sensor.extension_input,sensor.extension_input,15,0,1/10,1,1
-"T1RF",extension,220,outpow,output IO1,uint8 (>=0<=100),%,false,sensor.extension_output_IO1,sensor.extension_outpow,15,0,1,2,1
-"T1RF",extension,220,setpower,request power,uint8 (>=0<=100),%,false,sensor.extension_request_power,sensor.extension_setpower,15,0,1,3,1
-"T1RF",extension,220,setpoint,set temp.,uint8 (>=0<=254),C,false,sensor.extension_set_temp.,sensor.extension_setpoint,15,0,1,4,1
-"T1RF",extension,220,minv,min volt.,uint8 (>=0<=25),V,true,number.extension_min_volt.,number.extension_minv,15,0,1/10,5,1
-"T1RF",extension,220,maxv,max volt.,uint8 (>=0<=25),V,true,number.extension_max_volt.,number.extension_maxv,15,0,1/10,6,1
-"T1RF",extension,220,mint,min temp.,uint8 (>=0<=254),C,true,number.extension_min_temp.,number.extension_mint,15,0,1,7,1
-"T1RF",extension,220,maxt,max temp.,uint8 (>=0<=254),C,true,number.extension_max_temp.,number.extension_maxt,15,0,1,8,1
-"T1RF",extension,220,mode,operating mode,uint8 (>=0<=254), ,false,sensor.extension_operating_mode,sensor.extension_mode,15,0,1,9,1
-"AM200",heatsource,228,ahs1.sysflowtemp,system flow temperature,int16 (>=-3199<=3199),C,false,sensor.heatsource_ahs1_system_flow_temperature,sensor.heatsource_ahs1_sysflowtemp,17,19,1/10,0,1
-"AM200",heatsource,228,ahs1.sysrettemp,system return temperature,int16 (>=-3199<=3199),C,false,sensor.heatsource_ahs1_system_return_temperature,sensor.heatsource_ahs1_sysrettemp,17,19,1/10,1,1
-"AM200",heatsource,228,ahs1.altflowtemp,alternative hs flow temperature,int16 (>=-3199<=3199),C,false,sensor.heatsource_ahs1_alternative_hs_flow_temperature,sensor.heatsource_ahs1_altflowtemp,17,19,1/10,2,1
-"AM200",heatsource,228,ahs1.altrettemp,alternative hs return temperature,int16 (>=-3199<=3199),C,false,sensor.heatsource_ahs1_alternative_hs_return_temperature,sensor.heatsource_ahs1_altrettemp,17,19,1/10,3,1
-"AM200",heatsource,228,ahs1.cyltoptemp,cylinder top temperature,int16 (>=-3199<=3199),C,false,sensor.heatsource_ahs1_cylinder_top_temperature,sensor.heatsource_ahs1_cyltoptemp,17,19,1/10,4,1
-"AM200",heatsource,228,ahs1.cylcentertemp,cylinder center temperature,int16 (>=-3199<=3199),C,false,sensor.heatsource_ahs1_cylinder_center_temperature,sensor.heatsource_ahs1_cylcentertemp,17,19,1/10,5,1
-"AM200",heatsource,228,ahs1.cylbottomtemp,cylinder bottom temperature,int16 (>=-3199<=3199),C,false,sensor.heatsource_ahs1_cylinder_bottom_temperature,sensor.heatsource_ahs1_cylbottomtemp,17,19,1/10,6,1
-"AM200",heatsource,228,ahs1.fluegastemp,flue gas temperature,int16 (>=-3199<=3199),C,false,sensor.heatsource_ahs1_flue_gas_temperature,sensor.heatsource_ahs1_fluegastemp,17,19,1/10,7,1
-"AM200",heatsource,228,ahs1.valvebuffer,buffer valve,uint8 (>=0<=100),%,false,sensor.heatsource_ahs1_buffer_valve,sensor.heatsource_ahs1_valvebuffer,17,19,1,8,1
-"AM200",heatsource,228,ahs1.valvereturn,return valve,uint8 (>=0<=100),%,false,sensor.heatsource_ahs1_return_valve,sensor.heatsource_ahs1_valvereturn,17,19,1,9,1
-"AM200",heatsource,228,ahs1.apumpmod,alternative hs pump modulation,uint8 (>=0<=100),%,false,sensor.heatsource_ahs1_alternative_hs_pump_modulation,sensor.heatsource_ahs1_apumpmod,17,19,1,10,1
-"AM200",heatsource,228,ahs1.vr2config,vr2 configuration,enum [off\|bypass], ,true,select.heatsource_ahs1_vr2_configuration,select.heatsource_ahs1_vr2config,17,19,1,11,1
-"AM200",heatsource,228,ahs1.ahsactivated,alternate heat source activation,boolean, ,true,switch.heatsource_ahs1_alternate_heat_source_activation,switch.heatsource_ahs1_ahsactivated,17,19,1,12,1
-"AM200",heatsource,228,ahs1.apumpconfig,primary pump config,boolean, ,true,switch.heatsource_ahs1_primary_pump_config,switch.heatsource_ahs1_apumpconfig,17,19,1,13,1
-"AM200",heatsource,228,ahs1.apumpsignal,output for pr1 pump,enum [off\|pwm\|pwm inverse], ,true,select.heatsource_ahs1_output_for_pr1_pump,select.heatsource_ahs1_apumpsignal,17,19,1,14,1
+"MX400",connect,17,src1.mode,operating mode,enum [off\|manual\|auto] (>=0<=0), ,true,select.connect_src1_operating_mode,select.connect_src1_mode,13,36,1,4,1
+"MX400",connect,17,src1.name,name,string (>=0<=0), ,true,sensor.connect_src1_name,sensor.connect_src1_name,13,36,1,5,26
+"MX400",connect,17,src1.childlock,child lock,boolean (>=0<=0), ,true,switch.connect_src1_child_lock,switch.connect_src1_childlock,13,36,1,31,1
+"MX400",connect,17,src1.icon,icon,enum [none\|mdi:chef-hat\|mdi:sofa-single-outline\|mdi:bowl-mix-outline\|mdi:bed-single-outline\|mdi:bed-double-outline\|mdi:teddy-bear\|mdi:shower\|mdi:laptop\|mdi:door\|mdi:palette-outline\|mdi:washing-machine\|mdi:bookshelf] (>=0<=0), ,true,select.connect_src1_icon,select.connect_src1_icon,13,36,1,32,1
+"EM10",alert,74,setflowtemp,set flow temperature,uint8,C,false,sensor.alert_set_flow_temperature,sensor.alert_setflowtemp,14,0,1,0,1
+"EM10",alert,74,setburnpow,burner set power,uint8,%,false,sensor.alert_burner_set_power,sensor.alert_setburnpow,14,0,1,1,1
+"EM10, EM100",extension,243,flowtempvf,flow temperature in header (T0/Vf),int16,C,false,sensor.extension_flow_temperature_in_header_(T0/Vf),sensor.extension_flowtempvf,15,0,1/10,0,1
+"EM10, EM100",extension,243,input,input,uint8,V,false,sensor.extension_input,sensor.extension_input,15,0,1/10,1,1
+"EM10, EM100",extension,243,outpow,output IO1,uint8,%,false,sensor.extension_output_IO1,sensor.extension_outpow,15,0,1,2,1
+"EM10, EM100",extension,243,setpower,request power,uint8,%,false,sensor.extension_request_power,sensor.extension_setpower,15,0,1,3,1
+"EM10, EM100",extension,243,setpoint,set temp.,uint8,C,false,sensor.extension_set_temp.,sensor.extension_setpoint,15,0,1,4,1
+"EM10, EM100",extension,243,minv,min volt.,uint8 (>=0<=0),V,true,number.extension_min_volt.,number.extension_minv,15,0,1/10,5,1
+"EM10, EM100",extension,243,maxv,max volt.,uint8 (>=0<=0),V,true,number.extension_max_volt.,number.extension_maxv,15,0,1/10,6,1
+"EM10, EM100",extension,243,mint,min temp.,uint8 (>=0<=0),C,true,number.extension_min_temp.,number.extension_mint,15,0,1,7,1
+"EM10, EM100",extension,243,maxt,max temp.,uint8 (>=0<=0),C,true,number.extension_max_temp.,number.extension_maxt,15,0,1,8,1
+"EM10, EM100",extension,243,mode,operating mode,uint8, ,false,sensor.extension_operating_mode,sensor.extension_mode,15,0,1,9,1
+"T1RF",extension,220,flowtempvf,flow temperature in header (T0/Vf),int16,C,false,sensor.extension_flow_temperature_in_header_(T0/Vf),sensor.extension_flowtempvf,15,0,1/10,0,1
+"T1RF",extension,220,input,input,uint8,V,false,sensor.extension_input,sensor.extension_input,15,0,1/10,1,1
+"T1RF",extension,220,outpow,output IO1,uint8,%,false,sensor.extension_output_IO1,sensor.extension_outpow,15,0,1,2,1
+"T1RF",extension,220,setpower,request power,uint8,%,false,sensor.extension_request_power,sensor.extension_setpower,15,0,1,3,1
+"T1RF",extension,220,setpoint,set temp.,uint8,C,false,sensor.extension_set_temp.,sensor.extension_setpoint,15,0,1,4,1
+"T1RF",extension,220,minv,min volt.,uint8 (>=0<=0),V,true,number.extension_min_volt.,number.extension_minv,15,0,1/10,5,1
+"T1RF",extension,220,maxv,max volt.,uint8 (>=0<=0),V,true,number.extension_max_volt.,number.extension_maxv,15,0,1/10,6,1
+"T1RF",extension,220,mint,min temp.,uint8 (>=0<=0),C,true,number.extension_min_temp.,number.extension_mint,15,0,1,7,1
+"T1RF",extension,220,maxt,max temp.,uint8 (>=0<=0),C,true,number.extension_max_temp.,number.extension_maxt,15,0,1,8,1
+"T1RF",extension,220,mode,operating mode,uint8, ,false,sensor.extension_operating_mode,sensor.extension_mode,15,0,1,9,1
+"AM200",heatsource,228,ahs1.sysflowtemp,system flow temperature,int16,C,false,sensor.heatsource_ahs1_system_flow_temperature,sensor.heatsource_ahs1_sysflowtemp,17,19,1/10,0,1
+"AM200",heatsource,228,ahs1.sysrettemp,system return temperature,int16,C,false,sensor.heatsource_ahs1_system_return_temperature,sensor.heatsource_ahs1_sysrettemp,17,19,1/10,1,1
+"AM200",heatsource,228,ahs1.altflowtemp,alternative hs flow temperature,int16,C,false,sensor.heatsource_ahs1_alternative_hs_flow_temperature,sensor.heatsource_ahs1_altflowtemp,17,19,1/10,2,1
+"AM200",heatsource,228,ahs1.altrettemp,alternative hs return temperature,int16,C,false,sensor.heatsource_ahs1_alternative_hs_return_temperature,sensor.heatsource_ahs1_altrettemp,17,19,1/10,3,1
+"AM200",heatsource,228,ahs1.cyltoptemp,cylinder top temperature,int16,C,false,sensor.heatsource_ahs1_cylinder_top_temperature,sensor.heatsource_ahs1_cyltoptemp,17,19,1/10,4,1
+"AM200",heatsource,228,ahs1.cylcentertemp,cylinder center temperature,int16,C,false,sensor.heatsource_ahs1_cylinder_center_temperature,sensor.heatsource_ahs1_cylcentertemp,17,19,1/10,5,1
+"AM200",heatsource,228,ahs1.cylbottomtemp,cylinder bottom temperature,int16,C,false,sensor.heatsource_ahs1_cylinder_bottom_temperature,sensor.heatsource_ahs1_cylbottomtemp,17,19,1/10,6,1
+"AM200",heatsource,228,ahs1.fluegastemp,flue gas temperature,int16,C,false,sensor.heatsource_ahs1_flue_gas_temperature,sensor.heatsource_ahs1_fluegastemp,17,19,1/10,7,1
+"AM200",heatsource,228,ahs1.valvebuffer,buffer valve,uint8,%,false,sensor.heatsource_ahs1_buffer_valve,sensor.heatsource_ahs1_valvebuffer,17,19,1,8,1
+"AM200",heatsource,228,ahs1.valvereturn,return valve,uint8,%,false,sensor.heatsource_ahs1_return_valve,sensor.heatsource_ahs1_valvereturn,17,19,1,9,1
+"AM200",heatsource,228,ahs1.apumpmod,alternative hs pump modulation,uint8,%,false,sensor.heatsource_ahs1_alternative_hs_pump_modulation,sensor.heatsource_ahs1_apumpmod,17,19,1,10,1
+"AM200",heatsource,228,ahs1.vr2config,vr2 configuration,enum [off\|bypass] (>=0<=0), ,true,select.heatsource_ahs1_vr2_configuration,select.heatsource_ahs1_vr2config,17,19,1,11,1
+"AM200",heatsource,228,ahs1.ahsactivated,alternate heat source activation,boolean (>=0<=0), ,true,switch.heatsource_ahs1_alternate_heat_source_activation,switch.heatsource_ahs1_ahsactivated,17,19,1,12,1
+"AM200",heatsource,228,ahs1.apumpconfig,primary pump config,boolean (>=0<=0), ,true,switch.heatsource_ahs1_primary_pump_config,switch.heatsource_ahs1_apumpconfig,17,19,1,13,1
+"AM200",heatsource,228,ahs1.apumpsignal,output for pr1 pump,enum [off\|pwm\|pwm inverse] (>=0<=0), ,true,select.heatsource_ahs1_output_for_pr1_pump,select.heatsource_ahs1_apumpsignal,17,19,1,14,1
 "AM200",heatsource,228,ahs1.apumpmin,min output pump pr1,uint8 (>=12<=50),%,true,number.heatsource_ahs1_min_output_pump_pr1,number.heatsource_ahs1_apumpmin,17,19,1,15,1
-"AM200",heatsource,228,ahs1.temprise,ahs return temp rise,boolean, ,true,switch.heatsource_ahs1_ahs_return_temp_rise,switch.heatsource_ahs1_temprise,17,19,1,16,1
+"AM200",heatsource,228,ahs1.temprise,ahs return temp rise,boolean (>=0<=0), ,true,switch.heatsource_ahs1_ahs_return_temp_rise,switch.heatsource_ahs1_temprise,17,19,1,16,1
 "AM200",heatsource,228,ahs1.setreturntemp,set temp return,uint8 (>=40<=75),C,true,number.heatsource_ahs1_set_temp_return,number.heatsource_ahs1_setreturntemp,17,19,1,17,1
 "AM200",heatsource,228,ahs1.mixruntime,mixer run time,uint16 (>=0<=600),seconds,true,number.heatsource_ahs1_mixer_run_time,number.heatsource_ahs1_mixruntime,17,19,1,18,1
 "AM200",heatsource,228,ahs1.setflowtemp,set flow temperature,uint8 (>=40<=75),C,true,number.heatsource_ahs1_set_flow_temperature,number.heatsource_ahs1_setflowtemp,17,19,1,19,1
-"AM200",heatsource,228,ahs1.bufbypass,buffer bypass config,enum [no\|mixer\|valve], ,true,select.heatsource_ahs1_buffer_bypass_config,select.heatsource_ahs1_bufbypass,17,19,1,20,1
+"AM200",heatsource,228,ahs1.bufbypass,buffer bypass config,enum [no\|mixer\|valve] (>=0<=0), ,true,select.heatsource_ahs1_buffer_bypass_config,select.heatsource_ahs1_bufbypass,17,19,1,20,1
 "AM200",heatsource,228,ahs1.bufmixruntime,bypass mixer run time,uint16 (>=0<=600),seconds,true,number.heatsource_ahs1_bypass_mixer_run_time,number.heatsource_ahs1_bufmixruntime,17,19,1,21,1
-"AM200",heatsource,228,ahs1.bufconfig,dhw buffer config,enum [off\|monovalent\|bivalent], ,true,select.heatsource_ahs1_dhw_buffer_config,select.heatsource_ahs1_bufconfig,17,19,1,22,1
-"AM200",heatsource,228,ahs1.blockmode,config htg. blocking mode,enum [off\|auto\|blocking], ,true,select.heatsource_ahs1_config_htg._blocking_mode,select.heatsource_ahs1_blockmode,17,19,1,23,1
-"AM200",heatsource,228,ahs1.blockterm,config of block terminal,enum [n_o\|n_c], ,true,select.heatsource_ahs1_config_of_block_terminal,select.heatsource_ahs1_blockterm,17,19,1,24,1
+"AM200",heatsource,228,ahs1.bufconfig,dhw buffer config,enum [off\|monovalent\|bivalent] (>=0<=0), ,true,select.heatsource_ahs1_dhw_buffer_config,select.heatsource_ahs1_bufconfig,17,19,1,22,1
+"AM200",heatsource,228,ahs1.blockmode,config htg. blocking mode,enum [off\|auto\|blocking] (>=0<=0), ,true,select.heatsource_ahs1_config_htg._blocking_mode,select.heatsource_ahs1_blockmode,17,19,1,23,1
+"AM200",heatsource,228,ahs1.blockterm,config of block terminal,enum [n_o\|n_c] (>=0<=0), ,true,select.heatsource_ahs1_config_of_block_terminal,select.heatsource_ahs1_blockterm,17,19,1,24,1
 "AM200",heatsource,228,ahs1.blockhyst,hyst. for boiler block,int8 (>=0<=50),C,true,number.heatsource_ahs1_hyst._for_boiler_block,number.heatsource_ahs1_blockhyst,17,19,1,25,1
 "AM200",heatsource,228,ahs1.releasewait,boiler release wait time,uint8 (>=0<=240),minutes,true,number.heatsource_ahs1_boiler_release_wait_time,number.heatsource_ahs1_releasewait,17,19,1,26,1
 "AM200",heatsource,228,ahs1.burner,burner,boolean, ,false,binary_sensor.heatsource_ahs1_burner,binary_sensor.heatsource_ahs1_burner,17,19,1,27,1
 "AM200",heatsource,228,ahs1.apump,alternative hs pump,boolean, ,false,binary_sensor.heatsource_ahs1_alternative_hs_pump,binary_sensor.heatsource_ahs1_apump,17,19,1,28,1
-"AM200",heatsource,228,ahs1.heatrequest,heat request,uint8 (>=0<=100),%,false,sensor.heatsource_ahs1_heat_request,sensor.heatsource_ahs1_heatrequest,17,19,1,29,1
-"AM200",heatsource,228,ahs1.blockremain,remaining blocktime,uint8 (>=0<=254),minutes,false,sensor.heatsource_ahs1_remaining_blocktime,sensor.heatsource_ahs1_blockremain,17,19,1,30,1
-"AM200",heatsource,228,ahs1.blockremaindhw,remaining blocktime dhw,uint8 (>=0<=254),minutes,false,sensor.heatsource_ahs1_remaining_blocktime_dhw,sensor.heatsource_ahs1_blockremaindhw,17,19,1,31,1
-"HRV176, HRV156, 5000c, MV200",ventilation,231,outfresh,outdoor fresh air,int16 (>=-3199<=3199),C,false,sensor.ventilation_outdoor_fresh_air,sensor.ventilation_outfresh,18,0,1/10,0,1
-"HRV176, HRV156, 5000c, MV200",ventilation,231,infresh,indoor fresh air,int16 (>=-3199<=3199),C,false,sensor.ventilation_indoor_fresh_air,sensor.ventilation_infresh,18,0,1/10,1,1
-"HRV176, HRV156, 5000c, MV200",ventilation,231,outexhaust,outdoor exhaust air,int16 (>=-3199<=3199),C,false,sensor.ventilation_outdoor_exhaust_air,sensor.ventilation_outexhaust,18,0,1/10,2,1
-"HRV176, HRV156, 5000c, MV200",ventilation,231,inexhaust,indoor exhaust air,int16 (>=-3199<=3199),C,false,sensor.ventilation_indoor_exhaust_air,sensor.ventilation_inexhaust,18,0,1/10,3,1
-"HRV176, HRV156, 5000c, MV200",ventilation,231,ventinspeed,in blower speed,uint8 (>=0<=100),%,false,sensor.ventilation_in_blower_speed,sensor.ventilation_ventinspeed,18,0,1,4,1
-"HRV176, HRV156, 5000c, MV200",ventilation,231,ventoutspeed,out blower speed,uint8 (>=0<=100),%,false,sensor.ventilation_out_blower_speed,sensor.ventilation_ventoutspeed,18,0,1,5,1
-"HRV176, HRV156, 5000c, MV200",ventilation,231,ventmode,ventilation mode,enum [auto\|off\|L1\|L2\|L3\|L4\|demand\|sleep\|intense\|bypass\|party\|fireplace], ,true,select.ventilation_ventilation_mode,select.ventilation_ventmode,18,0,1,6,1
-"HRV176, HRV156, 5000c, MV200",ventilation,231,airquality,air quality (voc),uint16 (>=0<=31999), ,false,sensor.ventilation_air_quality_(voc),sensor.ventilation_airquality,18,0,1,7,1
-"HRV176, HRV156, 5000c, MV200",ventilation,231,airhumidity,relative air humidity,uint8 (>=0<=100),%,false,sensor.ventilation_relative_air_humidity,sensor.ventilation_airhumidity,18,0,1,8,1
-"HRV176, HRV156, 5000c, MV200",ventilation,231,bypass,bypass,boolean, ,true,switch.ventilation_bypass,switch.ventilation_bypass,18,0,1,9,1
-"IPM",water,100,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.water_dhw_selected_temperature,number.water_dhw_seltemp,19,9,1,0,1
-"IPM",water,100,dhw.temp,current temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
-"IPM",water,100,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_current_extern_temperature,sensor.water_dhw_curtemp2,19,9,1/10,2,1
-"IPM",water,100,dhw.hydrTemp,hydraulic header temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_hydraulic_header_temperature,sensor.water_dhw_hydrTemp,19,9,1/10,3,1
+"AM200",heatsource,228,ahs1.heatrequest,heat request,uint8,%,false,sensor.heatsource_ahs1_heat_request,sensor.heatsource_ahs1_heatrequest,17,19,1,29,1
+"AM200",heatsource,228,ahs1.blockremain,remaining blocktime,uint8,minutes,false,sensor.heatsource_ahs1_remaining_blocktime,sensor.heatsource_ahs1_blockremain,17,19,1,30,1
+"AM200",heatsource,228,ahs1.blockremaindhw,remaining blocktime dhw,uint8,minutes,false,sensor.heatsource_ahs1_remaining_blocktime_dhw,sensor.heatsource_ahs1_blockremaindhw,17,19,1,31,1
+"HRV176, HRV156, 5000c, MV200",ventilation,231,outfresh,outdoor fresh air,int16,C,false,sensor.ventilation_outdoor_fresh_air,sensor.ventilation_outfresh,18,0,1/10,0,1
+"HRV176, HRV156, 5000c, MV200",ventilation,231,infresh,indoor fresh air,int16,C,false,sensor.ventilation_indoor_fresh_air,sensor.ventilation_infresh,18,0,1/10,1,1
+"HRV176, HRV156, 5000c, MV200",ventilation,231,outexhaust,outdoor exhaust air,int16,C,false,sensor.ventilation_outdoor_exhaust_air,sensor.ventilation_outexhaust,18,0,1/10,2,1
+"HRV176, HRV156, 5000c, MV200",ventilation,231,inexhaust,indoor exhaust air,int16,C,false,sensor.ventilation_indoor_exhaust_air,sensor.ventilation_inexhaust,18,0,1/10,3,1
+"HRV176, HRV156, 5000c, MV200",ventilation,231,ventinspeed,in blower speed,uint8,%,false,sensor.ventilation_in_blower_speed,sensor.ventilation_ventinspeed,18,0,1,4,1
+"HRV176, HRV156, 5000c, MV200",ventilation,231,ventoutspeed,out blower speed,uint8,%,false,sensor.ventilation_out_blower_speed,sensor.ventilation_ventoutspeed,18,0,1,5,1
+"HRV176, HRV156, 5000c, MV200",ventilation,231,ventmode,ventilation mode,enum [auto\|off\|L1\|L2\|L3\|L4\|demand\|sleep\|intense\|bypass\|party\|fireplace] (>=0<=0), ,true,select.ventilation_ventilation_mode,select.ventilation_ventmode,18,0,1,6,1
+"HRV176, HRV156, 5000c, MV200",ventilation,231,airquality,air quality (voc),uint16, ,false,sensor.ventilation_air_quality_(voc),sensor.ventilation_airquality,18,0,1,7,1
+"HRV176, HRV156, 5000c, MV200",ventilation,231,airhumidity,relative air humidity,uint8,%,false,sensor.ventilation_relative_air_humidity,sensor.ventilation_airhumidity,18,0,1,8,1
+"HRV176, HRV156, 5000c, MV200",ventilation,231,bypass,bypass,boolean (>=0<=0), ,true,switch.ventilation_bypass,switch.ventilation_bypass,18,0,1,9,1
+"IPM",water,100,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.water_dhw_selected_temperature,number.water_dhw_seltemp,19,9,1,0,1
+"IPM",water,100,dhw.temp,current temperature,uint16,C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
+"IPM",water,100,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.water_dhw_current_extern_temperature,sensor.water_dhw_curtemp2,19,9,1/10,2,1
+"IPM",water,100,dhw.hydrTemp,hydraulic header temperature,uint16,C,false,sensor.water_dhw_hydraulic_header_temperature,sensor.water_dhw_hydrTemp,19,9,1/10,3,1
 "IPM",water,100,dhw.pump,pump,boolean, ,false,binary_sensor.water_dhw_pump,binary_sensor.water_dhw_pump,19,9,1,4,1
-"IPM",water,100,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=254),C,true,number.water_dhw_flow_temperature_offset,number.water_dhw_flowtempoffset,19,9,1,5,1
-"IPM",water,100,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.water_dhw_hysteresis_on_temperature,number.water_dhw_hyston,19,9,1,6,1
-"IPM",water,100,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.water_dhw_hysteresis_off_temperature,number.water_dhw_hystoff,19,9,1,7,1
-"IPM",water,100,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=254),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
-"IPM",water,100,dhw.circ,circulation active,boolean, ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
-"IPM",water,100,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog], ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
-"IPM2",water,102,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.water_dhw_selected_temperature,number.water_dhw_seltemp,19,9,1,0,1
-"IPM2",water,102,dhw.temp,current temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
-"IPM2",water,102,dhw.curtemp2,current extern temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_current_extern_temperature,sensor.water_dhw_curtemp2,19,9,1/10,2,1
-"IPM2",water,102,dhw.hydrTemp,hydraulic header temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_hydraulic_header_temperature,sensor.water_dhw_hydrTemp,19,9,1/10,3,1
+"IPM",water,100,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=0),C,true,number.water_dhw_flow_temperature_offset,number.water_dhw_flowtempoffset,19,9,1,5,1
+"IPM",water,100,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.water_dhw_hysteresis_on_temperature,number.water_dhw_hyston,19,9,1,6,1
+"IPM",water,100,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.water_dhw_hysteresis_off_temperature,number.water_dhw_hystoff,19,9,1,7,1
+"IPM",water,100,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=0),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
+"IPM",water,100,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
+"IPM",water,100,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog] (>=0<=0), ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
+"IPM2",water,102,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.water_dhw_selected_temperature,number.water_dhw_seltemp,19,9,1,0,1
+"IPM2",water,102,dhw.temp,current temperature,uint16,C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
+"IPM2",water,102,dhw.curtemp2,current extern temperature,uint16,C,false,sensor.water_dhw_current_extern_temperature,sensor.water_dhw_curtemp2,19,9,1/10,2,1
+"IPM2",water,102,dhw.hydrTemp,hydraulic header temperature,uint16,C,false,sensor.water_dhw_hydraulic_header_temperature,sensor.water_dhw_hydrTemp,19,9,1/10,3,1
 "IPM2",water,102,dhw.pump,pump,boolean, ,false,binary_sensor.water_dhw_pump,binary_sensor.water_dhw_pump,19,9,1,4,1
-"IPM2",water,102,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=254),C,true,number.water_dhw_flow_temperature_offset,number.water_dhw_flowtempoffset,19,9,1,5,1
-"IPM2",water,102,dhw.hyston,hysteresis on temperature,int8 (>=-126<=126),C,true,number.water_dhw_hysteresis_on_temperature,number.water_dhw_hyston,19,9,1,6,1
-"IPM2",water,102,dhw.hystoff,hysteresis off temperature,int8 (>=-126<=126),C,true,number.water_dhw_hysteresis_off_temperature,number.water_dhw_hystoff,19,9,1,7,1
-"IPM2",water,102,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=254),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
-"IPM2",water,102,dhw.circ,circulation active,boolean, ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
-"IPM2",water,102,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog], ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
-"MM100",water,160,dhw.temp,current temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
-"MM100",water,160,dhw.tempstatus,temperature switch in assigned dhw (MC1),int8 (>=-126<=126), ,false,sensor.water_dhw_temperature_switch_in_assigned_dhw_(MC1),sensor.water_dhw_tempstatus,19,9,1,11,1
+"IPM2",water,102,dhw.flowtempoffset,flow temperature offset,uint8 (>=0<=0),C,true,number.water_dhw_flow_temperature_offset,number.water_dhw_flowtempoffset,19,9,1,5,1
+"IPM2",water,102,dhw.hyston,hysteresis on temperature,int8 (>=0<=0),C,true,number.water_dhw_hysteresis_on_temperature,number.water_dhw_hyston,19,9,1,6,1
+"IPM2",water,102,dhw.hystoff,hysteresis off temperature,int8 (>=0<=0),C,true,number.water_dhw_hysteresis_off_temperature,number.water_dhw_hystoff,19,9,1,7,1
+"IPM2",water,102,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=0),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
+"IPM2",water,102,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
+"IPM2",water,102,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog] (>=0<=0), ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
+"MM100",water,160,dhw.temp,current temperature,uint16,C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
+"MM100",water,160,dhw.tempstatus,temperature switch in assigned dhw (MC1),int8, ,false,sensor.water_dhw_temperature_switch_in_assigned_dhw_(MC1),sensor.water_dhw_tempstatus,19,9,1,11,1
 "MM100",water,160,dhw.pump,pump,boolean, ,false,binary_sensor.water_dhw_pump,binary_sensor.water_dhw_pump,19,9,1,4,1
-"MM100",water,160,dhw.maxtemp,maximum temperature,uint8 (>=0<=254),C,true,number.water_dhw_maximum_temperature,number.water_dhw_maxtemp,19,9,1,12,1
-"MM100",water,160,dhw.difftemp,start differential temperature,int8 (>=-126<=126),C,true,number.water_dhw_start_differential_temperature,number.water_dhw_difftemp,19,9,1,13,1
-"MM100",water,160,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=254),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
-"MM100",water,160,dhw.redtemp,reduced temperature,uint8 (>=0<=254),C,true,number.water_dhw_reduced_temperature,number.water_dhw_redtemp,19,9,1,14,1
-"MM100",water,160,dhw.requiredtemp,required temperature,uint8 (>=0<=254),C,true,number.water_dhw_required_temperature,number.water_dhw_requiredtemp,19,9,1,15,1
-"MM100",water,160,dhw.circ,circulation active,boolean, ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
-"MM100",water,160,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog], ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
-"MM200",water,161,dhw.temp,current temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
-"MM200",water,161,dhw.tempstatus,temperature switch in assigned dhw (MC1),int8 (>=-126<=126), ,false,sensor.water_dhw_temperature_switch_in_assigned_dhw_(MC1),sensor.water_dhw_tempstatus,19,9,1,11,1
+"MM100",water,160,dhw.maxtemp,maximum temperature,uint8 (>=0<=0),C,true,number.water_dhw_maximum_temperature,number.water_dhw_maxtemp,19,9,1,12,1
+"MM100",water,160,dhw.difftemp,start differential temperature,int8 (>=0<=0),C,true,number.water_dhw_start_differential_temperature,number.water_dhw_difftemp,19,9,1,13,1
+"MM100",water,160,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=0),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
+"MM100",water,160,dhw.redtemp,reduced temperature,uint8 (>=0<=0),C,true,number.water_dhw_reduced_temperature,number.water_dhw_redtemp,19,9,1,14,1
+"MM100",water,160,dhw.requiredtemp,required temperature,uint8 (>=0<=0),C,true,number.water_dhw_required_temperature,number.water_dhw_requiredtemp,19,9,1,15,1
+"MM100",water,160,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
+"MM100",water,160,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog] (>=0<=0), ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
+"MM200",water,161,dhw.temp,current temperature,uint16,C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
+"MM200",water,161,dhw.tempstatus,temperature switch in assigned dhw (MC1),int8, ,false,sensor.water_dhw_temperature_switch_in_assigned_dhw_(MC1),sensor.water_dhw_tempstatus,19,9,1,11,1
 "MM200",water,161,dhw.pump,pump,boolean, ,false,binary_sensor.water_dhw_pump,binary_sensor.water_dhw_pump,19,9,1,4,1
-"MM200",water,161,dhw.maxtemp,maximum temperature,uint8 (>=0<=254),C,true,number.water_dhw_maximum_temperature,number.water_dhw_maxtemp,19,9,1,12,1
-"MM200",water,161,dhw.difftemp,start differential temperature,int8 (>=-126<=126),C,true,number.water_dhw_start_differential_temperature,number.water_dhw_difftemp,19,9,1,13,1
-"MM200",water,161,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=254),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
-"MM200",water,161,dhw.redtemp,reduced temperature,uint8 (>=0<=254),C,true,number.water_dhw_reduced_temperature,number.water_dhw_redtemp,19,9,1,14,1
-"MM200",water,161,dhw.requiredtemp,required temperature,uint8 (>=0<=254),C,true,number.water_dhw_required_temperature,number.water_dhw_requiredtemp,19,9,1,15,1
-"MM200",water,161,dhw.circ,circulation active,boolean, ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
-"MM200",water,161,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog], ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
-"SM100, MS100",water,163,dhw.temp,current temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
-"SM100, MS100",water,163,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_storage_intern_temperature,sensor.water_dhw_storagetemp1,19,9,1/10,16,1
-"SM100, MS100",water,163,dhw.coldtemp,cold water,uint16 (>=0<=3199),C,false,sensor.water_dhw_cold_water,sensor.water_dhw_coldtemp,19,9,1/10,17,1
-"SM100, MS100",water,163,dhw.temp5,temperature 5,uint16 (>=0<=3199),C,false,sensor.water_dhw_temperature_5,sensor.water_dhw_temp5,19,9,1/10,18,1
-"SM100, MS100",water,163,dhw.rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_return_temperature,sensor.water_dhw_rettemp,19,9,1/10,19,1
+"MM200",water,161,dhw.maxtemp,maximum temperature,uint8 (>=0<=0),C,true,number.water_dhw_maximum_temperature,number.water_dhw_maxtemp,19,9,1,12,1
+"MM200",water,161,dhw.difftemp,start differential temperature,int8 (>=0<=0),C,true,number.water_dhw_start_differential_temperature,number.water_dhw_difftemp,19,9,1,13,1
+"MM200",water,161,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=0),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
+"MM200",water,161,dhw.redtemp,reduced temperature,uint8 (>=0<=0),C,true,number.water_dhw_reduced_temperature,number.water_dhw_redtemp,19,9,1,14,1
+"MM200",water,161,dhw.requiredtemp,required temperature,uint8 (>=0<=0),C,true,number.water_dhw_required_temperature,number.water_dhw_requiredtemp,19,9,1,15,1
+"MM200",water,161,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
+"MM200",water,161,dhw.circmode,circulation pump mode,enum [off\|on\|auto\|own prog] (>=0<=0), ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
+"SM100, MS100",water,163,dhw.temp,current temperature,uint16,C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
+"SM100, MS100",water,163,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.water_dhw_storage_intern_temperature,sensor.water_dhw_storagetemp1,19,9,1/10,16,1
+"SM100, MS100",water,163,dhw.coldtemp,cold water,uint16,C,false,sensor.water_dhw_cold_water,sensor.water_dhw_coldtemp,19,9,1/10,17,1
+"SM100, MS100",water,163,dhw.temp5,temperature 5,uint16,C,false,sensor.water_dhw_temperature_5,sensor.water_dhw_temp5,19,9,1/10,18,1
+"SM100, MS100",water,163,dhw.rettemp,return temperature,uint16,C,false,sensor.water_dhw_return_temperature,sensor.water_dhw_rettemp,19,9,1/10,19,1
 "SM100, MS100",water,163,dhw.pump,pump,boolean, ,false,binary_sensor.water_dhw_pump,binary_sensor.water_dhw_pump,19,9,1,4,1
-"SM100, MS100",water,163,dhw.maxtemp,maximum temperature,uint8 (>=0<=254),C,true,number.water_dhw_maximum_temperature,number.water_dhw_maxtemp,19,9,1,12,1
-"SM100, MS100",water,163,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.water_dhw_selected_temperature,number.water_dhw_seltemp,19,9,1,0,1
-"SM100, MS100",water,163,dhw.redtemp,reduced temperature,uint8 (>=0<=254),C,true,number.water_dhw_reduced_temperature,number.water_dhw_redtemp,19,9,1,14,1
-"SM100, MS100",water,163,dhw.hottemp,extra hot temperature,uint8 (>=0<=254),C,true,number.water_dhw_extra_hot_temperature,number.water_dhw_hottemp,19,9,1,20,1
-"SM100, MS100",water,163,dhw.dailytemp,daily temperature,uint8 (>=0<=254),C,true,number.water_dhw_daily_temperature,number.water_dhw_dailytemp,19,9,1,21,1
-"SM100, MS100",water,163,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=254),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
-"SM100, MS100",water,163,dhw.circ,circulation active,boolean, ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
-"SM100, MS100",water,163,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
-"SM100, MS100",water,163,dhw.circtc,circulation time controlled,boolean, ,true,switch.water_dhw_circulation_time_controlled,switch.water_dhw_circtc,19,9,1,22,1
-"SM100, MS100",water,163,dhw.keepwarm,keep warm,boolean, ,true,switch.water_dhw_keep_warm,switch.water_dhw_keepwarm,19,9,1,23,1
+"SM100, MS100",water,163,dhw.maxtemp,maximum temperature,uint8 (>=0<=0),C,true,number.water_dhw_maximum_temperature,number.water_dhw_maxtemp,19,9,1,12,1
+"SM100, MS100",water,163,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.water_dhw_selected_temperature,number.water_dhw_seltemp,19,9,1,0,1
+"SM100, MS100",water,163,dhw.redtemp,reduced temperature,uint8 (>=0<=0),C,true,number.water_dhw_reduced_temperature,number.water_dhw_redtemp,19,9,1,14,1
+"SM100, MS100",water,163,dhw.hottemp,extra hot temperature,uint8 (>=0<=0),C,true,number.water_dhw_extra_hot_temperature,number.water_dhw_hottemp,19,9,1,20,1
+"SM100, MS100",water,163,dhw.dailytemp,daily temperature,uint8 (>=0<=0),C,true,number.water_dhw_daily_temperature,number.water_dhw_dailytemp,19,9,1,21,1
+"SM100, MS100",water,163,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=0),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
+"SM100, MS100",water,163,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
+"SM100, MS100",water,163,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
+"SM100, MS100",water,163,dhw.circtc,circulation time controlled,boolean (>=0<=0), ,true,switch.water_dhw_circulation_time_controlled,switch.water_dhw_circtc,19,9,1,22,1
+"SM100, MS100",water,163,dhw.keepwarm,keep warm,boolean (>=0<=0), ,true,switch.water_dhw_keep_warm,switch.water_dhw_keepwarm,19,9,1,23,1
 "SM100, MS100",water,163,dhw.status2,status 2,enum [\|\|\|no heat\|\|\|heat request\|\|disinfecting\|hold], ,false,sensor.water_dhw_status_2,sensor.water_dhw_status2,19,9,1,24,1
-"SM100, MS100",water,163,dhw.pumpmod,pump modulation,uint8 (>=0<=100),%,false,sensor.water_dhw_pump_modulation,sensor.water_dhw_pumpmod,19,9,1,25,1
-"SM100, MS100",water,163,dhw.flow,flow rate,uint16 (>=0<=3199),l/min,false,sensor.water_dhw_flow_rate,sensor.water_dhw_flow,19,9,1/10,26,1
-"SM100, MS100",water,163,dhw.valvereturn,return valve,uint8 (>=0<=100),%,true,number.water_dhw_return_valve,number.water_dhw_valvereturn,19,9,1,27,1
-"SM100, MS100",water,163,dhw.deltatret,temp. diff. return valve,uint8 (>=0<=254),K,true,number.water_dhw_temp._diff._return_valve,number.water_dhw_deltatret,19,9,1,28,1
-"SM100, MS100",water,163,dhw.errordisp,error display,enum [off\|normal\|inverted], ,true,select.water_dhw_error_display,select.water_dhw_errordisp,19,9,1,29,1
-"SM200, MS200",water,164,dhw.temp,current temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
-"SM200, MS200",water,164,dhw.storagetemp1,storage intern temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_storage_intern_temperature,sensor.water_dhw_storagetemp1,19,9,1/10,16,1
-"SM200, MS200",water,164,dhw.coldtemp,cold water,uint16 (>=0<=3199),C,false,sensor.water_dhw_cold_water,sensor.water_dhw_coldtemp,19,9,1/10,17,1
-"SM200, MS200",water,164,dhw.temp5,temperature 5,uint16 (>=0<=3199),C,false,sensor.water_dhw_temperature_5,sensor.water_dhw_temp5,19,9,1/10,18,1
-"SM200, MS200",water,164,dhw.rettemp,return temperature,uint16 (>=0<=3199),C,false,sensor.water_dhw_return_temperature,sensor.water_dhw_rettemp,19,9,1/10,19,1
+"SM100, MS100",water,163,dhw.pumpmod,pump modulation,uint8,%,false,sensor.water_dhw_pump_modulation,sensor.water_dhw_pumpmod,19,9,1,25,1
+"SM100, MS100",water,163,dhw.flow,flow rate,uint16,l/min,false,sensor.water_dhw_flow_rate,sensor.water_dhw_flow,19,9,1/10,26,1
+"SM100, MS100",water,163,dhw.valvereturn,return valve,uint8 (>=0<=0),%,true,number.water_dhw_return_valve,number.water_dhw_valvereturn,19,9,1,27,1
+"SM100, MS100",water,163,dhw.deltatret,temp. diff. return valve,uint8 (>=0<=0),K,true,number.water_dhw_temp._diff._return_valve,number.water_dhw_deltatret,19,9,1,28,1
+"SM100, MS100",water,163,dhw.errordisp,error display,enum [off\|normal\|inverted] (>=0<=0), ,true,select.water_dhw_error_display,select.water_dhw_errordisp,19,9,1,29,1
+"SM200, MS200",water,164,dhw.temp,current temperature,uint16,C,false,sensor.water_dhw_current_temperature,sensor.water_dhw_temp,19,9,1/10,1,1
+"SM200, MS200",water,164,dhw.storagetemp1,storage intern temperature,uint16,C,false,sensor.water_dhw_storage_intern_temperature,sensor.water_dhw_storagetemp1,19,9,1/10,16,1
+"SM200, MS200",water,164,dhw.coldtemp,cold water,uint16,C,false,sensor.water_dhw_cold_water,sensor.water_dhw_coldtemp,19,9,1/10,17,1
+"SM200, MS200",water,164,dhw.temp5,temperature 5,uint16,C,false,sensor.water_dhw_temperature_5,sensor.water_dhw_temp5,19,9,1/10,18,1
+"SM200, MS200",water,164,dhw.rettemp,return temperature,uint16,C,false,sensor.water_dhw_return_temperature,sensor.water_dhw_rettemp,19,9,1/10,19,1
 "SM200, MS200",water,164,dhw.pump,pump,boolean, ,false,binary_sensor.water_dhw_pump,binary_sensor.water_dhw_pump,19,9,1,4,1
-"SM200, MS200",water,164,dhw.maxtemp,maximum temperature,uint8 (>=0<=254),C,true,number.water_dhw_maximum_temperature,number.water_dhw_maxtemp,19,9,1,12,1
-"SM200, MS200",water,164,dhw.seltemp,selected temperature,uint8 (>=0<=254),C,true,number.water_dhw_selected_temperature,number.water_dhw_seltemp,19,9,1,0,1
-"SM200, MS200",water,164,dhw.redtemp,reduced temperature,uint8 (>=0<=254),C,true,number.water_dhw_reduced_temperature,number.water_dhw_redtemp,19,9,1,14,1
-"SM200, MS200",water,164,dhw.hottemp,extra hot temperature,uint8 (>=0<=254),C,true,number.water_dhw_extra_hot_temperature,number.water_dhw_hottemp,19,9,1,20,1
-"SM200, MS200",water,164,dhw.dailytemp,daily temperature,uint8 (>=0<=254),C,true,number.water_dhw_daily_temperature,number.water_dhw_dailytemp,19,9,1,21,1
-"SM200, MS200",water,164,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=254),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
-"SM200, MS200",water,164,dhw.circ,circulation active,boolean, ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
-"SM200, MS200",water,164,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous], ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
-"SM200, MS200",water,164,dhw.circtc,circulation time controlled,boolean, ,true,switch.water_dhw_circulation_time_controlled,switch.water_dhw_circtc,19,9,1,22,1
-"SM200, MS200",water,164,dhw.keepwarm,keep warm,boolean, ,true,switch.water_dhw_keep_warm,switch.water_dhw_keepwarm,19,9,1,23,1
+"SM200, MS200",water,164,dhw.maxtemp,maximum temperature,uint8 (>=0<=0),C,true,number.water_dhw_maximum_temperature,number.water_dhw_maxtemp,19,9,1,12,1
+"SM200, MS200",water,164,dhw.seltemp,selected temperature,uint8 (>=0<=0),C,true,number.water_dhw_selected_temperature,number.water_dhw_seltemp,19,9,1,0,1
+"SM200, MS200",water,164,dhw.redtemp,reduced temperature,uint8 (>=0<=0),C,true,number.water_dhw_reduced_temperature,number.water_dhw_redtemp,19,9,1,14,1
+"SM200, MS200",water,164,dhw.hottemp,extra hot temperature,uint8 (>=0<=0),C,true,number.water_dhw_extra_hot_temperature,number.water_dhw_hottemp,19,9,1,20,1
+"SM200, MS200",water,164,dhw.dailytemp,daily temperature,uint8 (>=0<=0),C,true,number.water_dhw_daily_temperature,number.water_dhw_dailytemp,19,9,1,21,1
+"SM200, MS200",water,164,dhw.disinfectiontemp,disinfection temperature,uint8 (>=0<=0),C,true,number.water_dhw_disinfection_temperature,number.water_dhw_disinfectiontemp,19,9,1,8,1
+"SM200, MS200",water,164,dhw.circ,circulation active,boolean (>=0<=0), ,true,switch.water_dhw_circulation_active,switch.water_dhw_circ,19,9,1,9,1
+"SM200, MS200",water,164,dhw.circmode,circulation pump mode,enum [off\|1x3min\|2x3min\|3x3min\|4x3min\|5x3min\|6x3min\|continuous] (>=0<=0), ,true,select.water_dhw_circulation_pump_mode,select.water_dhw_circmode,19,9,1,10,1
+"SM200, MS200",water,164,dhw.circtc,circulation time controlled,boolean (>=0<=0), ,true,switch.water_dhw_circulation_time_controlled,switch.water_dhw_circtc,19,9,1,22,1
+"SM200, MS200",water,164,dhw.keepwarm,keep warm,boolean (>=0<=0), ,true,switch.water_dhw_keep_warm,switch.water_dhw_keepwarm,19,9,1,23,1
 "SM200, MS200",water,164,dhw.status2,status 2,enum [\|\|\|no heat\|\|\|heat request\|\|disinfecting\|hold], ,false,sensor.water_dhw_status_2,sensor.water_dhw_status2,19,9,1,24,1
-"SM200, MS200",water,164,dhw.pumpmod,pump modulation,uint8 (>=0<=100),%,false,sensor.water_dhw_pump_modulation,sensor.water_dhw_pumpmod,19,9,1,25,1
-"SM200, MS200",water,164,dhw.flow,flow rate,uint16 (>=0<=3199),l/min,false,sensor.water_dhw_flow_rate,sensor.water_dhw_flow,19,9,1/10,26,1
-"SM200, MS200",water,164,dhw.valvereturn,return valve,uint8 (>=0<=100),%,true,number.water_dhw_return_valve,number.water_dhw_valvereturn,19,9,1,27,1
-"SM200, MS200",water,164,dhw.deltatret,temp. diff. return valve,uint8 (>=0<=254),K,true,number.water_dhw_temp._diff._return_valve,number.water_dhw_deltatret,19,9,1,28,1
-"SM200, MS200",water,164,dhw.errordisp,error display,enum [off\|normal\|inverted], ,true,select.water_dhw_error_display,select.water_dhw_errordisp,19,9,1,29,1
-"MP100",pool,204,pooltemp,pool temperature,int16 (>=-3199<=3199),C,false,sensor.pool_pool_temperature,sensor.pool_pooltemp,20,0,1/10,-1,1
+"SM200, MS200",water,164,dhw.pumpmod,pump modulation,uint8,%,false,sensor.water_dhw_pump_modulation,sensor.water_dhw_pumpmod,19,9,1,25,1
+"SM200, MS200",water,164,dhw.flow,flow rate,uint16,l/min,false,sensor.water_dhw_flow_rate,sensor.water_dhw_flow,19,9,1/10,26,1
+"SM200, MS200",water,164,dhw.valvereturn,return valve,uint8 (>=0<=0),%,true,number.water_dhw_return_valve,number.water_dhw_valvereturn,19,9,1,27,1
+"SM200, MS200",water,164,dhw.deltatret,temp. diff. return valve,uint8 (>=0<=0),K,true,number.water_dhw_temp._diff._return_valve,number.water_dhw_deltatret,19,9,1,28,1
+"SM200, MS200",water,164,dhw.errordisp,error display,enum [off\|normal\|inverted] (>=0<=0), ,true,select.water_dhw_error_display,select.water_dhw_errordisp,19,9,1,29,1
+"MP100",pool,204,pooltemp,pool temperature,int16,C,false,sensor.pool_pool_temperature,sensor.pool_pooltemp,20,0,1/10,-1,1
 "MP100",pool,204,poolshuntstatus,pool shunt status opening/closing,enum [stopped\|opening\|closing\|open\|close], ,false,sensor.pool_pool_shunt_status_opening/closing,sensor.pool_poolshuntstatus,20,0,1,-1,1
-"MP100",pool,204,poolshunt,pool shunt open/close (0% = pool / 100% = heat),uint8 (>=0<=100),%,false,sensor.pool_pool_shunt_open/close_(0%_=_pool_/_100%_=_heat),sensor.pool_poolshunt,20,0,1,-1,1
+"MP100",pool,204,poolshunt,pool shunt open/close (0% = pool / 100% = heat),uint8,%,false,sensor.pool_pool_shunt_open/close_(0%_=_pool_/_100%_=_heat),sensor.pool_poolshunt,20,0,1,-1,1
diff --git a/interface/package.json b/interface/package.json
index 4bc3b941d..f1227b8b7 100644
--- a/interface/package.json
+++ b/interface/package.json
@@ -41,7 +41,7 @@
     "react": "^19.2.3",
     "react-dom": "^19.2.3",
     "react-icons": "^5.5.0",
-    "react-router": "^7.11.0",
+    "react-router": "^7.12.0",
     "react-toastify": "^11.0.5",
     "typesafe-i18n": "^5.26.2",
     "typescript": "^5.9.3"
@@ -51,7 +51,7 @@
     "@eslint/js": "^9.39.2",
     "@preact/compat": "^18.3.1",
     "@preact/preset-vite": "^2.10.2",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.1",
+    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "@types/node": "^25.0.3",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
@@ -63,7 +63,7 @@
     "rollup-plugin-visualizer": "^6.0.5",
     "terser": "^5.44.1",
     "typescript-eslint": "^8.52.0",
-    "vite": "^7.3.0",
+    "vite": "^7.3.1",
     "vite-plugin-imagemin": "^0.6.1",
     "vite-tsconfig-paths": "^6.0.3"
   },
diff --git a/interface/pnpm-lock.yaml b/interface/pnpm-lock.yaml
index 091e63690..aefe975b8 100644
--- a/interface/pnpm-lock.yaml
+++ b/interface/pnpm-lock.yaml
@@ -63,8 +63,8 @@ importers:
         specifier: ^5.5.0
         version: 5.5.0(react@19.2.3)
       react-router:
-        specifier: ^7.11.0
-        version: 7.11.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
+        specifier: ^7.12.0
+        version: 7.12.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       react-toastify:
         specifier: ^11.0.5
         version: 11.0.5(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
@@ -83,10 +83,10 @@ importers:
         version: 9.39.2
       '@preact/preset-vite':
         specifier: ^2.10.2
-        version: 2.10.2(@babel/core@7.28.5)(preact@10.28.2)(vite@7.3.0(@types/node@25.0.3)(terser@5.44.1))
+        version: 2.10.2(@babel/core@7.28.5)(preact@10.28.2)(vite@7.3.1(@types/node@25.0.3)(terser@5.44.1))
       '@trivago/prettier-plugin-sort-imports':
-        specifier: ^6.0.1
-        version: 6.0.1(prettier@3.7.4)
+        specifier: ^6.0.2
+        version: 6.0.2(prettier@3.7.4)
       '@types/node':
         specifier: ^25.0.3
         version: 25.0.3
@@ -121,14 +121,14 @@ importers:
         specifier: ^8.52.0
         version: 8.52.0(eslint@9.39.2)(typescript@5.9.3)
       vite:
-        specifier: ^7.3.0
-        version: 7.3.0(@types/node@25.0.3)(terser@5.44.1)
+        specifier: ^7.3.1
+        version: 7.3.1(@types/node@25.0.3)(terser@5.44.1)
       vite-plugin-imagemin:
         specifier: ^0.6.1
-        version: 0.6.1(vite@7.3.0(@types/node@25.0.3)(terser@5.44.1))
+        version: 0.6.1(vite@7.3.1(@types/node@25.0.3)(terser@5.44.1))
       vite-tsconfig-paths:
         specifier: ^6.0.3
-        version: 6.0.3(typescript@5.9.3)(vite@7.3.0(@types/node@25.0.3)(terser@5.44.1))
+        version: 6.0.3(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.3)(terser@5.44.1))
 
 packages:
 
@@ -815,8 +815,8 @@ packages:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
 
-  '@trivago/prettier-plugin-sort-imports@6.0.1':
-    resolution: {integrity: sha512-6B13DCWDfAfh4AEJ43gRgeCSAQmlKG5LHqHzHc0lbUwgBy0rX7o41US+46Fd4XiXBx+JDGEz3NBadCbUls0dUQ==}
+  '@trivago/prettier-plugin-sort-imports@6.0.2':
+    resolution: {integrity: sha512-3DgfkukFyC/sE/VuYjaUUWoFfuVjPK55vOFDsxD56XXynFMCZDYFogH2l/hDfOsQAm1myoU/1xByJ3tWqtulXA==}
     engines: {node: '>= 20'}
     peerDependencies:
       '@vue/compiler-sfc': 3.x
@@ -1042,8 +1042,8 @@ packages:
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
-  baseline-browser-mapping@2.9.11:
-    resolution: {integrity: sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==}
+  baseline-browser-mapping@2.9.12:
+    resolution: {integrity: sha512-Mij6Lij93pTAIsSYy5cyBQ975Qh9uLEc5rwGTpomiZeXZL9yIS6uORJakb3ScHgfs0serMMfIbXzokPMuEiRyw==}
     hasBin: true
 
   bin-build@3.0.0:
@@ -2540,8 +2540,8 @@ packages:
   react-is@19.2.3:
     resolution: {integrity: sha512-qJNJfu81ByyabuG7hPFEbXqNcWSU3+eVus+KJs+0ncpGfMyYdvSmxiJxbWR65lYi1I+/0HBcliO029gc4F+PnA==}
 
-  react-router@7.11.0:
-    resolution: {integrity: sha512-uI4JkMmjbWCZc01WVP2cH7ZfSzH91JAZUDd7/nIprDgWxBV1TkkmLToFh7EbMTcMak8URFRa2YoBL/W8GWnCTQ==}
+  react-router@7.12.0:
+    resolution: {integrity: sha512-kTPDYPFzDVGIIGNLS5VJykK0HfHLY5MF3b+xj0/tTyNYL1gF1qs7u67Z9jEhQk2sQ98SUaHxlG31g1JtF7IfVw==}
     engines: {node: '>=20.0.0'}
     peerDependencies:
       react: '>=18'
@@ -3011,8 +3011,8 @@ packages:
       vite:
         optional: true
 
-  vite@7.3.0:
-    resolution: {integrity: sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==}
+  vite@7.3.1:
+    resolution: {integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -3610,18 +3610,18 @@ snapshots:
     dependencies:
       preact: 10.28.2
 
-  '@preact/preset-vite@2.10.2(@babel/core@7.28.5)(preact@10.28.2)(vite@7.3.0(@types/node@25.0.3)(terser@5.44.1))':
+  '@preact/preset-vite@2.10.2(@babel/core@7.28.5)(preact@10.28.2)(vite@7.3.1(@types/node@25.0.3)(terser@5.44.1))':
     dependencies:
       '@babel/core': 7.28.5
       '@babel/plugin-transform-react-jsx': 7.27.1(@babel/core@7.28.5)
       '@babel/plugin-transform-react-jsx-development': 7.27.1(@babel/core@7.28.5)
-      '@prefresh/vite': 2.4.11(preact@10.28.2)(vite@7.3.0(@types/node@25.0.3)(terser@5.44.1))
+      '@prefresh/vite': 2.4.11(preact@10.28.2)(vite@7.3.1(@types/node@25.0.3)(terser@5.44.1))
       '@rollup/pluginutils': 4.2.1
       babel-plugin-transform-hook-names: 1.0.2(@babel/core@7.28.5)
       debug: 4.4.3
       picocolors: 1.1.1
-      vite: 7.3.0(@types/node@25.0.3)(terser@5.44.1)
-      vite-prerender-plugin: 0.5.12(vite@7.3.0(@types/node@25.0.3)(terser@5.44.1))
+      vite: 7.3.1(@types/node@25.0.3)(terser@5.44.1)
+      vite-prerender-plugin: 0.5.12(vite@7.3.1(@types/node@25.0.3)(terser@5.44.1))
     transitivePeerDependencies:
       - preact
       - supports-color
@@ -3634,7 +3634,7 @@ snapshots:
 
   '@prefresh/utils@1.2.1': {}
 
-  '@prefresh/vite@2.4.11(preact@10.28.2)(vite@7.3.0(@types/node@25.0.3)(terser@5.44.1))':
+  '@prefresh/vite@2.4.11(preact@10.28.2)(vite@7.3.1(@types/node@25.0.3)(terser@5.44.1))':
     dependencies:
       '@babel/core': 7.28.5
       '@prefresh/babel-plugin': 0.5.2
@@ -3642,7 +3642,7 @@ snapshots:
       '@prefresh/utils': 1.2.1
       '@rollup/pluginutils': 4.2.1
       preact: 10.28.2
-      vite: 7.3.0(@types/node@25.0.3)(terser@5.44.1)
+      vite: 7.3.1(@types/node@25.0.3)(terser@5.44.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -3737,7 +3737,7 @@ snapshots:
       react-virtualized-auto-sizer: 1.0.26(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
       react-window: 1.8.11(react-dom@19.2.3(react@19.2.3))(react@19.2.3)
 
-  '@trivago/prettier-plugin-sort-imports@6.0.1(prettier@3.7.4)':
+  '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.7.4)':
     dependencies:
       '@babel/generator': 7.28.5
       '@babel/parser': 7.28.5
@@ -3982,7 +3982,7 @@ snapshots:
 
   base64-js@1.5.1: {}
 
-  baseline-browser-mapping@2.9.11: {}
+  baseline-browser-mapping@2.9.12: {}
 
   bin-build@3.0.0:
     dependencies:
@@ -4039,7 +4039,7 @@ snapshots:
 
   browserslist@4.28.1:
     dependencies:
-      baseline-browser-mapping: 2.9.11
+      baseline-browser-mapping: 2.9.12
       caniuse-lite: 1.0.30001762
       electron-to-chromium: 1.5.267
       node-releases: 2.0.27
@@ -5549,7 +5549,7 @@ snapshots:
 
   react-is@19.2.3: {}
 
-  react-router@7.11.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3):
+  react-router@7.12.0(react-dom@19.2.3(react@19.2.3))(react@19.2.3):
     dependencies:
       cookie: 1.1.1
       react: 19.2.3
@@ -5990,7 +5990,7 @@ snapshots:
       spdx-correct: 3.2.0
       spdx-expression-parse: 3.0.1
 
-  vite-plugin-imagemin@0.6.1(vite@7.3.0(@types/node@25.0.3)(terser@5.44.1)):
+  vite-plugin-imagemin@0.6.1(vite@7.3.1(@types/node@25.0.3)(terser@5.44.1)):
     dependencies:
       '@types/imagemin': 7.0.1
       '@types/imagemin-gifsicle': 7.0.4
@@ -6015,11 +6015,11 @@ snapshots:
       imagemin-webp: 6.1.0
       jpegtran-bin: 6.0.1
       pathe: 0.2.0
-      vite: 7.3.0(@types/node@25.0.3)(terser@5.44.1)
+      vite: 7.3.1(@types/node@25.0.3)(terser@5.44.1)
     transitivePeerDependencies:
       - supports-color
 
-  vite-prerender-plugin@0.5.12(vite@7.3.0(@types/node@25.0.3)(terser@5.44.1)):
+  vite-prerender-plugin@0.5.12(vite@7.3.1(@types/node@25.0.3)(terser@5.44.1)):
     dependencies:
       kolorist: 1.8.0
       magic-string: 0.30.21
@@ -6027,20 +6027,20 @@ snapshots:
       simple-code-frame: 1.3.0
       source-map: 0.7.6
       stack-trace: 1.0.0-pre2
-      vite: 7.3.0(@types/node@25.0.3)(terser@5.44.1)
+      vite: 7.3.1(@types/node@25.0.3)(terser@5.44.1)
 
-  vite-tsconfig-paths@6.0.3(typescript@5.9.3)(vite@7.3.0(@types/node@25.0.3)(terser@5.44.1)):
+  vite-tsconfig-paths@6.0.3(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.3)(terser@5.44.1)):
     dependencies:
       debug: 4.4.3
       globrex: 0.1.2
       tsconfck: 3.1.6(typescript@5.9.3)
     optionalDependencies:
-      vite: 7.3.0(@types/node@25.0.3)(terser@5.44.1)
+      vite: 7.3.1(@types/node@25.0.3)(terser@5.44.1)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  vite@7.3.0(@types/node@25.0.3)(terser@5.44.1):
+  vite@7.3.1(@types/node@25.0.3)(terser@5.44.1):
     dependencies:
       esbuild: 0.27.2
       fdir: 6.5.0(picomatch@4.0.3)
diff --git a/mock-api/package.json b/mock-api/package.json
index 8780817cc..18711319b 100644
--- a/mock-api/package.json
+++ b/mock-api/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@msgpack/msgpack": "^3.1.3",
-    "@trivago/prettier-plugin-sort-imports": "^6.0.1",
+    "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "formidable": "^3.5.4",
     "itty-router": "^5.0.22",
     "prettier": "^3.7.4"
diff --git a/mock-api/pnpm-lock.yaml b/mock-api/pnpm-lock.yaml
index 9586176a7..5f50a949e 100644
--- a/mock-api/pnpm-lock.yaml
+++ b/mock-api/pnpm-lock.yaml
@@ -12,8 +12,8 @@ importers:
         specifier: ^3.1.3
         version: 3.1.3
       '@trivago/prettier-plugin-sort-imports':
-        specifier: ^6.0.1
-        version: 6.0.1(prettier@3.7.4)
+        specifier: ^6.0.2
+        version: 6.0.2(prettier@3.7.4)
       formidable:
         specifier: ^3.5.4
         version: 3.5.4
@@ -87,8 +87,8 @@ packages:
   '@paralleldrive/cuid2@2.3.1':
     resolution: {integrity: sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==}
 
-  '@trivago/prettier-plugin-sort-imports@6.0.1':
-    resolution: {integrity: sha512-6B13DCWDfAfh4AEJ43gRgeCSAQmlKG5LHqHzHc0lbUwgBy0rX7o41US+46Fd4XiXBx+JDGEz3NBadCbUls0dUQ==}
+  '@trivago/prettier-plugin-sort-imports@6.0.2':
+    resolution: {integrity: sha512-3DgfkukFyC/sE/VuYjaUUWoFfuVjPK55vOFDsxD56XXynFMCZDYFogH2l/hDfOsQAm1myoU/1xByJ3tWqtulXA==}
     engines: {node: '>= 20'}
     peerDependencies:
       '@vue/compiler-sfc': 3.x
@@ -246,7 +246,7 @@ snapshots:
     dependencies:
       '@noble/hashes': 1.8.0
 
-  '@trivago/prettier-plugin-sort-imports@6.0.1(prettier@3.7.4)':
+  '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.7.4)':
     dependencies:
       '@babel/generator': 7.28.5
       '@babel/parser': 7.28.5
diff --git a/src/core/emsdevice.cpp b/src/core/emsdevice.cpp
index 8d07660d0..ea8e0de05 100644
--- a/src/core/emsdevice.cpp
+++ b/src/core/emsdevice.cpp
@@ -547,40 +547,56 @@ void EMSdevice::add_device_value(int8_t                tag,              // to b
                                  int16_t               min,              // min allowed value
                                  uint32_t              max               // max allowed value
 ) {
-    // initialize the device value depending on it's type
-
-    if (type == DeviceValueType::STRING) {
-        *(char *)(value_p) = {'\0'}; // this is important for string functions like strlen() to work later
-    } else if (type == DeviceValueType::INT8) {
-        *(int8_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_INT8_DUMMY : EMS_VALUE_DEFAULT_INT8;
-    } else if (type == DeviceValueType::UINT8) {
-        *(uint8_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_UINT8_DUMMY : EMS_VALUE_DEFAULT_UINT8;
-    } else if (type == DeviceValueType::INT16) {
-        *(int16_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_INT16_DUMMY : EMS_VALUE_DEFAULT_INT16;
-    } else if (type == DeviceValueType::UINT16) {
-        *(uint16_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_UINT16_DUMMY : EMS_VALUE_DEFAULT_UINT16;
-    } else if ((type == DeviceValueType::UINT24) || (type == DeviceValueType::TIME) || (type == DeviceValueType::UINT32)) {
-        *(uint32_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_UINT24_DUMMY : EMS_VALUE_DEFAULT_UINT24;
-    } else if (type == DeviceValueType::BOOL) {
-        *(int8_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_BOOL_DUMMY : EMS_VALUE_DEFAULT_BOOL; // bool is uint8_t, but other initial value
-    } else if (type == DeviceValueType::ENUM) {
-        *(uint8_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_ENUM_DUMMY : EMS_VALUE_DEFAULT_ENUM; // enums behave as uint8_t
-    } else if (type == DeviceValueType::CMD) {
-        if (uom == DeviceValueUOM::NONE) {
-            *(uint8_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_ENUM_DUMMY : EMS_VALUE_DEFAULT_ENUM; // enums behave as uint8_t
-        } else if (uom == DeviceValueUOM::DEGREES) {
-            *(int16_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_INT16_DUMMY : EMS_VALUE_DEFAULT_INT16;
-        } else if (uom == DeviceValueUOM::PERCENT) {
-            *(uint8_t *)(value_p) = System::test_set_all_active() ? EMS_VALUE_DEFAULT_UINT8_DUMMY : EMS_VALUE_DEFAULT_UINT8;
-        }
-    }
-
     uint8_t state           = DeviceValueState::DV_DEFAULT; // determine state
     auto    custom_fullname = std::string("");              // custom fullname
     auto    short_name      = name[0];                      // entity name
     bool    has_cmd         = (f != nullptr);               // is it a command?
     bool    ignore          = false;                        // ignore this entity?
 
+    // check test mode, which populates all device values with some dummy date
+    bool test_active = System::test_set_all_active();
+
+    // if writable and in test mode, set to max value directly; otherwise set to default/dummy
+    bool use_max = test_active && has_cmd;
+
+    switch (type) {
+    case DeviceValueType::STRING:
+        *(char *)(value_p) = {'\0'}; // this is important for string functions like strlen() to work later
+        break;
+    case DeviceValueType::INT8:
+        *(int8_t *)(value_p) = use_max ? static_cast<int8_t>(max) : (test_active ? EMS_VALUE_DEFAULT_INT8_DUMMY : EMS_VALUE_DEFAULT_INT8);
+        break;
+    case DeviceValueType::UINT8:
+        *(uint8_t *)(value_p) = use_max ? static_cast<uint8_t>(max) : (test_active ? EMS_VALUE_DEFAULT_UINT8_DUMMY : EMS_VALUE_DEFAULT_UINT8);
+        break;
+    case DeviceValueType::INT16:
+        *(int16_t *)(value_p) = use_max ? static_cast<int16_t>(max) : (test_active ? EMS_VALUE_DEFAULT_INT16_DUMMY : EMS_VALUE_DEFAULT_INT16);
+        break;
+    case DeviceValueType::UINT16:
+        *(uint16_t *)(value_p) = use_max ? static_cast<uint16_t>(max) : (test_active ? EMS_VALUE_DEFAULT_UINT16_DUMMY : EMS_VALUE_DEFAULT_UINT16);
+        break;
+    case DeviceValueType::UINT24:
+    case DeviceValueType::TIME:
+    case DeviceValueType::UINT32:
+        *(uint32_t *)(value_p) = use_max ? static_cast<uint32_t>(max) : (test_active ? EMS_VALUE_DEFAULT_UINT24_DUMMY : EMS_VALUE_DEFAULT_UINT24);
+        break;
+    case DeviceValueType::BOOL:
+        *(int8_t *)(value_p) = use_max ? static_cast<int8_t>(max ? 1 : 0) : (test_active ? EMS_VALUE_DEFAULT_BOOL_DUMMY : EMS_VALUE_DEFAULT_BOOL);
+        break;
+    case DeviceValueType::ENUM:
+        *(uint8_t *)(value_p) = use_max ? static_cast<uint8_t>(max) : (test_active ? EMS_VALUE_DEFAULT_ENUM_DUMMY : EMS_VALUE_DEFAULT_ENUM);
+        break;
+    case DeviceValueType::CMD:
+        if (uom == DeviceValueUOM::NONE) {
+            *(uint8_t *)(value_p) = use_max ? static_cast<uint8_t>(max) : (test_active ? EMS_VALUE_DEFAULT_ENUM_DUMMY : EMS_VALUE_DEFAULT_ENUM);
+        } else if (uom == DeviceValueUOM::DEGREES) {
+            *(int16_t *)(value_p) = use_max ? static_cast<int16_t>(max) : (test_active ? EMS_VALUE_DEFAULT_INT16_DUMMY : EMS_VALUE_DEFAULT_INT16);
+        } else if (uom == DeviceValueUOM::PERCENT) {
+            *(uint8_t *)(value_p) = use_max ? static_cast<uint8_t>(max) : (test_active ? EMS_VALUE_DEFAULT_UINT8_DUMMY : EMS_VALUE_DEFAULT_UINT8);
+        }
+        break;
+    }
+
     // get fullname, getting translation if it exists
     const char * const * fullname;
     if (Helpers::count_items(name) == 1) {
@@ -1295,11 +1311,21 @@ void EMSdevice::getCustomizationEntities(std::vector<std::string> & entity_ids)
 // dumps all entity values in native English
 // the code is intended to run only once standalone, outside the ESP32 so not optimized for memory efficiency
 // pipe symbols (|) are escaped so they can be converted to Markdown in the Wiki
-// format is: device name,device type,product id,shortname,fullname,type [options...] \\| (min/max),uom,writeable,discovery entityid v3.4, discovery entityid
+// format is: device name,device type,product id,shortname,fullname,type [options...] [(min/max)],uom,writeable,discovery entityid v3.4, discovery entityid
 #if defined(EMSESP_STANDALONE)
 void EMSdevice::dump_devicevalue_info() {
     for (auto & dv : devicevalues_) {
         if (dv.fullname != nullptr) {
+            // for debugging, finding max values
+            /*
+            if (dv.has_cmd) {
+                if (dv.max - dv.min > 400) {
+                    Serial.printf("shortname:%s, min:%d, max:%d\n", dv.short_name, dv.min, dv.max);
+                }
+            }
+            continue;
+            */
+
             Serial.print('\"');
             Serial.print(default_name());
             Serial.print('\"');
@@ -1323,7 +1349,7 @@ void EMSdevice::dump_devicevalue_info() {
             Serial.print(dv.fullname[0]);
             Serial.print(',');
 
-            // per type
+            // type [options...] [(min/max)]
             switch (dv.type) {
             case DeviceValueType::ENUM:
             case DeviceValueType::CMD:
@@ -1383,14 +1409,12 @@ void EMSdevice::dump_devicevalue_info() {
                 break;
             }
 
-            // min/max range
-            int16_t  dv_set_min;
-            uint32_t dv_set_max;
-            if (dv.get_min_max(dv_set_min, dv_set_max)) {
+            // min/max range, if writeable
+            if (dv.has_cmd) {
                 Serial.print(" (>=");
-                Serial.print(dv_set_min);
+                Serial.print(dv.min);
                 Serial.print("<=");
-                Serial.print(dv_set_max);
+                Serial.print(dv.max);
                 Serial.print(")");
             }
             Serial.print(",");