refactor

owrx/aprs/direwolf.py

@@ -16,7 +16,7 @@ class DirewolfConfigSubscriber(ABC):
         pass
 
 
-class DirewolfConfig(object):
+class DirewolfConfig:
     config_keys = [
         "aprs_callsign",
         "aprs_igate_enabled",

owrx/drm.py

@@ -1,14 +0,0 @@
-from csdr.module import PopenModule
-from pycsdr.types import Format
-
-
-class DrmModule(PopenModule):
-    def getInputFormat(self) -> Format:
-        return Format.COMPLEX_FLOAT
-
-    def getOutputFormat(self) -> Format:
-        return Format.SHORT
-
-    def getCommand(self):
-        # dream -c 6 --sigsrate 48000 --audsrate 48000 -I - -O -
-        return ["dream", "-c", "6", "--sigsrate", "48000", "--audsrate", "48000", "-I", "-", "-O", "-"]

owrx/dsp.py

@@ -10,7 +10,7 @@ from csdr.chain.selector import Selector
 from csdr.chain.clientaudio import ClientAudioChain
 from csdr.chain.analog import NFm, WFm, Am, Ssb
 from csdr.chain.digiham import DigihamChain, Dmr, Dstar, Nxdn, Ysf
-from csdr.chain.m17 import M17Chain
+from csdr.chain.m17 import M17
 from csdr.chain.freedv import FreeDV
 from csdr.chain.drm import Drm
 from csdr.chain.fft import FftChain
@@ -449,7 +449,7 @@ class DspManager(SdrSourceEventClient):
         elif demod == "nxdn":
             return Nxdn(self.props["digital_voice_codecserver"])
         elif demod == "m17":
-            return M17Chain()
+            return M17()
         elif demod == "drm":
             return Drm()
         elif demod == "freedv":

owrx/freedv.py

@@ -1,13 +0,0 @@
-from pycsdr.types import Format
-from csdr.module import PopenModule
-
-
-class FreeDVModule(PopenModule):
-    def getInputFormat(self) -> Format:
-        return Format.SHORT
-
-    def getOutputFormat(self) -> Format:
-        return Format.SHORT
-
-    def getCommand(self):
-        return ["freedv_rx", "1600", "-", "-"]

owrx/m17.py

@@ -1,13 +0,0 @@
-from csdr.module import PopenModule
-from pycsdr.types import Format
-
-
-class M17Module(PopenModule):
-    def getInputFormat(self) -> Format:
-        return Format.SHORT
-
-    def getOutputFormat(self) -> Format:
-        return Format.SHORT
-
-    def getCommand(self):
-        return ["m17-demod"]