v1.2.3

- added preliminary version of ZigBee interface (ConBee controller and ZigBee lights and switches) - update node database path
genielabs · Jan 10, 2023 · 476023e · 476023e
1 parent 786c35f
commit 476023e
Show file tree

Hide file tree

Showing 4 changed files with 532 additions and 11 deletions.
diff --git a/MIG.HomeAutomation/MIG.HomeAutomation.csproj b/MIG.HomeAutomation/MIG.HomeAutomation.csproj
@@ -19,9 +19,13 @@
 
   <ItemGroup>
     <PackageReference Include="CM19Lib" Version="1.2.1" />
-    <PackageReference Include="MIG" Version="1.2.3" />
+    <PackageReference Include="MIG" Version="1.2.7" />
     <PackageReference Include="SharpZipLib" Version="1.4.1" />
     <PackageReference Include="XTenLib" Version="1.1.1" />
+    <PackageReference Include="ZigBeeNet" Version="1.5.0" />
+    <PackageReference Include="ZigBeeNet.DataStore.Json" Version="1.5.0" />
+    <PackageReference Include="ZigbeeNet.Hardware.ConBee" Version="1.5.0" />
+    <PackageReference Include="ZigBeeNet.Transport.SerialPort" Version="1.5.0" />
     <PackageReference Include="ZWaveLib" Version="1.1.1" />
   </ItemGroup>
 </Project>
diff --git a/MIG.HomeAutomation/X10.cs b/MIG.HomeAutomation/X10.cs
@@ -493,11 +493,11 @@ private void DeserializeModules(string fileName, List<InterfaceModule> list) {
 
         private static string GetDbFullPath(string file)
         {
-            string assemblyFolder = Path.GetDirectoryName(typeof(X10).Assembly.Location);
-            string path = Path.Combine(assemblyFolder, file);
-            return path;
+            string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "data", "mig", "x10");
+            Directory.CreateDirectory(path);
+            return Path.Combine(path, file);
         }
-        
+
         private InterfaceModule AddSecurityModule(ModuleTypes moduleType, string address)
         {
             InterfaceModule module = new InterfaceModule();

diff --git a/MIG.HomeAutomation/ZWave/Pepper1Db.cs b/MIG.HomeAutomation/ZWave/Pepper1Db.cs
@@ -17,9 +17,9 @@ public class Pepper1Db
     {
         private const string dbFilename = "p1db.xml";
         private const string additionalDbFilename = "p1db_custom.xml";
-        private const string archiveFilename = "archive.zip";
-        private const string tempFolder = "temp";
-        private const string defaultPepper1Url = "https://genielabs.github.io/HomeGenie/_hg_files/zwave/pepper1_device_archive.zip";
+        private const string archiveFilename = "zwave_db_archive.zip";
+        private const string tempFolder = "tmp";
+        private const string defaultPepper1Url = "https://genielabs.github.io/HomeGenie/data/zwave/pepper1_device_archive.zip";
 
         public bool DbExists
         {
@@ -138,9 +138,9 @@ private List<XElement> GetDeviceInfoInDb(string filename, string manufacturerId,
 
         private static string GetDbFullPath(string file)
         {
-            string assemblyFolder = Path.GetDirectoryName(typeof(Pepper1Db).Assembly.Location);
-            string path = Path.Combine(assemblyFolder, file);
-            return path;
+            string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "data", "mig", "zwave");
+            Directory.CreateDirectory(path);
+            return Path.Combine(path, file);
         }
 
         private static void ExtractZipFile(string archiveFilenameIn, string password, string outFolder)