BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add config for rtl and mm bin-path

Browse source
This commit is contained in:
Bastian Schroll 2019-10-21 09:43:25 +02:00
parent 247bc3b6eb
commit 2a139aeb29
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bw_client.py
View file

@ -84,7 +84,7 @@ try:
# ========== INPUT CODE ========== # ========== INPUT CODE ==========
def handleSDRInput(dataQueue, sdrConfig, decoderConfig): # todo exception handling inside def handleSDRInput(dataQueue, sdrConfig, decoderConfig): # todo exception handling inside
sdrProc = ProcessManager("/usr/bin/rtl_fm") sdrProc = ProcessManager(str(sdrConfig.get("rtlPath", default="rtl_fm")))
sdrProc.addArgument("-d " + str(sdrConfig.get("device", default="0"))) # device id sdrProc.addArgument("-d " + str(sdrConfig.get("device", default="0"))) # device id
sdrProc.addArgument("-f " + sdrConfig.get("frequency")) # frequencies sdrProc.addArgument("-f " + sdrConfig.get("frequency")) # frequencies
sdrProc.addArgument("-p " + str(sdrConfig.get("error", default="0"))) # frequency error in ppm sdrProc.addArgument("-p " + str(sdrConfig.get("error", default="0"))) # frequency error in ppm
@ -96,7 +96,7 @@ try:
sdrProc.start() sdrProc.start()
sdrProc.skipLinesUntil("Output at") sdrProc.skipLinesUntil("Output at")
mmProc = ProcessManager("/opt/multimon/multimon-ng", textMode=True) mmProc = ProcessManager(str(sdrConfig.get("mmPath", default="multimon-ng")), textMode=True)
if decoderConfig.get("fms", default=0): if decoderConfig.get("fms", default=0):
mmProc.addArgument("-a FMSFSK") mmProc.addArgument("-a FMSFSK")
if decoderConfig.get("zvei", default=0): if decoderConfig.get("zvei", default=0):

2
config/client.yaml
View file

@ -26,6 +26,8 @@ inputSource:
error: 0 error: 0
squelch: 1 squelch: 1
gain: 100 gain: 100
rtlPath: /usr/bin/rtl-fm
mmPath: /opt/multimon/multimon-ng
decoder: decoder:
fms: yes fms: yes

6
docu/docs/config.md
View file

@ -46,16 +46,20 @@ Aktuell gibt es nur `sdr:` als Input Quelle
|error|Frequenz Abweichung in ppm|0| |error|Frequenz Abweichung in ppm|0|
|squelch|Einstellung der Rauschsperre|1| |squelch|Einstellung der Rauschsperre|1|
|gain|Verstärkung des Eingangssignals|100| |gain|Verstärkung des Eingangssignals|100|
|rtlPath|Pfad zur rtl_fm Binary|rtl_fm|
|mmPath|Pfad zur multimon-ng Binary|multimon-ng|
**Beispiel:** **Beispiel:**
```yaml ```yaml
inputSource: inputSource:
sdr: sdr:
device: 0 device: 0
frequency: 85.000M frequency: 85M
error: 0 error: 0
squelch: 1 squelch: 1
gain: 100 gain: 100
rtlPath: /usr/bin/rtl-fm
mmPath: /opt/multimon/multimon-ng
``` ```
--- ---