summaryrefslogtreecommitdiff
path: root/gr-trellis/python/qa_trellis.py
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-12-29 20:26:35 -0500
committerTom Rondeau <trondeau@vt.edu>2012-12-29 20:26:35 -0500
commit0fb538e11e8425c4f15063e249dc0dae2d54ebd5 (patch)
treed4d4964feb7771c01b75a33be9d209389a8b4fc9 /gr-trellis/python/qa_trellis.py
parent4580aaf9583b1e8ca4b3ef1d3127c7d48566fe67 (diff)
parentc805168975a30af962fbd0a25c091d7b2113394e (diff)
Merge branch 'next_blocks' into next
Conflicts: gr-trellis/CMakeLists.txt gr-trellis/python/CMakeLists.txt
Diffstat (limited to 'gr-trellis/python/qa_trellis.py')
-rwxr-xr-xgr-trellis/python/qa_trellis.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/gr-trellis/python/qa_trellis.py b/gr-trellis/python/qa_trellis.py
index 3bf8eb9b99..0e1ddc61b2 100755
--- a/gr-trellis/python/qa_trellis.py
+++ b/gr-trellis/python/qa_trellis.py
@@ -28,6 +28,7 @@ from gnuradio import gr, gr_unittest
import trellis_swig as trellis
import digital_swig as digital
import analog_swig as analog
+import blocks_swig as blocks
fsm_args = {"awgn1o2_4": (2, 4, 4,
(0, 2, 0, 2, 1, 3, 1, 3),
@@ -115,7 +116,7 @@ class trellis_tb(gr.top_block):
mod = digital.chunks_to_symbols_sc(constellation.points(), 1)
# CHANNEL
- add = gr.add_cc()
+ add = blocks.add_cc()
noise = analog.noise_source_c(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX