- Fix GPIO pin program module naming

- Fix notification dialog error if program uninstalled - Updated UI
genielabs · Jan 5, 2023 · d7a0348 · d7a0348
1 parent 5962e75
commit d7a0348
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/assets/build/all/app/index.html b/assets/build/all/app/index.html
@@ -52,6 +52,6 @@
 
   </div>
 
-<script src="runtime.b92e2ca178ebbf4a.js" type="module"></script><script src="polyfills.710b144f4805f4b0.js" type="module"></script><script src="main.2190347d578b0732.js" type="module"></script>
+<script src="runtime.b92e2ca178ebbf4a.js" type="module"></script><script src="polyfills.710b144f4805f4b0.js" type="module"></script><script src="main.b7f63b7bfc5d1f69.js" type="module"></script>
 
 </body></html>
diff --git a/...ts/build/all/app/main.2190347d578b0732.js → ...ts/build/all/app/main.b7f63b7bfc5d1f69.js b/...ts/build/all/app/main.2190347d578b0732.js → ...ts/build/all/app/main.b7f63b7bfc5d1f69.js
diff --git a/assets/build/all/app/ngsw.json b/assets/build/all/app/ngsw.json
@@ -1,6 +1,6 @@
 {
   "configVersion": 1,
-  "timestamp": 1672875362094,
+  "timestamp": 1672923066300,
   "index": "/app/index.html",
   "assetGroups": [
     {
@@ -15,7 +15,7 @@
         "/app/613.16b9c52c0ae74833.js",
         "/app/859.0f150be9c99a6b5a.js",
         "/app/index.html",
-        "/app/main.2190347d578b0732.js",
+        "/app/main.b7f63b7bfc5d1f69.js",
         "/app/manifest.webmanifest",
         "/app/polyfills.710b144f4805f4b0.js",
         "/app/runtime.b92e2ca178ebbf4a.js",
@@ -630,8 +630,8 @@
     "/app/assets/widgets/weather/images_alt/weather.svg": "73ab65b876b20b345dd8f397550fcf9226cad7c1",
     "/app/assets/widgets/weather/style.css": "1b70730e73885cc0ee83566eaf584008d34e2255",
     "/app/assets/workers/typings-worker.js": "be92b854a22224e5f740eafedea86523affc1ff2",
-    "/app/index.html": "8c13f375ad99aee4a6609c9bb99ee147638aa945",
-    "/app/main.2190347d578b0732.js": "ecac267e18b5552619e8b0dff73c1644dd2405c5",
+    "/app/index.html": "66f738c2c1f693ca094ca11661e50472f06cb499",
+    "/app/main.b7f63b7bfc5d1f69.js": "95cd2eb88359089bc801f45abbc0e5eeefc74973",
     "/app/manifest.webmanifest": "d47bb07a495e27ddf072f8702df373f79b4eb183",
     "/app/polyfills.710b144f4805f4b0.js": "594a5ea1b9d3f9cbc4f363eca84eda2c8bb8a901",
     "/app/runtime.b92e2ca178ebbf4a.js": "b50d841a4c50d466c34aab3267d3fb4afe87dede",

diff --git a/assets/build/all/data/packages/homegenie/homegenie-iot-net/package.json b/assets/build/all/data/packages/homegenie/homegenie-iot-net/package.json
@@ -1 +1 @@
-{"repository":"homegenie","id":"homegenie-iot-net","version":"1.0.0","description":"GPIO, SPI, I2C examples based on .NET IoT libraries.\n\nhttps://learn.microsoft.com/en-us/dotnet/iot/intro","programs":[{"repository":"homegenie","packageId":"homegenie-iot-net","packageVersion":"1.0.0","hid":"700","id":"gpio-pin","required":false,"version":"1.0.0","checksum":"6F5D22E597CF667BD80769C4BB671D0F","installed":false}],"modules":null,"groups":[],"schedules":[]}
+{"repository":"homegenie","id":"homegenie-iot-net","version":"1.0.0","description":"GPIO, SPI, I2C examples based on .NET IoT libraries.\n\nhttps://learn.microsoft.com/en-us/dotnet/iot/intro","programs":[{"repository":"homegenie","packageId":"homegenie-iot-net","packageVersion":"1.0.0","hid":"700","id":"gpio-pin","required":false,"version":"1.0.0","checksum":"795FF6FB11DE1010D18E755A4EF50A95","installed":false}],"modules":null,"groups":[],"schedules":[]}
diff --git a/assets/build/all/data/packages/homegenie/homegenie-iot-net/programs.xml b/assets/build/all/data/packages/homegenie/homegenie-iot-net/programs.xml
@@ -12,7 +12,7 @@ var gpio_pins = new string[]{
 	"GPIO27 (pin 13)=27",
 	"GPIO22 (pin 15)=22",
 
-	"GPIO4 (pin 7)=7",
+	"GPIO4 (pin 7)=4",
 	"GPIO5 (pin 29)=5",
 	"GPIO6 (pin 31)=6",
 	"GPIO13 (pin 33)=13",
@@ -149,7 +149,7 @@ Program.GoBackground();
       <Id>gpio-pin</Id>
       <Version>1.0.0</Version>
       <Required>false</Required>
-      <Checksum>6F5D22E597CF667BD80769C4BB671D0F</Checksum>
+      <Checksum>795FF6FB11DE1010D18E755A4EF50A95</Checksum>
     </PackageInfo>
     <Domain>HomeAutomation.HomeGenie.Automation</Domain>
     <Address>700</Address>

diff --git a/assets/build/all/data/packages/homegenie/homegenie-iot-sharp/package.json b/assets/build/all/data/packages/homegenie/homegenie-iot-sharp/package.json
@@ -1 +1 @@
-{"repository":"homegenie","id":"homegenie-iot-sharp","version":"1.0.0","description":"","programs":[{"repository":"homegenie","packageId":"homegenie-iot-sharp","packageVersion":"1.0.0","hid":"601","id":"dht-11-sensor","required":false,"version":"1.0.0","checksum":"3234723AF61E1E52FD1B134162E88093","installed":false},{"repository":"homegenie","packageId":"homegenie-iot-sharp","packageVersion":"1.0.0","hid":"602","id":"dht-22-sensor","required":false,"version":"1.0.0","checksum":"32EC4F6125839F3530864EB9A1D66F0E","installed":false},{"repository":"homegenie","packageId":"homegenie-iot-sharp","packageVersion":"1.0.0","hid":"600","id":"gpio-pin","required":false,"version":"1.0.0","checksum":"8C68A50941978859D4133B34B168CA7B","installed":false},{"repository":"homegenie","packageId":"homegenie-iot-sharp","packageVersion":"1.0.0","hid":"603","id":"grove-chainable-rgb-led","required":false,"version":"1.0.0","checksum":"68682FAA31D4BE1B5A6BD92C8117D644","installed":false}],"modules":null,"groups":[],"schedules":[]}
+{"repository":"homegenie","id":"homegenie-iot-sharp","version":"1.0.0","description":"","programs":[{"repository":"homegenie","packageId":"homegenie-iot-sharp","packageVersion":"1.0.0","hid":"601","id":"dht-11-sensor","required":false,"version":"1.0.0","checksum":"3234723AF61E1E52FD1B134162E88093","installed":false},{"repository":"homegenie","packageId":"homegenie-iot-sharp","packageVersion":"1.0.0","hid":"602","id":"dht-22-sensor","required":false,"version":"1.0.0","checksum":"32EC4F6125839F3530864EB9A1D66F0E","installed":false},{"repository":"homegenie","packageId":"homegenie-iot-sharp","packageVersion":"1.0.0","hid":"600","id":"gpio-pin","required":false,"version":"1.0.0","checksum":"305F46ABBF0DC22F1DC4630DC48E65DA","installed":false},{"repository":"homegenie","packageId":"homegenie-iot-sharp","packageVersion":"1.0.0","hid":"603","id":"grove-chainable-rgb-led","required":false,"version":"1.0.0","checksum":"68682FAA31D4BE1B5A6BD92C8117D644","installed":false}],"modules":null,"groups":[],"schedules":[]}
diff --git a/assets/build/all/data/packages/homegenie/homegenie-iot-sharp/programs.xml b/assets/build/all/data/packages/homegenie/homegenie-iot-sharp/programs.xml
@@ -91,7 +91,7 @@ while (Program.IsEnabled)
   Pause(pause);
 }
 </ScriptSource>
-    <ScriptErrors>[]</ScriptErrors>
+    <ScriptErrors />
     <PackageInfo>
       <Repository>homegenie</Repository>
       <PackageId>homegenie-iot-sharp</PackageId>
@@ -294,8 +294,9 @@ var cfg = new PinConfiguration[1] {
 
 // Add virtual module for this switch
 const string moduleDomain = "RaspberryPi.GPIO";
-Program.AddModule(moduleDomain, Program.Option("GPIO.Pin").Value, "Switch", "homegenie/generic/switch");
-var mod = Modules.InDomain(moduleDomain).WithAddress(pinName).Get();
+string moduleAddress = PinMapping.ToProcessor(pin).ToString().Substring(3); // get GPIO#
+Program.AddModule(moduleDomain, moduleAddress, "Switch", "homegenie/generic/switch");
+var mod = Modules.InDomain(moduleDomain).WithAddress(moduleAddress).Get();
 
 // Allocate GPIO connection
 GpioConnection connection = null;
@@ -375,15 +376,15 @@ if (pinMode == 1) { // Output
 
 Program.GoBackground();
 </ScriptSource>
-    <ScriptErrors />
+    <ScriptErrors>[]</ScriptErrors>
     <PackageInfo>
       <Repository>homegenie</Repository>
       <PackageId>homegenie-iot-sharp</PackageId>
       <PackageVersion>1.0.0</PackageVersion>
       <Id>gpio-pin</Id>
       <Version>1.0.0</Version>
       <Required>false</Required>
-      <Checksum>8C68A50941978859D4133B34B168CA7B</Checksum>
+      <Checksum>305F46ABBF0DC22F1DC4630DC48E65DA</Checksum>
     </PackageInfo>
     <Domain>HomeAutomation.HomeGenie.Automation</Domain>
     <Address>600</Address>

diff --git a/src/HomeGenie/Automation/Scripting/ProgramHelper.cs b/src/HomeGenie/Automation/Scripting/ProgramHelper.cs
@@ -367,7 +367,6 @@ public ProgramHelper AddModule(string domain, string address, string type, strin
                 }
                 Utility.ModuleParameterSet(module, Properties.WidgetDisplayModule, widget);
             }
-            homegenie.RaiseEvent(this, myProgramDomain, myProgramId.ToString(), "", Properties.ProgramEvent, $"MODULE_ADDED {domain}:{address}");
             return this;
         }
 
@@ -410,7 +409,6 @@ public ProgramHelper AddModules(
                     Utility.ModuleParameterSet(module, Properties.WidgetDisplayModule, widget);
                     homegenie.RaiseEvent(this, module.Domain, module.Address, "", Properties.WidgetDisplayModule, widget);
                 }
-                homegenie.RaiseEvent(this, myProgramDomain, myProgramId.ToString(), "", Properties.ProgramEvent, $"MODULE_ADDED {virtualModule.Domain}:{virtualModule.Address}");
             }
             return this;
         }
@@ -881,6 +879,7 @@ private VirtualModule AddProgramModule(string domain, string address, string typ
                     Value = widget
                 });
                 homegenie.VirtualModules.Add(virtualModule);
+                homegenie.RaiseEvent(this, myProgramDomain, myProgramId.ToString(), "", Properties.ProgramEvent, $"MODULE_ADDED {virtualModule.Domain}:{virtualModule.Address}");
             }
             else
             {