diff --git a/BosmonMqtt.sln b/BosmonMqtt.sln
index f654721..850b0a3 100644
--- a/BosmonMqtt.sln
+++ b/BosmonMqtt.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 15.0.27004.2010
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BosmonMqtt", "BosmonMqtt\BosmonMqtt.csproj", "{EE2F31C4-64D7-4788-AC68-33C5CC8EFCCD}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M2Mqtt", "..\Librarys\mqtt\M2Mqtt\M2Mqtt.csproj", "{A11AEF5A-B246-4FE8-8330-06DB73CC8074}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
{EE2F31C4-64D7-4788-AC68-33C5CC8EFCCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE2F31C4-64D7-4788-AC68-33C5CC8EFCCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE2F31C4-64D7-4788-AC68-33C5CC8EFCCD}.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
diff --git a/BosmonMqtt/BosmonMqtt.csproj b/BosmonMqtt/BosmonMqtt.csproj
index fc48278..ea1aea1 100644
--- a/BosmonMqtt/BosmonMqtt.csproj
+++ b/BosmonMqtt/BosmonMqtt.csproj
@@ -48,6 +48,159 @@
+
+ lib\litjson\IJsonWrapper.cs
+
+
+ lib\litjson\JsonData.cs
+
+
+ lib\litjson\JsonException.cs
+
+
+ lib\litjson\JsonMapper.cs
+
+
+ lib\litjson\JsonMockWrapper.cs
+
+
+ lib\litjson\JsonReader.cs
+
+
+ lib\litjson\JsonWriter.cs
+
+
+ lib\litjson\Lexer.cs
+
+
+ lib\litjson\Netstandard15Polyfill.cs
+
+
+ lib\litjson\ParserToken.cs
+
+
+ lib\M2Mqtt\Exceptions\MqttClientException.cs
+
+
+ lib\M2Mqtt\Exceptions\MqttCommunicationException.cs
+
+
+ lib\M2Mqtt\Exceptions\MqttConnectionException.cs
+
+
+ lib\M2Mqtt\Exceptions\MqttTimeoutException.cs
+
+
+ lib\M2Mqtt\IMqttNetworkChannel.cs
+
+
+ lib\M2Mqtt\Internal\InternalEvent.cs
+
+
+ lib\M2Mqtt\Internal\MsgInternalEvent.cs
+
+
+ lib\M2Mqtt\Internal\MsgPublishedInternalEvent.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgBase.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgConnack.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgConnect.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgConnectEventArgs.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgContext.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgDisconnect.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgPingReq.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgPingResp.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgPuback.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgPubcomp.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgPublish.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgPublishedEventArgs.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgPublishEventArgs.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgPubrec.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgPubrel.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgSuback.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgSubscribe.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgSubscribedEventArgs.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgSubscribeEventArgs.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgUnsuback.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgUnsubscribe.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgUnsubscribedEventArgs.cs
+
+
+ lib\M2Mqtt\Messages\MqttMsgUnsubscribeEventArgs.cs
+
+
+ lib\M2Mqtt\MqttClient.cs
+
+
+ lib\M2Mqtt\MqttSecurity.cs
+
+
+ lib\M2Mqtt\Net\Fx.cs
+
+
+ lib\M2Mqtt\Net\MqttNetworkChannel.cs
+
+
+ lib\M2Mqtt\M2Mqtt\MqttSettings.cs
+
+
+ lib\M2Mqtt\Session\MqttBrokerSession.cs
+
+
+ lib\M2Mqtt\Session\MqttClientSession.cs
+
+
+ lib\M2Mqtt\Session\MqttSession.cs
+
+
+ lib\M2Mqtt\Utility\Trace.cs
+
+
+ lib\M2Mqtt\Utility\QueueExtension.cs
+
@@ -65,12 +218,7 @@
Config.cs
-
-
- {a11aef5a-b246-4fe8-8330-06db73cc8074}
- M2Mqtt
-
-
+
copy "$(TargetPath)" "D:\Programme\BosMon_dev\plugins\$(TargetFileName)"
diff --git a/BosmonMqtt/MqttEventProcessor.cs b/BosmonMqtt/MqttEventProcessor.cs
index b1c8ebe..7f00e7a 100644
--- a/BosmonMqtt/MqttEventProcessor.cs
+++ b/BosmonMqtt/MqttEventProcessor.cs
@@ -7,6 +7,7 @@ using BosMon.Data;
using BosMon.Data.Telegrams;
using BosMon.Plugins;
using BosMon.Utils;
+using LitJson;
using TelegramFilter.Filter;
using uPLibrary.Networking.M2Mqtt;
using uPLibrary.Networking.M2Mqtt.Messages;
@@ -133,19 +134,26 @@ namespace BlubbFish.BosmonMqtt {
Telegram t = e.Telegram as Telegram;
if (this.client != null && this.client.IsConnected && this.filter != null) {
if (this.FilterMatch(t)) {
+ String text = "";
+ String topic = "";
if (t.Type == PocsagTelegram.TYPE_POCSAG) {
PocsagTelegram p = t as PocsagTelegram;
- this.client.Publish(this.pluginconfig.Topic + "pocsag/" + p.Address + p.Func, Encoding.UTF8.GetBytes(p.Msg));
+ text = JsonMapper.ToJson(p);
+ topic = this.pluginconfig.Topic + "pocsag/" + p.Address + p.Func;
} else if(t.Type == FmsTelegram.TYPE_FMS) {
FmsTelegram f = t as FmsTelegram;
- this.client.Publish(this.pluginconfig.Topic + "fms/" + f.Address, Encoding.UTF8.GetBytes(f.Bos + "\t" + f.Fzg + "\t" + f.Info + "\t" + f.Lkz + "\t" + f.Msg + "\t" + f.Okz + "\t" + f.Status));
+ text = JsonMapper.ToJson(f);
+ topic = this.pluginconfig.Topic + "fms/" + f.Address;
} else if(t.Type == ZveiTelegram.TYPE_ZVEI) {
ZveiTelegram z = t as ZveiTelegram;
- this.client.Publish(this.pluginconfig.Topic + "zvei/" + z.Address, Encoding.UTF8.GetBytes(""));
+ text = JsonMapper.ToJson(z);
+ topic = this.pluginconfig.Topic + "zvei/" + z.Address;
} else if (t.Type == ZveiDtmfTelegram.TYPE_ZVEIDTMF) {
ZveiDtmfTelegram z = t as ZveiDtmfTelegram;
- this.client.Publish(this.pluginconfig.Topic + "zveidmf/" + z.Address, Encoding.UTF8.GetBytes(z.DtmfTone));
+ text = JsonMapper.ToJson(z);
+ topic = this.pluginconfig.Topic + "zveidmf/" + z.Address;
}
+ this.client.Publish(topic, Encoding.UTF8.GetBytes(text));
}
}
} catch (Exception) { }
diff --git a/BosmonMqtt/MqttPlugin.cs b/BosmonMqtt/MqttPlugin.cs
index e89bca4..7113fe0 100644
--- a/BosmonMqtt/MqttPlugin.cs
+++ b/BosmonMqtt/MqttPlugin.cs
@@ -21,7 +21,7 @@ namespace BlubbFish.BosmonMqtt {
Int32 IBosMonPlugin.PluginVersion {
get {
- return 3;
+ return 4;
}
}
diff --git a/BosmonMqtt/Properties/AssemblyInfo.cs b/BosmonMqtt/Properties/AssemblyInfo.cs
index 6039b8e..8033e64 100644
--- a/BosmonMqtt/Properties/AssemblyInfo.cs
+++ b/BosmonMqtt/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@ 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.2.1.0")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
[assembly: NeutralResourcesLanguage("de")]
diff --git a/BosmonMqtt/bin/Release/BosmonMqtt.dll b/BosmonMqtt/bin/Release/BosmonMqtt.dll
index 6f50ff3..c13c750 100644
Binary files a/BosmonMqtt/bin/Release/BosmonMqtt.dll and b/BosmonMqtt/bin/Release/BosmonMqtt.dll differ
diff --git a/BosmonMqtt/bin/Release/M2Mqtt.dll b/BosmonMqtt/bin/Release/M2Mqtt.dll
deleted file mode 100644
index f3f4a49..0000000
Binary files a/BosmonMqtt/bin/Release/M2Mqtt.dll and /dev/null differ