diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-21 19:34:27 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-21 19:34:27 -0500 |
| commit | 4f479665bc9f04e52b047cb270772ee61e319a59 (patch) | |
| tree | 09a018da0d2c14f160520707ecc2a2ff6ae8e1f1 /gr-digital/python | |
| parent | 7b4a518bfe47fb1d0b2a32fc5c93ed0157d2dc6c (diff) | |
blocks: removing blocks from gnuradio-core.
delay, rms, packed_to_unpacked, unpacked_to_packed.
Diffstat (limited to 'gr-digital/python')
| -rw-r--r-- | gr-digital/python/cpm.py | 2 | ||||
| -rw-r--r-- | gr-digital/python/generic_mod_demod.py | 17 | ||||
| -rw-r--r-- | gr-digital/python/gfsk.py | 2 | ||||
| -rw-r--r-- | gr-digital/python/gmsk.py | 3 | ||||
| -rw-r--r-- | gr-digital/python/ofdm_sync_ml.py | 2 | ||||
| -rw-r--r-- | gr-digital/python/ofdm_sync_pn.py | 2 | ||||
| -rw-r--r-- | gr-digital/python/ofdm_sync_pnac.py | 2 | ||||
| -rwxr-xr-x | gr-digital/python/qa_constellation.py | 6 | ||||
| -rwxr-xr-x | gr-digital/python/qa_constellation_receiver.py | 2 | ||||
| -rwxr-xr-x | gr-digital/python/qa_simple_correlator.py | 2 |
10 files changed, 23 insertions, 17 deletions
diff --git a/gr-digital/python/cpm.py b/gr-digital/python/cpm.py index 1929a73d30..a9915ba91a 100644 --- a/gr-digital/python/cpm.py +++ b/gr-digital/python/cpm.py @@ -117,7 +117,7 @@ class cpm_mod(gr.hier_block2): sensitivity = 2 * pi * h_numerator / h_denominator / samples_per_symbol # Unpack Bytes into bits_per_symbol groups - self.B2s = gr.packed_to_unpacked_bb(bits_per_symbol,gr.GR_MSB_FIRST) + self.B2s = blocks.packed_to_unpacked_bb(bits_per_symbol,gr.GR_MSB_FIRST) # Turn it into symmetric PAM data. diff --git a/gr-digital/python/generic_mod_demod.py b/gr-digital/python/generic_mod_demod.py index b71118ebcb..a5d1d9eb37 100644 --- a/gr-digital/python/generic_mod_demod.py +++ b/gr-digital/python/generic_mod_demod.py @@ -32,6 +32,11 @@ import digital_swig as digital import math try: + from gnuradio import blocks +except ImportError: + import blocks_swig as blocks + +try: from gnuradio import filter except ImportError: import filter_swig as filter @@ -126,7 +131,7 @@ class generic_mod(gr.hier_block2): # turn bytes into k-bit vectors self.bytes2chunks = \ - gr.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST) + blocks.packed_to_unpacked_bb(self.bits_per_symbol(), gr.GR_MSB_FIRST) if self.pre_diff_code: self.symbol_mapper = digital.map_bb(self._constellation.pre_diff_code()) @@ -149,13 +154,13 @@ class generic_mod(gr.hier_block2): self.rrc_taps) # Connect - blocks = [self, self.bytes2chunks] + self._blocks = [self, self.bytes2chunks] if self.pre_diff_code: - blocks.append(self.symbol_mapper) + self._blocks.append(self.symbol_mapper) if differential: - blocks.append(self.diffenc) - blocks += [self.chunks2symbols, self.rrc_filter, self] - self.connect(*blocks) + self._blocks.append(self.diffenc) + self._blocks += [self.chunks2symbols, self.rrc_filter, self] + self.connect(*self._blocks) if verbose: self._print_verbage() diff --git a/gr-digital/python/gfsk.py b/gr-digital/python/gfsk.py index 42d65d36ce..e4aeef8ef9 100644 --- a/gr-digital/python/gfsk.py +++ b/gr-digital/python/gfsk.py @@ -99,7 +99,7 @@ class gfsk_mod(gr.hier_block2): # Turn it into NRZ data. #self.nrz = digital.bytes_to_syms() - self.unpack = gr.packed_to_unpacked_bb(1, gr.GR_MSB_FIRST) + self.unpack = blocks.packed_to_unpacked_bb(1, gr.GR_MSB_FIRST) self.nrz = digital.chunks_to_symbols_bf([-1, 1]) # Form Gaussian filter diff --git a/gr-digital/python/gmsk.py b/gr-digital/python/gmsk.py index c0f5c439aa..a90e49a521 100644 --- a/gr-digital/python/gmsk.py +++ b/gr-digital/python/gmsk.py @@ -25,6 +25,7 @@ # See gnuradio-examples/python/digital for examples from gnuradio import gr +from gnuradio import blocks from gnuradio import analog import modulation_utils import digital_swig as digital @@ -97,7 +98,7 @@ class gmsk_mod(gr.hier_block2): # Turn it into NRZ data. #self.nrz = digital.bytes_to_syms() - self.unpack = gr.packed_to_unpacked_bb(1, gr.GR_MSB_FIRST) + self.unpack = blocks.packed_to_unpacked_bb(1, gr.GR_MSB_FIRST) self.nrz = digital.chunks_to_symbols_bf([-1, 1], 1) # Form Gaussian filter diff --git a/gr-digital/python/ofdm_sync_ml.py b/gr-digital/python/ofdm_sync_ml.py index 885531f66a..895ab767a0 100644 --- a/gr-digital/python/ofdm_sync_ml.py +++ b/gr-digital/python/ofdm_sync_ml.py @@ -58,7 +58,7 @@ class ofdm_sync_ml(gr.hier_block2): self.connect(self, self.input) # Create a delay line - self.delay = gr.delay(gr.sizeof_gr_complex, fft_length) + self.delay = blocks.delay(gr.sizeof_gr_complex, fft_length) self.connect(self.input, self.delay) # magnitude squared blocks diff --git a/gr-digital/python/ofdm_sync_pn.py b/gr-digital/python/ofdm_sync_pn.py index fb011bf252..cddd1b31da 100644 --- a/gr-digital/python/ofdm_sync_pn.py +++ b/gr-digital/python/ofdm_sync_pn.py @@ -52,7 +52,7 @@ class ofdm_sync_pn(gr.hier_block2): # PN Sync # Create a delay line - self.delay = gr.delay(gr.sizeof_gr_complex, fft_length/2) + self.delay = blocks.delay(gr.sizeof_gr_complex, fft_length/2) # Correlation from ML Sync self.conjg = blocks.conjugate_cc(); diff --git a/gr-digital/python/ofdm_sync_pnac.py b/gr-digital/python/ofdm_sync_pnac.py index 9b0302ffbb..f6627a4aba 100644 --- a/gr-digital/python/ofdm_sync_pnac.py +++ b/gr-digital/python/ofdm_sync_pnac.py @@ -72,7 +72,7 @@ class ofdm_sync_pnac(gr.hier_block2): self.crosscorr_filter = filter.fir_filter_ccc(1, kstime) # Create a delay line - self.delay = gr.delay(gr.sizeof_gr_complex, fft_length/2) + self.delay = blocks.delay(gr.sizeof_gr_complex, fft_length/2) # Correlation from ML Sync self.conjg = blocks.conjugate_cc(); diff --git a/gr-digital/python/qa_constellation.py b/gr-digital/python/qa_constellation.py index 3c109cfe82..12dbca232f 100755 --- a/gr-digital/python/qa_constellation.py +++ b/gr-digital/python/qa_constellation.py @@ -174,12 +174,12 @@ class mod_demod(gr.hier_block2): self.blocks = [self] # We expect a stream of unpacked bits. # First step is to pack them. - self.blocks.append(gr.unpacked_to_packed_bb(1, gr.GR_MSB_FIRST)) + self.blocks.append(blocks.unpacked_to_packed_bb(1, gr.GR_MSB_FIRST)) # Second step we unpack them such that we have k bits in each byte where # each constellation symbol hold k bits. self.blocks.append( - gr.packed_to_unpacked_bb(self.constellation.bits_per_symbol(), - gr.GR_MSB_FIRST)) + blocks.packed_to_unpacked_bb(self.constellation.bits_per_symbol(), + gr.GR_MSB_FIRST)) # Apply any pre-differential coding # Gray-coding is done here if we're also using differential coding. if self.constellation.apply_pre_diff_code(): diff --git a/gr-digital/python/qa_constellation_receiver.py b/gr-digital/python/qa_constellation_receiver.py index 254a8240d4..ff0154d740 100755 --- a/gr-digital/python/qa_constellation_receiver.py +++ b/gr-digital/python/qa_constellation_receiver.py @@ -150,7 +150,7 @@ class rec_test_tb(gr.top_block): self.src_data = tuple([rndm.randint(0,1) for i in range(0, data_length)]) else: self.src_data = src_data - packer = gr.unpacked_to_packed_bb(1, gr.GR_MSB_FIRST) + packer = blocks.unpacked_to_packed_bb(1, gr.GR_MSB_FIRST) src = gr.vector_source_b(self.src_data) mod = generic_mod(constellation, differential=differential) # Channel diff --git a/gr-digital/python/qa_simple_correlator.py b/gr-digital/python/qa_simple_correlator.py index 292dfd69fc..ff0faeb415 100755 --- a/gr-digital/python/qa_simple_correlator.py +++ b/gr-digital/python/qa_simple_correlator.py @@ -46,7 +46,7 @@ class test_simple_correlator(gr_unittest.TestCase): src = gr.vector_source_b(expected_result) frame = digital.simple_framer(4) - unpack = gr.packed_to_unpacked_bb(1, gr.GR_MSB_FIRST) + unpack = blocks.packed_to_unpacked_bb(1, gr.GR_MSB_FIRST) expand = filter.interp_fir_filter_fff(8, taps) b2f = blocks.char_to_float() mult2 = blocks.multiply_const_ff(2) |