summaryrefslogtreecommitdiff
path: root/grc/blocks
diff options
context:
space:
mode:
authorMarcus D Leech2010-05-16 08:16:39 -0700
committerJohnathan Corgan2010-05-16 08:16:39 -0700
commit4c8cda27d86d400e60358f6ad342827bab9d3fdc (patch)
treea6637fae504c713c06a468896052d6ea0c24a5e4 /grc/blocks
parent467678259c56fab32a326690cc01eac1dbcb48ca (diff)
downloadgnuradio-4c8cda27d86d400e60358f6ad342827bab9d3fdc.tar.gz
gnuradio-4c8cda27d86d400e60358f6ad342827bab9d3fdc.tar.bz2
gnuradio-4c8cda27d86d400e60358f6ad342827bab9d3fdc.zip
grc: adds gr.and_const to block tree
Diffstat (limited to 'grc/blocks')
-rw-r--r--grc/blocks/Makefile.am1
-rw-r--r--grc/blocks/block_tree.xml1
-rw-r--r--grc/blocks/gr_and_const_xx.xml48
3 files changed, 50 insertions, 0 deletions
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 4e3839d27..8e50225e7 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 04568e19a..6597f5b83 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 000000000..dc9649311
--- /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>