diff --git a/csdr/chain/digimodes.py b/csdr/chain/digimodes.py index bac56c30..0e13e88c 100644 --- a/csdr/chain/digimodes.py +++ b/csdr/chain/digimodes.py @@ -114,16 +114,20 @@ class RttyDemodulator(SecondaryDemodulator, SecondarySelectorChain): self.replace(2, RttyDecoder(sampleRate, 550, int(self.targetWidth), self.baudRate, self.reverse)) -class SstvDemodulator(ServiceDemodulator): +class SstvDemodulator(ServiceDemodulator, DialFrequencyReceiver): def __init__(self, service: bool = False): + self.parser = SstvParser(service=service) self.sampleRate = 24000 workers = [ Agc(Format.COMPLEX_FLOAT), SstvDecoder(self.sampleRate), - SstvParser(service=service) + self.parser ] super().__init__(workers) def getFixedAudioRate(self) -> int: return self.sampleRate + def setDialFrequency(self, frequency: int) -> None: + self.parser.setDialFrequency(frequency) + diff --git a/owrx/sstv.py b/owrx/sstv.py index 8fc8930e..5bf57a82 100644 --- a/owrx/sstv.py +++ b/owrx/sstv.py @@ -218,11 +218,11 @@ class SstvParser(ThreadModule): } # Could not parse input data (yet) - if len(self.data)>1: - logger.debug("%s got %d bytes of data..." % ( - ("Service" if self.service else "Client"), - len(self.data) - )) +# if len(self.data)>1: +# logger.debug("%s got %d bytes of data..." % ( +# ("Service" if self.service else "Client"), +# len(self.data) +# )) return None except Exception as exptn: