From 473498456c2488bdf9603532bd2c64e136fe7e56 Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Sat, 17 Feb 2024 13:57:12 -0500 Subject: [PATCH] Removing bandpass filters from ADSB and ISM, making ISM 1.2Msps. --- CHANGELOG.md | 4 +++- csdr/chain/toolbox.py | 2 +- csdr/module/toolbox.py | 2 +- debian/changelog | 4 +++- htdocs/lib/Demodulator.js | 2 +- owrx/modes.py | 8 +++++--- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 67bf6729..d4ac9285 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ **1.2.49** -- Optimizations to DAB processing made by Jakob. +- Added optimizations to DAB processing made by Jakob. +- Removed bandpass filters from ADS-B and ISM modes. +- Increased ISM bandwidth to 1.2Msps. - Coloring ground-to-air messages black. **1.2.48** diff --git a/csdr/chain/toolbox.py b/csdr/chain/toolbox.py index 41e6294c..cf6fd225 100644 --- a/csdr/chain/toolbox.py +++ b/csdr/chain/toolbox.py @@ -9,7 +9,7 @@ import os class IsmDemodulator(ServiceDemodulator, DialFrequencyReceiver): def __init__(self, service: bool = False): - self.sampleRate = 250000 + self.sampleRate = 1200000 self.parser = IsmParser(service=service) workers = [ Agc(Format.COMPLEX_FLOAT), diff --git a/csdr/module/toolbox.py b/csdr/module/toolbox.py index 1fbd922f..4e1e91f6 100644 --- a/csdr/module/toolbox.py +++ b/csdr/module/toolbox.py @@ -5,7 +5,7 @@ from owrx.config import Config import os class Rtl433Module(ExecModule): - def __init__(self, sampleRate: int = 250000, jsonOutput: bool = False): + def __init__(self, sampleRate: int = 1200000, jsonOutput: bool = False): self.sampleRate = sampleRate self.jsonOutput = jsonOutput cmd = [ diff --git a/debian/changelog b/debian/changelog index ffba4057..699c18f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ openwebrx (1.2.49) bullseye jammy; urgency=low - * Optimizations to DAB processing made by Jakob. + * Added optimizations to DAB processing made by Jakob. + * Removed bandpass filters from ADS-B and ISM modes. + * Increased ISM bandwidth to 1.2Msps. * Coloring ground-to-air messages black. -- Marat Fayzullin Fri, 16 Feb 2024 16:12:00 +0000 diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js index 2c4a5429..660d90f2 100644 --- a/htdocs/lib/Demodulator.js +++ b/htdocs/lib/Demodulator.js @@ -5,7 +5,7 @@ function Filter(demodulator) { Filter.prototype.getLimits = function() { var max_bw; - if (['pocsag', 'flex', 'packet', 'ais'].indexOf(this.demodulator.get_secondary_demod()) >= 0) { + if (['pocsag', 'page', 'packet', 'ais', 'acars'].indexOf(this.demodulator.get_secondary_demod()) >= 0) { max_bw = 12500; } else if (['dmr', 'dstar', 'nxdn', 'ysf', 'm17'].indexOf(this.demodulator.get_modulation()) >= 0) { max_bw = 6250; diff --git a/owrx/modes.py b/owrx/modes.py index 539cf92b..879b1e5f 100644 --- a/owrx/modes.py +++ b/owrx/modes.py @@ -135,7 +135,7 @@ class Modes(object): "freedv", "FreeDV", bandpass=Bandpass(300, 3000), requirements=["digital_voice_freedv"], squelch=False ), AnalogMode("drm", "DRM", bandpass=Bandpass(-5000, 5000), requirements=["drm"], squelch=False), - AnalogMode("dab", "DAB", bandpass=None, ifRate=2.048e6, requirements=["dab"], squelch=False), + AnalogMode("dab", "DAB", bandpass=None, ifRate=2048000, requirements=["dab"], squelch=False), DigitalMode("bpsk31", "BPSK31", underlying=["usb"]), DigitalMode("bpsk63", "BPSK63", underlying=["usb"]), DigitalMode("rtty170", "RTTY-170 (45)", underlying=["usb", "lsb"]), @@ -227,7 +227,8 @@ class Modes(object): "ism", "ISM", underlying=["empty"], - bandpass=Bandpass(-125000, 125000), + bandpass=None, + ifRate=1200000, requirements=["ism"], service=True, squelch=False @@ -263,7 +264,8 @@ class Modes(object): "adsb", "ADSB", underlying=["empty"], - bandpass=Bandpass(-1200000, 1200000), + bandpass=None, + ifRate=2400000, requirements=["adsb"], service=True, squelch=False,