From ca81d86a1eed5e56aa68234e02e4cae08118233c Mon Sep 17 00:00:00 2001
From: Jan Speller <j-speller@outlook.com>
Date: Fri, 1 May 2020 13:58:36 +0200
Subject: [PATCH 01/37] add source for telegram.py

---
 plugin/.telegram.py.swp | Bin 0 -> 12288 bytes
 plugin/telegram.py      |  19 +++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 plugin/.telegram.py.swp

diff --git a/plugin/.telegram.py.swp b/plugin/.telegram.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..a9e0d2601811df772dab77a4e744a59c48373d17
GIT binary patch
literal 12288
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
V>Jm0ISntMBeI8fsLpZGr*gt5>VR--m

literal 0
HcmV?d00001

diff --git a/plugin/telegram.py b/plugin/telegram.py
index 5dea41f..15536ff 100644
--- a/plugin/telegram.py
+++ b/plugin/telegram.py
@@ -1,3 +1,4 @@
+??? from here until ???END lines may have been inserted/deleted
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 """!
@@ -64,3 +65,21 @@ class BoswatchPlugin(PluginBase):
                 logging.exception("Error while sending Telegram Message")
             except Exception as e:
                 logging.exception("Unknown Error while sending Telegram Message: " + str(type(e).__name__) + ": " + str(e))
+
+    def zvei(self, bwPacket):
+        """!Called on ZVEI alarm
+        @param bwPacket: bwPacket instance"""
+        msg = self.parseWildcards(self.config.get("message"))
+        for chatId in self.config.get("chatIds", default=[]):
+            try:
+                # Send Message via Telegram
+                logging.info("Sending message to " + chatId)
+                self.bot.send_message(chat_id=chatId, text=msg)
+            except Unauthorized:
+                logging.exception("Error while sending Telegram Message, please Check your api-key")
+            except (TimedOut, NetworkError):
+                logging.exception("Error while sending Telegram Message, please Check your connectivity")
+            except (BadRequest, TelegramError):
+                logging.exception("Error while sending Telegram Message")
+            except Exception as e:
+                logging.exception("Unknown Error while sending Telegram Message: " + str(type(e).__name__) + ": " + str(e))

From fd9307dd0343d24aee99b79fdbcee2de78009a9d Mon Sep 17 00:00:00 2001
From: Jan Speller <j-speller@outlook.com>
Date: Fri, 1 May 2020 14:00:16 +0200
Subject: [PATCH 02/37] fix telegram.py

---
 plugin/telegram.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugin/telegram.py b/plugin/telegram.py
index 15536ff..f783e72 100644
--- a/plugin/telegram.py
+++ b/plugin/telegram.py
@@ -1,4 +1,3 @@
-??? from here until ???END lines may have been inserted/deleted
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 """!

From 456efc111687e4d87e443893e4dc59bf21421434 Mon Sep 17 00:00:00 2001
From: Schrolli91 <bastian@schroll-software.de>
Date: Fri, 1 May 2020 23:52:19 +0200
Subject: [PATCH 03/37] update telegram plugin

---
 plugin/.telegram.py.swp | Bin 12288 -> 0 bytes
 plugin/telegram.py      |  74 ++++++++++++++++++++++++++--------------
 2 files changed, 49 insertions(+), 25 deletions(-)
 delete mode 100644 plugin/.telegram.py.swp

diff --git a/plugin/.telegram.py.swp b/plugin/.telegram.py.swp
deleted file mode 100644
index a9e0d2601811df772dab77a4e744a59c48373d17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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
V>Jm0ISntMBeI8fsLpZGr*gt5>VR--m

diff --git a/plugin/telegram.py b/plugin/telegram.py
index f783e72..900754b 100644
--- a/plugin/telegram.py
+++ b/plugin/telegram.py
@@ -35,45 +35,69 @@ class BoswatchPlugin(PluginBase):
 
     def onLoad(self):
         """!Called by import of the plugin"""
-        self.bot = telegram.Bot(token=self.config.get("botToken", default=""))
+        self.bot = telegram.Bot(token=self.config.get("botToken"))
+
+    def fms(self, bwPacket):
+        """!Called on FMS alarm
+
+        @param bwPacket: bwPacket instance
+        Remove if not implemented"""
+        msg = self.parseWildcards(self.config.get("message_fms", default="{FMS}"))
+        _sendMessage(msg)
 
     def pocsag(self, bwPacket):
         """!Called on POCSAG alarm
 
-        @param bwPacket: bwPacket instance"""
-        msg = self.parseWildcards(self.config.get("message"))
+        @param bwPacket: bwPacket instance
+        Remove if not implemented"""
+        msg = self.parseWildcards(self.config.get("message_pocsag", default="{RIC}({SRIC})\n{MSG}"))
+        self._sendMessage(msg)
+
         if bwPacket.get("lat") is not None and bwPacket.get("lon") is not None:
             logging.debug("Found coordinates in packet")
             (lat, lon) = (bwPacket.get("lat"), bwPacket.get("lon"))
-
-        for chatId in self.config.get("chatIds", default=[]):
-            try:
-                # Send Message via Telegram
-                logging.info("Sending message to " + chatId)
-                self.bot.send_message(chat_id=chatId, text=msg)
-
-                # Send Location via Telegram if lat and lon are defined
-                if lat is not None and lon is not None:
-                    logging.info("Sending location to " + chatId)
-                    self.bot.sendLocation(chat_id=chatId, latitude=lat, longitude=lon)
-            except Unauthorized:
-                logging.exception("Error while sending Telegram Message, please Check your api-key")
-            except (TimedOut, NetworkError):
-                logging.exception("Error while sending Telegram Message, please Check your connectivity")
-            except (BadRequest, TelegramError):
-                logging.exception("Error while sending Telegram Message")
-            except Exception as e:
-                logging.exception("Unknown Error while sending Telegram Message: " + str(type(e).__name__) + ": " + str(e))
+            self._sendMessage(lat, lon)
 
     def zvei(self, bwPacket):
         """!Called on ZVEI alarm
-        @param bwPacket: bwPacket instance"""
-        msg = self.parseWildcards(self.config.get("message"))
+
+        @param bwPacket: bwPacket instance
+        Remove if not implemented"""
+        msg = self.parseWildcards(self.config.get("message_zvei", default="{TONE}"))
+        _sendMessage(msg)
+
+    def msg(self, bwPacket):
+        """!Called on MSG packet
+
+        @param bwPacket: bwPacket instance
+        Remove if not implemented"""
+        msg = self.parseWildcards(self.config.get("message_msg"))
+        _sendMessage(msg)
+
+    def _sendMessage(self, message):
         for chatId in self.config.get("chatIds", default=[]):
             try:
                 # Send Message via Telegram
                 logging.info("Sending message to " + chatId)
-                self.bot.send_message(chat_id=chatId, text=msg)
+                self.bot.send_message(chat_id=chatId, text=message)
+
+            except Unauthorized:
+                logging.exception("Error while sending Telegram Message, please Check your api-key")
+            except (TimedOut, NetworkError):
+                logging.exception("Error while sending Telegram Message, please Check your connectivity")
+            except (BadRequest, TelegramError):
+                logging.exception("Error while sending Telegram Message")
+            except Exception as e:
+                logging.exception("Unknown Error while sending Telegram Message: " + str(type(e).__name__) + ": " + str(e))
+
+    def _sendLocation(self, lat, lon):
+        for chatId in self.config.get("chatIds", default=[]):
+            try:
+                # Send Location via Telegram
+                if lat is not None and lon is not None:
+                    logging.info("Sending location to " + chatId)
+                    self.bot.sendLocation(chat_id=chatId, latitude=lat, longitude=lon)
+
             except Unauthorized:
                 logging.exception("Error while sending Telegram Message, please Check your api-key")
             except (TimedOut, NetworkError):

From c94938dd3d9d51bd691f27abbad164e0e7f46453 Mon Sep 17 00:00:00 2001
From: Schrolli91 <bastian@schroll-software.de>
Date: Fri, 1 May 2020 23:52:38 +0200
Subject: [PATCH 04/37] update docs

---
 docu/docs/plugin/telegram.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docu/docs/plugin/telegram.md b/docu/docs/plugin/telegram.md
index c072556..92319d2 100644
--- a/docu/docs/plugin/telegram.md
+++ b/docu/docs/plugin/telegram.md
@@ -6,7 +6,10 @@ Mit diesem Plugin ist es moeglich, Telegram-Nachrichten für POCSAG-Alarmierunge
 Außerdem werden Locations versendet, wenn die Felder `lat` und `lon` im Paket definiert sind. (beispielsweise durch das [Geocoding](../modul/geocoding.md) Modul)
 
 ## Unterstütze Alarmtypen
+- Fms
 - Pocsag
+- Zvei
+- Msg
 
 ## Resource
 `telegram`
@@ -15,9 +18,12 @@ Außerdem werden Locations versendet, wenn die Felder `lat` und `lon` im Paket d
 
 |Feld|Beschreibung|Default|
 |----|------------|-------|
-|message|Format der Nachricht||
 |botToken|Der Api-Key des Telegram-Bots||
 |chatIds|Liste mit Chat-Ids der Empfängers / der Emfänger-Gruppen||
+|message_fms|Format der Nachricht für FMS|`{FMS}`|
+|message_pocsag|Format der Nachricht für Pocsag|`{RIC}({SRIC})\n{MSG}`|
+|message_zvei|Format der Nachricht für ZVEI|`{TONE}`|
+|message_msg|Format der Nachricht für MSG||
 
 **Beispiel:**
 ```yaml
@@ -25,7 +31,7 @@ Außerdem werden Locations versendet, wenn die Felder `lat` und `lon` im Paket d
     name: Telegram Plugin
     res: telegram
     config:
-      message: "{RIC}({SRIC})\n{MSG}"
+      message_pocsag: "{RIC}({SRIC})\n{MSG}"
       botToken: "BOT_TOKEN"
       chatIds:
         - "CHAT_ID"
@@ -33,7 +39,7 @@ Außerdem werden Locations versendet, wenn die Felder `lat` und `lon` im Paket d
 
 ---
 ## Modul Abhängigkeiten
-Aus dem Modul [Geocoding](../modul/geocoding.md) (optional):
+Aus dem Modul [Geocoding](../modul/geocoding.md) (optional/nur POCSAG):
 
 - `lat`
 - `lon`

From e05b81e5d77f69920a6895d16134c2434add12e6 Mon Sep 17 00:00:00 2001
From: Schrolli91 <bastian@schroll-software.de>
Date: Fri, 1 May 2020 23:56:29 +0200
Subject: [PATCH 05/37] bugfix

---
 plugin/telegram.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin/telegram.py b/plugin/telegram.py
index 900754b..1707d2c 100644
--- a/plugin/telegram.py
+++ b/plugin/telegram.py
@@ -43,7 +43,7 @@ class BoswatchPlugin(PluginBase):
         @param bwPacket: bwPacket instance
         Remove if not implemented"""
         msg = self.parseWildcards(self.config.get("message_fms", default="{FMS}"))
-        _sendMessage(msg)
+        self._sendMessage(msg)
 
     def pocsag(self, bwPacket):
         """!Called on POCSAG alarm
@@ -64,7 +64,7 @@ class BoswatchPlugin(PluginBase):
         @param bwPacket: bwPacket instance
         Remove if not implemented"""
         msg = self.parseWildcards(self.config.get("message_zvei", default="{TONE}"))
-        _sendMessage(msg)
+        self._sendMessage(msg)
 
     def msg(self, bwPacket):
         """!Called on MSG packet
@@ -72,7 +72,7 @@ class BoswatchPlugin(PluginBase):
         @param bwPacket: bwPacket instance
         Remove if not implemented"""
         msg = self.parseWildcards(self.config.get("message_msg"))
-        _sendMessage(msg)
+        self._sendMessage(msg)
 
     def _sendMessage(self, message):
         for chatId in self.config.get("chatIds", default=[]):

From f79554f4153f85bf83a55f6db5c03465bb64d0b2 Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@schroll-software.de>
Date: Wed, 6 May 2020 07:41:52 +0200
Subject: [PATCH 06/37] Update plugin/telegram.py

Co-authored-by: Jan Speller <j-speller@outlook.com>
---
 plugin/telegram.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin/telegram.py b/plugin/telegram.py
index 1707d2c..ec043ea 100644
--- a/plugin/telegram.py
+++ b/plugin/telegram.py
@@ -40,8 +40,7 @@ class BoswatchPlugin(PluginBase):
     def fms(self, bwPacket):
         """!Called on FMS alarm
 
-        @param bwPacket: bwPacket instance
-        Remove if not implemented"""
+        @param bwPacket: bwPacket instance"""
         msg = self.parseWildcards(self.config.get("message_fms", default="{FMS}"))
         self._sendMessage(msg)
 

From 689d81565bba621bf2e9dd5e83af583383e2effa Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@schroll-software.de>
Date: Wed, 6 May 2020 07:42:04 +0200
Subject: [PATCH 07/37] Update plugin/telegram.py

Co-authored-by: Jan Speller <j-speller@outlook.com>
---
 plugin/telegram.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin/telegram.py b/plugin/telegram.py
index ec043ea..5d6f44a 100644
--- a/plugin/telegram.py
+++ b/plugin/telegram.py
@@ -47,8 +47,7 @@ class BoswatchPlugin(PluginBase):
     def pocsag(self, bwPacket):
         """!Called on POCSAG alarm
 
-        @param bwPacket: bwPacket instance
-        Remove if not implemented"""
+        @param bwPacket: bwPacket instance"""
         msg = self.parseWildcards(self.config.get("message_pocsag", default="{RIC}({SRIC})\n{MSG}"))
         self._sendMessage(msg)
 

From 6b0488ed1b9c285be59ddea85bcafd140b382779 Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@schroll-software.de>
Date: Wed, 6 May 2020 07:42:11 +0200
Subject: [PATCH 08/37] Update plugin/telegram.py

Co-authored-by: Jan Speller <j-speller@outlook.com>
---
 plugin/telegram.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin/telegram.py b/plugin/telegram.py
index 5d6f44a..3a6322e 100644
--- a/plugin/telegram.py
+++ b/plugin/telegram.py
@@ -67,8 +67,7 @@ class BoswatchPlugin(PluginBase):
     def msg(self, bwPacket):
         """!Called on MSG packet
 
-        @param bwPacket: bwPacket instance
-        Remove if not implemented"""
+        @param bwPacket: bwPacket instance"""
         msg = self.parseWildcards(self.config.get("message_msg"))
         self._sendMessage(msg)
 

From e4852be0e718144d97070542b27735528531813e Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@schroll-software.de>
Date: Wed, 6 May 2020 07:42:20 +0200
Subject: [PATCH 09/37] Update plugin/telegram.py

Co-authored-by: Jan Speller <j-speller@outlook.com>
---
 plugin/telegram.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugin/telegram.py b/plugin/telegram.py
index 3a6322e..46018d9 100644
--- a/plugin/telegram.py
+++ b/plugin/telegram.py
@@ -59,8 +59,7 @@ class BoswatchPlugin(PluginBase):
     def zvei(self, bwPacket):
         """!Called on ZVEI alarm
 
-        @param bwPacket: bwPacket instance
-        Remove if not implemented"""
+        @param bwPacket: bwPacket instance"""
         msg = self.parseWildcards(self.config.get("message_zvei", default="{TONE}"))
         self._sendMessage(msg)
 

From 687a11719aa606cebd6173fde971533656bf1477 Mon Sep 17 00:00:00 2001
From: Jan Speller <j-speller@outlook.com>
Date: Sun, 7 Jun 2020 22:56:29 +0200
Subject: [PATCH 10/37] fix usage of port in server

---
 bw_server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bw_server.py b/bw_server.py
index d84c8d1..ed600b4 100644
--- a/bw_server.py
+++ b/bw_server.py
@@ -86,7 +86,7 @@ try:
 
     incomingQueue = queue.Queue()
     bwServer = TCPServer(incomingQueue)
-    if bwServer.start():
+    if bwServer.start(port=bwConfig.get('server', 'port', default=8080)):
 
         while 1:
             if incomingQueue.empty():  # pause only when no data

From c3ccc11b5de0da39981f7d2f9a80667c0de6773f Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Wed, 24 Jun 2020 21:38:11 +0200
Subject: [PATCH 11/37] FR #42 - added config for Char-set mm

---
 boswatch/inputSource/lineInInput.py | 2 ++
 boswatch/inputSource/sdrInput.py    | 2 ++
 config/client.yaml                  | 2 ++
 docu/docs/config.md                 | 4 ++++
 4 files changed, 10 insertions(+)

diff --git a/boswatch/inputSource/lineInInput.py b/boswatch/inputSource/lineInInput.py
index 602f31d..c8016bc 100644
--- a/boswatch/inputSource/lineInInput.py
+++ b/boswatch/inputSource/lineInInput.py
@@ -51,6 +51,8 @@ class LineInInput(InputBase):
                 mmProc.addArgument("-a POCSAG1200")
             if decoderConfig.get("poc2400", default=0):
                 mmProc.addArgument("-a POCSAG2400")
+            if lineInConfig.get("mmChar"):
+                mmProc.addArgument("-C " + str(lineInConfig.get("mmChar")))
             mmProc.addArgument("-f alpha")
             mmProc.addArgument("-t raw -")
             mmProc.setStdin(lineInProc.stdout)
diff --git a/boswatch/inputSource/sdrInput.py b/boswatch/inputSource/sdrInput.py
index 8f9ce1e..ed79116 100644
--- a/boswatch/inputSource/sdrInput.py
+++ b/boswatch/inputSource/sdrInput.py
@@ -52,6 +52,8 @@ class SdrInput(InputBase):
                 mmProc.addArgument("-a POCSAG1200")
             if decoderConfig.get("poc2400", default=0):
                 mmProc.addArgument("-a POCSAG2400")
+            if lineInConfig.get("mmChar"):
+                mmProc.addArgument("-C " + str(lineInConfig.get("mmChar")))                
             mmProc.addArgument("-f alpha")
             mmProc.addArgument("-t raw -")
             mmProc.setStdin(sdrProc.stdout)
diff --git a/config/client.yaml b/config/client.yaml
index e93f92f..2b2a736 100644
--- a/config/client.yaml
+++ b/config/client.yaml
@@ -28,10 +28,12 @@ inputSource:
     gain: 100
     rtlPath: /usr/bin/rtl_fm
     mmPath: /opt/multimon/multimon-ng
+    mmChar: DE
   lineIn:
     card: 1
     device: 0
     mmPath: /opt/multimon/multimon-ng
+    mmChar: DE
 
 decoder:
   fms: yes
diff --git a/docu/docs/config.md b/docu/docs/config.md
index b0b1177..dc9c237 100644
--- a/docu/docs/config.md
+++ b/docu/docs/config.md
@@ -48,6 +48,7 @@ Es gibt die Auswahl zwischen `sdr` oder `lineIn` als Input Quelle
 |gain|Verstärkung des Eingangssignals|100|
 |rtlPath|Pfad zur rtl_fm Binary|rtl_fm|
 |mmPath|Pfad zur multimon-ng Binary|multimon-ng|
+|mmChar|multimon-ng Char-Set||
 
 **Beispiel:**
 ```yaml
@@ -60,6 +61,7 @@ inputSource:
     gain: 100
     rtlPath: /usr/bin/rtl-fm
     mmPath: /opt/multimon/multimon-ng
+    mmChar: DE
 ```
 
 #### `lineIn:`
@@ -67,6 +69,7 @@ inputSource:
 |----|------------|-------|
 |device|die device Id der Soundkarte|1|
 |mmPath|Pfad zur multimon-ng Binary|multimon-ng|
+|mmChar|multimon-ng Char-Set||
 
 **Device herausfinden**
 Durch eingabe des Befehls `aplay -l` werden alle Soundkarten ausgegeben. Das schaut ungefähr so aus:
@@ -108,6 +111,7 @@ inputSource:
     card: 1
     device: 0
     mmPath: /opt/multimon/multimon-ng
+    mmChar: DE
 ```
 
 ---

From 8fbccd8169cb1e37d8c41f49871ddf15e20bdc94 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Wed, 24 Jun 2020 21:48:20 +0200
Subject: [PATCH 12/37] fixed trailing spaces

---
 boswatch/inputSource/sdrInput.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boswatch/inputSource/sdrInput.py b/boswatch/inputSource/sdrInput.py
index ed79116..95fecd9 100644
--- a/boswatch/inputSource/sdrInput.py
+++ b/boswatch/inputSource/sdrInput.py
@@ -53,7 +53,7 @@ class SdrInput(InputBase):
             if decoderConfig.get("poc2400", default=0):
                 mmProc.addArgument("-a POCSAG2400")
             if lineInConfig.get("mmChar"):
-                mmProc.addArgument("-C " + str(lineInConfig.get("mmChar")))                
+                mmProc.addArgument("-C " + str(lineInConfig.get("mmChar")))
             mmProc.addArgument("-f alpha")
             mmProc.addArgument("-t raw -")
             mmProc.setStdin(sdrProc.stdout)

From e6f588a06c1f5a48449e191d496b852044b375c3 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Wed, 24 Jun 2020 21:57:14 +0200
Subject: [PATCH 13/37] fixed copy an paste error

---
 boswatch/inputSource/sdrInput.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boswatch/inputSource/sdrInput.py b/boswatch/inputSource/sdrInput.py
index 95fecd9..6dcb278 100644
--- a/boswatch/inputSource/sdrInput.py
+++ b/boswatch/inputSource/sdrInput.py
@@ -52,8 +52,8 @@ class SdrInput(InputBase):
                 mmProc.addArgument("-a POCSAG1200")
             if decoderConfig.get("poc2400", default=0):
                 mmProc.addArgument("-a POCSAG2400")
-            if lineInConfig.get("mmChar"):
-                mmProc.addArgument("-C " + str(lineInConfig.get("mmChar")))
+            if sdrConfig.get("mmChar"):
+                mmProc.addArgument("-C " + str(sdrConfig.get("mmChar")))
             mmProc.addArgument("-f alpha")
             mmProc.addArgument("-t raw -")
             mmProc.setStdin(sdrProc.stdout)

From 23ae9b9aa01ad3c5a6e8390909df928633aa7479 Mon Sep 17 00:00:00 2001
From: b-watch <67390066+b-watch@users.noreply.github.com>
Date: Sun, 28 Jun 2020 21:02:14 +0200
Subject: [PATCH 14/37] Added default description for mmChar

---
 docu/docs/config.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docu/docs/config.md b/docu/docs/config.md
index dc9c237..4f9d45f 100644
--- a/docu/docs/config.md
+++ b/docu/docs/config.md
@@ -48,7 +48,7 @@ Es gibt die Auswahl zwischen `sdr` oder `lineIn` als Input Quelle
 |gain|Verstärkung des Eingangssignals|100|
 |rtlPath|Pfad zur rtl_fm Binary|rtl_fm|
 |mmPath|Pfad zur multimon-ng Binary|multimon-ng|
-|mmChar|multimon-ng Char-Set||
+|mmChar|multimon-ng Char-Set|deaktiviert|
 
 **Beispiel:**
 ```yaml

From 117ea5347ec5ee25176666e4041112fd818e0217 Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@schroll-software.de>
Date: Mon, 29 Jun 2020 07:21:33 +0200
Subject: [PATCH 15/37] Update config.md

---
 docu/docs/config.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docu/docs/config.md b/docu/docs/config.md
index 4f9d45f..fc666b8 100644
--- a/docu/docs/config.md
+++ b/docu/docs/config.md
@@ -48,7 +48,7 @@ Es gibt die Auswahl zwischen `sdr` oder `lineIn` als Input Quelle
 |gain|Verstärkung des Eingangssignals|100|
 |rtlPath|Pfad zur rtl_fm Binary|rtl_fm|
 |mmPath|Pfad zur multimon-ng Binary|multimon-ng|
-|mmChar|multimon-ng Char-Set|deaktiviert|
+|mmChar|multimon-ng Char-Set|not set|
 
 **Beispiel:**
 ```yaml

From df4ffaac533da5e01057e8bc4c9215afe8a5d398 Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@schroll-software.de>
Date: Mon, 29 Jun 2020 07:25:24 +0200
Subject: [PATCH 16/37] Update config.md

---
 docu/docs/config.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docu/docs/config.md b/docu/docs/config.md
index fc666b8..a5598a2 100644
--- a/docu/docs/config.md
+++ b/docu/docs/config.md
@@ -69,7 +69,7 @@ inputSource:
 |----|------------|-------|
 |device|die device Id der Soundkarte|1|
 |mmPath|Pfad zur multimon-ng Binary|multimon-ng|
-|mmChar|multimon-ng Char-Set||
+|mmChar|multimon-ng Char-Set|not set|
 
 **Device herausfinden**
 Durch eingabe des Befehls `aplay -l` werden alle Soundkarten ausgegeben. Das schaut ungefähr so aus:

From 7f35d0592e927289cbfb8247bf50c9af599b2e78 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Mon, 29 Jun 2020 21:11:07 +0200
Subject: [PATCH 17/37] Added PulseAudio as Source

---
 boswatch/inputSource/pulseaudioInput.py | 77 +++++++++++++++++++++++++
 bw_client.py                            |  3 +
 docu/docs/config.md                     | 30 +++++++++-
 3 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 boswatch/inputSource/pulseaudioInput.py

diff --git a/boswatch/inputSource/pulseaudioInput.py b/boswatch/inputSource/pulseaudioInput.py
new file mode 100644
index 0000000..39957a6
--- /dev/null
+++ b/boswatch/inputSource/pulseaudioInput.py
@@ -0,0 +1,77 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+"""!
+    ____  ____  ______       __      __       __       _____
+   / __ )/ __ \/ ___/ |     / /___ _/ /______/ /_     |__  /
+  / __  / / / /\__ \| | /| / / __ `/ __/ ___/ __ \     /_ <
+ / /_/ / /_/ /___/ /| |/ |/ / /_/ / /_/ /__/ / / /   ___/ /
+/_____/\____//____/ |__/|__/\__,_/\__/\___/_/ /_/   /____/
+                German BOS Information Script
+                     by Bastian Schroll
+
+@file:        pulseaudioInput.py
+@date:        18.04.2020, 29.06.2020
+@author:      Philipp von Kirschbaum, b-watch
+@description: Input source for PulseAudio
+"""
+import logging
+from boswatch.utils import paths
+from boswatch.processManager import ProcessManager
+from boswatch.inputSource.inputBase import InputBase
+
+logging.debug("- %s loaded", __name__)
+
+
+class PulseAudioInput(InputBase):
+    """!Class for the PulseAudio input source"""
+
+    def _runThread(self, dataQueue, PulseAudioConfig, decoderConfig):
+        PulseAudioProc = None
+        mmProc = None
+        try:
+            PulseAudioProc = ProcessManager("parec")
+            PulseAudioProc.addArgument("--channels=1")                            # supress any other outputs
+            PulseAudioProc.addArgument("--format=s16le")                          # set output format (16bit)
+            PulseAudioProc.addArgument("--rate=22050")                            # set output sampling rate (22050Hz)
+            PulseAudioProc.addArgument("--device=" +
+                                       str(PulseAudioConfig.get("device", default="boswatch")) +
+                                       ".monitor")                                # sink name
+            PulseAudioProc.setStderr(open(paths.LOG_PATH + "pulseaudio.log", "a"))
+            PulseAudioProc.start()
+
+            mmProc = ProcessManager(str(PulseAudioConfig.get("mmPath", default="multimon-ng")), textMode=True)
+            if decoderConfig.get("fms", default=0):
+                mmProc.addArgument("-a FMSFSK")
+            if decoderConfig.get("zvei", default=0):
+                mmProc.addArgument("-a ZVEI1")
+            if decoderConfig.get("poc512", default=0):
+                mmProc.addArgument("-a POCSAG512")
+            if decoderConfig.get("poc1200", default=0):
+                mmProc.addArgument("-a POCSAG1200")
+            if decoderConfig.get("poc2400", default=0):
+                mmProc.addArgument("-a POCSAG2400")
+            if PulseAudioConfig.get("mmChar"):
+                mmProc.addArgument("-C " + str(PulseAudioConfig.get("mmChar")))
+            mmProc.addArgument("-f alpha")
+            mmProc.addArgument("-t raw -")
+            mmProc.setStdin(PulseAudioProc.stdout)
+            mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
+            mmProc.start()
+
+            logging.info("start decoding")
+            while self._isRunning:
+                if not PulseAudioProc.isRunning:
+                    logging.warning("asla was down - try to restart")
+                    PulseAudioProc.start()
+                elif not mmProc.isRunning:
+                    logging.warning("multimon was down - try to restart")
+                    mmProc.start()
+                elif PulseAudioProc.isRunning and mmProc.isRunning:
+                    line = mmProc.readline()
+                    if line:
+                        self.addToQueue(line)
+        except:
+            logging.exception("error in PulseAudio input routine")
+        finally:
+            mmProc.stop()
+            PulseAudioProc.stop()
diff --git a/bw_client.py b/bw_client.py
index 3abe98c..560f05b 100644
--- a/bw_client.py
+++ b/bw_client.py
@@ -51,6 +51,7 @@ from boswatch.utils import header
 from boswatch.utils import misc
 from boswatch.inputSource.sdrInput import SdrInput
 from boswatch.inputSource.lineInInput import LineInInput
+from boswatch.inputSource.pulseaudioInput import PulseAudioInput
 
 header.logoToLog()
 header.infoToLog()
@@ -91,6 +92,8 @@ try:
             inputSource = SdrInput(inputQueue, bwConfig.get("inputSource", "sdr"), bwConfig.get("decoder"))
         elif bwConfig.get("client", "inputSource") == "lineIn":
             inputSource = LineInInput(inputQueue, bwConfig.get("inputSource", "lineIn"), bwConfig.get("decoder"))
+        elif bwConfig.get("client", "inputSource") == "PulseAudio":
+            inputSource = PulseAudioInput(inputQueue, bwConfig.get("inputSource", "PulseAudio"), bwConfig.get("decoder"))
         else:
             logging.fatal("Invalid input source: %s", bwConfig.get("client", "inputSource"))
             exit(1)
diff --git a/docu/docs/config.md b/docu/docs/config.md
index a5598a2..c5d38b6 100644
--- a/docu/docs/config.md
+++ b/docu/docs/config.md
@@ -11,7 +11,7 @@ zwingend in die Konfiguration eingetragen werden.
 |Feld|Beschreibung|Default|
 |----|------------|-------|
 |name|Name zur Identifizierung der Client Instanz||
-|inputSource|Art der zu nutzenden Input Quelle (`sdr` oder `lineIn`)||
+|inputSource|Art der zu nutzenden Input Quelle (`sdr`, `lineIn` oder `PulseAudio`)||
 |useBroadcast|Verbindungsdaten per [Broadcast](information/broadcast.md) beziehen|no|
 |reconnectDelay|Verzögerung für erneuten Verbindungsversuch zum Server|3|
 |sendTries|Anzahl der Sendeversuche eines Pakets|3|
@@ -36,7 +36,7 @@ server:
 
 ---
 ### `inputSource:`
-Es gibt die Auswahl zwischen `sdr` oder `lineIn` als Input Quelle
+Es gibt die Auswahl zwischen `sdr`, `lineIn` oder `PulseAudio` als Input Quelle
 
 #### `sdr:`
 |Feld|Beschreibung|Default|
@@ -114,6 +114,32 @@ inputSource:
     mmChar: DE
 ```
 
+#### `PulseAudio:`
+|Feld|Beschreibung|Default|
+|----|------------|-------|
+|device|Der Sinks-Name der Quelle|boswatch|
+|mmPath|Pfad zur multimon-ng Binary|multimon-ng|
+|mmChar|multimon-ng Char-Set|not set|
+
+
+**Device herausfinden**
+Durch eingabe des Befehls  `pacmd list-sinks | grep name:` werden alle Sinks ausgegeben. Beispiel:
+```console
+bash-5.0# pacmd list-sinks | grep name:
+	name: <boswatch>
+```
+
+In der Konfiguration wird das Feld `device` nun auf den den Namen des gewünschten Sinks gesetzt (ohne spitze Klammern, <>).
+
+**Beispiel:**
+```yaml
+inputSource:
+  ...
+  PulseAudio:
+    device: boswatch
+    mmPath: /opt/multimon/multimon-ng
+    mmChar: DE
+```
 ---
 ### `decoder:`
 |Feld|Beschreibung|Default|

From 5457cbfd3ef59e84f2063327e937dba1c8b64355 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Wed, 1 Jul 2020 11:45:13 +0200
Subject: [PATCH 18/37] changed log output

---
 boswatch/inputSource/pulseaudioInput.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boswatch/inputSource/pulseaudioInput.py b/boswatch/inputSource/pulseaudioInput.py
index 39957a6..5d955db 100644
--- a/boswatch/inputSource/pulseaudioInput.py
+++ b/boswatch/inputSource/pulseaudioInput.py
@@ -61,7 +61,7 @@ class PulseAudioInput(InputBase):
             logging.info("start decoding")
             while self._isRunning:
                 if not PulseAudioProc.isRunning:
-                    logging.warning("asla was down - try to restart")
+                    logging.warning("PulseAudio was down - try to restart")
                     PulseAudioProc.start()
                 elif not mmProc.isRunning:
                     logging.warning("multimon was down - try to restart")

From 5b3f1c3bd1b8b4553942e36fb0129c8ea2126fed Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Mon, 6 Jul 2020 09:48:27 +0200
Subject: [PATCH 19/37] additional documentation for inputsource

---
 docu/docs/config.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docu/docs/config.md b/docu/docs/config.md
index c5d38b6..97823f4 100644
--- a/docu/docs/config.md
+++ b/docu/docs/config.md
@@ -36,7 +36,10 @@ server:
 
 ---
 ### `inputSource:`
-Es gibt die Auswahl zwischen `sdr`, `lineIn` oder `PulseAudio` als Input Quelle
+Es gibt die Auswahl zwischen `sdr`, `lineIn` oder `PulseAudio` als Input Quelle.  
+Mit `sdr` wird direkt per **rtl_sdr** die zu empfangende Frequenz an Multimon-NG weitergereicht.  
+Mit `lineIn` wird eine Quelle die (per **ALSA**) direkt an die Soundkarte angeschlossen ist an Multimon-NG weitergereicht.  
+Mit `PulseAudio` wird ein PulseAudio-Sink an Multimon-NG weitergereicht, z.B. in Kombination mit [RTLSDR-Airband](https://github.com/szpajder/RTLSDR-Airband) und/oder Docker.
 
 #### `sdr:`
 |Feld|Beschreibung|Default|

From 35ada90130bbab886cf5ff05c11311d8346aa418 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Mon, 6 Jul 2020 12:01:41 +0200
Subject: [PATCH 20/37] Early draft

---
 boswatch/inputSource/inputBase.py       | 19 +++++++++++++++++++
 boswatch/inputSource/lineInInput.py     | 16 +---------------
 boswatch/inputSource/pulseaudioInput.py | 16 +---------------
 boswatch/inputSource/sdrInput.py        | 16 +---------------
 4 files changed, 22 insertions(+), 45 deletions(-)

diff --git a/boswatch/inputSource/inputBase.py b/boswatch/inputSource/inputBase.py
index 0a62410..8b62535 100644
--- a/boswatch/inputSource/inputBase.py
+++ b/boswatch/inputSource/inputBase.py
@@ -18,6 +18,7 @@ import time
 import logging
 import threading
 from abc import ABC, abstractmethod
+from boswatch.processManager import ProcessManager
 
 logging.debug("- %s loaded", __name__)
 
@@ -63,3 +64,21 @@ class InputBase(ABC):
         self._inputQueue.put_nowait((data, time.time()))
         logging.debug("Add received data to queue")
         print(data)
+
+    def startmm(self, decoderConfig):
+        mmProc = ProcessManager(str(decoderConfig.get("mmPath", default="multimon-ng")), textMode=True)
+        if decoderConfig.get("fms", default=0):
+            mmProc.addArgument("-a FMSFSK")
+        if decoderConfig.get("zvei", default=0):
+            mmProc.addArgument("-a ZVEI1")
+        if decoderConfig.get("poc512", default=0):
+            mmProc.addArgument("-a POCSAG512")
+        if decoderConfig.get("poc1200", default=0):
+            mmProc.addArgument("-a POCSAG1200")
+        if decoderConfig.get("poc2400", default=0):
+            mmProc.addArgument("-a POCSAG2400")
+        if decoderConfig.get("mmChar"):
+            mmProc.addArgument("-C " + str(decoderConfig.get("mmChar")))
+        mmProc.addArgument("-f alpha")
+        mmProc.addArgument("-t raw -")
+        return mmProc
diff --git a/boswatch/inputSource/lineInInput.py b/boswatch/inputSource/lineInInput.py
index c8016bc..50666ac 100644
--- a/boswatch/inputSource/lineInInput.py
+++ b/boswatch/inputSource/lineInInput.py
@@ -40,21 +40,7 @@ class LineInInput(InputBase):
             lineInProc.setStderr(open(paths.LOG_PATH + "asla.log", "a"))
             lineInProc.start()
 
-            mmProc = ProcessManager(str(lineInConfig.get("mmPath", default="multimon-ng")), textMode=True)
-            if decoderConfig.get("fms", default=0):
-                mmProc.addArgument("-a FMSFSK")
-            if decoderConfig.get("zvei", default=0):
-                mmProc.addArgument("-a ZVEI1")
-            if decoderConfig.get("poc512", default=0):
-                mmProc.addArgument("-a POCSAG512")
-            if decoderConfig.get("poc1200", default=0):
-                mmProc.addArgument("-a POCSAG1200")
-            if decoderConfig.get("poc2400", default=0):
-                mmProc.addArgument("-a POCSAG2400")
-            if lineInConfig.get("mmChar"):
-                mmProc.addArgument("-C " + str(lineInConfig.get("mmChar")))
-            mmProc.addArgument("-f alpha")
-            mmProc.addArgument("-t raw -")
+            mmProc = self.startmm(decoderConfig)
             mmProc.setStdin(lineInProc.stdout)
             mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
             mmProc.start()
diff --git a/boswatch/inputSource/pulseaudioInput.py b/boswatch/inputSource/pulseaudioInput.py
index 5d955db..97a5f79 100644
--- a/boswatch/inputSource/pulseaudioInput.py
+++ b/boswatch/inputSource/pulseaudioInput.py
@@ -39,21 +39,7 @@ class PulseAudioInput(InputBase):
             PulseAudioProc.setStderr(open(paths.LOG_PATH + "pulseaudio.log", "a"))
             PulseAudioProc.start()
 
-            mmProc = ProcessManager(str(PulseAudioConfig.get("mmPath", default="multimon-ng")), textMode=True)
-            if decoderConfig.get("fms", default=0):
-                mmProc.addArgument("-a FMSFSK")
-            if decoderConfig.get("zvei", default=0):
-                mmProc.addArgument("-a ZVEI1")
-            if decoderConfig.get("poc512", default=0):
-                mmProc.addArgument("-a POCSAG512")
-            if decoderConfig.get("poc1200", default=0):
-                mmProc.addArgument("-a POCSAG1200")
-            if decoderConfig.get("poc2400", default=0):
-                mmProc.addArgument("-a POCSAG2400")
-            if PulseAudioConfig.get("mmChar"):
-                mmProc.addArgument("-C " + str(PulseAudioConfig.get("mmChar")))
-            mmProc.addArgument("-f alpha")
-            mmProc.addArgument("-t raw -")
+            mmProc = self.startmm(decoderConfig)
             mmProc.setStdin(PulseAudioProc.stdout)
             mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
             mmProc.start()
diff --git a/boswatch/inputSource/sdrInput.py b/boswatch/inputSource/sdrInput.py
index 6dcb278..851db22 100644
--- a/boswatch/inputSource/sdrInput.py
+++ b/boswatch/inputSource/sdrInput.py
@@ -41,21 +41,7 @@ class SdrInput(InputBase):
             sdrProc.setStderr(open(paths.LOG_PATH + "rtl_fm.log", "a"))
             sdrProc.start()
 
-            mmProc = ProcessManager(str(sdrConfig.get("mmPath", default="multimon-ng")), textMode=True)
-            if decoderConfig.get("fms", default=0):
-                mmProc.addArgument("-a FMSFSK")
-            if decoderConfig.get("zvei", default=0):
-                mmProc.addArgument("-a ZVEI1")
-            if decoderConfig.get("poc512", default=0):
-                mmProc.addArgument("-a POCSAG512")
-            if decoderConfig.get("poc1200", default=0):
-                mmProc.addArgument("-a POCSAG1200")
-            if decoderConfig.get("poc2400", default=0):
-                mmProc.addArgument("-a POCSAG2400")
-            if sdrConfig.get("mmChar"):
-                mmProc.addArgument("-C " + str(sdrConfig.get("mmChar")))
-            mmProc.addArgument("-f alpha")
-            mmProc.addArgument("-t raw -")
+            mmProc = self.startmm(decoderConfig)
             mmProc.setStdin(sdrProc.stdout)
             mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
             mmProc.start()

From ba2fab398ef35e9464a0258cf59e9c2301d5011e Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Wed, 8 Jul 2020 11:55:46 +0200
Subject: [PATCH 21/37] Moved setStdin to BaseClass

---
 boswatch/inputSource/inputBase.py       | 5 ++++-
 boswatch/inputSource/lineInInput.py     | 4 +---
 boswatch/inputSource/pulseaudioInput.py | 4 +---
 boswatch/inputSource/sdrInput.py        | 4 +---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/boswatch/inputSource/inputBase.py b/boswatch/inputSource/inputBase.py
index 8b62535..c95269a 100644
--- a/boswatch/inputSource/inputBase.py
+++ b/boswatch/inputSource/inputBase.py
@@ -18,6 +18,7 @@ import time
 import logging
 import threading
 from abc import ABC, abstractmethod
+from boswatch.utils import paths
 from boswatch.processManager import ProcessManager
 
 logging.debug("- %s loaded", __name__)
@@ -65,7 +66,7 @@ class InputBase(ABC):
         logging.debug("Add received data to queue")
         print(data)
 
-    def startmm(self, decoderConfig):
+    def startmm(self, decoderConfig, StdIn):
         mmProc = ProcessManager(str(decoderConfig.get("mmPath", default="multimon-ng")), textMode=True)
         if decoderConfig.get("fms", default=0):
             mmProc.addArgument("-a FMSFSK")
@@ -81,4 +82,6 @@ class InputBase(ABC):
             mmProc.addArgument("-C " + str(decoderConfig.get("mmChar")))
         mmProc.addArgument("-f alpha")
         mmProc.addArgument("-t raw -")
+        mmProc.setStdin(StdIn)
+        mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
         return mmProc
diff --git a/boswatch/inputSource/lineInInput.py b/boswatch/inputSource/lineInInput.py
index 50666ac..032bb5f 100644
--- a/boswatch/inputSource/lineInInput.py
+++ b/boswatch/inputSource/lineInInput.py
@@ -40,9 +40,7 @@ class LineInInput(InputBase):
             lineInProc.setStderr(open(paths.LOG_PATH + "asla.log", "a"))
             lineInProc.start()
 
-            mmProc = self.startmm(decoderConfig)
-            mmProc.setStdin(lineInProc.stdout)
-            mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
+            mmProc = self.startmm(decoderConfig, lineInProc.stdout)
             mmProc.start()
 
             logging.info("start decoding")
diff --git a/boswatch/inputSource/pulseaudioInput.py b/boswatch/inputSource/pulseaudioInput.py
index 97a5f79..8f49371 100644
--- a/boswatch/inputSource/pulseaudioInput.py
+++ b/boswatch/inputSource/pulseaudioInput.py
@@ -39,9 +39,7 @@ class PulseAudioInput(InputBase):
             PulseAudioProc.setStderr(open(paths.LOG_PATH + "pulseaudio.log", "a"))
             PulseAudioProc.start()
 
-            mmProc = self.startmm(decoderConfig)
-            mmProc.setStdin(PulseAudioProc.stdout)
-            mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
+            mmProc = self.startmm(decoderConfig, PulseAudioProc.stdout)
             mmProc.start()
 
             logging.info("start decoding")
diff --git a/boswatch/inputSource/sdrInput.py b/boswatch/inputSource/sdrInput.py
index 851db22..061711b 100644
--- a/boswatch/inputSource/sdrInput.py
+++ b/boswatch/inputSource/sdrInput.py
@@ -41,9 +41,7 @@ class SdrInput(InputBase):
             sdrProc.setStderr(open(paths.LOG_PATH + "rtl_fm.log", "a"))
             sdrProc.start()
 
-            mmProc = self.startmm(decoderConfig)
-            mmProc.setStdin(sdrProc.stdout)
-            mmProc.setStderr(open(paths.LOG_PATH + "multimon-ng.log", "a"))
+            mmProc = self.startmm(decoderConfig, sdrProc.stdout)
             mmProc.start()
 
             logging.info("start decoding")

From e1afdcec7d2f735439ee5d07b9b1330a6e292b8f Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Wed, 8 Jul 2020 20:33:58 +0200
Subject: [PATCH 22/37] rename startmm to getDecoderInstance

---
 boswatch/inputSource/inputBase.py       | 2 +-
 boswatch/inputSource/lineInInput.py     | 2 +-
 boswatch/inputSource/pulseaudioInput.py | 2 +-
 boswatch/inputSource/sdrInput.py        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/boswatch/inputSource/inputBase.py b/boswatch/inputSource/inputBase.py
index c95269a..1c85e63 100644
--- a/boswatch/inputSource/inputBase.py
+++ b/boswatch/inputSource/inputBase.py
@@ -66,7 +66,7 @@ class InputBase(ABC):
         logging.debug("Add received data to queue")
         print(data)
 
-    def startmm(self, decoderConfig, StdIn):
+    def getDecoderInstance(self, decoderConfig, StdIn):
         mmProc = ProcessManager(str(decoderConfig.get("mmPath", default="multimon-ng")), textMode=True)
         if decoderConfig.get("fms", default=0):
             mmProc.addArgument("-a FMSFSK")
diff --git a/boswatch/inputSource/lineInInput.py b/boswatch/inputSource/lineInInput.py
index 032bb5f..5556d4c 100644
--- a/boswatch/inputSource/lineInInput.py
+++ b/boswatch/inputSource/lineInInput.py
@@ -40,7 +40,7 @@ class LineInInput(InputBase):
             lineInProc.setStderr(open(paths.LOG_PATH + "asla.log", "a"))
             lineInProc.start()
 
-            mmProc = self.startmm(decoderConfig, lineInProc.stdout)
+            mmProc = self.getDecoderInstance(decoderConfig, lineInProc.stdout)
             mmProc.start()
 
             logging.info("start decoding")
diff --git a/boswatch/inputSource/pulseaudioInput.py b/boswatch/inputSource/pulseaudioInput.py
index 8f49371..3b9b42d 100644
--- a/boswatch/inputSource/pulseaudioInput.py
+++ b/boswatch/inputSource/pulseaudioInput.py
@@ -39,7 +39,7 @@ class PulseAudioInput(InputBase):
             PulseAudioProc.setStderr(open(paths.LOG_PATH + "pulseaudio.log", "a"))
             PulseAudioProc.start()
 
-            mmProc = self.startmm(decoderConfig, PulseAudioProc.stdout)
+            mmProc = self.getDecoderInstance(decoderConfig, PulseAudioProc.stdout)
             mmProc.start()
 
             logging.info("start decoding")
diff --git a/boswatch/inputSource/sdrInput.py b/boswatch/inputSource/sdrInput.py
index 061711b..dcac725 100644
--- a/boswatch/inputSource/sdrInput.py
+++ b/boswatch/inputSource/sdrInput.py
@@ -41,7 +41,7 @@ class SdrInput(InputBase):
             sdrProc.setStderr(open(paths.LOG_PATH + "rtl_fm.log", "a"))
             sdrProc.start()
 
-            mmProc = self.startmm(decoderConfig, sdrProc.stdout)
+            mmProc = self.getDecoderInstance(decoderConfig, sdrProc.stdout)
             mmProc.start()
 
             logging.info("start decoding")

From 546ecada4299682c25a4e6f4d6050c47fcf9ad25 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Thu, 9 Jul 2020 14:20:16 +0200
Subject: [PATCH 23/37] added/modified documentation

---
 docu/docs/config.md | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/docu/docs/config.md b/docu/docs/config.md
index 97823f4..1aa03c4 100644
--- a/docu/docs/config.md
+++ b/docu/docs/config.md
@@ -50,8 +50,6 @@ Mit `PulseAudio` wird ein PulseAudio-Sink an Multimon-NG weitergereicht, z.B. in
 |squelch|Einstellung der Rauschsperre|1|
 |gain|Verstärkung des Eingangssignals|100|
 |rtlPath|Pfad zur rtl_fm Binary|rtl_fm|
-|mmPath|Pfad zur multimon-ng Binary|multimon-ng|
-|mmChar|multimon-ng Char-Set|not set|
 
 **Beispiel:**
 ```yaml
@@ -63,16 +61,12 @@ inputSource:
     squelch: 1
     gain: 100
     rtlPath: /usr/bin/rtl-fm
-    mmPath: /opt/multimon/multimon-ng
-    mmChar: DE
 ```
 
 #### `lineIn:`
 |Feld|Beschreibung|Default|
 |----|------------|-------|
 |device|die device Id der Soundkarte|1|
-|mmPath|Pfad zur multimon-ng Binary|multimon-ng|
-|mmChar|multimon-ng Char-Set|not set|
 
 **Device herausfinden**
 Durch eingabe des Befehls `aplay -l` werden alle Soundkarten ausgegeben. Das schaut ungefähr so aus:
@@ -113,16 +107,12 @@ inputSource:
   lineIn:
     card: 1
     device: 0
-    mmPath: /opt/multimon/multimon-ng
-    mmChar: DE
 ```
 
 #### `PulseAudio:`
 |Feld|Beschreibung|Default|
 |----|------------|-------|
 |device|Der Sinks-Name der Quelle|boswatch|
-|mmPath|Pfad zur multimon-ng Binary|multimon-ng|
-|mmChar|multimon-ng Char-Set|not set|
 
 
 **Device herausfinden**
@@ -140,8 +130,6 @@ inputSource:
   ...
   PulseAudio:
     device: boswatch
-    mmPath: /opt/multimon/multimon-ng
-    mmChar: DE
 ```
 ---
 ### `decoder:`
@@ -152,6 +140,20 @@ inputSource:
 |poc512|POCSAG Decoder (Bitrate 512)|no|
 |poc1200|POCSAG Decoder (Bitrate 1200)|no|
 |poc2400|POCSAG Decoder (Bitrate 2400)|no|
+|mmPath|Pfad zur multimon-ng Binary|multimon-ng|
+|mmChar|multimon-ng Char-Set|not set|
+
+**Beispiel:**
+```yaml
+decoder:
+  fms: yes
+  zvei: yes
+  poc512: no
+  poc1200: no
+  poc2400: yes
+  mmPath: /opt/multimon/multimon-ng
+  mmChar: DE
+```
 
 ---
 ## Server

From ff862617928c6dea13108742ec0d6a65603934d7 Mon Sep 17 00:00:00 2001
From: Jan Speller <j-speller@outlook.com>
Date: Thu, 9 Jul 2020 15:02:22 +0200
Subject: [PATCH 24/37] add queuing to telegram plugin

---
 plugin/telegram.py | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/plugin/telegram.py b/plugin/telegram.py
index 5dea41f..60a45e2 100644
--- a/plugin/telegram.py
+++ b/plugin/telegram.py
@@ -20,12 +20,36 @@ from plugin.pluginBase import PluginBase
 # ###################### #
 # Custom plugin includes #
 from telegram.error import (TelegramError, Unauthorized, BadRequest, TimedOut, NetworkError)
-import telegram
+from telegram.ext import messagequeue as mq
+from telegram.utils.request import Request
+import telegram.bot
 # ###################### #
 
 logging.debug("- %s loaded", __name__)
 
 
+class MQBot(telegram.bot.Bot):
+    '''A subclass of Bot which delegates send method handling to MQ'''
+
+    def __init__(self, *args, is_queued_def=True, mqueue=None, **kwargs):
+        super(MQBot, self).__init__(*args, **kwargs)
+        # below 2 attributes should be provided for decorator usage
+        self._is_messages_queued_default = is_queued_def
+        self._msg_queue = mqueue or mq.MessageQueue()
+
+    def __del__(self):
+        try:
+            self._msg_queue.stop()
+        except:
+            pass
+
+    @mq.queuedmessage
+    def send_message(self, *args, **kwargs):
+        '''Wrapped method would accept new `queued` and `isgroup`
+        OPTIONAL arguments'''
+        return super(MQBot, self).send_message(*args, **kwargs)
+
+
 class BoswatchPlugin(PluginBase):
     """!Description of the Plugin"""
 
@@ -35,7 +59,9 @@ class BoswatchPlugin(PluginBase):
 
     def onLoad(self):
         """!Called by import of the plugin"""
-        self.bot = telegram.Bot(token=self.config.get("botToken", default=""))
+        q = mq.MessageQueue()
+        request = Request(con_pool_size=8)
+        self.bot = MQBot(token=self.config.get("botToken", default=""), request=request, mqueue=q)
 
     def pocsag(self, bwPacket):
         """!Called on POCSAG alarm

From 99df0340a6593789c7889e87567e589fb0159050 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Thu, 9 Jul 2020 15:20:54 +0200
Subject: [PATCH 25/37] renamed config vars

---
 boswatch/inputSource/inputBase.py | 6 +++---
 config/client.yaml                | 6 ++----
 docu/docs/config.md               | 8 ++++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/boswatch/inputSource/inputBase.py b/boswatch/inputSource/inputBase.py
index 1c85e63..4cbf423 100644
--- a/boswatch/inputSource/inputBase.py
+++ b/boswatch/inputSource/inputBase.py
@@ -67,7 +67,7 @@ class InputBase(ABC):
         print(data)
 
     def getDecoderInstance(self, decoderConfig, StdIn):
-        mmProc = ProcessManager(str(decoderConfig.get("mmPath", default="multimon-ng")), textMode=True)
+        mmProc = ProcessManager(str(decoderConfig.get("Path", default="multimon-ng")), textMode=True)
         if decoderConfig.get("fms", default=0):
             mmProc.addArgument("-a FMSFSK")
         if decoderConfig.get("zvei", default=0):
@@ -78,8 +78,8 @@ class InputBase(ABC):
             mmProc.addArgument("-a POCSAG1200")
         if decoderConfig.get("poc2400", default=0):
             mmProc.addArgument("-a POCSAG2400")
-        if decoderConfig.get("mmChar"):
-            mmProc.addArgument("-C " + str(decoderConfig.get("mmChar")))
+        if decoderConfig.get("Char"):
+            mmProc.addArgument("-C " + str(decoderConfig.get("Char")))
         mmProc.addArgument("-f alpha")
         mmProc.addArgument("-t raw -")
         mmProc.setStdin(StdIn)
diff --git a/config/client.yaml b/config/client.yaml
index 2b2a736..b6a1f29 100644
--- a/config/client.yaml
+++ b/config/client.yaml
@@ -27,13 +27,9 @@ inputSource:
     squelch: 1
     gain: 100
     rtlPath: /usr/bin/rtl_fm
-    mmPath: /opt/multimon/multimon-ng
-    mmChar: DE
   lineIn:
     card: 1
     device: 0
-    mmPath: /opt/multimon/multimon-ng
-    mmChar: DE
 
 decoder:
   fms: yes
@@ -41,3 +37,5 @@ decoder:
   poc512: yes
   poc1200: yes
   poc2400: yes
+  Path: /opt/multimon/multimon-ng
+  Char: DE
diff --git a/docu/docs/config.md b/docu/docs/config.md
index 1aa03c4..efc4d5f 100644
--- a/docu/docs/config.md
+++ b/docu/docs/config.md
@@ -140,8 +140,8 @@ inputSource:
 |poc512|POCSAG Decoder (Bitrate 512)|no|
 |poc1200|POCSAG Decoder (Bitrate 1200)|no|
 |poc2400|POCSAG Decoder (Bitrate 2400)|no|
-|mmPath|Pfad zur multimon-ng Binary|multimon-ng|
-|mmChar|multimon-ng Char-Set|not set|
+|Path|Pfad zur multimon-ng Binary|multimon-ng|
+|Char|multimon-ng Char-Set|not set|
 
 **Beispiel:**
 ```yaml
@@ -151,8 +151,8 @@ decoder:
   poc512: no
   poc1200: no
   poc2400: yes
-  mmPath: /opt/multimon/multimon-ng
-  mmChar: DE
+  Path: /opt/multimon/multimon-ng
+  Char: DE
 ```
 
 ---

From 96cb967bb7b5b35746e9406b15c7f668a27857a7 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Thu, 9 Jul 2020 15:24:04 +0200
Subject: [PATCH 26/37] added default for mm char option

---
 boswatch/inputSource/inputBase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boswatch/inputSource/inputBase.py b/boswatch/inputSource/inputBase.py
index 4cbf423..e3c03c5 100644
--- a/boswatch/inputSource/inputBase.py
+++ b/boswatch/inputSource/inputBase.py
@@ -78,7 +78,7 @@ class InputBase(ABC):
             mmProc.addArgument("-a POCSAG1200")
         if decoderConfig.get("poc2400", default=0):
             mmProc.addArgument("-a POCSAG2400")
-        if decoderConfig.get("Char"):
+        if decoderConfig.get("Char", default=0):
             mmProc.addArgument("-C " + str(decoderConfig.get("Char")))
         mmProc.addArgument("-f alpha")
         mmProc.addArgument("-t raw -")

From 89d16793b26c6d77443f12b4a29dacc800cd8772 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Thu, 9 Jul 2020 15:27:04 +0200
Subject: [PATCH 27/37] Fixed Typo

---
 module/template_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/template_module.py b/module/template_module.py
index 2cb6eb1..2fe0568 100644
--- a/module/template_module.py
+++ b/module/template_module.py
@@ -25,7 +25,7 @@ from module.moduleBase import ModuleBase
 logging.debug("- %s loaded", __name__)
 
 
-class BoswatchModul(ModuleBase):
+class BoswatchModule(ModuleBase):
     """!Description of the Module"""
     def __init__(self, config):
         """!Do not change anything here!"""

From 8b5a538c5f300af997a78e79a9a221226aec38f8 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Thu, 9 Jul 2020 21:17:44 +0200
Subject: [PATCH 28/37] first draft doubleFilter

---
 .../{___doubleFilter.py => doubleFilter.py}   | 57 ++++++++++++-------
 1 file changed, 37 insertions(+), 20 deletions(-)
 rename module/filter/{___doubleFilter.py => doubleFilter.py} (53%)

diff --git a/module/filter/___doubleFilter.py b/module/filter/doubleFilter.py
similarity index 53%
rename from module/filter/___doubleFilter.py
rename to module/filter/doubleFilter.py
index aa8ba9f..82ee672 100644
--- a/module/filter/___doubleFilter.py
+++ b/module/filter/doubleFilter.py
@@ -10,33 +10,45 @@
                      by Bastian Schroll
 
 @file:        doubleFilter.py
-@date:        15.01.2018
-@author:      Bastian Schroll
-@description: Class to implement a filter for double alarms
-@todo test, refactor and document / check_msg is not implemented yet
+@date:        09.07.2020
+@author:      Bastian Schroll, b-watch
+@description: Filter module for double packages
 """
 import logging
+from module.moduleBase import ModuleBase
+
+# ###################### #
+# Custom plugin includes #
 import time
+# ######################
 
 logging.debug("- %s loaded", __name__)
 
 
-class DoubleFilter:
-    """!Double Filter Class"""
-
+class BoswatchModule(ModuleBase):
+    """!Description of the Module"""
     def __init__(self, config):
-        """!init"""
-        self._config = config
+        """!Do not change anything here!"""
+        super().__init__(__name__, config)  # you can access the config class on 'self.config'
         self._filterLists = {}
+        logging.debug("Configured ignoreTime: %d", self.config.get("ignoreTime", default=10))
+        logging.debug("Configured maxEntry: %d", self.config.get("maxEntry", default=10))
 
-    def filter(self, bwPacket):
+    def onLoad(self):
+        """!Called by import of the plugin
+        Remove if not implemented"""
+        pass
 
+    def doWork(self, bwPacket):
+        """!start an run of the module.
+
+        @param bwPacket: A BOSWatch packet instance"""
         if bwPacket.get("mode") == "fms":
-            scanWord = "fms"
+            filterFields = ["fms"]
         elif bwPacket.get("mode") == "pocsag":
-            scanWord = "ric"
+            filterFields = self.config.get("pocsagFields", default=["ric"])
         elif bwPacket.get("mode") == "zvei":
-            scanWord = "zvei"
+            filterFields = ["zvei"]
         else:
             logging.error("No Filter for '%s'", bwPacket)
             return False
@@ -45,30 +57,35 @@ class DoubleFilter:
             logging.debug("create new doubleFilter list for '%s'", bwPacket.get("mode"))
             self._filterLists[bwPacket.get("mode")] = []
 
-        logging.debug("scanWord for '%s' is '%s'", bwPacket.get("mode"), scanWord)
+        logging.debug("filterFields for '%s' is '%s'", bwPacket.get("mode"), ", ".join(filterFields))
 
-        return self._check(bwPacket, scanWord)
+        return self._check(bwPacket, filterFields)
 
-    def _check(self, bwPacket, scanWord):
+    def onUnload(self):
+        """!Called by destruction of the plugin
+        Remove if not implemented"""
+        pass
+
+    def _check(self, bwPacket, filterFields):
         self._filterLists[bwPacket.get("mode")].insert(0, bwPacket)
 
         # delete entries that are to old
         counter = 0
         for listPacket in self._filterLists[bwPacket.get("mode")][1:]:  # [1:] skip first entry, thats the new one
-            if listPacket.get("timestamp") < (time.time() - self._config["ignoreTime"]):
+            if float(listPacket.get("timestamp")) < (time.time() - self.config.get("ignoreTime", default=10)):
                 self._filterLists[bwPacket.get("mode")].remove(listPacket)
                 counter += 1
         if counter:
             logging.debug("%d old entry(s) removed", counter)
 
         # delete last entry if list is to big
-        if len(self._filterLists[bwPacket.get("mode")]) > self._config["maxEntry"]:
+        if len(self._filterLists[bwPacket.get("mode")]) > self.config.get("maxEntry", default=20):
             logging.debug("MaxEntry reached - delete oldest")
             self._filterLists[bwPacket.get("mode")].pop()
 
         for listPacket in self._filterLists[bwPacket.get("mode")][1:]:  # [1:] skip first entry, thats the new one
-            if listPacket.get(scanWord) is bwPacket.get(scanWord):
-                logging.debug("found duplicate: %s", bwPacket.get(scanWord))
+            if all(listPacket.get(x) == bwPacket.get(x) for x in filterFields):
+                logging.debug("found duplicate: %s", bwPacket.get("mode"))
                 return False
 
         logging.debug("doubleFilter ok")

From ec9f3f3875de6561ed380afdd0691d79d4233aaa Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@schroll-software.de>
Date: Fri, 10 Jul 2020 07:17:48 +0200
Subject: [PATCH 29/37] fix pep8 err

---
 plugin/telegram.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugin/telegram.py b/plugin/telegram.py
index 165b3c3..a68f536 100644
--- a/plugin/telegram.py
+++ b/plugin/telegram.py
@@ -70,7 +70,6 @@ class BoswatchPlugin(PluginBase):
         msg = self.parseWildcards(self.config.get("message_fms", default="{FMS}"))
         self._sendMessage(msg)
 
-
     def pocsag(self, bwPacket):
         """!Called on POCSAG alarm
 

From 8bd9e26fe1fbb5be03541aaf7b121ff55a315d80 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Fri, 10 Jul 2020 21:25:03 +0200
Subject: [PATCH 30/37] fixed wrong return

---
 module/filter/doubleFilter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/filter/doubleFilter.py b/module/filter/doubleFilter.py
index 82ee672..f23e17e 100644
--- a/module/filter/doubleFilter.py
+++ b/module/filter/doubleFilter.py
@@ -89,4 +89,4 @@ class BoswatchModule(ModuleBase):
                 return False
 
         logging.debug("doubleFilter ok")
-        return True
+        return bwPacket

From 2f96e4aa9bfa7e6bc2a54f5d651d0630b62e05be Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Fri, 10 Jul 2020 21:35:08 +0200
Subject: [PATCH 31/37] added documentation

---
 docu/docs/modul/double_filter.md | 49 ++++++++++++++++++++++++++++++++
 docu/mkdocs.yml                  |  1 +
 2 files changed, 50 insertions(+)
 create mode 100644 docu/docs/modul/double_filter.md

diff --git a/docu/docs/modul/double_filter.md b/docu/docs/modul/double_filter.md
new file mode 100644
index 0000000..7fb28f8
--- /dev/null
+++ b/docu/docs/modul/double_filter.md
@@ -0,0 +1,49 @@
+# <center>Double Filter</center> 
+---
+
+## Beschreibung
+Mit diesem Modul ist es möglich, die Pakete auf Duplikate zu Filtern. Je nach Konfiguration werden doppelte Pakete im aktuellen Router weitergeleitet oder verworfen.
+
+## Unterstütze Alarmtypen
+- Fms
+- Pocsag
+- Zvei
+
+## Resource
+`filter.doubleFilter`
+
+## Konfiguration
+|Feld|Beschreibung|Default|
+|----|------------|-------|
+|ignoreTime|Zeitfenster für doppelte Pakte in Sekunden|10|
+|maxEntry|Maximale Anzahl an Paketen in der Vergleichsliste|20|
+|pocsagFields|Liste der Pocsag Felder zum Vergleichen: `ric`, `subric` und/oder `message`|`ric`|
+
+**Beispiel:**
+```yaml
+- type: module
+  res: filter.doubleFilter
+  config:
+    ignoreTime: 30
+    maxEntry: 10
+    pocsagFields:
+      - ric
+      - subric
+```
+
+---
+## Modul Abhängigkeiten
+- keine
+
+---
+## Externe Abhängigkeiten
+- keine
+
+---
+## Paket Modifikationen
+- keine
+
+---
+## Zusätzliche Wildcards
+- keine
+
diff --git a/docu/mkdocs.yml b/docu/mkdocs.yml
index df708b9..ff4f904 100644
--- a/docu/mkdocs.yml
+++ b/docu/mkdocs.yml
@@ -22,6 +22,7 @@ nav:
       - Geocoding: modul/geocoding.md
       - Mode Filter: modul/mode_filter.md
       - Regex Filter: modul/regex_filter.md
+      - Double Filter: modul/double_filter.md
   - Plugins:
       - Http: plugin/http.md
       - Telegram: plugin/telegram.md

From 1aac3ce2cf3913ed0ce2b25967a7b2d577f2521a Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Fri, 10 Jul 2020 21:41:19 +0200
Subject: [PATCH 32/37] Merge branch 'develop' into FR-DoubleFilter

---
 module/template_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/template_module.py b/module/template_module.py
index 2cb6eb1..2fe0568 100644
--- a/module/template_module.py
+++ b/module/template_module.py
@@ -25,7 +25,7 @@ from module.moduleBase import ModuleBase
 logging.debug("- %s loaded", __name__)
 
 
-class BoswatchModul(ModuleBase):
+class BoswatchModule(ModuleBase):
     """!Description of the Module"""
     def __init__(self, config):
         """!Do not change anything here!"""

From 6e2ee6ba6a1b40a2988d32132c14867225aae86c Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Mon, 13 Jul 2020 19:56:38 +0200
Subject: [PATCH 33/37] Changed return to None

---
 module/filter/doubleFilter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/filter/doubleFilter.py b/module/filter/doubleFilter.py
index f23e17e..dfcdd72 100644
--- a/module/filter/doubleFilter.py
+++ b/module/filter/doubleFilter.py
@@ -89,4 +89,4 @@ class BoswatchModule(ModuleBase):
                 return False
 
         logging.debug("doubleFilter ok")
-        return bwPacket
+        return None

From 24899f3d08b0022942203bc111fa282a2150f915 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Mon, 13 Jul 2020 20:02:00 +0200
Subject: [PATCH 34/37] changed var-names

---
 boswatch/inputSource/inputBase.py | 6 +++---
 config/client.yaml                | 2 +-
 docu/docs/config.md               | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/boswatch/inputSource/inputBase.py b/boswatch/inputSource/inputBase.py
index e3c03c5..001d102 100644
--- a/boswatch/inputSource/inputBase.py
+++ b/boswatch/inputSource/inputBase.py
@@ -67,7 +67,7 @@ class InputBase(ABC):
         print(data)
 
     def getDecoderInstance(self, decoderConfig, StdIn):
-        mmProc = ProcessManager(str(decoderConfig.get("Path", default="multimon-ng")), textMode=True)
+        mmProc = ProcessManager(str(decoderConfig.get("path", default="multimon-ng")), textMode=True)
         if decoderConfig.get("fms", default=0):
             mmProc.addArgument("-a FMSFSK")
         if decoderConfig.get("zvei", default=0):
@@ -78,8 +78,8 @@ class InputBase(ABC):
             mmProc.addArgument("-a POCSAG1200")
         if decoderConfig.get("poc2400", default=0):
             mmProc.addArgument("-a POCSAG2400")
-        if decoderConfig.get("Char", default=0):
-            mmProc.addArgument("-C " + str(decoderConfig.get("Char")))
+        if decoderConfig.get("char", default=0):
+            mmProc.addArgument("-C " + str(decoderConfig.get("char")))
         mmProc.addArgument("-f alpha")
         mmProc.addArgument("-t raw -")
         mmProc.setStdin(StdIn)
diff --git a/config/client.yaml b/config/client.yaml
index b6a1f29..1550eab 100644
--- a/config/client.yaml
+++ b/config/client.yaml
@@ -38,4 +38,4 @@ decoder:
   poc1200: yes
   poc2400: yes
   Path: /opt/multimon/multimon-ng
-  Char: DE
+  char: DE
diff --git a/docu/docs/config.md b/docu/docs/config.md
index efc4d5f..b833101 100644
--- a/docu/docs/config.md
+++ b/docu/docs/config.md
@@ -140,8 +140,8 @@ inputSource:
 |poc512|POCSAG Decoder (Bitrate 512)|no|
 |poc1200|POCSAG Decoder (Bitrate 1200)|no|
 |poc2400|POCSAG Decoder (Bitrate 2400)|no|
-|Path|Pfad zur multimon-ng Binary|multimon-ng|
-|Char|multimon-ng Char-Set|not set|
+|path|Pfad zur multimon-ng Binary|multimon-ng|
+|char|multimon-ng char-Set|not set|
 
 **Beispiel:**
 ```yaml
@@ -151,8 +151,8 @@ decoder:
   poc512: no
   poc1200: no
   poc2400: yes
-  Path: /opt/multimon/multimon-ng
-  Char: DE
+  path: /opt/multimon/multimon-ng
+  char: DE
 ```
 
 ---

From 43c9ed1edc8c6e0812869cc9fc2a009371fefcc8 Mon Sep 17 00:00:00 2001
From: Jan Speller <j-speller@outlook.com>
Date: Tue, 14 Jul 2020 08:39:41 +0200
Subject: [PATCH 35/37] add new parameter to disable queue

---
 plugin/telegram.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugin/telegram.py b/plugin/telegram.py
index a68f536..9bc5ef1 100644
--- a/plugin/telegram.py
+++ b/plugin/telegram.py
@@ -59,9 +59,14 @@ class BoswatchPlugin(PluginBase):
 
     def onLoad(self):
         """!Called by import of the plugin"""
-        q = mq.MessageQueue()
-        request = Request(con_pool_size=8)
-        self.bot = MQBot(token=self.config.get("botToken", default=""), request=request, mqueue=q)
+        if self.config.get("queue", default=True):
+            q = mq.MessageQueue()
+            request = Request(con_pool_size=8)
+            self.bot = MQBot(token=self.config.get("botToken", default=""), request=request, mqueue=q)
+            print('queue')
+        else:
+            self.bot = telegram.Bot(token=self.config.get("botToken"))
+            print('normal')
 
     def fms(self, bwPacket):
         """!Called on FMS alarm

From b19d2e7eda755bb9d4b180e480068fe10c62d966 Mon Sep 17 00:00:00 2001
From: Jan Speller <j-speller@outlook.com>
Date: Tue, 14 Jul 2020 08:40:04 +0200
Subject: [PATCH 36/37] Add Notice to documentation

---
 docu/docs/plugin/telegram.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docu/docs/plugin/telegram.md b/docu/docs/plugin/telegram.md
index 92319d2..bd82296 100644
--- a/docu/docs/plugin/telegram.md
+++ b/docu/docs/plugin/telegram.md
@@ -5,6 +5,8 @@
 Mit diesem Plugin ist es moeglich, Telegram-Nachrichten für POCSAG-Alarmierungen zu senden. 
 Außerdem werden Locations versendet, wenn die Felder `lat` und `lon` im Paket definiert sind. (beispielsweise durch das [Geocoding](../modul/geocoding.md) Modul)
 
+Die abarbeitung der Alarmierungen erfolgt per Queue nach den Limits der Telegram API, damit keine Nachrichten verloren gehen, diese Funktion kann mit dem ```queue``` Parameter deaktiviert werden.
+
 ## Unterstütze Alarmtypen
 - Fms
 - Pocsag
@@ -24,6 +26,7 @@ Außerdem werden Locations versendet, wenn die Felder `lat` und `lon` im Paket d
 |message_pocsag|Format der Nachricht für Pocsag|`{RIC}({SRIC})\n{MSG}`|
 |message_zvei|Format der Nachricht für ZVEI|`{TONE}`|
 |message_msg|Format der Nachricht für MSG||
+|queue|Aktivieren/Deaktivieren der MessageQueue|true|
 
 **Beispiel:**
 ```yaml

From 4e95d14d889b4ee6f321796917436af66421f010 Mon Sep 17 00:00:00 2001
From: B-Watch <b-watch@forceweb.de>
Date: Wed, 15 Jul 2020 08:09:57 +0200
Subject: [PATCH 37/37] added changes from PR-Discussion

---
 docu/docs/modul/double_filter.md | 2 +-
 module/filter/doubleFilter.py    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docu/docs/modul/double_filter.md b/docu/docs/modul/double_filter.md
index 7fb28f8..e857c79 100644
--- a/docu/docs/modul/double_filter.md
+++ b/docu/docs/modul/double_filter.md
@@ -17,7 +17,7 @@ Mit diesem Modul ist es möglich, die Pakete auf Duplikate zu Filtern. Je nach K
 |----|------------|-------|
 |ignoreTime|Zeitfenster für doppelte Pakte in Sekunden|10|
 |maxEntry|Maximale Anzahl an Paketen in der Vergleichsliste|20|
-|pocsagFields|Liste der Pocsag Felder zum Vergleichen: `ric`, `subric` und/oder `message`|`ric`|
+|pocsagFields|Liste der Pocsag Felder zum Vergleichen: `ric`, `subric` und/oder `message`|`ric,subric`|
 
 **Beispiel:**
 ```yaml
diff --git a/module/filter/doubleFilter.py b/module/filter/doubleFilter.py
index dfcdd72..4b0a20a 100644
--- a/module/filter/doubleFilter.py
+++ b/module/filter/doubleFilter.py
@@ -46,9 +46,9 @@ class BoswatchModule(ModuleBase):
         if bwPacket.get("mode") == "fms":
             filterFields = ["fms"]
         elif bwPacket.get("mode") == "pocsag":
-            filterFields = self.config.get("pocsagFields", default=["ric"])
+            filterFields = self.config.get("pocsagFields", default=["ric", "subric"])
         elif bwPacket.get("mode") == "zvei":
-            filterFields = ["zvei"]
+            filterFields = ["tone"]
         else:
             logging.error("No Filter for '%s'", bwPacket)
             return False