updated CM19Lib; integrated CM19Lib (as X10) namespace into automatio…

…n programs; added 'Title' and 'Description' properties to ProgramHelper; fix dynamic module creation not working (UI);
genielabs · Dec 23, 2018 · 1e2d086 · 1e2d086
1 parent 0673147
commit 1e2d086
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 12 deletions.
diff --git a/BaseFiles/Common/html/js/app/homegenie.webapp.utility.js b/BaseFiles/Common/html/js/app/homegenie.webapp.utility.js
@@ -135,8 +135,9 @@ HG.WebApp.Utility = HG.WebApp.Utility || new function(){ var $$ = this;
     {
         var module = null;
         for (var m = 0; m < HG.WebApp.Data.Modules.length; m++) {
-            if (HG.WebApp.Data.Modules[m].Domain == domain && HG.WebApp.Data.Modules[m].Address == address) {
-                module = HG.WebApp.Data.Modules[m];
+            var cm = HG.WebApp.Data.Modules[m];
+            if (cm != null && cm.Domain == domain && cm.Address == address) {
+                module = cm;
                 break;
             }
         }
@@ -147,7 +148,8 @@ HG.WebApp.Utility = HG.WebApp.Utility || new function(){ var $$ = this;
     {
         var moduleidx = -1;
         for (var m = 0; m < HG.WebApp.Data.Modules.length; m++) {
-            if (HG.WebApp.Data.Modules[m].Domain == domain && HG.WebApp.Data.Modules[m].Address == address) {
+            var cm = HG.WebApp.Data.Modules[m];
+            if (cm != null && cm.Domain == domain && cm.Address == address) {
                 moduleidx = m;
                 break;
             }
@@ -324,4 +326,4 @@ HG.WebApp.Utility = HG.WebApp.Utility || new function(){ var $$ = this;
     $$.SwitchPopup = HG.Ui.SwitchPopup;
     $$.JScrollToElement = HG.Ui.ScrollTo;
 
-};
+};
diff --git a/BaseFiles/Common/html/pages/events/_events.js b/BaseFiles/Common/html/pages/events/_events.js
@@ -87,9 +87,22 @@
                 if (module != null) {
                     HG.WebApp.Utility.SetModulePropertyByName(module, event.Property, event.Value, event.Timestamp);
                     HG.WebApp.Control.RefreshGroupIndicators();
+                    $$.SendEventToUi(module, event);
+                } else {
+                    console.log("Adding module:", event.Domain, event.Source, "...");
+                    HG.Configure.Modules.Get(event.Domain, event.Source, function (data) {
+                        try {
+                            module = eval('[' + data + ']')[0];
+                            if (module != null) {
+                                HG.WebApp.Data.Modules.push(module);
+                                $$.SendEventToUi(module, event);
+                                console.log("...done.");
+                            }
+                        } catch (e) {
+                            console.log("...error!", e);
+                        }
+                    });
                 }
-                // send message to UI for updating UI elements related to this event (widgets, popup and such)
-                $$.SendEventToUi(module, event);
             }
             //
             if (event.Domain == 'MIGService.Interfaces') {
@@ -456,4 +469,4 @@
     };
 
 };
-HG.Ui.CreatePage(HG.WebApp.Events, 'page_events');
+HG.Ui.CreatePage(HG.WebApp.Events, 'page_events');
diff --git a/HomeGenie/Automation/Engines/CSharpAppFactory.cs b/HomeGenie/Automation/Engines/CSharpAppFactory.cs
@@ -59,6 +59,8 @@ public static int ProgramCodeOffset
             "HomeGenie.Automation",
             "HomeGenie.Data",
             "MIG",
+            "CM19Lib",
+            "X10 = CM19Lib.X10",
             "Innovative.Geometry",
             "Innovative.SolarCalculator",
             "Raspberry",
@@ -222,6 +224,7 @@ private MethodRunResult Setup()
 
             compilerParams.ReferencedAssemblies.Add("HomeGenie.exe");
             compilerParams.ReferencedAssemblies.Add("MIG.dll");
+            compilerParams.ReferencedAssemblies.Add(Path.Combine("lib", "mig", "CM19Lib.dll"));
             compilerParams.ReferencedAssemblies.Add("NLog.dll");
             compilerParams.ReferencedAssemblies.Add("Newtonsoft.Json.dll");
 

diff --git a/HomeGenie/Automation/Scripting/ProgramHelperBase.cs b/HomeGenie/Automation/Scripting/ProgramHelperBase.cs
@@ -19,6 +19,16 @@ public ProgramHelperBase(HomeGenieService hg)
             homegenie = hg;
         }
 
+        /// <summary>
+        /// Program title field (runtime variable)
+        /// </summary>
+        public string Title;
+
+        /// <summary>
+        /// Program description field (runtime variable)
+        /// </summary>
+        public string Description;
+
         /// <summary>
         /// Gets the logger object.
         /// </summary>

diff --git a/HomeGenie/HomeGenie.csproj b/HomeGenie/HomeGenie.csproj
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CM19Lib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>packages\CM19Lib.1.0.4\lib\CM19Lib.dll</HintPath>
+      <HintPath>packages\CM19Lib.1.1.2\lib\CM19Lib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CommonMark, Version=0.1.0.0, Culture=neutral, PublicKeyToken=001ef8810438905d">
@@ -126,8 +126,8 @@
       <HintPath>packages\MIG.1.0.8\lib\MIG.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MIG.HomeAutomation, Version=1.0.6927.31715, Culture=neutral, PublicKeyToken=null">
-      <HintPath>packages\MIG.HomeAutomation.1.0.8\lib\MIG.HomeAutomation.dll</HintPath>
+    <Reference Include="MIG.HomeAutomation, Version=1.0.6931.37409, Culture=neutral, PublicKeyToken=null">
+      <HintPath>packages\MIG.HomeAutomation.1.0.9\lib\MIG.HomeAutomation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="MIG.Protocols, Version=1.0.6841.32282, Culture=neutral, PublicKeyToken=null">

diff --git a/HomeGenie/packages.config b/HomeGenie/packages.config
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CM19Lib" version="1.0.4" targetFramework="net45" />
+  <package id="CM19Lib" version="1.1.2" targetFramework="net45" />
   <package id="CommonMark.NET" version="0.15.1" targetFramework="net45" />
   <package id="DynamicLanguageRuntime" version="1.2.2" targetFramework="net45" />
   <package id="IronPython" version="2.7.9" targetFramework="net45" />
   <package id="Jint" version="2.11.58" targetFramework="net45" />
   <package id="LibUsbDotNet" version="2.2.8" targetFramework="net45" />
   <package id="M2Mqtt" version="4.3.0.0" targetFramework="net45" />
   <package id="MIG" version="1.0.8" targetFramework="net45" />
-  <package id="MIG.HomeAutomation" version="1.0.8" targetFramework="net45" />
+  <package id="MIG.HomeAutomation" version="1.0.9" targetFramework="net45" />
   <package id="MIG.Protocols" version="1.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
   <package id="NLog" version="4.5.10" targetFramework="net45" />