diff --git a/boswatch/inputSource/inputBase.py b/boswatch/inputSource/inputBase.py index 1c85e63..4cbf423 100644 --- a/boswatch/inputSource/inputBase.py +++ b/boswatch/inputSource/inputBase.py @@ -67,7 +67,7 @@ class InputBase(ABC): print(data) 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): mmProc.addArgument("-a FMSFSK") if decoderConfig.get("zvei", default=0): @@ -78,8 +78,8 @@ class InputBase(ABC): mmProc.addArgument("-a POCSAG1200") if decoderConfig.get("poc2400", default=0): mmProc.addArgument("-a POCSAG2400") - if decoderConfig.get("mmChar"): - mmProc.addArgument("-C " + str(decoderConfig.get("mmChar"))) + if decoderConfig.get("Char"): + mmProc.addArgument("-C " + str(decoderConfig.get("Char"))) mmProc.addArgument("-f alpha") mmProc.addArgument("-t raw -") mmProc.setStdin(StdIn) diff --git a/config/client.yaml b/config/client.yaml index 2b2a736..b6a1f29 100644 --- a/config/client.yaml +++ b/config/client.yaml @@ -27,13 +27,9 @@ inputSource: squelch: 1 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 @@ -41,3 +37,5 @@ decoder: poc512: yes poc1200: yes poc2400: yes + Path: /opt/multimon/multimon-ng + Char: DE diff --git a/docu/docs/config.md b/docu/docs/config.md index 1aa03c4..efc4d5f 100644 --- a/docu/docs/config.md +++ b/docu/docs/config.md @@ -140,8 +140,8 @@ inputSource: |poc512|POCSAG Decoder (Bitrate 512)|no| |poc1200|POCSAG Decoder (Bitrate 1200)|no| |poc2400|POCSAG Decoder (Bitrate 2400)|no| -|mmPath|Pfad zur multimon-ng Binary|multimon-ng| -|mmChar|multimon-ng Char-Set|not set| +|Path|Pfad zur multimon-ng Binary|multimon-ng| +|Char|multimon-ng Char-Set|not set| **Beispiel:** ```yaml @@ -151,8 +151,8 @@ decoder: poc512: no poc1200: no poc2400: yes - mmPath: /opt/multimon/multimon-ng - mmChar: DE + Path: /opt/multimon/multimon-ng + Char: DE ``` ---