From 96f268915fc82c9d51dcf15500378ba28ef9caa0 Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Sun, 18 Jun 2023 13:29:28 -0400 Subject: [PATCH] Extended ISM bandwidth to 250kHz, requires newer CSDR. --- csdr/chain/toolbox.py | 2 +- csdr/module/toolbox.py | 7 +------ debian/changelog | 6 +++++- debian/control | 2 +- owrx/modes.py | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/csdr/chain/toolbox.py b/csdr/chain/toolbox.py index 7a95833a..524d047c 100644 --- a/csdr/chain/toolbox.py +++ b/csdr/chain/toolbox.py @@ -7,7 +7,7 @@ from owrx.toolbox import TextParser, PageParser, SelCallParser, IsmParser, HfdlP class IsmDemodulator(ServiceDemodulator, DialFrequencyReceiver): def __init__(self, service: bool = False): - self.sampleRate = 48000 + self.sampleRate = 250000 self.parser = IsmParser(service=service) workers = [ Agc(Format.COMPLEX_FLOAT), diff --git a/csdr/module/toolbox.py b/csdr/module/toolbox.py index 2cf28609..dc370b70 100644 --- a/csdr/module/toolbox.py +++ b/csdr/module/toolbox.py @@ -3,7 +3,7 @@ from csdr.module import PopenModule class Rtl433Module(PopenModule): - def __init__(self, sampleRate: int = 48000, jsonOutput: bool = False): + def __init__(self, sampleRate: int = 250000, jsonOutput: bool = False): self.sampleRate = sampleRate self.jsonOutput = jsonOutput super().__init__() @@ -12,11 +12,6 @@ class Rtl433Module(PopenModule): return [ "rtl_433", "-r", "cs16:-", "-s", str(self.sampleRate), "-M", "time:utc", "-F", "json" if self.jsonOutput else "kv", -# These need 48kHz, 24kHz is not enough for them -# "-R", "-80", "-R", "-149", "-R", "-154", "-R", "-160", -# "-R", "-161", -# These need >48kHz bandwidth -# "-R", "-167", "-R", "-178", "-A", ] diff --git a/debian/changelog b/debian/changelog index 80c7a140..0df83f1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,15 @@ openwebrx (1.2.20) bullseye jammy; urgency=low + * Increased ISM mode bandwidth from 48kHz to 250kHz. * Added admin-defined receiver name (if any) to the window title. * Made scanner continue scan from the last active bookmark. + * Fixed CSDR crashing OWRX at >48kHz NFM deemphasis bandwidths. * Fixed Soapy extra settings being sent as individual values. * Fixed Settings icon getting cut off in Chrome on Android. * Fixed number input dialog shifting the UI on mobile devices. - * Fixed accidetal resize on mobile devices. + * Fixed accidental resize on mobile devices. + * Optimized CW decoder, RTTY, SSTV, FAX operation in CSDR. + * Now killing slave process if it does not quit in 3 seconds. * Added 8m amateur band. -- Marat Fayzullin Sat, 17 Jun 2023 16:12:00 +0000 diff --git a/debian/control b/debian/control index 4c6f94a3..c986a116 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Vcs-Git: https://github.com/luarvique/openwebrx.git Package: openwebrx Architecture: all -Depends: adduser, python3 (>= 3.5), python3-pkg-resources, owrx-connector (>= 0.6), soapysdr-tools, python3-csdr (>= 0.18.10), ${python3:Depends}, ${misc:Depends} +Depends: adduser, python3 (>= 3.5), python3-pkg-resources, owrx-connector (>= 0.6), soapysdr-tools, python3-csdr (>= 0.18.11), ${python3:Depends}, ${misc:Depends} Recommends: python3-digiham (>= 0.6), direwolf (>= 1.4), wsjtx, js8call, runds-connector (>= 0.2), hpsdrconnector, aprs-symbols, m17-demod, js8call, python3-js8py (>= 0.1), nmux (>= 0.18), codecserver (>= 0.1), msk144decoder, multimon-ng, rtl-433, imagemagick Description: multi-user web sdr Open source, multi-user SDR receiver with a web interface diff --git a/owrx/modes.py b/owrx/modes.py index 8cf149c7..106708d5 100644 --- a/owrx/modes.py +++ b/owrx/modes.py @@ -198,7 +198,7 @@ class Modes(object): "ism", "ISM", underlying=["nfm"], - bandpass=Bandpass(-24000, 24000), + bandpass=Bandpass(-125000, 125000), requirements=["ism"], service=True, squelch=False