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

use new agc in all the spots

Browse Source
This commit is contained in:
Jakob Ketterl 2021-06-28 13:01:26 +02:00
parent 6b4432982e
commit 22f0d90896
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
csdr/__init__.py
View File

@ -59,7 +59,6 @@ class Dsp(DirewolfConfigSubscriber):
self.fft_compression = "none" self.fft_compression = "none"
self.demodulator = "nfm" self.demodulator = "nfm"
self.name = "csdr" self.name = "csdr"
self.base_bufsize = 512
self.decimation = None self.decimation = None
self.last_decimation = None self.last_decimation = None
self.nc_port = None self.nc_port = None
@ -146,7 +145,7 @@ class Dsp(DirewolfConfigSubscriber):
chain += last_decimation_block chain += last_decimation_block
chain += [ chain += [
"csdr deemphasis_nfm_ff {audio_rate}", "csdr deemphasis_nfm_ff {audio_rate}",
"csdr agc_ff --profile slow --max 3", "csdr++ agc --format float --profile slow --max 3",
] ]
if self.get_audio_rate() != self.get_output_rate(): if self.get_audio_rate() != self.get_output_rate():
chain += [ chain += [
@ -205,7 +204,7 @@ class Dsp(DirewolfConfigSubscriber):
chain += ["csdr amdemod_cf", "csdr fastdcblock_ff"] chain += ["csdr amdemod_cf", "csdr fastdcblock_ff"]
chain += last_decimation_block chain += last_decimation_block
chain += [ chain += [
"csdr agc_ff --profile slow --initial 200", "csdr++ agc --format float --profile slow --initial 200",
"csdr convert_f_s16", "csdr convert_f_s16",
] ]
elif self.isFreeDV(which): elif self.isFreeDV(which):
@ -765,7 +764,6 @@ class Dsp(DirewolfConfigSubscriber):
bpf_transition_bw=float(self.bpf_transition_bw) / self.if_samp_rate(), bpf_transition_bw=float(self.bpf_transition_bw) / self.if_samp_rate(),
ddc_transition_bw=self.ddc_transition_bw(), ddc_transition_bw=self.ddc_transition_bw(),
flowcontrol=int(self.samp_rate * 2), flowcontrol=int(self.samp_rate * 2),
start_bufsize=self.base_bufsize * self.decimation,
nc_port=self.nc_port, nc_port=self.nc_port,
output_rate=self.get_output_rate(), output_rate=self.get_output_rate(),
smeter_report_every=int(self.if_samp_rate() / 6000), smeter_report_every=int(self.if_samp_rate() / 6000),
@ -778,7 +776,7 @@ class Dsp(DirewolfConfigSubscriber):
logger.debug("Command = %s", command) logger.debug("Command = %s", command)
out = subprocess.PIPE if self.output.supports_type("audio") else subprocess.DEVNULL out = subprocess.PIPE if self.output.supports_type("audio") else subprocess.DEVNULL
self.process = subprocess.Popen(command, stdout=out, shell=True, start_new_session=True) self.process = subprocess.Popen(command, stdout=out, shell=True, start_new_session=True, bufsize=128)
def watch_thread(): def watch_thread():
rc = self.process.wait() rc = self.process.wait()