joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set parameters for psk63 mode

Browse Source
This commit is contained in:
Jakob Ketterl 2020-01-13 20:10:14 +01:00
parent c3d89bd4bf
commit 758b15e887
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
csdr/csdr.py
View File

@ -225,7 +225,7 @@ class dsp(object):
if self.fft_compression == "adpcm": if self.fft_compression == "adpcm":
chain += ["csdr compress_fft_adpcm_f_u8 {secondary_fft_size}"] chain += ["csdr compress_fft_adpcm_f_u8 {secondary_fft_size}"]
return chain return chain
elif which == "bpsk31": elif which == "bpsk31" or which == "bpsk63":
return chain + [ return chain + [
"csdr shift_addition_cc --fifo {secondary_shift_pipe}", "csdr shift_addition_cc --fifo {secondary_shift_pipe}",
"csdr bandpass_fir_fft_cc -{secondary_bpf_cutoff} {secondary_bpf_cutoff} {secondary_bpf_cutoff}", "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): def secondary_bpf_cutoff(self):
if self.secondary_demodulator == "bpsk31": if self.secondary_demodulator == "bpsk31":
return 31.25 / self.if_samp_rate() return 31.25 / self.if_samp_rate()
elif self.secondary_demodulator == "bpsk63":
return 62.5 / self.if_samp_rate()
return 0 return 0
def secondary_bpf_transition_bw(self): def secondary_bpf_transition_bw(self):
if self.secondary_demodulator == "bpsk31": if self.secondary_demodulator == "bpsk31":
return 31.25 / self.if_samp_rate() return 31.25 / self.if_samp_rate()
elif self.secondary_demodulator == "bpsk63":
return 62.5 / self.if_samp_rate()
return 0 return 0
def secondary_samples_per_bits(self): def secondary_samples_per_bits(self):
if self.secondary_demodulator == "bpsk31": if self.secondary_demodulator == "bpsk31":
return int(round(self.if_samp_rate() / 31.25)) & ~3 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 return 0
def secondary_bw(self): def secondary_bw(self):
if self.secondary_demodulator == "bpsk31": if self.secondary_demodulator == "bpsk31":
return 31.25 return 31.25
elif self.secondary_demodulator == "bpsk63":
return 62.5
def start_secondary_demodulator(self): def start_secondary_demodulator(self):
if not self.secondary_demodulator: if not self.secondary_demodulator:

1
htdocs/index.html
View File

@ -185,6 +185,7 @@
<select id="openwebrx-secondary-demod-listbox" onchange="secondary_demod_listbox_changed();"> <select id="openwebrx-secondary-demod-listbox" onchange="secondary_demod_listbox_changed();">
<option value="none"></option> <option value="none"></option>
<option value="bpsk31">BPSK31</option> <option value="bpsk31">BPSK31</option>
<option value="bpsk63">BPSK63</option>
<option value="ft8" data-feature="wsjt-x">FT8</option> <option value="ft8" data-feature="wsjt-x">FT8</option>
<option value="wspr" data-feature="wsjt-x">WSPR</option> <option value="wspr" data-feature="wsjt-x">WSPR</option>
<option value="jt65" data-feature="wsjt-x">JT65</option> <option value="jt65" data-feature="wsjt-x">JT65</option>

1
htdocs/openwebrx.js
View File

@ -1981,6 +1981,7 @@ function demodulator_digital_replace_last() {
function demodulator_digital_replace(subtype) { function demodulator_digital_replace(subtype) {
switch (subtype) { switch (subtype) {
case "bpsk31": case "bpsk31":
case "bpsk63":
case "rtty": case "rtty":
case "ft8": case "ft8":
case "jt65": case "jt65":