From c3ccc11b5de0da39981f7d2f9a80667c0de6773f Mon Sep 17 00:00:00 2001 From: B-Watch Date: Wed, 24 Jun 2020 21:38:11 +0200 Subject: [PATCH 1/5] 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 Date: Wed, 24 Jun 2020 21:48:20 +0200 Subject: [PATCH 2/5] 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 Date: Wed, 24 Jun 2020 21:57:14 +0200 Subject: [PATCH 3/5] 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 4/5] 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 Date: Mon, 29 Jun 2020 07:21:33 +0200 Subject: [PATCH 5/5] 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