Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jQuery.extend(true,langJSON, {
"stringTableTemperatureFallOpenTimePeriod" : "Dauer für Fenster-Auf-Temperatur",
"stringTableTemperatureOffset" : "Temperatur-Offset",
"stringTableBoostTimePeriod" : "Boost-Dauer",
"stringTableBoostPosition" : "Ventilöffnungsgrad",
"stringTableBoostPosition" : "Boost-Ventilöffnungsgrad",
"stringTableBoostAfterWindowOpen" : "Boost nach Fensterschließung auslösen",
"stringTableShowWeekday" : "Wochentag im Display anzeigen",
"stringTableDisplayInformation" : "Display-Information",
Expand Down Expand Up @@ -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",
Expand Down
182 changes: 170 additions & 12 deletions src/webui/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -3203,26 +3203,19 @@ 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 } {
append html "<tr><td>\${lblTemperatureWindowOpenHeating}</td>"
} 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>"
}

Expand All @@ -3231,10 +3224,150 @@ 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 "<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>"
}

append html "</table>"

append html "<hr>"

append html "<table class=\"ProfileTbl\">"

array_clear options
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 "<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>"
}
if { $hasValvePosition } {
append html "</tr>"
}

# left
set param TEMPERATURE_OFFSET
append html "<tr>"
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 i 0} {$i <= 100} {incr i} {
set options([expr {$i / 100.0}]) "$i %"
}
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>"
Expand All @@ -3249,7 +3382,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) } {
Expand All @@ -3272,7 +3430,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>"
}
Expand Down
Loading