diff options
| author | Johnathan Corgan | 2012-06-14 10:09:14 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-06-14 10:09:14 -0700 |
| commit | 6a2d514fab10f692d49f724d1d09afce1c603fa0 (patch) | |
| tree | 301bb37ed3158e4506cb206f5c18ade499da633c /gr-blocks/grc | |
| parent | 926f7cba99c4fa3906853e11ff4e91eea93a5a53 (diff) | |
| download | gnuradio-6a2d514fab10f692d49f724d1d09afce1c603fa0.tar.gz gnuradio-6a2d514fab10f692d49f724d1d09afce1c603fa0.tar.bz2 gnuradio-6a2d514fab10f692d49f724d1d09afce1c603fa0.zip | |
blocks: added multiply_xx, some cleanup on add_xx
Diffstat (limited to 'gr-blocks/grc')
| -rw-r--r-- | gr-blocks/grc/blocks_block_tree.xml | 1 | ||||
| -rw-r--r-- | gr-blocks/grc/blocks_multiply_xx.xml | 63 |
2 files changed, 64 insertions, 0 deletions
diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index b4834d06f..125137d8b 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -32,5 +32,6 @@ <name>Math Operations</name> <block>blocks_add_xx</block> <block>blocks_add_const_xx</block> + <block>blocks_multiply_xx</block> </cat> </cat> diff --git a/gr-blocks/grc/blocks_multiply_xx.xml b/gr-blocks/grc/blocks_multiply_xx.xml new file mode 100644 index 000000000..d1578ca11 --- /dev/null +++ b/gr-blocks/grc/blocks_multiply_xx.xml @@ -0,0 +1,63 @@ +<?xml version="1.0"?> +<!-- +################################################### +##Multiply Block: +## all types, 1 output, 2 to inf inputs +################################################### + --> +<block> + <name>Multiply</name> + <key>blocks_multiply_xx</key> + <import>from gnuradio import blocks</import> + <make>gr.multiply_v$(type.fcn)($vlen)</make> + <param> + <name>IO Type</name> + <key>type</key> + <type>enum</type> + <option> + <name>Complex</name> + <key>complex</key> + <opt>fcn:cc</opt> + </option> + <option> + <name>Float</name> + <key>float</key> + <opt>fcn:ff</opt> + </option> + <option> + <name>Int</name> + <key>int</key> + <opt>fcn:ii</opt> + </option> + <option> + <name>Short</name> + <key>short</key> + <opt>fcn:ss</opt> + </option> + </param> + <param> + <name>Num Inputs</name> + <key>num_inputs</key> + <value>2</value> + <type>int</type> + </param> + <param> + <name>Vec Length</name> + <key>vlen</key> + <value>1</value> + <type>int</type> + </param> + <check>$num_inputs > 1</check> + <check>$vlen > 0</check> + <sink> + <name>in</name> + <type>$type</type> + <vlen>$vlen</vlen> + <nports>$num_inputs</nports> + </sink> + <source> + <name>out</name> + <type>$type</type> + <vlen>$vlen</vlen> + </source> +</block> |