update to latest development snapshot (2.31.x)

WebUI/www/api/methods.conf

@@ -933,7 +933,7 @@ CCU.getStickyUnreachState {
 }
 
 CCU.existsFile {
-  LEVEL USER
+  LEVEL GUEST
   SCRIPT_FILE ccu/existsfile.tcl
   INFO {Pr�ft, ob eine Datei oder ein Verzeichniss vorhanden ist}
   ARGUMENTS {_session_id_ file}
@@ -981,7 +981,7 @@ User.getLanguage {
         LEVEL NONE 
         SCRIPT_FILE user/getlanguage.tcl
         INFO {Ermittelt die gew�hlte Sprache des Benutzers}
-        ARGUMENTS {userName userID}
+        ARGUMENTS {userID}
 }
 User.setLanguage {
         LEVEL NONE 

WebUI/www/api/methods/user/getlanguage.tcl

@@ -3,7 +3,6 @@
 # Ermittelt die vom User gewählte Sprache
 #
 # Parameter:
-#   userName: [string] userName des Anwenders
 #   userID: [string] userId des Anwenders
 #
 # Rückgabewert: Gewählte Sprache des Users
@@ -13,9 +12,9 @@ set script {
   var user = dom.GetObject(userID);
   Write(user.UserFirstName());
 }
-set legitimateUser [hmscript $script args]
+set userName [hmscript $script args]
 
-if {([string equal $args(userName) $legitimateUser] == 1) && ([catch {set fp [open "/etc/config/userprofiles/$args(userName).lang" r]}] == 0)} {
+if {[catch {set fp [open "/etc/config/userprofiles/$userName.lang" r]}] == 0} {
   set data [read $fp]
   set lang [split $data "\n"]
   close $fp

WebUI/www/config/cp_maintenance.cgi

@@ -1022,14 +1022,15 @@ proc action_download_logfile {} {
     puts "Content-Disposition:attachment;filename=[set HOSTNAME]-$year-$month-$day.log\n"
 
     cd /var/log
-    foreach f {messages.1 messages.0 messages} {
+    foreach f {messages.1 messages.0 messages hmserver.log.1 hmserver.log} {
         catch {
             set fd [open $f r]
+            puts -nonewline "\r\n***** $f *****\r\n"
             while { ! [eof $fd]} {
                 puts -nonewline "[gets $fd]\r\n"
             }
-      close $fd
-  }
+            close $fd
+        }
     }
 }
 

WebUI/www/config/easymodes/BLIND_VIRTUAL_RECEIVER/localization/en/ROTARY_HANDLE_TRANSCEIVER.txt

@@ -8,6 +8,14 @@
 
 "subset_1" : "moved up",
 "subset_2" : "moved down",
-"subset_3" : "changing between moved up and moved down",
+"subset_3" : "moved up/down in toggle mode",
 
+"subset_4" : "Open - off / Closed - on",
+"subset_5" : "Open - on / Closed - off",
 
+"subset_6" : "Close",
+"subset_7" : "Open",
+"subset_8" : "Change",
+
+"subset_9" : "Open",
+"subset_10" : "Close",

WebUI/www/config/easymodes/BLIND_VIRTUAL_RECEIVER/localization/en/SHUTTER_CONTACT.txt

@@ -11,3 +11,16 @@
 "subset_3" : "changing between moved up and moved down",
 
 
+"subset_1" : "moved up",
+"subset_2" : "moved down",
+"subset_3" : "moved up/down in toggle mode",
+
+"subset_4" : "Open - off / Closed - on",
+"subset_5" : "Open - on / Closed - off",
+
+"subset_6" : "Close",
+"subset_7" : "Open",
+"subset_8" : "Change",
+
+"subset_9" : "Open",
+"subset_10" : "Close",

WebUI/www/config/easymodes/BLIND_VIRTUAL_RECEIVER/localization/tr/ROTARY_HANDLE_TRANSCEIVER.txt

@@ -8,7 +8,17 @@
 
 "subset_1" : "moved up",
 "subset_2" : "moved down",
-"subset_3" : "changing between moved up and moved down",
+"subset_3" : "moved up/down in toggle mode",
+
+"subset_4" : "Open - off / Closed - on",
+"subset_5" : "Open - on / Closed - off",
+
+"subset_6" : "Close",
+"subset_7" : "Open",
+"subset_8" : "Change",
+
+"subset_9" : "Open",
+"subset_10" : "Close",
 
 
 

WebUI/www/config/easymodes/BLIND_VIRTUAL_RECEIVER/localization/tr/SHUTTER_CONTACT.txt

@@ -1,4 +1,4 @@
-"description_1" : "<span class=\"translated\">With each opening / closing of the window / door contact  the blind will be moved up completely for the set time. If a up-delay is set the blind will be moved up after the delay time has expired.</span><br/><br/>",
+"description_1" : "<span class=\"translated\">With each opening / closing of the window / door contact  the blind will be moved up completely for the set time. If an up-delay is set the blind will be moved up after the delay time has expired.</span><br/><br/>",
 
 "description_2" : "<span class=\"translated\">With each opening / closing of the window / door contact  the blind will be moved down completely for the set time. If a down-delay is set the blind will be moved down after the delay time has expired.</span><br/><br/>",
 
@@ -11,4 +11,18 @@
 "subset_3" : "changing between moved up and moved down",
 
 
+"subset_1" : "moved up",
+"subset_2" : "moved down",
+"subset_3" : "moved up/down in toggle mode",
+
+"subset_4" : "Open - off / Closed - on",
+"subset_5" : "Open - on / Closed - off",
+
+"subset_6" : "Close",
+"subset_7" : "Open",
+"subset_8" : "Change",
+
+"subset_9" : "Open",
+"subset_10" : "Close",
+
 

WebUI/www/config/easymodes/DIMMER_VIRTUAL_RECEIVER/localization/en/SHUTTER_CONTACT.txt

@@ -5,4 +5,6 @@
 "subset_3" : "Close",
 "subset_4" : "Open",
 "subset_5" : "Change",
+"subset_6" : "Open - on/off",
+"subset_7" : "Closed - on/off",
 "at" : "<span class=\"translated\">on</span>",

WebUI/www/config/easymodes/DIMMER_VIRTUAL_RECEIVER/localization/tr/SHUTTER_CONTACT.txt

@@ -5,4 +5,6 @@
 "subset_3" : "Kapat",
 "subset_4" : "Acma",
 "subset_5" : "Degistir",
+"subset_6" : "Open - on/off",
+"subset_7" : "Closed - on/off",
 "at" : "<span class=\"translated\">'da</span>",

WebUI/www/config/easymodes/MASTER_LANG/HM_ES_PMSw.js

@@ -110,6 +110,12 @@ jQuery.extend(true,langJSON, {
     "stringTableCondTxDecisionAbove" : "Sent decision value if upper limit is exceeded",
     "stringTableCondTxDecisionBelow" : "Sent decision value if lower limit falls below threshold",
 
+    "stringTableCondTxDecisionPassageRL_A" : "Sent decision value<br/>if number of passages right -> left reached",
+    "stringTableCondTxDecisionPassageLR_A" : "Sent decision value<br/>if number of passages left -> right reached",
+
+    "stringTableCondTxDecisionPassageRL_B" : "Sent upper decision value,<br/>wenn der obere Differenzwert erreicht wurde.",
+    "stringTableCondTxDecisionPassageLR_B" : "Sent lower decision value,<br/>when the lower differential value has been reached and the upper limit has been reached previously.",
+
     "stringTableCondTxFalling" : "Send decision value if lower limit falls below threshold<br/>" +
        "and if the upper limit has been exceeded previously.",
     "stringTableCondTxFallingA" : "Send decision value (",
@@ -185,6 +191,13 @@ jQuery.extend(true,langJSON, {
     "stringTableCondTxCyclicBelow" : "Alt sinir deger asildiginda karar degerini periyodik sekilde g&ouml;nder",
     "stringTableCondTxDecisionAbove" : "&Uuml;st sinir deger asildiginda g&ouml;nderilen karar degeri",
     "stringTableCondTxDecisionBelow" : "Alt sinir deger asildiginda g&ouml;nderilen karar degeri",
+
+    "stringTableCondTxDecisionPassageRL_A" : "Sent decision value<br/>if number of passages right -> left reached",
+    "stringTableCondTxDecisionPassageLR_A" : "Sent decision value<br/>if number of passages left -> right reached",
+
+    "stringTableCondTxDecisionPassageRL_B" : "Sent upper decision value,<br/>wenn der obere Differenzwert erreicht wurde.",
+    "stringTableCondTxDecisionPassageLR_B" : "Sent lower decision value,<br/>when the lower differential value has been reached and the upper limit has been reached previously.",
+
     "stringTableCondTxFalling" : "Eger &ouml;nceden &uuml;st sinir deger asilmissa,<br/>alt sinir deger de asildiginda karar degerini g&ouml;nder.",
     "stringTableCondTxFallingA" : "Eger &ouml;nceden &uuml;st sinir deger asilmissa (",
     "stringTableCondTxFallingB" : ") <br/>alt sinir deger de asildiginda karar degerini g&ouml;nder.",

WebUI/www/config/easymodes/MASTER_LANG/HmIP-ParamHelp.js

@@ -137,23 +137,23 @@ jQuery.extend(true,langJSON, {
             "<li class='diagramHelpCustomModeLi1'>" +
               //"<b>5 - \${optionPassageCounterDeltaL}</b><br/>" +
               "<b>5 -Difference of passages - left </b><br/>" +
-                "In this mode an internal counter variant is increased by 1 on detected passage from LEFT and" +
-                "reduced by 1 on passage detected from RIGHT. The mimium value of the internal counter variable is ZERO and the maximum value is 1000.<br/><br/>" +
+                "In this mode an internal counter variant is increased by 1 on detected passage to LEFT and " +
+                "reduced by 1 on passage detected to RIGHT. The mimium value of the internal counter variable is ZERO and the maximum value is 1000.<br/><br/>" +
                 "The adjustable upper and lower difference value is used to create a hysteresis. If the internal counter reaches the " +
-                "upper difference value, a switching command is send with the upper decision value to the" +
-                "connection partner(s). Additional passages are counted until the maximum value but will not cause" +
+                "upper difference value, a switching command is send with the upper decision value to the " +
+                "connection partner(s). Additional passages are counted until the maximum value but will not cause " +
                 "additional switching commands. Only when reaching the lower difference value, a switching command " +
                 "with the lower decision value is sent to the connection partner(s)." +
              "</li>" +
 
             "<li class='diagramHelpCustomModeLi1'>" +
               //"<b>6 - \${optionPassageCounterDeltaR}</b><br/>" +
               "<b>6 -Difference of passages - right </b><br/>" +
-                "In this mode an internal counter variant is increased by 1 on detected passage from RIGHT and" +
-                "reduced by 1 on passage detected from LEFT. The mimium value of the internal counter variable is ZERO and the maximum value is 1000.<br/><br/>" +
+                "In this mode an internal counter variant is increased by 1 on detected passage to RIGHT and " +
+                "reduced by 1 on passage detected to LEFT. The mimium value of the internal counter variable is ZERO and the maximum value is 1000.<br/><br/>" +
                 "The adjustable upper and lower difference value is used to create a hysteresis. If the internal counter reaches the " +
-                "upper difference value, a switching command is send with the upper decision value to the" +
-                "connection partner(s). Additional passages are counted until the maximum value but will not cause" +
+                "upper difference value, a switching command is send with the upper decision value to the " +
+                "connection partner(s). Additional passages are counted until the maximum value but will not cause " +
                 "additional switching commands. Only when reaching the lower difference value, a switching command " +
                 "with the lower decision value is sent to the connection partner(s)." +
                  "</li>" +
@@ -218,23 +218,23 @@ jQuery.extend(true,langJSON, {
             "<li class='diagramHelpCustomModeLi1'>" +
               //"<b>5 - \${optionPassageCounterDeltaL}</b><br/>" +
               "<b>5 -Difference of passages - left </b><br/>" +
-                "In this mode an internal counter variant is increased by 1 on detected passage from LEFT and" +
-                "reduced by 1 on passage detected from RIGHT. The mimium value of the internal counter variable is ZERO and the maximum value is 1000.<br/><br/>" +
+                "In this mode an internal counter variant is increased by 1 on detected passage to LEFT and " +
+                "reduced by 1 on passage detected to RIGHT. The mimium value of the internal counter variable is ZERO and the maximum value is 1000.<br/><br/>" +
                 "The adjustable upper and lower difference value is used to create a hysteresis. If the internal counter reaches the " +
-                "upper difference value, a switching command is send with the upper decision value to the" +
-                "connection partner(s). Additional passages are counted until the maximum value but will not cause" +
+                "upper difference value, a switching command is send with the upper decision value to the " +
+                "connection partner(s). Additional passages are counted until the maximum value but will not cause " +
                 "additional switching commands. Only when reaching the lower difference value, a switching command " +
                 "with the lower decision value is sent to the connection partner(s)." +
              "</li>" +
 
             "<li class='diagramHelpCustomModeLi1'>" +
               //"<b>6 - \${optionPassageCounterDeltaR}</b><br/>" +
               "<b>6 -Difference of passages - right </b><br/>" +
-                "In this mode an internal counter variant is increased by 1 on detected passage from RIGHT and" +
-                "reduced by 1 on passage detected from LEFT. The mimium value of the internal counter variable is ZERO and the maximum value is 1000.<br/><br/>" +
+                "In this mode an internal counter variant is increased by 1 on detected passage to RIGHT and " +
+                "reduced by 1 on passage detected to LEFT. The mimium value of the internal counter variable is ZERO and the maximum value is 1000.<br/><br/>" +
                 "The adjustable upper and lower difference value is used to create a hysteresis. If the internal counter reaches the " +
-                "upper difference value, a switching command is send with the upper decision value to the" +
-                "connection partner(s). Additional passages are counted until the maximum value but will not cause" +
+                "upper difference value, a switching command is send with the upper decision value to the " +
+                "connection partner(s). Additional passages are counted until the maximum value but will not cause " +
                 "additional switching commands. Only when reaching the lower difference value, a switching command " +
                 "with the lower decision value is sent to the connection partner(s)." +
                  "</li>" +

WebUI/www/config/easymodes/STATE_RESET_RECEIVER/localization/en/GENERIC.txt

@@ -1,5 +1,5 @@
 "hintPermanentFullRX" :
 
-  "To make sure that the connection will be working correctly, �Permanently ready to receive� has to be activated in the channel settings. " +
+  "To make sure that the connection will be working correctly, 'Permanently ready to receive' has to be activated in the channel settings. " +
   "As the battery lifetime is reduced by this, it is recommended to use this function only with the push-buttons of the device.<br/><br/>" +
-  "You can check and set the parameter via the �Channel parameter� button<br/><br/>",
+  "You can check and set the parameter via the 'Channel parameter' button<br/><br/>",

WebUI/www/config/easymodes/STATE_RESET_RECEIVER/localization/fr/GENERIC.txt

@@ -1,5 +1,5 @@
 "hintPermanentFullRX" :
 
-  "To make sure that the connection will be working correctly, �Permanently ready to receive� has to be activated in the channel settings. " +
+  "To make sure that the connection will be working correctly, 'Permanently ready to receive' has to be activated in the channel settings. " +
   "As the battery lifetime is reduced by this, it is recommended to use this function only with the push-buttons of the device.<br/><br/>" +
-  "You can check and set the parameter via the �Channel parameter� button<br/><br/>",
+  "You can check and set the parameter via the 'Channel parameter' button<br/><br/>",

WebUI/www/config/easymodes/SWITCH_VIRTUAL_RECEIVER/KEY_TRANSCEIVER.tcl

@@ -200,6 +200,11 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
   #append HTML_PARAMS(separate_$prn) "\${description_$prn}"
   append HTML_PARAMS(separate_$prn) "[getDescription $longKeypressAvailable $prn]"
+
+  if {$parentType == "hmip-wgc"} {
+    append HTML_PARAMS(separate_$prn) "\${hint_hmip_wgc}"
+  }
+
   append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
 
   set pref 0
@@ -266,6 +271,11 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
   #append HTML_PARAMS(separate_$prn) "\${description_$prn}"
   append HTML_PARAMS(separate_$prn) "[getDescription $longKeypressAvailable $prn]"
+
+  if {$parentType == "hmip-wgc"} {
+    append HTML_PARAMS(separate_$prn) "\${hint_hmip_wgc}"
+  }
+
   append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
 
     set pref 0

WebUI/www/config/easymodes/SWITCH_VIRTUAL_RECEIVER/localization/de/KEY_TRANSCEIVER.txt

@@ -10,4 +10,4 @@
 "description_noLong_4" : "<span class=\"translated\">Beim Ausl&ouml;sen des Sensors wird der Schalter f&uuml;r die festgelegte Zeit ein- bzw. ausgeschaltet.</span><br/><br/>",
 "description_noLong_5" : "<span class=\"translated\">Beim Ausl&ouml;sen des Sensors wird der Schalter f&uuml;r die festgelegte Zeit aus- bzw. eingeschaltet.</span><br/><br/>",
 
-
+"hint_hmip_wgc" : "Wenn das Ger&auml;t mit Batterien betrieben wird, sollte keine lange Einschaltdauer gew&auml;hlt werden, da das angezogene Relais die Batterien sehr schnell entleeren w&uuml;rde.<br/><br/>",

WebUI/www/config/easymodes/SWITCH_VIRTUAL_RECEIVER/localization/en/GENERIC.txt

@@ -3,7 +3,7 @@
 "switch_on_off" : "Switch - on / off",
 "switch_toggle" : "Switch toggle",
 "change_signal_on" : "When changing on",
-"change_signal_off" : "When changing off"
+"change_signal_off" : "When changing off",
 
 "actor_off" : "Actor off",
 "actor_on" : "Actor on",

WebUI/www/config/easymodes/SWITCH_VIRTUAL_RECEIVER/localization/en/KEY_TRANSCEIVER.txt

@@ -9,3 +9,6 @@
 "description_noLong_3" : "<span class=\"translated\">When the sensor is triggered the switch will be switched on or off for the time set (toggle function). If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
 "description_noLong_4" : "<span class=\"translated\">When the sensor is triggered the switch will be switched on or off for the set time.</span><br/><br/>",
 "description_noLong_5" : "<span class=\"translated\">When the sensor is triggered the switch will be switched off or on for the set time.</span><br/><br/>",
+
+
+"hint_hmip_wgc" : "If the device is operated with batteries, a long on time should not be chosen because the energized relay would drain the batteries very quickly.<br/><br/>",

WebUI/www/config/easymodes/SWITCH_VIRTUAL_RECEIVER/localization/tr/GENERIC.txt

@@ -3,7 +3,7 @@
 "switch_on_off" : "Switch - on / off",
 "switch_toggle" : "Switch toggle",
 "change_signal_on" : "When changing on",
-"change_signal_off" : "When changing off"
+"change_signal_off" : "When changing off",
 
 "actor_off" : "Actor off",
 "actor_on" : "Actor on",

WebUI/www/config/easymodes/SWITCH_VIRTUAL_RECEIVER/localization/tr/KEY_TRANSCEIVER.txt

@@ -9,3 +9,6 @@
 "description_noLong_3" : "<span class=\"translated\">When the sensor is triggered the switch will be switched on or off for the time set (toggle function). If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
 "description_noLong_4" : "<span class=\"translated\">When the sensor is triggered the switch will be switched on or off for the set time.</span><br/><br/>",
 "description_noLong_5" : "<span class=\"translated\">When the sensor is triggered the switch will be switched off or on for the set time.</span><br/><br/>",
+
+
+"hint_hmip_wgc" : "If the device is operated with batteries, a long on time should not be chosen because the energized relay would drain the batteries very quickly.<br/><br/>",

WebUI/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl

@@ -104,7 +104,6 @@ proc getMaintenance {chn p descr} {
 
     append html "<script type='text/javascript'>"
       append html " showParameterHint = function(elmID, value) { "
-        append html " console.log(\"elmID: \" + elmID + \" - value: \" + value); "
         append html " var elm = jQuery(\"#hint_\"+elmID); "
         append html " if (parseInt(value) == 0) { "
           append html " elm.show(); "
@@ -395,12 +394,22 @@ proc getClimateReceiver {chn p descr} {
   upvar prn prn
   upvar special_input_id special_input_id
 
+  set CHANNEL $special_input_id
+
   set html ""
 
+  puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/MASTER_LANG/HEATINGTHERMOSTATE_2ND_GEN_HELP.js');</script>"
+
   set param TEMPERATURE_OFFSET
   append html "<tr>"
-  append html "<td>\${stringTableTemperatureOffset}</td>"
-  append html "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getUnit $param]&nbsp;[getMinMaxValueDescr $param]</td>"
+    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 "<td>\${stringTableTemperatureOffset}</td>"
+    append html "<td>[get_ComboBox options $param separate_$CHANNEL\_$prn ps $param][getHelpIcon $param]</td>"
   append html "</tr>"
 
   return $html