Compare commits
No commits in common. "master" and "v1.1.0" have entirely different histories.
33
Changelog.md
33
Changelog.md
@ -1,33 +0,0 @@
|
||||
# Changelog
|
||||
|
||||
## 1.3.0 - 2022-01-15 - Netcore default
|
||||
### New Features
|
||||
* Netcore is now default
|
||||
* ABackend thows exeption if loading failed
|
||||
### Bugfixes
|
||||
### Changes
|
||||
* Make ref for github in readme
|
||||
* Refactoring
|
||||
* Codingstyles
|
||||
|
||||
## 1.2.0 - 2019-12.01 - Refactoring
|
||||
### New Features
|
||||
* Add netcore
|
||||
* ABackend now return null if type is not loadable
|
||||
### Bugfixes
|
||||
### Changes
|
||||
* Refactoring
|
||||
|
||||
## 1.1.0 - 2019-05-29 - Readme
|
||||
### New Features
|
||||
* Add Readme, Contribution and Licence
|
||||
### Bugfixes
|
||||
### Changes
|
||||
* Coding Styles
|
||||
|
||||
## 1.0.0.0 - 2019-02-14 - Init
|
||||
### New Features
|
||||
* First Version
|
||||
### Bugfixes
|
||||
### Changes
|
||||
|
||||
17
README.md
17
README.md
@ -1,11 +1,6 @@
|
||||
# BlubbFish.Utils.IoT (Utils-IoT)
|
||||
Library contains utils for Iot
|
||||
|
||||
Maybe you find this Repo on Github. This is a mirror from [here](https://git.blubbfish.net/vs_utils/Utils-IoT).
|
||||
|
||||
## Linking to
|
||||
### Internal
|
||||
* BlubbFish.Utils ([Utils](http://git.blubbfish.net/vs_utils/Utils))
|
||||
|
||||
### External
|
||||
* litjson ([Used Fork](https://github.com/blubbfish/litjson), [Original](https://github.com/LitJSON/litjson))
|
||||
# BlubbFish.Utils.IoT (Utils-IoT)
|
||||
Library contains utils for Iot
|
||||
|
||||
## Linking to
|
||||
### External
|
||||
* litjson
|
||||
@ -1,37 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.29519.87
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "Utils-IoT\Utils-IoT-4.7.1.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-4.7.1", "..\Utils\Utils\Utils-4.7.1.csproj", "{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{FAC8CE64-BF13-4ECE-8097-AEB5DD060098}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {844D8F60-6DE1-4C48-976D-F71450E9707B}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@ -1,13 +1,11 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.29519.87
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27004.2010
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils-IoT", "Utils-IoT\Utils-IoT.csproj", "{549D532E-F859-4128-BA8E-9658E7349F64}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "Utils-IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "..\Utils\Utils\Utils.csproj", "{5A666820-02FF-4649-95F7-476CE95E0E29}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "litjson", "..\..\Librarys\litjson\litjson\litjson.csproj", "{822DFFA0-7838-4590-8160-63EC92AE15B5}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "litjson_4.7.1", "..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj", "{91A14CD2-2940-4500-8193-56D37EDDDBAA}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
@ -15,23 +13,19 @@ Global
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{549D532E-F859-4128-BA8E-9658E7349F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{549D532E-F859-4128-BA8E-9658E7349F64}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{549D532E-F859-4128-BA8E-9658E7349F64}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{549D532E-F859-4128-BA8E-9658E7349F64}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5A666820-02FF-4649-95F7-476CE95E0E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5A666820-02FF-4649-95F7-476CE95E0E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5A666820-02FF-4649-95F7-476CE95E0E29}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5A666820-02FF-4649-95F7-476CE95E0E29}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{822DFFA0-7838-4590-8160-63EC92AE15B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{822DFFA0-7838-4590-8160-63EC92AE15B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{822DFFA0-7838-4590-8160-63EC92AE15B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{822DFFA0-7838-4590-8160-63EC92AE15B5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{91A14CD2-2940-4500-8193-56D37EDDDBAA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {28A0A2C2-A747-4FB6-80F6-50CA564403B8}
|
||||
SolutionGuid = {844D8F60-6DE1-4C48-976D-F71450E9707B}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@ -1,44 +1,45 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector {
|
||||
public abstract class ABackend {
|
||||
public enum BackendType {
|
||||
Data,
|
||||
User
|
||||
}
|
||||
public event BackendMessage MessageIncomming;
|
||||
public event BackendMessage MessageSending;
|
||||
public delegate void BackendMessage(Object sender, BackendEvent e);
|
||||
|
||||
protected Dictionary<String, String> settings;
|
||||
|
||||
public abstract Boolean IsConnected { get; }
|
||||
|
||||
public ABackend(Dictionary<String, String> settings) => this.settings = settings;
|
||||
|
||||
public static ABackend GetInstance(Dictionary<String, String> settings, BackendType ty) {
|
||||
if (settings.Count == 0) {
|
||||
return null;
|
||||
}
|
||||
String object_sensor = "BlubbFish.Utils.IoT.Connector." + ty.ToString() + "." + settings["type"].ToUpperLower() + ", " + "Connector" + ty.ToString() + settings["type"].ToUpperLower();
|
||||
try {
|
||||
Type t = Type.GetType(object_sensor, true);
|
||||
return (ABackend)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>) }).Invoke(new Object[] { settings });
|
||||
} catch (TypeLoadException) {
|
||||
throw new TypeLoadException("Configuration: " + settings["type"] + " is not a " + ty.ToString() + "Backend");
|
||||
} catch (System.IO.FileNotFoundException) {
|
||||
throw new DllNotFoundException("Driver " + object_sensor + " could not load!");
|
||||
} catch (Exception e) {
|
||||
throw new Exception("Something bad Happend while Loading Connectior: "+e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
protected void NotifyClientIncomming(BackendEvent value) => this.MessageIncomming?.Invoke(this, value);
|
||||
|
||||
protected void NotifyClientSending(BackendEvent value) => this.MessageSending?.Invoke(this, value);
|
||||
|
||||
public abstract void Dispose();
|
||||
}
|
||||
}
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector {
|
||||
public abstract class ABackend {
|
||||
public enum BackendType {
|
||||
Data,
|
||||
User
|
||||
}
|
||||
public event BackendMessage MessageIncomming;
|
||||
public event BackendMessage MessageSending;
|
||||
public delegate void BackendMessage(Object sender, BackendEvent e);
|
||||
|
||||
protected Dictionary<String, String> settings;
|
||||
|
||||
public abstract Boolean IsConnected { get; }
|
||||
|
||||
public ABackend(Dictionary<String, String> settings) => this.settings = settings;
|
||||
|
||||
public static ABackend GetInstance(Dictionary<String, String> settings, BackendType ty) {
|
||||
if (settings.Count == 0) {
|
||||
return null;
|
||||
}
|
||||
String object_sensor = "BlubbFish.Utils.IoT.Connector." + ty.ToString() + "." + settings["type"].ToUpperLower() + ", " + "Connector" + ty.ToString() + settings["type"].ToUpperLower();
|
||||
Type t = null;
|
||||
try {
|
||||
t = Type.GetType(object_sensor, true);
|
||||
} catch (TypeLoadException) {
|
||||
Console.Error.WriteLine("Configuration: " + settings["type"] + " is not a " + ty.ToString() + "Backend");
|
||||
return null;
|
||||
} catch (System.IO.FileNotFoundException) {
|
||||
Console.Error.WriteLine("Driver " + object_sensor + " could not load!");
|
||||
return null;
|
||||
}
|
||||
return (ABackend)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>) }).Invoke(new Object[] { settings });
|
||||
}
|
||||
|
||||
protected void NotifyClientIncomming(BackendEvent value) => this.MessageIncomming?.Invoke(this, value);
|
||||
|
||||
protected void NotifyClientSending(BackendEvent value) => this.MessageSending?.Invoke(this, value);
|
||||
|
||||
public abstract void Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector {
|
||||
public abstract class ADataBackend : ABackend {
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector {
|
||||
public abstract class AUserBackend : ABackend {
|
||||
|
||||
26
Utils-IoT/Connector/Helper.cs
Normal file
26
Utils-IoT/Connector/Helper.cs
Normal file
@ -0,0 +1,26 @@
|
||||
using System;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Connector {
|
||||
public class UserMessageEventArgs : EventArgs {
|
||||
public UserMessageEventArgs() : base() { }
|
||||
public UserMessageEventArgs(String message, Int64 UserId, DateTime date) {
|
||||
this.UserId = UserId;
|
||||
this.Message = message;
|
||||
this.Date = date;
|
||||
}
|
||||
public Int64 UserId { get; private set; }
|
||||
public String Message { get; private set; }
|
||||
public DateTime Date { get; private set; }
|
||||
}
|
||||
public class MqttEventArgs : EventArgs {
|
||||
public MqttEventArgs() : base() { }
|
||||
public MqttEventArgs(String message, String topic) {
|
||||
this.Topic = topic;
|
||||
this.Message = message;
|
||||
this.Date = DateTime.Now;
|
||||
}
|
||||
public String Topic { get; private set; }
|
||||
public String Message { get; private set; }
|
||||
public DateTime Date { get; private set; }
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Events {
|
||||
public class BackendEvent : EventArgs {
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Events {
|
||||
public class DataEvent : BackendEvent {
|
||||
public DataEvent() : base() { }
|
||||
public DataEvent(String data) : base() { }
|
||||
public DataEvent(String message, String topic, DateTime date) : base(message, topic, date, "Data") { }
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
using System;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Events {
|
||||
public class MqttEventArgs : EventArgs {
|
||||
public MqttEventArgs() : base() { }
|
||||
public MqttEventArgs(String message, String topic) {
|
||||
this.Topic = topic;
|
||||
this.Message = message;
|
||||
this.Date = DateTime.Now;
|
||||
}
|
||||
public String Topic {
|
||||
get; private set;
|
||||
}
|
||||
public String Message {
|
||||
get; private set;
|
||||
}
|
||||
public DateTime Date {
|
||||
get; private set;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,8 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Events {
|
||||
public class UserEvent : BackendEvent {
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
using System;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.Events {
|
||||
public class UserMessageEventArgs : EventArgs {
|
||||
public UserMessageEventArgs() : base() { }
|
||||
public UserMessageEventArgs(String message, Int64 UserId, DateTime date) {
|
||||
this.UserId = UserId;
|
||||
this.Message = message;
|
||||
this.Date = date;
|
||||
}
|
||||
public Int64 UserId {
|
||||
get; private set;
|
||||
}
|
||||
public String Message {
|
||||
get; private set;
|
||||
}
|
||||
public DateTime Date {
|
||||
get; private set;
|
||||
}
|
||||
}
|
||||
}
|
||||
19
Utils-IoT/Helper.cs
Normal file
19
Utils-IoT/Helper.cs
Normal file
@ -0,0 +1,19 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace BlubbFish.Utils.IoT {
|
||||
static class Helper {
|
||||
internal static String ToUpperLower(this String s) {
|
||||
if (s.Length == 0) {
|
||||
return "";
|
||||
}
|
||||
if (s.Length == 1) {
|
||||
return s.ToUpper();
|
||||
}
|
||||
return s[0].ToString().ToUpper() + s.Substring(1).ToLower();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,134 +1,129 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||
public abstract class AJsonSensor : IDisposable {
|
||||
protected String topic;
|
||||
protected Int32 pollcount;
|
||||
protected Dictionary<String, String> settings;
|
||||
protected ABackend backend;
|
||||
private Thread pollingThread;
|
||||
private Boolean pollEnabled = false;
|
||||
|
||||
public AJsonSensor(Dictionary<String, String> settings, String name, ABackend backend) {
|
||||
this.GetBool = true;
|
||||
this.GetFloat = 0.0f;
|
||||
this.GetInt = 0;
|
||||
this.topic = settings.Keys.Contains("topic") ? settings["topic"] : "";
|
||||
this.settings = settings;
|
||||
this.Title = settings.Keys.Contains("title") ? settings["title"] : "";
|
||||
this.Name = name;
|
||||
this.backend = backend;
|
||||
this.backend.MessageIncomming += this.IncommingMqttMessage;
|
||||
if (settings.Keys.Contains("polling")) {
|
||||
this.pollEnabled = true;
|
||||
this.Polling = Int32.Parse(settings["polling"]);
|
||||
this.pollcount = this.Polling;
|
||||
this.pollingThread = new Thread(this.SensorPolling);
|
||||
this.pollingThread.Start();
|
||||
}
|
||||
}
|
||||
|
||||
private void SensorPolling() {
|
||||
while(this.pollEnabled) {
|
||||
Thread.Sleep(1000);
|
||||
this.Poll();
|
||||
}
|
||||
}
|
||||
|
||||
private void IncommingMqttMessage(Object sender, BackendEvent e) {
|
||||
if(Regex.Match(e.From.ToString(), this.topic).Success) {
|
||||
if (this.UpdateValue(e)) {
|
||||
this.Timestamp = DateTime.Now;
|
||||
this.Update?.Invoke(this, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static AJsonSensor GetInstance(Dictionary<String, ABackend> backends, Dictionary<String, String> settings, String name) {
|
||||
if(!settings.ContainsKey("backend") || !backends.ContainsKey(settings["backend"])) {
|
||||
throw new ArgumentException("Backend not specified!");
|
||||
}
|
||||
String object_sensor = "BlubbFish.Utils.IoT.JsonSensor." + settings["type"].ToUpperLower();
|
||||
try {
|
||||
Type t = Type.GetType(object_sensor, true);
|
||||
return (AJsonSensor)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>), typeof(String), typeof(ABackend) }).Invoke(new Object[] { settings, name, backends[settings["backend"]] });
|
||||
} catch(TypeLoadException) {
|
||||
throw new ArgumentException("Sensor: " + object_sensor + " is not a Sensor");
|
||||
} catch(Exception e) {
|
||||
Helper.WriteError("Something went wrong! " + e.Message);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void Poll() {
|
||||
if(this.pollcount++ >= this.Polling) {
|
||||
this.pollcount = 1;
|
||||
if (this.backend is ADataBackend databackend) {
|
||||
databackend.Send(this.topic + "/get", "");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void SetBool(Boolean v) {
|
||||
if (this.backend is ADataBackend databackend) {
|
||||
databackend.Send(this.topic + "/set", v ? "on" : "off");
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract Boolean UpdateValue(BackendEvent e);
|
||||
|
||||
public Single GetFloat { get; protected set; }
|
||||
public Boolean GetBool { get; protected set; }
|
||||
public Int32 GetInt { get; protected set; }
|
||||
public Types Datatypes { get; protected set; }
|
||||
public DateTime Timestamp { get; protected set; }
|
||||
public Int32 Polling { get; private set; }
|
||||
public String Title { get; protected set; }
|
||||
public String Name { get; internal set; }
|
||||
|
||||
public enum Types {
|
||||
Bool,
|
||||
Int,
|
||||
Float
|
||||
}
|
||||
public delegate void UpdatedValue(Object sender, EventArgs e);
|
||||
public event UpdatedValue Update;
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if(!this.disposedValue) {
|
||||
if(disposing) {
|
||||
this.pollEnabled = false;
|
||||
if (this.pollingThread != null && this.pollingThread.ThreadState == ThreadState.Running) {
|
||||
this.pollingThread.Abort();
|
||||
while (this.pollingThread.ThreadState != ThreadState.Aborted) { }
|
||||
}
|
||||
this.backend.MessageIncomming -= this.IncommingMqttMessage;
|
||||
}
|
||||
this.settings = null;
|
||||
this.pollingThread = null;
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
~AJsonSensor() {
|
||||
this.Dispose(false);
|
||||
}
|
||||
|
||||
public void Dispose() {
|
||||
this.Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||
public abstract class AJsonSensor : IDisposable {
|
||||
protected String topic;
|
||||
protected Int32 pollcount;
|
||||
protected Dictionary<String, String> settings;
|
||||
protected ABackend backend;
|
||||
private Thread pollingThread;
|
||||
private Boolean pollEnabled = false;
|
||||
|
||||
public AJsonSensor(Dictionary<String, String> settings, String name, ABackend backend) {
|
||||
this.GetBool = true;
|
||||
this.GetFloat = 0.0f;
|
||||
this.GetInt = 0;
|
||||
this.topic = (settings.Keys.Contains("topic")) ? settings["topic"] : "";
|
||||
this.settings = settings;
|
||||
this.Title = (settings.Keys.Contains("title")) ? settings["title"] : "";
|
||||
this.Name = name;
|
||||
this.backend = backend;
|
||||
this.backend.MessageIncomming += this.IncommingMqttMessage;
|
||||
if (settings.Keys.Contains("polling")) {
|
||||
this.pollEnabled = true;
|
||||
this.Polling = Int32.Parse(settings["polling"]);
|
||||
this.pollcount = this.Polling;
|
||||
this.pollingThread = new Thread(this.SensorPolling);
|
||||
this.pollingThread.Start();
|
||||
}
|
||||
}
|
||||
|
||||
private void SensorPolling() {
|
||||
while(this.pollEnabled) {
|
||||
Thread.Sleep(1000);
|
||||
this.Poll();
|
||||
}
|
||||
}
|
||||
|
||||
private void IncommingMqttMessage(Object sender, BackendEvent e) {
|
||||
if(Regex.Match(e.From.ToString(), this.topic).Success) {
|
||||
if (this.UpdateValue(e)) {
|
||||
this.Timestamp = DateTime.Now;
|
||||
this.Update?.Invoke(this, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static AJsonSensor GetInstance(Dictionary<String, ABackend> backends, Dictionary<String, String> settings, String name) {
|
||||
String object_sensor = "BlubbFish.Utils.IoT.JsonSensor." + Char.ToUpper(settings["type"][0]) + settings["type"].Substring(1).ToLower();
|
||||
Type t = null;
|
||||
try {
|
||||
t = Type.GetType(object_sensor, true);
|
||||
} catch(TypeLoadException) {
|
||||
throw new ArgumentException("Sensor: " + object_sensor + " is not a Sensor");
|
||||
}
|
||||
if(!settings.ContainsKey("backend") || !backends.ContainsKey(settings["backend"])) {
|
||||
throw new ArgumentException("Backend not specified!");
|
||||
}
|
||||
return (AJsonSensor)t.GetConstructor(new Type[] { typeof(Dictionary<String, String>), typeof(String), typeof(ABackend) }).Invoke(new Object[] { settings, name, backends[settings["backend"]] });
|
||||
}
|
||||
|
||||
protected virtual void Poll() {
|
||||
if(this.pollcount++ >= this.Polling) {
|
||||
this.pollcount = 1;
|
||||
if (this.backend is ADataBackend) {
|
||||
((ADataBackend)this.backend).Send(this.topic + "/get", "");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void SetBool(Boolean v) {
|
||||
if (this.backend is ADataBackend) {
|
||||
((ADataBackend)this.backend).Send(this.topic + "/set", v ? "on" : "off");
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract Boolean UpdateValue(BackendEvent e);
|
||||
|
||||
public Single GetFloat { get; protected set; }
|
||||
public Boolean GetBool { get; protected set; }
|
||||
public Int32 GetInt { get; protected set; }
|
||||
public Types Datatypes { get; protected set; }
|
||||
public DateTime Timestamp { get; protected set; }
|
||||
public Int32 Polling { get; private set; }
|
||||
public String Title { get; protected set; }
|
||||
public String Name { get; internal set; }
|
||||
|
||||
public enum Types {
|
||||
Bool,
|
||||
Int,
|
||||
Float
|
||||
}
|
||||
public delegate void UpdatedValue(Object sender, EventArgs e);
|
||||
public event UpdatedValue Update;
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if(!this.disposedValue) {
|
||||
if(disposing) {
|
||||
this.pollEnabled = false;
|
||||
if (this.pollingThread != null && this.pollingThread.ThreadState == ThreadState.Running) {
|
||||
this.pollingThread.Abort();
|
||||
while (this.pollingThread.ThreadState != ThreadState.Aborted) { }
|
||||
}
|
||||
this.backend.MessageIncomming -= this.IncommingMqttMessage;
|
||||
}
|
||||
this.settings = null;
|
||||
this.pollingThread = null;
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
~AJsonSensor() {
|
||||
Dispose(false);
|
||||
}
|
||||
public void Dispose() {
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@ -5,10 +5,12 @@ using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||
class Pir : AJsonSensor {
|
||||
public Pir(Dictionary<String, String> settings, String name, ADataBackend backend) : base(settings, name, backend) => this.Datatypes = Types.Bool;
|
||||
public Pir(Dictionary<String, String> settings, String name, ADataBackend backend) : base(settings, name, backend) {
|
||||
this.Datatypes = Types.Bool;
|
||||
}
|
||||
|
||||
protected override Boolean UpdateValue(BackendEvent e) {
|
||||
this.GetBool = e.Message.ToLower() == "on";
|
||||
this.GetBool = (e.Message.ToLower() == "on") ? true : false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,10 +5,12 @@ using BlubbFish.Utils.IoT.Events;
|
||||
|
||||
namespace BlubbFish.Utils.IoT.JsonSensor {
|
||||
class Switch : AJsonSensor {
|
||||
public Switch(Dictionary<String, String> settings, String name, ADataBackend backend) : base(settings, name, backend) => this.Datatypes = Types.Bool;
|
||||
public Switch(Dictionary<System.String, System.String> settings, String name, ADataBackend backend) : base(settings, name, backend) {
|
||||
this.Datatypes = Types.Bool;
|
||||
}
|
||||
|
||||
protected override Boolean UpdateValue(BackendEvent e) {
|
||||
this.GetBool = e.Message.ToLower() == "on";
|
||||
this.GetBool = (e.Message.ToLower() == "on") ? true : false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,20 +1,18 @@
|
||||
#if !NETCOREAPP
|
||||
using System.Reflection;
|
||||
using System.Resources;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// Allgemeine Informationen über eine Assembly werden über die folgenden
|
||||
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
|
||||
// die einer Assembly zugeordnet sind.
|
||||
[assembly: AssemblyTitle("Utils-IoT")]
|
||||
[assembly: AssemblyDescription("Provides classes for iot development")]
|
||||
[assembly: AssemblyTitle("IoT")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("BlubbFish")]
|
||||
[assembly: AssemblyProduct("Utils-IoT")]
|
||||
[assembly: AssemblyCopyright("Copyright © BlubbFish 2017 - 24.11.2019")]
|
||||
[assembly: AssemblyTrademark("BlubbFish")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("IoT")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2017")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
[assembly: NeutralResourcesLanguage("de-DE")]
|
||||
|
||||
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
|
||||
// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
|
||||
@ -34,6 +32,5 @@ using System.Runtime.InteropServices;
|
||||
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
|
||||
// indem Sie "*" wie unten gezeigt eingeben:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0")]
|
||||
#endif
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>BlubbFish.Utils.IoT</RootNamespace>
|
||||
<AssemblyName>Utils-IoT</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Connector\ABackend.cs" />
|
||||
<Compile Include="Connector\ADataBackend.cs" />
|
||||
<Compile Include="Connector\AUserBackend.cs" />
|
||||
<Compile Include="Events\BackendEvent.cs" />
|
||||
<Compile Include="Events\DataEvent.cs" />
|
||||
<Compile Include="Events\UserEvent.cs" />
|
||||
<Compile Include="JsonSensor\Bosmon.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="JsonSensor\AJsonSensor.cs" />
|
||||
<Compile Include="JsonSensor\Luminanz.cs" />
|
||||
<Compile Include="JsonSensor\Pir.cs" />
|
||||
<Compile Include="JsonSensor\Power.cs" />
|
||||
<Compile Include="JsonSensor\Switch.cs" />
|
||||
<Compile Include="JsonSensor\Temperatur.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\CHANGELOG.md" />
|
||||
<Content Include="..\CONTRIBUTING.md" />
|
||||
<Content Include="..\LICENSE" />
|
||||
<Content Include="..\README.md" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
|
||||
<Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
|
||||
<Name>litjson_4.7.1</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Utils\Utils\Utils.csproj">
|
||||
<Project>{fac8ce64-bf13-4ece-8097-aeb5dd060098}</Project>
|
||||
<Name>Utils</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
@ -1,44 +1,60 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>BlubbFish.Utils.IoT</RootNamespace>
|
||||
<AssemblyName>Utils-IoT</AssemblyName>
|
||||
<NeutralLanguage>de-DE</NeutralLanguage>
|
||||
<PackageReleaseNotes>
|
||||
1.3.0 Netcore default
|
||||
1.2.0 Refactoring
|
||||
1.1.0 Readme
|
||||
1.0.0.0 Init
|
||||
</PackageReleaseNotes>
|
||||
<Copyright>Copyright © BlubbFish 2017 - 15.01.2022</Copyright>
|
||||
<Description>Provides classes for iot development</Description>
|
||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||
<Company>BlubbFish</Company>
|
||||
<Authors>BlubbFish</Authors>
|
||||
<PackageProjectUrl>http://git.blubbfish.net/vs_utils/Utils-IoT</PackageProjectUrl>
|
||||
<RepositoryUrl>http://git.blubbfish.net/vs_utils/Utils-IoT.git</RepositoryUrl>
|
||||
<RepositoryType>git</RepositoryType>
|
||||
<Version>1.3.0</Version>
|
||||
<PackageId>IoT.Utils.BlubbFish</PackageId>
|
||||
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Librarys\litjson\litjson\litjson.csproj" />
|
||||
<ProjectReference Include="..\..\Utils\Utils\Utils.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Content Include="../CHANGELOG.md" />
|
||||
<Content Include="../CONTRIBUTING.md" />
|
||||
<Content Include="../LICENSE" />
|
||||
<Content Include="../README.md" />
|
||||
<Reference Include="System" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\LICENSE">
|
||||
<Pack>True</Pack>
|
||||
<PackagePath></PackagePath>
|
||||
</None>
|
||||
<Compile Include="Connector\ABackend.cs" />
|
||||
<Compile Include="Connector\ADataBackend.cs" />
|
||||
<Compile Include="Connector\AUserBackend.cs" />
|
||||
<Compile Include="Events\BackendEvent.cs" />
|
||||
<Compile Include="Events\DataEvent.cs" />
|
||||
<Compile Include="Events\UserEvent.cs" />
|
||||
<Compile Include="Helper.cs" />
|
||||
<Compile Include="JsonSensor\Bosmon.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="JsonSensor\AJsonSensor.cs" />
|
||||
<Compile Include="JsonSensor\Luminanz.cs" />
|
||||
<Compile Include="JsonSensor\Pir.cs" />
|
||||
<Compile Include="JsonSensor\Power.cs" />
|
||||
<Compile Include="JsonSensor\Switch.cs" />
|
||||
<Compile Include="JsonSensor\Temperatur.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Librarys\litjson\litjson\litjson_4.7.1.csproj">
|
||||
<Project>{91a14cd2-2940-4500-8193-56d37edddbaa}</Project>
|
||||
<Name>litjson_4.7.1</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
Loading…
Reference in New Issue
Block a user