diff options
| author | Tom Rondeau | 2011-10-18 20:46:04 -0700 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-18 20:46:04 -0700 |
| commit | 52b42b9e958be6908ab5279bbe4ecea8b2464ee8 (patch) | |
| tree | 3340aef44ae5fd7607f659e27b9b02de3d13670e /grc | |
| parent | 3b08bd8312f7499a3ffcaba147f5fe7a66f91ba4 (diff) | |
| parent | 6474548641d8b611adf6c5a08aa3da06508d77bf (diff) | |
| download | gnuradio-52b42b9e958be6908ab5279bbe4ecea8b2464ee8.tar.gz gnuradio-52b42b9e958be6908ab5279bbe4ecea8b2464ee8.tar.bz2 gnuradio-52b42b9e958be6908ab5279bbe4ecea8b2464ee8.zip | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/lib/general/general.i
Diffstat (limited to 'grc')
| -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 5fff38f1f..f326285e5 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 a7a90c4ac..91afc506c 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 000000000..eede447f9 --- /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> |