summaryrefslogtreecommitdiff
path: root/gr-digital/python/qa_constellation_receiver.py
diff options
context:
space:
mode:
Diffstat (limited to 'gr-digital/python/qa_constellation_receiver.py')
-rwxr-xr-xgr-digital/python/qa_constellation_receiver.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/gr-digital/python/qa_constellation_receiver.py b/gr-digital/python/qa_constellation_receiver.py
index ebdbf3bfb..70b62c7aa 100755
--- a/gr-digital/python/qa_constellation_receiver.py
+++ b/gr-digital/python/qa_constellation_receiver.py
@@ -25,9 +25,11 @@ import random
from gnuradio import gr, blks2, packet_utils, gr_unittest
from utils import mod_codes, alignment
import digital_swig
+from generic_mod_demod import generic_mod, generic_demod
from qa_constellation import tested_constellations, twod_constell
+
# Set a seed so that if errors turn up they are reproducible.
# 1234 fails
random.seed(1239)
@@ -68,6 +70,7 @@ class test_constellation_receiver (gr_unittest.TestCase):
demodulation uses constellation_receiver which is what
we're really trying to test.
"""
+
# Assumes not more than 64 points in a constellation
# Generates some random input data to use.
self.src_data = tuple(
@@ -76,7 +79,7 @@ class test_constellation_receiver (gr_unittest.TestCase):
# output data (a full comparison is too slow in python).
self.indices = alignment.random_sample(
self.max_data_length, self.max_num_samples, self.seed)
-
+
for constellation, differential in tested_constellations():
# The constellation_receiver doesn't work for constellations
# of multple dimensions (i.e. multiple complex numbers to a
@@ -119,13 +122,13 @@ class rec_test_tb (gr.top_block):
self.src_data = src_data
packer = gr.unpacked_to_packed_bb(1, gr.GR_MSB_FIRST)
src = gr.vector_source_b(self.src_data)
- mod = blks2.generic_mod(constellation, differential=differential)
+ mod = generic_mod(constellation, differential=differential)
# Channel
channel = gr.channel_model(NOISE_VOLTAGE, FREQUENCY_OFFSET, TIMING_OFFSET)
# Receiver Blocks
- demod = blks2.generic_demod(constellation, differential=differential,
- freq_alpha=FREQ_ALPHA,
- phase_alpha=PHASE_ALPHA)
+ demod = generic_demod(constellation, differential=differential,
+ freq_alpha=FREQ_ALPHA,
+ phase_alpha=PHASE_ALPHA)
self.dst = gr.vector_sink_b()
self.connect(src, packer, mod, channel, demod, self.dst)