From 8d80a132dcdd1a065b95179dd2e8f32ab5ac3c55 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Mon, 2 Oct 2017 00:49:44 +0200 Subject: [PATCH] [NF] Umbenennung zu IoTBot Namespace --- .gitignore | 3 ++ IoT-Bot/IoT-Bot/Condition/ACondition.cs | 31 +++++++++------- IoT-Bot/IoT-Bot/Condition/ConditionWorker.cs | 35 ------------------ IoT-Bot/IoT-Bot/Condition/Edge.cs | 13 +++---- IoT-Bot/IoT-Bot/ConditionWorker.cs | 34 +++++++++++++++++ IoT-Bot/IoT-Bot/Connector/ADataBackend.cs | 6 +-- IoT-Bot/IoT-Bot/Connector/Mosquitto.cs | 2 +- IoT-Bot/IoT-Bot/Connector/Mqtt.cs | 2 +- IoT-Bot/IoT-Bot/Connector/Telegram.cs | 8 ++-- IoT-Bot/IoT-Bot/IoT-Bot.csproj | 3 +- IoT-Bot/IoT-Bot/Program.cs | 31 ++++++++-------- IoT-Bot/IoT-Bot/Sensor/ASensor.cs | 10 ++--- IoT-Bot/IoT-Bot/Sensor/Flex4GridSwitch.cs | 4 +- IoT-Bot/IoT-Bot/Sensor/Flex4gridPower.cs | 4 +- IoT-Bot/IoT-Bot/Sensor/Luminanz.cs | 12 +++--- IoT-Bot/IoT-Bot/Sensor/Pir.cs | 12 +++--- IoT-Bot/IoT-Bot/Sensor/Power.cs | 4 +- IoT-Bot/IoT-Bot/Sensor/Switch.cs | 4 +- IoT-Bot/IoT-Bot/Sensor/Temperatur.cs | 12 +++--- IoT-Bot/IoT-Bot/condition.ini.example | 4 ++ IoT-Bot/IoT-Bot/settings.ini.example | 7 +++- .../Mqtt-Dashboard/Connector/ADataBackend.cs | 6 +-- .../Mqtt-Dashboard/Connector/Mosquitto.cs | 2 +- .../Mqtt-Dashboard/Connector/Mqtt.cs | 3 +- .../Mqtt-Dashboard/Connector/Telegram.cs | 8 ++-- Mqtt-Dashboard/Mqtt-Dashboard/Form1.cs | 4 +- .../Mqtt-Dashboard/Sensor/ASensor.cs | 10 ++--- .../Mqtt-Dashboard/Sensor/Flex4GridSwitch.cs | 4 +- .../Mqtt-Dashboard/Sensor/Flex4gridPower.cs | 4 +- .../Mqtt-Dashboard/Sensor/Luminanz.cs | 12 +++--- Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Pir.cs | 12 +++--- Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Power.cs | 4 +- .../Mqtt-Dashboard/Sensor/Switch.cs | 4 +- .../Mqtt-Dashboard/Sensor/Temperatur.cs | 12 +++--- .../Mqtt-Dashboard/Tracings/ATracings.cs | 2 +- .../Mqtt-Dashboard/Tracings/Graph.cs | 2 +- .../Mqtt-Dashboard/Tracings/Meter.cs | 2 +- .../Mqtt-Dashboard/Tracings/PowerMeter.cs | 2 +- .../Mqtt-Dashboard/Tracings/Switcher.cs | 4 +- .../Mqtt-Dashboard/bin/Release/Dashboard.exe | Bin 33280 -> 33280 bytes .../Mqtt-Dashboard/bin/Release/Utils.dll | Bin 24576 -> 24576 bytes .../Connector/ADataBackend.cs | 6 +-- .../Mqtt-SWB-Dashboard/Connector/Mosquitto.cs | 2 +- .../Mqtt-SWB-Dashboard/Connector/Mqtt.cs | 3 +- .../Mqtt-SWB-Dashboard/Connector/Telegram.cs | 8 ++-- .../Mqtt-SWB-Dashboard/MainWindow.xaml.cs | 2 +- .../Mqtt-SWB-Dashboard/Stats.cs | 2 +- 47 files changed, 186 insertions(+), 175 deletions(-) delete mode 100644 IoT-Bot/IoT-Bot/Condition/ConditionWorker.cs create mode 100644 IoT-Bot/IoT-Bot/ConditionWorker.cs create mode 100644 IoT-Bot/IoT-Bot/condition.ini.example diff --git a/.gitignore b/.gitignore index c2af6b6..08ea109 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,6 @@ /IoT-Bot/IoT-Bot/Connector/.svn /IoT-Bot/IoT-Bot/obj/Debug /IoT-Bot/IoT-Bot/Sensor/.svn +/Mqtt-Dashboard/Mqtt-Dashboard/Connector/.svn +/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/.svn +/IoT-Bot/IoT-Bot/bin/Debug diff --git a/IoT-Bot/IoT-Bot/Condition/ACondition.cs b/IoT-Bot/IoT-Bot/Condition/ACondition.cs index c0357d1..e2c84d5 100644 --- a/IoT-Bot/IoT-Bot/Condition/ACondition.cs +++ b/IoT-Bot/IoT-Bot/Condition/ACondition.cs @@ -1,32 +1,37 @@ -using Dashboard.Sensor; -using System; +using System; using System.Collections.Generic; +using IoTBot.Connector; +using IoTBot.Sensor; -namespace MqttToTelegram.Condition { +namespace IoTBot.Condition { abstract class ACondition { protected ASensor sensor; protected Dictionary settings; - public ACondition(Dictionary settings) { + public ACondition(Dictionary settings, ADataBackend backend) { this.settings = settings; - Dictionary l = new Dictionary(); - l.Add("topic", this.settings["sensor_topic"]); - l.Add("polling", this.settings["sensor_polling"]); - this.sensor = ASensor.GetInstance(this.settings["sensor"],l); - this.sensor.Update += Sensor_Update; + Dictionary l = new Dictionary { + { "topic", this.settings["sensor_topic"] }, + { "type", this.settings["sensor"] } + }; + if(settings.ContainsKey("sensor_polling")) { + l.Add("polling", this.settings["sensor_polling"]); + } + this.sensor = ASensor.GetInstance(backend, l, "testSensor"); + this.sensor.Update += this.Sensor_Update; } protected abstract void Sensor_Update(Object sender, EventArgs e); - public static ACondition GetInstance(String v, Dictionary dictionary) { - string object_condition = "MqttToTelegram.Condition." + char.ToUpper(v[0]) + v.Substring(1).ToLower(); + public static ACondition GetInstance(Dictionary settings, ADataBackend backend) { + String object_condition = "IoTBot.Condition." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower(); Type t = null; try { t = Type.GetType(object_condition, true); } catch(TypeLoadException) { - throw new ArgumentException("condition.ini: " + v + " is not a Sensor"); + throw new ArgumentException("condition.ini: " + settings["type"] + " is not a Sensor"); } - return (ACondition)t.GetConstructor(new Type[] { typeof(Dictionary) }).Invoke(new object[] { dictionary }); + return (ACondition)t.GetConstructor(new Type[] { typeof(Dictionary), typeof(ADataBackend) }).Invoke(new Object[] { settings, backend }); } } } \ No newline at end of file diff --git a/IoT-Bot/IoT-Bot/Condition/ConditionWorker.cs b/IoT-Bot/IoT-Bot/Condition/ConditionWorker.cs deleted file mode 100644 index b4d2f5a..0000000 --- a/IoT-Bot/IoT-Bot/Condition/ConditionWorker.cs +++ /dev/null @@ -1,35 +0,0 @@ -using BlubbFish.Utils; -using System; -using System.Collections.Generic; -using Dashboard.Connector; - -namespace MqttToTelegram.Condition { - class ConditionWorker { - private InIReader ini; - private static ConditionWorker instance; - private List conditions; - private Telegram telegram; - - public static ConditionWorker Instance { - get { - if(instance == null) { - instance = new ConditionWorker(); - } - return instance; - } - } - - internal void Run(Telegram telegram) { - this.telegram = telegram; - } - - private ConditionWorker() { - this.ini = InIReader.GetInstance("condition.ini"); - this.conditions = new List(); - List sections = this.ini.GetSections(); - foreach(String section in sections) { - this.conditions.Add(ACondition.GetInstance(this.ini.GetValue(section,"type"), this.ini.GetSection(section))); - } - } - } -} diff --git a/IoT-Bot/IoT-Bot/Condition/Edge.cs b/IoT-Bot/IoT-Bot/Condition/Edge.cs index ee52876..72ce7c7 100644 --- a/IoT-Bot/IoT-Bot/Condition/Edge.cs +++ b/IoT-Bot/IoT-Bot/Condition/Edge.cs @@ -1,22 +1,21 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using IoTBot.Connector; +using IoTBot.Sensor; -namespace MqttToTelegram.Condition { +namespace IoTBot.Condition { class Edge : ACondition { private Boolean histBool; - public Edge(Dictionary settings) : base(settings) { + public Edge(Dictionary settings, ADataBackend backend) : base(settings, backend) { } protected override void Sensor_Update(Object sender, EventArgs e) { - if(this.sensor.Datatypes == Dashboard.Sensor.ASensor.Types.Bool) { + if(this.sensor.Datatypes == ASensor.Types.Bool) { if(this.sensor.GetBool == Boolean.Parse(this.settings["sensor_value"]) && this.histBool != this.sensor.GetBool) { this.histBool = this.sensor.GetBool; - Telegram.Instance.Send("Jemand ist DA!"); + IoTBot.Connector.Telegram.Instance.Send("Jemand ist DA!"); } else { this.histBool = this.sensor.GetBool; } diff --git a/IoT-Bot/IoT-Bot/ConditionWorker.cs b/IoT-Bot/IoT-Bot/ConditionWorker.cs new file mode 100644 index 0000000..1c05f41 --- /dev/null +++ b/IoT-Bot/IoT-Bot/ConditionWorker.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using BlubbFish.Utils; +using IoTBot.Condition; +using IoTBot.Connector; + +namespace IoTBot { + class ConditionWorker { + private InIReader ini; + private static ConditionWorker instance; + private List conditions; + private Connector.Telegram telegram; + + public static ConditionWorker GetInstance(ADataBackend backend) { + if (instance == null) { + instance = new ConditionWorker(backend); + } + return instance; + } + + internal void Run(Connector.Telegram telegram) { + this.telegram = telegram; + } + + private ConditionWorker(ADataBackend backend) { + this.ini = InIReader.GetInstance("condition.ini"); + this.conditions = new List(); + List sections = this.ini.GetSections(); + foreach(String section in sections) { + this.conditions.Add(ACondition.GetInstance(this.ini.GetSection(section), backend)); + } + } + } +} diff --git a/IoT-Bot/IoT-Bot/Connector/ADataBackend.cs b/IoT-Bot/IoT-Bot/Connector/ADataBackend.cs index 33a0301..b1b3705 100644 --- a/IoT-Bot/IoT-Bot/Connector/ADataBackend.cs +++ b/IoT-Bot/IoT-Bot/Connector/ADataBackend.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; -namespace Dashboard.Connector { +namespace IoTBot.Connector { public abstract class ADataBackend { public abstract event MqttMessage MessageIncomming; public abstract event MqttMessage MessageSending; - public delegate void MqttMessage(Object sender, MqttEventArgs e); + public delegate void MqttMessage(ADataBackend sender, MqttEventArgs e); public static ADataBackend GetInstance(Dictionary dictionary) { - String object_sensor = "Dashboard.Connector." + Char.ToUpper(dictionary["type"][0]) + dictionary["type"].Substring(1).ToLower(); + String object_sensor = "IoTBot.Connector." + Char.ToUpper(dictionary["type"][0]) + dictionary["type"].Substring(1).ToLower(); Type t = null; try { t = Type.GetType(object_sensor, true); diff --git a/IoT-Bot/IoT-Bot/Connector/Mosquitto.cs b/IoT-Bot/IoT-Bot/Connector/Mosquitto.cs index cf88022..f3bf4a4 100644 --- a/IoT-Bot/IoT-Bot/Connector/Mosquitto.cs +++ b/IoT-Bot/IoT-Bot/Connector/Mosquitto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Text.RegularExpressions; -namespace Dashboard.Connector { +namespace IoTBot.Connector { class Mosquitto : ADataBackend, IDisposable { private Process p; private String message; diff --git a/IoT-Bot/IoT-Bot/Connector/Mqtt.cs b/IoT-Bot/IoT-Bot/Connector/Mqtt.cs index 401b568..f12dc34 100644 --- a/IoT-Bot/IoT-Bot/Connector/Mqtt.cs +++ b/IoT-Bot/IoT-Bot/Connector/Mqtt.cs @@ -4,7 +4,7 @@ using System.Text; using uPLibrary.Networking.M2Mqtt; using uPLibrary.Networking.M2Mqtt.Messages; -namespace Dashboard.Connector { +namespace IoTBot.Connector { class Mqtt : ADataBackend, IDisposable { private MqttClient client; diff --git a/IoT-Bot/IoT-Bot/Connector/Telegram.cs b/IoT-Bot/IoT-Bot/Connector/Telegram.cs index 4ec1ded..973c923 100644 --- a/IoT-Bot/IoT-Bot/Connector/Telegram.cs +++ b/IoT-Bot/IoT-Bot/Connector/Telegram.cs @@ -5,7 +5,7 @@ using Telegram.Bot.Args; using Telegram.Bot.Exceptions; using Telegram.Bot.Types; -namespace MqttToTelegram { +namespace IoTBot.Connector { class Telegram { private static Telegram instance; private TelegramBotClient bot; @@ -17,8 +17,8 @@ namespace MqttToTelegram { public event TelegramMessage MessageSending; private Telegram() { - bot = new TelegramBotClient(InIReader.GetInstance("settings.ini").GetValue("general", "telegram-key")); - bot.OnMessage += Bot_OnMessage; + this.bot = new TelegramBotClient(InIReader.GetInstance("settings.ini").GetValue("general", "telegram-key")); + this.bot.OnMessage += this.Bot_OnMessage; this.Connect(); } @@ -36,7 +36,7 @@ namespace MqttToTelegram { } private void Connect() { - bot.StartReceiving(); + this.bot.StartReceiving(); this.chat = new ChatId(InIReader.GetInstance("settings.ini").GetValue("general", "chatid")); } diff --git a/IoT-Bot/IoT-Bot/IoT-Bot.csproj b/IoT-Bot/IoT-Bot/IoT-Bot.csproj index 097ad94..f2fc0e6 100644 --- a/IoT-Bot/IoT-Bot/IoT-Bot.csproj +++ b/IoT-Bot/IoT-Bot/IoT-Bot.csproj @@ -62,7 +62,7 @@ - + @@ -79,6 +79,7 @@ + diff --git a/IoT-Bot/IoT-Bot/Program.cs b/IoT-Bot/IoT-Bot/Program.cs index d14f89b..19ba3e8 100644 --- a/IoT-Bot/IoT-Bot/Program.cs +++ b/IoT-Bot/IoT-Bot/Program.cs @@ -1,25 +1,24 @@ -using Dashboard.Connector; -using MqttToTelegram.Condition; -using System; -using System.Text; -using uPLibrary.Networking.M2Mqtt.Messages; +using System; +using BlubbFish.Utils; +using IoTBot.Connector; -namespace MqttToTelegram { +namespace IoTBot { class Program { - static void Main(string[] args) { - ConditionWorker.Instance.Run(Telegram.Instance); - Mqtt.Instance.MessageIncomming += Mqtt_MessageIncomming; - Mqtt.Instance.MessageSending += Mqtt_MessageSending; - Telegram.Instance.MessageIncomming += Telegram_MessageIncomming; - Telegram.Instance.MessageSending += Telegram_MessageSending; + static void Main(String[] args) { + ADataBackend mqtt = ADataBackend.GetInstance(InIReader.GetInstance("settings.ini").GetSection("mqtt")); + ConditionWorker.GetInstance(mqtt).Run(Connector.Telegram.Instance); + mqtt.MessageIncomming += Mqtt_MessageIncomming; + mqtt.MessageSending += Mqtt_MessageSending; + Connector.Telegram.Instance.MessageIncomming += Telegram_MessageIncomming; + Connector.Telegram.Instance.MessageSending += Telegram_MessageSending; while(true) { System.Threading.Thread.Sleep(100); } } - private static void Mqtt_MessageSending(Object sender, MqttMsgPublishEventArgs e) { - Console.WriteLine("-> [" + DateTime.Now.ToUniversalTime() + "] MQTT: " + Encoding.UTF8.GetString(e.Message) + " on " + e.Topic); + private static void Mqtt_MessageSending(ADataBackend sender, MqttEventArgs e) { + Console.WriteLine("-> [" + DateTime.Now.ToUniversalTime() + "] MQTT: " + e.Message + " on " + e.Topic); } private static void Telegram_MessageSending(Object sender, global::Telegram.Bot.Types.Message e) { @@ -30,8 +29,8 @@ namespace MqttToTelegram { Console.WriteLine("<- [" + e.Date.ToUniversalTime() + "] Telegram: " + e.Text + " on " + e.Chat.Id); } - private static void Mqtt_MessageIncomming(Object sender, MqttMsgPublishEventArgs e) { - Console.WriteLine("<- [" + DateTime.Now.ToUniversalTime() + "] MQTT: " + Encoding.UTF8.GetString(e.Message) + " on " + e.Topic); + private static void Mqtt_MessageIncomming(ADataBackend sender, MqttEventArgs e) { + Console.WriteLine("<- [" + DateTime.Now.ToUniversalTime() + "] MQTT: " + e.Message + " on " + e.Topic); } } } diff --git a/IoT-Bot/IoT-Bot/Sensor/ASensor.cs b/IoT-Bot/IoT-Bot/Sensor/ASensor.cs index ccbd6b7..ec51c14 100644 --- a/IoT-Bot/IoT-Bot/Sensor/ASensor.cs +++ b/IoT-Bot/IoT-Bot/Sensor/ASensor.cs @@ -1,11 +1,11 @@ -using Dashboard.Connector; -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Text.RegularExpressions; +using System.Threading; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { public abstract class ASensor : IDisposable { protected String topic; protected Int32 pollcount; @@ -50,7 +50,7 @@ namespace Dashboard.Sensor { } internal static ASensor GetInstance(ADataBackend backend, Dictionary dictionary, String name) { - String object_sensor = "Dashboard.Sensor." + Char.ToUpper(dictionary["type"][0]) + dictionary["type"].Substring(1).ToLower(); + String object_sensor = "IoTBot.Sensor." + Char.ToUpper(dictionary["type"][0]) + dictionary["type"].Substring(1).ToLower(); Type t = null; try { t = Type.GetType(object_sensor, true); diff --git a/IoT-Bot/IoT-Bot/Sensor/Flex4GridSwitch.cs b/IoT-Bot/IoT-Bot/Sensor/Flex4GridSwitch.cs index 20deb4d..895eb47 100644 --- a/IoT-Bot/IoT-Bot/Sensor/Flex4GridSwitch.cs +++ b/IoT-Bot/IoT-Bot/Sensor/Flex4GridSwitch.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Globalization; using System.Text.RegularExpressions; -using Dashboard.Connector; +using IoTBot.Connector; using LitJson; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Flex4gridswitch : ASensor { private String id; diff --git a/IoT-Bot/IoT-Bot/Sensor/Flex4gridPower.cs b/IoT-Bot/IoT-Bot/Sensor/Flex4gridPower.cs index db95d9a..2c5d463 100644 --- a/IoT-Bot/IoT-Bot/Sensor/Flex4gridPower.cs +++ b/IoT-Bot/IoT-Bot/Sensor/Flex4gridPower.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Globalization; -using Dashboard.Connector; +using IoTBot.Connector; using LitJson; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Flex4gridpower : ASensor { private String id; diff --git a/IoT-Bot/IoT-Bot/Sensor/Luminanz.cs b/IoT-Bot/IoT-Bot/Sensor/Luminanz.cs index 1e5eb9f..1bd6eb7 100644 --- a/IoT-Bot/IoT-Bot/Sensor/Luminanz.cs +++ b/IoT-Bot/IoT-Bot/Sensor/Luminanz.cs @@ -1,20 +1,20 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Text; -using uPLibrary.Networking.M2Mqtt.Messages; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Luminanz : ASensor { - public Luminanz(Dictionary settings) : base(settings) { + 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 void UpdateValue(MqttMsgPublishEventArgs e) { - this.GetInt = Int32.Parse(Encoding.UTF8.GetString(e.Message), new CultureInfo("en-US")); + protected override Boolean UpdateValue(MqttEventArgs e) { + this.GetInt = Int32.Parse(e.Message, new CultureInfo("en-US")); + return true; } } } diff --git a/IoT-Bot/IoT-Bot/Sensor/Pir.cs b/IoT-Bot/IoT-Bot/Sensor/Pir.cs index 79f8d8f..88b1870 100644 --- a/IoT-Bot/IoT-Bot/Sensor/Pir.cs +++ b/IoT-Bot/IoT-Bot/Sensor/Pir.cs @@ -1,16 +1,16 @@ using System; using System.Collections.Generic; -using System.Text; -using uPLibrary.Networking.M2Mqtt.Messages; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Pir : ASensor { - public Pir(Dictionary settings) : base(settings) { + public Pir(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { this.Datatypes = Types.Bool; } - protected override void UpdateValue(MqttMsgPublishEventArgs e) { - this.GetBool = (Encoding.UTF8.GetString(e.Message).ToLower() == "on") ? true : false; + protected override Boolean UpdateValue(MqttEventArgs e) { + this.GetBool = (e.Message.ToLower() == "on") ? true : false; + return true; } } } \ No newline at end of file diff --git a/IoT-Bot/IoT-Bot/Sensor/Power.cs b/IoT-Bot/IoT-Bot/Sensor/Power.cs index d796e1b..16cac83 100644 --- a/IoT-Bot/IoT-Bot/Sensor/Power.cs +++ b/IoT-Bot/IoT-Bot/Sensor/Power.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Globalization; -using Dashboard.Connector; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Power : ASensor { public Power(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { this.GetBool = true; diff --git a/IoT-Bot/IoT-Bot/Sensor/Switch.cs b/IoT-Bot/IoT-Bot/Sensor/Switch.cs index 7537208..1b53ca3 100644 --- a/IoT-Bot/IoT-Bot/Sensor/Switch.cs +++ b/IoT-Bot/IoT-Bot/Sensor/Switch.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using Dashboard.Connector; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Switch : ASensor { public Switch(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { this.Datatypes = Types.Bool; diff --git a/IoT-Bot/IoT-Bot/Sensor/Temperatur.cs b/IoT-Bot/IoT-Bot/Sensor/Temperatur.cs index 702b871..c9a1973 100644 --- a/IoT-Bot/IoT-Bot/Sensor/Temperatur.cs +++ b/IoT-Bot/IoT-Bot/Sensor/Temperatur.cs @@ -1,20 +1,20 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Text; -using uPLibrary.Networking.M2Mqtt.Messages; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Temperatur : ASensor { - public Temperatur(Dictionary settings) : base(settings) { + 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 void UpdateValue(MqttMsgPublishEventArgs e) { - this.GetFloat = Single.Parse(Encoding.UTF8.GetString(e.Message), new CultureInfo("en-US")); + protected override Boolean UpdateValue(MqttEventArgs e) { + this.GetFloat = Single.Parse(e.Message, new CultureInfo("en-US")); + return true; } } } \ No newline at end of file diff --git a/IoT-Bot/IoT-Bot/condition.ini.example b/IoT-Bot/IoT-Bot/condition.ini.example new file mode 100644 index 0000000..8ae8a93 --- /dev/null +++ b/IoT-Bot/IoT-Bot/condition.ini.example @@ -0,0 +1,4 @@ +[test] +type=Edge +sensor=Power +sensor_topic=/test/powersensor \ No newline at end of file diff --git a/IoT-Bot/IoT-Bot/settings.ini.example b/IoT-Bot/IoT-Bot/settings.ini.example index ef6a45c..c5a9de1 100644 --- a/IoT-Bot/IoT-Bot/settings.ini.example +++ b/IoT-Bot/IoT-Bot/settings.ini.example @@ -1,4 +1,7 @@ [general] -mqtt-server=localhost telegram-key=ABCDEFGH -chatid=1234 \ No newline at end of file +chatid=1234 + +[mqtt] +server=localhost +type=mqtt \ No newline at end of file diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Connector/ADataBackend.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Connector/ADataBackend.cs index 33a0301..b1b3705 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Connector/ADataBackend.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Connector/ADataBackend.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; -namespace Dashboard.Connector { +namespace IoTBot.Connector { public abstract class ADataBackend { public abstract event MqttMessage MessageIncomming; public abstract event MqttMessage MessageSending; - public delegate void MqttMessage(Object sender, MqttEventArgs e); + public delegate void MqttMessage(ADataBackend sender, MqttEventArgs e); public static ADataBackend GetInstance(Dictionary dictionary) { - String object_sensor = "Dashboard.Connector." + Char.ToUpper(dictionary["type"][0]) + dictionary["type"].Substring(1).ToLower(); + String object_sensor = "IoTBot.Connector." + Char.ToUpper(dictionary["type"][0]) + dictionary["type"].Substring(1).ToLower(); Type t = null; try { t = Type.GetType(object_sensor, true); diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Mosquitto.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Mosquitto.cs index cf88022..f3bf4a4 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Mosquitto.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Mosquitto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Text.RegularExpressions; -namespace Dashboard.Connector { +namespace IoTBot.Connector { class Mosquitto : ADataBackend, IDisposable { private Process p; private String message; diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Mqtt.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Mqtt.cs index 36d21a4..f12dc34 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Mqtt.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Mqtt.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using BlubbFish.Utils; using uPLibrary.Networking.M2Mqtt; using uPLibrary.Networking.M2Mqtt.Messages; -namespace Dashboard.Connector { +namespace IoTBot.Connector { class Mqtt : ADataBackend, IDisposable { private MqttClient client; diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Telegram.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Telegram.cs index 4ec1ded..973c923 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Telegram.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Connector/Telegram.cs @@ -5,7 +5,7 @@ using Telegram.Bot.Args; using Telegram.Bot.Exceptions; using Telegram.Bot.Types; -namespace MqttToTelegram { +namespace IoTBot.Connector { class Telegram { private static Telegram instance; private TelegramBotClient bot; @@ -17,8 +17,8 @@ namespace MqttToTelegram { public event TelegramMessage MessageSending; private Telegram() { - bot = new TelegramBotClient(InIReader.GetInstance("settings.ini").GetValue("general", "telegram-key")); - bot.OnMessage += Bot_OnMessage; + this.bot = new TelegramBotClient(InIReader.GetInstance("settings.ini").GetValue("general", "telegram-key")); + this.bot.OnMessage += this.Bot_OnMessage; this.Connect(); } @@ -36,7 +36,7 @@ namespace MqttToTelegram { } private void Connect() { - bot.StartReceiving(); + this.bot.StartReceiving(); this.chat = new ChatId(InIReader.GetInstance("settings.ini").GetValue("general", "chatid")); } diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Form1.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Form1.cs index a05edce..3ecf6c6 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Form1.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Form1.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Windows.Forms; using BlubbFish.Utils; -using Dashboard.Connector; -using Dashboard.Sensor; +using IoTBot.Connector; +using IoTBot.Sensor; using Dashboard.Tracings; namespace Dashboard { diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/ASensor.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/ASensor.cs index ccbd6b7..ec51c14 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/ASensor.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/ASensor.cs @@ -1,11 +1,11 @@ -using Dashboard.Connector; -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Threading; using System.Text.RegularExpressions; +using System.Threading; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { public abstract class ASensor : IDisposable { protected String topic; protected Int32 pollcount; @@ -50,7 +50,7 @@ namespace Dashboard.Sensor { } internal static ASensor GetInstance(ADataBackend backend, Dictionary dictionary, String name) { - String object_sensor = "Dashboard.Sensor." + Char.ToUpper(dictionary["type"][0]) + dictionary["type"].Substring(1).ToLower(); + String object_sensor = "IoTBot.Sensor." + Char.ToUpper(dictionary["type"][0]) + dictionary["type"].Substring(1).ToLower(); Type t = null; try { t = Type.GetType(object_sensor, true); diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Flex4GridSwitch.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Flex4GridSwitch.cs index 20deb4d..895eb47 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Flex4GridSwitch.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Flex4GridSwitch.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Globalization; using System.Text.RegularExpressions; -using Dashboard.Connector; +using IoTBot.Connector; using LitJson; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Flex4gridswitch : ASensor { private String id; diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Flex4gridPower.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Flex4gridPower.cs index db95d9a..2c5d463 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Flex4gridPower.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Flex4gridPower.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Globalization; -using Dashboard.Connector; +using IoTBot.Connector; using LitJson; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Flex4gridpower : ASensor { private String id; diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Luminanz.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Luminanz.cs index 1e5eb9f..1bd6eb7 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Luminanz.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Luminanz.cs @@ -1,20 +1,20 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Text; -using uPLibrary.Networking.M2Mqtt.Messages; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Luminanz : ASensor { - public Luminanz(Dictionary settings) : base(settings) { + 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 void UpdateValue(MqttMsgPublishEventArgs e) { - this.GetInt = Int32.Parse(Encoding.UTF8.GetString(e.Message), new CultureInfo("en-US")); + protected override Boolean UpdateValue(MqttEventArgs e) { + this.GetInt = Int32.Parse(e.Message, new CultureInfo("en-US")); + return true; } } } diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Pir.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Pir.cs index 79f8d8f..88b1870 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Pir.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Pir.cs @@ -1,16 +1,16 @@ using System; using System.Collections.Generic; -using System.Text; -using uPLibrary.Networking.M2Mqtt.Messages; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Pir : ASensor { - public Pir(Dictionary settings) : base(settings) { + public Pir(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { this.Datatypes = Types.Bool; } - protected override void UpdateValue(MqttMsgPublishEventArgs e) { - this.GetBool = (Encoding.UTF8.GetString(e.Message).ToLower() == "on") ? true : false; + protected override Boolean UpdateValue(MqttEventArgs e) { + this.GetBool = (e.Message.ToLower() == "on") ? true : false; + return true; } } } \ No newline at end of file diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Power.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Power.cs index d796e1b..16cac83 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Power.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Power.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Globalization; -using Dashboard.Connector; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Power : ASensor { public Power(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { this.GetBool = true; diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Switch.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Switch.cs index 7537208..1b53ca3 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Switch.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Switch.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using Dashboard.Connector; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Switch : ASensor { public Switch(Dictionary settings, String name, ADataBackend backend) : base(settings, name, backend) { this.Datatypes = Types.Bool; diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Temperatur.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Temperatur.cs index 702b871..c9a1973 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Temperatur.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Temperatur.cs @@ -1,20 +1,20 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Text; -using uPLibrary.Networking.M2Mqtt.Messages; +using IoTBot.Connector; -namespace Dashboard.Sensor { +namespace IoTBot.Sensor { class Temperatur : ASensor { - public Temperatur(Dictionary settings) : base(settings) { + 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 void UpdateValue(MqttMsgPublishEventArgs e) { - this.GetFloat = Single.Parse(Encoding.UTF8.GetString(e.Message), new CultureInfo("en-US")); + protected override Boolean UpdateValue(MqttEventArgs e) { + this.GetFloat = Single.Parse(e.Message, new CultureInfo("en-US")); + return true; } } } \ No newline at end of file diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/ATracings.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/ATracings.cs index e400472..0ec5ca6 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/ATracings.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/ATracings.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Windows.Forms; -using Dashboard.Sensor; +using IoTBot.Sensor; namespace Dashboard.Tracings { public abstract class ATracings { diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Graph.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Graph.cs index 7bb1d2e..2109779 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Graph.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Graph.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; -using Dashboard.Sensor; +using IoTBot.Sensor; using OxyPlot; using OxyPlot.Axes; using OxyPlot.Series; diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Meter.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Meter.cs index 928f9aa..956011d 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Meter.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Meter.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Dashboard.Sensor; +using IoTBot.Sensor; using System; using System.Windows.Forms; using System.Linq; diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/PowerMeter.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/PowerMeter.cs index 3a4b3ca..64aec5a 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/PowerMeter.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/PowerMeter.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using System.Windows.Forms; -using Dashboard.Sensor; +using IoTBot.Sensor; namespace Dashboard.Tracings { class Powermeter : Meter { diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Switcher.cs b/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Switcher.cs index 83679f4..c2d7fbf 100644 --- a/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Switcher.cs +++ b/Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Switcher.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Globalization; using System.Windows.Forms; -using Dashboard.Connector; -using Dashboard.Sensor; +using IoTBot.Connector; +using IoTBot.Sensor; namespace Dashboard.Tracings { class Switcher : ATracings { diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/bin/Release/Dashboard.exe b/Mqtt-Dashboard/Mqtt-Dashboard/bin/Release/Dashboard.exe index e190e878649f454accf4b21c507a07d7f763f61a..54577af3d4f983687193c81ba2beee53a3eb117a 100644 GIT binary patch delta 4755 zcmb7I3s{s@8vf4t=l^FM=KjwGklQqZGpj-bhzKeuN+Y^n@P;?!Q6B?MbRtE`M)FeT zrRcC2tLp_TLf4c=OY*Un%3O3?SKEEeu3lXfLYkqx%c>5Ys7)R(2ZW^v~0xX=F^a^%@tQL{Zr(9{+~K z?vBZ#__aP}KIz4-#>9E&YhZ~sP>1N9%56??Dj6w*jRrp9%v)TX$x>rI!X=z7iPc4L zHzklGce+Jy9tl9=oq=Lj9UGBUiSqjR2wFJ+KvN$d8K@J2-Xd_AjdTaDkB`FG=VK?4 zW|kP2Z+jmNX^)oNkV6~eUME41f|b0@GZ}^ytsIDf19@C1IyV_9k-xrERmfH6(Z0W1 z3C!(w5%O-AchI8CWnoX372Pge9_+D9PoK>_eYSS{2>H)1)6mo9K(~vK|HK7%LQ{4Q zWY8;tV{D=)6g|I&#rmmZza27c6udwf?I{94sxqj>NLl@d>6O+~`v@ zawg9U%wlB7q(C7X>Ww3LtjJqR6n4@ZB1-5%-x`VN z86A+4>eb<#9mTk1LlAy(l2(qw4XO<1)2K%st;BPnSrqOy5zudX1kXgk%Sr}#b&06# zCkIBex&h0RzjFb23d#c|ix=Dn__>ewh=akDjG zRd7v?&*`$QX84qSn3!BtfczpI$HBe6F)HBhwJ%H$X~uR{fihyJCWx`r8uSolZddj2 zih;}5JA7yvRDDJp9M@kBb3(ECAj&D)F94ktmw^nmUCjd>D@%$sW@GdTI==FH^Al`a zQZ#92%}MTHu`ALZ1HU!YJ7XZ*mS9uhI@oCpOhP&&;wVsS@)`B88rRjsvnIa!GaBV)8tA~CHFLA#} zP0{fv9hORL&mw2N(*`R=9wQZ=%@GI3Og1h#Hi8#&zU+*x@R=E3EpV5fubmb)nq5oIoLgs| zVVjInERk3sQk`M@4d`&ds_?O>H&NFMR2(x4#29Yc!qF~5a9I}4IUrVW!;yD z8c*0y$ppS}{u$B8s#84u&RM>YHQ-ghM!c;(=lmYEBOFGBK#S9j_<`y}+{->pacK|Q zvlI;;g_|i!+6_)F_p+4K$Fw{GfmGI-8XerCmMaQWn!k`0xJ~ylR-hz_tU|2PPed%1 zGZ43^RX>reLrItK21QX?h)WEvTJGS8D|`a6eH}5=hi%w0!9c4t~xxzI+Ylq z^#@%uT7J{Tu~`F0npJDF5)Oazc6zg>fg>?)`@nR>q;$SUema*_rx%+`9pTz6Xc@$9 z*XoutGRW6Yb##^~)BX}R3l1w_6EgVf8!}d*odQMhHr{4kwH3jIE{=Hy*P-39!F5=LUt10pc&+k| z)v)=Q1*mDx?A?z?SP8{lH4E-;Ket;0K^*ZOI(945hhDxcjs;mfhmBe3v8r_#+VYPC zZ;)ehg?8N!+!1*-yO=d0b_1RUf7cRSM^OuEK3t+z%tJP_H;4I*n;qQ7fE5xDl3a0KLlW6<`P1`Y=Sn9A_=~=vd1(j9)}|q9n)F0EHx2r^R2*OD!LKPU3rs+DZ&FAH+1-fQvKIp##X8(H z%;i7~cPUUpU2+OZ6+xGx{cxmtH6;`reo{r3*rp=B@0dYK=u65Rqz{2|teqnl}}t`~LFa*LU+;1Vx} z^E;fh6~o;@&(q!7RGK49b4Z#p6^*XjX44L;veUy|!MALcw2hV;mmwae4w#A6KT3N^ ze3aVgP?T2*U#qlR`#932maVj!9Ki1S=-*vCkalC+SCBN@Q*@s2wMrMr5gH+R91h&v zAYPSjy4=u0my%6}-_u2y`cBA&VfsgDE(Ezc7t-~$Fi)8JaN%L-a74a9$H2?3SZR#d zj!B)^+qe_Ph)F6Jlk|X?qzB+hS1n8uJu4SeH4km_rL|&6tI00cHpr0pw9P}C*;0fQ z?wBWS!pUPFjj$B+S{p@`eq4T)(<*(y-pcim zwX8ii+UR#wXtqO=JyzN+ZDa0{uHZyRgQiIg%oS1N6>`n=il$8}#(m2YE#@m8N6BTo z1=^$lo{css2CHt95(M2~aX^R2{0bQ)y{WlEi~eF=7mB9qGe2%neP4Xr)`j_q>CQldLlS>X5?a4pPIcqdfP1 zV9P?fk6}1sDQY{2B>NG!<1#bFPPWn6IHI|@+Y98U#BMJF3#o-gP(!|g99%IdZxUnq zl$eVZggG5JLHxXBXfA2i$-MZD9NF$svBej)iFju>BdYK!VsGFQ4}6N)557lC5tu1( zgplWhMwbW$LNY_(T!=!+LKua39~9{Punps^!8ht|=FW4GOQDRs%VgXZEx;UY4Pv|F z*NBylorqTqdl2t%HXv@Z?L!=FK8QFoj7#E`!-ypUb(GUvWR8cl2SW?}a|!<5I6XSk z_Y%GV`5USGvsaG9_wv8WLUKJz$?r=V*o=I)aS#5QInrs-655deokj7NO&VTS&bG`f z>?A{<&pfAuTIWuY4AFil!!tJ=u{@N#Uix8=hFX$YBCek;=@ M14Gu;|3F^*PmXK?KmY&$ delta 4757 zcmb7I4OG-s7QgTPXZ|w`^Yx#P|A6u}4Jfl9M1Y8(r1249ONt^YhLf;{TIk3siUw?A zDZ0i!qR3LAHYKyo9Wzblb7!rf{;VxpO9oWrU2@e$fID#+p~evsq*`sb>wOj+8P& z?WXN{01{9L29WCmZo1v2)Jm{K^3MQRQZ*aE;D3^x3f)0oXRAiI$N&PoP5B{;S0&%*~;)(9PS8@7sC_GCox*p35*k;r$f^b5#h=|ICTuE zs&{yNqG5MOWK#TE7g0eh>`Fvb>>>>;(fPL_#?It6$GMb*lF>%}SGn>Yrzf$LNRMy{ zVM`+Qq1;XO=V=Gr!Z+mrkQmj!fHg;kCN?175fe&l#{g(LVn+D431XxO9Bd;)fjeTt zF!tHV>EsYgh$^u4pdlSr5}h1qih7IGCCZq|8NQMNlxXc(4D2uBq^O(^C9!_Pz)%Gr zI*a!4ZrNWon{uUS9 z2~E{$(1Jnsce81pK;0$o|36eB_|{73{!1kWU4~Uc=l@A19{Nco27QKALg)X_l^Apx zRtcT|=PSW_qr+lvV8$IWAsT;>4wm>$2vr~BzF~v;?WkaXNgXjG{ce^T(?;UhiI`F5 zd~Wn98mUR;{wgMoT1d?7;Zb449B3NVMn(*^M?95=`bhFuu!*rzq==QpE+jT~EH*%F zfk(WLNadchIh21EiYz?J`sm2Q@>4wbf{V zFiXGP0Edj6-{|zBWux6|vcVCO z*-PjpgA9+D_!|0k9JMOPVx!k|8=NBB&1SgZ$W_cxWY1MbL85w5m0_RcHI0Hw`whha z2QU{I`es{rXev@Y8SFLL$p|xm8A{bwqYM_Ar?*_a5^RG5>&TJ$YX0KnIEfV|MTYW3UQ;g_%<#0U*kJ}@e9mns?ydbA699tZmF_?=TGIZ&7*+#+J_KWHb_{@T@7P!N}=S~g2k6lg5 zn7>W&*=8V%DH1D0*?qR>K#vX9fRAdI>@y$;?AT^jh%id_5VQ*wTBen2PKXrRWYnT? z#3Qs;3m*%G7!l+3dG|2>xs&2%~b}!<3iQBFcB^daM3D3?TXOW={MWlx-7UhF!mgqG44%_6q-IVTve{i1yGg2 zBfSNS4L02`VUy4>12#3C&%Qo=4cf_2250a#8_cZ?&JSwLGrkS&4vufbEb?{LP=nVh zuh=uJBBKaLx-v$_@d&HHH<+`~?#}0Sk3t=`_^>f{Bg2bc-b{`~nS2dRnQ4)#l7+VX zBf;C`pmvMg_@lO8Tf;77PL14*r-5Koa6E?>F~w%&@^QQ>P-asngvV64xO__GaXv)( z-&*PhB5<$B;n8aGs8TpPd=_rQq9zzg0t=t$G4Z$(Jd9U9feLo-#Cr?*I;dbIIH%$K zP5=Lw=d0((q-SCx`H+QXcm$PVia`3DSUw#g;9gR!w{`agu`&vlnM&v+uQ(0X%2)6*-aPGDabr)D1k0WGR{R* z6(6|i?+pvk>(`DNaDZNU48q`7YAbl@z1A%lzl?4}CeO74W|6u!9ll%XY5Oj8s4?t; zBw9vaMcbH{zYzSPXOk^Kete zttx7FG|0`3|@9@CGFH}eID^h@D?oBnc$rwv)$jBL-GPk6ONdR-Xdg49J0;Ey$wEuTnj5;0zt zI;Fokc3@pgoJ5l(y(C*Td!((}Fq9uNST$Y5qEA3Pj9!POV}=xso0K{4(sWA~*n8O? zvVmRC4mTA#Yc$V7sv}Zrm)e;-$5mJ2+@aYc8m33&*h8+G4{3TOAMRVGC^4V$2r@km zEA&b=cs6>a2+X=yiWl+@s}uUf%6rH->A0qcm;@eBcR&x>h;Mx_wP^RC{Eid5hIErH zqGG&9a%@K4(;pblYuYfx$B5CaJI9M}nC~=wqLgk8-}63FC@ES(15${#k37SaT+c(7 zZJ8)X8z&HGM?fMbQ8{Eq7JX9B>&R)nZ#w@OL_IW-4Kz`W{PEnPh} Mpwxd(ns3+r6E@=mJpcdz diff --git a/Mqtt-Dashboard/Mqtt-Dashboard/bin/Release/Utils.dll b/Mqtt-Dashboard/Mqtt-Dashboard/bin/Release/Utils.dll index 28f5d3debb41c7436ba7309617ee5861c8898473..dfb96ce21f6df6b43949d0585426421867ccc093 100644 GIT binary patch delta 88 zcmZoTz}RqraY6_4<&~#4c9;4K{QbL?@k3~d`|8{e6B)nfo!cxBuz+0$C>zND1WZ6I o!^psJq7;b385n|sU4l1m;CDQm%jdVQ)~4R$smqbgcfwUT0FkOAApigX delta 88 zcmZoTz}RqraY6?(o6pIO-KG8lPO^8t%v|K^(9WVFHd)?#_hx~B1?)ON*+>Q;U;<(p oMh1oxr9d3czz`Jd63oti@7=ER39kF?-|pEKeou7sop2Qn08B(52LJ#7 diff --git a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/ADataBackend.cs b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/ADataBackend.cs index 33a0301..b1b3705 100644 --- a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/ADataBackend.cs +++ b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/ADataBackend.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; -namespace Dashboard.Connector { +namespace IoTBot.Connector { public abstract class ADataBackend { public abstract event MqttMessage MessageIncomming; public abstract event MqttMessage MessageSending; - public delegate void MqttMessage(Object sender, MqttEventArgs e); + public delegate void MqttMessage(ADataBackend sender, MqttEventArgs e); public static ADataBackend GetInstance(Dictionary dictionary) { - String object_sensor = "Dashboard.Connector." + Char.ToUpper(dictionary["type"][0]) + dictionary["type"].Substring(1).ToLower(); + String object_sensor = "IoTBot.Connector." + Char.ToUpper(dictionary["type"][0]) + dictionary["type"].Substring(1).ToLower(); Type t = null; try { t = Type.GetType(object_sensor, true); diff --git a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Mosquitto.cs b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Mosquitto.cs index cf88022..f3bf4a4 100644 --- a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Mosquitto.cs +++ b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Mosquitto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Text.RegularExpressions; -namespace Dashboard.Connector { +namespace IoTBot.Connector { class Mosquitto : ADataBackend, IDisposable { private Process p; private String message; diff --git a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Mqtt.cs b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Mqtt.cs index 36d21a4..f12dc34 100644 --- a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Mqtt.cs +++ b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Mqtt.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; using System.Text; -using BlubbFish.Utils; using uPLibrary.Networking.M2Mqtt; using uPLibrary.Networking.M2Mqtt.Messages; -namespace Dashboard.Connector { +namespace IoTBot.Connector { class Mqtt : ADataBackend, IDisposable { private MqttClient client; diff --git a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Telegram.cs b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Telegram.cs index 4ec1ded..973c923 100644 --- a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Telegram.cs +++ b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/Telegram.cs @@ -5,7 +5,7 @@ using Telegram.Bot.Args; using Telegram.Bot.Exceptions; using Telegram.Bot.Types; -namespace MqttToTelegram { +namespace IoTBot.Connector { class Telegram { private static Telegram instance; private TelegramBotClient bot; @@ -17,8 +17,8 @@ namespace MqttToTelegram { public event TelegramMessage MessageSending; private Telegram() { - bot = new TelegramBotClient(InIReader.GetInstance("settings.ini").GetValue("general", "telegram-key")); - bot.OnMessage += Bot_OnMessage; + this.bot = new TelegramBotClient(InIReader.GetInstance("settings.ini").GetValue("general", "telegram-key")); + this.bot.OnMessage += this.Bot_OnMessage; this.Connect(); } @@ -36,7 +36,7 @@ namespace MqttToTelegram { } private void Connect() { - bot.StartReceiving(); + this.bot.StartReceiving(); this.chat = new ChatId(InIReader.GetInstance("settings.ini").GetValue("general", "chatid")); } diff --git a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/MainWindow.xaml.cs b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/MainWindow.xaml.cs index 0eaa4be..b16f799 100644 --- a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/MainWindow.xaml.cs +++ b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/MainWindow.xaml.cs @@ -2,7 +2,7 @@ using System; using System.Globalization; using System.Windows; -using Dashboard.Connector; +using IoTBot.Connector; namespace Mqtt_SWB_Dashboard { /// diff --git a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Stats.cs b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Stats.cs index 2d8a587..9a37bd7 100644 --- a/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Stats.cs +++ b/Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Stats.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text.RegularExpressions; -using Dashboard.Connector; +using IoTBot.Connector; using LitJson; using Mqtt_SWB_Dashboard.Helper;