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

now the sequence doesn't matter any more

Browse Source
This commit is contained in:
Jakob Ketterl 2020-02-28 16:55:50 +01:00
parent 10523dbbd7
commit 8abfe059b7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
csdr/csdr.py
View File

@ -776,14 +776,15 @@ class dsp(object):
self.start_secondary_demodulator() self.start_secondary_demodulator()
# send initial config through the pipes # send initial config through the pipes
# the sequencing here is essential; the pipes must be opened in the order that they appear in the command,
# otherwise deadlocks will occur.
if self.has_pipe("bpf_pipe"): if self.has_pipe("bpf_pipe"):
self.set_bpf(self.low_cut, self.high_cut) self.set_bpf(self.low_cut, self.high_cut)
if self.has_pipe("shift_pipe"): if self.has_pipe("shift_pipe"):
self.set_offset_freq(self.offset_freq) self.set_offset_freq(self.offset_freq)
if self.has_pipe("squelch_pipe"): if self.has_pipe("squelch_pipe"):
self.set_squelch_level(self.squelch_level) self.set_squelch_level(self.squelch_level)
if self.has_pipe("dmr_control_pipe"):
self.set_dmr_filter(3)
if self.has_pipe("smeter_pipe"): if self.has_pipe("smeter_pipe"):
def read_smeter(): def read_smeter():
raw = self.pipes["smeter_pipe"].readline() raw = self.pipes["smeter_pipe"].readline()
@ -802,8 +803,6 @@ class dsp(object):
return raw.rstrip("\n") return raw.rstrip("\n")
self.output.send_output("meta", read_meta) self.output.send_output("meta", read_meta)
if self.has_pipe("dmr_control_pipe"):
self.set_dmr_filter(3)
if self.csdr_dynamic_bufsize: if self.csdr_dynamic_bufsize:
self.process.stdout.read(8) # dummy read to skip bufsize & preamble self.process.stdout.read(8) # dummy read to skip bufsize & preamble