From 4a68c9d3da1e3719d9323feff3cba8df52fc995e Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Fri, 2 Jul 2021 19:15:10 +0200 Subject: [PATCH] use new csdr++ firdecimate --- csdr/__init__.py | 2 +- owrx/source/resampler.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/csdr/__init__.py b/csdr/__init__.py index 2ac0d7a..166a7e2 100644 --- a/csdr/__init__.py +++ b/csdr/__init__.py @@ -120,7 +120,7 @@ class Dsp(DirewolfConfigSubscriber): return chain chain += ["csdr++ shift --fifo {shift_pipe}"] if self.decimation > 1: - chain += ["csdr fir_decimate_cc {decimation} {ddc_transition_bw} HAMMING"] + chain += ["csdr++ firdecimate {decimation} {ddc_transition_bw} --window hamming"] chain += ["csdr bandpass_fir_fft_cc --fifo {bpf_pipe} {bpf_transition_bw} HAMMING"] if self.output.supports_type("smeter"): chain += [ diff --git a/owrx/source/resampler.py b/owrx/source/resampler.py index 141a721..9fb6aea 100644 --- a/owrx/source/resampler.py +++ b/owrx/source/resampler.py @@ -24,7 +24,7 @@ class Resampler(DirectSource): return [ "nc -v 127.0.0.1 {nc_port}".format(nc_port=self.sdr.getPort()), "csdr++ shift {shift}".format(shift=self.shift), - "csdr fir_decimate_cc {decimation} {ddc_transition_bw} HAMMING".format( + "csdr++ firdecimate {decimation} {ddc_transition_bw} --window hamming".format( decimation=self.decimation, ddc_transition_bw=self.transition_bw ), ] + self.getNmuxCommand()