diff --git a/csdr/chain/toolbox.py b/csdr/chain/toolbox.py index d6d57f29..d92d7438 100644 --- a/csdr/chain/toolbox.py +++ b/csdr/chain/toolbox.py @@ -31,12 +31,11 @@ class IsmDemodulator(ServiceDemodulator, DialFrequencyReceiver): class MultimonDemodulator(ServiceDemodulator, DialFrequencyReceiver): def __init__(self, decoders: list[str], parser, withSquelch: bool = False): - self.sampleRate = 24000 + self.sampleRate = 22050 self.squelch = None self.parser = parser workers = [ FmDemod(), - AudioResampler(self.sampleRate, 22050), Convert(Format.FLOAT, Format.SHORT), MultimonModule(decoders), self.parser, diff --git a/owrx/modes.py b/owrx/modes.py index bbb3c9db..76084d05 100644 --- a/owrx/modes.py +++ b/owrx/modes.py @@ -179,7 +179,7 @@ class Modes(object): DigitalMode( "page", "Page", - underlying=["nfm"], + underlying=["empty"], bandpass=Bandpass(-6000, 6000), requirements=["page"], service=True, @@ -205,21 +205,21 @@ class Modes(object): DigitalMode( "selcall", "SelCall", - underlying=["nfm"], + underlying=["empty"], requirements=["selcall"], squelch=True ), DigitalMode( "zvei", "Zvei", - underlying=["nfm"], + underlying=["empty"], requirements=["selcall"], squelch=True ), DigitalMode( "ism", "ISM", - underlying=["nfm"], + underlying=["empty"], bandpass=Bandpass(-125000, 125000), requirements=["ism"], service=True, @@ -228,7 +228,7 @@ class Modes(object): DigitalMode( "hfdl", "HFDL", - underlying=["usb"], + underlying=["empty"], bandpass=Bandpass(0, 3000), requirements=["hfdl"], service=True, @@ -237,7 +237,7 @@ class Modes(object): DigitalMode( "vdl2", "VDL2", - underlying=["nfm"], + underlying=["empty"], bandpass=Bandpass(-12500, 12500), requirements=["vdl2"], service=True, @@ -255,11 +255,12 @@ class Modes(object): DigitalMode( "adsb", "ADSB", - underlying=["nfm"], + underlying=["empty"], bandpass=Bandpass(-1200000, 1200000), requirements=["adsb"], service=True, - squelch=False + squelch=False, + secondaryFft=False ), ]