From a22628b0d0787562b55082a573a0758d795efd6a Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Thu, 10 May 2018 06:26:39 +0000 Subject: [PATCH] [BF] Some sensors make wrong measurements near 0 not exactly 0, so ABS(value) >= 0.1 is alse false --- .../CommandClassSubs/SensorMultilevelSub.cs | 2 +- Zway/Properties/AssemblyInfo.cs | 4 ++-- Zway/bin/Release/Zway.dll | Bin 61440 -> 61440 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs b/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs index dbee67c..5e41f04 100644 --- a/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs +++ b/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs @@ -65,7 +65,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs { 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)) { + (t == "Temperature" && this.Level >= 4 && Math.Abs(l) >= 0.1)) { return; } } diff --git a/Zway/Properties/AssemblyInfo.cs b/Zway/Properties/AssemblyInfo.cs index 476ec44..62bba52 100644 --- a/Zway/Properties/AssemblyInfo.cs +++ b/Zway/Properties/AssemblyInfo.cs @@ -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.4.1.0")] -[assembly: AssemblyFileVersion("1.4.1.0")] +[assembly: AssemblyVersion("1.4.2.0")] +[assembly: AssemblyFileVersion("1.4.2.0")] diff --git a/Zway/bin/Release/Zway.dll b/Zway/bin/Release/Zway.dll index 7b38bcb2254c3a5b189b150a3367694d195aa335..fa1bd8723c7882510283a1007e1552f644b09a32 100644 GIT binary patch delta 8614 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 MHTlFz)l_KzUm}Av>Hq)$