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

use new csdr++ squelch and power; disable squelch when unused

Browse Source
This commit is contained in:
Jakob Ketterl 2021-07-06 00:05:24 +02:00
parent f0933472c9
commit 6cce1ccdaa
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
csdr/__init__.py
View File

@ -123,9 +123,10 @@ class Dsp(DirewolfConfigSubscriber):
chain += ["csdr++ firdecimate {decimation} {ddc_transition_bw} --window hamming"] chain += ["csdr++ firdecimate {decimation} {ddc_transition_bw} --window hamming"]
chain += ["csdr bandpass_fir_fft_cc --fifo {bpf_pipe} {bpf_transition_bw} HAMMING"] chain += ["csdr bandpass_fir_fft_cc --fifo {bpf_pipe} {bpf_transition_bw} HAMMING"]
if self.output.supports_type("smeter"): if self.output.supports_type("smeter"):
chain += [ if self.isSquelchActive():
"csdr squelch_and_smeter_cc --fifo {squelch_pipe} --outfifo {smeter_pipe} 5 {smeter_report_every}" chain += ["csdr++ squelch --fifo {squelch_pipe} --outfifo {smeter_pipe} 5 {smeter_report_every}"]
] else:
chain += ["csdr++ power --outfifo {smeter_pipe} 5 {smeter_report_every}"]
if self.secondary_demodulator: if self.secondary_demodulator:
if self.output.supports_type("secondary_fft"): if self.output.supports_type("secondary_fft"):
chain += ["csdr tee {iqtee_pipe}"] chain += ["csdr tee {iqtee_pipe}"]
@ -629,15 +630,14 @@ class Dsp(DirewolfConfigSubscriber):
def convertToLinear(self, db): def convertToLinear(self, db):
return float(math.pow(10, db / 10)) return float(math.pow(10, db / 10))
def isSquelchActive(self):
return not self.isDigitalVoice() and not self.isPacket() and not self.isPocsag() and not self.isFreeDV()
def set_squelch_level(self, squelch_level): def set_squelch_level(self, squelch_level):
self.squelch_level = squelch_level self.squelch_level = squelch_level
# no squelch required on digital voice modes # no squelch required on digital voice modes
actual_squelch = ( actual_squelch = self.squelch_level if self.isSquelchActive() else -150
-150 if self.running and "squelch_pipe" in self.pipes:
if self.isDigitalVoice() or self.isPacket() or self.isPocsag() or self.isFreeDV()
else self.squelch_level
)
if self.running:
self.pipes["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch))) self.pipes["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
def set_unvoiced_quality(self, q): def set_unvoiced_quality(self, q):