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

renamed config vars

Browse source
This commit is contained in:
B-Watch 2020-07-09 15:20:54 +02:00
parent 546ecada42
commit 99df0340a6
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
boswatch/inputSource/inputBase.py
View file

@ -67,7 +67,7 @@ class InputBase(ABC):
print(data) print(data)
def getDecoderInstance(self, decoderConfig, StdIn): 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): 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):
@ -78,8 +78,8 @@ class InputBase(ABC):
mmProc.addArgument("-a POCSAG1200") mmProc.addArgument("-a POCSAG1200")
if decoderConfig.get("poc2400", default=0): if decoderConfig.get("poc2400", default=0):
mmProc.addArgument("-a POCSAG2400") mmProc.addArgument("-a POCSAG2400")
if decoderConfig.get("mmChar"): if decoderConfig.get("Char"):
mmProc.addArgument("-C " + str(decoderConfig.get("mmChar"))) mmProc.addArgument("-C " + str(decoderConfig.get("Char")))
mmProc.addArgument("-f alpha") mmProc.addArgument("-f alpha")
mmProc.addArgument("-t raw -") mmProc.addArgument("-t raw -")
mmProc.setStdin(StdIn) mmProc.setStdin(StdIn)

6
config/client.yaml
View file

@ -27,13 +27,9 @@ inputSource:
squelch: 1 squelch: 1
gain: 100 gain: 100
rtlPath: /usr/bin/rtl_fm rtlPath: /usr/bin/rtl_fm
mmPath: /opt/multimon/multimon-ng
mmChar: DE
lineIn: lineIn:
card: 1 card: 1
device: 0 device: 0
mmPath: /opt/multimon/multimon-ng
mmChar: DE
decoder: decoder:
fms: yes fms: yes
@ -41,3 +37,5 @@ decoder:
poc512: yes poc512: yes
poc1200: yes poc1200: yes
poc2400: yes poc2400: yes
Path: /opt/multimon/multimon-ng
Char: DE

8
docu/docs/config.md
View file

@ -140,8 +140,8 @@ inputSource:
|poc512|POCSAG Decoder (Bitrate 512)|no| |poc512|POCSAG Decoder (Bitrate 512)|no|
|poc1200|POCSAG Decoder (Bitrate 1200)|no| |poc1200|POCSAG Decoder (Bitrate 1200)|no|
|poc2400|POCSAG Decoder (Bitrate 2400)|no| |poc2400|POCSAG Decoder (Bitrate 2400)|no|
|mmPath|Pfad zur multimon-ng Binary|multimon-ng| |Path|Pfad zur multimon-ng Binary|multimon-ng|
|mmChar|multimon-ng Char-Set|not set| |Char|multimon-ng Char-Set|not set|
**Beispiel:** **Beispiel:**
```yaml ```yaml
@ -151,8 +151,8 @@ decoder:
poc512: no poc512: no
poc1200: no poc1200: no
poc2400: yes poc2400: yes
mmPath: /opt/multimon/multimon-ng Path: /opt/multimon/multimon-ng
mmChar: DE Char: DE
``` ```
--- ---