From 64c9020bcb8a97c9f1894bcfdf0e6dc8fc6c5d31 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Sat, 12 May 2018 12:36:32 +0000 Subject: [PATCH] [BF] Fixing Issue with Math.Abs(l) --- .../CommandClassSubs/SensorMultilevelSub.cs | 2 +- Zway/Interfaces/ACommandClass.cs | 1 + Zway/Properties/AssemblyInfo.cs | 4 ++-- Zway/bin/Release/Zway.dll | Bin 61440 -> 61952 bytes 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs b/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs index 5e41f04..6fc2667 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 && Math.Abs(l) >= 0.1)) { + (t == "Temperature" && this.Level >= 4 && Math.Abs(l) <= 0.1)) { return; } } diff --git a/Zway/Interfaces/ACommandClass.cs b/Zway/Interfaces/ACommandClass.cs index b084dd8..c189bcc 100644 --- a/Zway/Interfaces/ACommandClass.cs +++ b/Zway/Interfaces/ACommandClass.cs @@ -38,6 +38,7 @@ namespace BlubbFish.IoT.Zway.Interfaces { Association = 133, Version = 134, Proprietary = 136, + TimeParameters = 139, MultiChannelAssociation = 142, MultiCmd = 143, Security = 152 diff --git a/Zway/Properties/AssemblyInfo.cs b/Zway/Properties/AssemblyInfo.cs index 62bba52..ea773b7 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.2.0")] -[assembly: AssemblyFileVersion("1.4.2.0")] +[assembly: AssemblyVersion("1.4.3")] +[assembly: AssemblyFileVersion("1.4.3")] diff --git a/Zway/bin/Release/Zway.dll b/Zway/bin/Release/Zway.dll index fa1bd8723c7882510283a1007e1552f644b09a32..27adb000709f6775ab989c068e39b4e2815d6873 100644 GIT binary patch delta 7808 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 W{lfc_sedgt?`=xF(k|+A9RCCXrQR+8 delta 7790 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 fRUu1PmJZ30U1P-Cn9)c+nnmDiGZ`X}*!7K*PA