From 9f404f69a15066861204c8fae58a3af4c5596ab4 Mon Sep 17 00:00:00 2001 From: Philip Schell Date: Thu, 14 Feb 2019 11:55:58 +0100 Subject: [PATCH] move Iot to Utils-IoT --- IoT.sln => Utils-IoT/Utils-IoT.sln | 110 ++++---- .../Utils-IoT}/Connector/ABackend.cs | 108 ++++---- .../Utils-IoT}/Connector/ADataBackend.cs | 20 +- .../Utils-IoT}/Connector/AUserBackend.cs | 22 +- .../Utils-IoT}/Connector/Helper.cs | 52 ++-- .../Utils-IoT}/Events/BackendEvent.cs | 44 +-- .../Utils-IoT}/Events/DataEvent.cs | 24 +- .../Utils-IoT}/Events/UserEvent.cs | 24 +- {IoT => Utils-IoT/Utils-IoT}/Helper.cs | 38 +-- .../Utils-IoT}/JsonSensor/AJsonSensor.cs | 256 +++++++++--------- .../Utils-IoT}/JsonSensor/Bosmon.cs | 68 ++--- .../Utils-IoT}/JsonSensor/Luminanz.cs | 42 +-- .../Utils-IoT}/JsonSensor/Pir.cs | 32 +-- .../Utils-IoT}/JsonSensor/Power.cs | 42 +-- .../Utils-IoT}/JsonSensor/Switch.cs | 32 +-- .../Utils-IoT}/JsonSensor/Temperatur.cs | 40 +-- .../Utils-IoT}/Properties/AssemblyInfo.cs | 72 ++--- {IoT => Utils-IoT/Utils-IoT}/Utils-IoT.csproj | 118 ++++---- 18 files changed, 572 insertions(+), 572 deletions(-) rename IoT.sln => Utils-IoT/Utils-IoT.sln (98%) rename {IoT => Utils-IoT/Utils-IoT}/Connector/ABackend.cs (97%) rename {IoT => Utils-IoT/Utils-IoT}/Connector/ADataBackend.cs (97%) rename {IoT => Utils-IoT/Utils-IoT}/Connector/AUserBackend.cs (97%) rename {IoT => Utils-IoT/Utils-IoT}/Connector/Helper.cs (97%) rename {IoT => Utils-IoT/Utils-IoT}/Events/BackendEvent.cs (96%) rename {IoT => Utils-IoT/Utils-IoT}/Events/DataEvent.cs (96%) rename {IoT => Utils-IoT/Utils-IoT}/Events/UserEvent.cs (96%) rename {IoT => Utils-IoT/Utils-IoT}/Helper.cs (95%) rename {IoT => Utils-IoT/Utils-IoT}/JsonSensor/AJsonSensor.cs (97%) rename {IoT => Utils-IoT/Utils-IoT}/JsonSensor/Bosmon.cs (97%) rename {IoT => Utils-IoT/Utils-IoT}/JsonSensor/Luminanz.cs (96%) rename {IoT => Utils-IoT/Utils-IoT}/JsonSensor/Pir.cs (96%) rename {IoT => Utils-IoT/Utils-IoT}/JsonSensor/Power.cs (96%) rename {IoT => Utils-IoT/Utils-IoT}/JsonSensor/Switch.cs (96%) rename {IoT => Utils-IoT/Utils-IoT}/JsonSensor/Temperatur.cs (96%) rename {IoT => Utils-IoT/Utils-IoT}/Properties/AssemblyInfo.cs (97%) rename {IoT => Utils-IoT/Utils-IoT}/Utils-IoT.csproj (97%) diff --git a/IoT.sln b/Utils-IoT/Utils-IoT.sln similarity index 98% rename from IoT.sln rename to Utils-IoT/Utils-IoT.sln index bd3c75d..e6e56fb 100644 --- a/IoT.sln +++ b/Utils-IoT/Utils-IoT.sln @@ -1,55 +1,55 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27004.2010 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMosquitto", "IoT\Connector\Data\Mosquitto\ConnectorDataMosquitto.csproj", "{39235FAD-BA9D-4B51-82FC-6969967BEAE9}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMqtt", "IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj", "{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorUserTelegram", "IoT\Connector\User\Telegram\ConnectorUserTelegram.csproj", "{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt", "..\Librarys\mqtt\M2Mqtt\M2Mqtt.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU - {39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.Build.0 = Release|Any CPU - {EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.Build.0 = Release|Any CPU - {E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.Build.0 = Release|Any CPU - {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU - {A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {844D8F60-6DE1-4C48-976D-F71450E9707B} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2010 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMosquitto", "IoT\Connector\Data\Mosquitto\ConnectorDataMosquitto.csproj", "{39235FAD-BA9D-4B51-82FC-6969967BEAE9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMqtt", "IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj", "{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorUserTelegram", "IoT\Connector\User\Telegram\ConnectorUserTelegram.csproj", "{E66A57DD-858A-40E4-8A2F-BEA5129C31F7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt", "..\Librarys\mqtt\M2Mqtt\M2Mqtt.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU + {39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.Build.0 = Release|Any CPU + {EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.Build.0 = Release|Any CPU + {E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E66A57DD-858A-40E4-8A2F-BEA5129C31F7}.Release|Any CPU.Build.0 = Release|Any CPU + {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU + {A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {844D8F60-6DE1-4C48-976D-F71450E9707B} + EndGlobalSection +EndGlobal diff --git a/IoT/Connector/ABackend.cs b/Utils-IoT/Utils-IoT/Connector/ABackend.cs similarity index 97% rename from IoT/Connector/ABackend.cs rename to Utils-IoT/Utils-IoT/Connector/ABackend.cs index 4c31491..7eb0adf 100644 --- a/IoT/Connector/ABackend.cs +++ b/Utils-IoT/Utils-IoT/Connector/ABackend.cs @@ -1,54 +1,54 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using BlubbFish.Utils.IoT.Events; - -namespace BlubbFish.Utils.IoT.Connector { - public abstract class ABackend { - public enum BackendType { - Data, - User - } - public event BackendMessage MessageIncomming; - public event BackendMessage MessageSending; - public delegate void BackendMessage(Object sender, BackendEvent e); - - protected Dictionary settings; - - public abstract Boolean IsConnected { get; } - - public ABackend(Dictionary settings) { - this.settings = settings; - } - - public static ABackend GetInstance(Dictionary settings, BackendType ty) { - if (settings.Count == 0) { - return null; - } - String object_sensor = "BlubbFish.Utils.IoT.Connector." + ty.ToString() + "." + settings["type"].ToUpperLower() + ", " + "Connector" + ty.ToString() + settings["type"].ToUpperLower(); - Type t = null; - try { - t = Type.GetType(object_sensor, true); - } catch (TypeLoadException) { - Console.Error.WriteLine("Configuration: " + settings["type"] + " is not a " + ty.ToString() + "Backend"); - return null; - } catch (System.IO.FileNotFoundException) { - Console.Error.WriteLine("Driver " + object_sensor + " could not load!"); - return null; - } - return (ABackend)t.GetConstructor(new Type[] { typeof(Dictionary) }).Invoke(new Object[] { settings }); - } - - protected void NotifyClientIncomming(BackendEvent value) { - this.MessageIncomming?.Invoke(this, value); - } - - protected void NotifyClientSending(BackendEvent value) { - this.MessageSending?.Invoke(this, value); - } - - public abstract void Dispose(); - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using BlubbFish.Utils.IoT.Events; + +namespace BlubbFish.Utils.IoT.Connector { + public abstract class ABackend { + public enum BackendType { + Data, + User + } + public event BackendMessage MessageIncomming; + public event BackendMessage MessageSending; + public delegate void BackendMessage(Object sender, BackendEvent e); + + protected Dictionary settings; + + public abstract Boolean IsConnected { get; } + + public ABackend(Dictionary settings) { + this.settings = settings; + } + + public static ABackend GetInstance(Dictionary settings, BackendType ty) { + if (settings.Count == 0) { + return null; + } + String object_sensor = "BlubbFish.Utils.IoT.Connector." + ty.ToString() + "." + settings["type"].ToUpperLower() + ", " + "Connector" + ty.ToString() + settings["type"].ToUpperLower(); + Type t = null; + try { + t = Type.GetType(object_sensor, true); + } catch (TypeLoadException) { + Console.Error.WriteLine("Configuration: " + settings["type"] + " is not a " + ty.ToString() + "Backend"); + return null; + } catch (System.IO.FileNotFoundException) { + Console.Error.WriteLine("Driver " + object_sensor + " could not load!"); + return null; + } + return (ABackend)t.GetConstructor(new Type[] { typeof(Dictionary) }).Invoke(new Object[] { settings }); + } + + protected void NotifyClientIncomming(BackendEvent value) { + this.MessageIncomming?.Invoke(this, value); + } + + protected void NotifyClientSending(BackendEvent value) { + this.MessageSending?.Invoke(this, value); + } + + public abstract void Dispose(); + } +} diff --git a/IoT/Connector/ADataBackend.cs b/Utils-IoT/Utils-IoT/Connector/ADataBackend.cs similarity index 97% rename from IoT/Connector/ADataBackend.cs rename to Utils-IoT/Utils-IoT/Connector/ADataBackend.cs index 0b33769..cd8ac2b 100644 --- a/IoT/Connector/ADataBackend.cs +++ b/Utils-IoT/Utils-IoT/Connector/ADataBackend.cs @@ -1,10 +1,10 @@ -using System; -using System.Collections.Generic; -using BlubbFish.Utils.IoT.Events; - -namespace BlubbFish.Utils.IoT.Connector { - public abstract class ADataBackend : ABackend { - public ADataBackend(Dictionary settings) : base(settings) { } - public abstract void Send(String topic, String data); - } -} +using System; +using System.Collections.Generic; +using BlubbFish.Utils.IoT.Events; + +namespace BlubbFish.Utils.IoT.Connector { + public abstract class ADataBackend : ABackend { + public ADataBackend(Dictionary settings) : base(settings) { } + public abstract void Send(String topic, String data); + } +} diff --git a/IoT/Connector/AUserBackend.cs b/Utils-IoT/Utils-IoT/Connector/AUserBackend.cs similarity index 97% rename from IoT/Connector/AUserBackend.cs rename to Utils-IoT/Utils-IoT/Connector/AUserBackend.cs index 763900a..fed0e1f 100644 --- a/IoT/Connector/AUserBackend.cs +++ b/Utils-IoT/Utils-IoT/Connector/AUserBackend.cs @@ -1,11 +1,11 @@ -using System; -using System.Collections.Generic; -using BlubbFish.Utils.IoT.Events; - -namespace BlubbFish.Utils.IoT.Connector { - public abstract class AUserBackend : ABackend { - public AUserBackend(Dictionary settings) : base(settings) {} - public abstract void Send(String message); - public abstract void Send(String message, String[] buttons); - } -} +using System; +using System.Collections.Generic; +using BlubbFish.Utils.IoT.Events; + +namespace BlubbFish.Utils.IoT.Connector { + public abstract class AUserBackend : ABackend { + public AUserBackend(Dictionary settings) : base(settings) {} + public abstract void Send(String message); + public abstract void Send(String message, String[] buttons); + } +} diff --git a/IoT/Connector/Helper.cs b/Utils-IoT/Utils-IoT/Connector/Helper.cs similarity index 97% rename from IoT/Connector/Helper.cs rename to Utils-IoT/Utils-IoT/Connector/Helper.cs index eb8a5ac..0565ec3 100644 --- a/IoT/Connector/Helper.cs +++ b/Utils-IoT/Utils-IoT/Connector/Helper.cs @@ -1,26 +1,26 @@ -using System; - -namespace BlubbFish.Utils.IoT.Connector { - public class UserMessageEventArgs : EventArgs { - public UserMessageEventArgs() : base() { } - public UserMessageEventArgs(String message, Int64 UserId, DateTime date) { - this.UserId = UserId; - this.Message = message; - this.Date = date; - } - public Int64 UserId { get; private set; } - public String Message { get; private set; } - public DateTime Date { get; private set; } - } - public class MqttEventArgs : EventArgs { - public MqttEventArgs() : base() { } - public MqttEventArgs(String message, String topic) { - this.Topic = topic; - this.Message = message; - this.Date = DateTime.Now; - } - public String Topic { get; private set; } - public String Message { get; private set; } - public DateTime Date { get; private set; } - } -} +using System; + +namespace BlubbFish.Utils.IoT.Connector { + public class UserMessageEventArgs : EventArgs { + public UserMessageEventArgs() : base() { } + public UserMessageEventArgs(String message, Int64 UserId, DateTime date) { + this.UserId = UserId; + this.Message = message; + this.Date = date; + } + public Int64 UserId { get; private set; } + public String Message { get; private set; } + public DateTime Date { get; private set; } + } + public class MqttEventArgs : EventArgs { + public MqttEventArgs() : base() { } + public MqttEventArgs(String message, String topic) { + this.Topic = topic; + this.Message = message; + this.Date = DateTime.Now; + } + public String Topic { get; private set; } + public String Message { get; private set; } + public DateTime Date { get; private set; } + } +} diff --git a/IoT/Events/BackendEvent.cs b/Utils-IoT/Utils-IoT/Events/BackendEvent.cs similarity index 96% rename from IoT/Events/BackendEvent.cs rename to Utils-IoT/Utils-IoT/Events/BackendEvent.cs index c27aa76..e44db3b 100644 --- a/IoT/Events/BackendEvent.cs +++ b/Utils-IoT/Utils-IoT/Events/BackendEvent.cs @@ -1,22 +1,22 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BlubbFish.Utils.IoT.Events { - public class BackendEvent : EventArgs { - public BackendEvent() : base() { } - public BackendEvent(String message, Object from, DateTime date, String label) { - this.From = from; - this.Message = message; - this.Date = date; - this.Label = label; - } - - public Object From { get; private set; } - public String Message { get; private set; } - public DateTime Date { get; private set; } - public String Label { get; private set; } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BlubbFish.Utils.IoT.Events { + public class BackendEvent : EventArgs { + public BackendEvent() : base() { } + public BackendEvent(String message, Object from, DateTime date, String label) { + this.From = from; + this.Message = message; + this.Date = date; + this.Label = label; + } + + public Object From { get; private set; } + public String Message { get; private set; } + public DateTime Date { get; private set; } + public String Label { get; private set; } + } +} diff --git a/IoT/Events/DataEvent.cs b/Utils-IoT/Utils-IoT/Events/DataEvent.cs similarity index 96% rename from IoT/Events/DataEvent.cs rename to Utils-IoT/Utils-IoT/Events/DataEvent.cs index 11543f4..de48a8b 100644 --- a/IoT/Events/DataEvent.cs +++ b/Utils-IoT/Utils-IoT/Events/DataEvent.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BlubbFish.Utils.IoT.Events { - public class DataEvent : BackendEvent { - public DataEvent(String data) : base() { } - public DataEvent(String message, String topic, DateTime date) : base(message, topic, date, "Data") { } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BlubbFish.Utils.IoT.Events { + public class DataEvent : BackendEvent { + public DataEvent(String data) : base() { } + public DataEvent(String message, String topic, DateTime date) : base(message, topic, date, "Data") { } + } +} diff --git a/IoT/Events/UserEvent.cs b/Utils-IoT/Utils-IoT/Events/UserEvent.cs similarity index 96% rename from IoT/Events/UserEvent.cs rename to Utils-IoT/Utils-IoT/Events/UserEvent.cs index 35348e7..0159747 100644 --- a/IoT/Events/UserEvent.cs +++ b/Utils-IoT/Utils-IoT/Events/UserEvent.cs @@ -1,12 +1,12 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BlubbFish.Utils.IoT.Events { - public class UserEvent : BackendEvent { - public UserEvent() : base() { } - public UserEvent(String message, Int64 UserId, DateTime date) : base(message, UserId, date, "User") { } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BlubbFish.Utils.IoT.Events { + public class UserEvent : BackendEvent { + public UserEvent() : base() { } + public UserEvent(String message, Int64 UserId, DateTime date) : base(message, UserId, date, "User") { } + } +} diff --git a/IoT/Helper.cs b/Utils-IoT/Utils-IoT/Helper.cs similarity index 95% rename from IoT/Helper.cs rename to Utils-IoT/Utils-IoT/Helper.cs index 9ebdee8..1479ab1 100644 --- a/IoT/Helper.cs +++ b/Utils-IoT/Utils-IoT/Helper.cs @@ -1,19 +1,19 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BlubbFish.Utils.IoT { - static class Helper { - internal static String ToUpperLower(this String s) { - if (s.Length == 0) { - return ""; - } - if (s.Length == 1) { - return s.ToUpper(); - } - return s[0].ToString().ToUpper() + s.Substring(1).ToLower(); - } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BlubbFish.Utils.IoT { + static class Helper { + internal static String ToUpperLower(this String s) { + if (s.Length == 0) { + return ""; + } + if (s.Length == 1) { + return s.ToUpper(); + } + return s[0].ToString().ToUpper() + s.Substring(1).ToLower(); + } + } +} diff --git a/IoT/JsonSensor/AJsonSensor.cs b/Utils-IoT/Utils-IoT/JsonSensor/AJsonSensor.cs similarity index 97% rename from IoT/JsonSensor/AJsonSensor.cs rename to Utils-IoT/Utils-IoT/JsonSensor/AJsonSensor.cs index 96919d0..ab0a3c8 100644 --- a/IoT/JsonSensor/AJsonSensor.cs +++ b/Utils-IoT/Utils-IoT/JsonSensor/AJsonSensor.cs @@ -1,129 +1,129 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text.RegularExpressions; -using System.Threading; -using BlubbFish.Utils.IoT.Connector; -using BlubbFish.Utils.IoT.Events; - -namespace BlubbFish.Utils.IoT.JsonSensor { - public abstract class AJsonSensor : IDisposable { - protected String topic; - protected Int32 pollcount; - protected Dictionary settings; - protected ABackend backend; - private Thread pollingThread; - private Boolean pollEnabled = false; - - public AJsonSensor(Dictionary settings, String name, ABackend backend) { - this.GetBool = true; - this.GetFloat = 0.0f; - this.GetInt = 0; - this.topic = (settings.Keys.Contains("topic")) ? settings["topic"] : ""; - this.settings = settings; - this.Title = (settings.Keys.Contains("title")) ? settings["title"] : ""; - this.Name = name; - this.backend = backend; - this.backend.MessageIncomming += this.IncommingMqttMessage; - if (settings.Keys.Contains("polling")) { - this.pollEnabled = true; - this.Polling = Int32.Parse(settings["polling"]); - this.pollcount = this.Polling; - this.pollingThread = new Thread(this.SensorPolling); - this.pollingThread.Start(); - } - } - - private void SensorPolling() { - while(this.pollEnabled) { - Thread.Sleep(1000); - this.Poll(); - } - } - - private void IncommingMqttMessage(Object sender, BackendEvent e) { - if(Regex.Match(e.From.ToString(), this.topic).Success) { - if (this.UpdateValue(e)) { - this.Timestamp = DateTime.Now; - this.Update?.Invoke(this, e); - } - } - } - - public static AJsonSensor GetInstance(Dictionary backends, Dictionary settings, String name) { - String object_sensor = "BlubbFish.Utils.IoT.JsonSensor." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower(); - Type t = null; - try { - t = Type.GetType(object_sensor, true); - } catch(TypeLoadException) { - throw new ArgumentException("Sensor: " + object_sensor + " is not a Sensor"); - } - if(!settings.ContainsKey("backend") || !backends.ContainsKey(settings["backend"])) { - throw new ArgumentException("Backend not specified!"); - } - return (AJsonSensor)t.GetConstructor(new Type[] { typeof(Dictionary), typeof(String), typeof(ABackend) }).Invoke(new Object[] { settings, name, backends[settings["backend"]] }); - } - - protected virtual void Poll() { - if(this.pollcount++ >= this.Polling) { - this.pollcount = 1; - if (this.backend is ADataBackend) { - ((ADataBackend)this.backend).Send(this.topic + "/get", ""); - } - } - } - - public virtual void SetBool(Boolean v) { - if (this.backend is ADataBackend) { - ((ADataBackend)this.backend).Send(this.topic + "/set", v ? "on" : "off"); - } - } - - protected abstract Boolean UpdateValue(BackendEvent e); - - public Single GetFloat { get; protected set; } - public Boolean GetBool { get; protected set; } - public Int32 GetInt { get; protected set; } - public Types Datatypes { get; protected set; } - public DateTime Timestamp { get; protected set; } - public Int32 Polling { get; private set; } - public String Title { get; protected set; } - public String Name { get; internal set; } - - public enum Types { - Bool, - Int, - Float - } - public delegate void UpdatedValue(Object sender, EventArgs e); - public event UpdatedValue Update; - - #region IDisposable Support - private Boolean disposedValue = false; - - - protected virtual void Dispose(Boolean disposing) { - if(!this.disposedValue) { - if(disposing) { - this.pollEnabled = false; - if (this.pollingThread != null && this.pollingThread.ThreadState == ThreadState.Running) { - this.pollingThread.Abort(); - while (this.pollingThread.ThreadState != ThreadState.Aborted) { } - } - this.backend.MessageIncomming -= this.IncommingMqttMessage; - } - this.settings = null; - this.pollingThread = null; - this.disposedValue = true; - } - } - ~AJsonSensor() { - Dispose(false); - } - public void Dispose() { - Dispose(true); - GC.SuppressFinalize(this); - } - #endregion - } +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text.RegularExpressions; +using System.Threading; +using BlubbFish.Utils.IoT.Connector; +using BlubbFish.Utils.IoT.Events; + +namespace BlubbFish.Utils.IoT.JsonSensor { + public abstract class AJsonSensor : IDisposable { + protected String topic; + protected Int32 pollcount; + protected Dictionary settings; + protected ABackend backend; + private Thread pollingThread; + private Boolean pollEnabled = false; + + public AJsonSensor(Dictionary settings, String name, ABackend backend) { + this.GetBool = true; + this.GetFloat = 0.0f; + this.GetInt = 0; + this.topic = (settings.Keys.Contains("topic")) ? settings["topic"] : ""; + this.settings = settings; + this.Title = (settings.Keys.Contains("title")) ? settings["title"] : ""; + this.Name = name; + this.backend = backend; + this.backend.MessageIncomming += this.IncommingMqttMessage; + if (settings.Keys.Contains("polling")) { + this.pollEnabled = true; + this.Polling = Int32.Parse(settings["polling"]); + this.pollcount = this.Polling; + this.pollingThread = new Thread(this.SensorPolling); + this.pollingThread.Start(); + } + } + + private void SensorPolling() { + while(this.pollEnabled) { + Thread.Sleep(1000); + this.Poll(); + } + } + + private void IncommingMqttMessage(Object sender, BackendEvent e) { + if(Regex.Match(e.From.ToString(), this.topic).Success) { + if (this.UpdateValue(e)) { + this.Timestamp = DateTime.Now; + this.Update?.Invoke(this, e); + } + } + } + + public static AJsonSensor GetInstance(Dictionary backends, Dictionary settings, String name) { + String object_sensor = "BlubbFish.Utils.IoT.JsonSensor." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower(); + Type t = null; + try { + t = Type.GetType(object_sensor, true); + } catch(TypeLoadException) { + throw new ArgumentException("Sensor: " + object_sensor + " is not a Sensor"); + } + if(!settings.ContainsKey("backend") || !backends.ContainsKey(settings["backend"])) { + throw new ArgumentException("Backend not specified!"); + } + return (AJsonSensor)t.GetConstructor(new Type[] { typeof(Dictionary), typeof(String), typeof(ABackend) }).Invoke(new Object[] { settings, name, backends[settings["backend"]] }); + } + + protected virtual void Poll() { + if(this.pollcount++ >= this.Polling) { + this.pollcount = 1; + if (this.backend is ADataBackend) { + ((ADataBackend)this.backend).Send(this.topic + "/get", ""); + } + } + } + + public virtual void SetBool(Boolean v) { + if (this.backend is ADataBackend) { + ((ADataBackend)this.backend).Send(this.topic + "/set", v ? "on" : "off"); + } + } + + protected abstract Boolean UpdateValue(BackendEvent e); + + public Single GetFloat { get; protected set; } + public Boolean GetBool { get; protected set; } + public Int32 GetInt { get; protected set; } + public Types Datatypes { get; protected set; } + public DateTime Timestamp { get; protected set; } + public Int32 Polling { get; private set; } + public String Title { get; protected set; } + public String Name { get; internal set; } + + public enum Types { + Bool, + Int, + Float + } + public delegate void UpdatedValue(Object sender, EventArgs e); + public event UpdatedValue Update; + + #region IDisposable Support + private Boolean disposedValue = false; + + + protected virtual void Dispose(Boolean disposing) { + if(!this.disposedValue) { + if(disposing) { + this.pollEnabled = false; + if (this.pollingThread != null && this.pollingThread.ThreadState == ThreadState.Running) { + this.pollingThread.Abort(); + while (this.pollingThread.ThreadState != ThreadState.Aborted) { } + } + this.backend.MessageIncomming -= this.IncommingMqttMessage; + } + this.settings = null; + this.pollingThread = null; + this.disposedValue = true; + } + } + ~AJsonSensor() { + Dispose(false); + } + public void Dispose() { + Dispose(true); + GC.SuppressFinalize(this); + } + #endregion + } } \ No newline at end of file diff --git a/IoT/JsonSensor/Bosmon.cs b/Utils-IoT/Utils-IoT/JsonSensor/Bosmon.cs similarity index 97% rename from IoT/JsonSensor/Bosmon.cs rename to Utils-IoT/Utils-IoT/JsonSensor/Bosmon.cs index c77ea75..7ac1565 100644 --- a/IoT/JsonSensor/Bosmon.cs +++ b/Utils-IoT/Utils-IoT/JsonSensor/Bosmon.cs @@ -1,34 +1,34 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using BlubbFish.Utils.IoT.Connector; -using BlubbFish.Utils.IoT.Events; -using LitJson; - -namespace BlubbFish.Utils.IoT.JsonSensor { - class Bosmon : AJsonSensor { - public Bosmon(Dictionary settings, String name, ABackend backend) : base(settings, name, backend) { - } - - public String Ric { get; private set; } - public String Message { get; private set; } - public String Func { get; private set; } - public DateTime Time { get; private set; } - - protected override Boolean UpdateValue(BackendEvent e) { - try { - JsonData json = JsonMapper.ToObject(e.Message); - if(json.ContainsKey("TYPE_POCSAG")) { - if(this.settings["rics"].Split(';').ToList().Contains(json["Address"].ToString())) { - this.Ric = json["Address"].ToString(); - this.Message = json["Msg"].ToString(); - this.Func = json["Func"].ToString(); - this.Time = new DateTime(Int64.Parse(json["Timestamp"].ToString())); - return true; - } - } - } catch(Exception) { } - return false; - } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using BlubbFish.Utils.IoT.Connector; +using BlubbFish.Utils.IoT.Events; +using LitJson; + +namespace BlubbFish.Utils.IoT.JsonSensor { + class Bosmon : AJsonSensor { + public Bosmon(Dictionary settings, String name, ABackend backend) : base(settings, name, backend) { + } + + public String Ric { get; private set; } + public String Message { get; private set; } + public String Func { get; private set; } + public DateTime Time { get; private set; } + + protected override Boolean UpdateValue(BackendEvent e) { + try { + JsonData json = JsonMapper.ToObject(e.Message); + if(json.ContainsKey("TYPE_POCSAG")) { + if(this.settings["rics"].Split(';').ToList().Contains(json["Address"].ToString())) { + this.Ric = json["Address"].ToString(); + this.Message = json["Msg"].ToString(); + this.Func = json["Func"].ToString(); + this.Time = new DateTime(Int64.Parse(json["Timestamp"].ToString())); + return true; + } + } + } catch(Exception) { } + return false; + } + } +} diff --git a/IoT/JsonSensor/Luminanz.cs b/Utils-IoT/Utils-IoT/JsonSensor/Luminanz.cs similarity index 96% rename from IoT/JsonSensor/Luminanz.cs rename to Utils-IoT/Utils-IoT/JsonSensor/Luminanz.cs index 9fa07fe..be73396 100644 --- a/IoT/JsonSensor/Luminanz.cs +++ b/Utils-IoT/Utils-IoT/JsonSensor/Luminanz.cs @@ -1,21 +1,21 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using BlubbFish.Utils.IoT.Connector; -using BlubbFish.Utils.IoT.Events; - -namespace BlubbFish.Utils.IoT.JsonSensor { - class Luminanz : AJsonSensor { - public Luminanz(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { - this.GetBool = true; - this.GetFloat = 0.0f; - this.GetInt = 0; - this.Datatypes = Types.Int; - } - - protected override Boolean UpdateValue(BackendEvent e) { - this.GetInt = Int32.Parse(e.Message, new CultureInfo("en-US")); - return true; - } - } -} +using System; +using System.Collections.Generic; +using System.Globalization; +using BlubbFish.Utils.IoT.Connector; +using BlubbFish.Utils.IoT.Events; + +namespace BlubbFish.Utils.IoT.JsonSensor { + class Luminanz : AJsonSensor { + public Luminanz(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { + this.GetBool = true; + this.GetFloat = 0.0f; + this.GetInt = 0; + this.Datatypes = Types.Int; + } + + protected override Boolean UpdateValue(BackendEvent e) { + this.GetInt = Int32.Parse(e.Message, new CultureInfo("en-US")); + return true; + } + } +} diff --git a/IoT/JsonSensor/Pir.cs b/Utils-IoT/Utils-IoT/JsonSensor/Pir.cs similarity index 96% rename from IoT/JsonSensor/Pir.cs rename to Utils-IoT/Utils-IoT/JsonSensor/Pir.cs index de00a26..75d076b 100644 --- a/IoT/JsonSensor/Pir.cs +++ b/Utils-IoT/Utils-IoT/JsonSensor/Pir.cs @@ -1,17 +1,17 @@ -using System; -using System.Collections.Generic; -using BlubbFish.Utils.IoT.Connector; -using BlubbFish.Utils.IoT.Events; - -namespace BlubbFish.Utils.IoT.JsonSensor { - class Pir : AJsonSensor { - public Pir(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { - this.Datatypes = Types.Bool; - } - - protected override Boolean UpdateValue(BackendEvent e) { - this.GetBool = (e.Message.ToLower() == "on") ? true : false; - return true; - } - } +using System; +using System.Collections.Generic; +using BlubbFish.Utils.IoT.Connector; +using BlubbFish.Utils.IoT.Events; + +namespace BlubbFish.Utils.IoT.JsonSensor { + class Pir : AJsonSensor { + public Pir(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { + this.Datatypes = Types.Bool; + } + + protected override Boolean UpdateValue(BackendEvent e) { + this.GetBool = (e.Message.ToLower() == "on") ? true : false; + return true; + } + } } \ No newline at end of file diff --git a/IoT/JsonSensor/Power.cs b/Utils-IoT/Utils-IoT/JsonSensor/Power.cs similarity index 96% rename from IoT/JsonSensor/Power.cs rename to Utils-IoT/Utils-IoT/JsonSensor/Power.cs index f15a6a8..4f1b785 100644 --- a/IoT/JsonSensor/Power.cs +++ b/Utils-IoT/Utils-IoT/JsonSensor/Power.cs @@ -1,21 +1,21 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using BlubbFish.Utils.IoT.Connector; -using BlubbFish.Utils.IoT.Events; - -namespace BlubbFish.Utils.IoT.JsonSensor { - class Power : AJsonSensor { - public Power(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { - this.GetBool = true; - this.GetFloat = 0.0f; - this.GetInt = 0; - this.Datatypes = Types.Float; - } - - protected override Boolean UpdateValue(BackendEvent e) { - this.GetFloat = Single.Parse(e.Message, new CultureInfo("en-US")); - return true; - } - } -} +using System; +using System.Collections.Generic; +using System.Globalization; +using BlubbFish.Utils.IoT.Connector; +using BlubbFish.Utils.IoT.Events; + +namespace BlubbFish.Utils.IoT.JsonSensor { + class Power : AJsonSensor { + public Power(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { + this.GetBool = true; + this.GetFloat = 0.0f; + this.GetInt = 0; + this.Datatypes = Types.Float; + } + + protected override Boolean UpdateValue(BackendEvent e) { + this.GetFloat = Single.Parse(e.Message, new CultureInfo("en-US")); + return true; + } + } +} diff --git a/IoT/JsonSensor/Switch.cs b/Utils-IoT/Utils-IoT/JsonSensor/Switch.cs similarity index 96% rename from IoT/JsonSensor/Switch.cs rename to Utils-IoT/Utils-IoT/JsonSensor/Switch.cs index 712c757..273475c 100644 --- a/IoT/JsonSensor/Switch.cs +++ b/Utils-IoT/Utils-IoT/JsonSensor/Switch.cs @@ -1,17 +1,17 @@ -using System; -using System.Collections.Generic; -using BlubbFish.Utils.IoT.Connector; -using BlubbFish.Utils.IoT.Events; - -namespace BlubbFish.Utils.IoT.JsonSensor { - class Switch : AJsonSensor { - public Switch(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { - this.Datatypes = Types.Bool; - } - - protected override Boolean UpdateValue(BackendEvent e) { - this.GetBool = (e.Message.ToLower() == "on") ? true : false; - return true; - } - } +using System; +using System.Collections.Generic; +using BlubbFish.Utils.IoT.Connector; +using BlubbFish.Utils.IoT.Events; + +namespace BlubbFish.Utils.IoT.JsonSensor { + class Switch : AJsonSensor { + public Switch(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { + this.Datatypes = Types.Bool; + } + + protected override Boolean UpdateValue(BackendEvent e) { + this.GetBool = (e.Message.ToLower() == "on") ? true : false; + return true; + } + } } \ No newline at end of file diff --git a/IoT/JsonSensor/Temperatur.cs b/Utils-IoT/Utils-IoT/JsonSensor/Temperatur.cs similarity index 96% rename from IoT/JsonSensor/Temperatur.cs rename to Utils-IoT/Utils-IoT/JsonSensor/Temperatur.cs index 3a03237..ed708b7 100644 --- a/IoT/JsonSensor/Temperatur.cs +++ b/Utils-IoT/Utils-IoT/JsonSensor/Temperatur.cs @@ -1,21 +1,21 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using BlubbFish.Utils.IoT.Connector; -using BlubbFish.Utils.IoT.Events; - -namespace BlubbFish.Utils.IoT.JsonSensor { - class Temperatur : AJsonSensor { - public Temperatur(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { - this.GetBool = true; - this.GetFloat = 0.0f; - this.GetInt = 0; - this.Datatypes = Types.Float; - } - - protected override Boolean UpdateValue(BackendEvent e) { - this.GetFloat = Single.Parse(e.Message, new CultureInfo("en-US")); - return true; - } - } +using System; +using System.Collections.Generic; +using System.Globalization; +using BlubbFish.Utils.IoT.Connector; +using BlubbFish.Utils.IoT.Events; + +namespace BlubbFish.Utils.IoT.JsonSensor { + class Temperatur : AJsonSensor { + public Temperatur(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { + this.GetBool = true; + this.GetFloat = 0.0f; + this.GetInt = 0; + this.Datatypes = Types.Float; + } + + protected override Boolean UpdateValue(BackendEvent e) { + this.GetFloat = Single.Parse(e.Message, new CultureInfo("en-US")); + return true; + } + } } \ No newline at end of file diff --git a/IoT/Properties/AssemblyInfo.cs b/Utils-IoT/Utils-IoT/Properties/AssemblyInfo.cs similarity index 97% rename from IoT/Properties/AssemblyInfo.cs rename to Utils-IoT/Utils-IoT/Properties/AssemblyInfo.cs index 5a657bb..d8b40b1 100644 --- a/IoT/Properties/AssemblyInfo.cs +++ b/Utils-IoT/Utils-IoT/Properties/AssemblyInfo.cs @@ -1,36 +1,36 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die einer Assembly zugeordnet sind. -[assembly: AssemblyTitle("IoT")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("IoT")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly -// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von -// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("b870e4d5-6806-4a0b-b233-8907eedc5afc")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// 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.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// Allgemeine Informationen über eine Assembly werden über die folgenden +// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, +// die einer Assembly zugeordnet sind. +[assembly: AssemblyTitle("IoT")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("IoT")] +[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly +// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von +// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen. +[assembly: ComVisible(false)] + +// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird +[assembly: Guid("b870e4d5-6806-4a0b-b233-8907eedc5afc")] + +// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: +// +// Hauptversion +// Nebenversion +// Buildnummer +// Revision +// +// 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.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/IoT/Utils-IoT.csproj b/Utils-IoT/Utils-IoT/Utils-IoT.csproj similarity index 97% rename from IoT/Utils-IoT.csproj rename to Utils-IoT/Utils-IoT/Utils-IoT.csproj index 1622c64..0660f38 100644 --- a/IoT/Utils-IoT.csproj +++ b/Utils-IoT/Utils-IoT/Utils-IoT.csproj @@ -1,60 +1,60 @@ - - - - - Debug - AnyCPU - {B870E4D5-6806-4A0B-B233-8907EEDC5AFC} - Library - Properties - BlubbFish.Utils.IoT - Utils-IoT - v4.7.1 - 512 - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - {91a14cd2-2940-4500-8193-56d37edddbaa} - litjson_4.7.1 - - - + + + + + Debug + AnyCPU + {B870E4D5-6806-4A0B-B233-8907EEDC5AFC} + Library + Properties + BlubbFish.Utils.IoT + Utils-IoT + v4.7.1 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + {91a14cd2-2940-4500-8193-56d37edddbaa} + litjson_4.7.1 + + + \ No newline at end of file