diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-19 11:29:01 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-10-19 11:29:01 -0700 |
| commit | 53eef84f65168d0ca569fc4aa0dc2266e551c1d0 (patch) | |
| tree | 27e15c042c4e78628f626537e33943ec74a3d735 /grc/blocks | |
| parent | fb2162069ff725ff430729624605c40cbfaa356b (diff) | |
| parent | 52b42b9e958be6908ab5279bbe4ecea8b2464ee8 (diff) | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Diffstat (limited to 'grc/blocks')
| -rw-r--r-- | grc/blocks/Makefile.am | 1 | ||||
| -rw-r--r-- | grc/blocks/block_tree.xml | 2 | ||||
| -rw-r--r-- | grc/blocks/gr_transcendental.xml | 41 |
3 files changed, 43 insertions, 1 deletions
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 5fff38f1f9..f326285e56 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -171,6 +171,7 @@ dist_ourdata_DATA = \ gr_sub_xx.xml \ gr_threshold_ff.xml \ gr_throttle.xml \ + gr_transcendental.xml \ gr_uchar_to_float.xml \ gr_udp_sink.xml \ gr_udp_source.xml \ diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index a7a90c4ac5..91afc506ce 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -42,7 +42,7 @@ <block>gr_multiply_xx</block> <block>gr_divide_xx</block> <block>gr_nlog10_ff</block> - + <block>gr_transcendental</block> <block>gr_add_const_vxx</block> <block>gr_multiply_const_vxx</block> <block>gr_and_const_xx</block> diff --git a/grc/blocks/gr_transcendental.xml b/grc/blocks/gr_transcendental.xml new file mode 100644 index 0000000000..eede447f98 --- /dev/null +++ b/grc/blocks/gr_transcendental.xml @@ -0,0 +1,41 @@ +<?xml version="1.0"?> +<!-- +################################################### +##transcendental functions +################################################### + --> +<block> + <name>Transcendental</name> + <key>gr_transcendental</key> + <import>from gnuradio import gr</import> + <make>gr.transcendental($name, "$type")</make> + <param> + <name>Type</name> + <key>type</key> + <type>enum</type> + <option> + <name>Complex</name> + <key>complex_double</key> + <opt>type:complex</opt> + </option> + <option> + <name>Float</name> + <key>float</key> + <opt>type:float</opt> + </option> + </param> + <param> + <name>Function Name</name> + <key>name</key> + <value>cos</value> + <type>string</type> + </param> + <sink> + <name>in</name> + <type>$type.type</type> + </sink> + <source> + <name>out</name> + <type>$type.type</type> + </source> +</block> |