From 56cc4c39d6ac1df153189c61cb138414fe53e9f1 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Thu, 14 Feb 2019 21:15:37 +0100 Subject: [PATCH] Removing the folders that are now repositories --- Utils-IoT/Utils-IoT.sln | 55 -------- Utils-IoT/Utils-IoT/Connector/ABackend.cs | 54 -------- Utils-IoT/Utils-IoT/Connector/ADataBackend.cs | 10 -- Utils-IoT/Utils-IoT/Connector/AUserBackend.cs | 11 -- Utils-IoT/Utils-IoT/Connector/Helper.cs | 26 ---- Utils-IoT/Utils-IoT/Events/BackendEvent.cs | 22 --- Utils-IoT/Utils-IoT/Events/DataEvent.cs | 12 -- Utils-IoT/Utils-IoT/Events/UserEvent.cs | 12 -- Utils-IoT/Utils-IoT/Helper.cs | 19 --- Utils-IoT/Utils-IoT/JsonSensor/AJsonSensor.cs | 129 ------------------ Utils-IoT/Utils-IoT/JsonSensor/Bosmon.cs | 34 ----- Utils-IoT/Utils-IoT/JsonSensor/Luminanz.cs | 21 --- Utils-IoT/Utils-IoT/JsonSensor/Pir.cs | 17 --- Utils-IoT/Utils-IoT/JsonSensor/Power.cs | 21 --- Utils-IoT/Utils-IoT/JsonSensor/Switch.cs | 17 --- Utils-IoT/Utils-IoT/JsonSensor/Temperatur.cs | 21 --- .../Utils-IoT/Properties/AssemblyInfo.cs | 36 ----- Utils-IoT/Utils-IoT/Utils-IoT.csproj | 60 -------- 18 files changed, 577 deletions(-) delete mode 100644 Utils-IoT/Utils-IoT.sln delete mode 100644 Utils-IoT/Utils-IoT/Connector/ABackend.cs delete mode 100644 Utils-IoT/Utils-IoT/Connector/ADataBackend.cs delete mode 100644 Utils-IoT/Utils-IoT/Connector/AUserBackend.cs delete mode 100644 Utils-IoT/Utils-IoT/Connector/Helper.cs delete mode 100644 Utils-IoT/Utils-IoT/Events/BackendEvent.cs delete mode 100644 Utils-IoT/Utils-IoT/Events/DataEvent.cs delete mode 100644 Utils-IoT/Utils-IoT/Events/UserEvent.cs delete mode 100644 Utils-IoT/Utils-IoT/Helper.cs delete mode 100644 Utils-IoT/Utils-IoT/JsonSensor/AJsonSensor.cs delete mode 100644 Utils-IoT/Utils-IoT/JsonSensor/Bosmon.cs delete mode 100644 Utils-IoT/Utils-IoT/JsonSensor/Luminanz.cs delete mode 100644 Utils-IoT/Utils-IoT/JsonSensor/Pir.cs delete mode 100644 Utils-IoT/Utils-IoT/JsonSensor/Power.cs delete mode 100644 Utils-IoT/Utils-IoT/JsonSensor/Switch.cs delete mode 100644 Utils-IoT/Utils-IoT/JsonSensor/Temperatur.cs delete mode 100644 Utils-IoT/Utils-IoT/Properties/AssemblyInfo.cs delete mode 100644 Utils-IoT/Utils-IoT/Utils-IoT.csproj diff --git a/Utils-IoT/Utils-IoT.sln b/Utils-IoT/Utils-IoT.sln deleted file mode 100644 index e6e56fb..0000000 --- a/Utils-IoT/Utils-IoT.sln +++ /dev/null @@ -1,55 +0,0 @@ - -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/Utils-IoT/Utils-IoT/Connector/ABackend.cs b/Utils-IoT/Utils-IoT/Connector/ABackend.cs deleted file mode 100644 index 7eb0adf..0000000 --- a/Utils-IoT/Utils-IoT/Connector/ABackend.cs +++ /dev/null @@ -1,54 +0,0 @@ -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/Utils-IoT/Utils-IoT/Connector/ADataBackend.cs b/Utils-IoT/Utils-IoT/Connector/ADataBackend.cs deleted file mode 100644 index cd8ac2b..0000000 --- a/Utils-IoT/Utils-IoT/Connector/ADataBackend.cs +++ /dev/null @@ -1,10 +0,0 @@ -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/Utils-IoT/Utils-IoT/Connector/AUserBackend.cs b/Utils-IoT/Utils-IoT/Connector/AUserBackend.cs deleted file mode 100644 index fed0e1f..0000000 --- a/Utils-IoT/Utils-IoT/Connector/AUserBackend.cs +++ /dev/null @@ -1,11 +0,0 @@ -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/Utils-IoT/Utils-IoT/Connector/Helper.cs b/Utils-IoT/Utils-IoT/Connector/Helper.cs deleted file mode 100644 index 0565ec3..0000000 --- a/Utils-IoT/Utils-IoT/Connector/Helper.cs +++ /dev/null @@ -1,26 +0,0 @@ -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/Utils-IoT/Utils-IoT/Events/BackendEvent.cs b/Utils-IoT/Utils-IoT/Events/BackendEvent.cs deleted file mode 100644 index e44db3b..0000000 --- a/Utils-IoT/Utils-IoT/Events/BackendEvent.cs +++ /dev/null @@ -1,22 +0,0 @@ -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/Utils-IoT/Utils-IoT/Events/DataEvent.cs b/Utils-IoT/Utils-IoT/Events/DataEvent.cs deleted file mode 100644 index de48a8b..0000000 --- a/Utils-IoT/Utils-IoT/Events/DataEvent.cs +++ /dev/null @@ -1,12 +0,0 @@ -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/Utils-IoT/Utils-IoT/Events/UserEvent.cs b/Utils-IoT/Utils-IoT/Events/UserEvent.cs deleted file mode 100644 index 0159747..0000000 --- a/Utils-IoT/Utils-IoT/Events/UserEvent.cs +++ /dev/null @@ -1,12 +0,0 @@ -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/Utils-IoT/Utils-IoT/Helper.cs b/Utils-IoT/Utils-IoT/Helper.cs deleted file mode 100644 index 1479ab1..0000000 --- a/Utils-IoT/Utils-IoT/Helper.cs +++ /dev/null @@ -1,19 +0,0 @@ -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/Utils-IoT/Utils-IoT/JsonSensor/AJsonSensor.cs b/Utils-IoT/Utils-IoT/JsonSensor/AJsonSensor.cs deleted file mode 100644 index ab0a3c8..0000000 --- a/Utils-IoT/Utils-IoT/JsonSensor/AJsonSensor.cs +++ /dev/null @@ -1,129 +0,0 @@ -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/Utils-IoT/Utils-IoT/JsonSensor/Bosmon.cs b/Utils-IoT/Utils-IoT/JsonSensor/Bosmon.cs deleted file mode 100644 index 7ac1565..0000000 --- a/Utils-IoT/Utils-IoT/JsonSensor/Bosmon.cs +++ /dev/null @@ -1,34 +0,0 @@ -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/Utils-IoT/Utils-IoT/JsonSensor/Luminanz.cs b/Utils-IoT/Utils-IoT/JsonSensor/Luminanz.cs deleted file mode 100644 index be73396..0000000 --- a/Utils-IoT/Utils-IoT/JsonSensor/Luminanz.cs +++ /dev/null @@ -1,21 +0,0 @@ -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/Utils-IoT/Utils-IoT/JsonSensor/Pir.cs b/Utils-IoT/Utils-IoT/JsonSensor/Pir.cs deleted file mode 100644 index 75d076b..0000000 --- a/Utils-IoT/Utils-IoT/JsonSensor/Pir.cs +++ /dev/null @@ -1,17 +0,0 @@ -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/Utils-IoT/Utils-IoT/JsonSensor/Power.cs b/Utils-IoT/Utils-IoT/JsonSensor/Power.cs deleted file mode 100644 index 4f1b785..0000000 --- a/Utils-IoT/Utils-IoT/JsonSensor/Power.cs +++ /dev/null @@ -1,21 +0,0 @@ -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/Utils-IoT/Utils-IoT/JsonSensor/Switch.cs b/Utils-IoT/Utils-IoT/JsonSensor/Switch.cs deleted file mode 100644 index 273475c..0000000 --- a/Utils-IoT/Utils-IoT/JsonSensor/Switch.cs +++ /dev/null @@ -1,17 +0,0 @@ -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/Utils-IoT/Utils-IoT/JsonSensor/Temperatur.cs b/Utils-IoT/Utils-IoT/JsonSensor/Temperatur.cs deleted file mode 100644 index ed708b7..0000000 --- a/Utils-IoT/Utils-IoT/JsonSensor/Temperatur.cs +++ /dev/null @@ -1,21 +0,0 @@ -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/Utils-IoT/Utils-IoT/Properties/AssemblyInfo.cs b/Utils-IoT/Utils-IoT/Properties/AssemblyInfo.cs deleted file mode 100644 index d8b40b1..0000000 --- a/Utils-IoT/Utils-IoT/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +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/Utils-IoT/Utils-IoT/Utils-IoT.csproj b/Utils-IoT/Utils-IoT/Utils-IoT.csproj deleted file mode 100644 index ce2ffe0..0000000 --- a/Utils-IoT/Utils-IoT/Utils-IoT.csproj +++ /dev/null @@ -1,60 +0,0 @@ - - - - - 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