refactor

csdr/chain/drm.py

@@ -1,7 +1,7 @@
 from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain
 from pycsdr.modules import Convert, Downmix
 from pycsdr.types import Format
-from owrx.drm import DrmModule
+from csdr.module.drm import DrmModule
 
 
 class Drm(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain):

csdr/chain/freedv.py

@@ -1,5 +1,5 @@
 from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain
-from owrx.freedv import FreeDVModule
+from csdr.module.freedv import FreeDVModule
 from pycsdr.modules import RealPart, Agc, Convert
 from pycsdr.types import Format
 

csdr/chain/m17.py

@@ -1,11 +1,11 @@
 from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain
-from owrx.m17 import M17Module
+from csdr.module.m17 import M17Module
 from pycsdr.modules import FmDemod, Limit, Convert
 from pycsdr.types import Format
 from digiham.modules import DcBlock
 
 
-class M17Chain(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain):
+class M17(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain):
     def __init__(self):
         workers = [
             FmDemod(),

csdr/module/drm.py

@@ -0,0 +1,14 @@
+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", "-"]

csdr/module/freedv.py

@@ -0,0 +1,13 @@
+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", "-", "-"]

csdr/module/m17.py

@@ -0,0 +1,13 @@
+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"]