From d4f6b86a9bdea09c2c158b9982559a727f8c6a0b Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Sun, 17 Mar 2013 12:24:38 -0400
Subject: blocks: converting references to vector source/sink, null
source/sink, nop, copy, head, skiphead, vector_map, and annotator blocks to
use gr-blocks.
---
.../src/examples/ctrlport/pfb_sync_test-qt.grc | 12 ++++++------
gnuradio-core/src/examples/ctrlport/pfb_sync_test.grc | 6 +++---
gnuradio-core/src/examples/mp-sched/affinity_set.py | 19 ++++++++++---------
gnuradio-core/src/examples/mp-sched/synthetic.py | 11 ++++++-----
gnuradio-core/src/examples/network/vector_source.py | 4 ++--
.../src/examples/volk_benchmark/volk_test_funcs.py | 7 ++++---
6 files changed, 31 insertions(+), 28 deletions(-)
(limited to 'gnuradio-core/src/examples')
diff --git a/gnuradio-core/src/examples/ctrlport/pfb_sync_test-qt.grc b/gnuradio-core/src/examples/ctrlport/pfb_sync_test-qt.grc
index 31914412bc..a24adfd9e7 100644
--- a/gnuradio-core/src/examples/ctrlport/pfb_sync_test-qt.grc
+++ b/gnuradio-core/src/examples/ctrlport/pfb_sync_test-qt.grc
@@ -94,10 +94,10 @@
</param>
</block>
<block>
- <key>gr_vector_source_x</key>
+ <key>blocks_vector_source_x</key>
<param>
<key>id</key>
- <value>gr_vector_source_x_0</value>
+ <value>blocks_vector_source_x_0</value>
</param>
<param>
<key>_enabled</key>
@@ -659,10 +659,10 @@
</param>
</block>
<block>
- <key>gr_null_sink</key>
+ <key>blocks_null_sink</key>
<param>
<key>id</key>
- <value>gr_null_sink_0</value>
+ <value>blocks_null_sink_0</value>
</param>
<param>
<key>_enabled</key>
@@ -795,7 +795,7 @@
</connection>
<connection>
<source_block_id>digital_costas_loop_cc_0</source_block_id>
- <sink_block_id>gr_null_sink_0</sink_block_id>
+ <sink_block_id>blocks_null_sink_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -824,7 +824,7 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_vector_source_x_0</source_block_id>
+ <source_block_id>blocks_vector_source_x_0</source_block_id>
<sink_block_id>blocks_packed_to_unpacked_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
diff --git a/gnuradio-core/src/examples/ctrlport/pfb_sync_test.grc b/gnuradio-core/src/examples/ctrlport/pfb_sync_test.grc
index 5b0bfeb793..da63b4f5b3 100644
--- a/gnuradio-core/src/examples/ctrlport/pfb_sync_test.grc
+++ b/gnuradio-core/src/examples/ctrlport/pfb_sync_test.grc
@@ -226,10 +226,10 @@
</param>
</block>
<block>
- <key>gr_null_sink</key>
+ <key>blocks_null_sink</key>
<param>
<key>id</key>
- <value>gr_null_sink_0</value>
+ <value>blocks_null_sink_0</value>
</param>
<param>
<key>_enabled</key>
@@ -637,7 +637,7 @@
</connection>
<connection>
<source_block_id>digital_costas_loop_cc_0</source_block_id>
- <sink_block_id>gr_null_sink_0</sink_block_id>
+ <sink_block_id>blocks_null_sink_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
diff --git a/gnuradio-core/src/examples/mp-sched/affinity_set.py b/gnuradio-core/src/examples/mp-sched/affinity_set.py
index 8b032acd83..eee88cd34e 100755
--- a/gnuradio-core/src/examples/mp-sched/affinity_set.py
+++ b/gnuradio-core/src/examples/mp-sched/affinity_set.py
@@ -7,6 +7,7 @@
from gnuradio import eng_notation
from gnuradio import gr
from gnuradio import blocks
+from gnuradio import filter
from gnuradio.eng_option import eng_option
from gnuradio.filter import firdes
from optparse import OptionParser
@@ -27,21 +28,21 @@ class affinity_set(gr.top_block):
##################################################
vec_len = 1
self.blocks_throttle_0 = blocks.throttle(gr.sizeof_gr_complex*vec_len, samp_rate)
- self.gr_null_source_0 = gr.null_source(gr.sizeof_gr_complex*vec_len)
- self.gr_null_sink_0 = gr.null_sink(gr.sizeof_gr_complex*vec_len)
- self.gr_filt_0 = gr.fir_filter_ccc(1, 40000*[0.2+0.3j,])
- self.gr_filt_1 = gr.fir_filter_ccc(1, 40000*[0.2+0.3j,])
+ self.blocks_null_source_0 = blocks.null_source(gr.sizeof_gr_complex*vec_len)
+ self.blocks_null_sink_0 = blocks.null_sink(gr.sizeof_gr_complex*vec_len)
+ self.filter_filt_0 = filter.fir_filter_ccc(1, 40000*[0.2+0.3j,])
+ self.filter_filt_1 = filter.fir_filter_ccc(1, 40000*[0.2+0.3j,])
- self.gr_filt_0.set_processor_affinity([0,])
- self.gr_filt_1.set_processor_affinity([0,1])
+ self.filter_filt_0.set_processor_affinity([0,])
+ self.filter_filt_1.set_processor_affinity([0,1])
##################################################
# Connections
##################################################
- self.connect((self.gr_null_source_0, 0), (self.blocks_throttle_0, 0))
+ self.connect((self.blocks_null_source_0, 0), (self.blocks_throttle_0, 0))
self.connect((self.blocks_throttle_0, 0), (self.gr_filt_0, 0))
- self.connect((self.gr_filt_0, 0), (self.gr_filt_1, 0))
- self.connect((self.gr_filt_1, 0), (self.gr_null_sink_0, 0))
+ self.connect((self.filter_filt_0, 0), (self.gr_filt_1, 0))
+ self.connect((self.filter_filt_1, 0), (self.blocks_null_sink_0, 0))
# QT sink close method reimplementation
diff --git a/gnuradio-core/src/examples/mp-sched/synthetic.py b/gnuradio-core/src/examples/mp-sched/synthetic.py
index 5ce1b5eb89..4b509af228 100755
--- a/gnuradio-core/src/examples/mp-sched/synthetic.py
+++ b/gnuradio-core/src/examples/mp-sched/synthetic.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2013 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -20,6 +20,7 @@
#
from gnuradio import gr, gru, eng_notation, blks2
+from gnuradio import blocks
from gnuradio.eng_option import eng_option
from optparse import OptionParser
import os
@@ -29,7 +30,7 @@ class pipeline(gr.hier_block2):
def __init__(self, nstages, ntaps=256):
"""
Create a pipeline of nstages of gr.fir_filter_fff's connected in serial
- terminating in a gr.null_sink.
+ terminating in a blocks.null_sink.
"""
gr.hier_block2.__init__(self, "pipeline",
gr.io_signature(1, 1, gr.sizeof_float),
@@ -41,7 +42,7 @@ class pipeline(gr.hier_block2):
self.connect(upstream, op)
upstream = op
- self.connect(upstream, gr.null_sink(gr.sizeof_float))
+ self.connect(upstream, blocks.null_sink(gr.sizeof_float))
class top(gr.top_block):
@@ -75,8 +76,8 @@ class top(gr.top_block):
# Something vaguely like floating point ops
self.flop = 2 * ntaps * options.npipelines * options.nstages * options.nsamples
- src = gr.null_source(gr.sizeof_float)
- head = gr.head(gr.sizeof_float, int(options.nsamples))
+ src = blocks.null_source(gr.sizeof_float)
+ head = blocks.head(gr.sizeof_float, int(options.nsamples))
self.connect(src, head)
for n in range(options.npipelines):
diff --git a/gnuradio-core/src/examples/network/vector_source.py b/gnuradio-core/src/examples/network/vector_source.py
index b960a6d96a..568425fd50 100755
--- a/gnuradio-core/src/examples/network/vector_source.py
+++ b/gnuradio-core/src/examples/network/vector_source.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright 2006,2010 Free Software Foundation, Inc.
+# Copyright 2006,2010,2013 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -29,7 +29,7 @@ class vector_source(gr.top_block):
def __init__(self, host, port, pkt_size, eof):
gr.top_block.__init__(self, "vector_source")
data = [i*0.01 for i in range(1000)]
- vec = gr.vector_source_f(data, True)
+ vec = blocks.vector_source_f(data, True)
udp = blocks.udp_sink(gr.sizeof_float, host, port, pkt_size, eof=eof)
self.connect(vec, udp)
diff --git a/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py b/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py
index 0ce25fcc6a..0f2c84100a 100644
--- a/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py
+++ b/gnuradio-core/src/examples/volk_benchmark/volk_test_funcs.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
+from gnuradio import blocks
import math, sys, os, time
try:
@@ -119,13 +120,13 @@ class helper(gr.top_block):
self.op = op
self.srcs = []
self.snks = []
- self.head = gr.head(isizeof, N)
+ self.head = blocks.head(isizeof, N)
for n in xrange(nsrcs):
- self.srcs.append(gr.null_source(isizeof))
+ self.srcs.append(blocks.null_source(isizeof))
for n in xrange(nsnks):
- self.snks.append(gr.null_sink(osizeof))
+ self.snks.append(blocks.null_sink(osizeof))
self.connect(self.srcs[0], self.head, (self.op,0))
--
cgit v1.2.3