diff --git a/csdr/chain/toolbox.py b/csdr/chain/toolbox.py index 0e736614..f45ef064 100644 --- a/csdr/chain/toolbox.py +++ b/csdr/chain/toolbox.py @@ -228,6 +228,7 @@ class CwSkimmerDemodulator(ServiceDemodulator, DialFrequencyReceiver): self.sampleRate = sampleRate self.parser = CwSkimmerParser() workers = [ + Convert(Format.FLOAT, Format.SHORT), CwSkimmerModule(sampleRate, charCount), self.parser, ] diff --git a/csdr/module/toolbox.py b/csdr/module/toolbox.py index 3ca568ed..765b8d2c 100644 --- a/csdr/module/toolbox.py +++ b/csdr/module/toolbox.py @@ -122,7 +122,7 @@ class AcarsDecModule(WavFileModule): class CwSkimmerModule(ExecModule): def __init__(self, sampleRate: int = 12000, charCount: int = 8): cmd = ["csdr-cwskimmer", "-r", str(sampleRate), "-n", str(charCount)] - super().__init__(Format.FLOAT, Format.CHAR, cmd) + super().__init__(Format.SHORT, Format.CHAR, cmd) class RedseaModule(ExecModule): diff --git a/owrx/dsp.py b/owrx/dsp.py index aa922365..17068d21 100644 --- a/owrx/dsp.py +++ b/owrx/dsp.py @@ -721,7 +721,7 @@ class DspManager(SdrSourceEventClient, ClientDemodulatorSecondaryDspEventClient) from csdr.chain.digimodes import CwDemodulator return CwDemodulator(75.0) elif mod == "cwskimmer": - from csdr.chain.digimodes import CwSkimmerDemodulator + from csdr.chain.toolbox import CwSkimmerDemodulator return CwSkimmerDemodulator() elif mod == "mfrtty170": from csdr.chain.digimodes import MFRttyDemodulator