blocks: converting references to vector source/sink, null source/sink, nop, copy, head, skiphead, vector_map, and annotator blocks to use gr-blocks.

author: Tom Rondeau <trondeau@vt.edu> 2013-03-17 12:24:38 -0400
committer: Tom Rondeau <trondeau@vt.edu> 2013-03-17 15:40:32 -0400
commit: d4f6b86a9bdea09c2c158b9982559a727f8c6a0b (patch)
tree: 60b452d387bd494b461ee78b2b0faec1fbf6e5fe /grc
parent: ee2b700f72503d6e7f62adbfb7dff9997b9cb003 (diff)
16 files changed, 13 insertions, 807 deletions
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index e9da1ec880..9614c6ae02 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -8,31 +8,19 @@
 	<name></name> <!-- Blank for Root Name -->
 	<cat>
 		<name>Sources</name>
-		<block>gr_vector_source_x</block>
 		<block>random_source_x</block>
-		<block>gr_null_source</block>
 		<block>blks2_tcp_source</block>
 		<block>pad_source</block>
 		<block>virtual_source</block>
 	</cat>
 	<cat>
 		<name>Sinks</name>
-		<block>gr_vector_sink_x</block>
-		<block>gr_null_sink</block>
 		<block>blks2_tcp_sink</block>
 		<block>pad_sink</block>
 		<block>virtual_sink</block>
 	</cat>
 	<cat>
-		<name>Operators</name>
-		<block>gr_vector_insert_x</block>
-                <block>gr_endian_swap</block>
-	</cat>
-	<cat>
 		<name>Synchronizers</name>
-
-		<block>gr_mpsk_sync_cc</block>
-
 		<block>blks2_packet_decoder</block>
 		<block>blks2_packet_encoder</block>
 	</cat>
@@ -58,13 +46,6 @@
 		<block>blks2_valve</block>
 		<block>blks2_error_rate</block>
 
-		<block>gr_head</block>
-		<block>gr_skiphead</block>
-
-		<block>gr_kludge_copy</block>
-		<block>gr_copy</block>
-		<block>gr_nop</block>
-
 		<block>xmlrpc_server</block>
 		<block>xmlrpc_client</block>
 	</cat>
diff --git a/grc/blocks/gr_copy.xml b/grc/blocks/gr_copy.xml
deleted file mode 100644
index 8b12eaca78..0000000000
--- a/grc/blocks/gr_copy.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Copy
-###################################################
- -->
-<block>
-	<name>Copy</name>
-	<key>gr_copy</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.copy($type.size*$vlen)
-self.$(id).set_enabled($enabled)</make>
-	<callback>set_enabled($enabled)</callback>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Enabled</name>
-		<key>enabled</key>
-		<value>True</value>
-		<type>bool</type>
-		<option>
-			<name>Enabled</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>Disabled</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</source>
-</block>
diff --git a/grc/blocks/gr_endian_swap.xml b/grc/blocks/gr_endian_swap.xml
deleted file mode 100644
index aa564026cd..0000000000
--- a/grc/blocks/gr_endian_swap.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Add Block:
-##	all types, 1 output, 2 to inf inputs
-###################################################
- -->
-<block>
-	<name>Endian Swap</name>
-	<key>gr_endian_swap</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.endian_swap($type.size)</make>
-	<param>
-		<name>IO Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:8</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>s32</key>
-			<opt>size:4</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>s16</key>
-			<opt>size:2</opt>
-		</option>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_head.xml b/grc/blocks/gr_head.xml
deleted file mode 100644
index e5ff7f6aad..0000000000
--- a/grc/blocks/gr_head.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Head
-###################################################
- -->
-<block>
-	<name>Head</name>
-	<key>gr_head</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.head($type.size*$vlen, $num_items)</make>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Num Items</name>
-		<key>num_items</key>
-		<value>1024</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</source>
-</block>
diff --git a/grc/blocks/gr_kludge_copy.xml b/grc/blocks/gr_kludge_copy.xml
deleted file mode 100644
index 8058b082db..0000000000
--- a/grc/blocks/gr_kludge_copy.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Kludge Copy
-###################################################
- -->
-<block>
-	<name>Kludge Copy</name>
-	<key>gr_kludge_copy</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.kludge_copy($type.size*$vlen)</make>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Num Ports</name>
-		<key>num_ports</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$num_ports &gt; 0</check>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-		<nports>$num_ports</nports>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-		<nports>$num_ports</nports>
-	</source>
-</block>
diff --git a/grc/blocks/gr_mpsk_sync_cc.xml b/grc/blocks/gr_mpsk_sync_cc.xml
deleted file mode 100644
index fd08f8340b..0000000000
--- a/grc/blocks/gr_mpsk_sync_cc.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##MPSK Sync
-###################################################
- -->
-<block>
-	<name>MPSK Sync</name>
-	<key>gr_mpsk_sync_cc</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.mpsk_sync_cc($alpha, $beta, $max_freq, $min_freq, $ref_phase, $omega, $gain_omega, $mu, $gain_mu)</make>
-	<callback>set_mu($mu)</callback>
-	<callback>set_gain_mu($gain_mu)</callback>
-	<callback>set_omega($omega)</callback>
-	<callback>set_gain_omega($gain_omega)</callback>
-	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Max Freq</name>
-		<key>max_freq</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Min Freq</name>
-		<key>min_freq</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Reference Phase</name>
-		<key>ref_phase</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Omega</name>
-		<key>omega</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Gain Omega</name>
-		<key>gain_omega</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Mu</name>
-		<key>mu</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Gain Mu</name>
-		<key>gain_mu</key>
-		<type>real</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>complex</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>complex</type>
-	</source>
-</block>
diff --git a/grc/blocks/gr_nop.xml b/grc/blocks/gr_nop.xml
deleted file mode 100644
index bd884d6b8b..0000000000
--- a/grc/blocks/gr_nop.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Nop
-###################################################
- -->
-<block>
-	<name>Nop</name>
-	<key>gr_nop</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.nop($type.size*$vlen)</make>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Num Ports</name>
-		<key>num_ports</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$num_ports &gt; 0</check>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-		<nports>$num_ports</nports>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-		<nports>$num_ports</nports>
-	</source>
-</block>
diff --git a/grc/blocks/gr_null_sink.xml b/grc/blocks/gr_null_sink.xml
deleted file mode 100644
index ed106b4950..0000000000
--- a/grc/blocks/gr_null_sink.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Null Sink
-###################################################
- -->
-<block>
-	<name>Null Sink</name>
-	<key>gr_null_sink</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.null_sink($type.size*$vlen)</make>
-	<param>
-		<name>Input Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</sink>
-</block>
diff --git a/grc/blocks/gr_null_source.xml b/grc/blocks/gr_null_source.xml
deleted file mode 100644
index 6132eae3cb..0000000000
--- a/grc/blocks/gr_null_source.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Null Source
-###################################################
- -->
-<block>
-	<name>Null Source</name>
-	<key>gr_null_source</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.null_source($type.size*$vlen)</make>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</source>
-</block>
diff --git a/grc/blocks/gr_skiphead.xml b/grc/blocks/gr_skiphead.xml
deleted file mode 100644
index 0849ad2981..0000000000
--- a/grc/blocks/gr_skiphead.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Skip Head
-###################################################
- -->
-<block>
-	<name>Skip Head</name>
-	<key>gr_skiphead</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.skiphead($type.size*$vlen, $num_items)</make>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>size:gr.sizeof_gr_complex</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>size:gr.sizeof_float</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>size:gr.sizeof_int</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>size:gr.sizeof_short</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>size:gr.sizeof_char</opt>
-		</option>
-	</param>
-	<param>
-		<name>Num Items</name>
-		<key>num_items</key>
-		<value>1024</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</source>
-</block>
diff --git a/grc/blocks/gr_vector_insert_x.xml b/grc/blocks/gr_vector_insert_x.xml
deleted file mode 100644
index f9ce1f6544..0000000000
--- a/grc/blocks/gr_vector_insert_x.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Vector Source
-###################################################
- -->
-<block>
-	<name>Vector Insert</name>
-	<key>gr_vector_insert_x</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.vector_insert_$(type.fcn)($vector, $period, $offset)</make>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>fcn:b</opt>
-			<opt>vec_type:int_vector</opt>
-		</option>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-			<opt>vec_type:complex_vector</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:f</opt>
-			<opt>vec_type:real_vector</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>fcn:i</opt>
-			<opt>vec_type:int_vector</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-			<opt>vec_type:int_vector</opt>
-		</option>
-	</param>
-	<param>
-		<name>Vector</name>
-		<key>vector</key>
-		<value>0, 0, 0</value>
-		<type>$type.vec_type</type>
-	</param>
-	<param>
-		<name>Periodicity</name>
-		<key>period</key>
-		<value>100</value>
-		<type>int</type>
-	</param>
-	<param>
-		<name>Offset</name>
-		<key>offset</key>
-		<value>0</value>
-		<type>int</type>
-	</param>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-	</sink>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-	</source>
-
-    <doc>
-        Periodicity, the length of the periodicity at which the vector should be inserted at the output.
-        (i.e. one vector for every N output items)
-
-        Offset sepcifies where in the cycle period we should begin at.
-    </doc>
-</block>
diff --git a/grc/blocks/gr_vector_sink_x.xml b/grc/blocks/gr_vector_sink_x.xml
deleted file mode 100644
index 3bd998698f..0000000000
--- a/grc/blocks/gr_vector_sink_x.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Vector sink
-###################################################
- -->
-<block>
-	<name>Vector Sink</name>
-	<key>gr_vector_sink_x</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.vector_sink_$(type.fcn)($vlen)</make>
-	<param>
-		<name>Input Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:f</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>fcn:i</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>fcn:b</opt>
-		</option>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<sink>
-		<name>in</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</sink>
-</block>
diff --git a/grc/blocks/gr_vector_source_x.xml b/grc/blocks/gr_vector_source_x.xml
deleted file mode 100644
index 992a6a787d..0000000000
--- a/grc/blocks/gr_vector_source_x.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##Vector Source
-###################################################
- -->
-<block>
-	<name>Vector Source</name>
-	<key>gr_vector_source_x</key>
-	<import>from gnuradio import gr</import>
-	<make>gr.vector_source_$(type.fcn)($vector, $repeat, $vlen, $tags)
-    </make>
-	<param>
-		<name>Output Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>Complex</name>
-			<key>complex</key>
-			<opt>fcn:c</opt>
-			<opt>vec_type:complex_vector</opt>
-		</option>
-		<option>
-			<name>Float</name>
-			<key>float</key>
-			<opt>fcn:f</opt>
-			<opt>vec_type:real_vector</opt>
-		</option>
-		<option>
-			<name>Int</name>
-			<key>int</key>
-			<opt>fcn:i</opt>
-			<opt>vec_type:int_vector</opt>
-		</option>
-		<option>
-			<name>Short</name>
-			<key>short</key>
-			<opt>fcn:s</opt>
-			<opt>vec_type:int_vector</opt>
-		</option>
-		<option>
-			<name>Byte</name>
-			<key>byte</key>
-			<opt>fcn:b</opt>
-			<opt>vec_type:int_vector</opt>
-		</option>
-	</param>
-	<param>
-		<name>Vector</name>
-		<key>vector</key>
-		<value>0, 0, 0</value>
-		<type>raw</type>
-	</param>
-	<param>
-		<name>Tags</name>
-		<key>tags</key>
-		<value>[]</value>
-		<type>raw</type>
-	</param>
-	<param>
-		<name>Repeat</name>
-		<key>repeat</key>
-		<value>True</value>
-		<type>enum</type>
-		<option>
-			<name>Yes</name>
-			<key>True</key>
-		</option>
-		<option>
-			<name>No</name>
-			<key>False</key>
-		</option>
-	</param>
-	<param>
-		<name>Vec Length</name>
-		<key>vlen</key>
-		<value>1</value>
-		<type>int</type>
-	</param>
-	<check>$vlen &gt; 0</check>
-	<source>
-		<name>out</name>
-		<type>$type</type>
-		<vlen>$vlen</vlen>
-	</source>
-</block>
diff --git a/grc/blocks/random_source_x.xml b/grc/blocks/random_source_x.xml
index 800bae7167..f826c77d16 100644
--- a/grc/blocks/random_source_x.xml
+++ b/grc/blocks/random_source_x.xml
@@ -10,7 +10,7 @@
 	<key>random_source_x</key>
 	<import>from gnuradio import gr</import>
 	<import>import numpy</import>
-	<make>gr.vector_source_$(type.fcn)(map(int, numpy.random.randint($min, $max, $num_samps)), $repeat)</make>
+	<make>blocks.vector_source_$(type.fcn)(map(int, numpy.random.randint($min, $max, $num_samps)), $repeat)</make>
 	<param>
 		<name>Output Type</name>
 		<key>type</key>
diff --git a/grc/grc_gnuradio/blks2/packet.py b/grc/grc_gnuradio/blks2/packet.py
index eeadfb4a60..4c7bd235dd 100644
--- a/grc/grc_gnuradio/blks2/packet.py
+++ b/grc/grc_gnuradio/blks2/packet.py
@@ -1,4 +1,4 @@
-# Copyright 2008, 2009, 2012 Free Software Foundation, Inc.
+# Copyright 2008,2009,2012-2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -236,10 +236,12 @@ class packet_demod_base(gr.hier_block2):
 		self.connect(self, packet_sink)
 		self.connect(msg_source, self)
 		if packet_sink._hb.output_signature().sizeof_stream_item(0):
-			self.connect(packet_sink, gr.null_sink(packet_sink._hb.output_signature().sizeof_stream_item(0)))
+			self.connect(packet_sink,
+                                     blocks.null_sink(packet_sink._hb.output_signature().sizeof_stream_item(0)))
 
 	def recv_pkt(self, ok, payload):
-		msg = blocks.message_from_string(payload, 0, self._item_size_out, len(payload)/self._item_size_out)
+		msg = blocks.message_from_string(payload, 0, self._item_size_out,
+                                                 len(payload)/self._item_size_out)
 		if ok: self._msgq_out.insert_tail(msg)
 
 class packet_demod_b(packet_demod_base): _item_size_out = gr.sizeof_char
diff --git a/grc/grc_gnuradio/blks2/selector.py b/grc/grc_gnuradio/blks2/selector.py
index f6a8aa79b1..bc393f84b6 100644
--- a/grc/grc_gnuradio/blks2/selector.py
+++ b/grc/grc_gnuradio/blks2/selector.py
@@ -1,5 +1,5 @@
 #
-# 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
+from gnuradio import blocks
 
 class selector(gr.hier_block2):
 	"""A hier2 block with N inputs and M outputs, where data is only forwarded through input n to output m."""
@@ -40,12 +41,13 @@ class selector(gr.hier_block2):
 			gr.io_signature(num_outputs, num_outputs, item_size),
 		)
 		#terminator blocks for unused inputs and outputs
-		self.input_terminators = [gr.null_sink(item_size) for i in range(num_inputs)]
-		self.output_terminators = [gr.head(item_size, 0) for i in range(num_outputs)]
-		self.copy = gr.kludge_copy(item_size)
+		self.input_terminators = [blocks.null_sink(item_size) for i in range(num_inputs)]
+		self.output_terminators = [blocks.head(item_size, 0) for i in range(num_outputs)]
+		self.copy = blocks.copy(item_size)
 		#connections
 		for i in range(num_inputs): self.connect((self, i), self.input_terminators[i])
-		for i in range(num_outputs): self.connect(gr.null_source(item_size), self.output_terminators[i], (self, i))
+		for i in range(num_outputs): self.connect(blocks.null_source(item_size),
+                                                          self.output_terminators[i], (self, i))
 		self.item_size = item_size
 		self.input_index = input_index
 		self.output_index = output_index
author	Tom Rondeau <trondeau@vt.edu>	2013-03-17 12:24:38 -0400
committer	Tom Rondeau <trondeau@vt.edu>	2013-03-17 15:40:32 -0400
commit	d4f6b86a9bdea09c2c158b9982559a727f8c6a0b (patch)
tree	60b452d387bd494b461ee78b2b0faec1fbf6e5fe /grc
parent	ee2b700f72503d6e7f62adbfb7dff9997b9cb003 (diff)