diff options
Diffstat (limited to 'gr-digital/python/qa_ofdm_sync_sc_cfb.py')
| -rwxr-xr-x | gr-digital/python/qa_ofdm_sync_sc_cfb.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gr-digital/python/qa_ofdm_sync_sc_cfb.py b/gr-digital/python/qa_ofdm_sync_sc_cfb.py index bed8e9c3ae..e71cd5cce3 100755 --- a/gr-digital/python/qa_ofdm_sync_sc_cfb.py +++ b/gr-digital/python/qa_ofdm_sync_sc_cfb.py @@ -24,6 +24,9 @@ import numpy import random from gnuradio import gr, gr_unittest +import blocks_swig as blocks +import analog_swig as analog + try: # This will work when feature #505 is added. from gnuradio import digital @@ -35,6 +38,7 @@ except ImportError: from utils import tagged_streams from ofdm_txrx import ofdm_tx + class qa_ofdm_sync_sc_cfb (gr_unittest.TestCase): def setUp (self): @@ -57,12 +61,12 @@ class qa_ofdm_sync_sc_cfb (gr_unittest.TestCase): sync_symbol + \ [(random.randint(0, 1)*2)-1 for x in range(sig_len)] tx_signal = tx_signal * 2 - add = gr.add_cc() + add = blocks.add_cc() sync = digital.ofdm_sync_sc_cfb(fft_len, cp_len) sink_freq = gr.vector_sink_f() sink_detect = gr.vector_sink_b() self.tb.connect(gr.vector_source_c(tx_signal), (add, 0)) - self.tb.connect(gr.noise_source_c(gr.GR_GAUSSIAN, .01), (add, 1)) + self.tb.connect(analog.noise_source_c(analog.GR_GAUSSIAN, .01), (add, 1)) self.tb.connect(add, sync) self.tb.connect((sync, 0), sink_freq) self.tb.connect((sync, 1), sink_detect) @@ -85,14 +89,14 @@ class qa_ofdm_sync_sc_cfb (gr_unittest.TestCase): tx_signal = sync_symbol[-cp_len:] + \ sync_symbol + \ [(random.randint(0, 1)*2)-1 for x in range(sig_len)] - mult = gr.multiply_cc() - add = gr.add_cc() + mult = blocks.multiply_cc() + add = blocks.add_cc() sync = digital.ofdm_sync_sc_cfb(fft_len, cp_len) sink_freq = gr.vector_sink_f() sink_detect = gr.vector_sink_b() self.tb.connect(gr.vector_source_c(tx_signal), (mult, 0), (add, 0)) - self.tb.connect(gr.sig_source_c(2 * numpy.pi, gr.GR_SIN_WAVE, freq_offset, 1.0), (mult, 1)) - self.tb.connect(gr.noise_source_c(gr.GR_GAUSSIAN, .01), (add, 1)) + self.tb.connect(analog.sig_source_c(2 * numpy.pi, analog.GR_SIN_WAVE, freq_offset, 1.0), (mult, 1)) + self.tb.connect(analog.noise_source_c(analog.GR_GAUSSIAN, .01), (add, 1)) self.tb.connect(add, sync) self.tb.connect((sync, 0), sink_freq) self.tb.connect((sync, 1), sink_detect) @@ -116,12 +120,12 @@ class qa_ofdm_sync_sc_cfb (gr_unittest.TestCase): sync_symbol[-cp_len:] + \ sync_symbol + \ [(random.randint(0, 1)*2)-1 for x in range(fft_len * random.randint(5,23))] - add = gr.add_cc() + add = blocks.add_cc() sync = digital.ofdm_sync_sc_cfb(fft_len, cp_len) sink_freq = gr.vector_sink_f() sink_detect = gr.vector_sink_b() self.tb.connect(gr.vector_source_c(tx_signal), (add, 0)) - self.tb.connect(gr.noise_source_c(gr.GR_GAUSSIAN, .005), (add, 1)) + self.tb.connect(analog.noise_source_c(analog.GR_GAUSSIAN, .005), (add, 1)) self.tb.connect(add, sync) self.tb.connect((sync, 0), sink_freq) self.tb.connect((sync, 1), sink_detect) |