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

Merge pull request #46 from b-watch/FR-mmChar

Browse source 
FR #42 - added config for Char-set mm
This commit is contained in:
Bastian Schroll 2020-06-29 07:23:06 +02:00 committed by GitHub
parent e004908652 117ea5347e
commit c2f6a783de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boswatch/inputSource/lineInInput.py
View file

@ -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)

2
boswatch/inputSource/sdrInput.py
View file

@ -52,6 +52,8 @@ class SdrInput(InputBase):
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.setStdin(sdrProc.stdout)

2
config/client.yaml
View file

@ -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

4
docu/docs/config.md
View file

@ -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|not 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
```
---