summaryrefslogtreecommitdiff
path: root/gr-digital
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-11-06 12:26:57 -0500
committerTom Rondeau <trondeau@vt.edu>2012-11-06 13:05:26 -0500
commit0c9c16fb008b02a5af39fb22e18acfff2dbd933a (patch)
tree2a1d555a5b496f84eaf7f360b1cc50b64ab0fd03 /gr-digital
parent463b962fe280c5515947498b4d0f4fd3b5993662 (diff)
all: Python, GRC, and examples to properly pull blocks from filter and analog.
Diffstat (limited to 'gr-digital')
-rwxr-xr-xgr-digital/examples/narrowband/rx_voice.py5
-rwxr-xr-xgr-digital/python/qa_constellation.py2
-rwxr-xr-xgr-digital/python/qa_constellation_receiver.py2
3 files changed, 5 insertions, 4 deletions
diff --git a/gr-digital/examples/narrowband/rx_voice.py b/gr-digital/examples/narrowband/rx_voice.py
index 100caff8ea..079f8cb9b9 100755
--- a/gr-digital/examples/narrowband/rx_voice.py
+++ b/gr-digital/examples/narrowband/rx_voice.py
@@ -20,7 +20,8 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, blks2, audio, uhd
+from gnuradio import gr, audio, uhd
+from gnuradio import filter
from gnuradio import eng_notation
from gnuradio.eng_option import eng_option
from optparse import OptionParser
@@ -75,7 +76,7 @@ class my_top_block(gr.top_block):
audio_rate = self.audio_tx.sample_rate
usrp_rate = self.source.get_sample_rate()
rrate = audio_rate / usrp_rate
- self.resampler = blks2.pfb_arb_resampler_ccf(rrate)
+ self.resampler = filter.pfb.arb_resampler_ccf(rrate)
self.connect(self.source, self.resampler, self.rxpath)
diff --git a/gr-digital/python/qa_constellation.py b/gr-digital/python/qa_constellation.py
index 750337a119..9d6f4c6427 100755
--- a/gr-digital/python/qa_constellation.py
+++ b/gr-digital/python/qa_constellation.py
@@ -23,7 +23,7 @@
import random
from cmath import exp, pi, log
-from gnuradio import gr, gr_unittest, blks2
+from gnuradio import gr, gr_unittest
from utils import mod_codes
import digital_swig as digital
diff --git a/gr-digital/python/qa_constellation_receiver.py b/gr-digital/python/qa_constellation_receiver.py
index 871df2da28..5490f16fdb 100755
--- a/gr-digital/python/qa_constellation_receiver.py
+++ b/gr-digital/python/qa_constellation_receiver.py
@@ -22,7 +22,7 @@
import random
-from gnuradio import gr, blks2, gr_unittest
+from gnuradio import gr, gr_unittest
from utils import mod_codes, alignment
import packet_utils
import filter_swig as filter