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

Optimized Multimon decoding, switched to empty underlying decoders.

This commit is contained in:
Marat Fayzullin 2023-09-09 21:22:15 -04:00
parent 2eae46d54c
commit 7b81c36e2d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
csdr/chain/toolbox.py
View File

@ -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,

17
owrx/modes.py
View File

@ -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
),
]