From 2ecefcecd55e98f4a851f21ed8e704b050e68af2 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Thu, 17 Jun 2021 14:13:17 +0200 Subject: [PATCH] update dependency handling for nxdn --- owrx/feature.py | 8 -------- owrx/modes.py | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/owrx/feature.py b/owrx/feature.py index 2e04a13..a5c4268 100644 --- a/owrx/feature.py +++ b/owrx/feature.py @@ -73,7 +73,6 @@ class FeatureDetector(object): "runds": ["runds_connector"], # optional features and their requirements "digital_voice_digiham": ["digiham", "sox", "codecserver_ambe"], - "digital_voice_dsd": ["dsd", "sox", "digiham"], "digital_voice_freedv": ["freedv_rx", "sox"], "digital_voice_m17": ["m17_demod", "sox", "digiham"], "wsjt-x": ["wsjtx", "sox"], @@ -414,13 +413,6 @@ class FeatureDetector(object): """ return self._has_soapy_driver("fcdpp") - def has_dsd(self): - """ - The digital voice modes NXDN and D-Star can be decoded by the dsd project. Please note that you need the version - modified by F4EXB that provides stdin/stdout support. You can find it [here](https://github.com/f4exb/dsd). - """ - return self.command_is_runnable("dsd -h") - def has_m17_demod(self): """ The `m17-demod` tool is used to demodulate M17 digital voice signals. diff --git a/owrx/modes.py b/owrx/modes.py index be9aea6..6bb292f 100644 --- a/owrx/modes.py +++ b/owrx/modes.py @@ -100,7 +100,7 @@ class Modes(object): AnalogMode( "dstar", "D-Star", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_digiham"], squelch=False ), - AnalogMode("nxdn", "NXDN", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"], squelch=False), + AnalogMode("nxdn", "NXDN", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_digiham"], squelch=False), AnalogMode("ysf", "YSF", bandpass=Bandpass(-4000, 4000), requirements=["digital_voice_digiham"], squelch=False), AnalogMode("m17", "M17", bandpass=Bandpass(-4000, 4000), requirements=["digital_voice_m17"], squelch=False), AnalogMode(