diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-06 14:28:22 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-06 14:40:43 -0500 |
| commit | fd110bdbbe8bc40781c34f33c70deec5b7931109 (patch) | |
| tree | ef18e813add19b09c57cc21cb672ea602701405b /gr-digital | |
| parent | 0c9c16fb008b02a5af39fb22e18acfff2dbd933a (diff) | |
analog: Removing reference to gr.sig_source_X and gr.noise_source_X where possible.
Passing make and make test. Examples and apps need testing.
gr-filter relies on sig_source and noise_source, so can't remove them from core.
Diffstat (limited to 'gr-digital')
| -rwxr-xr-x | gr-digital/examples/berawgn.py | 7 | ||||
| -rwxr-xr-x | gr-digital/python/qa_fll_band_edge.py | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/gr-digital/examples/berawgn.py b/gr-digital/examples/berawgn.py index 2d95a1345f..8ff43b7b92 100755 --- a/gr-digital/examples/berawgn.py +++ b/gr-digital/examples/berawgn.py @@ -36,6 +36,7 @@ magnitude below what you chose for N_BITS. import math import numpy from gnuradio import gr, digital +from gnuradio import analog try: from scipy.special import erfc @@ -92,9 +93,9 @@ class BERAWGNSimu(gr.top_block): src = gr.vector_source_b(data, False) mod = digital.chunks_to_symbols_bc((self.const.points()), 1) add = gr.add_vcc() - noise = gr.noise_source_c(gr.GR_GAUSSIAN, - self.EbN0_to_noise_voltage(EbN0), - RAND_SEED) + noise = analog.noise_source_c(analog.GR_GAUSSIAN, + self.EbN0_to_noise_voltage(EbN0), + RAND_SEED) demod = digital.constellation_decoder_cb(self.const.base()) ber = BitErrors(self.const.bits_per_symbol()) self.sink = gr.vector_sink_f() diff --git a/gr-digital/python/qa_fll_band_edge.py b/gr-digital/python/qa_fll_band_edge.py index a4269931f5..1e699bbdd4 100755 --- a/gr-digital/python/qa_fll_band_edge.py +++ b/gr-digital/python/qa_fll_band_edge.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2012 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,6 +23,7 @@ from gnuradio import gr, gr_unittest import digital_swig as digital import filter_swig as filter +import analog_swig as analog import random, math class test_fll_band_edge_cc(gr_unittest.TestCase): @@ -40,7 +41,7 @@ class test_fll_band_edge_cc(gr_unittest.TestCase): ntaps = 45 # Create pulse shape filter - rrc_taps = gr.firdes.root_raised_cosine( + rrc_taps = filter.firdes.root_raised_cosine( sps, sps, 1.0, rolloff, ntaps) # The frequency offset to correct @@ -53,7 +54,7 @@ class test_fll_band_edge_cc(gr_unittest.TestCase): self.rrc = filter.interp_fir_filter_ccf(sps, rrc_taps) # Mix symbols with a complex sinusoid to spin them - self.nco = gr.sig_source_c(1, gr.GR_SIN_WAVE, foffset, 1) + self.nco = analog.sig_source_c(1, analog.GR_SIN_WAVE, foffset, 1) self.mix = gr.multiply_cc() # FLL will despin the symbols to an arbitrary phase |