Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

0193-WebUI-EnhancedTRVSettingsPage #2919

Merged
merged 10 commits into from
Nov 17, 2024
Merged

0193-WebUI-EnhancedTRVSettingsPage #2919

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6827f1e
0193-WebUI-EnhancedTRVSettingsPage
Baxxy13 Nov 15, 2024
d5829ee
Update hmipChannelConfigDialogs.tcl
Baxxy13 Nov 15, 2024
3939d5a
Update 0193-WebUI-EnhancedTRVSettingsPage.patch
Baxxy13 Nov 15, 2024
3f2c9b1
Update2 hmipChannelConfigDialogs.tcl
Baxxy13 Nov 15, 2024
6611577
Update3 hmipChannelConfigDialogs.tcl
Baxxy13 Nov 16, 2024
c2d284e
Update3 0193-WebUI-EnhancedTRVSettingsPage.patch
Baxxy13 Nov 16, 2024
9ce38e9
fix some whitespace and indentation issues.
jens-maus Nov 16, 2024
aeab9d6
make sure to force remove all hmip-etrv-*_master.tcl files.
jens-maus Nov 16, 2024
43bb04c
update patch file
jens-maus Nov 16, 2024
a917763
add OCCU_POST_PATCH_FIXUP to remove empty non-dot files so that our
jens-maus Nov 17, 2024
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
274 changes: 274 additions & 0 deletions buildroot-external/patches/occu/0193-WebUI-EnhancedTRVSettingsPage.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
--- occu/WebUI/www/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js.orig
+++ occu/WebUI/www/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN.js
@@ -19,7 +19,7 @@
"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",
@@ -149,7 +149,7 @@
"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",
--- occu/WebUI/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl.orig
+++ occu/WebUI/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl
@@ -2931,10 +2931,21 @@
if { [info exists ps($param)] == 1 } {
incr prn
append html "<tr>"
- append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableOptimumStartStop}</td>"
- append html "<td name=\"expertParam\" class=\"hidden\">"
- append html "[getCheckBox '$param' $ps($param) $chn $prn]&nbsp;[getHelpIcon $param]"
- append html "</td>"
+ append html "<td name=\"expertParam\" class=\"hidden\">\${stringTableOptimumStartStop}</td>"
+ append html "<td name=\"expertParam\" class=\"hidden\">"
+ append html "[getCheckBox '$param' $ps($param) $chn $prn]&nbsp;[getHelpIcon $param]"
+ append html "</td>"
jens-maus marked this conversation as resolved.
Show resolved Hide resolved
+ 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>"
}

@@ -2946,13 +2957,12 @@
append html "<td colspan=\"2\" >[getTextField $param $ps($param) $chn $prn]&nbsp;[getUnit $param]&nbsp;[getMinMaxValueDescr $param]&nbsp;[getHelpIcon $param]</td>"

append html "<script type=\"text/javascript\">"
- append html "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {"
- append html "var value = this.value;"
- append html "this.value = Math.round(this.value / 5) * 5;"
- append html "ProofAndSetValue(this.id, this.id, [getMinValue $param], [getMaxValue $param], 1);"
- append html "});"
+ append html "jQuery(\"#separate_$CHANNEL\_$prn\").bind(\"blur\",function() {"
+ append html "var value = this.value;"
+ append html "this.value = Math.round(this.value / 5) * 5;"
+ append html "ProofAndSetValue(this.id, this.id, [getMinValue $param], [getMaxValue $param], 1);"
+ append html "});"
jens-maus marked this conversation as resolved.
Show resolved Hide resolved
append html "</script>"
-
append html "</tr>"
}

@@ -2962,18 +2972,11 @@

append html "<table class=\"ProfileTbl\">"
# 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 "<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
+ array_clear options
+ for {set val 5.0} {$val <= 30.0} {set val [expr $val + 0.5]} {
+ set options($val) "$val &#176;C"
+ }
if { [info exists ps($param)] == 1 } {
incr prn
if { [info exists ps(TEMPERATURE_WINDOW_OPEN_COOLING)] == 1 } {
@@ -2981,7 +2984,7 @@
} 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>"
}

@@ -2990,7 +2993,7 @@
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>"
}

@@ -2999,6 +3002,138 @@
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>"
+ }
jens-maus marked this conversation as resolved.
Show resolved Hide resolved
+
+ 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
jens-maus marked this conversation as resolved.
Show resolved Hide resolved
+ 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"
+ }
jens-maus marked this conversation as resolved.
Show resolved Hide resolved
+ 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>"
+
+ append html "<table class=\"ProfileTbl\">"
+
# left
incr prn
set param BOOST_TIME_PERIOD
@@ -3007,9 +3142,24 @@
set options($val) "$val min"
}
append html "<tr><td>\${stringTableBoostTimePeriod}</td>"
- append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param]</td>"
+ append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param]&nbsp;[getHelpIcon $param]</td>"
jens-maus marked this conversation as resolved.
Show resolved Hide resolved
+
+ # 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>"
- append html "</table>"
jens-maus marked this conversation as resolved.
Show resolved Hide resolved
+ 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) } {
append html "<hr>"
Loading
Loading