ua1zbe
/
openwebrxplus
mirror of https://github.com/luarvique/openwebrx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactoring SITORB / CCIR476.

This commit is contained in:
Marat Fayzullin 2023-12-14 23:46:51 -05:00
parent 0a115261d5
commit a66de19cc2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
csdr/chain/digimodes.py
View File

@ -219,7 +219,7 @@ class FaxDemodulator(ServiceDemodulator, DialFrequencyReceiver):
class SitorBDemodulator(SecondaryDemodulator, SecondarySelectorChain): class SitorBDemodulator(SecondaryDemodulator, SecondarySelectorChain):
def __init__(self, baudRate, bandWidth, invert=False): def __init__(self, baudRate=100, bandWidth=170, invert=False):
self.baudRate = baudRate self.baudRate = baudRate
self.bandWidth = bandWidth self.bandWidth = bandWidth
self.invert = invert self.invert = invert
@ -233,8 +233,8 @@ class SitorBDemodulator(SecondaryDemodulator, SecondarySelectorChain):
FmDemod(), FmDemod(),
Lowpass(Format.FLOAT, cutoff), Lowpass(Format.FLOAT, cutoff),
TimingRecovery(Format.FLOAT, secondary_samples_per_bit, loop_gain, 10), TimingRecovery(Format.FLOAT, secondary_samples_per_bit, loop_gain, 10),
SitorDecoder(jitter=1, invert=invert), SitorDecoder(jitter=1, allowErrors=16, invert=invert),
Ccir476Decoder(fec=True, allowErrors=16), Ccir476Decoder(),
] ]
super().__init__(workers) super().__init__(workers)
@ -253,7 +253,7 @@ class SitorBDemodulator(SecondaryDemodulator, SecondarySelectorChain):
class DscDemodulator(SecondaryDemodulator, SecondarySelectorChain): class DscDemodulator(SecondaryDemodulator, SecondarySelectorChain):
def __init__(self, baudRate, bandWidth, invert=False): def __init__(self, baudRate=100, bandWidth=170, invert=False):
self.baudRate = baudRate self.baudRate = baudRate
self.bandWidth = bandWidth self.bandWidth = bandWidth
self.invert = invert self.invert = invert

4
owrx/dsp.py
View File

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