updated ZWaveLib; changed pepper1db archive location to local HomeGenie gh-pages site

Author: genemars

MIG.HomeAutomation/MIG.HomeAutomation.csproj

@@ -31,10 +31,6 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="LibUsbDotNet">
@@ -44,9 +40,6 @@
     <Reference Include="NLog">
       <HintPath>..\packages\NLog.4.1.0\lib\net45\NLog.dll</HintPath>
     </Reference>
-    <Reference Include="SerialPortLib">
-      <HintPath>..\packages\SerialPortLib.1.0.11\lib\SerialPortLib.dll</HintPath>
-    </Reference>
     <Reference Include="XTenLib">
       <HintPath>..\packages\XTenLib.1.0.7\lib\XTenLib.dll</HintPath>
     </Reference>
@@ -55,8 +48,14 @@
       <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="System.Net" />
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="SerialPortLib">
+      <HintPath>..\packages\SerialPortLib.1.0.12\lib\SerialPortLib.dll</HintPath>
+    </Reference>
     <Reference Include="ZWaveLib">
-      <HintPath>..\packages\ZWaveLib.1.0.12\lib\ZWaveLib.dll</HintPath>
+      <HintPath>..\packages\ZWaveLib.1.0.15\lib\ZWaveLib.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

MIG.HomeAutomation/ModuleEvents.cs

@@ -62,6 +62,12 @@ public static class ModuleEvents
             "Sensor.Luminance";
         public static string Sensor_Humidity =
             "Sensor.Humidity";
+        public static string Sensor_WaterFlow =
+            "Sensor.WaterFlow";
+        public static string Sensor_WaterPressure =
+            "Sensor.WaterPressure";
+        public static string Sensor_Ultraviolet =
+            "Sensor.Ultraviolet";
         public static string Sensor_DoorWindow =
             "Sensor.DoorWindow";
         public static string Sensor_Key =

MIG.HomeAutomation/ZWave.cs

@@ -46,6 +46,8 @@ You should have received a copy of the GNU General Public License
 using System.Xml.XPath;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using System.Security.Cryptography.X509Certificates;
+using System.Net.Security;
 
 namespace MIG.Interfaces.HomeAutomation
 {
@@ -976,6 +978,15 @@ private void Controller_NodeUpdated(object sender, NodeUpdatedEventArgs args)
                 case EventParameter.SensorMotion:
                     eventPath = ModuleEvents.Sensor_MotionDetect;
                     break;
+                case EventParameter.WaterFlow:
+                    eventPath = ModuleEvents.Sensor_WaterFlow;
+                    break;
+                case EventParameter.WaterPressure:
+                    eventPath = ModuleEvents.Sensor_WaterPressure;
+                    break;
+                case EventParameter.Ultraviolet:
+                    eventPath = ModuleEvents.Sensor_Ultraviolet;
+                    break;
                 case EventParameter.AlarmGeneric:
                     eventPath = ModuleEvents.Sensor_Alarm;
                     // Translate generic alarm into specific Door Lock event values if node is an entry control type device
@@ -1235,7 +1246,7 @@ public class Pepper1Db
         private const string additionalDbFilename = "p1db_custom.xml";
         private const string archiveFilename = "archive.zip";
         private const string tempFolder = "temp";
-        private const string defaultPepper1Url = "http://pepper1.net/zwavedb/device/export/device_archive.zip";
+        private const string defaultPepper1Url = "https://genielabs.github.io/HomeGenie/_hg_files/zwave/pepper1_device_archive.zip";
 
         public bool DbExists
         {

MIG.HomeAutomation/packages.config

@@ -3,8 +3,8 @@
   <package id="LibUsbDotNet" version="2.2.8" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
   <package id="NLog" version="4.1.0" targetFramework="net45" />
-  <package id="SerialPortLib" version="1.0.11" targetFramework="net45" />
+  <package id="SerialPortLib" version="1.0.12" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
   <package id="XTenLib" version="1.0.7" targetFramework="net45" />
-  <package id="ZWaveLib" version="1.0.12" targetFramework="net45" />
+  <package id="ZWaveLib" version="1.0.15" targetFramework="net45" />
 </packages>

packages/repositories.config

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <repositories>
-  <repository path="../MIG.Controllers/packages.config" />
   <repository path="../MIG.HomeAutomation/packages.config" />
   <repository path="../MIG/packages.config" />
 </repositories>