vs/ProjectsOld
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NF] Umbenennung zu IoTBot Namespace

Browse Source
This commit is contained in:
BlubbFish
2017-10-02 00:49:44 +02:00
parent ceef3daf21
commit 8d80a132dc
47 changed files with 186 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mqtt-Dashboard/Mqtt-Dashboard/Connector/ADataBackend.cs
+3 -3
View File
@@ -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<String, String> 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);
Mqtt-Dashboard/Mqtt-Dashboard/Connector/Mosquitto.cs
+1 -1
View File
@@ -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;
Mqtt-Dashboard/Mqtt-Dashboard/Connector/Mqtt.cs
+1 -2
View File
@@ -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;
Mqtt-Dashboard/Mqtt-Dashboard/Connector/Telegram.cs
+4 -4
View File
@@ -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"));
}
Mqtt-Dashboard/Mqtt-Dashboard/Form1.cs
+2 -2
View File
@@ -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 {
Mqtt-Dashboard/Mqtt-Dashboard/Sensor/ASensor.cs
+5 -5
View File
@@ -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<String, String> 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);
Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Flex4GridSwitch.cs
+2 -2
View File
@@ -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;
Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Flex4gridPower.cs
+2 -2
View File
@@ -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;
Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Luminanz.cs
+6 -6
View File
@@ -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<String, String> settings) : base(settings) {
public Luminanz(Dictionary<String, String> 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;
}
}
}
Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Pir.cs
+6 -6
View File
@@ -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<String, String> settings) : base(settings) {
public Pir(Dictionary<String, String> 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;
}
}
}
Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Power.cs
+2 -2
View File
@@ -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<String, String> settings, String name, ADataBackend backend) : base(settings, name, backend) {
this.GetBool = true;
Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Switch.cs
+2 -2
View File
@@ -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<System.String, System.String> settings, String name, ADataBackend backend) : base(settings, name, backend) {
this.Datatypes = Types.Bool;
Mqtt-Dashboard/Mqtt-Dashboard/Sensor/Temperatur.cs
+6 -6
View File
@@ -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<String, String> settings) : base(settings) {
public Temperatur(Dictionary<String, String> 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;
}
}
}
Mqtt-Dashboard/Mqtt-Dashboard/Tracings/ATracings.cs
+1 -1
View File
@@ -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 {
Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Graph.cs
+1 -1
View File
@@ -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;
Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Meter.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using Dashboard.Sensor;
using IoTBot.Sensor;
using System;
using System.Windows.Forms;
using System.Linq;
Mqtt-Dashboard/Mqtt-Dashboard/Tracings/PowerMeter.cs
+1 -1
View File
@@ -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 {
Mqtt-Dashboard/Mqtt-Dashboard/Tracings/Switcher.cs
+2 -2
View File
@@ -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 {
Mqtt-Dashboard/Mqtt-Dashboard/bin/Release/Dashboard.exe
BIN
View File
Binary file not shown.
Mqtt-Dashboard/Mqtt-Dashboard/bin/Release/Utils.dll
BIN
View File
Binary file not shown.