diff --git a/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs b/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs index 3214c38..2b9bff8 100644 --- a/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs +++ b/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs @@ -33,13 +33,18 @@ 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 > 50 || l < -20)) { + 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") && this.CheckSetUpdateTime(json)) { - if(Double.Parse(json["val"]["value"].ToString()) > 3660 && json["scaleString"]["value"].ToString() == "W") { - return; - } this.Level = Double.Parse(json["val"]["value"].ToString()); this.Type = json["sensorTypeString"]["value"].ToString(); this.Scale = json["scaleString"]["value"].ToString(); diff --git a/Zway/Properties/AssemblyInfo.cs b/Zway/Properties/AssemblyInfo.cs index 471c850..a498147 100644 --- a/Zway/Properties/AssemblyInfo.cs +++ b/Zway/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Zway")] -[assembly: AssemblyCopyright("Copyright © 2017 - 23.12.2017")] +[assembly: AssemblyCopyright("Copyright © 2017 - 24.12.2017")] [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.1")] -[assembly: AssemblyFileVersion("1.3.5.1")] +[assembly: AssemblyVersion("1.3.5.2")] +[assembly: AssemblyFileVersion("1.3.5.2")] diff --git a/Zway/bin/Release/Zway.dll b/Zway/bin/Release/Zway.dll index 09c0684..87cf95e 100644 Binary files a/Zway/bin/Release/Zway.dll and b/Zway/bin/Release/Zway.dll differ