Adding SITOR.

csdr/chain/digimodes.py

@@ -3,7 +3,7 @@ from csdr.module.msk144 import Msk144Module, ParserAdapter
 from owrx.audio.chopper import AudioChopper, AudioChopperParser
 from owrx.aprs.kiss import KissDeframer
 from owrx.aprs import Ax25Parser, AprsParser
-from pycsdr.modules import Convert, FmDemod, Agc, TimingRecovery, DBPskDecoder, VaricodeDecoder, RttyDecoder, BaudotDecoder, Lowpass, MFRttyDecoder, CwDecoder, SstvDecoder, FaxDecoder, Shift
+from pycsdr.modules import Convert, FmDemod, Agc, TimingRecovery, DBPskDecoder, VaricodeDecoder, RttyDecoder, BaudotDecoder, Lowpass, MFRttyDecoder, CwDecoder, SstvDecoder, FaxDecoder, SitorDecoder, Ccir476Decoder, Shift
 from pycsdr.types import Format
 from owrx.aprs.direwolf import DirewolfModule
 from owrx.sstv import SstvParser
@@ -217,3 +217,36 @@ class FaxDemodulator(ServiceDemodulator, DialFrequencyReceiver):
     def setDialFrequency(self, frequency: int) -> None:
         self.parser.setDialFrequency(frequency)
 
+
+class SitorBDemodulator(SecondaryDemodulator, SecondarySelectorChain):
+    def __init__(self, baudRate, bandWidth, invert=False):
+        self.baudRate = baudRate
+        self.bandWidth = bandWidth
+        self.invert = invert
+        # this is an assumption, we will adjust in setSampleRate
+        self.sampleRate = 12000
+        secondary_samples_per_bit = int(round(self.sampleRate / self.baudRate))
+        cutoff = self.baudRate / self.sampleRate
+        loop_gain = self.sampleRate / self.getBandwidth() / 5
+        workers = [
+            Agc(Format.COMPLEX_FLOAT),
+            FmDemod(),
+            Lowpass(Format.FLOAT, cutoff),
+            TimingRecovery(Format.FLOAT, secondary_samples_per_bit, loop_gain, 10),
+            SitorDecoder(jitter=1, invert=invert),
+            Ccir476Decoder(fec=True, allowErrors=16),
+        ]
+        super().__init__(workers)
+
+    def getBandwidth(self) -> float:
+        return self.bandWidth
+
+    def setSampleRate(self, sampleRate: int) -> None:
+        if sampleRate == self.sampleRate:
+            return
+        self.sampleRate = sampleRate
+        secondary_samples_per_bit = int(round(self.sampleRate / self.baudRate))
+        cutoff = self.baudRate / self.sampleRate
+        loop_gain = self.sampleRate / self.getBandwidth() / 5
+        self.replace(2, Lowpass(Format.FLOAT, cutoff))
+        self.replace(3, TimingRecovery(Format.FLOAT, secondary_samples_per_bit, loop_gain, 10))

owrx/dsp.py

@@ -660,6 +660,9 @@ class DspManager(SdrSourceEventClient, ClientDemodulatorSecondaryDspEventClient)
         elif mod == "rtty85":
             from csdr.chain.digimodes import RttyDemodulator
             return RttyDemodulator(50, 85, invert=True)
+        elif mod == "sitorb":
+            from csdr.chain.digimodes import SitorBDemodulator
+            return SitorBDemodulator(100, 170)
         elif mod == "cwdecoder":
             from csdr.chain.digimodes import CwDemodulator
             return CwDemodulator(75.0)

owrx/modes.py

@@ -138,6 +138,7 @@ class Modes(object):
         DigitalMode("rtty170", "RTTY-170 (45)", underlying=["usb", "lsb"]),
         DigitalMode("rtty450", "RTTY-450 (50N)", underlying=["usb", "lsb"]),
         DigitalMode("rtty85", "RTTY-85 (50N)", underlying=["usb", "lsb"]),
+        DigitalMode("sitorb", "SITOR-B", underlying=["usb", "lsb"]),
         WsjtMode("ft8", "FT8"),
         WsjtMode("ft4", "FT4"),
         WsjtMode("jt65", "JT65"),