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

use new fft

Browse Source
This commit is contained in:
Jakob Ketterl 2021-06-30 21:23:25 +02:00
parent b3cdc568d9
commit 8797615720
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
csdr/__init__.py
View File

@ -109,7 +109,7 @@ class Dsp(DirewolfConfigSubscriber):
chain = ["nc -v 127.0.0.1 {nc_port}"] chain = ["nc -v 127.0.0.1 {nc_port}"]
if which == "fft": if which == "fft":
chain += [ chain += [
"csdr fft_cc {fft_size} {fft_block_size}", "csdr++ fft {fft_size} {fft_block_size}",
"csdr logpower_cf -70" "csdr logpower_cf -70"
if self.fft_averages == 0 if self.fft_averages == 0
else "csdr logaveragepower_cf -70 {fft_size} {fft_averages}", else "csdr logaveragepower_cf -70 {fft_size} {fft_averages}",
@ -246,7 +246,7 @@ class Dsp(DirewolfConfigSubscriber):
chain = ["cat {input_pipe}"] chain = ["cat {input_pipe}"]
if which == "fft": if which == "fft":
chain += [ chain += [
"csdr fft_cc {secondary_fft_input_size} {secondary_fft_block_size}", "csdr++ fft {secondary_fft_input_size} {secondary_fft_block_size}",
"csdr logpower_cf -70" "csdr logpower_cf -70"
if self.fft_averages == 0 if self.fft_averages == 0
else "csdr logaveragepower_cf -70 {secondary_fft_size} {fft_averages}", else "csdr logaveragepower_cf -70 {secondary_fft_size} {fft_averages}",
@ -290,8 +290,8 @@ class Dsp(DirewolfConfigSubscriber):
def secondary_fft_block_size(self): def secondary_fft_block_size(self):
base = (self.samp_rate / self.decimation) / (self.fft_fps * 2) base = (self.samp_rate / self.decimation) / (self.fft_fps * 2)
if self.fft_averages == 0: if self.fft_averages == 0:
return base return round(base)
return base / self.fft_averages return round(base / self.fft_averages)
def secondary_decimation(self): def secondary_decimation(self):
return 1 # currently unused return 1 # currently unused
@ -594,9 +594,9 @@ class Dsp(DirewolfConfigSubscriber):
def fft_block_size(self): def fft_block_size(self):
if self.fft_averages == 0: if self.fft_averages == 0:
return self.samp_rate / self.fft_fps return round(self.samp_rate / self.fft_fps)
else: else:
return self.samp_rate / self.fft_fps / self.fft_averages return round(self.samp_rate / self.fft_fps / self.fft_averages)
def set_offset_freq(self, offset_freq): def set_offset_freq(self, offset_freq):
if offset_freq is None: if offset_freq is None: