diff options
| author | Johnathan Corgan | 2012-07-04 07:11:51 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-07-04 07:11:51 -0700 |
| commit | 4c85f46aee089432b090b988dedbc42091084ba3 (patch) | |
| tree | 77753a2ddc0384e1552a8ba74b2614c4fa2f5bd0 /gr-blocks/grc | |
| parent | 312de88604d052142f91ae4eb292ccd25fac7963 (diff) | |
| download | gnuradio-4c85f46aee089432b090b988dedbc42091084ba3.tar.gz gnuradio-4c85f46aee089432b090b988dedbc42091084ba3.tar.bz2 gnuradio-4c85f46aee089432b090b988dedbc42091084ba3.zip | |
blocks: added gr::blocks::or_XX (bb ss ii)
Diffstat (limited to 'gr-blocks/grc')
| -rw-r--r-- | gr-blocks/grc/blocks_block_tree.xml | 1 | ||||
| -rw-r--r-- | gr-blocks/grc/blocks_or_xx.xml | 48 |
2 files changed, 49 insertions, 0 deletions
diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index bc2a6fa4e..e2658a373 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -46,6 +46,7 @@ <block>blocks_and_xx.xml</block> <block>blocks_and_const_xx.xml</block> <block>blocks_not_xx.xml</block> + <block>blocks_or_xx.xml</block> </cat> <cat> <name>Stream Type Conversions (New) </name> diff --git a/gr-blocks/grc/blocks_or_xx.xml b/gr-blocks/grc/blocks_or_xx.xml new file mode 100644 index 000000000..400c09389 --- /dev/null +++ b/gr-blocks/grc/blocks_or_xx.xml @@ -0,0 +1,48 @@ +<?xml version="1.0"?> +<!-- +################################################### +##Logical Or Block +################################################### + --> +<block> + <name>Or</name> + <key>blocks_or_xx</key> + <import>from gnuradio import blocks</import> + <make>blocks.or_$(type.fcn)()</make> + <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>Num Inputs</name> + <key>num_inputs</key> + <value>2</value> + <type>int</type> + </param> + <check>$num_inputs >= 2</check> + <sink> + <name>in</name> + <type>$type</type> + <nports>$num_inputs</nports> + </sink> + <source> + <name>out</name> + <type>$type</type> + </source> +</block> |