From a931ed15f062423b0053dc9fe6f0ffd5fba3e979 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Mon, 7 May 2018 09:34:10 +0000 Subject: [PATCH] [NF] fixing Senml topics and data --- Zway/Interfaces/ACommandClass.cs | 4 ++-- Zway/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Zway/Interfaces/ACommandClass.cs b/Zway/Interfaces/ACommandClass.cs index cbb1cf4..683466d 100644 --- a/Zway/Interfaces/ACommandClass.cs +++ b/Zway/Interfaces/ACommandClass.cs @@ -259,14 +259,14 @@ namespace BlubbFish.IoT.Zway.Interfaces { } Dictionary json = new Dictionary { { "e", l }, - { "bn", "urn:dev:id:" + this.SenmlTopic() }, + { "bn", this.DeviceId + "/" + this.Instance + "/" + ((Int32)this.Commandclass).ToString() + (this.IsSub ? "/" + this.SensorId : "") + "/" }, { "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 : ""); + return "/LS/v2/ZGW/" + Guid.NewGuid().ToString(); } #endregion diff --git a/Zway/Properties/AssemblyInfo.cs b/Zway/Properties/AssemblyInfo.cs index 2df5c27..476ec44 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.0.0")] -[assembly: AssemblyFileVersion("1.4.0.0")] +[assembly: AssemblyVersion("1.4.1.0")] +[assembly: AssemblyFileVersion("1.4.1.0")]