From 3ac9fb2e3252779ce4afdf7dcd9893d76965a5d4 Mon Sep 17 00:00:00 2001
From: BlubbFish <git@blubbfish.net>
Date: Sun, 1 Oct 2017 22:08:32 +0000
Subject: [PATCH] [NF] Komplette Umbenennung

---
 IoT-Bot/Condition/ACondition.cs | 10 +++++-----
 IoT-Bot/Condition/Edge.cs       |  9 +++++----
 IoT-Bot/ConditionWorker.cs      | 14 +++++++-------
 IoT-Bot/IoT-Bot.csproj          |  1 +
 IoT-Bot/Program.cs              | 10 +++++-----
 IoT-Bot/condition.ini.example   |  4 ++++
 6 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 IoT-Bot/condition.ini.example

diff --git a/IoT-Bot/Condition/ACondition.cs b/IoT-Bot/Condition/ACondition.cs
index a53f0e6..b9164a3 100644
--- a/IoT-Bot/Condition/ACondition.cs
+++ b/IoT-Bot/Condition/ACondition.cs
@@ -1,9 +1,9 @@
-using Dashboard.Sensor;
-using System;
+using System;
 using System.Collections.Generic;
-using Dashboard.Connector;
+using IoTBot.Connector;
+using IoTBot.Sensor;
 
-namespace MqttToTelegram.Condition {
+namespace IoTBot.Condition {
   abstract class ACondition {
     protected ASensor sensor;
     protected Dictionary<String, String> settings;
@@ -24,7 +24,7 @@ namespace MqttToTelegram.Condition {
     protected abstract void Sensor_Update(Object sender, EventArgs e);
 
     public static ACondition GetInstance(Dictionary<String, String> settings, ADataBackend backend) {
-      String object_condition = "MqttToTelegram.Condition." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower();
+      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);
diff --git a/IoT-Bot/Condition/Edge.cs b/IoT-Bot/Condition/Edge.cs
index 35955f1..0aafa8a 100644
--- a/IoT-Bot/Condition/Edge.cs
+++ b/IoT-Bot/Condition/Edge.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
-using Dashboard.Connector;
+using IoTBot.Connector;
+using IoTBot.Sensor;
 
-namespace MqttToTelegram.Condition {
+namespace IoTBot.Condition {
   class Edge : ACondition {
     private Boolean histBool;
 
@@ -11,10 +12,10 @@ namespace MqttToTelegram.Condition {
     }
 
     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/ConditionWorker.cs b/IoT-Bot/ConditionWorker.cs
index 3d679de..e0b5061 100644
--- a/IoT-Bot/ConditionWorker.cs
+++ b/IoT-Bot/ConditionWorker.cs
@@ -1,15 +1,15 @@
-using BlubbFish.Utils;
-using System;
+using System;
 using System.Collections.Generic;
-using Dashboard.Connector;
-using MqttToTelegram.Condition;
+using BlubbFish.Utils;
+using IoTBot.Condition;
+using IoTBot.Connector;
 
-namespace MqttToTelegram {
+namespace IoTBot {
   class ConditionWorker {
     private InIReader ini;
     private static ConditionWorker instance;
     private List<ACondition> conditions;
-    private Telegram telegram;
+    private Connector.Telegram telegram;
 
     public static ConditionWorker GetInstance(ADataBackend backend) {
       if (instance == null) {
@@ -18,7 +18,7 @@ namespace MqttToTelegram {
       return instance;
     }
 
-    internal void Run(Telegram telegram) {
+    internal void Run(Connector.Telegram telegram) {
       this.telegram = telegram;
     }
 
diff --git a/IoT-Bot/IoT-Bot.csproj b/IoT-Bot/IoT-Bot.csproj
index 800a082..a5f5883 100644
--- a/IoT-Bot/IoT-Bot.csproj
+++ b/IoT-Bot/IoT-Bot.csproj
@@ -79,6 +79,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="condition.ini.example" />
     <None Include="packages.config" />
     <None Include="settings.ini.example" />
   </ItemGroup>
diff --git a/IoT-Bot/Program.cs b/IoT-Bot/Program.cs
index 8a27a76..7a67aaa 100644
--- a/IoT-Bot/Program.cs
+++ b/IoT-Bot/Program.cs
@@ -1,16 +1,16 @@
 using System;
 using BlubbFish.Utils;
-using Dashboard.Connector;
+using IoTBot.Connector;
 
-namespace MqttToTelegram {
+namespace IoTBot {
   class Program {
     static void Main(String[] args) {
       ADataBackend mqtt = ADataBackend.GetInstance(InIReader.GetInstance("settings.ini").GetSection("mqtt"));
-      ConditionWorker.GetInstance(mqtt).Run(Telegram.Instance);
+      ConditionWorker.GetInstance(mqtt).Run(Connector.Telegram.Instance);
       mqtt.MessageIncomming += Mqtt_MessageIncomming;
       mqtt.MessageSending += Mqtt_MessageSending;
-      Telegram.Instance.MessageIncomming += Telegram_MessageIncomming;
-      Telegram.Instance.MessageSending += Telegram_MessageSending;
+      Connector.Telegram.Instance.MessageIncomming += Telegram_MessageIncomming;
+      Connector.Telegram.Instance.MessageSending += Telegram_MessageSending;
       
       while(true) {
         System.Threading.Thread.Sleep(100);
diff --git a/IoT-Bot/condition.ini.example b/IoT-Bot/condition.ini.example
new file mode 100644
index 0000000..89ffc42
--- /dev/null
+++ b/IoT-Bot/condition.ini.example
@@ -0,0 +1,4 @@
+[test]
+type=Edge
+sensor=Power
+sensor_topic=/test/powersensor
\ No newline at end of file