diff --git a/IoT/Connector/ADataBackend.cs b/IoT/Connector/ADataBackend.cs index 61bcfe6..4df5ffc 100644 --- a/IoT/Connector/ADataBackend.cs +++ b/IoT/Connector/ADataBackend.cs @@ -12,7 +12,7 @@ namespace BlubbFish.Utils.IoT.Connector { if(settings.Count == 0) { return null; } - String object_sensor = "BlubbFish.Utils.IoT.Connector.Data." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower(); + String object_sensor = "BlubbFish.Utils.IoT.Connector.Data." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower()+", "+ "ConnectorData" + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower(); Type t = null; try { t = Type.GetType(object_sensor, true); diff --git a/IoT/Connector/AUserBackend.cs b/IoT/Connector/AUserBackend.cs index 1b2dc6e..556e091 100644 --- a/IoT/Connector/AUserBackend.cs +++ b/IoT/Connector/AUserBackend.cs @@ -14,7 +14,7 @@ namespace BlubbFish.Utils.IoT.Connector { } public static AUserBackend GetInstance(Dictionary settings) { - String object_sensor = "BlubbFish.Utils.IoT.Connector.User." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower(); + String object_sensor = "BlubbFish.Utils.IoT.Connector.User." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower()+", "+ "ConnectorUser" + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower(); Type t = null; try { t = Type.GetType(object_sensor, true); diff --git a/IoT/Connector/Data/Mosquitto/Mosquitto.cs b/IoT/Connector/Data/Mosquitto/Mosquitto.cs index 2e13847..34beb6a 100644 --- a/IoT/Connector/Data/Mosquitto/Mosquitto.cs +++ b/IoT/Connector/Data/Mosquitto/Mosquitto.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Text.RegularExpressions; namespace BlubbFish.Utils.IoT.Connector.Data { - class Mosquitto : ADataBackend, IDisposable { + public class Mosquitto : ADataBackend, IDisposable { private Process p; private String message; diff --git a/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll b/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll index 48e4aa5..4299dde 100644 Binary files a/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll and b/IoT/Connector/Data/Mosquitto/bin/Release/ConnectorDataMosquitto.dll differ diff --git a/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll b/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll index 34d22f5..6f8d8fe 100644 Binary files a/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll and b/IoT/Connector/Data/Mosquitto/bin/Release/Utils-IoT.dll differ diff --git a/IoT/Connector/Data/Mqtt/Mqtt.cs b/IoT/Connector/Data/Mqtt/Mqtt.cs index 309a0b9..35b8205 100644 --- a/IoT/Connector/Data/Mqtt/Mqtt.cs +++ b/IoT/Connector/Data/Mqtt/Mqtt.cs @@ -5,7 +5,7 @@ using uPLibrary.Networking.M2Mqtt; using uPLibrary.Networking.M2Mqtt.Messages; namespace BlubbFish.Utils.IoT.Connector.Data { - class Mqtt : ADataBackend, IDisposable { + public class Mqtt : ADataBackend, IDisposable { private MqttClient client; public override event MqttMessage MessageIncomming; diff --git a/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll b/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll index 56751a9..875955e 100644 Binary files a/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll and b/IoT/Connector/Data/Mqtt/bin/Release/ConnectorDataMqtt.dll differ diff --git a/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll b/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll index 34d22f5..6f8d8fe 100644 Binary files a/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll and b/IoT/Connector/Data/Mqtt/bin/Release/Utils-IoT.dll differ diff --git a/IoT/Connector/User/Telegram/bin/Release/ConnectorUserTelegram.dll b/IoT/Connector/User/Telegram/bin/Release/ConnectorUserTelegram.dll index 4b25281..9c1c87e 100644 Binary files a/IoT/Connector/User/Telegram/bin/Release/ConnectorUserTelegram.dll and b/IoT/Connector/User/Telegram/bin/Release/ConnectorUserTelegram.dll differ diff --git a/IoT/Connector/User/Telegram/bin/Release/Utils-IoT.dll b/IoT/Connector/User/Telegram/bin/Release/Utils-IoT.dll index 34d22f5..6f8d8fe 100644 Binary files a/IoT/Connector/User/Telegram/bin/Release/Utils-IoT.dll and b/IoT/Connector/User/Telegram/bin/Release/Utils-IoT.dll differ diff --git a/IoT/bin/Release/Utils-IoT.dll b/IoT/bin/Release/Utils-IoT.dll index 34d22f5..6f8d8fe 100644 Binary files a/IoT/bin/Release/Utils-IoT.dll and b/IoT/bin/Release/Utils-IoT.dll differ diff --git a/IoT/packages.config b/IoT/packages.config index fbbfca6..a36cd5e 100644 --- a/IoT/packages.config +++ b/IoT/packages.config @@ -1,53 +1,4 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file