From 6d525384228965bac9f843238612a668a5696308 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Tue, 13 Feb 2024 00:48:23 +0100 Subject: [PATCH] fix DAB coarse sync problems caused by bandpass --- csdr/chain/dablin.py | 1 - docker/scripts/install-owrx-tools.sh | 4 ++-- htdocs/lib/Demodulator.js | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/csdr/chain/dablin.py b/csdr/chain/dablin.py index a322443d..c5a32116 100644 --- a/csdr/chain/dablin.py +++ b/csdr/chain/dablin.py @@ -33,7 +33,6 @@ class MetaProcessor(PickleModule): self._nudgeShift(random() * -self.coarse_increment) elif key == "fine_frequency_shift": if abs(value) > 10: - logger.debug("ffs: %f", value) self._nudgeShift(self.fine_increment * value) else: # pass through everything else diff --git a/docker/scripts/install-owrx-tools.sh b/docker/scripts/install-owrx-tools.sh index bc2628c0..6f1435cd 100755 --- a/docker/scripts/install-owrx-tools.sh +++ b/docker/scripts/install-owrx-tools.sh @@ -44,8 +44,8 @@ cd .. rm -rf pycsdr git clone https://github.com/jketterl/csdr-eti.git -# latest develop as of 2024-02-12 (memory leak fix) -cmakebuild csdr-eti 3f6134327c2a00840e54f9ce5d0e0f0899a2cf8c +# latest develop as of 2024-02-13 (coarse frequency shift fix) +cmakebuild csdr-eti 0a14f9dded466be227ade4d11fe1419169a9649b git clone https://github.com/jketterl/pycsdr-eti.git cd pycsdr-eti diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js index 4d7ebcba..8187b39c 100644 --- a/htdocs/lib/Demodulator.js +++ b/htdocs/lib/Demodulator.js @@ -234,8 +234,8 @@ function Demodulator(offset_frequency, modulation) { this.state = {}; this.secondary_demod = false; var mode = Modes.findByModulation(modulation); - this.low_cut = mode && mode.bandpass && mode.bandpass.low_cut; - this.high_cut = mode && mode.bandpass && mode.bandpass.high_cut; + this.low_cut = mode && mode.bandpass && mode.bandpass.low_cut || null; + this.high_cut = mode && mode.bandpass && mode.bandpass.high_cut || null; this.ifRate = mode && mode.ifRate; this.listeners = { "frequencychange": [],