diff options
author | Nathan West <nathan.west@okstate.edu> | 2013-07-26 09:52:28 -0400 |
---|---|---|
committer | Tom Rondeau <tom@trondeau.com> | 2013-07-26 09:52:28 -0400 |
commit | 370d1a34dc70db7fd150d55f1a59f26d6db23fa4 (patch) | |
tree | 520a94fb185692c0cd8e3d97cd8b38e65fd90788 /gnuradio-runtime/examples | |
parent | 5432c985f911f4715456846425dbf84121842de8 (diff) |
examples: Some of the examples were updated to use 3.7 API, but the new module namespaces were never imported.
Diffstat (limited to 'gnuradio-runtime/examples')
6 files changed, 17 insertions, 6 deletions
diff --git a/gnuradio-runtime/examples/mp-sched/synthetic.py b/gnuradio-runtime/examples/mp-sched/synthetic.py index 6f0bb85da8..d815879cff 100755 --- a/gnuradio-runtime/examples/mp-sched/synthetic.py +++ b/gnuradio-runtime/examples/mp-sched/synthetic.py @@ -19,8 +19,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from gnuradio import gr, gru, eng_notation, blks2 -from gnuradio import blocks +from gnuradio import gr, eng_notation +from gnuradio import blocks, filter from gnuradio.eng_option import eng_option from optparse import OptionParser import os diff --git a/gnuradio-runtime/examples/network/audio_sink.py b/gnuradio-runtime/examples/network/audio_sink.py index 0e412de5ae..de20abe48d 100755 --- a/gnuradio-runtime/examples/network/audio_sink.py +++ b/gnuradio-runtime/examples/network/audio_sink.py @@ -33,7 +33,7 @@ except ImportError: sys.exit(1) class audio_sink(gr.top_block): - def __init__(self, host, port, pkt_size, sample_rate, eof, wait): + def __init__(self, host, port, pkt_size, sample_rate, eof): gr.top_block.__init__(self, "audio_sink") src = blocks.udp_source(gr.sizeof_float, host, port, pkt_size, eof=eof) dst = audio.sink(sample_rate) diff --git a/gnuradio-runtime/examples/network/dial_tone_sink.py b/gnuradio-runtime/examples/network/dial_tone_sink.py index fee6ded846..7139a13250 100755 --- a/gnuradio-runtime/examples/network/dial_tone_sink.py +++ b/gnuradio-runtime/examples/network/dial_tone_sink.py @@ -28,7 +28,7 @@ from optparse import OptionParser class dial_tone_sink(gr.top_block): def __init__(self, host, port, pkt_size, sample_rate, eof): gr.top_block.__init__(self, "dial_tone_sink") - udp = blokcs.udp_source(gr.sizeof_float, host, port, pkt_size, eof=eof) + udp = blocks.udp_source(gr.sizeof_float, host, port, pkt_size, eof=eof) sink = audio.sink(sample_rate) self.connect(udp, sink) diff --git a/gnuradio-runtime/examples/network/dial_tone_source.py b/gnuradio-runtime/examples/network/dial_tone_source.py index 44f05dc83c..26064962dd 100755 --- a/gnuradio-runtime/examples/network/dial_tone_source.py +++ b/gnuradio-runtime/examples/network/dial_tone_source.py @@ -21,7 +21,6 @@ # from gnuradio import gr -from gnuradio import blocks from gnuradio.eng_option import eng_option from optparse import OptionParser import sys diff --git a/gnuradio-runtime/examples/network/vector_sink.py b/gnuradio-runtime/examples/network/vector_sink.py index c0397d1e43..c756f36f42 100755 --- a/gnuradio-runtime/examples/network/vector_sink.py +++ b/gnuradio-runtime/examples/network/vector_sink.py @@ -26,7 +26,7 @@ from gnuradio.eng_option import eng_option from optparse import OptionParser class vector_sink(gr.top_block): - def __init__(self, host, port, pkt_size, eof, wait): + def __init__(self, host, port, pkt_size, eof): gr.top_block.__init__(self, "vector_sink") udp = blocks.udp_source(gr.sizeof_float, host, port, pkt_size, eof=eof) diff --git a/gnuradio-runtime/examples/volk_benchmark/volk_types.py b/gnuradio-runtime/examples/volk_benchmark/volk_types.py index e8db14aff7..ba4a4ff491 100755 --- a/gnuradio-runtime/examples/volk_benchmark/volk_types.py +++ b/gnuradio-runtime/examples/volk_benchmark/volk_types.py @@ -42,6 +42,18 @@ def short_to_char(N): ###################################################################### +def char_to_short(N): + op = blocks.char_to_short() + tb = helper(N, op, gr.sizeof_char, gr.sizeof_short, 1, 1) + ++###################################################################### + +def char_to_float(N): + op = blocks.char_to_float() + tb = helper(N, op, gr.sizeof_char, gr.sizeof_float, 1, 1) + +##################################################################### + def int_to_float(N): op = blocks.int_to_float() tb = helper(N, op, gr.sizeof_int, gr.sizeof_float, 1, 1) |