Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
57daf12ed4 | ||
|
|
cabcce03b3 | ||
|
|
a9c77c6614 | ||
|
|
1c84703ac6 | ||
|
|
25e1e5165d | ||
|
|
a76234f43d | ||
|
|
a3afadd5f5 | ||
|
|
002b3cf338 | ||
|
|
a7895ef59a | ||
|
|
852a096f1d | ||
|
|
69030796f5 | ||
|
|
19d92c8cac | ||
|
|
c792ea20ad | ||
|
|
611205e78f | ||
|
|
4be8bb72f4 | ||
|
|
76cb025606 | ||
|
|
aa84aa0539 | ||
|
|
04f43b95ff | ||
|
|
a1009b5293 | ||
|
|
91a05f882e | ||
|
|
74d270b6d2 | ||
|
|
200420c9b0 | ||
|
|
acf5cea593 | ||
|
|
307f03c7c0 | ||
|
|
32b4daf3fb | ||
|
|
55e88f7b45 | ||
|
|
8baef3b2b5 | ||
|
|
80baca45e5 | ||
|
|
75eac65510 | ||
|
|
44b8daa325 | ||
|
|
2cd2c7c02e | ||
|
|
33b1b6527c | ||
|
|
9e60264d7d | ||
|
|
c96b2393d3 | ||
|
|
5fa97ea82b | ||
|
|
74027d705d |
+23
-5
@@ -11,7 +11,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\Utils\Utils\Uti
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils-IoT", "..\Utils\IoT\Utils-IoT.csproj", "{B870E4D5-6806-4A0B-B233-8907EEDC5AFC}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMosquitto", "..\Utils\IoT\Connector\Data\Mosquitto\ConnectorDataMosquitto.csproj", "{39235FAD-BA9D-4B51-82FC-6969967BEAE9}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectorDataMqtt", "..\Utils\IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj", "{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Iot-Interfaces", "..\Utils\IoT\Interfaces\Iot-Interfaces.csproj", "{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}"
|
||||
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}") = "M2Mqtt", "..\Librarys\mqtt\M2Mqtt\M2Mqtt_4.7.1.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
@@ -35,10 +41,22 @@ Global
|
||||
{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
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{39235FAD-BA9D-4B51-82FC-6969967BEAE9}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{EE6C8F68-ED46-4C1C-ABDD-CFCDF75104F2}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4DAADA29-C600-4CF3-8AD3-9C97C8D7F632}.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
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A11AEF5A-B246-4FE8-8330-06DB73CC8074}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@@ -39,6 +39,34 @@ namespace ZwayBot {
|
||||
}
|
||||
}
|
||||
|
||||
public class MqttEvent : ModulEventArgs {
|
||||
public MqttEvent() {
|
||||
}
|
||||
public MqttEvent(String topic, String text) {
|
||||
this.Address = topic;
|
||||
this.Value = text;
|
||||
this.Source = "MQTT";
|
||||
}
|
||||
public override String ToString() {
|
||||
return this.Source + ": on " + this.Address + " set " + this.Value;
|
||||
}
|
||||
}
|
||||
|
||||
public class StatusPollingEvent : ModulEventArgs {
|
||||
public StatusPollingEvent() {
|
||||
}
|
||||
|
||||
public StatusPollingEvent(String text, String node) {
|
||||
this.Value = text;
|
||||
this.Address = node;
|
||||
this.Source = "POLLING";
|
||||
}
|
||||
|
||||
public override String ToString() {
|
||||
return this.Source + ": " + this.Value + " on " + this.Address;
|
||||
}
|
||||
}
|
||||
|
||||
public class ModulEventArgs : EventArgs {
|
||||
public ModulEventArgs() {
|
||||
}
|
||||
|
||||
+35
-7
@@ -2,8 +2,8 @@
|
||||
using System.Reflection;
|
||||
|
||||
namespace ZwayBot {
|
||||
class Helper {
|
||||
public static void SetProperty(Object o, String name, String value) {
|
||||
static class Helper {
|
||||
public static void SetProperty(this Object o, String name, String value) {
|
||||
PropertyInfo prop = o.GetType().GetProperty(name);
|
||||
if (prop.CanWrite) {
|
||||
if (prop.PropertyType == typeof(Boolean) && Boolean.TryParse(value, out Boolean vb)) {
|
||||
@@ -12,12 +12,15 @@ namespace ZwayBot {
|
||||
prop.SetValue(o, v32);
|
||||
} else if (prop.PropertyType == typeof(Single) && Single.TryParse(value, out Single vs)) {
|
||||
prop.SetValue(o, vs);
|
||||
} else if (prop.PropertyType == typeof(Double) && Double.TryParse(value, out Double vd)) {
|
||||
prop.SetValue(o, vd);
|
||||
} else if (prop.PropertyType == typeof(Int64) && Int64.TryParse(value, out Int64 v64)) {
|
||||
prop.SetValue(o, v64);
|
||||
}
|
||||
}
|
||||
}
|
||||
public static Boolean HasProperty(Object o, String type) {
|
||||
|
||||
internal static Boolean HasProperty(this Object o, String type) {
|
||||
Type t = o.GetType();
|
||||
foreach (PropertyInfo item in t.GetProperties()) {
|
||||
if (item.Name == type) {
|
||||
@@ -27,7 +30,7 @@ namespace ZwayBot {
|
||||
return false;
|
||||
}
|
||||
|
||||
internal static Object GetProperty(Object o, String name) {
|
||||
internal static Object GetProperty(this Object o, String name) {
|
||||
PropertyInfo prop = o.GetType().GetProperty(name);
|
||||
if(prop.CanRead) {
|
||||
return prop.GetValue(o);
|
||||
@@ -35,9 +38,15 @@ namespace ZwayBot {
|
||||
return null;
|
||||
}
|
||||
|
||||
internal static Boolean HasInterface(Object o, String type) {
|
||||
Type t = o.GetType();
|
||||
foreach (Type item in t.GetInterfaces()) {
|
||||
internal static Boolean HasAbstract(this Object o, Type type) {
|
||||
if(o.GetType().BaseType == type) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
internal static Boolean HasInterface(this Type o, String type) {
|
||||
foreach (Type item in o.GetInterfaces()) {
|
||||
if(item.Name == type) {
|
||||
return true;
|
||||
}
|
||||
@@ -45,10 +54,29 @@ namespace ZwayBot {
|
||||
return false;
|
||||
}
|
||||
|
||||
internal static Boolean HasInterface(this Object o, Type interf) {
|
||||
foreach(Type item in o.GetType().GetInterfaces()) {
|
||||
if(item == interf) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
internal static void WriteError(String text) {
|
||||
Console.ForegroundColor = ConsoleColor.Red;
|
||||
Console.Error.WriteLine("ERROR: " + text);
|
||||
Console.ResetColor();
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
namespace ZwayBot.Interfaces {
|
||||
interface IForceLoad {
|
||||
}
|
||||
}
|
||||
@@ -1,20 +1,71 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BlubbFish.IoT.Zway;
|
||||
using BlubbFish.Utils;
|
||||
|
||||
namespace ZwayBot {
|
||||
abstract class AModul {
|
||||
protected ZwayController zw;
|
||||
protected InIReader ini;
|
||||
private readonly InIReader settings;
|
||||
protected Dictionary<String, Dictionary<String, String>> config = new Dictionary<String, Dictionary<String, String>>();
|
||||
|
||||
public AModul(ZwayController zway, InIReader settings) {
|
||||
this.zw = zway;
|
||||
this.ini = settings;
|
||||
}
|
||||
public Boolean HasConfig { get; private set; }
|
||||
public Boolean ConfigPublic { get; private set; }
|
||||
|
||||
public delegate void ModulEvent(Object sender, ModulEventArgs e);
|
||||
public abstract event ModulEvent Update;
|
||||
|
||||
public AModul(ZwayController zway, InIReader settings) {
|
||||
this.HasConfig = false;
|
||||
this.ConfigPublic = false;
|
||||
this.zw = zway;
|
||||
this.settings = settings;
|
||||
this.ParseConfig();
|
||||
}
|
||||
|
||||
private void ParseConfig() {
|
||||
if (this.settings != null) {
|
||||
this.HasConfig = true;
|
||||
foreach (String item in this.settings.GetSections(false)) {
|
||||
this.config.Add(item, this.settings.GetSection(item));
|
||||
}
|
||||
if(this.config.ContainsKey("modul")) {
|
||||
this.ConfigPublic = this.config["modul"].ContainsKey("config") && this.config["modul"]["config"].ToLower() == "public";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public Dictionary<String, Dictionary<String, String>> GetConfig() {
|
||||
if (this.HasConfig && this.ConfigPublic) {
|
||||
Dictionary<String, Dictionary<String, String>> ret = new Dictionary<String, Dictionary<String, String>>(this.config);
|
||||
if(ret.ContainsKey("modul")) {
|
||||
ret.Remove("modul");
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
return new Dictionary<String, Dictionary<String, String>>();
|
||||
}
|
||||
|
||||
public virtual void Interconnect(Dictionary<String, AModul> moduls) { }
|
||||
|
||||
public virtual void SetInterconnection(String param, Action<Object> hook, Object data) { }
|
||||
|
||||
public abstract void Dispose();
|
||||
|
||||
internal void SetConfig(Dictionary<String, Dictionary<String, String>> newconf) {
|
||||
if (this.HasConfig && this.ConfigPublic) {
|
||||
if (newconf.ContainsKey("modul")) {
|
||||
newconf.Remove("modul");
|
||||
}
|
||||
if (this.config.ContainsKey("modul")) {
|
||||
newconf.Add("modul", this.config["modul"]);
|
||||
}
|
||||
this.config = newconf;
|
||||
this.settings.SetSections(this.config);
|
||||
this.UpdateConfig();
|
||||
}
|
||||
}
|
||||
|
||||
protected abstract void UpdateConfig();
|
||||
}
|
||||
}
|
||||
|
||||
+27
-30
@@ -6,15 +6,17 @@ using System.Threading;
|
||||
using BlubbFish.IoT.Zway;
|
||||
using BlubbFish.IoT.Zway.Interfaces;
|
||||
using BlubbFish.Utils;
|
||||
using ZwayBot.Interfaces;
|
||||
|
||||
namespace ZwayBot.Moduls {
|
||||
internal class CronJob : AModul, IDisposable {
|
||||
internal class CronJob : AModul, IDisposable, IForceLoad {
|
||||
private DateTime crontime;
|
||||
private Thread thread;
|
||||
private List<Tuple<String, Action<Object>, Object>> internalCron = new List<Tuple<String, Action<Object>, Object>>();
|
||||
|
||||
public override event ModulEvent Update;
|
||||
|
||||
private Dictionary<String, String> cron_named = new Dictionary<String, String> {
|
||||
private readonly Dictionary<String, String> cron_named = new Dictionary<String, String> {
|
||||
{ "@yearly", "0 0 1 1 *" },
|
||||
{ "@annually", "0 0 1 1 *" },
|
||||
{ "@monthly", "0 0 1 * *" },
|
||||
@@ -34,9 +36,16 @@ namespace ZwayBot.Moduls {
|
||||
while (true) {
|
||||
if(this.crontime.Minute != DateTime.Now.Minute) {
|
||||
this.crontime = DateTime.Now;
|
||||
foreach (String item in this.ini.GetSections()) {
|
||||
if(ParseCronString(this.ini.GetValue(item, "cron"))) {
|
||||
this.SetValues(this.ini.GetValue(item, "set"));
|
||||
if (this.config.Count != 0) {
|
||||
foreach (KeyValuePair<String, Dictionary<String, String>> item in this.config) {
|
||||
if (item.Value.ContainsKey("cron") && item.Value.ContainsKey("set") && this.ParseCronString(item.Value["cron"])) {
|
||||
this.SetValues(item.Value["set"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach (Tuple<String, Action<Object>, Object> item in this.internalCron) {
|
||||
if(this.ParseCronString(item.Item1)) {
|
||||
item.Item2?.Invoke(item.Item3);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -48,24 +57,12 @@ namespace ZwayBot.Moduls {
|
||||
foreach (String item in value.Split(';')) {
|
||||
String[] items = item.Split(':');
|
||||
if(items.Length == 2) {
|
||||
String[] addr = items[0].Split('-');
|
||||
String[] values = items[1].Split('-');
|
||||
if(addr.Length == 3 || addr.Length == 4) {
|
||||
Int32 deviceid = Int32.Parse(addr[0]);
|
||||
Int32 instanceid = Int32.Parse(addr[1]);
|
||||
Int32 classid = Int32.Parse(addr[2]);
|
||||
ICommandClass c;
|
||||
if(addr.Length == 4) {
|
||||
Int32 subcid = Int32.Parse(addr[3]);
|
||||
c = this.zw.GetCommandClassSub(deviceid, instanceid, classid, subcid);
|
||||
} else {
|
||||
c = this.zw.GetCommandClass(deviceid, instanceid, classid);
|
||||
}
|
||||
if (c != null && values.Length == 2) {
|
||||
if (Helper.HasProperty(c, values[0])) {
|
||||
Helper.SetProperty(c, values[0], values[1]);
|
||||
this.Update?.Invoke(this, new CronEvent(items[0], values[0], values[1]));
|
||||
}
|
||||
ACommandClass c = this.zw.GetCommandClass(items[0]);
|
||||
if (c != null && values.Length == 2) {
|
||||
if (c.HasProperty(values[0])) {
|
||||
c.SetProperty(values[0], values[1]);
|
||||
this.Update?.Invoke(this, new CronEvent(items[0], values[0], values[1]));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -112,7 +109,7 @@ namespace ZwayBot.Moduls {
|
||||
cron = cron.Replace(DateTime.Parse("2015-01-" + (4 + i) + "T00:00:00").ToString("dddd", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
}
|
||||
for (Int32 i = 1; i <= 12; i++) {
|
||||
cron = cron.Replace(DateTime.Parse("2015-"+i+"-01T00:00:00").ToString("MMM", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
cron = cron.Replace(DateTime.Parse("2015-" + i + "-01T00:00:00").ToString("MMM", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
cron = cron.Replace(DateTime.Parse("2015-" + i + "-01T00:00:00").ToString("MMMM", CultureInfo.CreateSpecificCulture("en-US")), i.ToString());
|
||||
}
|
||||
if (cron.Contains("*")) {
|
||||
@@ -156,6 +153,12 @@ namespace ZwayBot.Moduls {
|
||||
return ret.ContainsKey(Int32.Parse(date));
|
||||
}
|
||||
|
||||
public override void SetInterconnection(String cron, Action<Object> hook, Object data) {
|
||||
this.internalCron.Add(new Tuple<String, Action<Object>, Object>(cron, hook, data));
|
||||
}
|
||||
|
||||
protected override void UpdateConfig() { }
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
@@ -163,19 +166,13 @@ namespace ZwayBot.Moduls {
|
||||
if (!this.disposedValue) {
|
||||
if (disposing) {
|
||||
this.thread.Abort();
|
||||
while(this.thread.ThreadState != ThreadState.Aborted) { Thread.Sleep(100); }
|
||||
while(this.thread.ThreadState == ThreadState.Running) { Thread.Sleep(100); }
|
||||
}
|
||||
|
||||
this.thread = null;
|
||||
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
~CronJob() {
|
||||
Dispose(false);
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
|
||||
@@ -1,139 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BlubbFish.IoT.Zway;
|
||||
using BlubbFish.IoT.Zway.Devices;
|
||||
using BlubbFish.IoT.Zway.Devices.CommandClasses;
|
||||
using BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs;
|
||||
using BlubbFish.IoT.Zway.Events;
|
||||
using BlubbFish.Utils;
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using LitJson;
|
||||
|
||||
namespace ZwayBot.Moduls {
|
||||
class Flex4Grid : AModul, IDisposable {
|
||||
private ADataBackend mqtt;
|
||||
private String household = "";
|
||||
|
||||
public override event ModulEvent Update;
|
||||
|
||||
public Flex4Grid(ZwayController zway, InIReader settings) : base(zway, settings) {
|
||||
this.mqtt = ADataBackend.GetInstance(this.ini.GetSection("settings"));
|
||||
this.ParseIni();
|
||||
this.mqtt.MessageIncomming += this.Mqtt_MessageIncomming;
|
||||
}
|
||||
|
||||
private void ParseIni() {
|
||||
if (this.ini.GetValue("zway", "devices") != null) {
|
||||
foreach (String device in this.ini.GetValue("zway", "devices").Split(',')) {
|
||||
Int32 deviceid = Int32.Parse(device);
|
||||
if (this.zw.Devices.ContainsKey(deviceid) && this.zw.Devices[deviceid].Instances.ContainsKey(0)) {
|
||||
this.zw.Devices[deviceid].Instances[0].Update += this.DeviceUpdate;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(this.ini.GetValue("f4g", "household") != null) {
|
||||
this.household = this.ini.GetValue("f4g", "household");
|
||||
}
|
||||
}
|
||||
|
||||
private void DeviceUpdate(Object sender, DeviceUpdateEvent e) {
|
||||
Instance instance = (Instance)sender;
|
||||
if(e.Parent.GetType() == typeof(Switchbinary)) {
|
||||
if (instance.CommandClasses.ContainsKey(37)) { //SwitchBinary
|
||||
String topic = "/flex4grid/v1/households/" + this.household + "/device/state";
|
||||
String text = JsonMapper.ToJson(new Dictionary<String, String>() {
|
||||
{ "status", ((Switchbinary)instance.CommandClasses[37]).Level?"active":"idle" },
|
||||
{ "timestamp", DateTime.Now.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffff'Z'") },
|
||||
{ "type", ((Switchbinary)instance.CommandClasses[37]).Name },
|
||||
{ "id", instance.DeviceId.ToString() }
|
||||
}).ToString();
|
||||
this.mqtt.Send(topic, text);
|
||||
this.Update?.Invoke(this, new Flex4gridEvent(topic, text));
|
||||
}
|
||||
} else if(e.Parent.GetType() == typeof(Sensormultilevelsub) || e.Parent.GetType() == typeof(Metersub)) {
|
||||
if (instance.CommandClasses.ContainsKey(49) && ((Sensormultilevel)instance.CommandClasses[49]).Sub.ContainsKey(4) && //SensorMultilevel
|
||||
instance.CommandClasses.ContainsKey(50) && ((Meter)instance.CommandClasses[50]).Sub.ContainsKey(0)) { //Meter
|
||||
String topic = "/flex4grid/v1/households/" + this.household + "/device/consumption";
|
||||
String text = JsonMapper.ToJson(new Dictionary<String, String>() {
|
||||
{ "timestamp", DateTime.Now.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffff'Z'") },
|
||||
{ "id", instance.DeviceId.ToString() },
|
||||
{ "power", Math.Round(((Sensormultilevelsub)((Sensormultilevel)instance.CommandClasses[49]).Sub[4]).Level).ToString("F0") },
|
||||
{ "energyCumul", ((Metersub)((Meter)instance.CommandClasses[50]).Sub[0]).Level.ToString() }
|
||||
}).ToString();
|
||||
this.mqtt.Send(topic, text);
|
||||
this.Update?.Invoke(this, new Flex4gridEvent(topic, text));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void Mqtt_MessageIncomming(Object sender, MqttEventArgs e) {
|
||||
JsonData message;
|
||||
String topic = e.Topic;
|
||||
try {
|
||||
if (e.Message.StartsWith("{")) {
|
||||
message = JsonMapper.ToObject(e.Message);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
} catch (Exception) {
|
||||
return;
|
||||
}
|
||||
if(topic == "/flex4grid/v1/households/" + this.household + "/device/actuate") {
|
||||
if(message.Keys.Contains("deviceId") && message.Keys.Contains("command")) {
|
||||
String device = message["deviceId"].ToString();
|
||||
if(this.ini.GetValue("zway", "devices") != null) {
|
||||
foreach (String item in this.ini.GetValue("zway", "devices").Split(',')) {
|
||||
if (item == device) {
|
||||
Int32 deviceid = Int32.Parse(device);
|
||||
if (this.zw.Devices.ContainsKey(deviceid) && this.zw.Devices[deviceid].Instances.ContainsKey(0) && this.zw.Devices[deviceid].Instances[0].CommandClasses.ContainsKey(37)) {
|
||||
((Switchbinary)this.zw.Devices[deviceid].Instances[0].CommandClasses[37]).Level = message["command"].ToString() == "ON";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (topic == "/flex4grid/v1/households/" + this.household + "/devices/state/request") {
|
||||
if (this.ini.GetValue("zway", "devices") != null) {
|
||||
Dictionary<String, String> response = new Dictionary<String, String>();
|
||||
foreach (String device in this.ini.GetValue("zway", "devices").Split(',')) {
|
||||
Int32 deviceid = Int32.Parse(device);
|
||||
if (this.zw.Devices.ContainsKey(deviceid) && this.zw.Devices[deviceid].Instances.ContainsKey(0)) {
|
||||
if (this.zw.Devices[deviceid].Instances[0].CommandClasses.ContainsKey(37)) {
|
||||
Switchbinary sw = ((Switchbinary)this.zw.Devices[deviceid].Instances[0].CommandClasses[37]);
|
||||
response.Add(sw.DeviceId.ToString(), sw.Level ? "active" : "idle");
|
||||
}
|
||||
}
|
||||
}
|
||||
if(response.Count != 0) {
|
||||
response.Add("timestamp", DateTime.Now.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'ffffff'Z'"));
|
||||
String rtopic = "/flex4grid/v1/households/" + this.household + "/devices/state/response";
|
||||
String rtext = JsonMapper.ToJson(response).ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if (!this.disposedValue) {
|
||||
if (disposing) {
|
||||
this.mqtt.Dispose();
|
||||
}
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
~Flex4Grid() {
|
||||
Dispose(false);
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,134 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text.RegularExpressions;
|
||||
using BlubbFish.IoT.Zway;
|
||||
using BlubbFish.IoT.Zway.Events;
|
||||
using BlubbFish.IoT.Zway.Interfaces;
|
||||
using BlubbFish.Utils;
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
using LitJson;
|
||||
|
||||
namespace ZwayBot.Moduls {
|
||||
class Mqtt : AModul, IDisposable {
|
||||
private readonly ABackend mqtt;
|
||||
private Dictionary<String, AModul> modules;
|
||||
|
||||
public override event ModulEvent Update;
|
||||
|
||||
public Mqtt(ZwayController zway, InIReader settings) : base(zway, settings) {
|
||||
if (this.config.ContainsKey("settings")) {
|
||||
this.mqtt = ABackend.GetInstance(this.config["settings"], ABackend.BackendType.Data);
|
||||
this.mqtt.MessageIncomming += this.Mqtt_MessageIncomming;
|
||||
this.zw.Update += this.ZwayEvent;
|
||||
}
|
||||
}
|
||||
|
||||
private void ZwayEvent(Object sender, DeviceUpdateEvent e) {
|
||||
String topic = "";
|
||||
String data = "";
|
||||
if(e.Parent.HasAbstract(typeof(ACommandClass))) {
|
||||
ACommandClass sensor = (ACommandClass)e.Parent;
|
||||
topic = "zwavebot/devices/" + sensor.MqttTopic();
|
||||
data = sensor.ToJson();
|
||||
}
|
||||
if(topic != "" && data != "") {
|
||||
((ADataBackend)this.mqtt).Send(topic, data);
|
||||
this.Update?.Invoke(this, new MqttEvent(topic, data));
|
||||
}
|
||||
}
|
||||
|
||||
private void Mqtt_MessageIncomming(Object sender, BackendEvent e) {
|
||||
if (e.From.ToString().StartsWith("zwavebot/devices/") && (e.From.ToString().EndsWith("/set") || e.From.ToString().EndsWith("/get"))) {
|
||||
Match m = new Regex("^zwavebot/devices/(\\d+)/(\\d+)/(\\d+)/[gs]et$|^zwavebot/devices/(\\d+)/(\\d+)/(\\d+)/(\\d+)/[gs]et$").Match(e.From.ToString());
|
||||
String id = "";
|
||||
if(m.Groups[1].Success) {
|
||||
id = m.Groups[1].Value + "-" + m.Groups[2].Value + "-" + m.Groups[3].Value;
|
||||
}
|
||||
if(m.Groups[4].Success) {
|
||||
id = m.Groups[4].Value + "-" + m.Groups[5].Value + "-" + m.Groups[6].Value + "-" + m.Groups[7].Value;
|
||||
}
|
||||
ACommandClass c = this.zw.GetCommandClass(id);
|
||||
if(c == null) {
|
||||
return;
|
||||
}
|
||||
if (e.From.ToString().EndsWith("/set")) {
|
||||
try {
|
||||
JsonData a = JsonMapper.ToObject(e.Message);
|
||||
foreach (String item in a.Keys) {
|
||||
String key = item.ToUpperLower();
|
||||
if (c.HasProperty(key)) {
|
||||
c.SetProperty(key, a[item].ToString());
|
||||
this.Update?.Invoke(this, new MqttEvent(c.Id, a[item].ToString()));
|
||||
}
|
||||
}
|
||||
} catch (Exception) { }
|
||||
} else if(e.From.ToString().EndsWith("/get")) {
|
||||
c.PollOnce = true;
|
||||
((ADataBackend)this.mqtt).Send("zwavebot/devices/" + c.MqttTopic(), c.ToJson());
|
||||
this.Update?.Invoke(this, new MqttEvent(e.From.ToString(), "Dataget"));
|
||||
}
|
||||
}
|
||||
if (e.From.ToString().StartsWith("zwavebot/config/") && (e.From.ToString().EndsWith("/set") || e.From.ToString().EndsWith("/get"))) {
|
||||
Match m = new Regex("^zwavebot/config/(\\w+)/[gs]et$|").Match(e.From.ToString());
|
||||
if (!m.Groups[1].Success) {
|
||||
return;
|
||||
}
|
||||
AModul modul = null;
|
||||
foreach (KeyValuePair<String, AModul> item in this.modules) {
|
||||
if (item.Key.ToLower() == m.Groups[1].Value) {
|
||||
modul = item.Value;
|
||||
}
|
||||
}
|
||||
if (modul == null) {
|
||||
return;
|
||||
}
|
||||
if(e.From.ToString().EndsWith("/get") && modul.HasConfig && modul.ConfigPublic) {
|
||||
String topic = "zwavebot/config/" + m.Groups[1].Value;
|
||||
String data = JsonMapper.ToJson(modul.GetConfig()).ToString();
|
||||
((ADataBackend)this.mqtt).Send(topic, data);
|
||||
this.Update?.Invoke(this, new MqttEvent(topic, data));
|
||||
}
|
||||
if (e.From.ToString().EndsWith("/set") && modul.HasConfig && modul.ConfigPublic) {
|
||||
try {
|
||||
JsonData a = JsonMapper.ToObject(e.Message);
|
||||
Dictionary<String, Dictionary<String, String>> newconf = new Dictionary<String, Dictionary<String, String>>();
|
||||
foreach (String section in a.Keys) {
|
||||
Dictionary<String, String> sectiondata = new Dictionary<String, String>();
|
||||
foreach (String item in a[section].Keys) {
|
||||
sectiondata.Add(item, a[section][item].ToString());
|
||||
}
|
||||
newconf.Add(section, sectiondata);
|
||||
}
|
||||
modul.SetConfig(newconf);
|
||||
this.Update?.Invoke(this, new MqttEvent("New Config", "Write"));
|
||||
} catch (Exception) { }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override void Interconnect(Dictionary<String, AModul> moduls) {
|
||||
this.modules = moduls;
|
||||
}
|
||||
|
||||
protected override void UpdateConfig() { }
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if (!this.disposedValue) {
|
||||
if (disposing) {
|
||||
this.mqtt.Dispose();
|
||||
}
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,7 @@ using BlubbFish.Utils;
|
||||
|
||||
namespace ZwayBot.Moduls {
|
||||
internal class Overtaker : AModul, IDisposable {
|
||||
private Dictionary<String, Dictionary<String, String>> events = new Dictionary<String, Dictionary<String, String>>();
|
||||
private readonly Dictionary<String, Dictionary<String, String>> events = new Dictionary<String, Dictionary<String, String>>();
|
||||
|
||||
public override event ModulEvent Update;
|
||||
|
||||
@@ -16,22 +16,12 @@ namespace ZwayBot.Moduls {
|
||||
}
|
||||
|
||||
private void ParseIni() {
|
||||
foreach (String item in this.ini.GetSections()) {
|
||||
String from = this.ini.GetValue(item, "from");
|
||||
String[] source = from.Split(':');
|
||||
this.events.Add(source[0], this.ini.GetSection(item));
|
||||
String[] addr = source[0].Split('-');
|
||||
ICommandClass c;
|
||||
if (addr.Length == 3 || addr.Length == 4) {
|
||||
Int32 deviceid = Int32.Parse(addr[0]);
|
||||
Int32 instanceid = Int32.Parse(addr[1]);
|
||||
Int32 classid = Int32.Parse(addr[2]);
|
||||
if (addr.Length == 4) {
|
||||
Int32 subcid = Int32.Parse(addr[3]);
|
||||
c = this.zw.GetCommandClassSub(deviceid, instanceid, classid, subcid);
|
||||
} else {
|
||||
c = this.zw.GetCommandClass(deviceid, instanceid, classid);
|
||||
}
|
||||
foreach (KeyValuePair<String, Dictionary<String, String>> item in this.config) {
|
||||
if (item.Value.ContainsKey("from")) {
|
||||
String from = item.Value["from"];
|
||||
String[] source = from.Split(':');
|
||||
this.events.Add(source[0], item.Value);
|
||||
ACommandClass c = this.zw.GetCommandClass(source[0]);
|
||||
if (c != null) {
|
||||
c.Polling = true;
|
||||
c.Update += this.ChangedEvent;
|
||||
@@ -41,9 +31,9 @@ namespace ZwayBot.Moduls {
|
||||
}
|
||||
|
||||
private void ChangedEvent(Object sender, DeviceUpdateEvent e) {
|
||||
if(Helper.HasInterface(sender, "ICommandClass")) {
|
||||
if (this.events.ContainsKey(((ICommandClass)sender).Id)) {
|
||||
this.SetValues(sender, ((ICommandClass)sender).Id, this.events[((ICommandClass)sender).Id]);
|
||||
if(sender.HasAbstract(typeof(ACommandClass))) {
|
||||
if (this.events.ContainsKey(((ACommandClass)sender).Id)) {
|
||||
this.SetValues(sender, ((ACommandClass)sender).Id, this.events[((ACommandClass)sender).Id]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -55,8 +45,8 @@ namespace ZwayBot.Moduls {
|
||||
return;
|
||||
}
|
||||
String source_value;
|
||||
if (Helper.HasProperty(sender, source[1])) {
|
||||
source_value = Helper.GetProperty(sender, source[1]).ToString();
|
||||
if (sender.HasProperty(source[1])) {
|
||||
source_value = sender.GetProperty(source[1]).ToString();
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
@@ -68,27 +58,15 @@ namespace ZwayBot.Moduls {
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach (String to in dictionary["to"].Split(';')) {
|
||||
String[] target = to.Split(':');
|
||||
if(target.Length == 2) {
|
||||
String[] addr = target[0].Split('-');
|
||||
if (addr.Length == 3 || addr.Length == 4) {
|
||||
Int32 deviceid = Int32.Parse(addr[0]);
|
||||
Int32 instanceid = Int32.Parse(addr[1]);
|
||||
Int32 classid = Int32.Parse(addr[2]);
|
||||
ICommandClass c;
|
||||
if (addr.Length == 4) {
|
||||
Int32 subcid = Int32.Parse(addr[3]);
|
||||
c = this.zw.GetCommandClassSub(deviceid, instanceid, classid, subcid);
|
||||
} else {
|
||||
c = this.zw.GetCommandClass(deviceid, instanceid, classid);
|
||||
}
|
||||
if (dictionary.ContainsKey("to")) {
|
||||
foreach (String to in dictionary["to"].Split(';')) {
|
||||
String[] target = to.Split(':');
|
||||
if (target.Length == 2) {
|
||||
ACommandClass c = this.zw.GetCommandClass(target[0]);
|
||||
if (c != null) {
|
||||
String target_value;
|
||||
if (Helper.HasProperty(c, target[1])) {
|
||||
target_value = Helper.GetProperty(c, target[1]).ToString();
|
||||
if (target_value != source_value) {
|
||||
Helper.SetProperty(c, target[1], source_value);
|
||||
if (c.HasProperty(target[1])) {
|
||||
if (c.GetProperty(target[1]).ToString() != source_value) {
|
||||
c.SetProperty(target[1], source_value);
|
||||
this.Update?.Invoke(this, new OvertakerEvent(target[0], target[1], source_value));
|
||||
}
|
||||
}
|
||||
@@ -98,6 +76,8 @@ namespace ZwayBot.Moduls {
|
||||
}
|
||||
}
|
||||
|
||||
protected override void UpdateConfig() { }
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
@@ -109,10 +89,6 @@ namespace ZwayBot.Moduls {
|
||||
}
|
||||
}
|
||||
|
||||
~Overtaker() {
|
||||
Dispose(false);
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
using System;
|
||||
using BlubbFish.IoT.Zway;
|
||||
using BlubbFish.IoT.Zway.Events;
|
||||
using BlubbFish.Utils;
|
||||
using BlubbFish.Utils.IoT.Connector;
|
||||
using BlubbFish.Utils.IoT.Events;
|
||||
using BlubbFish.Utils.IoT.Interfaces;
|
||||
|
||||
namespace ZwayBot.Moduls {
|
||||
class Senml : AModul {
|
||||
public override event ModulEvent Update;
|
||||
private readonly ABackend mqtt;
|
||||
private readonly String SenmlGuid;
|
||||
|
||||
public Senml(ZwayController zway, InIReader settings) : base(zway, settings) {
|
||||
if (this.config.ContainsKey("settings")) {
|
||||
this.mqtt = ABackend.GetInstance(this.config["settings"], ABackend.BackendType.Data);
|
||||
this.mqtt.MessageIncomming += this.EventInput;
|
||||
this.zw.Update += this.EventOutput;
|
||||
this.SenmlGuid = this.config["settings"]["guid"];
|
||||
}
|
||||
}
|
||||
|
||||
#region Events
|
||||
private void EventOutput(Object sender, DeviceUpdateEvent e) {
|
||||
String topic = "";
|
||||
String data = "";
|
||||
if (e.Parent.HasInterface(typeof(ISenml))) {
|
||||
ISenml sensor = (ISenml)e.Parent;
|
||||
topic = sensor.SenmlTopic() + this.SenmlGuid+ "/senml";
|
||||
data = sensor.ToSenml();
|
||||
}
|
||||
if (topic != "" && data != null && data != "") {
|
||||
((ADataBackend)this.mqtt).Send(topic, data);
|
||||
this.Update?.Invoke(this, new MqttEvent(topic, data));
|
||||
}
|
||||
}
|
||||
|
||||
private void EventInput(Object sender, BackendEvent e) { }
|
||||
#endregion
|
||||
|
||||
#region Config
|
||||
protected override void UpdateConfig() { }
|
||||
#endregion
|
||||
|
||||
#region IDisposable Support
|
||||
private Boolean disposedValue = false;
|
||||
|
||||
protected virtual void Dispose(Boolean disposing) {
|
||||
if (!this.disposedValue) {
|
||||
if (disposing) {
|
||||
this.mqtt.Dispose();
|
||||
}
|
||||
this.disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
public override void Dispose() {
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using BlubbFish.IoT.Zway;
|
||||
using BlubbFish.IoT.Zway.Devices;
|
||||
using BlubbFish.IoT.Zway.Interfaces;
|
||||
using BlubbFish.Utils;
|
||||
using ZwayBot.Interfaces;
|
||||
|
||||
namespace ZwayBot.Moduls {
|
||||
class Statuspolling : AModul, IDisposable, IForceLoad {
|
||||
public override event ModulEvent Update;
|
||||
|
||||
public Statuspolling(ZwayController zway, InIReader settings) : base(zway, settings) { }
|
||||
|
||||
|
||||
public override void Interconnect(Dictionary<String, AModul> moduls) {
|
||||
foreach (KeyValuePair<String, AModul> item in moduls) {
|
||||
if (item.Value is CronJob) {
|
||||
item.Value.SetInterconnection("0 0 * * *", new Action<Object>(this.PollAll), null);
|
||||
if (this.config.Count != 0) {
|
||||
foreach (KeyValuePair<String, Dictionary<String, String>> section in this.config) {
|
||||
if (section.Value.ContainsKey("cron") && section.Value.ContainsKey("devices")) {
|
||||
item.Value.SetInterconnection(section.Value["cron"], new Action<Object>(this.PollSpecific), section.Value["devices"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void PollSpecific(Object obj) {
|
||||
String devices = (String)obj;
|
||||
foreach (String item in devices.Split(',')) {
|
||||
ACommandClass c = this.zw.GetCommandClass(item);
|
||||
c.PollOnce = true;
|
||||
this.Update?.Invoke(this, new StatusPollingEvent("Polling", item));
|
||||
}
|
||||
}
|
||||
|
||||
private void PollAll(Object o) {
|
||||
foreach (KeyValuePair<Int32, Device> device in this.zw.Devices) {
|
||||
foreach (KeyValuePair<Int32, Instance> instance in device.Value.Instances) {
|
||||
foreach (KeyValuePair<ACommandClass.Classes, ACommandClass> commandclass in instance.Value.CommandClasses) {
|
||||
commandclass.Value.PollOnce = true;
|
||||
if(commandclass.Value.HasSub) {
|
||||
foreach (KeyValuePair<Int32, ACommandClass> subclass in commandclass.Value.Sub) {
|
||||
subclass.Value.PollOnce = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
this.Update?.Invoke(this, new StatusPollingEvent("Polling", "all nodes"));
|
||||
}
|
||||
|
||||
protected override void UpdateConfig() { }
|
||||
|
||||
public override void Dispose() {}
|
||||
}
|
||||
}
|
||||
+52
-16
@@ -1,47 +1,77 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
using BlubbFish.IoT.Zway;
|
||||
using BlubbFish.Utils;
|
||||
using ZwayBot.Moduls;
|
||||
|
||||
namespace ZwayBot {
|
||||
class Program {
|
||||
static void Main(String[] args) => new Program(args);
|
||||
|
||||
private ZwayController zw;
|
||||
private Dictionary<String, AModul> moduls = new Dictionary<String, AModul>();
|
||||
private readonly ZwayController zw;
|
||||
private readonly Dictionary<String, AModul> moduls = new Dictionary<String, AModul>();
|
||||
private Boolean RunningProcess = true;
|
||||
private Thread sig_thread;
|
||||
private readonly ProgramLogger logger = new ProgramLogger();
|
||||
|
||||
public Program(String[] args) {
|
||||
InIReader.SetSearchPath(new List<String>() { "/etc/zwaybot", Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\zwaybot" });
|
||||
Dictionary<String, String> names;
|
||||
if(File.Exists("names.ini")) {
|
||||
names = InIReader.GetInstance("names.ini").GetSection("names");
|
||||
if(InIReader.ConfigExist("names")) {
|
||||
names = InIReader.GetInstance("names").GetSection("names");
|
||||
} else {
|
||||
names = new Dictionary<String, String>();
|
||||
}
|
||||
if(!File.Exists("settings.ini")) {
|
||||
if(!InIReader.ConfigExist("settings")) {
|
||||
Helper.WriteError("No settings.ini found. Abord!");
|
||||
return;
|
||||
}
|
||||
this.zw = new ZwayController(InIReader.GetInstance("settings.ini").GetSection("zway"), names, false);
|
||||
this.logger.SetPath(InIReader.GetInstance("settings").GetValue("logging", "path"));
|
||||
this.zw = new ZwayController(InIReader.GetInstance("settings").GetSection("zway"), names, false);
|
||||
this.zw.Update += this.ZwayDataUpate;
|
||||
this.ModulLoader();
|
||||
this.ModulInterconnect();
|
||||
this.ModulEvents();
|
||||
this.WaitForShutdown();
|
||||
this.ModulDispose();
|
||||
}
|
||||
|
||||
private void ModulInterconnect() {
|
||||
foreach (KeyValuePair<String, AModul> item in this.moduls) {
|
||||
item.Value.Interconnect(this.moduls);
|
||||
}
|
||||
}
|
||||
|
||||
private void WaitForShutdown() {
|
||||
while (true) {
|
||||
System.Threading.Thread.Sleep(100);
|
||||
if (Console.KeyAvailable) {
|
||||
ConsoleKeyInfo key = Console.ReadKey(false);
|
||||
if (key.Key == ConsoleKey.Escape) {
|
||||
if (Type.GetType("Mono.Runtime") != null) {
|
||||
this.sig_thread = new Thread(delegate () {
|
||||
Mono.Unix.UnixSignal[] signals = new Mono.Unix.UnixSignal[] {
|
||||
new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGTERM),
|
||||
new Mono.Unix.UnixSignal(Mono.Unix.Native.Signum.SIGINT)
|
||||
};
|
||||
Console.WriteLine("Signalhandler Mono attached.");
|
||||
while (true) {
|
||||
Int32 i = Mono.Unix.UnixSignal.WaitAny(signals, -1);
|
||||
Console.WriteLine("Signalhandler Mono INT recieved " + i + ".");
|
||||
this.RunningProcess = false; // TODO BUG
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
this.sig_thread.Start();
|
||||
} else {
|
||||
Console.CancelKeyPress += new ConsoleCancelEventHandler(this.SetupShutdown);
|
||||
Console.WriteLine("Signalhandler Windows attached.");
|
||||
}
|
||||
while (this.RunningProcess) {
|
||||
Thread.Sleep(100);
|
||||
}
|
||||
}
|
||||
|
||||
private void SetupShutdown(Object sender, ConsoleCancelEventArgs e) {
|
||||
e.Cancel = true;
|
||||
Console.WriteLine("Signalhandler Windows INT recieved.");
|
||||
this.RunningProcess = false;
|
||||
}
|
||||
|
||||
private void ModulDispose() {
|
||||
@@ -50,6 +80,9 @@ namespace ZwayBot {
|
||||
Console.WriteLine("Modul entladen: " + item.Key);
|
||||
}
|
||||
this.zw.Dispose();
|
||||
if (this.sig_thread != null && this.sig_thread.IsAlive) {
|
||||
this.sig_thread.Abort();
|
||||
}
|
||||
}
|
||||
|
||||
private void ModulEvents() {
|
||||
@@ -68,9 +101,12 @@ namespace ZwayBot {
|
||||
if(item.Namespace == "ZwayBot.Moduls") {
|
||||
Type t = item;
|
||||
String name = t.Name;
|
||||
if (File.Exists(name.ToLower() + ".ini")) {
|
||||
this.moduls.Add(name, (AModul)t.GetConstructor(new Type[] { typeof(ZwayController), typeof(InIReader) }).Invoke(new Object[] { this.zw, InIReader.GetInstance(name.ToLower() + ".ini") }));
|
||||
if (InIReader.ConfigExist(name.ToLower())) {
|
||||
this.moduls.Add(name, (AModul)t.GetConstructor(new Type[] { typeof(ZwayController), typeof(InIReader) }).Invoke(new Object[] { this.zw, InIReader.GetInstance(name.ToLower()) }));
|
||||
Console.WriteLine("Load Modul " + name);
|
||||
} else if(t.HasInterface("IForceLoad")) {
|
||||
this.moduls.Add(name, (AModul)t.GetConstructor(new Type[] { typeof(ZwayController), typeof(InIReader) }).Invoke(new Object[] { this.zw, null }));
|
||||
Console.WriteLine("Load Modul Forced " + name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
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,
|
||||
// die einer Assembly zugeordnet sind.
|
||||
[assembly: AssemblyTitle("Zway-Bot")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyDescription("Is a Bot for Zwave Devices")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyCompany("BlubbFish")]
|
||||
[assembly: AssemblyProduct("Zway-Bot")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2017")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2017 - 15.05.2018")]
|
||||
[assembly: AssemblyTrademark("BlubbFish")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
|
||||
@@ -27,12 +27,12 @@ using System.Runtime.InteropServices;
|
||||
// Hauptversion
|
||||
// Nebenversion
|
||||
// Buildnummer
|
||||
// Revision
|
||||
//
|
||||
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
|
||||
// übernehmen, indem Sie "*" eingeben:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
[assembly: AssemblyVersion("1.5.6")]
|
||||
[assembly: AssemblyFileVersion("1.5.6")]
|
||||
[assembly: NeutralResourcesLanguage("de-DE")]
|
||||
|
||||
// “Internet Of Things” icon by By Michael Wohlwend, US, from thenounproject.com.
|
||||
|
||||
@@ -12,6 +12,8 @@
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<TargetFrameworkProfile />
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
@@ -39,9 +41,6 @@
|
||||
<ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="LitJson, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\LitJson.0.9.0\lib\LitJson.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
@@ -53,12 +52,17 @@
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="dpkg\preinst" />
|
||||
<None Include="dpkg\postinst" />
|
||||
<Compile Include="Events.cs" />
|
||||
<Compile Include="Interfaces\IForceLoad.cs" />
|
||||
<Compile Include="Moduls\AModul.cs" />
|
||||
<Compile Include="Moduls\CronJob.cs" />
|
||||
<Compile Include="Helper.cs" />
|
||||
<Compile Include="Moduls\Flex4Grid.cs" />
|
||||
<Compile Include="Moduls\Mqtt.cs" />
|
||||
<Compile Include="Moduls\Overtaker.cs" />
|
||||
<Compile Include="Moduls\Senml.cs" />
|
||||
<Compile Include="Moduls\StatusPolling.cs" />
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Properties\Resources.Designer.cs">
|
||||
@@ -68,9 +72,17 @@
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\Utils\IoT\Connector\Data\Mosquitto\ConnectorDataMosquitto.csproj">
|
||||
<Project>{39235fad-ba9d-4b51-82fc-6969967beae9}</Project>
|
||||
<Name>ConnectorDataMosquitto</Name>
|
||||
<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\IoT\Connector\Data\Mqtt\ConnectorDataMqtt.csproj">
|
||||
<Project>{ee6c8f68-ed46-4c1c-abdd-cfcdf75104f2}</Project>
|
||||
<Name>ConnectorDataMqtt</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Utils\IoT\Interfaces\Iot-Interfaces.csproj">
|
||||
<Project>{4daada29-c600-4cf3-8ad3-9c97c8d7f632}</Project>
|
||||
<Name>Iot-Interfaces</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Utils\IoT\Utils-IoT.csproj">
|
||||
<Project>{b870e4d5-6806-4a0b-b233-8907eedc5afc}</Project>
|
||||
@@ -86,9 +98,36 @@
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
<None Include="config-example\cronjob.conf.example">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="config-example\names.conf.example">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="config-example\senml.conf.example">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="config-example\settings.conf.example">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="config-example\statuspolling.conf.example">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="config-example\mqtt.conf.example">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="config-example\overtaker.conf.example">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="dpkg\control" />
|
||||
<None Include="dpkg\create-Builds.bat" />
|
||||
<None Include="dpkg\make-deb.sh" />
|
||||
<None Include="dpkg\prerm" />
|
||||
<None Include="dpkg\zwaybot-logrotate" />
|
||||
<None Include="dpkg\zwaybot.service" />
|
||||
<None Include="packages.config" />
|
||||
<None Include="Resources\Icon.ico" />
|
||||
<Content Include="Resources\icon.svg" />
|
||||
</ItemGroup>
|
||||
@@ -99,4 +138,11 @@
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\Mono.Posix.5.4.0.201\build\net45\Mono.Posix.targets" Condition="Exists('..\packages\Mono.Posix.5.4.0.201\build\net45\Mono.Posix.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\Mono.Posix.5.4.0.201\build\net45\Mono.Posix.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Mono.Posix.5.4.0.201\build\net45\Mono.Posix.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,10 @@
|
||||
[modul]
|
||||
config=public
|
||||
|
||||
[cold]
|
||||
cron=0 23 * * 0-4
|
||||
set=7-0-67-2:Level-19;7-0-112-8:Level-2
|
||||
|
||||
[hot]
|
||||
cron=0 16 * * 1-5
|
||||
set=7-0-67-1:Level-22;7-0-112-8:Level-1
|
||||
@@ -0,0 +1,6 @@
|
||||
[modul]
|
||||
config=private
|
||||
|
||||
[settings]
|
||||
type=mqtt
|
||||
server=localhost
|
||||
@@ -0,0 +1,24 @@
|
||||
[names]
|
||||
2-0-37=Kühlschrank Schalter
|
||||
2-0-49-4=Kühlschrank Leistung
|
||||
2-0-50-0=Kühlschrank Verbrauch [kWh]
|
||||
2-0-50-2=Kühlschrank Verbrauch [Wh]
|
||||
2-0-112-1=Kühlschrank Config (Immer AN)
|
||||
2-0-112-16=Kühlschrank Config (Zurück zu altem Status nach Stromausfall)
|
||||
2-0-112-34=Kühlschrank Config (Reaktion auf Alarm)
|
||||
2-0-112-35=Kühlschrank Config (Antwort auf Alarmmeldung)
|
||||
2-0-112-39=Kühlschrank Config (Alarm Dauer)
|
||||
2-0-112-40=Kühlschrank Config (Sofortiger Bericht über Stromverbrauch)
|
||||
2-0-112-42=Kühlschrank Config (Änderung der Leistung zum Generieren eines Reports)
|
||||
2-0-112-43=Kühlschrank Config (Regelmäßiges Senden eines Reports über die Stromaufnahme)
|
||||
2-0-112-45=Kühlschrank Config (Automatisches Senden eines Reportes über Stromverbrauch bei Verbrauchsänderung)
|
||||
2-0-112-47=Kühlschrank Config (Zeitinterval zum Senden eines Reportes ohne Änderung im Verbrauch)
|
||||
2-0-112-49=Kühlschrank Config (Messen des Eigenstromverbrauches)
|
||||
2-0-112-50=Kühlschrank Config (unterer Leistungsschwellwert)
|
||||
2-0-112-51=Kühlschrank Config (oberer Leistungsschwellwert)
|
||||
2-0-112-52=Kühlschrank Config (Aktion bei Erreichen des definierten Schwellwertes (Parameter 50/51))
|
||||
2-0-112-60=Kühlschrank Config (Leistungsschwellwert für violettes Blinken)
|
||||
2-0-112-61=Kühlschrank Config (LED Ring Farbe im Einschaltzustand)
|
||||
2-0-112-62=Kühlschrank Config (LED Ring Farbe im Ausschaltzustand)
|
||||
2-0-112-63=Kühlschrank Config (LED Ring Farbe bei Z-Wave Alarmmeldungen)
|
||||
2-0-112-70=Kühlschrank Config (Überlastabschaltung)
|
||||
@@ -0,0 +1,12 @@
|
||||
[hot]
|
||||
from=7-0-67-1:Level
|
||||
to=8-0-67-1:Level;9-0-67-1:Level
|
||||
|
||||
[cold]
|
||||
from=7-0-67-2:Level
|
||||
to=8-0-67-11:Level;9-0-67-11:Level
|
||||
|
||||
[mode]
|
||||
from=7-0-112-8:Level
|
||||
to=8-0-64:Level;9-0-64:Level
|
||||
convert=1-1;2-11
|
||||
@@ -0,0 +1,7 @@
|
||||
[modul]
|
||||
config=private
|
||||
|
||||
[settings]
|
||||
type=mqtt
|
||||
server=localhost
|
||||
guid=linksmart-zwaybot
|
||||
@@ -0,0 +1,7 @@
|
||||
[zway]
|
||||
server=localhost
|
||||
user=admin
|
||||
pass=pass
|
||||
|
||||
[logging]
|
||||
path=/var/log/zwaybot.log
|
||||
@@ -0,0 +1,3 @@
|
||||
[temp]
|
||||
cron=30 * * * *
|
||||
devices=7-0-49-1,8-0-49-1,9-0-49-1,10-0-49-1,11-0-49-1
|
||||
Binary file not shown.
@@ -0,0 +1,10 @@
|
||||
[modul]
|
||||
config=public
|
||||
|
||||
[cold]
|
||||
cron=0 23 * * 0-4
|
||||
set=7-0-67-2:Level-19;7-0-112-8:Level-2
|
||||
|
||||
[hot]
|
||||
cron=0 16 * * 1-5
|
||||
set=7-0-67-1:Level-22;7-0-112-8:Level-1
|
||||
@@ -0,0 +1,6 @@
|
||||
[modul]
|
||||
config=private
|
||||
|
||||
[settings]
|
||||
type=mqtt
|
||||
server=localhost
|
||||
@@ -0,0 +1,24 @@
|
||||
[names]
|
||||
2-0-37=Kühlschrank Schalter
|
||||
2-0-49-4=Kühlschrank Leistung
|
||||
2-0-50-0=Kühlschrank Verbrauch [kWh]
|
||||
2-0-50-2=Kühlschrank Verbrauch [Wh]
|
||||
2-0-112-1=Kühlschrank Config (Immer AN)
|
||||
2-0-112-16=Kühlschrank Config (Zurück zu altem Status nach Stromausfall)
|
||||
2-0-112-34=Kühlschrank Config (Reaktion auf Alarm)
|
||||
2-0-112-35=Kühlschrank Config (Antwort auf Alarmmeldung)
|
||||
2-0-112-39=Kühlschrank Config (Alarm Dauer)
|
||||
2-0-112-40=Kühlschrank Config (Sofortiger Bericht über Stromverbrauch)
|
||||
2-0-112-42=Kühlschrank Config (Änderung der Leistung zum Generieren eines Reports)
|
||||
2-0-112-43=Kühlschrank Config (Regelmäßiges Senden eines Reports über die Stromaufnahme)
|
||||
2-0-112-45=Kühlschrank Config (Automatisches Senden eines Reportes über Stromverbrauch bei Verbrauchsänderung)
|
||||
2-0-112-47=Kühlschrank Config (Zeitinterval zum Senden eines Reportes ohne Änderung im Verbrauch)
|
||||
2-0-112-49=Kühlschrank Config (Messen des Eigenstromverbrauches)
|
||||
2-0-112-50=Kühlschrank Config (unterer Leistungsschwellwert)
|
||||
2-0-112-51=Kühlschrank Config (oberer Leistungsschwellwert)
|
||||
2-0-112-52=Kühlschrank Config (Aktion bei Erreichen des definierten Schwellwertes (Parameter 50/51))
|
||||
2-0-112-60=Kühlschrank Config (Leistungsschwellwert für violettes Blinken)
|
||||
2-0-112-61=Kühlschrank Config (LED Ring Farbe im Einschaltzustand)
|
||||
2-0-112-62=Kühlschrank Config (LED Ring Farbe im Ausschaltzustand)
|
||||
2-0-112-63=Kühlschrank Config (LED Ring Farbe bei Z-Wave Alarmmeldungen)
|
||||
2-0-112-70=Kühlschrank Config (Überlastabschaltung)
|
||||
@@ -0,0 +1,12 @@
|
||||
[hot]
|
||||
from=7-0-67-1:Level
|
||||
to=8-0-67-1:Level;9-0-67-1:Level
|
||||
|
||||
[cold]
|
||||
from=7-0-67-2:Level
|
||||
to=8-0-67-11:Level;9-0-67-11:Level
|
||||
|
||||
[mode]
|
||||
from=7-0-112-8:Level
|
||||
to=8-0-64:Level;9-0-64:Level
|
||||
convert=1-1;2-11
|
||||
@@ -0,0 +1,7 @@
|
||||
[modul]
|
||||
config=private
|
||||
|
||||
[settings]
|
||||
type=mqtt
|
||||
server=localhost
|
||||
guid=linksmart-zwaybot
|
||||
@@ -0,0 +1,7 @@
|
||||
[zway]
|
||||
server=localhost
|
||||
user=admin
|
||||
pass=pass
|
||||
|
||||
[logging]
|
||||
path=/var/log/zwaybot.log
|
||||
@@ -0,0 +1,3 @@
|
||||
[temp]
|
||||
cron=30 * * * *
|
||||
devices=7-0-49-1,8-0-49-1,9-0-49-1,10-0-49-1,11-0-49-1
|
||||
@@ -0,0 +1,10 @@
|
||||
Package: zwaybot
|
||||
Version: x.x-x
|
||||
Section: base
|
||||
Priority: optional
|
||||
Architecture: any
|
||||
Depends: mono-complete (>= 5.4.1.6)
|
||||
Maintainer: BlubbFish <dev@blubbfish.net>
|
||||
Description: Zway-Bot
|
||||
Zway-Bot manage a Zwave.me installation
|
||||
so that it has more features
|
||||
@@ -0,0 +1 @@
|
||||
bash.exe -c "./make-deb.sh armhf"
|
||||
@@ -0,0 +1,49 @@
|
||||
#!/bin/bash
|
||||
|
||||
HOMEDIR="/home/blubb"
|
||||
ROOT="$HOMEDIR/deb"
|
||||
OUTPUT="../bin/Release"
|
||||
|
||||
EXEC="$ROOT/usr/local/bin/zwaybot"
|
||||
CONFIG="$ROOT/etc/zwaybot"
|
||||
SYSTEMD="$ROOT/etc/systemd/system"
|
||||
LOGROTATE="$ROOT/etc/logrotate.d"
|
||||
|
||||
DEBIAN="$ROOT/DEBIAN"
|
||||
VMAJOR=$(grep -e "^\[assembly: AssemblyVersion(\"" ../Properties/AssemblyInfo.cs | cut -d'"' -f 2 | cut -d'.' -f 1)
|
||||
VMINOR=$(grep -e "^\[assembly: AssemblyVersion(\"" ../Properties/AssemblyInfo.cs | cut -d'"' -f 2 | cut -d'.' -f 2)
|
||||
VBUILD=$(grep -e "^\[assembly: AssemblyVersion(\"" ../Properties/AssemblyInfo.cs | cut -d'"' -f 2 | cut -d'.' -f 3)
|
||||
ARCHT=$1
|
||||
|
||||
mkdir -p $EXEC
|
||||
mkdir -p $CONFIG
|
||||
mkdir -p $DEBIAN
|
||||
mkdir -p $SYSTEMD
|
||||
mkdir -p $LOGROTATE
|
||||
|
||||
cp control $DEBIAN
|
||||
cp preinst $DEBIAN
|
||||
cp postinst $DEBIAN
|
||||
cp prerm $DEBIAN
|
||||
sed -i s/Version:\ x\.x-x/"Version: $VMAJOR.$VMINOR-$VBUILD"/ $DEBIAN/control
|
||||
sed -i s/Architecture:\ any/"Architecture: $ARCHT"/ $DEBIAN/control
|
||||
chmod 755 $DEBIAN -R
|
||||
|
||||
cp zwaybot.service $SYSTEMD
|
||||
chmod 644 $SYSTEMD/zwaybot.service
|
||||
|
||||
cp $OUTPUT/*.exe $EXEC/
|
||||
find $OUTPUT -name \*.dll ! -name Mono.Posix.dll -exec cp {} $EXEC/ \;
|
||||
chmod 644 $EXEC/*
|
||||
chmod 755 $EXEC
|
||||
|
||||
cp $OUTPUT/config-example/* $CONFIG
|
||||
chmod 644 $CONFIG/*
|
||||
chmod 755 $CONFIG
|
||||
|
||||
cp zwaybot-logrotate $LOGROTATE/zwaybot
|
||||
chmod 644 $LOGROTATE/*
|
||||
|
||||
dpkg-deb --build $ROOT
|
||||
mv $HOMEDIR/deb.deb ../../../Builds/"$ARCHT-zwaybot_$VMAJOR.$VMINOR-$VBUILD.deb"
|
||||
rm $HOMEDIR/deb -r
|
||||
@@ -0,0 +1 @@
|
||||
Name "Example1"
|
||||
@@ -0,0 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
systemctl daemon-reload
|
||||
if [[ $(systemctl is-active zwaybot || true) == "active" ]]
|
||||
then
|
||||
service zwaybot restart
|
||||
fi
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
useradd -M zwaybot
|
||||
usermod -L zwaybot
|
||||
groupadd zwaybot
|
||||
usermod -G zwaybot,adm zwaybot
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
service zwaybot stop
|
||||
@@ -0,0 +1,10 @@
|
||||
/var/log/zwaybot.log {
|
||||
compress
|
||||
copytruncate
|
||||
daily
|
||||
delaycompress
|
||||
missingok
|
||||
notifempty
|
||||
rotate 4
|
||||
size=10M
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
# If you modify this, please also make sure to edit init.sh
|
||||
|
||||
[Unit]
|
||||
Description=Zway-Bot manage a Zwave.me installation so that it has more features
|
||||
After=network-online.target
|
||||
|
||||
[Service]
|
||||
User=zwaybot
|
||||
Group=zwaybot
|
||||
WorkingDirectory=/usr/local/bin/zwaybot
|
||||
# ExecStartPre=/bin/rm /var/log/zwaybot.log && /bin/touch /var/log/zwaybot.log && /bin/chown zwaybot:zwaybot /var/log/zwaybot.log && /bin/chmod 644 /var/log/zwaybot.log
|
||||
ExecStart=/usr/bin/mono /usr/local/bin/zwaybot/Zway-Bot.exe
|
||||
KillMode=control-group
|
||||
Restart=on-failure
|
||||
StandardOutput=null
|
||||
StandardError=syslog+journal
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
Alias=zwaybot.service
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="LitJson" version="0.9.0" targetFramework="net461" />
|
||||
<package id="Mono.Posix" version="5.4.0.201" targetFramework="net471" />
|
||||
</packages>
|
||||
Reference in New Issue
Block a user