vs_projects/Zway
1
0
Fork 0
Code Issues Pull Requests Releases 25 Wiki Activity

[NF] Create Senml Messages for Linksmart

Browse Source
This commit is contained in:
BlubbFish 2018-05-03 14:35:02 +00:00
parent b5e0c70b1e
commit 317ae9b682
29 changed files with 748 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Zway/Devices/CommandClasses/Alarm.cs
View File

@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -13,9 +14,18 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
class Alarm : ACommandClass {
public override event UpdatedValue Update;
#region Properties
/// <summary>
/// Unklar
/// </summary>
public Int32 Level { get; private set; }
/// <summary>
/// unklar
/// </summary>
public Int32 AlarmType { get; private set; }
#endregion
#region Constructor
public Alarm(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.InitComplex(json);
}
@ -28,9 +38,22 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
this.Level = Int32.Parse(json["data"]["V1event"]["level"]["value"].ToString());
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "Alarm " + this.Name + " [" + this.Id + "]: " + this.AlarmType + " " + this.Level;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "AlarmType", this.AlarmType },
{ "Level", this.Level },
};
}
internal override void SetUpdate(JsonData json, Match match) {
if(match.Groups[4].Value == ".data.V1event") {
if (match.Groups[4].Value == ".data.V1event") {
if (json.Keys.Contains("alarmType") && json["alarmType"].Keys.Contains("value") &&
json.Keys.Contains("level") && json["level"].Keys.Contains("value") &&
this.CheckSetUpdateTime(json)) {
@ -43,17 +66,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
public override String ToString() {
return "Alarm " + this.Name + " [" + this.Id + "]: " + this.AlarmType + " " + this.Level;
}
internal override void Poll() => this.PollNone();
#endregion
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "AlarmType", this.AlarmType },
{ "Level", this.Level },
};
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { };
}
#endregion
}
}

41
Zway/Devices/CommandClasses/AlarmSensor.cs
View File

@ -6,6 +6,7 @@ using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -15,6 +16,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
public class Alarmsensor : ACommandClass {
public override event UpdatedValue Update;
#region Constructor
public Alarmsensor(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.HasSub = true;
this.InitComplex(json);
@ -23,21 +25,6 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
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"];
@ -55,8 +42,30 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
internal override void Poll() => this.PollSubGlobal();
private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
this.Update?.Invoke(this, e);
}
#endregion
#region ACommandClass
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!");
}
}
public override Dictionary<String, Object> ToDictionary() => this.ToDictionarySub();
internal override void Poll() => this.PollSubGlobal();
#endregion
#region ISenml
protected override List<Senml> ToSenmlList() => this.ToSenmlListSub();
#endregion
}
}

47
Zway/Devices/CommandClasses/Battery.cs
View File

@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -11,15 +12,37 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
/// 128 = Battery
/// </summary>
public class Battery : ACommandClass {
public Double Level { get; private set; }
public override event UpdatedValue Update;
#region Properties
/// <summary>
/// Batterylevel in Percent
/// </summary>
public Double Level { get; private set; }
#endregion
#region Constructor
public Battery(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("last") && json["data"]["last"].Keys.Contains("value")) {
this.Level = Double.Parse(json["data"]["last"]["value"].ToString());
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "Battery " + this.Name + " [" + this.Id + "]: " + this.Level;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level },
};
}
internal override void SetUpdate(JsonData json, Match match) {
Boolean success = false;
if (match.Groups[4].Value == ".data") {
@ -41,21 +64,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
this.Update?.Invoke(this, new DeviceUpdateEvent(this.Level, this.LastUpdate, this));
}
}
#endregion
private void InitComplex(JsonData json) {
if (json.Keys.Contains("data") && json["data"].Keys.Contains("last") && json["data"]["last"].Keys.Contains("value")) {
this.Level = Double.Parse(json["data"]["last"]["value"].ToString());
}
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { new SenmlDouble("chargelevel", Senml.Units.Percent, this.Level) };
}
#endregion
public override String ToString() {
return "Battery " + this.Name + " [" + this.Id + "]: " + this.Level;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level },
};
}
}
}

104
Zway/Devices/CommandClasses/CentralScene.cs
View File

@ -5,6 +5,7 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -14,15 +15,72 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
public class Centralscene : ACommandClass {
public override event UpdatedValue Update;
#region Properties
/// <summary>
/// Combination of Scenes and Modes
/// </summary>
public ReadOnlyDictionary<Int32, ReadOnlyCollection<Int32>> ValidScenesModes { get; private set; }
/// <summary>
/// Current active Senes
/// </summary>
public Int32 Scene { get; private set; }
/// <summary>
/// Current active mode
/// </summary>
public Int32 Key { get; private set; }
#endregion
#region Constructor
public Centralscene(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.ValidScenesModes = new ReadOnlyDictionary<Int32, ReadOnlyCollection<Int32>>(new Dictionary<Int32, ReadOnlyCollection<Int32>>());
this.InitComplex(json);
}
private void InitComplex(JsonData json) {
if (json.Keys.Contains("data")) {
JsonData data = json["data"];
if (data.Keys.Contains("sceneSupportedKeyAttributesMask")) {
Dictionary<Int32, ReadOnlyCollection<Int32>> scenes = new Dictionary<Int32, ReadOnlyCollection<Int32>>();
foreach (String item in data["sceneSupportedKeyAttributesMask"].Keys) {
if (Int32.TryParse(item, out Int32 mode) &&
data["sceneSupportedKeyAttributesMask"][item].Keys.Contains("value") &&
data["sceneSupportedKeyAttributesMask"][item]["value"].IsArray) {
JsonData values = data["sceneSupportedKeyAttributesMask"][item]["value"];
List<Int32> modes = new List<Int32>();
foreach (JsonData value in values) {
modes.Add(Int32.Parse(value.ToString()));
}
scenes.Add(mode, new ReadOnlyCollection<Int32>(modes));
}
}
this.ValidScenesModes = new ReadOnlyDictionary<Int32, ReadOnlyCollection<Int32>>(scenes);
if (data.Keys.Contains("currentScene") &&
data["currentScene"].Keys.Contains("value") &&
data["currentScene"]["value"] != null) {
this.Scene = Int32.Parse(data["currentScene"]["value"].ToString());
}
if (data.Keys.Contains("keyAttribute") &&
data["keyAttribute"].Keys.Contains("value") &&
data["keyAttribute"]["value"] != null) {
this.Key = Int32.Parse(data["keyAttribute"]["value"].ToString());
}
}
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "CentralScene " + this.Name + " [" + this.Id + "]: " + this.Scene + "-" + this.Key;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Scene", this.Scene },
{ "Key", this.Key },
};
}
internal override void SetUpdate(JsonData json, Match match) {
if (match.Groups[4].Value == ".data.currentScene") {
if (json.Keys.Contains("value")) {
@ -38,49 +96,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
private void InitComplex(JsonData json) {
if (json.Keys.Contains("data")) {
JsonData data = json["data"];
if(data.Keys.Contains("sceneSupportedKeyAttributesMask")) {
Dictionary<Int32, ReadOnlyCollection<Int32>> scenes = new Dictionary<Int32, ReadOnlyCollection<Int32>>();
foreach (String item in data["sceneSupportedKeyAttributesMask"].Keys) {
if (Int32.TryParse(item, out Int32 mode) &&
data["sceneSupportedKeyAttributesMask"][item].Keys.Contains("value") &&
data["sceneSupportedKeyAttributesMask"][item]["value"].IsArray) {
JsonData values = data["sceneSupportedKeyAttributesMask"][item]["value"];
List<Int32> modes = new List<Int32>();
foreach (JsonData value in values) {
modes.Add(Int32.Parse(value.ToString()));
}
scenes.Add(mode, new ReadOnlyCollection<Int32>(modes));
}
}
this.ValidScenesModes = new ReadOnlyDictionary<Int32, ReadOnlyCollection<Int32>>(scenes);
if (data.Keys.Contains("currentScene") &&
data["currentScene"].Keys.Contains("value") &&
data["currentScene"]["value"] != null) {
this.Scene = Int32.Parse(data["currentScene"]["value"].ToString());
}
if (data.Keys.Contains("keyAttribute") &&
data["keyAttribute"].Keys.Contains("value") &&
data["keyAttribute"]["value"] != null) {
this.Key = Int32.Parse(data["keyAttribute"]["value"].ToString());
}
}
}
}
public override String ToString() {
return "CentralScene " + this.Name + " [" + this.Id + "]: " + this.Scene+"-"+this.Key;
}
internal override void Poll() => this.PollNone();
#endregion
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Scene", this.Scene },
{ "Key", this.Key },
};
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { new SenmlDouble("scene", Senml.Units.CounterValue, this.Scene), new SenmlDouble("key", Senml.Units.CounterValue, this.Key) };
}
#endregion
}
}

47
Zway/Devices/CommandClasses/CommandClassSubs/Alarmsensorsub.cs
View File

@ -4,17 +4,33 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
public class Alarmsensorsub : ACommandClass {
public override event UpdatedValue Update;
#region Properties
/// <summary>
///
/// </summary>
public Int32 Source { get; private set; }
/// <summary>
///
/// </summary>
public Int32 Level { get; private set; }
/// <summary>
///
/// </summary>
public Int32 Time { get; private set; }
/// <summary>
///
/// </summary>
public String Type { get; private set; }
#endregion
#region Constructor
public Alarmsensorsub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.IsSub = true;
InitComplex(json);
@ -31,6 +47,21 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
this.Type = json["typeString"]["value"].ToString();
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "AlarmSensor " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.Source + " " + this.Level + " " + this.Time + " " + this.Type;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Source", this.Source },
{ "Level", this.Level },
{ "Time", this.Time },
{ "Type", this.Type }
};
}
internal override void SetUpdate(JsonData json, Match match) {
if (json.Keys.Contains("srcId") && json["srcId"].Keys.Contains("value") &&
@ -46,19 +77,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
}
}
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();
#endregion
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Source", this.Source },
{ "Level", this.Level },
{ "Time", this.Time },
{ "Type", this.Type }
};
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { };
}
#endregion
}
}

39
Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs
View File

@ -4,13 +4,18 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
class Configurationsub : ACommandClass {
public override event UpdatedValue Update;
private Int64 _level;
#region Properties
private Int64 _level;
/// <summary>
/// Value of the Configuration Item
/// </summary>
public Int64 Level {
get {
return this._level;
@ -25,8 +30,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
}
}
}
/// <summary>
/// Size of the Configuration slot
/// </summary>
public Int32 Size { get; private set; }
#endregion
#region Constructor
public Configurationsub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.IsSub = true;
InitComplex(json);
@ -42,8 +52,19 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
this.Size = Int32.Parse(json["size"]["value"].ToString());
}
}
#endregion
internal override void Poll() => this.PollSub();
#region ACommandClass
public override String ToString() {
return "Configuration " + this.Name + " [" + this.Id + "]: " + this.Level;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level },
{ "Size", this.Size },
};
}
internal override void SetUpdate(JsonData json, Match match) {
if (json.Keys.Contains("val") && json["val"].Keys.Contains("value") && json["val"]["value"] != null &&
@ -55,15 +76,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
}
}
public override String ToString() {
return "Configuration " + this.Name + " [" + this.Id + "]: " + this.Level;
}
internal override void Poll() => this.PollSub();
#endregion
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level },
{ "Size", this.Size },
};
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { };
}
#endregion
}
}

48
Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs
View File

@ -4,15 +4,29 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
public class Metersub : ACommandClass {
public override event UpdatedValue Update;
#region Properties
/// <summary>
/// Type of the Sensor
/// </summary>
public String Type { get; private set; }
/// <summary>
/// Actual value of the Sensor
/// </summary>
public Double Level { get; private set; }
/// <summary>
/// Scale of the Sensor
/// </summary>
public String Scale { get; private set; }
#endregion
#region Constructor
public Metersub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.HasReset = true;
this.IsSub = true;
@ -31,6 +45,20 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
this.Scale = json["scaleString"]["value"].ToString();
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "Meter " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.Level + "" + this.Scale;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level },
{ "Type", this.Type },
{ "Scale", this.Scale },
};
}
internal override void SetUpdate(JsonData json, Match match) {
if (json.Keys.Contains("val") && json["val"].Keys.Contains("value") &&
@ -44,18 +72,18 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
}
}
public override String ToString() {
return "Meter " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.Level + "" + this.Scale;
}
internal override void Poll() => this.PollNone();
#endregion
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level },
{ "Type", this.Type },
{ "Scale", this.Scale },
};
#region ISenml
protected override List<Senml> ToSenmlList() {
if (this.Scale == "W") {
return new List<Senml>() { new SenmlDouble("power", Senml.Units.Watt, this.Level) };
} else if(this.Scale == "kWh") {
return new List<Senml>() { new SenmlDouble("consumption", Senml.Units.Joule, this.Level * 1000 * 3.6 * 1000) };
}
return new List<Senml>() {};
}
#endregion
}
}

38
Zway/Devices/CommandClasses/CommandClassSubs/SceneControllerConfSub.cs
View File

@ -4,14 +4,25 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
public class Scenecontrollerconfsub : ACommandClass {
public override event UpdatedValue Update;
#region Properties
/// <summary>
///
/// </summary>
public Int32 Scene { get; private set; }
/// <summary>
///
/// </summary>
public Int32 Duration { get; private set; }
#endregion
#region Constructor
public Scenecontrollerconfsub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.IsSub = true;
InitComplex(json);
@ -24,6 +35,19 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
this.Duration = Int32.Parse(json["duration"]["value"].ToString());
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "SceneControllerConf " + this.Name + " [" + this.Id + "]: " + this.Scene + " " + this.Duration;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Scene", this.Scene },
{ "Duration", this.Duration }
};
}
internal override void SetUpdate(JsonData json, Match match) {
if (json.Keys.Contains("scene") && json["scene"].Keys.Contains("value") &&
@ -35,17 +59,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
}
}
public override String ToString() {
return "SceneControllerConf " + this.Name + " [" + this.Id + "]: " + this.Scene + " " + this.Duration;
}
internal override void Poll() => this.PollSub();
#endregion
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Scene", this.Scene },
{ "Duration", this.Duration }
};
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { };
}
#endregion
}
}

42
Zway/Devices/CommandClasses/CommandClassSubs/SensorBinarySub.cs
View File

@ -4,20 +4,33 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
public class Sensorbinarysub : ACommandClass {
public override event UpdatedValue Update;
#region Properties
/// <summary>
///
/// </summary>
public String Type { get; private set; }
/// <summary>
///
/// </summary>
public Boolean State { get; private set; }
/// <summary>
///
/// </summary>
public Int32 Level {
get {
return (this.State) ? 1 : 0;
}
}
#endregion
#region Constructor
public Sensorbinarysub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.IsSub = true;
InitComplex(json);
@ -32,6 +45,20 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
this.State = (Boolean)json["level"]["value"];
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "SensorBinary " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.State.ToString();
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "State", this.State },
{ "Type", this.Type },
{ "Level", this.Level }
};
}
internal override void SetUpdate(JsonData json, Match match) {
if (json.Keys.Contains("level") && json["level"].Keys.Contains("value") &&
@ -43,18 +70,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
}
}
public override String ToString() {
return "SensorBinary " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.State.ToString();
}
internal override void Poll() => this.PollNone();
#endregion
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "State", this.State },
{ "Type", this.Type },
{ "Level", this.Level }
};
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { };
}
#endregion
}
}

47
Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs
View File

@ -4,16 +4,29 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
public class Sensormultilevelsub : ACommandClass {
public override event UpdatedValue Update;
#region Properties
/// <summary>
/// Type of the Sensor
/// </summary>
public String Type { get; private set; }
/// <summary>
/// Level of the sensor
/// </summary>
public Double Level { get; private set; }
/// <summary>
/// Scale of the sensor
/// </summary>
public String Scale { get; private set; }
#endregion
#region Constructor
public Sensormultilevelsub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.IsSub = true;
InitComplex(json);
@ -31,6 +44,20 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
this.Scale = json["scaleString"]["value"].ToString();
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "SensorMultilevel " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.Level + "" + this.Scale;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level },
{ "Type", this.Type },
{ "Scale", this.Scale },
};
}
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")) {
@ -53,18 +80,18 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
}
}
public override String ToString() {
return "SensorMultilevel " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.Level + "" + this.Scale;
}
internal override void Poll() => this.PollNone();
#endregion
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level },
{ "Type", this.Type },
{ "Scale", this.Scale },
};
#region ISenml
protected override List<Senml> ToSenmlList() {
if(this.Scale == "W") {
return new List<Senml>() { new SenmlDouble("power", Senml.Units.Watt, this.Level) };
} else if(this.Scale == "°C") {
return new List<Senml>() { new SenmlDouble("temperatur", Senml.Units.Celsius, this.Level) };
}
return new List<Senml>() { };
}
#endregion
}
}

60
Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs
View File

@ -4,13 +4,18 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
class Thermostatsetpointsub : ACommandClass {
public override event UpdatedValue Update;
#region Properties
private Double _level;
/// <summary>
/// Target-Temperatur
/// </summary>
public Double Level {
get {
return this._level;
@ -21,12 +26,29 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
}
}
}
/// <summary>
/// Scale of the actor
/// </summary>
public String Scale { get; private set; }
/// <summary>
/// Maximum Temperatur of the actor
/// </summary>
public Double TempMax { get; private set; }
/// <summary>
/// Minimum Temperatur of the actor
/// </summary>
public Double TempMin { get; private set; }
/// <summary>
/// Has Maximum and Minimum
/// </summary>
public Boolean HasMinMax { get; private set; }
/// <summary>
/// Type of the actor
/// </summary>
public String Type { get; private set; }
#endregion
#region Constructor
public Thermostatsetpointsub(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.IsSub = true;
InitComplex(json);
@ -49,6 +71,23 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
this.HasMinMax = false;
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "ThermostatSetPoint " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.Level + "" + this.Scale + " [" + this.TempMin + "," + this.TempMax + "," + this.HasMinMax + "]";
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level },
{ "Type", this.Type },
{ "Scale", this.Scale },
{ "TempMax", this.TempMax },
{ "TempMin", this.TempMin },
{ "HasMinMax", this.HasMinMax },
};
}
internal override void SetUpdate(JsonData json, Match match) {
Boolean ret = false;
@ -74,21 +113,16 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
}
}
public override String ToString() {
return "ThermostatSetPoint " + this.Name + " [" + this.Id + "]: " + this.Type + " " + this.Level + "" + this.Scale + " [" + this.TempMin + "," + this.TempMax + "," + this.HasMinMax + "]";
}
internal override void Poll() => this.PollSub();
#endregion
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level },
{ "Type", this.Type },
{ "Scale", this.Scale },
{ "TempMax", this.TempMax },
{ "TempMin", this.TempMin },
{ "HasMinMax", this.HasMinMax },
};
#region ISenml
protected override List<Senml> ToSenmlList() {
if(this.Scale == "°C") {
return new List<Senml>() { new SenmlDouble("temperatur", Senml.Units.Celsius, this.Level) };
}
return new List<Senml>() { };
}
#endregion
}
}

17
Zway/Devices/CommandClasses/Configuration.cs
View File

@ -6,6 +6,7 @@ using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -15,6 +16,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
class Configuration : ACommandClass {
public override event UpdatedValue Update;
#region Constructor
public Configuration(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.HasSub = true;
this.InitComplex(json);
@ -23,10 +25,6 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
this.Update?.Invoke(this, e);
}
private void InitComplex(JsonData json) {
if (json.Keys.Contains("data")) {
JsonData data = json["data"];
@ -44,6 +42,12 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
this.Update?.Invoke(this, e);
}
#endregion
#region ACommandClass
internal override void SetUpdate(JsonData json, Match match) {
if (match.Groups[4].Value.StartsWith(".data.")) {
Int32 subid = Int32.Parse(match.Groups[5].Value);
@ -58,5 +62,10 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
internal override void Poll() => this.PollPerSub();
public override Dictionary<String, Object> ToDictionary() => this.ToDictionarySub();
#endregion
#region ISenml
protected override List<Senml> ToSenmlList() => this.ToSenmlListSub();
#endregion
}
}

41
Zway/Devices/CommandClasses/Indicator.cs
View File

@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -11,9 +12,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
/// 135 = Indicator
/// </summary>
class Indicator : ACommandClass {
private Boolean _state;
public override event UpdatedValue Update;
#region Properties
private Boolean _state;
/// <summary>
/// Status of the Indicator
/// </summary>
public Boolean State {
get {
return this._state;
@ -22,7 +27,9 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
this.SetInt(value ? 255 : 0);
}
}
/// <summary>
/// Int-Representation of the Indicator
/// </summary>
public Int32 Level {
get {
return (this.State) ? 1 : 0;
@ -31,7 +38,9 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
this.State = (value == 1);
}
}
#endregion
#region Constructor
public Indicator(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.InitComplex(json);
}
@ -41,6 +50,19 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
this._state = Int32.Parse(json["data"]["stat"]["value"].ToString()) == 255;
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "Indicator " + this.Name + " [" + this.Id + "]: " + this.State;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "State", this.State },
{ "Level", this.Level }
};
}
internal override void SetUpdate(JsonData json, Match match) {
if(match.Groups[4].Value == ".data.stat") {
@ -52,16 +74,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
}
}
#endregion
public override String ToString() {
return "Indicator " + this.Name + " [" + this.Id + "]: " + this.State;
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { new SenmlBool("status", Senml.Units.CounterValue, this.State) };
}
#endregion
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "State", this.State },
{ "Level", this.Level }
};
}
}
}

39
Zway/Devices/CommandClasses/Meter.cs
View File

@ -6,6 +6,7 @@ using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -15,6 +16,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
public class Meter : ACommandClass {
public override event UpdatedValue Update;
#region Constructor
public Meter(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.HasSub = true;
this.InitComplex(json);
@ -23,21 +25,6 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
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"];
@ -54,8 +41,30 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
this.Update?.Invoke(this, e);
}
#endregion
#region ACommandClass
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!");
}
}
internal override void Poll() => this.PollSubGlobal();
public override Dictionary<String, Object> ToDictionary() => this.ToDictionarySub();
#endregion
#region ISenml
protected override List<Senml> ToSenmlList() => this.ToSenmlListSub();
#endregion
}
}

39
Zway/Devices/CommandClasses/SceneControllerConf.cs
View File

@ -6,6 +6,7 @@ using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -15,6 +16,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
public class Scenecontrollerconf : ACommandClass {
public override event UpdatedValue Update;
#region Constructor
public Scenecontrollerconf(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.HasSub = true;
this.InitComplex(json);
@ -23,21 +25,6 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
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"];
@ -53,8 +40,30 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
this.Update?.Invoke(this, e);
}
#endregion
#region ACommandClass
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!");
}
}
internal override void Poll() => this.PollPerSub();
public override Dictionary<String, Object> ToDictionary() => this.ToDictionarySub();
#endregion
#region ISenml
protected override List<Senml> ToSenmlList() => this.ToSenmlListSub();
#endregion
}
}

39
Zway/Devices/CommandClasses/SensorBinary.cs
View File

@ -6,6 +6,7 @@ using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -15,6 +16,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
public class Sensorbinary : ACommandClass {
public override event UpdatedValue Update;
#region Constructor
public Sensorbinary(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.HasSub = true;
this.InitComplex(json);
@ -23,21 +25,6 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
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"];
@ -53,8 +40,30 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
this.Update?.Invoke(this, e);
}
#endregion
#region ACommandClass
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!");
}
}
internal override void Poll() => this.PollSubGlobal();
public override Dictionary<String, Object> ToDictionary() => this.ToDictionarySub();
#endregion
#region ISenml
protected override List<Senml> ToSenmlList() => this.ToSenmlListSub();
#endregion
}
}

39
Zway/Devices/CommandClasses/SensorMultilevel.cs
View File

@ -6,6 +6,7 @@ using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -15,6 +16,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
public class Sensormultilevel : ACommandClass {
public override event UpdatedValue Update;
#region Constructor
public Sensormultilevel(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.HasSub = true;
this.InitComplex(json);
@ -23,21 +25,6 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
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"];
@ -54,8 +41,30 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
this.Update?.Invoke(this, e);
}
#endregion
#region ACommandClass
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!");
}
}
internal override void Poll() => this.PollSubGlobal();
public override Dictionary<String, Object> ToDictionary() => this.ToDictionarySub();
#endregion
#region ISenml
protected override List<Senml> ToSenmlList() => this.ToSenmlListSub();
#endregion
}
}

53
Zway/Devices/CommandClasses/SwitchBinary.cs
View File

@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -11,10 +12,12 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
/// 37 = SwitchBinary
/// </summary>
public class Switchbinary : ACommandClass {
private Boolean _state;
public override event UpdatedValue Update;
#region Properties
/// <summary>
/// Int representation of Boolean
/// </summary>
public Int32 Level {
get {
return (this.State) ? 1 : 0;
@ -23,7 +26,10 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
this.State = (value == 1);
}
}
private Boolean _state;
/// <summary>
/// State if Switch is activated
/// </summary>
public Boolean State {
get {
return this._state;
@ -32,11 +38,32 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
this.SetInt(value ? 255 : 0);
}
}
#endregion
#region Constructor
public Switchbinary(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("level") && json["data"]["level"].Keys.Contains("value") && json["data"]["level"]["value"].IsBoolean) {
this._state = (Boolean)json["data"]["level"]["value"];
}
}
#endregion
#region ACommandClass
public override String ToString() {
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 }
};
}
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)) {
@ -47,22 +74,12 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
}
}
#endregion
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._state = (Boolean)json["data"]["level"]["value"];
}
}
public override String ToString() {
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 }
};
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { new SenmlBool("state", Senml.Units.CounterValue, this.State) };
}
#endregion
}
}

47
Zway/Devices/CommandClasses/SwitchMultilevel.cs
View File

@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -11,10 +12,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
/// 38 = SwitchMultilevel
/// </summary>
public class Switchmultilevel : ACommandClass {
private Int32 _level;
public override event UpdatedValue Update;
#region Properties
private Int32 _level;
/// <summary>
/// Level of thw Switch
/// </summary>
public Int32 Level {
get {
return this._level;
@ -25,11 +29,31 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
}
#endregion
#region Constructor
public Switchmultilevel(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("level") && json["data"]["level"].Keys.Contains("value")) {
this._level = Int32.Parse(json["data"]["level"]["value"].ToString());
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "SwitchMultilevel " + this.Name + " [" + this.Id + "]: " + this.Level;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level }
};
}
internal override void SetUpdate(JsonData json, Match match) {
if(match.Groups[4].Value == ".data.level") {
if(json.Keys.Contains("value") && this.CheckSetUpdateTime(json)) {
@ -41,21 +65,12 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
}
}
#endregion
private void InitComplex(JsonData json) {
if (json.Keys.Contains("data") && json["data"].Keys.Contains("level") && json["data"]["level"].Keys.Contains("value")) {
this._level = Int32.Parse(json["data"]["level"]["value"].ToString());
}
}
public override String ToString() {
return "SwitchMultilevel " + this.Name + " [" + this.Id + "]: " + this.Level;
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Level", this.Level }
};
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { new SenmlDouble("state", Senml.Units.Percent, (Double)this.Level/255) };
}
#endregion
}
}

44
Zway/Devices/CommandClasses/ThermostatMode.cs
View File

@ -5,6 +5,7 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -12,11 +13,17 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
/// 64 = ThermostatMode
/// </summary>
public class Thermostatmode : ACommandClass {
private Int32 _level;
public override event UpdatedValue Update;
#region Properties
/// <summary>
/// Allowd Modes
/// </summary>
public ReadOnlyDictionary<Int32, String> ValidModes { get; private set; }
private Int32 _level;
/// <summary>
/// Actual mode
/// </summary>
public Int32 Level {
get { return this._level; }
set {
@ -25,23 +32,14 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
}
#endregion
#region Constructor
public Thermostatmode(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.ValidModes = new ReadOnlyDictionary<Int32, String>(new Dictionary<Int32, String>());
this.InitComplex(json);
}
internal override void SetUpdate(JsonData json, Match match) {
if(match.Groups[4].Value == ".data.mode") {
if(json.Keys.Contains("value") && this.CheckSetUpdateTime(json)) {
this._level = Int32.Parse(json["value"].ToString());
this.Update?.Invoke(this, new DeviceUpdateEvent(this.Level, this.LastUpdate, this));
}
} 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"];
@ -60,7 +58,9 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "ThermostatMode " + this.Name + " [" + this.Id + "]: " + this.ValidModes[this.Level];
}
@ -76,5 +76,23 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
};
return json;
}
internal override void SetUpdate(JsonData json, Match match) {
if(match.Groups[4].Value == ".data.mode") {
if(json.Keys.Contains("value") && this.CheckSetUpdateTime(json)) {
this._level = Int32.Parse(json["value"].ToString());
this.Update?.Invoke(this, new DeviceUpdateEvent(this.Level, this.LastUpdate, this));
}
} else {
Helper.WriteError("Kenne in " + this.Name + " [" + this.Id + "] " + match.Groups[4].Value + " nicht!");
}
}
#endregion
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { new SenmlDouble("mode", Senml.Units.CounterValue, this.Level) };
}
#endregion
}
}

39
Zway/Devices/CommandClasses/ThermostatSetPoint.cs
View File

@ -6,6 +6,7 @@ using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -15,6 +16,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
public class Thermostatsetpoint : ACommandClass {
public override event UpdatedValue Update;
#region Constructor
public Thermostatsetpoint(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.HasSub = true;
this.InitComplex(json);
@ -23,21 +25,6 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
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"];
@ -54,8 +41,30 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
this.Update?.Invoke(this, e);
}
#endregion
#region ACommandClass
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!");
}
}
internal override void Poll() => this.PollPerSub();
public override Dictionary<String, Object> ToDictionary() => this.ToDictionarySub();
#endregion
#region ISenml
protected override List<Senml> ToSenmlList() => this.ToSenmlListSub();
#endregion
}
}

55
Zway/Devices/CommandClasses/Wakeup.cs
View File

@ -4,6 +4,7 @@ using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.Interfaces;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
@ -11,10 +12,10 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
/// 132 = Wakeup
/// </summary>
class Wakeup : ACommandClass {
private Int32 _interval;
private Int32 _againstNode;
public override event UpdatedValue Update;
#region Properties
private Int32 _interval;
public Int32 Interval {
get {
return this._interval;
@ -25,6 +26,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
}
private Int32 _againstNode;
public Int32 AgainstNode { get {
return this._againstNode;
}
@ -41,7 +43,9 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
public Int32 HasDefaultLevel { get { return (this.HasDefaultState) ? 1 : 0; } }
public DateTime LastWakeup { get; private set; }
public DateTime LastSleep { get; private set; }
#endregion
#region Constructor
public Wakeup(JsonData json, Tuple<Int32, Int32, Classes> id, HttpConnection http, Boolean polling) : base(json, id, http, polling) {
this.InitComplex(json);
}
@ -77,6 +81,28 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
}
}
}
#endregion
#region ACommandClass
public override String ToString() {
return "Wakeup " + this.Name + " [" + this.Id + "]: " + this.LastWakeup + "-" + this.LastSleep + " " + this.Interval + " [" + this.WakeupMin + "," + this.WakeupMax + "," + this.WakeupDefault + "," + this.AgainstNode + "]";
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Interval", this.Interval },
{ "AgainstNode", this.AgainstNode },
{ "WakeupMin", this.WakeupMin },
{ "WakeupMax", this.WakeupMax },
{ "HasMinMaxState", this.HasMinMaxState },
{ "HasMinMaxLevel", this.HasMinMaxLevel },
{ "WakeupDefault", this.WakeupDefault },
{ "HasDefaultState", this.HasDefaultState },
{ "HasDefaultLevel", this.HasDefaultLevel },
{ "LastWakeup", this.LastWakeup.ToString() },
{ "LastSleep", this.LastSleep.ToString() }
};
}
internal override void SetUpdate(JsonData json, Match match) {
Boolean success = false;
@ -131,25 +157,12 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
this.Update?.Invoke(this, new DeviceUpdateEvent(0, this.LastUpdate, this));
}
}
#endregion
public override String ToString() {
return "Wakeup " + this.Name + " [" + this.Id + "]: " + this.LastWakeup + "-" + this.LastSleep + " " + this.Interval + " [" + this.WakeupMin + "," + this.WakeupMax + "," + this.WakeupDefault + "," + this.AgainstNode + "]";
}
public override Dictionary<String, Object> ToDictionary() {
return new Dictionary<String, Object> {
{ "Interval", this.Interval },
{ "AgainstNode", this.AgainstNode },
{ "WakeupMin", this.WakeupMin },
{ "WakeupMax", this.WakeupMax },
{ "HasMinMaxState", this.HasMinMaxState },
{ "HasMinMaxLevel", this.HasMinMaxLevel },
{ "WakeupDefault", this.WakeupDefault },
{ "HasDefaultState", this.HasDefaultState },
{ "HasDefaultLevel", this.HasDefaultLevel },
{ "LastWakeup", this.LastWakeup.ToString() },
{ "LastSleep", this.LastSleep.ToString() }
};
#region ISenml
protected override List<Senml> ToSenmlList() {
return new List<Senml>() { };
}
#endregion
}
}

63
Zway/Interfaces/ACommandClass.cs
View File

@ -4,10 +4,12 @@ using System.Collections.ObjectModel;
using System.Text.RegularExpressions;
using BlubbFish.IoT.Zway.Events;
using BlubbFish.IoT.Zway.lib;
using BlubbFish.Utils.IoT.Interfaces;
using BlubbFish.Utils.IoT.Interfaces.Language;
using LitJson;
namespace BlubbFish.IoT.Zway.Interfaces {
public abstract class ACommandClass {
public abstract class ACommandClass : IMqtt, ISenml {
protected HttpConnection http;
public delegate void UpdatedValue(Object sender, DeviceUpdateEvent e);
@ -58,6 +60,7 @@ namespace BlubbFish.IoT.Zway.Interfaces {
AlarmSensor = 156
}
#region Properties
public Int32 DeviceId { get; }
public Int32 Instance { get; }
public Classes Commandclass { get; }
@ -71,9 +74,9 @@ namespace BlubbFish.IoT.Zway.Interfaces {
public Boolean HasSub { get; protected set; }
public Boolean IsSub { get; protected set; }
public Boolean HasReset { get; protected set; }
#endregion
#region Constructor
protected ACommandClass(JsonData json, Tuple<Int32, Int32, Classes, Int32> id, HttpConnection http, Boolean polling) {
this.DeviceId = id.Item1;
this.Instance = id.Item2;
@ -119,7 +122,7 @@ namespace BlubbFish.IoT.Zway.Interfaces {
return GetInstanceConcrete(objectName, json, http, id, polling);
}
if (!Enum.IsDefined(typeof(IgnoredClasses), (Int32)id.Item3) && !Enum.IsDefined(typeof(Classes), id.Item3)) {
Helper.WriteError("CommandClass " + id.Item3 + " not exist.");
Helper.WriteError("CommandClass " + id.Item3 + " not exist. (" + id.Item1 + ", " + id.Item2 + ")");
}
return null;
}
@ -182,7 +185,6 @@ namespace BlubbFish.IoT.Zway.Interfaces {
#endregion
#region SetValues
protected void SetInt(Int32 value) {
this.http.GetVoid("ZWave.zway/Run/devices[" + this.DeviceId + "].instances[" + this.Instance + "].commandClasses[" + ((Int32)this.Commandclass).ToString() + "].Set(" + value + ")");
}
@ -217,8 +219,25 @@ namespace BlubbFish.IoT.Zway.Interfaces {
#endregion
#region Output
#region InternalHelper
protected Dictionary<String, Object> ToDictionarySub() {
Dictionary<String, Object> json = new Dictionary<String, Object>();
foreach (KeyValuePair<Int32, ACommandClass> item in this.Sub) {
json.Add(item.Key.ToString(), item.Value.ToDictionary());
}
return json;
}
protected List<Senml> ToSenmlListSub() {
List<Senml> list = new List<Senml>();
foreach (KeyValuePair<Int32, ACommandClass> item in this.Sub) {
list.AddRange(item.Value.ToSenmlList());
}
return list;
}
#endregion
#region IMqtt
public String MqttTopic() {
return this.DeviceId + "/" + this.Instance + "/" + ((Int32)this.Commandclass).ToString() + (this.IsSub ? "/" + this.SensorId : "");
}
@ -230,19 +249,31 @@ namespace BlubbFish.IoT.Zway.Interfaces {
json.Add("Commandclass", this.Commandclass.ToString());
return JsonMapper.ToJson(json);
}
public abstract Dictionary<String, Object> ToDictionary();
protected Dictionary<String, Object> ToDictionarySub() {
Dictionary<String, Object> json = new Dictionary<String, Object>();
foreach (KeyValuePair<Int32, ACommandClass> item in this.Sub) {
json.Add(item.Key.ToString(), item.Value.ToDictionary());
}
return json;
}
#endregion
#region ISenml
public String ToSenml() {
List<Senml> l = this.ToSenmlList();
if(l.Count == 0) {
return null;
}
Dictionary<String, Object> json = new Dictionary<String, Object> {
{ "e", l },
{ "bn", "urn:dev:id:" + this.SenmlTopic() },
{ "bt", ((DateTimeOffset)this.LastUpdate).ToUnixTimeSeconds() }
};
return JsonMapper.ToJson(json);
}
public String SenmlTopic() {
return this.DeviceId + "/" + this.Instance + "/" + ((Int32)this.Commandclass).ToString() + (this.IsSub ? "/" + this.SensorId : "");
}
#endregion
#region Abstract
protected abstract List<Senml> ToSenmlList();
public abstract Dictionary<String, Object> ToDictionary();
internal abstract void SetUpdate(JsonData json, Match match);
#endregion
}
}

6
Zway/Properties/AssemblyInfo.cs
View File

@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Zway")]
[assembly: AssemblyCopyright("Copyright © 2017 - 01.01.2018")]
[assembly: AssemblyCopyright("Copyright © 2017 - 03.05.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.6.0")]
[assembly: AssemblyFileVersion("1.3.6.0")]
[assembly: AssemblyVersion("1.4.0.0")]
[assembly: AssemblyFileVersion("1.4.0.0")]

12
Zway/Zway.csproj
View File

@ -31,9 +31,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="LitJson, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LitJson.0.9.0\lib\LitJson.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@ -77,7 +74,14 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<ProjectReference Include="..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
<Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
<Name>litjson_4.7.1</Name>
</ProjectReference>
<ProjectReference Include="..\..\Utils\IoT\Interfaces\Iot-Interfaces.csproj">
<Project>{4daada29-c600-4cf3-8ad3-9c97c8d7f632}</Project>
<Name>Iot-Interfaces</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

BIN
Zway/bin/Release/Iot-Interfaces.dll Normal file
View File

Binary file not shown.

BIN
Zway/bin/Release/LitJson.dll
View File

Binary file not shown.

BIN
Zway/bin/Release/Zway.dll
View File

Binary file not shown.

4
Zway/packages.config
View File

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