From 758b15e8875f901b97646bb7bf23f38504b18450 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Mon, 13 Jan 2020 20:10:14 +0100 Subject: [PATCH 1/3] set parameters for psk63 mode --- csdr/csdr.py | 10 +++++++++- htdocs/index.html | 1 + htdocs/openwebrx.js | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/csdr/csdr.py b/csdr/csdr.py index f79bcd7..d6cfc11 100644 --- a/csdr/csdr.py +++ b/csdr/csdr.py @@ -225,7 +225,7 @@ class dsp(object): if self.fft_compression == "adpcm": chain += ["csdr compress_fft_adpcm_f_u8 {secondary_fft_size}"] return chain - elif which == "bpsk31": + elif which == "bpsk31" or which == "bpsk63": return chain + [ "csdr shift_addition_cc --fifo {secondary_shift_pipe}", "csdr bandpass_fir_fft_cc -{secondary_bpf_cutoff} {secondary_bpf_cutoff} {secondary_bpf_cutoff}", @@ -268,21 +268,29 @@ class dsp(object): def secondary_bpf_cutoff(self): if self.secondary_demodulator == "bpsk31": return 31.25 / self.if_samp_rate() + elif self.secondary_demodulator == "bpsk63": + return 62.5 / self.if_samp_rate() return 0 def secondary_bpf_transition_bw(self): if self.secondary_demodulator == "bpsk31": return 31.25 / self.if_samp_rate() + elif self.secondary_demodulator == "bpsk63": + return 62.5 / self.if_samp_rate() return 0 def secondary_samples_per_bits(self): if self.secondary_demodulator == "bpsk31": return int(round(self.if_samp_rate() / 31.25)) & ~3 + elif self.secondary_demodulator == "bpsk63": + return int(round(self.if_samp_rate() / 62.5)) & ~3 return 0 def secondary_bw(self): if self.secondary_demodulator == "bpsk31": return 31.25 + elif self.secondary_demodulator == "bpsk63": + return 62.5 def start_secondary_demodulator(self): if not self.secondary_demodulator: diff --git a/htdocs/index.html b/htdocs/index.html index 4d63278..f18f659 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -185,6 +185,7 @@