From 806a0d476a9d510c42dc53ef90b6b15658eaf259 Mon Sep 17 00:00:00 2001
From: Bastian Schroll <bastian@schroll-software.de>
Date: Fri, 18 Oct 2019 09:19:13 +0200
Subject: [PATCH] add rtl_fm using in bw_client

---
 bw_client.py        | 8 +++++---
 config/client.yaml  | 1 -
 docu/docs/config.md | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bw_client.py b/bw_client.py
index 2150fc7..5a6a82b 100644
--- a/bw_client.py
+++ b/bw_client.py
@@ -90,7 +90,9 @@ try:
             sdrProc.addArgument("-f " + freq)                                      # frequencies
         sdrProc.addArgument("-p " + str(config.get("error", default="0")))         # frequency error in ppm
         sdrProc.addArgument("-l " + str(config.get("squelch", default="1")))       # squelch
-        sdrProc.addArgument("-g " + str(config.get("gain", default="automatic")))  # gain
+        sdrProc.addArgument("-g " + str(config.get("gain", default="100")))         # gain
+        sdrProc.addArgument("-M fm")                                               # set mode to fm
+        sdrProc.addArgument("-E DC")                                               # set DC filter
         sdrProc.addArgument("-s 22050")                                            # bit rate of audio stream
         if not sdrProc.start():
             exit(0)
@@ -109,11 +111,11 @@ try:
             if not sdrProc.isRunning:
                 logging.warning("rtl_fm was down - try to restart")
                 sdrProc.start()
-                # sdrProc.skipLines(20)
+                sdrProc.skipLinesUntil("Output at")  # last line form rtl_fm before data
             elif not mmProc.isRunning:
                 logging.warning("multimon was down - try to restart")
                 mmProc.start()
-                mmProc.skipLines(5)
+                mmProc.skipLinesUntil("Enabled Demodulators:")  # last line from mm before data
             elif sdrProc.isRunning and mmProc.isRunning:
                 line = mmProc.readline()
                 if line:
diff --git a/config/client.yaml b/config/client.yaml
index 87267e3..1d99914 100644
--- a/config/client.yaml
+++ b/config/client.yaml
@@ -24,7 +24,6 @@ inputSource:
     device: 0
     frequencies:
       - 85M
-      - 86M
     error: 0
     squelch: 1
     gain: 100
diff --git a/docu/docs/config.md b/docu/docs/config.md
index 1b86ecc..47ccef5 100644
--- a/docu/docs/config.md
+++ b/docu/docs/config.md
@@ -45,7 +45,7 @@ Aktuell gibt es nur `sdr:` als Input Quelle
 |frequencies|Liste der zu empfangenden Frequenzen||
 |error|Frequenz Abweichung in ppm|0|
 |squelch|Einstellung der Rauschsperre|1|
-|gain|Verstärkung des Eingangssignals|automatic|
+|gain|Verstärkung des Eingangssignals|100|
 
 **Beispiel:**
 ```yaml