From ceef3daf21f0a8db971ee7dfa8530b9510b5fac6 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Sun, 1 Oct 2017 23:04:57 +0200 Subject: [PATCH] Copy from MqttToTelegram to IoT-Bot --- .gitignore | 5 +++++ MqttToTelegram/MqttToTelegram.sln => IoT-Bot/IoT-Bot.sln | 2 +- .../MqttToTelegram => IoT-Bot/IoT-Bot}/App.config | 0 .../IoT-Bot}/Condition/ACondition.cs | 0 .../IoT-Bot}/Condition/ConditionWorker.cs | 0 .../MqttToTelegram => IoT-Bot/IoT-Bot}/Condition/Edge.cs | 0 .../IoT-Bot}/Connector/ADataBackend.cs | 0 .../IoT-Bot}/Connector/Mosquitto.cs | 0 .../MqttToTelegram => IoT-Bot/IoT-Bot}/Connector/Mqtt.cs | 1 - .../MqttToTelegram => IoT-Bot/IoT-Bot}/Connector/Telegram.cs | 0 .../MqttToTelegram.csproj => IoT-Bot/IoT-Bot/IoT-Bot.csproj | 1 + .../MqttToTelegram => IoT-Bot/IoT-Bot}/Program.cs | 0 .../IoT-Bot}/Properties/AssemblyInfo.cs | 0 .../MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/ASensor.cs | 0 .../IoT-Bot}/Sensor/Flex4GridSwitch.cs | 0 .../IoT-Bot}/Sensor/Flex4gridPower.cs | 0 .../MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Luminanz.cs | 0 .../MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Pir.cs | 0 .../MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Power.cs | 0 .../MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Switch.cs | 0 .../MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Temperatur.cs | 0 .../MqttToTelegram => IoT-Bot/IoT-Bot}/packages.config | 0 .../MqttToTelegram => IoT-Bot/IoT-Bot}/settings.ini.example | 0 23 files changed, 7 insertions(+), 2 deletions(-) rename MqttToTelegram/MqttToTelegram.sln => IoT-Bot/IoT-Bot.sln (84%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/App.config (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Condition/ACondition.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Condition/ConditionWorker.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Condition/Edge.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Connector/ADataBackend.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Connector/Mosquitto.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Connector/Mqtt.cs (98%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Connector/Telegram.cs (100%) rename MqttToTelegram/MqttToTelegram/MqttToTelegram.csproj => IoT-Bot/IoT-Bot/IoT-Bot.csproj (98%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Program.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Properties/AssemblyInfo.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/ASensor.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Flex4GridSwitch.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Flex4gridPower.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Luminanz.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Pir.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Power.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Switch.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/Sensor/Temperatur.cs (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/packages.config (100%) rename {MqttToTelegram/MqttToTelegram => IoT-Bot/IoT-Bot}/settings.ini.example (100%) diff --git a/.gitignore b/.gitignore index 2070ce8..c2af6b6 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,8 @@ /Mqtt-SWB-Dashboard/Mqtt-SWB-Dashboard/Connector/.svn /MqttToTelegram/MqttToTelegram/Connector/.svn /MqttToTelegram/MqttToTelegram/Sensor/.svn +/IoT-Bot/.vs/IoT-Bot/v15 +/IoT-Bot/packages +/IoT-Bot/IoT-Bot/Connector/.svn +/IoT-Bot/IoT-Bot/obj/Debug +/IoT-Bot/IoT-Bot/Sensor/.svn diff --git a/MqttToTelegram/MqttToTelegram.sln b/IoT-Bot/IoT-Bot.sln similarity index 84% rename from MqttToTelegram/MqttToTelegram.sln rename to IoT-Bot/IoT-Bot.sln index fc19be2..e7aa6d9 100644 --- a/MqttToTelegram/MqttToTelegram.sln +++ b/IoT-Bot/IoT-Bot.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MqttToTelegram", "MqttToTelegram\MqttToTelegram.csproj", "{89077643-B472-419F-8EAB-56B9E2D13ABC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IoT-Bot", "IoT-Bot\IoT-Bot.csproj", "{89077643-B472-419F-8EAB-56B9E2D13ABC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/MqttToTelegram/MqttToTelegram/App.config b/IoT-Bot/IoT-Bot/App.config similarity index 100% rename from MqttToTelegram/MqttToTelegram/App.config rename to IoT-Bot/IoT-Bot/App.config diff --git a/MqttToTelegram/MqttToTelegram/Condition/ACondition.cs b/IoT-Bot/IoT-Bot/Condition/ACondition.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Condition/ACondition.cs rename to IoT-Bot/IoT-Bot/Condition/ACondition.cs diff --git a/MqttToTelegram/MqttToTelegram/Condition/ConditionWorker.cs b/IoT-Bot/IoT-Bot/Condition/ConditionWorker.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Condition/ConditionWorker.cs rename to IoT-Bot/IoT-Bot/Condition/ConditionWorker.cs diff --git a/MqttToTelegram/MqttToTelegram/Condition/Edge.cs b/IoT-Bot/IoT-Bot/Condition/Edge.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Condition/Edge.cs rename to IoT-Bot/IoT-Bot/Condition/Edge.cs diff --git a/MqttToTelegram/MqttToTelegram/Connector/ADataBackend.cs b/IoT-Bot/IoT-Bot/Connector/ADataBackend.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Connector/ADataBackend.cs rename to IoT-Bot/IoT-Bot/Connector/ADataBackend.cs diff --git a/MqttToTelegram/MqttToTelegram/Connector/Mosquitto.cs b/IoT-Bot/IoT-Bot/Connector/Mosquitto.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Connector/Mosquitto.cs rename to IoT-Bot/IoT-Bot/Connector/Mosquitto.cs diff --git a/MqttToTelegram/MqttToTelegram/Connector/Mqtt.cs b/IoT-Bot/IoT-Bot/Connector/Mqtt.cs similarity index 98% rename from MqttToTelegram/MqttToTelegram/Connector/Mqtt.cs rename to IoT-Bot/IoT-Bot/Connector/Mqtt.cs index 36d21a4..401b568 100644 --- a/MqttToTelegram/MqttToTelegram/Connector/Mqtt.cs +++ b/IoT-Bot/IoT-Bot/Connector/Mqtt.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Text; -using BlubbFish.Utils; using uPLibrary.Networking.M2Mqtt; using uPLibrary.Networking.M2Mqtt.Messages; diff --git a/MqttToTelegram/MqttToTelegram/Connector/Telegram.cs b/IoT-Bot/IoT-Bot/Connector/Telegram.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Connector/Telegram.cs rename to IoT-Bot/IoT-Bot/Connector/Telegram.cs diff --git a/MqttToTelegram/MqttToTelegram/MqttToTelegram.csproj b/IoT-Bot/IoT-Bot/IoT-Bot.csproj similarity index 98% rename from MqttToTelegram/MqttToTelegram/MqttToTelegram.csproj rename to IoT-Bot/IoT-Bot/IoT-Bot.csproj index 1de068f..097ad94 100644 --- a/MqttToTelegram/MqttToTelegram/MqttToTelegram.csproj +++ b/IoT-Bot/IoT-Bot/IoT-Bot.csproj @@ -65,6 +65,7 @@ + diff --git a/MqttToTelegram/MqttToTelegram/Program.cs b/IoT-Bot/IoT-Bot/Program.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Program.cs rename to IoT-Bot/IoT-Bot/Program.cs diff --git a/MqttToTelegram/MqttToTelegram/Properties/AssemblyInfo.cs b/IoT-Bot/IoT-Bot/Properties/AssemblyInfo.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Properties/AssemblyInfo.cs rename to IoT-Bot/IoT-Bot/Properties/AssemblyInfo.cs diff --git a/MqttToTelegram/MqttToTelegram/Sensor/ASensor.cs b/IoT-Bot/IoT-Bot/Sensor/ASensor.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Sensor/ASensor.cs rename to IoT-Bot/IoT-Bot/Sensor/ASensor.cs diff --git a/MqttToTelegram/MqttToTelegram/Sensor/Flex4GridSwitch.cs b/IoT-Bot/IoT-Bot/Sensor/Flex4GridSwitch.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Sensor/Flex4GridSwitch.cs rename to IoT-Bot/IoT-Bot/Sensor/Flex4GridSwitch.cs diff --git a/MqttToTelegram/MqttToTelegram/Sensor/Flex4gridPower.cs b/IoT-Bot/IoT-Bot/Sensor/Flex4gridPower.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Sensor/Flex4gridPower.cs rename to IoT-Bot/IoT-Bot/Sensor/Flex4gridPower.cs diff --git a/MqttToTelegram/MqttToTelegram/Sensor/Luminanz.cs b/IoT-Bot/IoT-Bot/Sensor/Luminanz.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Sensor/Luminanz.cs rename to IoT-Bot/IoT-Bot/Sensor/Luminanz.cs diff --git a/MqttToTelegram/MqttToTelegram/Sensor/Pir.cs b/IoT-Bot/IoT-Bot/Sensor/Pir.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Sensor/Pir.cs rename to IoT-Bot/IoT-Bot/Sensor/Pir.cs diff --git a/MqttToTelegram/MqttToTelegram/Sensor/Power.cs b/IoT-Bot/IoT-Bot/Sensor/Power.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Sensor/Power.cs rename to IoT-Bot/IoT-Bot/Sensor/Power.cs diff --git a/MqttToTelegram/MqttToTelegram/Sensor/Switch.cs b/IoT-Bot/IoT-Bot/Sensor/Switch.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Sensor/Switch.cs rename to IoT-Bot/IoT-Bot/Sensor/Switch.cs diff --git a/MqttToTelegram/MqttToTelegram/Sensor/Temperatur.cs b/IoT-Bot/IoT-Bot/Sensor/Temperatur.cs similarity index 100% rename from MqttToTelegram/MqttToTelegram/Sensor/Temperatur.cs rename to IoT-Bot/IoT-Bot/Sensor/Temperatur.cs diff --git a/MqttToTelegram/MqttToTelegram/packages.config b/IoT-Bot/IoT-Bot/packages.config similarity index 100% rename from MqttToTelegram/MqttToTelegram/packages.config rename to IoT-Bot/IoT-Bot/packages.config diff --git a/MqttToTelegram/MqttToTelegram/settings.ini.example b/IoT-Bot/IoT-Bot/settings.ini.example similarity index 100% rename from MqttToTelegram/MqttToTelegram/settings.ini.example rename to IoT-Bot/IoT-Bot/settings.ini.example