From cb98f3750bd42e72d80aba4386bdf4ae9633ca4f Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Sun, 22 Jan 2023 00:07:47 -0500 Subject: [PATCH] Switching from number of buckets to frequency width. --- csdr/chain/digimodes.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/csdr/chain/digimodes.py b/csdr/chain/digimodes.py index fa1f8eb3..1580b0aa 100644 --- a/csdr/chain/digimodes.py +++ b/csdr/chain/digimodes.py @@ -94,14 +94,11 @@ class PskDemodulator(SecondaryDemodulator, SecondarySelectorChain): class CwDemodulator(SecondaryDemodulator, SecondarySelectorChain): def __init__(self, baudRate: float): self.baudRate = baudRate - # this is an assumption, we will adjust in setSampleRate self.sampleRate = 12000 - self.targetFreq = 0 - self.buckets = int(self.sampleRate/baudRate) workers = [ RealPart(), Agc(Format.FLOAT), - CwDecoder(self.sampleRate, self.targetFreq, self.buckets), + CwDecoder(self.sampleRate, 0, self.baudRate), ] super().__init__(workers) @@ -112,6 +109,5 @@ class CwDemodulator(SecondaryDemodulator, SecondarySelectorChain): if sampleRate == self.sampleRate: return self.sampleRate = sampleRate - self.buckets = int(sampleRate/self.baudRate) - self.replace(1, CwDecoder(sampleRate, self.targetFreq, self.buckets)) + self.replace(1, CwDecoder(sampleRate, 0, self.baudRate))