From: Marcus D Leech <mleech@ripnet.com>
Date: Sun, 16 May 2010 15:16:39 +0000 (-0700)
Subject: grc: adds gr.and_const to block tree
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=4c8cda27d86d400e60358f6ad342827bab9d3fdc;p=debian%2Fgnuradio

grc: adds gr.and_const to block tree
---

diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 4e3839d2..8e50225e 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -71,6 +71,7 @@ dist_ourdata_DATA = \
 	gr_agc2_xx.xml \
 	gr_agc_xx.xml \
 	gr_and_xx.xml \
+	gr_and_const_xx.xml \
 	gr_argmax_xx.xml \
 	gr_binary_slicer_fb.xml \
 	gr_channel_model.xml \
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 04568e19..6597f5b8 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -58,6 +58,7 @@
 
 		<block>gr_add_const_vxx</block>
 		<block>gr_multiply_const_vxx</block>
+		<block>gr_and_const_xx</block>
 
 		<block>gr_not_xx</block>
 		<block>gr_and_xx</block>
diff --git a/grc/blocks/gr_and_const_xx.xml b/grc/blocks/gr_and_const_xx.xml
new file mode 100644
index 00000000..dc964931
--- /dev/null
+++ b/grc/blocks/gr_and_const_xx.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## And Const Block:
+##	all types, 1 output, 1 input & const
+###################################################
+ -->
+<block>
+	<name>And Const</name>
+	<key>gr_and_const_xx</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.and_const_$(type.fcn)($const)</make>
+	<callback>set_k($const)</callback>
+	<param>
+		<name>IO Type</name>
+		<key>type</key>
+		<type>enum</type>
+		<option>
+			<name>Int</name>
+			<key>int</key>
+			<opt>fcn:ii</opt>
+		</option>
+		<option>
+			<name>Short</name>
+			<key>short</key>
+			<opt>fcn:ss</opt>
+		</option>
+		<option>
+			<name>Byte</name>
+			<key>byte</key>
+			<opt>fcn:bb</opt>
+		</option>
+	</param>
+	<param>
+		<name>Constant</name>
+		<key>const</key>
+		<value>0</value>
+		<type>int</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>$type</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>$type</type>
+	</source>
+</block>