- Fixed ZWave interface sensor timeout bug and sensor Status.Level "0.01" bug

- Disabled limit of max one opened http connection per program in NetHelper

Author: genemars

BaseFiles/Common/Common.csproj

@@ -4899,10 +4899,6 @@
       <Link>lib\mig\LibUsbDotNet.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\Externals\g-labs\SerialPortLib.dll">
-      <Link>lib\shared\SerialPortLib.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="..\..\Externals\g-labs\W800Rf32Lib.dll">
       <Link>lib\mig\W800Rf32Lib.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

BaseFiles/Common/homegenie_factory_config.zip

@@ -330,11 +330,23 @@ HG.WebApp.GroupModules.GetModulesListViewItems = function (groupname) {
             var haselement = $.grep(groupmodules.Modules, function (value) {
                 return (value.Domain == module.Domain && value.Address == module.Address);
             });
+            // module it's not present in current group
             if (haselement.length == 0) {
                 var propwidget = HG.WebApp.Utility.GetModulePropertyByName(module, "Widget.DisplayModule");
                 var vmparentid = HG.WebApp.Utility.GetModulePropertyByName(module, "VirtualModule.ParentId");
-                // check if no explicit witdget is specified and it's not a virtual module
-                if ((propwidget != null && propwidget.Value != null && propwidget.Value == "") && (vmparentid != null && vmparentid.Value == module.Address)) continue;
+                var widget = (propwidget != null && propwidget.Value != null) ? propwidget.Value : '';
+                var vid = (vmparentid != null && vmparentid.Value != null) ? vmparentid.Value : '';
+                // check if no explicit witdget is specified and it's not a virtual module or program
+                if (module.Domain == 'HomeAutomation.HomeGenie.Automation') {
+                    var pid = (vid != '' && vid != module.Address) ? vid : module.Address;
+                    var cp = HG.WebApp.Utility.GetProgramByAddress(pid);
+                    if (cp != null) {
+                        if (!cp.IsEnabled)
+                            continue;
+                        else if (cp.Type.toLowerCase() != 'wizard' && widget == '')
+                            continue;
+                    }
+                }
                 //
                 if (cursect != module.Domain) {
                     cursect = module.Domain;

BaseFiles/Common/html/pages/configure/groups/_groupmodules.js

@@ -34,18 +34,26 @@
         requestPopupOpen = false;
         var popup = $(cuid).find('[data-ui-field=widget]').data('ControlPopUp');
         popup.find('[data-ui-field=camerapicture]').attr('src', imageurl + '?' + (new Date().getTime()));
-        $.mobile.loading('hide');
       });
-      controlpopup.on('popupafterclose', function () { popupisopen = false; });
+      controlpopup.on('popupafterclose', function () { popupisopen = false; $.mobile.loading('hide'); });
       controlpopup.find('[data-ui-field=camerapicture]').attr('src', imageurl + '?' + (new Date().getTime())).load(function () {
         var popup = $(cuid).find('[data-ui-field=widget]').data('ControlPopUp');
         if (requestPopupOpen) {
           popup.popup('open');
         } else if (popupisopen) {
+          $.mobile.loading('hide');
           setTimeout(function () {
             popup.find('[data-ui-field=camerapicture]').attr('src', imageurl + '?' + (new Date().getTime()));
           }, 100);
         }
+      }).error(function () {
+        var popup = $(cuid).find('[data-ui-field=widget]').data('ControlPopUp');
+        if (popupisopen) {
+          $.mobile.loading('show', { text: 'Error connecting to camera', textVisible: true });
+          setTimeout(function () {
+            popup.find('[data-ui-field=camerapicture]').attr('src', imageurl + '?' + (new Date().getTime()));
+          }, 2000);
+        }
       });
       //
       // initialization stuff here
@@ -54,7 +62,7 @@
       widget.find('[data-ui-field=camerapicturepreview]').on('click', function () {
         if ($(cuid).find('[data-ui-field=widget]').data('ControlPopUp')) {
           var popup = $(cuid).find('[data-ui-field=widget]').data('ControlPopUp');
-          $.mobile.loading('show');
+          $.mobile.loading('show', { text: 'Connecting to camera', textVisible: true });
           requestPopupOpen = true;
           popup.find('[data-ui-field=camerapicture]').attr('src', imageurl + '?' + (new Date().getTime()));
         }
@@ -65,6 +73,12 @@
             _this.Widget.find('[data-ui-field=camerapicturepreview]').attr('src', imageurl + '?' + (new Date().getTime()));
           }, 2000);
         }
+      }).error(function () {
+        if (_this.Widget.is(':visible')) {
+          setTimeout(function () {
+            _this.Widget.find('[data-ui-field=camerapicturepreview]').attr('src', imageurl + '?' + (new Date().getTime()));
+          }, 2000);
+        }
       });
       //
       // ui events handlers

BaseFiles/Common/html/pages/control/widgets/homegenie/generic/camerainput.js

@@ -1,8 +1,10 @@
 RELEASE HISTORY
 
-04/11/2015 v1.1-beta.500
-    - Improved media server widget with thumbnails and multiple bitrates and formats support
-    - Added UPnP interface command AvMedia.GetItem
+05/11/2015 v1.1-beta.500
+    - Fixed ZWave interface sensor timeout bug and sensor Status.Level "0.01" bug
+    - Disabled limit of max one opened http connection per program in NetHelper
+    - Improved media server widget with thumbnails and support for multiple bitrates and formats
+    - Added UPnP interface command "AvMedia.GetItem"
     - Improved camera widget
     - Fixed 'continuous Event Stream disconnection' bug when running on old mono ARM-hf (eg. Raspberry Pi)
     - Updated Spanish locales

Externals/g-labs/MIG.HomeAutomation.dll

@@ -73,7 +73,7 @@ public class NetHelper
 
         // multithread safe lock objects
         private object smtpSyncLock = new object();
-        private object httpSyncLock = new object();
+        //private object httpSyncLock = new object();
         private object mqttSyncLock = new object();
 
         private HomeGenieService homegenie;
@@ -396,7 +396,7 @@ public NetHelper AddHeader(string name, string value)
         public string Call()
         {
             string returnvalue = "";
-            lock(httpSyncLock)
+            //lock(httpSyncLock)
             using (var webClient = new WebClient())
             {
                 try
@@ -483,7 +483,7 @@ public dynamic GetData()
         public byte[] GetBytes()
         {
             byte[] responseBytes = null;
-            lock(httpSyncLock)
+            //lock(httpSyncLock)
             using (var webClient = new WebClient())
             {
                 try
@@ -664,13 +664,13 @@ private class WebClient : System.Net.WebClient
             protected override WebRequest GetWebRequest(Uri uri)
             {
                 WebRequest w = base.GetWebRequest(uri);
-                // Disable Keep-Alive
-                if (w is HttpWebRequest)
-                {
-                    (w as HttpWebRequest).KeepAlive = false;
-                }
-                // WebClient default timeout set to 30 seconds
-                w.Timeout = 30 * 1000;
+                // Disable Keep-Alive (this lead to poor performance, so let's keep it disabled by default)
+                //if (w is HttpWebRequest)
+                //{
+                //    (w as HttpWebRequest).KeepAlive = false;
+                //}
+                // WebClient default timeout set to 10 seconds
+                w.Timeout = 10 * 1000;
                 return w;
             }
         }