[NF] v1.3.6.0 Better levelcheck and Alarmsensor added

Zway/Devices/CommandClasses/AlarmSensor.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text.RegularExpressions;
+using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
+using BlubbFish.IoT.Zway.Events;
+using BlubbFish.IoT.Zway.Interfaces;
+using BlubbFish.IoT.Zway.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
+  /// <summary>
+  /// 50 = Meter
+  /// </summary>
+  public class Alarmsensor : ACommandClass {
+    public override event UpdatedValue Update;
+
+    public Alarmsensor(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
+      this.HasSub = true;
+      this.InitComplex(json);
+      foreach (KeyValuePair<Int32, ACommandClass> item in this.Sub) {
+        item.Value.Update += this.DeviceUpdate;
+      }
+    }
+
+    private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
+      this.Update?.Invoke(this, e);
+    }
+
+    internal override void SetUpdate(JsonData json, Match match) {
+      if (match.Groups[4].Value.StartsWith(".data.")) {
+        Int32 subid = Int32.Parse(match.Groups[5].Value);
+        if (this.Sub.ContainsKey(subid)) {
+          this.Sub[subid].SetUpdate(json, match);
+        }
+      } else {
+        Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
+      }
+    }
+
+    private void InitComplex(JsonData json) {
+      if (json.Keys.Contains("data")) {
+        JsonData data = json["data"];
+        Dictionary<Int32, ACommandClass> subs = new Dictionary<Int32, ACommandClass>();
+        foreach (String item in data.Keys) {
+          if (Int32.TryParse(item, out Int32 subid) &&
+            data[item].Keys.Contains("srcId") &&
+            data[item].Keys.Contains("sensorState") &&
+            data[item].Keys.Contains("sensorTime") &&
+            data[item].Keys.Contains("typeString")) {
+            subs.Add(subid, new Alarmsensorsub(data[item], new Tuple<Int32, Int32, Classes, Int32>(this.DeviceId, this.Instance, this.Commandclass, subid), this.http, this.Polling));
+          }
+        }
+        this.Sub = new ReadOnlyDictionary<Int32, ACommandClass>(subs);
+      }
+    }
+
+    internal override void Poll() => this.PollSubGlobal();
+
+    public override Dictionary<String, Object> ToDictionary() => this.ToDictionarySub();
+  }
+}

Zway/Devices/CommandClasses/CommandClassSubs/Alarmsensorsub.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using BlubbFish.IoT.Zway.Events;
+using BlubbFish.IoT.Zway.Interfaces;
+using BlubbFish.IoT.Zway.lib;
+using LitJson;
+
+namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
+  public class Alarmsensorsub : ACommandClass {
+    public override event UpdatedValue Update;
+
+    public Int32 Source { get; private set; }
+    public Int32 Level { get; private set; }
+    public Int32 Time { get; private set; }
+    public String Type { get; private set; }
+
+    public Alarmsensorsub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
+      this.IsSub = true;
+      InitComplex(json);
+    }
+
+    private void InitComplex(JsonData json) {
+      if (json.Keys.Contains("srcId") && json["srcId"].Keys.Contains("value") &&
+        json.Keys.Contains("sensorState") && json["sensorState"].Keys.Contains("value") &&
+        json.Keys.Contains("sensorTime") && json["sensorTime"].Keys.Contains("value") &&
+        json.Keys.Contains("typeString") && json["typeString"].Keys.Contains("value")) {
+        this.Source = Int32.Parse(json["srcId"]["value"].ToString());
+        this.Level = Int32.Parse(json["sensorState"]["value"].ToString());
+        this.Time = Int32.Parse(json["sensorTime"]["value"].ToString());
+        this.Type = json["typeString"]["value"].ToString();
+      }
+    }
+
+    internal override void SetUpdate(JsonData json, Match match) {
+      if (json.Keys.Contains("srcId") && json["srcId"].Keys.Contains("value") &&
+        json.Keys.Contains("sensorState") && json["sensorState"].Keys.Contains("value") &&
+        json.Keys.Contains("sensorTime") && json["sensorTime"].Keys.Contains("value") &&
+        json.Keys.Contains("typeString") && json["typeString"].Keys.Contains("value") && 
+        this.CheckSetUpdateTime(json)) {
+        this.Source = Int32.Parse(json["srcId"]["value"].ToString());
+        this.Level = Int32.Parse(json["sensorState"]["value"].ToString());
+        this.Time = Int32.Parse(json["sensorTime"]["value"].ToString());
+        this.Type = json["typeString"]["value"].ToString();
+        this.Update?.Invoke(this, new DeviceUpdateEvent(new Tuple<Int32, Int32, Int32, String>(this.Source, this.Level, this.Time, this.Type), this.LastUpdate, this));
+      }
+    }
+
+    public override String ToString() {
+      return "AlarmSensor " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.Source + " " + this.Level + " " + this.Time + " " + this.Type;
+    }
+
+    internal override void Poll() => this.PollNone();
+
+    public override Dictionary<String, Object> ToDictionary() {
+      return new Dictionary<String, Object> {
+        { "Source", this.Source },
+        { "Level", this.Level },
+        { "Time", this.Time },
+        { "Type", this.Type }
+      };
+    }
+  }
+}

Zway/Devices/CommandClasses/CommandClassSubs/SensorBinarySub.cs

@@ -11,7 +11,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
     public override event UpdatedValue Update;
 
     public String Type { get; private set; }
-    public Boolean Level { get; private set; }
+    public Boolean State { get; private set; }
+    public Int32 Level {
+      get {
+        return (this.State) ? 1 : 0;
+      }
+    }
+
     public Sensorbinarysub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
       this.IsSub = true;
       InitComplex(json);
@@ -23,7 +29,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
         json.Keys.Contains("level") &&
         json["level"].Keys.Contains("value")) {
         this.Type = json["sensorTypeString"]["value"].ToString();
-        this.Level = (Boolean)json["level"]["value"];
+        this.State = (Boolean)json["level"]["value"];
       }
     }
 
@@ -31,22 +37,23 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
       if (json.Keys.Contains("level") && json["level"].Keys.Contains("value") &&
           json.Keys.Contains("sensorTypeString") && json["sensorTypeString"].Keys.Contains("value") &&
           this.CheckSetUpdateTime(json)) {
-        this.Level = (Boolean)json["level"]["value"];
+        this.State = (Boolean)json["level"]["value"];
         this.Type = json["sensorTypeString"]["value"].ToString();
-        this.Update?.Invoke(this, new DeviceUpdateEvent(new Tuple<String, Boolean>(this.Type, this.Level), this.LastUpdate, this));
+        this.Update?.Invoke(this, new DeviceUpdateEvent(new Tuple<String, Boolean>(this.Type, this.State), this.LastUpdate, this));
       }
     }
 
     public override String ToString() {
-      return "SensorBinary " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.Level.ToString();
+      return "SensorBinary " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.State.ToString();
     }
 
     internal override void Poll() => this.PollNone();
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "Level", this.Level },
-        { "Type", this.Type }
+        { "State", this.State },
+        { "Type", this.Type },
+        { "Level", this.Level }
       };
     }
   }

Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs

@@ -33,6 +33,15 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
     }
 
     internal override void SetUpdate(JsonData json, Match match) {
+      if(json.Keys.Contains("val") && json["val"].Keys.Contains("value") && json.Keys.Contains("sensorTypeString") && json["sensorTypeString"].Keys.Contains("value")) {
+        String t = json["sensorTypeString"]["value"].ToString();
+        Double l = Double.Parse(json["val"]["value"].ToString());
+        if (t == "Power" && (l > 3660 || l < 0) ||
+          t == "Temperature" && (l > 65 || l < -25) ||
+          (t == "Temperature" && this.Level >= 4 && l == 0)) {
+          return;
+        }
+      }
       if(json.Keys.Contains("val") && json["val"].Keys.Contains("value") &&
           json.Keys.Contains("sensorTypeString") && json["sensorTypeString"].Keys.Contains("value") &&
           json.Keys.Contains("scaleString") && json["scaleString"].Keys.Contains("value") && 

Zway/Devices/CommandClasses/Indicator.cs

@@ -11,33 +11,42 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
   /// 135 = Indicator
   /// </summary>
   class Indicator : ACommandClass {
-    private Boolean _level;
+    private Boolean _state;
 
     public override event UpdatedValue Update;
-    public Boolean Level {
+    public Boolean State {
       get {
-        return this._level;
+        return this._state;
       }
       set {
         this.SetInt(value ? 255 : 0);
       }
     }
 
+    public Int32 Level {
+      get {
+        return (this.State) ? 1 : 0;
+      }
+      set {
+        this.State = (value == 1);
+      }
+    }
+
     public Indicator(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
       this.InitComplex(json);
     }
 
     private void InitComplex(JsonData json) {
       if (json.Keys.Contains("data") && json["data"].Keys.Contains("stat") && json["data"]["stat"].Keys.Contains("value")) {
-        this._level = Int32.Parse(json["data"]["stat"]["value"].ToString()) == 255;
+        this._state = Int32.Parse(json["data"]["stat"]["value"].ToString()) == 255;
       }
     }
 
     internal override void SetUpdate(JsonData json, Match match) {
       if(match.Groups[4].Value == ".data.stat") {
         if (json.Keys.Contains("value") && this.CheckSetUpdateTime(json)) {
-          this._level = Int32.Parse(json["value"].ToString()) == 255;
-          this.Update?.Invoke(this, new DeviceUpdateEvent(this.Level, this.LastUpdate, this));
+          this._state = Int32.Parse(json["value"].ToString()) == 255;
+          this.Update?.Invoke(this, new DeviceUpdateEvent(this.State, this.LastUpdate, this));
         }
       } else {
         Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
@@ -45,12 +54,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
     }
 
     public override String ToString() {
-      return "Indicator " + this.Name + " [" + this.Id + "]: " + this.Level;
+      return "Indicator " + this.Name + " [" + this.Id + "]: " + this.State;
     }
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "Level", this.Level },
+        { "State", this.State },
+        { "Level", this.Level }
       };
     }
   }

Zway/Devices/CommandClasses/SwitchBinary.cs

@@ -11,13 +11,22 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
   /// 37 = SwitchBinary
   /// </summary>
   public class Switchbinary : ACommandClass {
-    private Boolean _level;
+    private Boolean _state;
 
     public override event UpdatedValue Update;
 
-    public Boolean Level {
+    public Int32 Level {
       get {
-        return this._level;
+        return (this.State) ? 1 : 0;
+      }
+      set {
+        this.State = (value == 1);
+      }
+    }
+
+    public Boolean State {
+      get {
+        return this._state;
       }
       set {
         this.SetInt(value ? 255 : 0);
@@ -31,8 +40,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
     internal override void SetUpdate(JsonData json, Match match) {
       if(match.Groups[4].Value == ".data.level") {
         if (json.Keys.Contains("value") && json["value"].IsBoolean && this.CheckSetUpdateTime(json)) {
-          this._level = (Boolean)json["value"];
-          this.Update?.Invoke(this, new DeviceUpdateEvent(this.Level, this.LastUpdate, this));
+          this._state = (Boolean)json["value"];
+          this.Update?.Invoke(this, new DeviceUpdateEvent(this.State, this.LastUpdate, this));
         }
       }  else {
         Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
@@ -41,16 +50,17 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     private void InitComplex(JsonData json) {
       if (json.Keys.Contains("data") && json["data"].Keys.Contains("level") && json["data"]["level"].Keys.Contains("value") && json["data"]["level"]["value"].IsBoolean) {
-        this._level = (Boolean)json["data"]["level"]["value"];
+        this._state = (Boolean)json["data"]["level"]["value"];
       }
     }
 
     public override String ToString() {
-      return "SwitchBinary " + this.Name + " [" + this.Id + "]: " + this.Level;
+      return "SwitchBinary " + this.Name + " [" + this.Id + "]: " + this.State;
     }
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
+        { "State", this.State },
         { "Level", this.Level }
       };
     }

Zway/Devices/CommandClasses/Wakeup.cs

@@ -34,9 +34,11 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
     }
     public Int32 WakeupMin { get; private set; }
     public Int32 WakeupMax { get; private set; }
-    public Boolean HasMinMax { get; private set; }
+    public Boolean HasMinMaxState { get; private set; }
+    public Int32 HasMinMaxLevel { get { return (this.HasMinMaxState) ? 1 : 0; } }
     public Int32 WakeupDefault { get; private set; }
-    public Boolean HasDefault { get; private set; }
+    public Boolean HasDefaultState { get; private set; }
+    public Int32 HasDefaultLevel { get { return (this.HasDefaultState) ? 1 : 0; } }
     public DateTime LastWakeup { get; private set; }
     public DateTime LastSleep { get; private set; }
 
@@ -53,19 +55,19 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
         if (data.Keys.Contains("nodeId") && data["nodeId"].Keys.Contains("value")) {
           this._againstNode = Int32.Parse(data["nodeId"]["value"].ToString());
         }
-        this.HasMinMax = false;
+        this.HasMinMaxState = false;
         if (data.Keys.Contains("min") && data["min"].Keys.Contains("value") && data["min"]["value"] != null) {
           this.WakeupMin = Int32.Parse(data["min"]["value"].ToString());
-          this.HasMinMax = true;
+          this.HasMinMaxState = true;
         }
         if (data.Keys.Contains("max") && data["max"].Keys.Contains("value") && data["max"]["value"] != null) {
           this.WakeupMax = Int32.Parse(data["max"]["value"].ToString());
-          this.HasMinMax = true;
+          this.HasMinMaxState = true;
         }
-        this.HasDefault = false;
+        this.HasDefaultState = false;
         if (data.Keys.Contains("default") && data["default"].Keys.Contains("value") && data["default"]["value"] != null) {
           this.WakeupDefault = Int32.Parse(data["default"]["value"].ToString());
-          this.HasDefault = true;
+          this.HasDefaultState = true;
         }
         if (data.Keys.Contains("lastWakeup") && data["lastWakeup"].Keys.Contains("value") && data["lastWakeup"]["value"] != null) {
           this.LastWakeup = DateTimeOffset.FromUnixTimeSeconds(Int64.Parse(data["lastWakeup"]["value"].ToString())).DateTime.ToLocalTime();
@@ -97,22 +99,22 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
           this._againstNode = Int32.Parse(json["nodeId"]["value"].ToString());
           success = true;
         }
-        this.HasMinMax = false;
+        this.HasMinMaxState = false;
         if (json.Keys.Contains("min") && json["min"].Keys.Contains("value") && json["min"]["value"] != null) {
           this.WakeupMin = Int32.Parse(json["min"]["value"].ToString());
           success = true;
-          this.HasMinMax = true;
+          this.HasMinMaxState = true;
         }
         if (json.Keys.Contains("max") && json["max"].Keys.Contains("value") && json["max"]["value"] != null) {
           this.WakeupMax = Int32.Parse(json["max"]["value"].ToString());
           success = true;
-          this.HasMinMax = true;
+          this.HasMinMaxState = true;
         }
-        this.HasDefault = false;
+        this.HasDefaultState = false;
         if (json.Keys.Contains("default") && json["default"].Keys.Contains("value") && json["default"]["value"] != null) {
           this.WakeupDefault = Int32.Parse(json["default"]["value"].ToString());
           success = true;
-          this.HasDefault = true;
+          this.HasDefaultState = true;
         }
         if (json.Keys.Contains("lastWakeup") && json["lastWakeup"].Keys.Contains("value") && json["lastWakeup"]["value"] != null) {
           this.LastWakeup = DateTimeOffset.FromUnixTimeSeconds(Int64.Parse(json["lastWakeup"]["value"].ToString())).DateTime.ToLocalTime();
@@ -140,9 +142,11 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
         { "AgainstNode", this.AgainstNode },
         { "WakeupMin", this.WakeupMin },
         { "WakeupMax", this.WakeupMax },
-        { "HasMinMax", this.HasMinMax },
+        { "HasMinMaxState", this.HasMinMaxState },
+        { "HasMinMaxLevel", this.HasMinMaxLevel },
         { "WakeupDefault", this.WakeupDefault },
-        { "HasDefault", this.HasDefault },
+        { "HasDefaultState", this.HasDefaultState },
+        { "HasDefaultLevel", this.HasDefaultLevel },
         { "LastWakeup", this.LastWakeup.ToString() },
         { "LastSleep", this.LastSleep.ToString() }
       };

Zway/Interfaces/ACommandClass.cs

@@ -36,8 +36,7 @@ namespace BlubbFish.IoT.Zway.Interfaces {
       Proprietary = 136,
       MultiChannelAssociation = 142,
       MultiCmd = 143,
-      Security = 152,
-      AlarmSensor = 156 //
+      Security = 152
     }
 
     public enum Classes : Int32 {
@@ -54,7 +53,8 @@ namespace BlubbFish.IoT.Zway.Interfaces {
       Alarm = 113,
       Battery = 128,
       Wakeup = 132,
-      Indicator = 135
+      Indicator = 135,
+      AlarmSensor = 156
     }
 
     public Int32 DeviceId { get; }

Zway/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Zway")]
-[assembly: AssemblyCopyright("Copyright ©  2017 - 22.12.2017")]
+[assembly: AssemblyCopyright("Copyright ©  2017 - 01.01.2018")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.5.0")]
-[assembly: AssemblyFileVersion("1.3.5.0")]
+[assembly: AssemblyVersion("1.3.6.0")]
+[assembly: AssemblyFileVersion("1.3.6.0")]

Zway/Zway.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BlubbFish.IoT.Zway</RootNamespace>
     <AssemblyName>Zway</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,7 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="LitJson, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\IoT-Bot\packages\LitJson.0.9.0\lib\LitJson.dll</HintPath>
+      <HintPath>..\packages\LitJson.0.9.0\lib\LitJson.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -46,11 +47,13 @@
     <Compile Include="Devices\CommandClasses\Alarm.cs" />
     <Compile Include="Devices\CommandClasses\Battery.cs" />
     <Compile Include="Devices\CommandClasses\CommandClassSubs\Configurationsub.cs" />
+    <Compile Include="Devices\CommandClasses\CommandClassSubs\Alarmsensorsub.cs" />
     <Compile Include="Devices\CommandClasses\CommandClassSubs\SceneControllerConfSub.cs" />
     <Compile Include="Devices\CommandClasses\CommandClassSubs\SensorBinarySub.cs" />
     <Compile Include="Devices\CommandClasses\CommandClassSubs\ThermostatSetPointSub.cs" />
     <Compile Include="Devices\CommandClasses\Configuration.cs" />
     <Compile Include="Devices\CommandClasses\Indicator.cs" />
+    <Compile Include="Devices\CommandClasses\AlarmSensor.cs" />
     <Compile Include="Devices\CommandClasses\Meter.cs" />
     <Compile Include="Devices\CommandClasses\CommandClassSubs\MeterSub.cs" />
     <Compile Include="Devices\CommandClasses\CommandClassSubs\SensorMultilevelSub.cs" />
@@ -76,6 +79,5 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Zway/ZwayController.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
-using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading;
 using BlubbFish.IoT.Zway.Devices;

Zway/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LitJson" version="0.9.0" targetFramework="net461" />
+  <package id="LitJson" version="0.9.0" targetFramework="net471" />
 </packages>