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

[[BF] v1.3.5.2 Check to avoid megapeaks in data now also for temperature

Browse Source
This commit is contained in:
BlubbFish 2017-12-24 10:43:58 +00:00
parent 6d395107cb
commit 1082ee0d2a
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,13 +33,18 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
} }
internal override void SetUpdate(JsonData json, Match match) { 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") && if(json.Keys.Contains("val") && json["val"].Keys.Contains("value") &&
json.Keys.Contains("sensorTypeString") && json["sensorTypeString"].Keys.Contains("value") && json.Keys.Contains("sensorTypeString") && json["sensorTypeString"].Keys.Contains("value") &&
json.Keys.Contains("scaleString") && json["scaleString"].Keys.Contains("value") && json.Keys.Contains("scaleString") && json["scaleString"].Keys.Contains("value") &&
this.CheckSetUpdateTime(json)) { 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.Level = Double.Parse(json["val"]["value"].ToString());
this.Type = json["sensorTypeString"]["value"].ToString(); this.Type = json["sensorTypeString"]["value"].ToString();
this.Scale = json["scaleString"]["value"].ToString(); this.Scale = json["scaleString"]["value"].ToString();

6
Zway/Properties/AssemblyInfo.cs
View File

@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Zway")] [assembly: AssemblyProduct("Zway")]
[assembly: AssemblyCopyright("Copyright © 2017 - 23.12.2017")] [assembly: AssemblyCopyright("Copyright © 2017 - 24.12.2017")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [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, // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben: // indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.5.1")] [assembly: AssemblyVersion("1.3.5.2")]
[assembly: AssemblyFileVersion("1.3.5.1")] [assembly: AssemblyFileVersion("1.3.5.2")]

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

Binary file not shown.