Removing bandpass filters from ADSB and ISM, making ISM 1.2Msps.

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**

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

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 = [

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 <luarvique@gmail.com>  Fri, 16 Feb 2024 16:12:00 +0000

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;

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,