Merged changes from svn repository trunk.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11601 221aa14e-8319-0410-a670-987f0aec2ac5

Signed-off-by: Johnathan Corgan <jcorgan@corganenterprises.com>

4 files changed, 134 insertions, 0 deletions

diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 025c261f4..fbd8f4bb4 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -123,6 +123,8 @@ dist_ourdata_DATA = \
 	gr_kludge_copy.xml \
 	gr_map_bb.xml \
 	gr_max_xx.xml \
+	gr_message_sink.xml \
+	gr_message_source.xml \
 	gr_moving_average_xx.xml \
 	gr_mpsk_receiver_cc.xml \
 	gr_mpsk_sync_cc.xml \
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 9eda2fdcf..2cedb45a2 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -20,6 +20,7 @@
 		<block>gr_udp_source</block>
 		<block>audio_source</block>
 		<block>gr_wavfile_source</block>
+		<block>gr_message_source</block>
 		<block>pad_source</block>
 	</cat>
 	<cat>
@@ -32,6 +33,7 @@
 		<block>gr_udp_sink</block>
 		<block>audio_sink</block>
 		<block>gr_wavfile_sink</block>
+		<block>gr_message_sink</block>
 		<block>pad_sink</block>
 	</cat>
 	<cat>
diff --git a/grc/blocks/gr_message_sink.xml b/grc/blocks/gr_message_sink.xml
new file mode 100644
index 000000000..76537f283
--- /dev/null
+++ b/grc/blocks/gr_message_sink.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Message Sink (the source port is a message)
+###################################################
+ -->
+<block>
+	<name>Message Sink</name>
+	<key>gr_message_sink</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.message_sink($type.size*$vlen, $(id)_msgq, $dont_block)</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>Don't Block</name>
+		<key>dont_block</key>
+		<value>False</value>
+		<type>enum</type>
+		<option>
+			<name>Don't Block</name>
+			<key>True</key>
+		</option>
+		<option>
+			<name>Block</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>msg</type>
+	</source>
+</block>
diff --git a/grc/blocks/gr_message_source.xml b/grc/blocks/gr_message_source.xml
new file mode 100644
index 000000000..44378ae83
--- /dev/null
+++ b/grc/blocks/gr_message_source.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Message Source (the sink port is a message)
+###################################################
+ -->
+<block>
+	<name>Message Source</name>
+	<key>gr_message_source</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.message_source($type.size*$vlen, $(id)_msgq)</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>
+	<sink>
+		<name>in</name>
+		<type>msg</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type</type>
+		<vlen>$vlen</vlen>
+	</source>
+</block>