diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gr-digital/python | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-digital/python')
| -rwxr-xr-x | gr-digital/python/qa_crc32_bb.py | 3 | ||||
| -rwxr-xr-x | gr-digital/python/qa_header_payload_demux.py | 3 | ||||
| -rwxr-xr-x | gr-digital/python/qa_ofdm_carrier_allocator_cvc.py | 3 | ||||
| -rwxr-xr-x | gr-digital/python/qa_ofdm_chanest_vcvc.py | 3 | ||||
| -rwxr-xr-x | gr-digital/python/qa_ofdm_cyclic_prefixer.py | 3 | ||||
| -rwxr-xr-x | gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py | 3 | ||||
| -rwxr-xr-x | gr-digital/python/qa_ofdm_serializer_vcc.py | 3 | ||||
| -rwxr-xr-x | gr-digital/python/qa_packet_headergenerator_bb.py | 3 | ||||
| -rwxr-xr-x | gr-digital/python/qa_packet_headerparser_b.py | 3 | ||||
| -rw-r--r-- | gr-digital/python/utils/tagged_streams.py | 25 |
10 files changed, 32 insertions, 20 deletions
diff --git a/gr-digital/python/qa_crc32_bb.py b/gr-digital/python/qa_crc32_bb.py index 6ee7ca1bcf..6f5249ca08 100755 --- a/gr-digital/python/qa_crc32_bb.py +++ b/gr-digital/python/qa_crc32_bb.py @@ -22,8 +22,7 @@ from gnuradio import gr, gr_unittest import blocks_swig as blocks import digital_swig as digital -try: import pmt -except: from gruel import pmt +import pmt class qa_crc32_bb (gr_unittest.TestCase): diff --git a/gr-digital/python/qa_header_payload_demux.py b/gr-digital/python/qa_header_payload_demux.py index 7595409ef8..222b457021 100755 --- a/gr-digital/python/qa_header_payload_demux.py +++ b/gr-digital/python/qa_header_payload_demux.py @@ -20,8 +20,7 @@ # from gnuradio import gr, gr_unittest -try: import pmt -except: from gruel import pmt +import pmt import digital_swig as digital import blocks_swig as blocks import time diff --git a/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py b/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py index e1f017ba9e..f5c72fb87e 100755 --- a/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py +++ b/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py @@ -20,8 +20,7 @@ # from gnuradio import gr, gr_unittest -try: import pmt -except: from gruel import pmt +import pmt import digital_swig as digital import blocks_swig as blocks diff --git a/gr-digital/python/qa_ofdm_chanest_vcvc.py b/gr-digital/python/qa_ofdm_chanest_vcvc.py index cd3aaa85d1..d095bbcd9c 100755 --- a/gr-digital/python/qa_ofdm_chanest_vcvc.py +++ b/gr-digital/python/qa_ofdm_chanest_vcvc.py @@ -20,8 +20,7 @@ # from gnuradio import gr, gr_unittest -try: import pmt -except: from gruel import pmt +import pmt import blocks_swig as blocks import analog_swig as analog import digital_swig as digital diff --git a/gr-digital/python/qa_ofdm_cyclic_prefixer.py b/gr-digital/python/qa_ofdm_cyclic_prefixer.py index 355742ab07..0469b3f970 100755 --- a/gr-digital/python/qa_ofdm_cyclic_prefixer.py +++ b/gr-digital/python/qa_ofdm_cyclic_prefixer.py @@ -21,8 +21,7 @@ # from gnuradio import gr, gr_unittest -try: import pmt -except: from gruel import pmt +import pmt import digital_swig as digital import blocks_swig as blocks diff --git a/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py b/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py index 6df9ecbecf..5a34791650 100755 --- a/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py +++ b/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py @@ -21,8 +21,7 @@ import numpy from gnuradio import gr, gr_unittest -try: import pmt -except: from gruel import pmt +import pmt import digital_swig as digital import blocks_swig as blocks diff --git a/gr-digital/python/qa_ofdm_serializer_vcc.py b/gr-digital/python/qa_ofdm_serializer_vcc.py index a5dee78558..0ce6f01348 100755 --- a/gr-digital/python/qa_ofdm_serializer_vcc.py +++ b/gr-digital/python/qa_ofdm_serializer_vcc.py @@ -25,8 +25,7 @@ import blocks_swig as blocks import fft_swig as fft import analog_swig as analog import digital_swig as digital -try: import pmt -except: from gruel import pmt +import pmt import numpy class qa_ofdm_serializer_vcc (gr_unittest.TestCase): diff --git a/gr-digital/python/qa_packet_headergenerator_bb.py b/gr-digital/python/qa_packet_headergenerator_bb.py index 0f42c33a51..bb0cfef9f4 100755 --- a/gr-digital/python/qa_packet_headergenerator_bb.py +++ b/gr-digital/python/qa_packet_headergenerator_bb.py @@ -22,8 +22,7 @@ from gnuradio import gr, gr_unittest import digital_swig as digital import blocks_swig as blocks -try: import pmt -except: from gruel import pmt +import pmt class qa_packet_headergenerator_bb (gr_unittest.TestCase): diff --git a/gr-digital/python/qa_packet_headerparser_b.py b/gr-digital/python/qa_packet_headerparser_b.py index da7aef69d3..3c8cd67335 100755 --- a/gr-digital/python/qa_packet_headerparser_b.py +++ b/gr-digital/python/qa_packet_headerparser_b.py @@ -21,8 +21,7 @@ import time from gnuradio import gr, gr_unittest -try: import pmt -except: from gruel import pmt +import pmt import blocks_swig as blocks import digital_swig as digital diff --git a/gr-digital/python/utils/tagged_streams.py b/gr-digital/python/utils/tagged_streams.py index 6a956aa642..f2a58ffe1e 100644 --- a/gr-digital/python/utils/tagged_streams.py +++ b/gr-digital/python/utils/tagged_streams.py @@ -1,6 +1,27 @@ +#!/usr/bin/env python +# +# Copyright 2013 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + from gnuradio import gr -try: import pmt -except: from gruel import pmt +import pmt def make_lengthtags(lengths, offsets, tagname='length', vlen=1): tags = [] |