v1.1-beta.516

genielabs · Apr 17, 2016 · bf83803 · bf83803
1 parent 4e88b9d
commit bf83803
Show file tree

Hide file tree

Showing 68 changed files with 812 additions and 4,893 deletions.
diff --git a/BaseFiles/Common/Common.csproj b/BaseFiles/Common/Common.csproj
@@ -3087,30 +3087,6 @@
       <Link>lib\shared\NCrontab.pdb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="..\..\Externals\nmqtt\Nmqtt.dll">
-      <Link>lib\shared\Nmqtt.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Externals\nmqtt\Nmqtt.dll.mdb">
-      <Link>lib\shared\Nmqtt.dll.mdb</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Externals\nmqtt\System.Reactive.Core.dll">
-      <Link>lib\shared\System.Reactive.Core.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Externals\nmqtt\System.Reactive.Interfaces.dll">
-      <Link>lib\shared\System.Reactive.Interfaces.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Externals\nmqtt\System.Reactive.Linq.dll">
-      <Link>lib\shared\System.Reactive.Linq.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="..\..\Externals\nmqtt\System.Reactive.PlatformServices.dll">
-      <Link>lib\shared\System.Reactive.PlatformServices.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="..\..\Externals\upnp\UPnP.dll">
       <Link>lib\shared\UPnP.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -3517,6 +3493,14 @@
     <None Include="lib\mig\p1db_custom.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="..\..\Externals\M2Mqtt.Net\M2Mqtt.Net.dll">
+      <Link>lib\shared\M2Mqtt.Net.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="..\..\Externals\M2Mqtt.Net\M2Mqtt.Net.dll.mdb">
+      <Link>lib\shared\M2Mqtt.Net.dll.mdb</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="dummy.cs" />

diff --git a/BaseFiles/Common/homegenie_factory_config.zip b/BaseFiles/Common/homegenie_factory_config.zip
diff --git a/BaseFiles/Common/html/js/api/homegenie.automation.js b/BaseFiles/Common/html/js/api/homegenie.automation.js
@@ -211,16 +211,6 @@ HG.Automation.Programs.ArduinoFileList = function (pid, callback) {
     });
 };
 
-HG.Automation.Programs.PostBack = function(postbackId, program, module, property, value, callback) {
-    $.get('/' + HG.WebApp.Data.ServiceKey + '/' + program.Domain + '/' + program.Address + '/' + postbackId + '/' + module.Domain + '/' + module.Address + '/' + property + '/' + encodeURIComponent(value) + '/', function (data) {
-        if (typeof callback != 'undefined') {
-            callback(data);
-        }
-    }).fail(function () {
-        if (typeof (callback) != 'undefined') callback(null);
-    });
-};
-
 //
 // namespace : HG.Automation.Scheduling namespace
 // info      : -

diff --git a/BaseFiles/Common/html/pages/configure/groups/_groupmodules.js b/BaseFiles/Common/html/pages/configure/groups/_groupmodules.js
@@ -715,11 +715,6 @@ HG.WebApp.GroupModules.FeatureUpdate = function (context, value) {
     var property = context.parameter.Name;
     var mp = HG.WebApp.Utility.GetModulePropertyByName(module, property);
     HG.WebApp.Utility.SetModulePropertyByName(module, property, value);
-    // postback value change to the automation program
-    HG.Automation.Programs.PostBack('ui/feature', program, module, property, value, function(res){
-        // TODO: think about how the response could be used (eg. field value validation and such)
-    });
-    //property.Changed = true;
 };
 
 HG.WebApp.GroupModules.ShowModuleOptions = function (domain, address) {

diff --git a/BaseFiles/Common/html/pages/events/_events.js b/BaseFiles/Common/html/pages/events/_events.js
@@ -250,7 +250,7 @@ HG.WebApp.Events.SendEventToUi = function (module, eventLog) {
                     text: '',
                     timestamp: date
                 };
-            } else if (eventLog.Property != 'Program.UiRefresh') {
+            } else if (!HG.WebApp.Events.IsBlacklisted(eventLog.Property)) {
                 //var name = module.Domain.substring(module.Domain.indexOf('.') + 1) + ' ' + module.Address;
                 //if (module.Name != '') name = module.Name;
                 popupdata = {
@@ -278,7 +278,7 @@ HG.WebApp.Events.SendEventToUi = function (module, eventLog) {
             // continue to default processing
 
         default:
-            if (module != null && eventLog.Property != 'Meter.Watts') {
+            if (module != null && !HG.WebApp.Events.IsBlacklisted(eventLog.Property)) {
 
                 var iconImage = HG.Ui.GetModuleIcon(module, null);
                 if ((module.Address == 'RF' || module.Address == 'IR') && eventLog.Value != '') {
@@ -360,14 +360,22 @@ HG.WebApp.Events.SendEventToUi = function (module, eventLog) {
             break;
     }
 
-    if (popupdata != null && !HG.WebApp.Events.PopupHasIgnore(eventLog.Domain, eventLog.Source, eventLog.Property) && eventLog.Description.indexOf(':nopopup:') < 0) {
+    if (popupdata != null 
+            && !HG.WebApp.Events.PopupHasIgnore(eventLog.Domain, eventLog.Source, eventLog.Property) && eventLog.Description.indexOf(':nopopup:') < 0
+            && !HG.WebApp.Events.IsBlacklisted(eventLog.Property)) {
 
         HG.WebApp.Events.ShowEventPopup(popupdata, eventLog);
 
     }
 
 };
 
+HG.WebApp.Events.IsBlacklisted = function(property) {
+    if (property == 'Meter.Watts' || property.startsWith('ConfigureOptions.') || property == 'Program.UiRefresh')
+        return true;
+    return false;
+};
+
 HG.WebApp.Events.PopupRefreshIgnore = function () {
     var ignoreList = dataStore.get('UI.EventPopupIgnore');
     if (ignoreList == null) return;