update to 2.31.25 version

eq-3 · Jan 16, 2018 · 6ead804 · 6ead804
1 parent 02fd93a
commit 6ead804
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 33 deletions.
diff --git a/HMserver/opt/HMServer/HMIPServer.jar b/HMserver/opt/HMServer/HMIPServer.jar
diff --git a/HMserver/opt/HMServer/HMServer.jar b/HMserver/opt/HMServer/HMServer.jar
diff --git a/WebUI/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl b/WebUI/www/config/easymodes/etc/hmipChannelConfigDialogs.tcl
@@ -337,6 +337,19 @@ proc getSwitchTransmitter {chn p descr} {
 
   set html ""
 
+  set param CURRENTDETECTION_BEHAVIOR
+  if { ! [catch {set tmp $ps($param)}]  } {
+    append html "<tr>"
+      append html "<td>\${stringTableCurrentDetectionBehavior}</td>"
+      array_clear option
+      set option(0) "\${stringTableCurrentDetectionBehaviorActive}"
+      set option(1) "\${stringTableCurrentDetectionBehaviorOutput1}"
+      set option(2) "\${stringTableCurrentDetectionBehaviorOutput2}"
+      append html  "<td>[getOptionBox '$param' option $ps($param) $chn $prn]</td>"
+    append html "</tr>"
+    incr prn
+  }
+
   append html "<tr>"
   append html "<td>\${stringTableEventDelay}</td>"
   append html [getComboBox $chn $prn "$specialID" "delayShort"]
@@ -990,25 +1003,25 @@ set comment {
     append html "<td>\${stringTableDimmerPowerUpAction}</td>"
     option POWERUP_JUMPTARGET_HMIP
     append html  "<td>[getOptionBox '$param' options $ps($param) $chn $prn]</td>"
-  append html "</tr>"  
-  
+  append html "</tr>"
+
   incr prn
   append html "<tr>"
   append html "<td>\${stringTableOnDelay}</td>"
   append html [getComboBox $chn $prn "$specialID" "delayShort"]
   append html "</tr>"
-  
+
   set param POWERUP_ONDELAY_UNIT
   append html [getTimeUnitComboBox $param $ps($param) $chn $prn $special_input_id]
-  
-  
+
+
   incr prn
   set param POWERUP_ONDELAY_VALUE
   append html "<tr id=\"timeFactor_$chn\_$prn\" class=\"hidden\">"
   append html "<td>\${stringTableOnDelayValue}</td>"
-  
+
   append html "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
-  
+
   append html "</tr>"
   append html "<tr id=\"space_$chn\_$prn\" class=\"hidden\"><td><br/></td></tr>"
   append html "<script type=\"text/javascript\">setTimeout(function() {setCurrentDelayShortOption($chn, [expr $prn - 1], '$specialID');}, 100)</script>"
@@ -1527,7 +1540,7 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
     append html "<hr>"
 
     # *************** #
-    
+
     append html "<table class=\"ProfileTbl\">"
       # left
 
@@ -1569,7 +1582,7 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
     append html "</table>"
 
     append html "<hr>"
-    
+
     append html "<table class=\"ProfileTbl\">"
 
       set param TEMPERATURE_LOWERING_COOLING
@@ -1711,7 +1724,7 @@ proc getHeatingClimateControlTransceiver {chn p descr address {extraparam ""}} {
     append html "</tr>"
   append html "</table>"
 
-    
+
   if {[session_is_expert]} {
     append html "<script type=\"text/javascript\">"
       append html "jQuery(\"\[name='expertParam'\]\").show();"
@@ -1738,18 +1751,6 @@ proc getSwitchVirtualReceiver {chn p descr} {
 
   set html ""
 
-  set param CURRENTDETECTION_BEHAVIOR
-  if { ! [catch {set tmp $ps($param)}]  } {
-    append html "<tr>"
-      append html "<td>\${stringTableCurrentDetectionBehavior}</td>"
-      array_clear option
-      set option(0) "\${stringTableCurrentDetectionBehaviorActive}"
-      set option(1) "\${stringTableCurrentDetectionBehaviorOutput1}"
-      set option(2) "\${stringTableCurrentDetectionBehaviorOutput2}"
-      append html  "<td>[getOptionBox '$param' option $ps($param) $chn $prn]</td>"
-    append html "</tr>"
-    incr prn
-  }
 
   if {[session_is_expert]} {
     set param "LOGIC_COMBINATION"

diff --git a/WebUI/www/rega/esp/functions.fn b/WebUI/www/rega/esp/functions.fn
@@ -495,18 +495,41 @@ function ::showHideHmIPChannel() {
   }
 }
 
-! [showHmIPParam]
+! [showChannelParam]
 function ::isParameterVisible() {
+  object _oIface = dom.GetObject(oCC.Interface());
+  string sInterface = _oIface.Name();
+
+  string hmIPRFIdentifier = "HmIP-RF";
+  string bidCosRFIdentifier = "BidCos-RF";
+  string wiredIdentifier = "BidCos-Wired";
+
   string tmp;
-  string excludeBinaryHmIPParams = "PARTY_,PARTY_MODE,SECTION,PROCESS,VALVE_STATE,CONTROL_DIFFERENTIAL_TEMPERATURE,RSSI_DEVICE,RSSI_PEER,";
-  excludeBinaryHmIPParams = excludeBinaryHmIPParams#"CURRENT_ILLUMINATION,OPERATING_VOLTAGE,BOOST_TIME,SMOKE_DETECTOR_TEST_RESULT=NONE";
+  string excludeBinaryParams;
+  string includeBinaryParams = "NOT_IN_USE";
+  showChannelParam = true;
 
-  showHmIPParam = true;
+  if ( sInterface == hmIPRFIdentifier ) {
+    excludeBinaryParams = "PARTY_,PARTY_MODE,SECTION,PROCESS,VALVE_STATE,CONTROL_DIFFERENTIAL_TEMPERATURE,RSSI_DEVICE,RSSI_PEER,";
+    excludeBinaryParams = excludeBinaryParams#"OPERATING_VOLTAGE,BOOST_TIME,SMOKE_DETECTOR_TEST_RESULT=NONE,QUICK_VETO_TIME";
+  }
+
+  if ( sInterface == bidCosRFIdentifier ) {
+    excludeBinaryParams = "PARTY_";
+    includeBinaryParams = "PARTY_MODE";
+  }
 
-  foreach (tmp, excludeBinaryHmIPParams.Split(",")) {
-    if ((oDP.HSSID().Find(tmp) != -1)) {
-      showHmIPParam = false;
-      return;
+ ! The check of the type is to prevent the hiding of system vars
+  if ((( sInterface == hmIPRFIdentifier ) || ( sInterface == bidCosRFIdentifier )) && ( oDP.IsTypeOf( OT_HSSDP ))) {
+    foreach (tmp, excludeBinaryParams.Split(",")) {
+      if (oDP.HSSID().Find(tmp) != -1) {
+        foreach (tmp, includeBinaryParams.Split(",")) {
+          if (oDP.HSSID().Find(tmp) == -1) {
+            showChannelParam = false;
+          }
+        }
+        return;
+      }
     }
   }
   return;

diff --git a/WebUI/www/rega/esp/sico.inc b/WebUI/www/rega/esp/sico.inc
@@ -10,7 +10,7 @@
   integer iCC = oSC.ConditionChannel();
   string sSelected = "";
 
-  boolean showHmIPParam = true;
+  boolean showChannelParam = true;
 
   Write( '<select class="SelectBox" onchange="LeftValSelectChange(this.selectedIndex,'#oSC.ID()#');">' );
   if( iLVT == ivtEmpty ) { sSelected = " selected"; } else { sSelected = ""; }
@@ -112,7 +112,7 @@
 
                     ! Some parameters shouldn't be visible
                     Call("/esp/functions.fn::isParameterVisible()");
-                    if (showHmIPParam == true)
+                    if (showChannelParam == true)
                      {
 
                       if( (oDP.ID() == iLV) && (iRV1 == sVLKey) ) { sSelected = " selected"; } else { sSelected = ""; }
@@ -191,7 +191,7 @@
                 {
                   ! Some parameter shouldn´t be visible
                   Call("/esp/functions.fn::isParameterVisible()");
-                  if(showHmIPParam == true) {
+                  if(showChannelParam == true) {
                     if( oDP.ID() == iLV ) { sSelected = " selected"; } else { sSelected = ""; }
                     Write( '<option value="'#oDP.ID()#':1"'#sSelected#'>' );
                     string sValue = oDP.Name();