From 5b992409440ceebffb9a8851e52c9af116b5df80 Mon Sep 17 00:00:00 2001 From: ha7ilm Date: Sun, 7 May 2017 12:03:18 +0200 Subject: [PATCH] selecting BPSK31 now does not screw up main waterfall --- csdr.py | 6 +++--- htdocs/openwebrx.js | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/csdr.py b/csdr.py index 7ff31bc..7c8b39c 100755 --- a/csdr.py +++ b/csdr.py @@ -77,8 +77,8 @@ class dsp: return fft_chain_base chain_begin=any_chain_base+"csdr shift_addition_cc --fifo {shift_pipe} | csdr fir_decimate_cc {decimation} {ddc_transition_bw} HAMMING | csdr bandpass_fir_fft_cc --fifo {bpf_pipe} {bpf_transition_bw} HAMMING | csdr squelch_and_smeter_cc --fifo {squelch_pipe} --outfifo {smeter_pipe} 5 1 | " if self.secondary_demodulator: - chain_begin+="tee {iqtee_pipe} | " - chain_begin+="tee {iqtee2_pipe} | " #TODO digimodes, and yes, tee sometimes hangs everything + chain_begin+="csdr tee {iqtee_pipe} | " + chain_begin+="csdr tee {iqtee2_pipe} | " #TODO digimodes, and yes, tee sometimes hangs everything chain_end = "" if self.audio_compression=="adpcm": chain_end = " | csdr encode_ima_adpcm_i16_u8" @@ -115,7 +115,7 @@ class dsp: self.secondary_demodulator = what def secondary_fft_block_size(self): - return (self.samp_rate/self.decimation)/(self.fft_fps) #*2 is there because we do FFT on real signal here + return (self.samp_rate/self.decimation)/(self.fft_fps*2) #*2 is there because we do FFT on real signal here def secondary_decimation(self): return 1 #currently unused diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js index 16b020c..cebedf0 100644 --- a/htdocs/openwebrx.js +++ b/htdocs/openwebrx.js @@ -2240,7 +2240,7 @@ function secondary_demod_create_canvas() new_canvas.style.width=$(secondary_demod_canvas_container).width()+"px"; new_canvas.style.height=$(secondary_demod_canvas_container).height()+"px"; console.log(new_canvas.width, new_canvas.height, new_canvas.style.width, new_canvas.style.height); - canvas_actual_line=new_canvas.height-1; + secondary_demod_current_canvas_actual_line=new_canvas.height-1; $(secondary_demod_canvas_container).append(new_canvas); return new_canvas; } @@ -2302,7 +2302,6 @@ function secondary_demod_stop() ws.send("SET secondary_mod=off"); secondary_demod = false; secondary_demod_waterfall_queue = []; - secondary_demod_remove_canvases(); } function secondary_demod_waterfall_add_queue(x)