summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnuradio-core/src/python/gnuradio/blks2impl/CMakeLists.txt1
-rwxr-xr-xgr-digital/examples/narrowband/tx_voice.py2
-rwxr-xr-xgr-digital/examples/ofdm/benchmark_rx.py2
-rw-r--r--gr-digital/python/cpm.py4
-rw-r--r--gr-fft/grc/fft_block_tree.xml5
-rw-r--r--gr-fft/grc/fft_logpwrfft_x.xml (renamed from grc/blocks/blks2_logpwrfft_x.xml)6
-rw-r--r--gr-fft/python/CMakeLists.txt1
-rw-r--r--gr-fft/python/__init__.py2
-rw-r--r--gr-fft/python/logpwrfft.py (renamed from gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py)18
-rw-r--r--gr-wxgui/src/python/fftsink_gl.py6
-rw-r--r--gr-wxgui/src/python/fftsink_nongl.py6
-rw-r--r--gr-wxgui/src/python/waterfallsink_gl.py6
-rw-r--r--gr-wxgui/src/python/waterfallsink_nongl.py6
-rw-r--r--grc/blocks/block_tree.xml1
14 files changed, 39 insertions, 27 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/CMakeLists.txt b/gnuradio-core/src/python/gnuradio/blks2impl/CMakeLists.txt
index 3b3c7a1536..b8ec6c88c4 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/CMakeLists.txt
+++ b/gnuradio-core/src/python/gnuradio/blks2impl/CMakeLists.txt
@@ -25,7 +25,6 @@ GR_PYTHON_INSTALL(FILES
filterbank.py
fm_demod.py
fm_emph.py
- logpwrfft.py
nbfm_rx.py
nbfm_tx.py
rational_resampler.py
diff --git a/gr-digital/examples/narrowband/tx_voice.py b/gr-digital/examples/narrowband/tx_voice.py
index 400ab7a587..1f968fa8a3 100755
--- a/gr-digital/examples/narrowband/tx_voice.py
+++ b/gr-digital/examples/narrowband/tx_voice.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, blks2, audio, uhd
+from gnuradio import gr, audio, uhd
from gnuradio import eng_notation
from gnuradio.eng_option import eng_option
from optparse import OptionParser
diff --git a/gr-digital/examples/ofdm/benchmark_rx.py b/gr-digital/examples/ofdm/benchmark_rx.py
index 57817c5018..f1b65276d0 100755
--- a/gr-digital/examples/ofdm/benchmark_rx.py
+++ b/gr-digital/examples/ofdm/benchmark_rx.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, blks2
+from gnuradio import gr
from gnuradio import eng_notation
from gnuradio.eng_option import eng_option
from optparse import OptionParser
diff --git a/gr-digital/python/cpm.py b/gr-digital/python/cpm.py
index f11832b626..eaefa194cf 100644
--- a/gr-digital/python/cpm.py
+++ b/gr-digital/python/cpm.py
@@ -24,7 +24,7 @@
# See gnuradio-examples/python/digital for examples
-from gnuradio import gr, blks2
+from gnuradio import gr, filter
from math import pi
import numpy
@@ -153,7 +153,7 @@ class cpm_mod(gr.hier_block2):
else:
raise TypeError, ("cpm_type must be an integer in {0,1,2,3}, is %r" % (cpm_type,))
- self.filter = blks2.pfb_arb_resampler_fff(samples_per_symbol, self.taps)
+ self.filter = filter.pfb.arb_resampler_fff(samples_per_symbol, self.taps)
# FM modulation
self.fmmod = gr.frequency_modulator_fc(sensitivity)
diff --git a/gr-fft/grc/fft_block_tree.xml b/gr-fft/grc/fft_block_tree.xml
index 3bda77eae1..5abbc3ef26 100644
--- a/gr-fft/grc/fft_block_tree.xml
+++ b/gr-fft/grc/fft_block_tree.xml
@@ -33,4 +33,9 @@
<block>fft_vxx</block>
<block>goertzel_fc</block>
</cat>
+
+ <cat>
+ <name>Operators</name>
+ <block>logpwrfft_x</block>
+ </cat>
</cat>
diff --git a/grc/blocks/blks2_logpwrfft_x.xml b/gr-fft/grc/fft_logpwrfft_x.xml
index 79a3bfc4bf..936be1cc71 100644
--- a/grc/blocks/blks2_logpwrfft_x.xml
+++ b/gr-fft/grc/fft_logpwrfft_x.xml
@@ -6,9 +6,9 @@
-->
<block>
<name>Log Power FFT</name>
- <key>blks2_logpwrfft_x</key>
- <import>from gnuradio import blks2</import>
- <make>blks2.logpwrfft_$(type.fcn)(
+ <key>logpwrfft_x</key>
+ <import>from gnuradio import fft</import>
+ <make>fft.logpwrfft_$(type.fcn)(
sample_rate=$sample_rate,
fft_size=$fft_size,
ref_scale=$ref_scale,
diff --git a/gr-fft/python/CMakeLists.txt b/gr-fft/python/CMakeLists.txt
index 16c29e5995..3cca444f9a 100644
--- a/gr-fft/python/CMakeLists.txt
+++ b/gr-fft/python/CMakeLists.txt
@@ -23,6 +23,7 @@ include(GrPython)
GR_PYTHON_INSTALL(
FILES
__init__.py
+ logpwrfft.py
DESTINATION ${GR_PYTHON_DIR}/gnuradio/fft
COMPONENT "fft_python"
)
diff --git a/gr-fft/python/__init__.py b/gr-fft/python/__init__.py
index 0fa643e35d..a532109b70 100644
--- a/gr-fft/python/__init__.py
+++ b/gr-fft/python/__init__.py
@@ -25,4 +25,4 @@ processing blocks for FFT and related functions.
'''
from fft_swig import *
-
+from logpwrfft import *
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py b/gr-fft/python/logpwrfft.py
index 6f7fc520fa..42a4757f02 100644
--- a/gnuradio-core/src/python/gnuradio/blks2impl/logpwrfft.py
+++ b/gr-fft/python/logpwrfft.py
@@ -20,8 +20,16 @@
#
from gnuradio import gr, window
-from stream_to_vector_decimator import stream_to_vector_decimator
-import math
+from gnuradio.blks2 import stream_to_vector_decimator
+import sys, math
+
+import fft_swig as fft
+
+try:
+ from gnuradio import filter
+except ImportError:
+ sys.stderr.write('fft.logpwrfft required gr-filter.\n')
+ sys.exit(1)
class _logpwrfft_base(gr.hier_block2):
"""
@@ -55,7 +63,7 @@ class _logpwrfft_base(gr.hier_block2):
window_power = sum(map(lambda x: x*x, fft_window))
c2magsq = gr.complex_to_mag_squared(fft_size)
- self._avg = gr.single_pole_iir_filter_ff(1.0, fft_size)
+ self._avg = filter.single_pole_iir_filter_ff(1.0, fft_size)
self._log = gr.nlog10_ff(10, fft_size,
-20*math.log10(fft_size) # Adjust for number of bins
-10*math.log10(window_power/fft_size) # Adjust for windowing loss
@@ -143,7 +151,7 @@ class logpwrfft_f(_logpwrfft_base):
"""
_name = "logpwrfft_f"
_item_size = gr.sizeof_float
- _fft_block = (gr.fft_vfc, )
+ _fft_block = (fft.fft_vfc, )
class logpwrfft_c(_logpwrfft_base):
"""
@@ -151,5 +159,5 @@ class logpwrfft_c(_logpwrfft_base):
"""
_name = "logpwrfft_c"
_item_size = gr.sizeof_gr_complex
- _fft_block = (gr.fft_vcc, )
+ _fft_block = (fft.fft_vcc, )
diff --git a/gr-wxgui/src/python/fftsink_gl.py b/gr-wxgui/src/python/fftsink_gl.py
index dc31e84a10..72659b8fa4 100644
--- a/gr-wxgui/src/python/fftsink_gl.py
+++ b/gr-wxgui/src/python/fftsink_gl.py
@@ -26,7 +26,7 @@ from __future__ import division
##################################################
import fft_window
import common
-from gnuradio import gr, blks2
+from gnuradio import gr, fft
from pubsub import pubsub
from constants import *
import math
@@ -132,12 +132,12 @@ class _fft_sink_base(gr.hier_block2, common.wxgui_hb):
self.win.set_callback(callb)
class fft_sink_f(_fft_sink_base):
- _fft_chain = blks2.logpwrfft_f
+ _fft_chain = fft.logpwrfft_f
_item_size = gr.sizeof_float
_real = True
class fft_sink_c(_fft_sink_base):
- _fft_chain = blks2.logpwrfft_c
+ _fft_chain = fft.logpwrfft_c
_item_size = gr.sizeof_gr_complex
_real = False
diff --git a/gr-wxgui/src/python/fftsink_nongl.py b/gr-wxgui/src/python/fftsink_nongl.py
index dc7163cdb7..1f91a976aa 100644
--- a/gr-wxgui/src/python/fftsink_nongl.py
+++ b/gr-wxgui/src/python/fftsink_nongl.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gru, window, filter
+from gnuradio import gr, gru, window, fft, filter
from gnuradio.wxgui import stdgui2
import wx
import plot
@@ -122,7 +122,7 @@ class fft_sink_f(gr.hier_block2, fft_sink_base):
max(1, int(self.sample_rate/self.fft_size/self.fft_rate)))
mywindow = window.blackmanharris(self.fft_size)
- self.fft = gr.fft_vfc(self.fft_size, True, mywindow)
+ self.fft = fft.fft_vfc(self.fft_size, True, mywindow)
power = 0
for tap in mywindow:
power += tap*tap
@@ -167,7 +167,7 @@ class fft_sink_c(gr.hier_block2, fft_sink_base):
max(1, int(self.sample_rate/self.fft_size/self.fft_rate)))
mywindow = window.blackmanharris(self.fft_size)
- self.fft = gr.fft_vcc(self.fft_size, True, mywindow)
+ self.fft = fft.fft_vcc(self.fft_size, True, mywindow)
power = 0
for tap in mywindow:
power += tap*tap
diff --git a/gr-wxgui/src/python/waterfallsink_gl.py b/gr-wxgui/src/python/waterfallsink_gl.py
index b69c5dda0c..b17f292875 100644
--- a/gr-wxgui/src/python/waterfallsink_gl.py
+++ b/gr-wxgui/src/python/waterfallsink_gl.py
@@ -24,7 +24,7 @@
##################################################
import waterfall_window
import common
-from gnuradio import gr, blks2
+from gnuradio import gr, fft
from pubsub import pubsub
from constants import *
@@ -117,12 +117,12 @@ class _waterfall_sink_base(gr.hier_block2, common.wxgui_hb):
self.win.set_callback(callb)
class waterfall_sink_f(_waterfall_sink_base):
- _fft_chain = blks2.logpwrfft_f
+ _fft_chain = fft.logpwrfft_f
_item_size = gr.sizeof_float
_real = True
class waterfall_sink_c(_waterfall_sink_base):
- _fft_chain = blks2.logpwrfft_c
+ _fft_chain = fft.logpwrfft_c
_item_size = gr.sizeof_gr_complex
_real = False
diff --git a/gr-wxgui/src/python/waterfallsink_nongl.py b/gr-wxgui/src/python/waterfallsink_nongl.py
index 4c73fb9191..be164bbccd 100644
--- a/gr-wxgui/src/python/waterfallsink_nongl.py
+++ b/gr-wxgui/src/python/waterfallsink_nongl.py
@@ -20,7 +20,7 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gru, window, filter
+from gnuradio import gr, gru, window, fft, filter
from gnuradio.wxgui import stdgui2
import wx
import gnuradio.wxgui.plot as plot
@@ -91,7 +91,7 @@ class waterfall_sink_f(gr.hier_block2, waterfall_sink_base):
max(1, int(self.sample_rate/self.fft_size/self.fft_rate)))
mywindow = window.blackmanharris(self.fft_size)
- self.fft = gr.fft_vfc(self.fft_size, True, mywindow)
+ self.fft = fft.fft_vfc(self.fft_size, True, mywindow)
self.c2mag = gr.complex_to_mag(self.fft_size)
self.avg = filter.single_pole_iir_filter_ff(1.0, self.fft_size)
self.log = gr.nlog10_ff(20, self.fft_size, -20*math.log10(self.fft_size))
@@ -122,7 +122,7 @@ class waterfall_sink_c(gr.hier_block2, waterfall_sink_base):
max(1, int(self.sample_rate/self.fft_size/self.fft_rate)))
mywindow = window.blackmanharris(self.fft_size)
- self.fft = gr.fft_vcc(self.fft_size, True, mywindow)
+ self.fft = fft.fft_vcc(self.fft_size, True, mywindow)
self.c2mag = gr.complex_to_mag(self.fft_size)
self.avg = filter.single_pole_iir_filter_ff(1.0, self.fft_size)
self.log = gr.nlog10_ff(20, self.fft_size, -20*math.log10(self.fft_size))
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 466b378807..59052afa90 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -60,7 +60,6 @@
<block>gr_conjugate_cc</block>
- <block>blks2_logpwrfft_x</block>
<block>gr_vector_insert_x</block>
</cat>
<cat>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-25 07:27:40 +0000