From e4317e657b9497a80854e7ac310358d637f43461 Mon Sep 17 00:00:00 2001
From: Jens Maus <mail@jens-maus.de>
Date: Thu, 15 Oct 2026 15:59:52 +0000
Subject: [PATCH 1/2] webui: unify the settings page of the HmIP-eTRV-B/C
 thermostats

This applies OpenCCU rootfs patch 0193-WebUI-EnhancedTRVSettingsPage.patch:

- Remove the device-specific settings pages of HmIP-eTRV-B, -B1, -C,
  -C-2 and -CL (hmip-etrv-*_1_master.tcl), so these devices use the
  common HEATING_CLIMATECONTROL_TRANSCEIVER page like other thermostats.
- Extend getHeatingClimateControlTransceiver() with the parameters of
  these pages: window open temperature as a selection, temperature fall
  mode/value/time, valve error/maximum/offset position, decalcification
  day and time, boost position and boost after window open (expert
  parameters are only shown in expert mode).
- Call getCheckBox with the argument order of uiElements.tcl for
  ACOUSTIC_ALARM_SIGNAL. The old order matched only the getCheckBox
  override of the removed pages.
- Label the boost valve opening as such.
---
 .../MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js |   4 +-
 .../etc/hmipChannelConfigDialogs.tcl          | 173 +++++-
 .../easymodes/hmip/hmip-etrv-b1_1_master.tcl  | 502 ------------------
 .../easymodes/hmip/hmip-etrv-b_1_master.tcl   | 502 ------------------
 .../easymodes/hmip/hmip-etrv-c-2_1_master.tcl | 502 ------------------
 .../easymodes/hmip/hmip-etrv-c_1_master.tcl   | 502 ------------------
 .../easymodes/hmip/hmip-etrv-cl_1_master.tcl  | 502 ------------------
 7 files changed, 163 insertions(+), 2524 deletions(-)
 delete mode 100644 src/webui/www/config/easymodes/hmip/hmip-etrv-b1_1_master.tcl
 delete mode 100644 src/webui/www/config/easymodes/hmip/hmip-etrv-b_1_master.tcl
 delete mode 100644 src/webui/www/config/easymodes/hmip/hmip-etrv-c-2_1_master.tcl
 delete mode 100644 src/webui/www/config/easymodes/hmip/hmip-etrv-c_1_master.tcl
 delete mode 100644 src/webui/www/config/easymodes/hmip/hmip-etrv-cl_1_master.tcl

diff --git a/src/webui/www/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js b/src/webui/www/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js
index 09c814727..4e743fe3a 100644
--- a/src/webui/www/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js
+++ b/src/webui/www/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js
@@ -19,7 +19,7 @@ jQuery.extend(true,langJSON, {
     "stringTableTemperatureFallOpenTimePeriod" : "Dauer f&uuml;r Fenster-Auf-Temperatur",
     "stringTableTemperatureOffset" : "Temperatur-Offset",
     "stringTableBoostTimePeriod" : "Boost-Dauer",
-    "stringTableBoostPosition" : "Ventil&ouml;ffnungsgrad",
+    "stringTableBoostPosition" : "Boost-Ventil&ouml;ffnungsgrad",
     "stringTableBoostAfterWindowOpen" : "Boost nach Fensterschlie&szlig;ung ausl&ouml;sen",
     "stringTableShowWeekday" : "Wochentag im Display anzeigen",
     "stringTableDisplayInformation" : "Display-Information",
@@ -149,7 +149,7 @@ jQuery.extend(true,langJSON, {
     "stringTableTemperatureFallOpenTimePeriod" : "Duration for open-window temperature",
     "stringTableTemperatureOffset" : "Temperature offset",
     "stringTableBoostTimePeriod" : "Boost duration",
-    "stringTableBoostPosition" : "Valve opening",
+    "stringTableBoostPosition" : "Boost valve opening",
     "stringTableBoostAfterWindowOpen" : "Trigger boost after window is closed",
     "stringTableShowWeekday" : "Show weekday in display",
     "stringTableDisplayInformation" : "Display information",
diff --git a/src/webui/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl b/src/webui/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl
index a967fa723..d4cb55b10 100644
--- a/src/webui/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl
+++ b/src/webui/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl
@@ -3203,18 +3203,11 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
 
     append html "<table class=\"ProfileTbl\">"
     # left
-    incr prn
-    set param TEMPERATURE_OFFSET
+    set param TEMPERATURE_WINDOW_OPEN
     array_clear options
-    for {set val -3.5} {$val <= 3.5} {set val [expr $val + 0.5]} {
+    for {set val 5.0} {$val <= 30.0} {set val [expr $val + 0.5]} {
       set options($val) "$val &#176;C"
     }
-    append html "<td>\${stringTableTemperatureOffset}</td>"
-    append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param]</td>"
-    append html "</tr>"
-
-    #left
-    set param TEMPERATURE_WINDOW_OPEN
     if { [info exists ps($param)] == 1  } {
       incr prn
       if { [info exists ps(TEMPERATURE_WINDOW_OPEN_COOLING)] == 1  } {
@@ -3222,7 +3215,7 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
       } else {
         append html "<tr><td>\${stringTableTemperatureFallWindowOpen}</td>"
       }
-        append html "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"</td>"
+        append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
       append html "</tr>"
     }
 
@@ -3231,10 +3224,141 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
     if { [info exists ps($param)] == 1  } {
       incr prn
       append html "<tr><td>\${lblTemperatureWindowOpenCooling}</td>"
-        append html "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"</td>"
+        append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
+      append html "</tr>"
+    }
+
+    append html "</table>"
+
+    append html "<hr>"
+
+    append html "<table class=\"ProfileTbl\">"
+
+    set param TEMPERATUREFALL_MODUS
+    if { [info exists ps($param)] == 1  } {
+      incr prn
+      array_clear options
+      set options(0) "\${stringTableTemperatureFallModeOpt0}"
+      set options(1) "\${stringTableTemperatureFallModeOpt1}"
+      set options(2) "\${stringTableTemperatureFallModeOpt2}"
+      set options(3) "\${stringTableTemperatureFallModeOpt3}"
+      set options(4) "\${stringTableTemperatureFallModeOpt4}"
+      append html "<tr>"
+        append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableTemperatureFallModeOptions}</td>"
+        append html "<td name=\"expertParam\" class=\"hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param ]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.75]]"
+      append html "</td></tr>"
+    }
+	   
+    set param TEMPERATUREFALL_VALUE
+    if { [info exists ps($param)] == 1  } {
+      incr prn
+      append html "<tr>"
+        append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableTemperatureFallValue}</td>"
+        append html "<td name=\"expertParam\" class=\"hidden\">[getTextField $param $ps($param) $chn $prn]&nbsp;[getUnit $param]&nbsp;[getMinMaxValueDescr $param]</td>"
+      append html "</tr>"
+    }
+	   
+    set param TEMPERATUREFALL_WINDOW_OPEN_TIME_PERIOD
+    if { [info exists ps($param)] == 1  } {
+      incr prn
+        append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableTemperatureFallOpenTimePeriod}</td>"
+        append html "<td name=\"expertParam\" class=\"hidden\">[getTextField $param $ps($param) $chn $prn]&nbsp;min [getMinMaxValueDescr $param]</td>"
+      append html "</tr>"
+    }
+	
+    append html "</table>"
+
+    append html "<hr>"
+
+    append html "<table class=\"ProfileTbl\">"
+	
+    array_clear options
+    for {set val 0} {$val <= 1} {set val [expr $val + 0.01]} {
+      set options($val) "[expr int($val * 100)] %"
+    }
+
+    set param VALVE_ERROR_RUN_POSITION
+    if { [info exists ps($param)] == 1  } {
+      incr prn
+      append html "<tr>"
+        append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableValveStateErrorPosition}</td>"
+        append html "<td name=\"expertParam\" class=\"hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
+    }
+
+    set param VALVE_MAXIMUM_POSITION
+    if { [info exists ps($param)] == 1  } {
+      incr prn
+        append html "<td>\${stringTableValveMaximumPosition}</td>"
+        append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
       append html "</tr>"
     }
 
+    # left
+    incr prn
+    set param TEMPERATURE_OFFSET
+    array_clear options
+    for {set val -3.5} {$val <= 3.5} {set val [expr $val + 0.5]} {
+      set options($val) "$val &#176;C"
+    }
+    append html "<tr>"
+    append html "<td>\${stringTableTemperatureOffset}</td>"
+    append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param]</td>"
+	
+    # right
+	  array_clear options
+    for {set val 0} {$val <= 1} {set val [expr $val + 0.01]} {
+      set options($val) "[expr int($val * 100)] %"
+    }
+    set param VALVE_OFFSET
+    if { [info exists ps($param)] == 1  } {
+      incr prn
+        append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableValveOffset}</td>"
+        append html "<td name=\"expertParam\" class=\"hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
+    }
+    append html "</tr>"
+	
+    # left
+    set param DECALCIFICATION_WEEKDAY
+    if { [info exists ps($param)] == 1 } {
+      incr prn
+      array_clear options
+      set i 0
+      set comment {
+        foreach day {\${optionSat} \${optionSun} \${optionMon} \${optionTue} \${optionWed} \${optionThu} \${optionFri}} {
+          set options($i) $day
+          incr i
+        }
+      }
+      append html "<tr><td>\${stringTableClimateControlRegDecalcDay}</td>"
+        append html "<td>"
+         append html "<select id='separate_$CHANNEL\_$prn' class='SUNDAY' name='DECALCIFICATION_WEEKDAY'>"
+         append html "<option value='0'>\${optionSun}</option>"
+         append html "<option value='1'>\${optionMon}</option>"
+         append html "<option value='2'>\${optionTue}</option>"
+         append html "<option value='3'>\${optionWed}</option>"
+         append html "<option value='4'>\${optionThu}</option>"
+         append html "<option value='5'>\${optionFri}</option>"
+         append html "<option value='6'>\${optionSat}</option>"
+        append html "</select>"
+       append html "</td>"
+      append html "<script type=\"text/javascript\">jQuery('\#separate_$CHANNEL\_$prn\').val($ps($param));</script>"
+
+    # right
+    set param DECALCIFICATION_TIME
+    if { [info exists ps($param)] == 1 } {
+      incr prn
+      array_clear options
+      for {set i 0} {$i <= 23} {incr i} {
+        set hour $i
+        if {$i < 10} {set hour "0$i"}
+        set options([expr $i * 2]) "$hour:00"
+      }
+        append html "<td>\${stringTableClimateControlRegDecalcTime}</td>"
+        append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
+      append html "</tr>"
+    }
+  }
+	
   append html "</table>"
 
   append html "<hr>"
@@ -3249,7 +3373,32 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
     }
     append html "<tr><td>\${stringTableBoostTimePeriod}</td>"
       append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param]</td>"
+
+    # right
+    set param BOOST_POSITION
+    if { [info exists ps($param)] == 1  } {
+	    incr prn
+      array_clear options
+      set i 0
+      for {set val 0} {$val <= 100} {incr val 5} {
+        set options($val) "$val %"
+        incr i;
+      }
+      append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostPosition}</td>"
+      append html "<td name=\"expertParam\" class=\"hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
+    }
     append html "</tr>"
+
+    set param BOOST_AFTER_WINDOW_OPEN
+    if { [info exists ps($param)] == 1  } {
+      incr prn
+      append html "<tr>"
+       append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostAfterWindowOpen}</td>"
+       append html "<td name=\"expertParam\" class=\"hidden\">"
+       append html  "[getCheckBox '$param' $ps($param) $chn $prn]&nbsp;[getHelpIcon $param]"
+       append html "</td>"
+      append html "</tr>"
+    }
   append html "</table>"
 
   if { ([info exists ps(CHANNEL_OPERATION_MODE)] == 1) || ([info exists ps(ACOUSTIC_ALARM_SIGNAL)] == 1) || ([info exists ps(EFFECT_ADAPTION_FADE_OUT_TIME_FACTOR)] == 1)  } {
@@ -3272,7 +3421,7 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
         append html "<tr>"
           append html "<td>\${lblAcousticAlarmSignal}</td>"
           append html "<td>"
-          append html "[getCheckBox $CHANNEL '$param' $ps($param) $prn]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.5]]"
+          append html "[getCheckBox '$param' $ps($param) $chn $prn]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.5]]"
           append html "</td>"
         append html "</tr>"
       }
diff --git a/src/webui/www/config/easymodes/hmip/hmip-etrv-b1_1_master.tcl b/src/webui/www/config/easymodes/hmip/hmip-etrv-b1_1_master.tcl
deleted file mode 100644
index d002e2c5d..000000000
--- a/src/webui/www/config/easymodes/hmip/hmip-etrv-b1_1_master.tcl
+++ /dev/null
@@ -1,502 +0,0 @@
-#!/bin/tclsh
-
-
-sourceOnce [file join /www/config/easymodes/em_common.tcl]
-
-#Namen der EasyModes tauchen nicht mehr auf. Der Durchgängkeit werden sie hier noch definiert.
-set PROFILES_MAP(0)  "Experte"
-set PROFILES_MAP(1)  "TheOneAndOnlyEasyMode"
-
-proc getCheckBox {type param value prn} {
-  set checked ""
-  if { $value } then { set checked "checked=\"checked\"" }
-  set s "<input id='separate_$type\_$prn' type='checkbox' $checked value='dummy' name=$param/>"
-  return $s
-}
-
-proc _getMinValue {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set min [format {%1.1f} $param_descr(MIN)]
-  return "$min"
-}
-
-proc _getMaxValue {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set max [format {%1.1f} $param_descr(MAX)]
-  return "$max"
-}
-
-proc _getTextField {type param value prn} {
-  set elemId 'separate_$type\_$prn'
-  # Limit float to 1 decimal places
-  if {[llength [split $value "."]] == 2} {
-    set value [format {%1.1f} $value]
-  }
-
-  set s "<input id=$elemId type=\"text\" size=\"5\" value=$value name=$param>"
-  return $s
-}
-
-proc _getUnit {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set unit $param_descr(UNIT)
-
-  if {$unit == "minutes"} {
-   set unit "\${lblMinutes}"
-  }
-
-  if {($unit == "K") || ($unit == "??C") || ($unit == "°C")} {
-    set unit "&#176;C"
-  }
-
-  if {$unit == "100%"} {
-   set unit "%"
-  }
-
-  return "$unit"
-}
-
-proc _getMinMaxValueDescr {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set min $param_descr(MIN)
-  set max $param_descr(MAX)
-
-  if {[string equal $param VALVE_OFFSET] != 0} {
-    return "(0 - 100)"
-  }
-
-  # Limit float to 2 decimal places
-  if {[llength [split $min "."]] != 1} {
-    set min [format {%1.1f} $min]
-    set max [format {%1.1f} $max]
-  }
-  return "($min - $max)"
-}
-
-proc getHelpIcon {topic x y} {
-  set ret "<img src=\"/ise/img/help.png\" style=\"cursor: pointer; width:18px; height:18px; position:relative; top:2px\" onclick=\"showParamHelp('$topic', '$x', '$y')\">"
-  return $ret
-}
-
-proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
-
-  global env iface_url
-  
-  upvar PROFILES_MAP  PROFILES_MAP
-  upvar HTML_PARAMS   HTML_PARAMS
-  upvar PROFILE_PNAME PROFILE_PNAME
-  upvar $pps          ps
-  upvar $pps_descr    psDescr
-  
-  #upvar PROFILE_0     PROFILE_0
-  upvar PROFILE_1     PROFILE_1
-
-  set CHANNEL $special_input_id
-
-  set chn [lindex [split $special_input_id _] 0]
-
-  set hlpBoxWidth 450
-  set hlpBoxHeight 160
-
-  foreach val [array names psDescr] {
-    #puts "$val: $psDescr($val)\n"
-  }
-
-  puts "<script type=\"text/javascript\">"
-    puts "ShowActiveWeeklyProgram = function(activePrg) {"
-      puts " for (var i = 1; i <= 3; i++) {"
-        puts "jQuery('#P' + i + '_Timeouts_Area').hide();"
-      puts " }"
-      puts " jQuery('#P' + activePrg + '_Timeouts_Area').show();"
-    puts "};"
-  puts "</script>"
-
-
-  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/CC.js');load_JSFunc('/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js');load_JSFunc('/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN_HELP.js');</script>"
-
-  append HTML_PARAMS(separate_1) "[addHintHeatingGroupDevice $address]"
-
-  set prn 0
-
-  set param WEEK_PROGRAM_POINTER
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-    append HTML_PARAMS(separate_1) "<td class='hidden'><input type='text' id='separate_$CHANNEL\_$prn' name='$param'></td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">\${stringTableWeekProgramToEdit}</td>"
-      #append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param "onchange=\"ShowActiveWeeklyProgram(parseInt(\$(this).value)+1);\""][getHelpIcon $param [expr $hlpBoxWidth * 0.8] [expr $hlpBoxHeight / 2]]</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">"
-        append HTML_PARAMS(separate_1) "<select id=\"editProgram\" onchange=\"ShowActiveWeeklyProgram(parseInt(\$(this).value)+1);\">"
-          append HTML_PARAMS(separate_1) "<option value='0'>\${stringTableWeekProgram1}</option>"
-          append HTML_PARAMS(separate_1) "<option value='1'>\${stringTableWeekProgram2}</option>"
-          append HTML_PARAMS(separate_1) "<option value='2'>\${stringTableWeekProgram3}</option>"
-      append HTML_PARAMS(separate_1) "</select>[getHelpIcon $param [expr $hlpBoxWidth * 0.8] [expr $hlpBoxHeight / 2]]"
-      append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-  append HTML_PARAMS(separate_1) "</table>"
-
-  ## Create 3 Weekly Programs ##
-
-  for {set loop 1} {$loop <=3} {incr loop} {
-    set pNr "P$loop";
-    append HTML_PARAMS(separate_1) "<div id=\"$pNr\_Timeouts_Area\" style=\"display:none\">"
-    foreach day {SATURDAY SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY} {
-      append HTML_PARAMS(separate_1) "<div id=\"$pNr\_temp_prof_$day\"></div>"
-    }
-    append HTML_PARAMS(separate_1) "</div>"
-
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "$pNr\_tom = new TimeoutManager('$iface', '$address', false, '$pNr\_');"
-    foreach day {SATURDAY SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY} {
-
-      for {set i 1} {$i <= 13} {incr i} {
-
-        set timeout     $ps($pNr\_ENDTIME_${day}_$i)
-        set temperature $ps($pNr\_TEMPERATURE_${day}_$i)
-        append HTML_PARAMS(separate_1) "$pNr\_tom.setTemp('$day', $timeout, $temperature);"
-
-        if {$timeout == 1440} then {
-          break;
-        }
-      }
-
-      append HTML_PARAMS(separate_1) "$pNr\_tom.setDivname('$day', '$pNr\_temp_prof_$day');"
-      append HTML_PARAMS(separate_1) "$pNr\_tom.writeDay('$day');"
-    }
-    append HTML_PARAMS(separate_1) "</script>"
-  }
-
-  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">ShowActiveWeeklyProgram(1);</script>"
-
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  # *************** #
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-
-  set comment {
-    # left
-    incr prn
-    set param SHOW_SET_TEMPERATURE
-    append HTML_PARAMS(separate_1) "<tr>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableShowSetpointTemp}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-    append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    # right
-    incr prn
-    set param SHOW_HUMIDITY
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableShowHumidity}</td>"
-    append HTML_PARAMS(separate_1)  "<td name=\"expertParam\" class=\"hidden\">[getCheckBox $CHANNEL '$param' $ps($param) $prn]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-  }
-
-    # left
-    set param BUTTON_RESPONSE_WITHOUT_BACKLIGHT
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableButtonResponseWithoutBacklight}</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-      append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]"
-      append HTML_PARAMS(separate_1) "</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-  append HTML_PARAMS(separate_1) "</table>"
-
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-
-    set param TEMPERATURE_LOWERING_COOLING
-    if { [info exists ps($param)] == 1  } {
-      # left
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr><td>\${ecoCoolingTemperature}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-        append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-      append HTML_PARAMS(separate_1) "</script>"
-
-      # right
-      incr prn
-      set param TEMPERATURE_LOWERING
-      append HTML_PARAMS(separate_1) "<td>\${ecoHeatingTemperature}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"ecoOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-        append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-      append HTML_PARAMS(separate_1) "</script>"
-      append HTML_PARAMS(separate_1) "</tr>"
-
-      append HTML_PARAMS(separate_1) "<tr id=\"errorRow\" class=\"hidden\"> <td></td> <td colspan=\"2\"><span id=\"errorComfort\" class=\"attention\"></span></td> <td colspan=\"2\"><span id=\"errorEco\" class=\"attention\"></span></td> </tr>"
-    }
-    # left
-    incr prn
-    set param TEMPERATURE_MINIMUM
-    array_clear options
-    set i 0
-    for {set val [_getMinValue $param]} {$val <= [_getMaxValue $param]} {set val [expr $val + 0.5]} {
-      set options($i) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableTemperatureMinimum}</td>"
-    append HTML_PARAMS(separate_1)  "<td>[get_ComboBox options $param tmp_$CHANNEL\_$prn ps $param onchange=setMinMaxTemp('tmp_$CHANNEL\_$prn','separate_$CHANNEL\_$prn')]</span> <span class='hidden'>[_getTextField $CHANNEL '$param' $ps($param) $prn]</span></td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "try{window.setTimeout(function() {setMinMaxTempOption('tmp_$CHANNEL\_$prn', 'separate_$CHANNEL\_$prn' );},100);} catch(e){}"
-    append HTML_PARAMS(separate_1) "</script>"
-
-    # right
-    incr prn
-    set param TEMPERATURE_MAXIMUM
-    array_clear options
-    set i 0
-    for {set val [_getMinValue $param]} {$val <= [_getMaxValue $param]} {set val [expr $val + 0.5]} {
-      set options($i) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableTemperatureMaximum}</td>"
-    append HTML_PARAMS(separate_1)  "<td>[get_ComboBox options $param tmp_$CHANNEL\_$prn ps $param onchange=setMinMaxTemp('tmp_$CHANNEL\_$prn','separate_$CHANNEL\_$prn')]</span> <span class='hidden'>[_getTextField $CHANNEL '$param' $ps($param) $prn]</span></td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "try{window.setTimeout(function() {setMinMaxTempOption('tmp_$CHANNEL\_$prn', 'separate_$CHANNEL\_$prn' );},100);} catch(e){}"
-    append HTML_PARAMS(separate_1) "</script>"
-
-    #left
-    incr prn
-    set param TEMPERATURE_OFFSET
-    array_clear options
-    set i 0
-    for {set val -3.5} {$val <= 3.5} {set val [expr $val + 0.5]} {
-      set options($val) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableTemperatureOffset}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-  # left
-    incr prn
-    set param TEMPERATURE_WINDOW_OPEN
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableTemperatureFallWindowOpen}</td>"
-    append HTML_PARAMS(separate_1)  "<td colspan=\"2\">[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-    append HTML_PARAMS(separate_1) "</script>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    incr prn
-    set param TEMPERATUREFALL_MODUS
-    append HTML_PARAMS(separate_1) "<tr name=\"expertParam\" class=\"hidden\"><td>\${stringTableTemperatureFallModeOptions}</td><td>"
-    #append HTML_PARAMS(separate_1)  [get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight + 20]]
-
-    append HTML_PARAMS(separate_1) "<select id='separate_$CHANNEL\_$prn' name='$param'>"
-    append HTML_PARAMS(separate_1) "<option value='0'>\${stringTableTemperatureFallModeOpt0}</option>"
-    append HTML_PARAMS(separate_1) "<option value='1'>\${stringTableTemperatureFallModeOpt1}</option>"
-    append HTML_PARAMS(separate_1) "<option value='2'>\${stringTableTemperatureFallModeOpt2}</option>"
-    append HTML_PARAMS(separate_1) "<option value='3'>\${stringTableTemperatureFallModeOpt3}</option>"
-    append HTML_PARAMS(separate_1) "<option value='4'>\${stringTableTemperatureFallModeOpt4}</option>"
-    append HTML_PARAMS(separate_1) "</select>"
-
-    append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">jQuery('\#separate_$CHANNEL\_$prn\').val($ps($param));</script>"
-
-    # right
-    incr prn
-    set param TEMPERATUREFALL_VALUE
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableTemperatureFallValue}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-
-
-    set param DURATION_5MIN
-    if { [info exists ps($param)] == 1  } {
-      # In older versions this parameter is not available
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr name=\"expertParam\" class=\"hidden\">"
-        append HTML_PARAMS(separate_1) "<td>\${stringTableDuration5Min}</td>"
-        append HTML_PARAMS(separate_1) "<td colspan=\"2\" >[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-
-        append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-          append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {"
-          append HTML_PARAMS(separate_1) "var value = this.value;"
-          append HTML_PARAMS(separate_1) "this.value = Math.round(this.value / 5) * 5;"
-          append HTML_PARAMS(separate_1) "ProofAndSetValue(this.id, this.id, [getMinValue $param], [getMaxValue $param], 1);"
-          append HTML_PARAMS(separate_1) "});"
-        append HTML_PARAMS(separate_1) "</script>"
-
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-
-  append HTML_PARAMS(separate_1) "</table>"
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-    # left
-    incr prn
-    set param BOOST_TIME_PERIOD
-    array_clear options
-    set i 0
-    for {set val 0} {$val <= 30} {incr val 5} {
-        set options($val) "$val min"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableBoostTimePeriod}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    # right
-    incr prn
-    set param BOOST_POSITION
-    array_clear options
-    set i 0
-    for {set val 0} {$val <= 100} {incr val 10} {
-        set options($val) "$val %"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostPosition}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    incr prn
-    set param DECALCIFICATION_WEEKDAY
-    array_clear options
-    set i 0
-    set comment {
-      foreach day {\${optionSat} \${optionSun} \${optionMon} \${optionTue} \${optionWed} \${optionThu} \${optionFri}} {
-        set options($i) $day
-        incr i
-      }
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableClimateControlRegDecalcDay}</td>"
-    #append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-
-    append HTML_PARAMS(separate_1) "<td>"
-       append HTML_PARAMS(separate_1) "<select id='separate_$CHANNEL\_$prn' class='SUNDAY' name='DECALCIFICATION_WEEKDAY'>"
-        append HTML_PARAMS(separate_1) "<option value='0'>\${optionSun}</option>"
-        append HTML_PARAMS(separate_1) "<option value='1'>\${optionMon}</option>"
-        append HTML_PARAMS(separate_1) "<option value='2'>\${optionTue}</option>"
-        append HTML_PARAMS(separate_1) "<option value='3'>\${optionWed}</option>"
-        append HTML_PARAMS(separate_1) "<option value='4'>\${optionThu}</option>"
-        append HTML_PARAMS(separate_1) "<option value='5'>\${optionFri}</option>"
-        append HTML_PARAMS(separate_1) "<option value='6'>\${optionSat}</option>"
-      append HTML_PARAMS(separate_1) "</select>"
-
-    append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">jQuery('\#separate_$CHANNEL\_$prn\').val($ps($param));</script>"
-
-    # right
-    incr prn
-    set param  DECALCIFICATION_TIME
-    array_clear options
-    for {set i 0} {$i <= 23} {incr i} {
-      set hour $i
-      if {$i < 10} {set hour "0$i"}
-      set options([expr $i * 2]) "$hour:00"
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableClimateControlRegDecalcTime}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    append HTML_PARAMS(separate_1) "<tr>"
-      array_clear options
-      for {set val 0} {$val <= 1} {set val [expr $val + 0.05]} {
-        set options($val) "[expr int($val * 100)] %"
-      }
-      set param VALVE_ERROR_RUN_POSITION
-      if { [info exists ps($param)] == 1  } {
-        incr prn
-        append HTML_PARAMS(separate_1) "<td>\${stringTableValveStateErrorPosition}</td>"
-        append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-      }
-
-      set param VALVE_MAXIMUM_POSITION
-      if { [info exists ps($param)] == 1  } {
-        incr prn
-        append HTML_PARAMS(separate_1) "<td>\${stringTableValveMaximumPosition}</td>"
-        append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-      }
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    set param VALVE_OFFSET
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableValveOffset}</td>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\" colspan=\"2\" >[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp; [_getUnit $param]&nbsp;[_getMinMaxValueDescr $param][getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight + 50]]</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-
-    set param BOOST_AFTER_WINDOW_OPEN
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostAfterWindowOpen}</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-      append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]"
-      append HTML_PARAMS(separate_1) "</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-  append HTML_PARAMS(separate_1) "</table>"
-
-  if { (! [catch {set tmp $ps(CHANNEL_OPERATION_MODE)}]) || (! [catch {set tmp $ps(ACOUSTIC_ALARM_SIGNAL)}])  } {
-    append HTML_PARAMS(separate_1) "<hr>"
-    append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-        set param CHANNEL_OPERATION_MODE
-        if { [info exists ps($param)] == 1  } {
-          incr prn
-          array_clear options
-          set options(0) "\${optionETRVNormalMode}"
-          set options(1) "\${optionETRVSilentMode}"
-          append HTML_PARAMS(separate_1) "<tr><td>\${lblMode}</td><td>"
-          append HTML_PARAMS(separate_1) "[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param onchange=\"alert(this.value,$chn)\"]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.75]]"
-          append HTML_PARAMS(separate_1) "</td></tr>"
-        }
-
-        set param ACOUSTIC_ALARM_SIGNAL
-        if { [info exists ps($param)] == 1  } {
-          incr prn
-          append HTML_PARAMS(separate_1) "<tr>"
-            append HTML_PARAMS(separate_1) "<td>\${lblAcousticAlarmSignal}</td>"
-            append HTML_PARAMS(separate_1) "<td>"
-            append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.5]]"
-            append HTML_PARAMS(separate_1) "</td>"
-          append HTML_PARAMS(separate_1) "</tr>"
-        }
-
-    append HTML_PARAMS(separate_1) "</table>"
-  }
-
-  if {[session_is_expert]} {
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-      append HTML_PARAMS(separate_1) "jQuery(\"\[name='expertParam'\]\").show();"
-    append HTML_PARAMS(separate_1) "</script>"
-  } else {
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-      append HTML_PARAMS(separate_1) "jQuery(\"\[name='expertParam'\]\").hide();"
-    append HTML_PARAMS(separate_1) "</script>"
-  }
-
-}
-
-constructor
diff --git a/src/webui/www/config/easymodes/hmip/hmip-etrv-b_1_master.tcl b/src/webui/www/config/easymodes/hmip/hmip-etrv-b_1_master.tcl
deleted file mode 100644
index d002e2c5d..000000000
--- a/src/webui/www/config/easymodes/hmip/hmip-etrv-b_1_master.tcl
+++ /dev/null
@@ -1,502 +0,0 @@
-#!/bin/tclsh
-
-
-sourceOnce [file join /www/config/easymodes/em_common.tcl]
-
-#Namen der EasyModes tauchen nicht mehr auf. Der Durchgängkeit werden sie hier noch definiert.
-set PROFILES_MAP(0)  "Experte"
-set PROFILES_MAP(1)  "TheOneAndOnlyEasyMode"
-
-proc getCheckBox {type param value prn} {
-  set checked ""
-  if { $value } then { set checked "checked=\"checked\"" }
-  set s "<input id='separate_$type\_$prn' type='checkbox' $checked value='dummy' name=$param/>"
-  return $s
-}
-
-proc _getMinValue {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set min [format {%1.1f} $param_descr(MIN)]
-  return "$min"
-}
-
-proc _getMaxValue {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set max [format {%1.1f} $param_descr(MAX)]
-  return "$max"
-}
-
-proc _getTextField {type param value prn} {
-  set elemId 'separate_$type\_$prn'
-  # Limit float to 1 decimal places
-  if {[llength [split $value "."]] == 2} {
-    set value [format {%1.1f} $value]
-  }
-
-  set s "<input id=$elemId type=\"text\" size=\"5\" value=$value name=$param>"
-  return $s
-}
-
-proc _getUnit {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set unit $param_descr(UNIT)
-
-  if {$unit == "minutes"} {
-   set unit "\${lblMinutes}"
-  }
-
-  if {($unit == "K") || ($unit == "??C") || ($unit == "°C")} {
-    set unit "&#176;C"
-  }
-
-  if {$unit == "100%"} {
-   set unit "%"
-  }
-
-  return "$unit"
-}
-
-proc _getMinMaxValueDescr {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set min $param_descr(MIN)
-  set max $param_descr(MAX)
-
-  if {[string equal $param VALVE_OFFSET] != 0} {
-    return "(0 - 100)"
-  }
-
-  # Limit float to 2 decimal places
-  if {[llength [split $min "."]] != 1} {
-    set min [format {%1.1f} $min]
-    set max [format {%1.1f} $max]
-  }
-  return "($min - $max)"
-}
-
-proc getHelpIcon {topic x y} {
-  set ret "<img src=\"/ise/img/help.png\" style=\"cursor: pointer; width:18px; height:18px; position:relative; top:2px\" onclick=\"showParamHelp('$topic', '$x', '$y')\">"
-  return $ret
-}
-
-proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
-
-  global env iface_url
-  
-  upvar PROFILES_MAP  PROFILES_MAP
-  upvar HTML_PARAMS   HTML_PARAMS
-  upvar PROFILE_PNAME PROFILE_PNAME
-  upvar $pps          ps
-  upvar $pps_descr    psDescr
-  
-  #upvar PROFILE_0     PROFILE_0
-  upvar PROFILE_1     PROFILE_1
-
-  set CHANNEL $special_input_id
-
-  set chn [lindex [split $special_input_id _] 0]
-
-  set hlpBoxWidth 450
-  set hlpBoxHeight 160
-
-  foreach val [array names psDescr] {
-    #puts "$val: $psDescr($val)\n"
-  }
-
-  puts "<script type=\"text/javascript\">"
-    puts "ShowActiveWeeklyProgram = function(activePrg) {"
-      puts " for (var i = 1; i <= 3; i++) {"
-        puts "jQuery('#P' + i + '_Timeouts_Area').hide();"
-      puts " }"
-      puts " jQuery('#P' + activePrg + '_Timeouts_Area').show();"
-    puts "};"
-  puts "</script>"
-
-
-  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/CC.js');load_JSFunc('/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js');load_JSFunc('/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN_HELP.js');</script>"
-
-  append HTML_PARAMS(separate_1) "[addHintHeatingGroupDevice $address]"
-
-  set prn 0
-
-  set param WEEK_PROGRAM_POINTER
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-    append HTML_PARAMS(separate_1) "<td class='hidden'><input type='text' id='separate_$CHANNEL\_$prn' name='$param'></td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">\${stringTableWeekProgramToEdit}</td>"
-      #append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param "onchange=\"ShowActiveWeeklyProgram(parseInt(\$(this).value)+1);\""][getHelpIcon $param [expr $hlpBoxWidth * 0.8] [expr $hlpBoxHeight / 2]]</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">"
-        append HTML_PARAMS(separate_1) "<select id=\"editProgram\" onchange=\"ShowActiveWeeklyProgram(parseInt(\$(this).value)+1);\">"
-          append HTML_PARAMS(separate_1) "<option value='0'>\${stringTableWeekProgram1}</option>"
-          append HTML_PARAMS(separate_1) "<option value='1'>\${stringTableWeekProgram2}</option>"
-          append HTML_PARAMS(separate_1) "<option value='2'>\${stringTableWeekProgram3}</option>"
-      append HTML_PARAMS(separate_1) "</select>[getHelpIcon $param [expr $hlpBoxWidth * 0.8] [expr $hlpBoxHeight / 2]]"
-      append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-  append HTML_PARAMS(separate_1) "</table>"
-
-  ## Create 3 Weekly Programs ##
-
-  for {set loop 1} {$loop <=3} {incr loop} {
-    set pNr "P$loop";
-    append HTML_PARAMS(separate_1) "<div id=\"$pNr\_Timeouts_Area\" style=\"display:none\">"
-    foreach day {SATURDAY SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY} {
-      append HTML_PARAMS(separate_1) "<div id=\"$pNr\_temp_prof_$day\"></div>"
-    }
-    append HTML_PARAMS(separate_1) "</div>"
-
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "$pNr\_tom = new TimeoutManager('$iface', '$address', false, '$pNr\_');"
-    foreach day {SATURDAY SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY} {
-
-      for {set i 1} {$i <= 13} {incr i} {
-
-        set timeout     $ps($pNr\_ENDTIME_${day}_$i)
-        set temperature $ps($pNr\_TEMPERATURE_${day}_$i)
-        append HTML_PARAMS(separate_1) "$pNr\_tom.setTemp('$day', $timeout, $temperature);"
-
-        if {$timeout == 1440} then {
-          break;
-        }
-      }
-
-      append HTML_PARAMS(separate_1) "$pNr\_tom.setDivname('$day', '$pNr\_temp_prof_$day');"
-      append HTML_PARAMS(separate_1) "$pNr\_tom.writeDay('$day');"
-    }
-    append HTML_PARAMS(separate_1) "</script>"
-  }
-
-  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">ShowActiveWeeklyProgram(1);</script>"
-
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  # *************** #
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-
-  set comment {
-    # left
-    incr prn
-    set param SHOW_SET_TEMPERATURE
-    append HTML_PARAMS(separate_1) "<tr>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableShowSetpointTemp}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-    append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    # right
-    incr prn
-    set param SHOW_HUMIDITY
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableShowHumidity}</td>"
-    append HTML_PARAMS(separate_1)  "<td name=\"expertParam\" class=\"hidden\">[getCheckBox $CHANNEL '$param' $ps($param) $prn]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-  }
-
-    # left
-    set param BUTTON_RESPONSE_WITHOUT_BACKLIGHT
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableButtonResponseWithoutBacklight}</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-      append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]"
-      append HTML_PARAMS(separate_1) "</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-  append HTML_PARAMS(separate_1) "</table>"
-
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-
-    set param TEMPERATURE_LOWERING_COOLING
-    if { [info exists ps($param)] == 1  } {
-      # left
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr><td>\${ecoCoolingTemperature}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-        append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-      append HTML_PARAMS(separate_1) "</script>"
-
-      # right
-      incr prn
-      set param TEMPERATURE_LOWERING
-      append HTML_PARAMS(separate_1) "<td>\${ecoHeatingTemperature}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"ecoOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-        append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-      append HTML_PARAMS(separate_1) "</script>"
-      append HTML_PARAMS(separate_1) "</tr>"
-
-      append HTML_PARAMS(separate_1) "<tr id=\"errorRow\" class=\"hidden\"> <td></td> <td colspan=\"2\"><span id=\"errorComfort\" class=\"attention\"></span></td> <td colspan=\"2\"><span id=\"errorEco\" class=\"attention\"></span></td> </tr>"
-    }
-    # left
-    incr prn
-    set param TEMPERATURE_MINIMUM
-    array_clear options
-    set i 0
-    for {set val [_getMinValue $param]} {$val <= [_getMaxValue $param]} {set val [expr $val + 0.5]} {
-      set options($i) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableTemperatureMinimum}</td>"
-    append HTML_PARAMS(separate_1)  "<td>[get_ComboBox options $param tmp_$CHANNEL\_$prn ps $param onchange=setMinMaxTemp('tmp_$CHANNEL\_$prn','separate_$CHANNEL\_$prn')]</span> <span class='hidden'>[_getTextField $CHANNEL '$param' $ps($param) $prn]</span></td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "try{window.setTimeout(function() {setMinMaxTempOption('tmp_$CHANNEL\_$prn', 'separate_$CHANNEL\_$prn' );},100);} catch(e){}"
-    append HTML_PARAMS(separate_1) "</script>"
-
-    # right
-    incr prn
-    set param TEMPERATURE_MAXIMUM
-    array_clear options
-    set i 0
-    for {set val [_getMinValue $param]} {$val <= [_getMaxValue $param]} {set val [expr $val + 0.5]} {
-      set options($i) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableTemperatureMaximum}</td>"
-    append HTML_PARAMS(separate_1)  "<td>[get_ComboBox options $param tmp_$CHANNEL\_$prn ps $param onchange=setMinMaxTemp('tmp_$CHANNEL\_$prn','separate_$CHANNEL\_$prn')]</span> <span class='hidden'>[_getTextField $CHANNEL '$param' $ps($param) $prn]</span></td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "try{window.setTimeout(function() {setMinMaxTempOption('tmp_$CHANNEL\_$prn', 'separate_$CHANNEL\_$prn' );},100);} catch(e){}"
-    append HTML_PARAMS(separate_1) "</script>"
-
-    #left
-    incr prn
-    set param TEMPERATURE_OFFSET
-    array_clear options
-    set i 0
-    for {set val -3.5} {$val <= 3.5} {set val [expr $val + 0.5]} {
-      set options($val) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableTemperatureOffset}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-  # left
-    incr prn
-    set param TEMPERATURE_WINDOW_OPEN
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableTemperatureFallWindowOpen}</td>"
-    append HTML_PARAMS(separate_1)  "<td colspan=\"2\">[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-    append HTML_PARAMS(separate_1) "</script>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    incr prn
-    set param TEMPERATUREFALL_MODUS
-    append HTML_PARAMS(separate_1) "<tr name=\"expertParam\" class=\"hidden\"><td>\${stringTableTemperatureFallModeOptions}</td><td>"
-    #append HTML_PARAMS(separate_1)  [get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight + 20]]
-
-    append HTML_PARAMS(separate_1) "<select id='separate_$CHANNEL\_$prn' name='$param'>"
-    append HTML_PARAMS(separate_1) "<option value='0'>\${stringTableTemperatureFallModeOpt0}</option>"
-    append HTML_PARAMS(separate_1) "<option value='1'>\${stringTableTemperatureFallModeOpt1}</option>"
-    append HTML_PARAMS(separate_1) "<option value='2'>\${stringTableTemperatureFallModeOpt2}</option>"
-    append HTML_PARAMS(separate_1) "<option value='3'>\${stringTableTemperatureFallModeOpt3}</option>"
-    append HTML_PARAMS(separate_1) "<option value='4'>\${stringTableTemperatureFallModeOpt4}</option>"
-    append HTML_PARAMS(separate_1) "</select>"
-
-    append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">jQuery('\#separate_$CHANNEL\_$prn\').val($ps($param));</script>"
-
-    # right
-    incr prn
-    set param TEMPERATUREFALL_VALUE
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableTemperatureFallValue}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-
-
-    set param DURATION_5MIN
-    if { [info exists ps($param)] == 1  } {
-      # In older versions this parameter is not available
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr name=\"expertParam\" class=\"hidden\">"
-        append HTML_PARAMS(separate_1) "<td>\${stringTableDuration5Min}</td>"
-        append HTML_PARAMS(separate_1) "<td colspan=\"2\" >[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-
-        append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-          append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {"
-          append HTML_PARAMS(separate_1) "var value = this.value;"
-          append HTML_PARAMS(separate_1) "this.value = Math.round(this.value / 5) * 5;"
-          append HTML_PARAMS(separate_1) "ProofAndSetValue(this.id, this.id, [getMinValue $param], [getMaxValue $param], 1);"
-          append HTML_PARAMS(separate_1) "});"
-        append HTML_PARAMS(separate_1) "</script>"
-
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-
-  append HTML_PARAMS(separate_1) "</table>"
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-    # left
-    incr prn
-    set param BOOST_TIME_PERIOD
-    array_clear options
-    set i 0
-    for {set val 0} {$val <= 30} {incr val 5} {
-        set options($val) "$val min"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableBoostTimePeriod}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    # right
-    incr prn
-    set param BOOST_POSITION
-    array_clear options
-    set i 0
-    for {set val 0} {$val <= 100} {incr val 10} {
-        set options($val) "$val %"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostPosition}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    incr prn
-    set param DECALCIFICATION_WEEKDAY
-    array_clear options
-    set i 0
-    set comment {
-      foreach day {\${optionSat} \${optionSun} \${optionMon} \${optionTue} \${optionWed} \${optionThu} \${optionFri}} {
-        set options($i) $day
-        incr i
-      }
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableClimateControlRegDecalcDay}</td>"
-    #append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-
-    append HTML_PARAMS(separate_1) "<td>"
-       append HTML_PARAMS(separate_1) "<select id='separate_$CHANNEL\_$prn' class='SUNDAY' name='DECALCIFICATION_WEEKDAY'>"
-        append HTML_PARAMS(separate_1) "<option value='0'>\${optionSun}</option>"
-        append HTML_PARAMS(separate_1) "<option value='1'>\${optionMon}</option>"
-        append HTML_PARAMS(separate_1) "<option value='2'>\${optionTue}</option>"
-        append HTML_PARAMS(separate_1) "<option value='3'>\${optionWed}</option>"
-        append HTML_PARAMS(separate_1) "<option value='4'>\${optionThu}</option>"
-        append HTML_PARAMS(separate_1) "<option value='5'>\${optionFri}</option>"
-        append HTML_PARAMS(separate_1) "<option value='6'>\${optionSat}</option>"
-      append HTML_PARAMS(separate_1) "</select>"
-
-    append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">jQuery('\#separate_$CHANNEL\_$prn\').val($ps($param));</script>"
-
-    # right
-    incr prn
-    set param  DECALCIFICATION_TIME
-    array_clear options
-    for {set i 0} {$i <= 23} {incr i} {
-      set hour $i
-      if {$i < 10} {set hour "0$i"}
-      set options([expr $i * 2]) "$hour:00"
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableClimateControlRegDecalcTime}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    append HTML_PARAMS(separate_1) "<tr>"
-      array_clear options
-      for {set val 0} {$val <= 1} {set val [expr $val + 0.05]} {
-        set options($val) "[expr int($val * 100)] %"
-      }
-      set param VALVE_ERROR_RUN_POSITION
-      if { [info exists ps($param)] == 1  } {
-        incr prn
-        append HTML_PARAMS(separate_1) "<td>\${stringTableValveStateErrorPosition}</td>"
-        append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-      }
-
-      set param VALVE_MAXIMUM_POSITION
-      if { [info exists ps($param)] == 1  } {
-        incr prn
-        append HTML_PARAMS(separate_1) "<td>\${stringTableValveMaximumPosition}</td>"
-        append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-      }
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    set param VALVE_OFFSET
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableValveOffset}</td>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\" colspan=\"2\" >[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp; [_getUnit $param]&nbsp;[_getMinMaxValueDescr $param][getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight + 50]]</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-
-    set param BOOST_AFTER_WINDOW_OPEN
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostAfterWindowOpen}</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-      append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]"
-      append HTML_PARAMS(separate_1) "</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-  append HTML_PARAMS(separate_1) "</table>"
-
-  if { (! [catch {set tmp $ps(CHANNEL_OPERATION_MODE)}]) || (! [catch {set tmp $ps(ACOUSTIC_ALARM_SIGNAL)}])  } {
-    append HTML_PARAMS(separate_1) "<hr>"
-    append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-        set param CHANNEL_OPERATION_MODE
-        if { [info exists ps($param)] == 1  } {
-          incr prn
-          array_clear options
-          set options(0) "\${optionETRVNormalMode}"
-          set options(1) "\${optionETRVSilentMode}"
-          append HTML_PARAMS(separate_1) "<tr><td>\${lblMode}</td><td>"
-          append HTML_PARAMS(separate_1) "[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param onchange=\"alert(this.value,$chn)\"]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.75]]"
-          append HTML_PARAMS(separate_1) "</td></tr>"
-        }
-
-        set param ACOUSTIC_ALARM_SIGNAL
-        if { [info exists ps($param)] == 1  } {
-          incr prn
-          append HTML_PARAMS(separate_1) "<tr>"
-            append HTML_PARAMS(separate_1) "<td>\${lblAcousticAlarmSignal}</td>"
-            append HTML_PARAMS(separate_1) "<td>"
-            append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.5]]"
-            append HTML_PARAMS(separate_1) "</td>"
-          append HTML_PARAMS(separate_1) "</tr>"
-        }
-
-    append HTML_PARAMS(separate_1) "</table>"
-  }
-
-  if {[session_is_expert]} {
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-      append HTML_PARAMS(separate_1) "jQuery(\"\[name='expertParam'\]\").show();"
-    append HTML_PARAMS(separate_1) "</script>"
-  } else {
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-      append HTML_PARAMS(separate_1) "jQuery(\"\[name='expertParam'\]\").hide();"
-    append HTML_PARAMS(separate_1) "</script>"
-  }
-
-}
-
-constructor
diff --git a/src/webui/www/config/easymodes/hmip/hmip-etrv-c-2_1_master.tcl b/src/webui/www/config/easymodes/hmip/hmip-etrv-c-2_1_master.tcl
deleted file mode 100644
index 897b5c032..000000000
--- a/src/webui/www/config/easymodes/hmip/hmip-etrv-c-2_1_master.tcl
+++ /dev/null
@@ -1,502 +0,0 @@
-#!/bin/tclsh
-
-
-sourceOnce [file join /www/config/easymodes/em_common.tcl]
-
-#Namen der EasyModes tauchen nicht mehr auf. Der Durchgängkeit werden sie hier noch definiert.
-set PROFILES_MAP(0)  "Experte"
-set PROFILES_MAP(1)  "TheOneAndOnlyEasyMode"
-
-proc getCheckBox {type param value prn} {
-  set checked ""
-  if { $value } then { set checked "checked=\"checked\"" }
-  set s "<input id='separate_$type\_$prn' type='checkbox' $checked value='dummy' name=$param/>"
-  return $s
-}
-
-proc _getMinValue {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set min [format {%1.1f} $param_descr(MIN)]
-  return "$min"
-}
-
-proc _getMaxValue {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set max [format {%1.1f} $param_descr(MAX)]
-  return "$max"
-}
-
-proc _getTextField {type param value prn} {
-  set elemId 'separate_$type\_$prn'
-  # Limit float to 1 decimal places
-  if {[llength [split $value "."]] == 2} {
-    set value [format {%1.1f} $value]
-  }
-
-  set s "<input id=$elemId type=\"text\" size=\"5\" value=$value name=$param>"
-  return $s
-}
-
-proc _getUnit {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set unit $param_descr(UNIT)
-
-  if {$unit == "minutes"} {
-   set unit "\${lblMinutes}"
-  }
-
-  if {($unit == "K") || ($unit == "??C") || ($unit == "°C")} {
-    set unit "&#176;C"
-  }
-
-  if {$unit == "100%"} {
-   set unit "%"
-  }
-
-  return "$unit"
-}
-
-proc _getMinMaxValueDescr {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set min $param_descr(MIN)
-  set max $param_descr(MAX)
-
-  if {[string equal $param VALVE_OFFSET] != 0} {
-    return "(0 - 100)"
-  }
-
-  # Limit float to 2 decimal places
-  if {[llength [split $min "."]] != 1} {
-    set min [format {%1.1f} $min]
-    set max [format {%1.1f} $max]
-  }
-  return "($min - $max)"
-}
-
-proc getHelpIcon {topic x y} {
-  set ret "<img src=\"/ise/img/help.png\" style=\"cursor: pointer; width:18px; height:18px; position:relative; top:2px\" onclick=\"showParamHelp('$topic', '$x', '$y')\">"
-  return $ret
-}
-
-proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
-
-  global env iface_url
-  
-  upvar PROFILES_MAP  PROFILES_MAP
-  upvar HTML_PARAMS   HTML_PARAMS
-  upvar PROFILE_PNAME PROFILE_PNAME
-  upvar $pps          ps
-  upvar $pps_descr    psDescr
-  
-  #upvar PROFILE_0     PROFILE_0
-  upvar PROFILE_1     PROFILE_1
-
-  set CHANNEL $special_input_id
-
-  set chn [lindex [split $special_input_id _] 0]
-
-  set hlpBoxWidth 450
-  set hlpBoxHeight 160
-
-  foreach val [array names psDescr] {
-    #puts "$val: $psDescr($val)\n"
-  }
-
-  puts "<script type=\"text/javascript\">"
-    puts "ShowActiveWeeklyProgram = function(activePrg) {"
-      puts " for (var i = 1; i <= 3; i++) {"
-        puts "jQuery('#P' + i + '_Timeouts_Area').hide();"
-      puts " }"
-      puts " jQuery('#P' + activePrg + '_Timeouts_Area').show();"
-    puts "};"
-  puts "</script>"
-
-
-  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/CC.js');load_JSFunc('/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js');load_JSFunc('/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN_HELP.js');</script>"
-
-  append HTML_PARAMS(separate_1) "[addHintHeatingGroupDevice $address]"
-
-  set prn 0
-
-  set param WEEK_PROGRAM_POINTER
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-    append HTML_PARAMS(separate_1) "<td class='hidden'><input type='text' id='separate_$CHANNEL\_$prn' name='$param'></td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">\${stringTableWeekProgramToEdit}</td>"
-      #append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param "onchange=\"ShowActiveWeeklyProgram(parseInt(\$(this).value)+1);\""]&nbsp;[getHelpIcon $param [expr $hlpBoxWidth * 0.8] [expr $hlpBoxHeight / 2]]</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">"
-        append HTML_PARAMS(separate_1) "<select id=\"editProgram\" onchange=\"ShowActiveWeeklyProgram(parseInt(\$(this).value)+1);\">"
-          append HTML_PARAMS(separate_1) "<option value='0'>\${stringTableWeekProgram1}</option>"
-          append HTML_PARAMS(separate_1) "<option value='1'>\${stringTableWeekProgram2}</option>"
-          append HTML_PARAMS(separate_1) "<option value='2'>\${stringTableWeekProgram3}</option>"
-      append HTML_PARAMS(separate_1) "</select>[getHelpIcon $param [expr $hlpBoxWidth * 0.8] [expr $hlpBoxHeight / 2]]"
-      append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-  append HTML_PARAMS(separate_1) "</table>"
-
-  ## Create 3 Weekly Programs ##
-
-  for {set loop 1} {$loop <=3} {incr loop} {
-    set pNr "P$loop";
-    append HTML_PARAMS(separate_1) "<div id=\"$pNr\_Timeouts_Area\" style=\"display:none\">"
-    foreach day {SATURDAY SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY} {
-      append HTML_PARAMS(separate_1) "<div id=\"$pNr\_temp_prof_$day\"></div>"
-    }
-    append HTML_PARAMS(separate_1) "</div>"
-
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "$pNr\_tom = new TimeoutManager('$iface', '$address', false, '$pNr\_');"
-    foreach day {SATURDAY SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY} {
-
-      for {set i 1} {$i <= 13} {incr i} {
-
-        set timeout     $ps($pNr\_ENDTIME_${day}_$i)
-        set temperature $ps($pNr\_TEMPERATURE_${day}_$i)
-        append HTML_PARAMS(separate_1) "$pNr\_tom.setTemp('$day', $timeout, $temperature);"
-
-        if {$timeout == 1440} then {
-          break;
-        }
-      }
-
-      append HTML_PARAMS(separate_1) "$pNr\_tom.setDivname('$day', '$pNr\_temp_prof_$day');"
-      append HTML_PARAMS(separate_1) "$pNr\_tom.writeDay('$day');"
-    }
-    append HTML_PARAMS(separate_1) "</script>"
-  }
-
-  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">ShowActiveWeeklyProgram(1);</script>"
-
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  # *************** #
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-
-  set comment {
-    # left
-    incr prn
-    set param SHOW_SET_TEMPERATURE
-    append HTML_PARAMS(separate_1) "<tr>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableShowSetpointTemp}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-    append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    # right
-    incr prn
-    set param SHOW_HUMIDITY
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableShowHumidity}</td>"
-    append HTML_PARAMS(separate_1)  "<td name=\"expertParam\" class=\"hidden\">[getCheckBox $CHANNEL '$param' $ps($param) $prn]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-  }
-
-    # left
-    set param BUTTON_RESPONSE_WITHOUT_BACKLIGHT
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableButtonResponseWithoutBacklight}</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-      append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]"
-      append HTML_PARAMS(separate_1) "</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-  append HTML_PARAMS(separate_1) "</table>"
-
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-
-    set param TEMPERATURE_LOWERING_COOLING
-    if { [info exists ps($param)] == 1  } {
-      # left
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr><td>\${ecoCoolingTemperature}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-        append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-      append HTML_PARAMS(separate_1) "</script>"
-
-      # right
-      incr prn
-      set param TEMPERATURE_LOWERING
-      append HTML_PARAMS(separate_1) "<td>\${ecoHeatingTemperature}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"ecoOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-        append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-      append HTML_PARAMS(separate_1) "</script>"
-      append HTML_PARAMS(separate_1) "</tr>"
-
-      append HTML_PARAMS(separate_1) "<tr id=\"errorRow\" class=\"hidden\"> <td></td> <td colspan=\"2\"><span id=\"errorComfort\" class=\"attention\"></span></td> <td colspan=\"2\"><span id=\"errorEco\" class=\"attention\"></span></td> </tr>"
-    }
-    # left
-    incr prn
-    set param TEMPERATURE_MINIMUM
-    array_clear options
-    set i 0
-    for {set val [_getMinValue $param]} {$val <= [_getMaxValue $param]} {set val [expr $val + 0.5]} {
-      set options($i) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableTemperatureMinimum}</td>"
-    append HTML_PARAMS(separate_1)  "<td>[get_ComboBox options $param tmp_$CHANNEL\_$prn ps $param onchange=setMinMaxTemp('tmp_$CHANNEL\_$prn','separate_$CHANNEL\_$prn')]</span> <span class='hidden'>[_getTextField $CHANNEL '$param' $ps($param) $prn]</span></td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "try{window.setTimeout(function() {setMinMaxTempOption('tmp_$CHANNEL\_$prn', 'separate_$CHANNEL\_$prn' );},100);} catch(e){}"
-    append HTML_PARAMS(separate_1) "</script>"
-
-    # right
-    incr prn
-    set param TEMPERATURE_MAXIMUM
-    array_clear options
-    set i 0
-    for {set val [_getMinValue $param]} {$val <= [_getMaxValue $param]} {set val [expr $val + 0.5]} {
-      set options($i) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableTemperatureMaximum}</td>"
-    append HTML_PARAMS(separate_1)  "<td>[get_ComboBox options $param tmp_$CHANNEL\_$prn ps $param onchange=setMinMaxTemp('tmp_$CHANNEL\_$prn','separate_$CHANNEL\_$prn')]</span> <span class='hidden'>[_getTextField $CHANNEL '$param' $ps($param) $prn]</span></td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "try{window.setTimeout(function() {setMinMaxTempOption('tmp_$CHANNEL\_$prn', 'separate_$CHANNEL\_$prn' );},100);} catch(e){}"
-    append HTML_PARAMS(separate_1) "</script>"
-
-    #left
-    incr prn
-    set param TEMPERATURE_OFFSET
-    array_clear options
-    set i 0
-    for {set val -3.5} {$val <= 3.5} {set val [expr $val + 0.5]} {
-      set options($val) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableTemperatureOffset}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-  # left
-    incr prn
-    set param TEMPERATURE_WINDOW_OPEN
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableTemperatureFallWindowOpen}</td>"
-    append HTML_PARAMS(separate_1)  "<td colspan=\"2\">[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-    append HTML_PARAMS(separate_1) "</script>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    incr prn
-    set param TEMPERATUREFALL_MODUS
-    append HTML_PARAMS(separate_1) "<tr name=\"expertParam\" class=\"hidden\"><td>\${stringTableTemperatureFallModeOptions}</td><td>"
-    #append HTML_PARAMS(separate_1)  [get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight + 20]]
-
-    append HTML_PARAMS(separate_1) "<select id='separate_$CHANNEL\_$prn' name='$param'>"
-    append HTML_PARAMS(separate_1) "<option value='0'>\${stringTableTemperatureFallModeOpt0}</option>"
-    append HTML_PARAMS(separate_1) "<option value='1'>\${stringTableTemperatureFallModeOpt1}</option>"
-    append HTML_PARAMS(separate_1) "<option value='2'>\${stringTableTemperatureFallModeOpt2}</option>"
-    append HTML_PARAMS(separate_1) "<option value='3'>\${stringTableTemperatureFallModeOpt3}</option>"
-    append HTML_PARAMS(separate_1) "<option value='4'>\${stringTableTemperatureFallModeOpt4}</option>"
-    append HTML_PARAMS(separate_1) "</select>"
-
-    append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">jQuery('\#separate_$CHANNEL\_$prn\').val($ps($param));</script>"
-
-    # right
-    incr prn
-    set param TEMPERATUREFALL_VALUE
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableTemperatureFallValue}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-
-
-    set param DURATION_5MIN
-    if { [info exists ps($param)] == 1  } {
-      # In older versions this parameter is not available
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr name=\"expertParam\" class=\"hidden\">"
-        append HTML_PARAMS(separate_1) "<td>\${stringTableDuration5Min}</td>"
-        append HTML_PARAMS(separate_1) "<td colspan=\"2\" >[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-
-        append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-          append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {"
-          append HTML_PARAMS(separate_1) "var value = this.value;"
-          append HTML_PARAMS(separate_1) "this.value = Math.round(this.value / 5) * 5;"
-          append HTML_PARAMS(separate_1) "ProofAndSetValue(this.id, this.id, [getMinValue $param], [getMaxValue $param], 1);"
-          append HTML_PARAMS(separate_1) "});"
-        append HTML_PARAMS(separate_1) "</script>"
-
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-
-  append HTML_PARAMS(separate_1) "</table>"
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-    # left
-    incr prn
-    set param BOOST_TIME_PERIOD
-    array_clear options
-    set i 0
-    for {set val 0} {$val <= 30} {incr val 5} {
-        set options($val) "$val min"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableBoostTimePeriod}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    # right
-    incr prn
-    set param BOOST_POSITION
-    array_clear options
-    set i 0
-    for {set val 0} {$val <= 100} {incr val 10} {
-        set options($val) "$val %"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostPosition}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    incr prn
-    set param DECALCIFICATION_WEEKDAY
-    array_clear options
-    set i 0
-    set comment {
-      foreach day {\${optionSat} \${optionSun} \${optionMon} \${optionTue} \${optionWed} \${optionThu} \${optionFri}} {
-        set options($i) $day
-        incr i
-      }
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableClimateControlRegDecalcDay}</td>"
-    #append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-
-    append HTML_PARAMS(separate_1) "<td>"
-       append HTML_PARAMS(separate_1) "<select id='separate_$CHANNEL\_$prn' class='SUNDAY' name='DECALCIFICATION_WEEKDAY'>"
-        append HTML_PARAMS(separate_1) "<option value='0'>\${optionSun}</option>"
-        append HTML_PARAMS(separate_1) "<option value='1'>\${optionMon}</option>"
-        append HTML_PARAMS(separate_1) "<option value='2'>\${optionTue}</option>"
-        append HTML_PARAMS(separate_1) "<option value='3'>\${optionWed}</option>"
-        append HTML_PARAMS(separate_1) "<option value='4'>\${optionThu}</option>"
-        append HTML_PARAMS(separate_1) "<option value='5'>\${optionFri}</option>"
-        append HTML_PARAMS(separate_1) "<option value='6'>\${optionSat}</option>"
-      append HTML_PARAMS(separate_1) "</select>"
-
-    append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">jQuery('\#separate_$CHANNEL\_$prn\').val($ps($param));</script>"
-
-    # right
-    incr prn
-    set param  DECALCIFICATION_TIME
-    array_clear options
-    for {set i 0} {$i <= 23} {incr i} {
-      set hour $i
-      if {$i < 10} {set hour "0$i"}
-      set options([expr $i * 2]) "$hour:00"
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableClimateControlRegDecalcTime}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    append HTML_PARAMS(separate_1) "<tr>"
-      array_clear options
-      for {set val 0} {$val <= 1} {set val [expr $val + 0.05]} {
-        set options($val) "[expr int($val * 100)] %"
-      }
-      set param VALVE_ERROR_RUN_POSITION
-      if { [info exists ps($param)] == 1  } {
-        incr prn
-        append HTML_PARAMS(separate_1) "<td>\${stringTableValveStateErrorPosition}</td>"
-        append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-      }
-
-      set param VALVE_MAXIMUM_POSITION
-      if { [info exists ps($param)] == 1  } {
-        incr prn
-        append HTML_PARAMS(separate_1) "<td>\${stringTableValveMaximumPosition}</td>"
-        append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-      }
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    set param VALVE_OFFSET
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableValveOffset}</td>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\" colspan=\"2\" >[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp; [_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight + 50]]</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-
-    set param BOOST_AFTER_WINDOW_OPEN
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostAfterWindowOpen}</td>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-        append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]"
-        append HTML_PARAMS(separate_1) "</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-  append HTML_PARAMS(separate_1) "</table>"
-
-  if { (! [catch {set tmp $ps(CHANNEL_OPERATION_MODE)}]) || (! [catch {set tmp $ps(ACOUSTIC_ALARM_SIGNAL)}])  } {
-    append HTML_PARAMS(separate_1) "<hr>"
-    append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-        set param CHANNEL_OPERATION_MODE
-        if { [info exists ps($param)] == 1  } {
-          incr prn
-          array_clear options
-          set options(0) "\${optionETRVNormalMode}"
-          set options(1) "\${optionETRVSilentMode}"
-          append HTML_PARAMS(separate_1) "<tr><td>\${lblMode}</td><td>"
-          append HTML_PARAMS(separate_1) "[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param onchange=\"alert(this.value,$chn)\"]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.75]]"
-          append HTML_PARAMS(separate_1) "</td></tr>"
-        }
-
-        set param ACOUSTIC_ALARM_SIGNAL
-        if { [info exists ps($param)] == 1  } {
-          incr prn
-          append HTML_PARAMS(separate_1) "<tr>"
-            append HTML_PARAMS(separate_1) "<td>\${lblAcousticAlarmSignal}</td>"
-            append HTML_PARAMS(separate_1) "<td>"
-            append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.5]]"
-            append HTML_PARAMS(separate_1) "</td>"
-          append HTML_PARAMS(separate_1) "</tr>"
-        }
-
-    append HTML_PARAMS(separate_1) "</table>"
-  }
-
-  if {[session_is_expert]} {
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-      append HTML_PARAMS(separate_1) "jQuery(\"\[name='expertParam'\]\").show();"
-    append HTML_PARAMS(separate_1) "</script>"
-  } else {
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-      append HTML_PARAMS(separate_1) "jQuery(\"\[name='expertParam'\]\").hide();"
-    append HTML_PARAMS(separate_1) "</script>"
-  }
-
-}
-
-constructor
diff --git a/src/webui/www/config/easymodes/hmip/hmip-etrv-c_1_master.tcl b/src/webui/www/config/easymodes/hmip/hmip-etrv-c_1_master.tcl
deleted file mode 100644
index 897b5c032..000000000
--- a/src/webui/www/config/easymodes/hmip/hmip-etrv-c_1_master.tcl
+++ /dev/null
@@ -1,502 +0,0 @@
-#!/bin/tclsh
-
-
-sourceOnce [file join /www/config/easymodes/em_common.tcl]
-
-#Namen der EasyModes tauchen nicht mehr auf. Der Durchgängkeit werden sie hier noch definiert.
-set PROFILES_MAP(0)  "Experte"
-set PROFILES_MAP(1)  "TheOneAndOnlyEasyMode"
-
-proc getCheckBox {type param value prn} {
-  set checked ""
-  if { $value } then { set checked "checked=\"checked\"" }
-  set s "<input id='separate_$type\_$prn' type='checkbox' $checked value='dummy' name=$param/>"
-  return $s
-}
-
-proc _getMinValue {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set min [format {%1.1f} $param_descr(MIN)]
-  return "$min"
-}
-
-proc _getMaxValue {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set max [format {%1.1f} $param_descr(MAX)]
-  return "$max"
-}
-
-proc _getTextField {type param value prn} {
-  set elemId 'separate_$type\_$prn'
-  # Limit float to 1 decimal places
-  if {[llength [split $value "."]] == 2} {
-    set value [format {%1.1f} $value]
-  }
-
-  set s "<input id=$elemId type=\"text\" size=\"5\" value=$value name=$param>"
-  return $s
-}
-
-proc _getUnit {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set unit $param_descr(UNIT)
-
-  if {$unit == "minutes"} {
-   set unit "\${lblMinutes}"
-  }
-
-  if {($unit == "K") || ($unit == "??C") || ($unit == "°C")} {
-    set unit "&#176;C"
-  }
-
-  if {$unit == "100%"} {
-   set unit "%"
-  }
-
-  return "$unit"
-}
-
-proc _getMinMaxValueDescr {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set min $param_descr(MIN)
-  set max $param_descr(MAX)
-
-  if {[string equal $param VALVE_OFFSET] != 0} {
-    return "(0 - 100)"
-  }
-
-  # Limit float to 2 decimal places
-  if {[llength [split $min "."]] != 1} {
-    set min [format {%1.1f} $min]
-    set max [format {%1.1f} $max]
-  }
-  return "($min - $max)"
-}
-
-proc getHelpIcon {topic x y} {
-  set ret "<img src=\"/ise/img/help.png\" style=\"cursor: pointer; width:18px; height:18px; position:relative; top:2px\" onclick=\"showParamHelp('$topic', '$x', '$y')\">"
-  return $ret
-}
-
-proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
-
-  global env iface_url
-  
-  upvar PROFILES_MAP  PROFILES_MAP
-  upvar HTML_PARAMS   HTML_PARAMS
-  upvar PROFILE_PNAME PROFILE_PNAME
-  upvar $pps          ps
-  upvar $pps_descr    psDescr
-  
-  #upvar PROFILE_0     PROFILE_0
-  upvar PROFILE_1     PROFILE_1
-
-  set CHANNEL $special_input_id
-
-  set chn [lindex [split $special_input_id _] 0]
-
-  set hlpBoxWidth 450
-  set hlpBoxHeight 160
-
-  foreach val [array names psDescr] {
-    #puts "$val: $psDescr($val)\n"
-  }
-
-  puts "<script type=\"text/javascript\">"
-    puts "ShowActiveWeeklyProgram = function(activePrg) {"
-      puts " for (var i = 1; i <= 3; i++) {"
-        puts "jQuery('#P' + i + '_Timeouts_Area').hide();"
-      puts " }"
-      puts " jQuery('#P' + activePrg + '_Timeouts_Area').show();"
-    puts "};"
-  puts "</script>"
-
-
-  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/CC.js');load_JSFunc('/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js');load_JSFunc('/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN_HELP.js');</script>"
-
-  append HTML_PARAMS(separate_1) "[addHintHeatingGroupDevice $address]"
-
-  set prn 0
-
-  set param WEEK_PROGRAM_POINTER
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-    append HTML_PARAMS(separate_1) "<td class='hidden'><input type='text' id='separate_$CHANNEL\_$prn' name='$param'></td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">\${stringTableWeekProgramToEdit}</td>"
-      #append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param "onchange=\"ShowActiveWeeklyProgram(parseInt(\$(this).value)+1);\""]&nbsp;[getHelpIcon $param [expr $hlpBoxWidth * 0.8] [expr $hlpBoxHeight / 2]]</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">"
-        append HTML_PARAMS(separate_1) "<select id=\"editProgram\" onchange=\"ShowActiveWeeklyProgram(parseInt(\$(this).value)+1);\">"
-          append HTML_PARAMS(separate_1) "<option value='0'>\${stringTableWeekProgram1}</option>"
-          append HTML_PARAMS(separate_1) "<option value='1'>\${stringTableWeekProgram2}</option>"
-          append HTML_PARAMS(separate_1) "<option value='2'>\${stringTableWeekProgram3}</option>"
-      append HTML_PARAMS(separate_1) "</select>[getHelpIcon $param [expr $hlpBoxWidth * 0.8] [expr $hlpBoxHeight / 2]]"
-      append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-  append HTML_PARAMS(separate_1) "</table>"
-
-  ## Create 3 Weekly Programs ##
-
-  for {set loop 1} {$loop <=3} {incr loop} {
-    set pNr "P$loop";
-    append HTML_PARAMS(separate_1) "<div id=\"$pNr\_Timeouts_Area\" style=\"display:none\">"
-    foreach day {SATURDAY SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY} {
-      append HTML_PARAMS(separate_1) "<div id=\"$pNr\_temp_prof_$day\"></div>"
-    }
-    append HTML_PARAMS(separate_1) "</div>"
-
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "$pNr\_tom = new TimeoutManager('$iface', '$address', false, '$pNr\_');"
-    foreach day {SATURDAY SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY} {
-
-      for {set i 1} {$i <= 13} {incr i} {
-
-        set timeout     $ps($pNr\_ENDTIME_${day}_$i)
-        set temperature $ps($pNr\_TEMPERATURE_${day}_$i)
-        append HTML_PARAMS(separate_1) "$pNr\_tom.setTemp('$day', $timeout, $temperature);"
-
-        if {$timeout == 1440} then {
-          break;
-        }
-      }
-
-      append HTML_PARAMS(separate_1) "$pNr\_tom.setDivname('$day', '$pNr\_temp_prof_$day');"
-      append HTML_PARAMS(separate_1) "$pNr\_tom.writeDay('$day');"
-    }
-    append HTML_PARAMS(separate_1) "</script>"
-  }
-
-  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">ShowActiveWeeklyProgram(1);</script>"
-
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  # *************** #
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-
-  set comment {
-    # left
-    incr prn
-    set param SHOW_SET_TEMPERATURE
-    append HTML_PARAMS(separate_1) "<tr>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableShowSetpointTemp}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-    append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    # right
-    incr prn
-    set param SHOW_HUMIDITY
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableShowHumidity}</td>"
-    append HTML_PARAMS(separate_1)  "<td name=\"expertParam\" class=\"hidden\">[getCheckBox $CHANNEL '$param' $ps($param) $prn]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-  }
-
-    # left
-    set param BUTTON_RESPONSE_WITHOUT_BACKLIGHT
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableButtonResponseWithoutBacklight}</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-      append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]"
-      append HTML_PARAMS(separate_1) "</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-  append HTML_PARAMS(separate_1) "</table>"
-
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-
-    set param TEMPERATURE_LOWERING_COOLING
-    if { [info exists ps($param)] == 1  } {
-      # left
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr><td>\${ecoCoolingTemperature}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-        append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-      append HTML_PARAMS(separate_1) "</script>"
-
-      # right
-      incr prn
-      set param TEMPERATURE_LOWERING
-      append HTML_PARAMS(separate_1) "<td>\${ecoHeatingTemperature}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"ecoOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-        append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-      append HTML_PARAMS(separate_1) "</script>"
-      append HTML_PARAMS(separate_1) "</tr>"
-
-      append HTML_PARAMS(separate_1) "<tr id=\"errorRow\" class=\"hidden\"> <td></td> <td colspan=\"2\"><span id=\"errorComfort\" class=\"attention\"></span></td> <td colspan=\"2\"><span id=\"errorEco\" class=\"attention\"></span></td> </tr>"
-    }
-    # left
-    incr prn
-    set param TEMPERATURE_MINIMUM
-    array_clear options
-    set i 0
-    for {set val [_getMinValue $param]} {$val <= [_getMaxValue $param]} {set val [expr $val + 0.5]} {
-      set options($i) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableTemperatureMinimum}</td>"
-    append HTML_PARAMS(separate_1)  "<td>[get_ComboBox options $param tmp_$CHANNEL\_$prn ps $param onchange=setMinMaxTemp('tmp_$CHANNEL\_$prn','separate_$CHANNEL\_$prn')]</span> <span class='hidden'>[_getTextField $CHANNEL '$param' $ps($param) $prn]</span></td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "try{window.setTimeout(function() {setMinMaxTempOption('tmp_$CHANNEL\_$prn', 'separate_$CHANNEL\_$prn' );},100);} catch(e){}"
-    append HTML_PARAMS(separate_1) "</script>"
-
-    # right
-    incr prn
-    set param TEMPERATURE_MAXIMUM
-    array_clear options
-    set i 0
-    for {set val [_getMinValue $param]} {$val <= [_getMaxValue $param]} {set val [expr $val + 0.5]} {
-      set options($i) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableTemperatureMaximum}</td>"
-    append HTML_PARAMS(separate_1)  "<td>[get_ComboBox options $param tmp_$CHANNEL\_$prn ps $param onchange=setMinMaxTemp('tmp_$CHANNEL\_$prn','separate_$CHANNEL\_$prn')]</span> <span class='hidden'>[_getTextField $CHANNEL '$param' $ps($param) $prn]</span></td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "try{window.setTimeout(function() {setMinMaxTempOption('tmp_$CHANNEL\_$prn', 'separate_$CHANNEL\_$prn' );},100);} catch(e){}"
-    append HTML_PARAMS(separate_1) "</script>"
-
-    #left
-    incr prn
-    set param TEMPERATURE_OFFSET
-    array_clear options
-    set i 0
-    for {set val -3.5} {$val <= 3.5} {set val [expr $val + 0.5]} {
-      set options($val) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableTemperatureOffset}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-  # left
-    incr prn
-    set param TEMPERATURE_WINDOW_OPEN
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableTemperatureFallWindowOpen}</td>"
-    append HTML_PARAMS(separate_1)  "<td colspan=\"2\">[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-    append HTML_PARAMS(separate_1) "</script>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    incr prn
-    set param TEMPERATUREFALL_MODUS
-    append HTML_PARAMS(separate_1) "<tr name=\"expertParam\" class=\"hidden\"><td>\${stringTableTemperatureFallModeOptions}</td><td>"
-    #append HTML_PARAMS(separate_1)  [get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight + 20]]
-
-    append HTML_PARAMS(separate_1) "<select id='separate_$CHANNEL\_$prn' name='$param'>"
-    append HTML_PARAMS(separate_1) "<option value='0'>\${stringTableTemperatureFallModeOpt0}</option>"
-    append HTML_PARAMS(separate_1) "<option value='1'>\${stringTableTemperatureFallModeOpt1}</option>"
-    append HTML_PARAMS(separate_1) "<option value='2'>\${stringTableTemperatureFallModeOpt2}</option>"
-    append HTML_PARAMS(separate_1) "<option value='3'>\${stringTableTemperatureFallModeOpt3}</option>"
-    append HTML_PARAMS(separate_1) "<option value='4'>\${stringTableTemperatureFallModeOpt4}</option>"
-    append HTML_PARAMS(separate_1) "</select>"
-
-    append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">jQuery('\#separate_$CHANNEL\_$prn\').val($ps($param));</script>"
-
-    # right
-    incr prn
-    set param TEMPERATUREFALL_VALUE
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableTemperatureFallValue}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-
-
-    set param DURATION_5MIN
-    if { [info exists ps($param)] == 1  } {
-      # In older versions this parameter is not available
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr name=\"expertParam\" class=\"hidden\">"
-        append HTML_PARAMS(separate_1) "<td>\${stringTableDuration5Min}</td>"
-        append HTML_PARAMS(separate_1) "<td colspan=\"2\" >[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-
-        append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-          append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {"
-          append HTML_PARAMS(separate_1) "var value = this.value;"
-          append HTML_PARAMS(separate_1) "this.value = Math.round(this.value / 5) * 5;"
-          append HTML_PARAMS(separate_1) "ProofAndSetValue(this.id, this.id, [getMinValue $param], [getMaxValue $param], 1);"
-          append HTML_PARAMS(separate_1) "});"
-        append HTML_PARAMS(separate_1) "</script>"
-
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-
-  append HTML_PARAMS(separate_1) "</table>"
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-    # left
-    incr prn
-    set param BOOST_TIME_PERIOD
-    array_clear options
-    set i 0
-    for {set val 0} {$val <= 30} {incr val 5} {
-        set options($val) "$val min"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableBoostTimePeriod}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    # right
-    incr prn
-    set param BOOST_POSITION
-    array_clear options
-    set i 0
-    for {set val 0} {$val <= 100} {incr val 10} {
-        set options($val) "$val %"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostPosition}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    incr prn
-    set param DECALCIFICATION_WEEKDAY
-    array_clear options
-    set i 0
-    set comment {
-      foreach day {\${optionSat} \${optionSun} \${optionMon} \${optionTue} \${optionWed} \${optionThu} \${optionFri}} {
-        set options($i) $day
-        incr i
-      }
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableClimateControlRegDecalcDay}</td>"
-    #append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-
-    append HTML_PARAMS(separate_1) "<td>"
-       append HTML_PARAMS(separate_1) "<select id='separate_$CHANNEL\_$prn' class='SUNDAY' name='DECALCIFICATION_WEEKDAY'>"
-        append HTML_PARAMS(separate_1) "<option value='0'>\${optionSun}</option>"
-        append HTML_PARAMS(separate_1) "<option value='1'>\${optionMon}</option>"
-        append HTML_PARAMS(separate_1) "<option value='2'>\${optionTue}</option>"
-        append HTML_PARAMS(separate_1) "<option value='3'>\${optionWed}</option>"
-        append HTML_PARAMS(separate_1) "<option value='4'>\${optionThu}</option>"
-        append HTML_PARAMS(separate_1) "<option value='5'>\${optionFri}</option>"
-        append HTML_PARAMS(separate_1) "<option value='6'>\${optionSat}</option>"
-      append HTML_PARAMS(separate_1) "</select>"
-
-    append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">jQuery('\#separate_$CHANNEL\_$prn\').val($ps($param));</script>"
-
-    # right
-    incr prn
-    set param  DECALCIFICATION_TIME
-    array_clear options
-    for {set i 0} {$i <= 23} {incr i} {
-      set hour $i
-      if {$i < 10} {set hour "0$i"}
-      set options([expr $i * 2]) "$hour:00"
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableClimateControlRegDecalcTime}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    append HTML_PARAMS(separate_1) "<tr>"
-      array_clear options
-      for {set val 0} {$val <= 1} {set val [expr $val + 0.05]} {
-        set options($val) "[expr int($val * 100)] %"
-      }
-      set param VALVE_ERROR_RUN_POSITION
-      if { [info exists ps($param)] == 1  } {
-        incr prn
-        append HTML_PARAMS(separate_1) "<td>\${stringTableValveStateErrorPosition}</td>"
-        append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-      }
-
-      set param VALVE_MAXIMUM_POSITION
-      if { [info exists ps($param)] == 1  } {
-        incr prn
-        append HTML_PARAMS(separate_1) "<td>\${stringTableValveMaximumPosition}</td>"
-        append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-      }
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    set param VALVE_OFFSET
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableValveOffset}</td>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\" colspan=\"2\" >[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp; [_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight + 50]]</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-
-    set param BOOST_AFTER_WINDOW_OPEN
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostAfterWindowOpen}</td>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-        append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]"
-        append HTML_PARAMS(separate_1) "</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-  append HTML_PARAMS(separate_1) "</table>"
-
-  if { (! [catch {set tmp $ps(CHANNEL_OPERATION_MODE)}]) || (! [catch {set tmp $ps(ACOUSTIC_ALARM_SIGNAL)}])  } {
-    append HTML_PARAMS(separate_1) "<hr>"
-    append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-        set param CHANNEL_OPERATION_MODE
-        if { [info exists ps($param)] == 1  } {
-          incr prn
-          array_clear options
-          set options(0) "\${optionETRVNormalMode}"
-          set options(1) "\${optionETRVSilentMode}"
-          append HTML_PARAMS(separate_1) "<tr><td>\${lblMode}</td><td>"
-          append HTML_PARAMS(separate_1) "[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param onchange=\"alert(this.value,$chn)\"]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.75]]"
-          append HTML_PARAMS(separate_1) "</td></tr>"
-        }
-
-        set param ACOUSTIC_ALARM_SIGNAL
-        if { [info exists ps($param)] == 1  } {
-          incr prn
-          append HTML_PARAMS(separate_1) "<tr>"
-            append HTML_PARAMS(separate_1) "<td>\${lblAcousticAlarmSignal}</td>"
-            append HTML_PARAMS(separate_1) "<td>"
-            append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.5]]"
-            append HTML_PARAMS(separate_1) "</td>"
-          append HTML_PARAMS(separate_1) "</tr>"
-        }
-
-    append HTML_PARAMS(separate_1) "</table>"
-  }
-
-  if {[session_is_expert]} {
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-      append HTML_PARAMS(separate_1) "jQuery(\"\[name='expertParam'\]\").show();"
-    append HTML_PARAMS(separate_1) "</script>"
-  } else {
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-      append HTML_PARAMS(separate_1) "jQuery(\"\[name='expertParam'\]\").hide();"
-    append HTML_PARAMS(separate_1) "</script>"
-  }
-
-}
-
-constructor
diff --git a/src/webui/www/config/easymodes/hmip/hmip-etrv-cl_1_master.tcl b/src/webui/www/config/easymodes/hmip/hmip-etrv-cl_1_master.tcl
deleted file mode 100644
index 897b5c032..000000000
--- a/src/webui/www/config/easymodes/hmip/hmip-etrv-cl_1_master.tcl
+++ /dev/null
@@ -1,502 +0,0 @@
-#!/bin/tclsh
-
-
-sourceOnce [file join /www/config/easymodes/em_common.tcl]
-
-#Namen der EasyModes tauchen nicht mehr auf. Der Durchgängkeit werden sie hier noch definiert.
-set PROFILES_MAP(0)  "Experte"
-set PROFILES_MAP(1)  "TheOneAndOnlyEasyMode"
-
-proc getCheckBox {type param value prn} {
-  set checked ""
-  if { $value } then { set checked "checked=\"checked\"" }
-  set s "<input id='separate_$type\_$prn' type='checkbox' $checked value='dummy' name=$param/>"
-  return $s
-}
-
-proc _getMinValue {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set min [format {%1.1f} $param_descr(MIN)]
-  return "$min"
-}
-
-proc _getMaxValue {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set max [format {%1.1f} $param_descr(MAX)]
-  return "$max"
-}
-
-proc _getTextField {type param value prn} {
-  set elemId 'separate_$type\_$prn'
-  # Limit float to 1 decimal places
-  if {[llength [split $value "."]] == 2} {
-    set value [format {%1.1f} $value]
-  }
-
-  set s "<input id=$elemId type=\"text\" size=\"5\" value=$value name=$param>"
-  return $s
-}
-
-proc _getUnit {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set unit $param_descr(UNIT)
-
-  if {$unit == "minutes"} {
-   set unit "\${lblMinutes}"
-  }
-
-  if {($unit == "K") || ($unit == "??C") || ($unit == "°C")} {
-    set unit "&#176;C"
-  }
-
-  if {$unit == "100%"} {
-   set unit "%"
-  }
-
-  return "$unit"
-}
-
-proc _getMinMaxValueDescr {param} {
-  global psDescr
-  upvar psDescr descr
-  array_clear param_descr
-  array set param_descr $descr($param)
-  set min $param_descr(MIN)
-  set max $param_descr(MAX)
-
-  if {[string equal $param VALVE_OFFSET] != 0} {
-    return "(0 - 100)"
-  }
-
-  # Limit float to 2 decimal places
-  if {[llength [split $min "."]] != 1} {
-    set min [format {%1.1f} $min]
-    set max [format {%1.1f} $max]
-  }
-  return "($min - $max)"
-}
-
-proc getHelpIcon {topic x y} {
-  set ret "<img src=\"/ise/img/help.png\" style=\"cursor: pointer; width:18px; height:18px; position:relative; top:2px\" onclick=\"showParamHelp('$topic', '$x', '$y')\">"
-  return $ret
-}
-
-proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
-
-  global env iface_url
-  
-  upvar PROFILES_MAP  PROFILES_MAP
-  upvar HTML_PARAMS   HTML_PARAMS
-  upvar PROFILE_PNAME PROFILE_PNAME
-  upvar $pps          ps
-  upvar $pps_descr    psDescr
-  
-  #upvar PROFILE_0     PROFILE_0
-  upvar PROFILE_1     PROFILE_1
-
-  set CHANNEL $special_input_id
-
-  set chn [lindex [split $special_input_id _] 0]
-
-  set hlpBoxWidth 450
-  set hlpBoxHeight 160
-
-  foreach val [array names psDescr] {
-    #puts "$val: $psDescr($val)\n"
-  }
-
-  puts "<script type=\"text/javascript\">"
-    puts "ShowActiveWeeklyProgram = function(activePrg) {"
-      puts " for (var i = 1; i <= 3; i++) {"
-        puts "jQuery('#P' + i + '_Timeouts_Area').hide();"
-      puts " }"
-      puts " jQuery('#P' + activePrg + '_Timeouts_Area').show();"
-    puts "};"
-  puts "</script>"
-
-
-  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/CC.js');load_JSFunc('/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js');load_JSFunc('/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN_HELP.js');</script>"
-
-  append HTML_PARAMS(separate_1) "[addHintHeatingGroupDevice $address]"
-
-  set prn 0
-
-  set param WEEK_PROGRAM_POINTER
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-    append HTML_PARAMS(separate_1) "<td class='hidden'><input type='text' id='separate_$CHANNEL\_$prn' name='$param'></td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">\${stringTableWeekProgramToEdit}</td>"
-      #append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param "onchange=\"ShowActiveWeeklyProgram(parseInt(\$(this).value)+1);\""]&nbsp;[getHelpIcon $param [expr $hlpBoxWidth * 0.8] [expr $hlpBoxHeight / 2]]</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"_expertParam\" class=\"_hidden\">"
-        append HTML_PARAMS(separate_1) "<select id=\"editProgram\" onchange=\"ShowActiveWeeklyProgram(parseInt(\$(this).value)+1);\">"
-          append HTML_PARAMS(separate_1) "<option value='0'>\${stringTableWeekProgram1}</option>"
-          append HTML_PARAMS(separate_1) "<option value='1'>\${stringTableWeekProgram2}</option>"
-          append HTML_PARAMS(separate_1) "<option value='2'>\${stringTableWeekProgram3}</option>"
-      append HTML_PARAMS(separate_1) "</select>[getHelpIcon $param [expr $hlpBoxWidth * 0.8] [expr $hlpBoxHeight / 2]]"
-      append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-  append HTML_PARAMS(separate_1) "</table>"
-
-  ## Create 3 Weekly Programs ##
-
-  for {set loop 1} {$loop <=3} {incr loop} {
-    set pNr "P$loop";
-    append HTML_PARAMS(separate_1) "<div id=\"$pNr\_Timeouts_Area\" style=\"display:none\">"
-    foreach day {SATURDAY SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY} {
-      append HTML_PARAMS(separate_1) "<div id=\"$pNr\_temp_prof_$day\"></div>"
-    }
-    append HTML_PARAMS(separate_1) "</div>"
-
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "$pNr\_tom = new TimeoutManager('$iface', '$address', false, '$pNr\_');"
-    foreach day {SATURDAY SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY} {
-
-      for {set i 1} {$i <= 13} {incr i} {
-
-        set timeout     $ps($pNr\_ENDTIME_${day}_$i)
-        set temperature $ps($pNr\_TEMPERATURE_${day}_$i)
-        append HTML_PARAMS(separate_1) "$pNr\_tom.setTemp('$day', $timeout, $temperature);"
-
-        if {$timeout == 1440} then {
-          break;
-        }
-      }
-
-      append HTML_PARAMS(separate_1) "$pNr\_tom.setDivname('$day', '$pNr\_temp_prof_$day');"
-      append HTML_PARAMS(separate_1) "$pNr\_tom.writeDay('$day');"
-    }
-    append HTML_PARAMS(separate_1) "</script>"
-  }
-
-  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">ShowActiveWeeklyProgram(1);</script>"
-
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  # *************** #
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-
-  set comment {
-    # left
-    incr prn
-    set param SHOW_SET_TEMPERATURE
-    append HTML_PARAMS(separate_1) "<tr>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableShowSetpointTemp}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-    append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    # right
-    incr prn
-    set param SHOW_HUMIDITY
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableShowHumidity}</td>"
-    append HTML_PARAMS(separate_1)  "<td name=\"expertParam\" class=\"hidden\">[getCheckBox $CHANNEL '$param' $ps($param) $prn]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-  }
-
-    # left
-    set param BUTTON_RESPONSE_WITHOUT_BACKLIGHT
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableButtonResponseWithoutBacklight}</td>"
-      append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-      append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]"
-      append HTML_PARAMS(separate_1) "</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-  append HTML_PARAMS(separate_1) "</table>"
-
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-
-    set param TEMPERATURE_LOWERING_COOLING
-    if { [info exists ps($param)] == 1  } {
-      # left
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr><td>\${ecoCoolingTemperature}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-        append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-      append HTML_PARAMS(separate_1) "</script>"
-
-      # right
-      incr prn
-      set param TEMPERATURE_LOWERING
-      append HTML_PARAMS(separate_1) "<td>\${ecoHeatingTemperature}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"ecoOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-        append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-      append HTML_PARAMS(separate_1) "</script>"
-      append HTML_PARAMS(separate_1) "</tr>"
-
-      append HTML_PARAMS(separate_1) "<tr id=\"errorRow\" class=\"hidden\"> <td></td> <td colspan=\"2\"><span id=\"errorComfort\" class=\"attention\"></span></td> <td colspan=\"2\"><span id=\"errorEco\" class=\"attention\"></span></td> </tr>"
-    }
-    # left
-    incr prn
-    set param TEMPERATURE_MINIMUM
-    array_clear options
-    set i 0
-    for {set val [_getMinValue $param]} {$val <= [_getMaxValue $param]} {set val [expr $val + 0.5]} {
-      set options($i) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableTemperatureMinimum}</td>"
-    append HTML_PARAMS(separate_1)  "<td>[get_ComboBox options $param tmp_$CHANNEL\_$prn ps $param onchange=setMinMaxTemp('tmp_$CHANNEL\_$prn','separate_$CHANNEL\_$prn')]</span> <span class='hidden'>[_getTextField $CHANNEL '$param' $ps($param) $prn]</span></td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "try{window.setTimeout(function() {setMinMaxTempOption('tmp_$CHANNEL\_$prn', 'separate_$CHANNEL\_$prn' );},100);} catch(e){}"
-    append HTML_PARAMS(separate_1) "</script>"
-
-    # right
-    incr prn
-    set param TEMPERATURE_MAXIMUM
-    array_clear options
-    set i 0
-    for {set val [_getMinValue $param]} {$val <= [_getMaxValue $param]} {set val [expr $val + 0.5]} {
-      set options($i) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableTemperatureMaximum}</td>"
-    append HTML_PARAMS(separate_1)  "<td>[get_ComboBox options $param tmp_$CHANNEL\_$prn ps $param onchange=setMinMaxTemp('tmp_$CHANNEL\_$prn','separate_$CHANNEL\_$prn')]</span> <span class='hidden'>[_getTextField $CHANNEL '$param' $ps($param) $prn]</span></td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "try{window.setTimeout(function() {setMinMaxTempOption('tmp_$CHANNEL\_$prn', 'separate_$CHANNEL\_$prn' );},100);} catch(e){}"
-    append HTML_PARAMS(separate_1) "</script>"
-
-    #left
-    incr prn
-    set param TEMPERATURE_OFFSET
-    array_clear options
-    set i 0
-    for {set val -3.5} {$val <= 3.5} {set val [expr $val + 0.5]} {
-      set options($val) "$val &#176;C"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableTemperatureOffset}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-  # left
-    incr prn
-    set param TEMPERATURE_WINDOW_OPEN
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableTemperatureFallWindowOpen}</td>"
-    append HTML_PARAMS(separate_1)  "<td colspan=\"2\">[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]<input id=\"comfortOld\" type=\"hidden\" value=\"$ps($param)\"></td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-    append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {ProofAndSetValue(this.id, this.id, '[_getMinValue $param]', '[_getMaxValue $param]', 1);});"
-    append HTML_PARAMS(separate_1) "</script>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    incr prn
-    set param TEMPERATUREFALL_MODUS
-    append HTML_PARAMS(separate_1) "<tr name=\"expertParam\" class=\"hidden\"><td>\${stringTableTemperatureFallModeOptions}</td><td>"
-    #append HTML_PARAMS(separate_1)  [get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight + 20]]
-
-    append HTML_PARAMS(separate_1) "<select id='separate_$CHANNEL\_$prn' name='$param'>"
-    append HTML_PARAMS(separate_1) "<option value='0'>\${stringTableTemperatureFallModeOpt0}</option>"
-    append HTML_PARAMS(separate_1) "<option value='1'>\${stringTableTemperatureFallModeOpt1}</option>"
-    append HTML_PARAMS(separate_1) "<option value='2'>\${stringTableTemperatureFallModeOpt2}</option>"
-    append HTML_PARAMS(separate_1) "<option value='3'>\${stringTableTemperatureFallModeOpt3}</option>"
-    append HTML_PARAMS(separate_1) "<option value='4'>\${stringTableTemperatureFallModeOpt4}</option>"
-    append HTML_PARAMS(separate_1) "</select>"
-
-    append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">jQuery('\#separate_$CHANNEL\_$prn\').val($ps($param));</script>"
-
-    # right
-    incr prn
-    set param TEMPERATUREFALL_VALUE
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableTemperatureFallValue}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]</td>"
-    append HTML_PARAMS(separate_1) "</tr>"
-
-
-
-    set param DURATION_5MIN
-    if { [info exists ps($param)] == 1  } {
-      # In older versions this parameter is not available
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr name=\"expertParam\" class=\"hidden\">"
-        append HTML_PARAMS(separate_1) "<td>\${stringTableDuration5Min}</td>"
-        append HTML_PARAMS(separate_1) "<td colspan=\"2\" >[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp;[_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-
-        append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-          append HTML_PARAMS(separate_1) "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {"
-          append HTML_PARAMS(separate_1) "var value = this.value;"
-          append HTML_PARAMS(separate_1) "this.value = Math.round(this.value / 5) * 5;"
-          append HTML_PARAMS(separate_1) "ProofAndSetValue(this.id, this.id, [getMinValue $param], [getMaxValue $param], 1);"
-          append HTML_PARAMS(separate_1) "});"
-        append HTML_PARAMS(separate_1) "</script>"
-
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-
-  append HTML_PARAMS(separate_1) "</table>"
-  append HTML_PARAMS(separate_1) "<hr>"
-
-  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-    # left
-    incr prn
-    set param BOOST_TIME_PERIOD
-    array_clear options
-    set i 0
-    for {set val 0} {$val <= 30} {incr val 5} {
-        set options($val) "$val min"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableBoostTimePeriod}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    # right
-    incr prn
-    set param BOOST_POSITION
-    array_clear options
-    set i 0
-    for {set val 0} {$val <= 100} {incr val 10} {
-        set options($val) "$val %"
-      incr i;
-    }
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostPosition}</td>"
-    append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-    append HTML_PARAMS(separate_1) "</td>"
-
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    # left
-    incr prn
-    set param DECALCIFICATION_WEEKDAY
-    array_clear options
-    set i 0
-    set comment {
-      foreach day {\${optionSat} \${optionSun} \${optionMon} \${optionTue} \${optionWed} \${optionThu} \${optionFri}} {
-        set options($i) $day
-        incr i
-      }
-    }
-    append HTML_PARAMS(separate_1) "<tr><td>\${stringTableClimateControlRegDecalcDay}</td>"
-    #append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-
-    append HTML_PARAMS(separate_1) "<td>"
-       append HTML_PARAMS(separate_1) "<select id='separate_$CHANNEL\_$prn' class='SUNDAY' name='DECALCIFICATION_WEEKDAY'>"
-        append HTML_PARAMS(separate_1) "<option value='0'>\${optionSun}</option>"
-        append HTML_PARAMS(separate_1) "<option value='1'>\${optionMon}</option>"
-        append HTML_PARAMS(separate_1) "<option value='2'>\${optionTue}</option>"
-        append HTML_PARAMS(separate_1) "<option value='3'>\${optionWed}</option>"
-        append HTML_PARAMS(separate_1) "<option value='4'>\${optionThu}</option>"
-        append HTML_PARAMS(separate_1) "<option value='5'>\${optionFri}</option>"
-        append HTML_PARAMS(separate_1) "<option value='6'>\${optionSat}</option>"
-      append HTML_PARAMS(separate_1) "</select>"
-
-    append HTML_PARAMS(separate_1) "</td>"
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">jQuery('\#separate_$CHANNEL\_$prn\').val($ps($param));</script>"
-
-    # right
-    incr prn
-    set param  DECALCIFICATION_TIME
-    array_clear options
-    for {set i 0} {$i <= 23} {incr i} {
-      set hour $i
-      if {$i < 10} {set hour "0$i"}
-      set options([expr $i * 2]) "$hour:00"
-    }
-    append HTML_PARAMS(separate_1) "<td>\${stringTableClimateControlRegDecalcTime}</td>"
-    append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    append HTML_PARAMS(separate_1) "<tr>"
-      array_clear options
-      for {set val 0} {$val <= 1} {set val [expr $val + 0.05]} {
-        set options($val) "[expr int($val * 100)] %"
-      }
-      set param VALVE_ERROR_RUN_POSITION
-      if { [info exists ps($param)] == 1  } {
-        incr prn
-        append HTML_PARAMS(separate_1) "<td>\${stringTableValveStateErrorPosition}</td>"
-        append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-      }
-
-      set param VALVE_MAXIMUM_POSITION
-      if { [info exists ps($param)] == 1  } {
-        incr prn
-        append HTML_PARAMS(separate_1) "<td>\${stringTableValveMaximumPosition}</td>"
-        append HTML_PARAMS(separate_1) "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
-      }
-    append HTML_PARAMS(separate_1) "</tr>"
-
-    set param VALVE_OFFSET
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableValveOffset}</td>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\" colspan=\"2\" >[_getTextField $CHANNEL $param $ps($param) $prn]&nbsp; [_getUnit $param]&nbsp;[_getMinMaxValueDescr $param]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight + 50]]</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-
-    set param BOOST_AFTER_WINDOW_OPEN
-    if { [info exists ps($param)] == 1  } {
-      incr prn
-      append HTML_PARAMS(separate_1) "<tr>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">\${stringTableBoostAfterWindowOpen}</td>"
-        append HTML_PARAMS(separate_1) "<td name=\"expertParam\" class=\"hidden\">"
-        append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]&nbsp;[getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]"
-        append HTML_PARAMS(separate_1) "</td>"
-      append HTML_PARAMS(separate_1) "</tr>"
-    }
-  append HTML_PARAMS(separate_1) "</table>"
-
-  if { (! [catch {set tmp $ps(CHANNEL_OPERATION_MODE)}]) || (! [catch {set tmp $ps(ACOUSTIC_ALARM_SIGNAL)}])  } {
-    append HTML_PARAMS(separate_1) "<hr>"
-    append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-        set param CHANNEL_OPERATION_MODE
-        if { [info exists ps($param)] == 1  } {
-          incr prn
-          array_clear options
-          set options(0) "\${optionETRVNormalMode}"
-          set options(1) "\${optionETRVSilentMode}"
-          append HTML_PARAMS(separate_1) "<tr><td>\${lblMode}</td><td>"
-          append HTML_PARAMS(separate_1) "[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param onchange=\"alert(this.value,$chn)\"]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.75]]"
-          append HTML_PARAMS(separate_1) "</td></tr>"
-        }
-
-        set param ACOUSTIC_ALARM_SIGNAL
-        if { [info exists ps($param)] == 1  } {
-          incr prn
-          append HTML_PARAMS(separate_1) "<tr>"
-            append HTML_PARAMS(separate_1) "<td>\${lblAcousticAlarmSignal}</td>"
-            append HTML_PARAMS(separate_1) "<td>"
-            append HTML_PARAMS(separate_1) "[getCheckBox $CHANNEL '$param' $ps($param) $prn]&nbsp;[getHelpIcon $param $hlpBoxWidth [expr $hlpBoxHeight * 0.5]]"
-            append HTML_PARAMS(separate_1) "</td>"
-          append HTML_PARAMS(separate_1) "</tr>"
-        }
-
-    append HTML_PARAMS(separate_1) "</table>"
-  }
-
-  if {[session_is_expert]} {
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-      append HTML_PARAMS(separate_1) "jQuery(\"\[name='expertParam'\]\").show();"
-    append HTML_PARAMS(separate_1) "</script>"
-  } else {
-    append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-      append HTML_PARAMS(separate_1) "jQuery(\"\[name='expertParam'\]\").hide();"
-    append HTML_PARAMS(separate_1) "</script>"
-  }
-
-}
-
-constructor

From 57d764c932985ba00568da1d81b0a381a7cb148e Mon Sep 17 00:00:00 2001
From: Jens Maus <mail@jens-maus.de>
Date: Thu, 15 Oct 2026 21:24:51 +0000
Subject: [PATCH 2/2] webui: select the valve positions of the eTRV settings
 page correctly

This applies the fix of OpenCCU/OpenCCU#4444, as found in the review of
this PR:

- Build the percentage options of VALVE_ERROR_RUN_POSITION,
  VALVE_MAXIMUM_POSITION and VALVE_OFFSET from integer steps (i / 100.0),
  so that all values from 0 % to 100 % exist and the stored value is
  selected.
- Show TEMPERATURE_OFFSET only if the channel has this parameter.
- Open and close the table rows of the optional parameters once.
---
 .../etc/hmipChannelConfigDialogs.tcl          | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/webui/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl b/src/webui/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl
index d4cb55b10..ec53fc7bb 100644
--- a/src/webui/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl
+++ b/src/webui/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl
@@ -3261,6 +3261,7 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
     set param TEMPERATUREFALL_WINDOW_OPEN_TIME_PERIOD
     if { [info exists ps($param)] == 1  } {
       incr prn
+      append html "<tr>"
         append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableTemperatureFallOpenTimePeriod}</td>"
         append html "<td name=\"expertParam\" class=\"hidden\">[getTextField $param $ps($param) $chn $prn]&nbsp;min [getMinMaxValueDescr $param]</td>"
       append html "</tr>"
@@ -3273,14 +3274,18 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
     append html "<table class=\"ProfileTbl\">"
 	
     array_clear options
-    for {set val 0} {$val <= 1} {set val [expr $val + 0.01]} {
-      set options($val) "[expr int($val * 100)] %"
+    for {set i 0} {$i <= 100} {incr i} {
+      set options([expr {$i / 100.0}]) "$i %"
+    }
+
+    set hasValvePosition [expr {[info exists ps(VALVE_ERROR_RUN_POSITION)] || [info exists ps(VALVE_MAXIMUM_POSITION)]}]
+    if { $hasValvePosition } {
+      append html "<tr>"
     }
 
     set param VALVE_ERROR_RUN_POSITION
     if { [info exists ps($param)] == 1  } {
       incr prn
-      append html "<tr>"
         append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableValveStateErrorPosition}</td>"
         append html "<td name=\"expertParam\" class=\"hidden\">[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
     }
@@ -3290,24 +3295,28 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
       incr prn
         append html "<td>\${stringTableValveMaximumPosition}</td>"
         append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
+    }
+    if { $hasValvePosition } {
       append html "</tr>"
     }
 
     # left
-    incr prn
     set param TEMPERATURE_OFFSET
-    array_clear options
-    for {set val -3.5} {$val <= 3.5} {set val [expr $val + 0.5]} {
-      set options($val) "$val &#176;C"
-    }
     append html "<tr>"
-    append html "<td>\${stringTableTemperatureOffset}</td>"
-    append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param]</td>"
+    if { [info exists ps($param)] == 1  } {
+      incr prn
+      array_clear options
+      for {set val -3.5} {$val <= 3.5} {set val [expr $val + 0.5]} {
+        set options($val) "$val &#176;C"
+      }
+      append html "<td>\${stringTableTemperatureOffset}</td>"
+      append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param]</td>"
+    }
 	
     # right
 	  array_clear options
-    for {set val 0} {$val <= 1} {set val [expr $val + 0.01]} {
-      set options($val) "[expr int($val * 100)] %"
+    for {set i 0} {$i <= 100} {incr i} {
+      set options([expr {$i / 100.0}]) "$i %"
     }
     set param VALVE_OFFSET
     if { [info exists ps($param)] == 1  } {
@@ -3355,8 +3364,8 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
       }
         append html "<td>\${stringTableClimateControlRegDecalcTime}</td>"
         append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]</td>"
-      append html "</tr>"
     }
+      append html "</tr>"
   }
 	
   append html "</table>"