From 630cd06cb33d628fa6426866f006580aad30f84b Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 5 May 2012 13:21:38 -0700 Subject: blocks: adds new top-level component gr-blocks with first block gr::blocks::add_XX --- gr-blocks/grc/CMakeLists.txt | 22 +++++++++++++ gr-blocks/grc/blocks_add_xx.xml | 63 +++++++++++++++++++++++++++++++++++++ gr-blocks/grc/blocks_block_tree.xml | 35 +++++++++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 gr-blocks/grc/CMakeLists.txt create mode 100644 gr-blocks/grc/blocks_add_xx.xml create mode 100644 gr-blocks/grc/blocks_block_tree.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/CMakeLists.txt b/gr-blocks/grc/CMakeLists.txt new file mode 100644 index 000000000..ed66d9e3b --- /dev/null +++ b/gr-blocks/grc/CMakeLists.txt @@ -0,0 +1,22 @@ +# Copyright 2012 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. + +######################################################################## +file(GLOB xml_files "*.xml") +install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "blocks_python") diff --git a/gr-blocks/grc/blocks_add_xx.xml b/gr-blocks/grc/blocks_add_xx.xml new file mode 100644 index 000000000..951dff5e5 --- /dev/null +++ b/gr-blocks/grc/blocks_add_xx.xml @@ -0,0 +1,63 @@ + + + + Add + blocks_add_xx + from gnuradio import blocks + blocks.add_v$(type.fcn)($vlen) + + IO Type + type + enum + + + + + + + Num Inputs + num_inputs + 2 + int + + + Vec Length + vlen + 1 + int + + $num_inputs > 1 + $vlen > 0 + + in + $type + $vlen + $num_inputs + + + out + $type + $vlen + + diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml new file mode 100644 index 000000000..37ed367c6 --- /dev/null +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -0,0 +1,35 @@ + + + + + + + + + Math Operations + blocks_add_xx + + -- cgit From 9752fabd851d05c77b0526e7a28c9c7099e54fc6 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Fri, 8 Jun 2012 14:48:46 -0700 Subject: blocks: added blocks_add_const_xx --- gr-blocks/grc/blocks_add_const_xx.xml | 67 +++++++++++++++++++++++++++++++++++ gr-blocks/grc/blocks_block_tree.xml | 1 + 2 files changed, 68 insertions(+) create mode 100644 gr-blocks/grc/blocks_add_const_xx.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_add_const_xx.xml b/gr-blocks/grc/blocks_add_const_xx.xml new file mode 100644 index 000000000..dc8ec1819 --- /dev/null +++ b/gr-blocks/grc/blocks_add_const_xx.xml @@ -0,0 +1,67 @@ + + + + Add Const + gr_add_const_vxx + from gnuradio import blocks + blocks.add_const_v$(type.fcn)($const) + set_k($const) + + IO Type + type + enum + + + + + + + Constant + const + 0 + $type.const_type + + + Vec Length + vlen + 1 + int + + len($const) == $vlen + $vlen > 0 + + in + $type + $vlen + + + out + $type + $vlen + + diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 37ed367c6..b4834d06f 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -31,5 +31,6 @@ Math Operations blocks_add_xx + blocks_add_const_xx -- cgit From 1dcce62a400a5d6674482dea2e917631923764fa Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Fri, 8 Jun 2012 15:01:33 -0700 Subject: blocks: fix XML file in previous commit --- gr-blocks/grc/blocks_add_const_xx.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_add_const_xx.xml b/gr-blocks/grc/blocks_add_const_xx.xml index dc8ec1819..5330f5dda 100644 --- a/gr-blocks/grc/blocks_add_const_xx.xml +++ b/gr-blocks/grc/blocks_add_const_xx.xml @@ -7,7 +7,7 @@ --> Add Const - gr_add_const_vxx + blocks_add_const_xx from gnuradio import blocks blocks.add_const_v$(type.fcn)($const) set_k($const) -- cgit From 6a2d514fab10f692d49f724d1d09afce1c603fa0 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 14 Jun 2012 10:09:14 -0700 Subject: blocks: added multiply_xx, some cleanup on add_xx --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_multiply_xx.xml | 63 ++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 gr-blocks/grc/blocks_multiply_xx.xml (limited to 'gr-blocks/grc') 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 @@ Math Operations blocks_add_xx blocks_add_const_xx + blocks_multiply_xx 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 @@ + + + + Multiply + blocks_multiply_xx + from gnuradio import blocks + gr.multiply_v$(type.fcn)($vlen) + + IO Type + type + enum + + + + + + + Num Inputs + num_inputs + 2 + int + + + Vec Length + vlen + 1 + int + + $num_inputs > 1 + $vlen > 0 + + in + $type + $vlen + $num_inputs + + + out + $type + $vlen + + -- cgit From 59f49f4663d5795adc7d7cc573d24c0747afad0f Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 16 Jun 2012 12:07:58 -0700 Subject: blocks: completed transition of add and multiply blocks * gr::blocks::add_* * gr::blocks::add_const_* * gr::blocks::add_const_v* * gr::blocks::multiply_* * gr::blocks::multiply_const_* * gr::blocks::multiply_const_v* Each of these has ss, ii, ff, and cc versions, for a total of 24 blocks. --- gr-blocks/grc/blocks_add_const_vxx.xml | 67 +++++++++++++++++++++++++++++ gr-blocks/grc/blocks_add_const_xx.xml | 67 ----------------------------- gr-blocks/grc/blocks_block_tree.xml | 3 +- gr-blocks/grc/blocks_multiply_const_vxx.xml | 67 +++++++++++++++++++++++++++++ gr-blocks/grc/blocks_multiply_xx.xml | 2 +- 5 files changed, 137 insertions(+), 69 deletions(-) create mode 100644 gr-blocks/grc/blocks_add_const_vxx.xml delete mode 100644 gr-blocks/grc/blocks_add_const_xx.xml create mode 100644 gr-blocks/grc/blocks_multiply_const_vxx.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_add_const_vxx.xml b/gr-blocks/grc/blocks_add_const_vxx.xml new file mode 100644 index 000000000..96303acef --- /dev/null +++ b/gr-blocks/grc/blocks_add_const_vxx.xml @@ -0,0 +1,67 @@ + + + + Add Const + blocks_add_const_vxx + from gnuradio import blocks + blocks.add_const_v$(type.fcn)($const) + set_k($const) + + IO Type + type + enum + + + + + + + Constant + const + 0 + $type.const_type + + + Vec Length + vlen + 1 + int + + len($const) == $vlen + $vlen > 0 + + in + $type + $vlen + + + out + $type + $vlen + + diff --git a/gr-blocks/grc/blocks_add_const_xx.xml b/gr-blocks/grc/blocks_add_const_xx.xml deleted file mode 100644 index 5330f5dda..000000000 --- a/gr-blocks/grc/blocks_add_const_xx.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - Add Const - blocks_add_const_xx - from gnuradio import blocks - blocks.add_const_v$(type.fcn)($const) - set_k($const) - - IO Type - type - enum - - - - - - - Constant - const - 0 - $type.const_type - - - Vec Length - vlen - 1 - int - - len($const) == $vlen - $vlen > 0 - - in - $type - $vlen - - - out - $type - $vlen - - diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 125137d8b..c0ce7ec7a 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -31,7 +31,8 @@ Math Operations blocks_add_xx - blocks_add_const_xx + blocks_add_const_vxx blocks_multiply_xx + blocks_multiply_const_vxx diff --git a/gr-blocks/grc/blocks_multiply_const_vxx.xml b/gr-blocks/grc/blocks_multiply_const_vxx.xml new file mode 100644 index 000000000..6162621d3 --- /dev/null +++ b/gr-blocks/grc/blocks_multiply_const_vxx.xml @@ -0,0 +1,67 @@ + + + + Multiply Const + blocks_multiply_const_vxx + from gnuradio import blocks + blocks.multiply_const_v$(type.fcn)($const) + set_k($const) + + IO Type + type + enum + + + + + + + Constant + const + 0 + $type.const_type + + + Vec Length + vlen + 1 + int + + len($const) == $vlen + $vlen > 0 + + in + $type + $vlen + + + out + $type + $vlen + + diff --git a/gr-blocks/grc/blocks_multiply_xx.xml b/gr-blocks/grc/blocks_multiply_xx.xml index d1578ca11..15f024142 100644 --- a/gr-blocks/grc/blocks_multiply_xx.xml +++ b/gr-blocks/grc/blocks_multiply_xx.xml @@ -9,7 +9,7 @@ Multiply blocks_multiply_xx from gnuradio import blocks - gr.multiply_v$(type.fcn)($vlen) + blocks.multiply_v$(type.fcn)($vlen) IO Type type -- cgit From 24962cd24c623c6822733fed4c911a4adabbdd57 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Mon, 18 Jun 2012 12:28:48 -0700 Subject: blocks: added div_XX and sub_XX blocks --- gr-blocks/grc/blocks_block_tree.xml | 2 ++ gr-blocks/grc/blocks_divide_XX.xml | 63 +++++++++++++++++++++++++++++++++++++ gr-blocks/grc/blocks_sub_xx.xml | 63 +++++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) create mode 100644 gr-blocks/grc/blocks_divide_XX.xml create mode 100644 gr-blocks/grc/blocks_sub_xx.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index c0ce7ec7a..b1680497b 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -32,7 +32,9 @@ Math Operations blocks_add_xx blocks_add_const_vxx + blocks_divide_xx blocks_multiply_xx blocks_multiply_const_vxx + blocks_sub_xx diff --git a/gr-blocks/grc/blocks_divide_XX.xml b/gr-blocks/grc/blocks_divide_XX.xml new file mode 100644 index 000000000..d784d305d --- /dev/null +++ b/gr-blocks/grc/blocks_divide_XX.xml @@ -0,0 +1,63 @@ + + + + Divide + blocks_divide_xx + from gnuradio import blocks + blocks.divide_$(type.fcn)($vlen) + + IO Type + type + enum + + + + + + + Vec Length + vlen + 1 + int + + + Num Inputs + num_inputs + 2 + int + + $vlen > 0 + $num_inputs >= 2 + + in + $type + $vlen + $num_inputs + + + out + $type + $vlen + + diff --git a/gr-blocks/grc/blocks_sub_xx.xml b/gr-blocks/grc/blocks_sub_xx.xml new file mode 100644 index 000000000..ae01cf74a --- /dev/null +++ b/gr-blocks/grc/blocks_sub_xx.xml @@ -0,0 +1,63 @@ + + + + Subtract + blocks_sub_xx + from gnuradio import blocks + blocks.sub_$(type.fcn)($vlen) + + IO Type + type + enum + + + + + + + Vec Length + vlen + 1 + int + + + Num Inputs + num_inputs + 2 + int + + $vlen > 0 + $num_inputs >= 2 + + in + $type + $vlen + $num_inputs + + + out + $type + $vlen + + -- cgit From 439b427e80ebc767db6e4e732213d89c2a6febd4 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 19 Jun 2012 10:00:28 -0700 Subject: blocks: added gr::blocks::char_to_float --- gr-blocks/grc/blocks_block_tree.xml | 5 +++++ gr-blocks/grc/blocks_char_to_float.xml | 35 ++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 gr-blocks/grc/blocks_char_to_float.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index b1680497b..ae540d3b1 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -37,4 +37,9 @@ blocks_multiply_const_vxx blocks_sub_xx + + Type Conversions + blocks_char_to_float + + diff --git a/gr-blocks/grc/blocks_char_to_float.xml b/gr-blocks/grc/blocks_char_to_float.xml new file mode 100644 index 000000000..5d367d719 --- /dev/null +++ b/gr-blocks/grc/blocks_char_to_float.xml @@ -0,0 +1,35 @@ + + + + Char To Float + blocks_char_to_float + from gnuradio import blocks + blocks.char_to_float($vlen, $scale) + set_scale($scale) + + Vec Length + vlen + 1 + int + + + Scale + scale + 1 + real + + + in + byte + $vlen + + + out + float + $vlen + + -- cgit From 75f11771a9ee4b2854297fdb2c9db5761bde1c45 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Fri, 22 Jun 2012 16:58:50 -0700 Subject: blocks: added gr::blocks:char_to_short --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_char_to_short.xml | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 gr-blocks/grc/blocks_char_to_short.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index ae540d3b1..6fe209db9 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -40,6 +40,7 @@ Type Conversions blocks_char_to_float + blocks_char_to_short diff --git a/gr-blocks/grc/blocks_char_to_short.xml b/gr-blocks/grc/blocks_char_to_short.xml new file mode 100644 index 000000000..b19fdb46a --- /dev/null +++ b/gr-blocks/grc/blocks_char_to_short.xml @@ -0,0 +1,28 @@ + + + + Char To Short + blocks_char_to_short + from gnuradio import blocks + blocks.char_to_short($vlen) + + Vec Length + vlen + 1 + int + + + in + byte + $vlen + + + out + short + $vlen + + -- cgit From c16e6eba638ebe3bdf5ee4770ce409481c8e1c7a Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 23 Jun 2012 07:46:42 -0700 Subject: blocks: added gr::blocks::complex_to_interleaved_short --- gr-blocks/grc/blocks_block_tree.xml | 2 +- .../grc/blocks_complex_to_interleaved_short.xml | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gr-blocks/grc/blocks_complex_to_interleaved_short.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 6fe209db9..523ee1b7c 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -41,6 +41,6 @@ Type Conversions blocks_char_to_float blocks_char_to_short + blocks_complex_to_interleaved_short - diff --git a/gr-blocks/grc/blocks_complex_to_interleaved_short.xml b/gr-blocks/grc/blocks_complex_to_interleaved_short.xml new file mode 100644 index 000000000..43b55f32a --- /dev/null +++ b/gr-blocks/grc/blocks_complex_to_interleaved_short.xml @@ -0,0 +1,20 @@ + + + + Complex To IShort + blocks_complex_to_interleaved_short + from gnuradio import blocks + blocks.complex_to_interleaved_short() + + in + complex + + + out + short + + -- cgit From 6eb1447df04883af78ed78eb8449378e67d67bf6 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 23 Jun 2012 08:12:30 -0700 Subject: blocks: added gr::blocks::complex_to_float --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_complex_to_float.xml | 36 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 gr-blocks/grc/blocks_complex_to_float.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 523ee1b7c..a1ef71b5c 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -42,5 +42,6 @@ blocks_char_to_float blocks_char_to_short blocks_complex_to_interleaved_short + blocks_complex_to_float diff --git a/gr-blocks/grc/blocks_complex_to_float.xml b/gr-blocks/grc/blocks_complex_to_float.xml new file mode 100644 index 000000000..7acf3fccb --- /dev/null +++ b/gr-blocks/grc/blocks_complex_to_float.xml @@ -0,0 +1,36 @@ + + + + Complex To Float + blocks_complex_to_float + from gnuradio import blocks + blocks.complex_to_float($vlen) + + Vec Length + vlen + 1 + int + + $vlen > 0 + + in + complex + $vlen + + + re + float + $vlen + + + im + float + $vlen + 1 + + -- cgit From 11a702b94a43cac127c146654f5fc10415f2bb6e Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 23 Jun 2012 08:32:59 -0700 Subject: blocks: added gr::blocks::complex_to_real --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_complex_to_real.xml | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 gr-blocks/grc/blocks_complex_to_real.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index a1ef71b5c..4a520828b 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -43,5 +43,6 @@ blocks_char_to_short blocks_complex_to_interleaved_short blocks_complex_to_float + blocks_complex_to_real diff --git a/gr-blocks/grc/blocks_complex_to_real.xml b/gr-blocks/grc/blocks_complex_to_real.xml new file mode 100644 index 000000000..7acf3fccb --- /dev/null +++ b/gr-blocks/grc/blocks_complex_to_real.xml @@ -0,0 +1,36 @@ + + + + Complex To Float + blocks_complex_to_float + from gnuradio import blocks + blocks.complex_to_float($vlen) + + Vec Length + vlen + 1 + int + + $vlen > 0 + + in + complex + $vlen + + + re + float + $vlen + + + im + float + $vlen + 1 + + -- cgit From ed0dffa3c1a84a4b8f3201969896f61af39b86a3 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 23 Jun 2012 08:44:47 -0700 Subject: blocks: added gr::blocks::complex_to_imag --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_complex_to_imag.xml | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 gr-blocks/grc/blocks_complex_to_imag.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 4a520828b..2739919d2 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -43,6 +43,7 @@ blocks_char_to_short blocks_complex_to_interleaved_short blocks_complex_to_float + blocks_complex_to_imag blocks_complex_to_real diff --git a/gr-blocks/grc/blocks_complex_to_imag.xml b/gr-blocks/grc/blocks_complex_to_imag.xml new file mode 100644 index 000000000..cb2c2019f --- /dev/null +++ b/gr-blocks/grc/blocks_complex_to_imag.xml @@ -0,0 +1,29 @@ + + + + Complex to Imag + blocks_complex_to_imag + from gnuradio import blocks + blocks.complex_to_imag($vlen) + + Vec Length + vlen + 1 + int + + $vlen > 0 + + in + complex + $vlen + + + out + float + $vlen + + -- cgit From 48ba99044710dc69c0ebdd3fbe97798622713a9f Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 23 Jun 2012 09:06:19 -0700 Subject: blocks: added gr::blocks::complex_to_mag --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_complex_to_mag.xml | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 gr-blocks/grc/blocks_complex_to_mag.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 2739919d2..0f68ee0d1 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -45,5 +45,6 @@ blocks_complex_to_float blocks_complex_to_imag blocks_complex_to_real + blocks_complex_to_mag diff --git a/gr-blocks/grc/blocks_complex_to_mag.xml b/gr-blocks/grc/blocks_complex_to_mag.xml new file mode 100644 index 000000000..2aa4faee7 --- /dev/null +++ b/gr-blocks/grc/blocks_complex_to_mag.xml @@ -0,0 +1,29 @@ + + + + Complex to Mag + blocks_complex_to_mag + from gnuradio import blocks + blocks.complex_to_mag($vlen) + + Vec Length + vlen + 1 + int + + $vlen > 0 + + in + complex + $vlen + + + out + float + $vlen + + -- cgit From 737b3dc0c41a867ea38c1475a3877bc0fb6f3ee2 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 23 Jun 2012 09:25:42 -0700 Subject: blocks: added gr::blocks::complex_to_mag_squared --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_complex_to_mag_squared.xml | 29 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 gr-blocks/grc/blocks_complex_to_mag_squared.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 0f68ee0d1..d83c99488 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -46,5 +46,6 @@ blocks_complex_to_imag blocks_complex_to_real blocks_complex_to_mag + blocks_complex_to_mag_squared diff --git a/gr-blocks/grc/blocks_complex_to_mag_squared.xml b/gr-blocks/grc/blocks_complex_to_mag_squared.xml new file mode 100644 index 000000000..ee2270fec --- /dev/null +++ b/gr-blocks/grc/blocks_complex_to_mag_squared.xml @@ -0,0 +1,29 @@ + + + + Complex to Mag^2 + blocks_complex_to_mag_squared + from gnuradio import blocks + blocks.complex_to_mag_squared($vlen) + + Vec Length + vlen + 1 + int + + $vlen > 0 + + in + complex + $vlen + + + out + float + $vlen + + -- cgit From 80aa560bbb59cad4d4d351a1e9c8c1fb56897397 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 23 Jun 2012 09:57:06 -0700 Subject: blocks: added gr::blocks::complex_to_arg --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_complex_to_arg.xml | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 gr-blocks/grc/blocks_complex_to_arg.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index d83c99488..537de92cc 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -47,5 +47,6 @@ blocks_complex_to_real blocks_complex_to_mag blocks_complex_to_mag_squared + blocks_complex_to_arg diff --git a/gr-blocks/grc/blocks_complex_to_arg.xml b/gr-blocks/grc/blocks_complex_to_arg.xml new file mode 100644 index 000000000..83140501d --- /dev/null +++ b/gr-blocks/grc/blocks_complex_to_arg.xml @@ -0,0 +1,29 @@ + + + + Complex to Arg + blocks_complex_to_arg + from gnuradio import blocks + blocks.complex_to_arg($vlen) + + Vec Length + vlen + 1 + int + + $vlen > 0 + + in + complex + $vlen + + + out + float + $vlen + + -- cgit From b48716fe0b666cf2be605c0c7d79111c6caf96c5 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sun, 24 Jun 2012 11:20:03 -0700 Subject: blocks: added gr::blocks::float_to_char --- gr-blocks/grc/blocks_block_tree.xml | 3 ++- gr-blocks/grc/blocks_float_to_char.xml | 35 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 gr-blocks/grc/blocks_float_to_char.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 537de92cc..eb0cdd79c 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -23,7 +23,7 @@ @@ -48,5 +48,6 @@ blocks_complex_to_mag blocks_complex_to_mag_squared blocks_complex_to_arg + float_to_char diff --git a/gr-blocks/grc/blocks_float_to_char.xml b/gr-blocks/grc/blocks_float_to_char.xml new file mode 100644 index 000000000..e3854fc4e --- /dev/null +++ b/gr-blocks/grc/blocks_float_to_char.xml @@ -0,0 +1,35 @@ + + + + Float To Char + blocks_float_to_char + from gnuradio import blocks + blocks.float_to_char($vlen, $scale) + set_scale($scale) + + Vec Length + vlen + 1 + int + + + Scale + scale + 1 + real + + + in + float + $vlen + + + out + byte + $vlen + + -- cgit From 8c23d9f9ebfe04b60d59efc636c6d5b02baacc99 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sun, 24 Jun 2012 11:42:20 -0700 Subject: blocks: added gr::blocks::float_to_complex --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_float_to_complex.xml | 36 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 gr-blocks/grc/blocks_float_to_complex.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index eb0cdd79c..29cc2634d 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -49,5 +49,6 @@ blocks_complex_to_mag_squared blocks_complex_to_arg float_to_char + float_to_complex diff --git a/gr-blocks/grc/blocks_float_to_complex.xml b/gr-blocks/grc/blocks_float_to_complex.xml new file mode 100644 index 000000000..6120d5887 --- /dev/null +++ b/gr-blocks/grc/blocks_float_to_complex.xml @@ -0,0 +1,36 @@ + + + + Float To Complex + blocks_float_to_complex + from gnuradio import blocks + blocks.float_to_complex($vlen) + + Vec Length + vlen + 1 + int + + $vlen > 0 + + re + float + $vlen + + + im + float + $vlen + 1 + + + out + complex + $vlen + + -- cgit From 31c61c16e2073f0c3f54a8d0523d8c4f10ca5dd2 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Mon, 25 Jun 2012 06:25:04 -0700 Subject: blocks: added gr::blocks::float_to_int --- gr-blocks/grc/blocks_block_tree.xml | 7 ++++--- gr-blocks/grc/blocks_float_to_int.xml | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 gr-blocks/grc/blocks_float_to_int.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 29cc2634d..169533d34 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -38,7 +38,7 @@ blocks_sub_xx - Type Conversions + Stream Type Conversions blocks_char_to_float blocks_char_to_short blocks_complex_to_interleaved_short @@ -48,7 +48,8 @@ blocks_complex_to_mag blocks_complex_to_mag_squared blocks_complex_to_arg - float_to_char - float_to_complex + blocks_float_to_char + blocks_float_to_complex + blocks_float_to_int diff --git a/gr-blocks/grc/blocks_float_to_int.xml b/gr-blocks/grc/blocks_float_to_int.xml new file mode 100644 index 000000000..0ff5d9cdf --- /dev/null +++ b/gr-blocks/grc/blocks_float_to_int.xml @@ -0,0 +1,35 @@ + + + + Float To Int + blocks_float_to_int + from gnuradio import blocks + blocks.float_to_int($vlen, $scale) + set_scale($scale) + + Vec Length + vlen + 1 + int + + + Scale + scale + 1 + real + + + in + float + $vlen + + + out + int + $vlen + + -- cgit From 86f15ba3488cde9eededa2af5af8dcadc01e9e47 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 26 Jun 2012 06:47:26 -0700 Subject: blocks: added gr::blocks::float_to_short --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_float_to_short.xml | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 gr-blocks/grc/blocks_float_to_short.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 169533d34..f73c634a7 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -51,5 +51,6 @@ blocks_float_to_char blocks_float_to_complex blocks_float_to_int + blocks_float_to_short diff --git a/gr-blocks/grc/blocks_float_to_short.xml b/gr-blocks/grc/blocks_float_to_short.xml new file mode 100644 index 000000000..986e68ec4 --- /dev/null +++ b/gr-blocks/grc/blocks_float_to_short.xml @@ -0,0 +1,35 @@ + + + + Float To Short + blocks_float_to_short + from gnuradio import blocks + blocks.float_to_short($vlen, $scale) + set_scale($scale) + + Vec Length + vlen + 1 + int + + + Scale + scale + 1 + real + + + in + float + $vlen + + + out + short + $vlen + + -- cgit From 0b7655a76e5c73b8f5a8310909cf038f12cbb869 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 26 Jun 2012 07:06:53 -0700 Subject: blocks: added gr::blocks::float_to_uchar --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_float_uchar.xml | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 gr-blocks/grc/blocks_float_uchar.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index f73c634a7..32a81c07a 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -52,5 +52,6 @@ blocks_float_to_complex blocks_float_to_int blocks_float_to_short + blocks_float_to_uchar diff --git a/gr-blocks/grc/blocks_float_uchar.xml b/gr-blocks/grc/blocks_float_uchar.xml new file mode 100644 index 000000000..d190eafcf --- /dev/null +++ b/gr-blocks/grc/blocks_float_uchar.xml @@ -0,0 +1,20 @@ + + + + Float To UChar + blocks_float_to_uchar + from gnuradio import blocks + blocks.float_to_uchar() + + in + float + + + out + byte + + -- cgit From 3de0c77ed91e417c0b54972a78ffbad62f4bbb87 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 26 Jun 2012 19:43:01 -0700 Subject: blocks: added gr::blocks::float_to_int --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_int_to_float.xml | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 gr-blocks/grc/blocks_int_to_float.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 32a81c07a..68135b924 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -53,5 +53,6 @@ blocks_float_to_int blocks_float_to_short blocks_float_to_uchar + blocks_int_to_float diff --git a/gr-blocks/grc/blocks_int_to_float.xml b/gr-blocks/grc/blocks_int_to_float.xml new file mode 100644 index 000000000..2bb25d8be --- /dev/null +++ b/gr-blocks/grc/blocks_int_to_float.xml @@ -0,0 +1,35 @@ + + + + Int To Float + blocks_int_to_float + from gnuradio import blocks + blocks.int_to_float($vlen, $scale) + set_scale($scale) + + Vec Length + vlen + 1 + int + + + Scale + scale + 1 + real + + + in + int + $vlen + + + out + float + $vlen + + -- cgit From be1219b0623bbceb5bca6a6f6774f0669f52bdde Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Wed, 27 Jun 2012 06:50:22 -0700 Subject: blocks: added gr::blocks::interleaved_short_to_complex --- gr-blocks/grc/blocks_block_tree.xml | 5 +++-- .../grc/blocks_interleaved_short_to_complex.xml | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 gr-blocks/grc/blocks_interleaved_short_to_complex.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 68135b924..9a56d4c41 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -29,7 +29,7 @@ - Math Operations + Math Operations (New) blocks_add_xx blocks_add_const_vxx blocks_divide_xx @@ -38,7 +38,7 @@ blocks_sub_xx - Stream Type Conversions + Stream Type Conversions (New) blocks_char_to_float blocks_char_to_short blocks_complex_to_interleaved_short @@ -54,5 +54,6 @@ blocks_float_to_short blocks_float_to_uchar blocks_int_to_float + blocks_interleaved_short_to_complex diff --git a/gr-blocks/grc/blocks_interleaved_short_to_complex.xml b/gr-blocks/grc/blocks_interleaved_short_to_complex.xml new file mode 100644 index 000000000..e44113e74 --- /dev/null +++ b/gr-blocks/grc/blocks_interleaved_short_to_complex.xml @@ -0,0 +1,20 @@ + + + + IShort To Complex + blocks_interleaved_short_to_complex + from gnuradio import blocks + blocks.interleaved_short_to_complex() + + in + short + + + out + complex + + -- cgit From c128e5aee66838c849ffc2ac45217ff1efab42e8 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 28 Jun 2012 09:02:58 -0700 Subject: blocks: added gr::blocks::short_to_char --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_short_to_char.xml | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 gr-blocks/grc/blocks_short_to_char.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 9a56d4c41..64af22cfd 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -55,5 +55,6 @@ blocks_float_to_uchar blocks_int_to_float blocks_interleaved_short_to_complex + blocks_short_to_char diff --git a/gr-blocks/grc/blocks_short_to_char.xml b/gr-blocks/grc/blocks_short_to_char.xml new file mode 100644 index 000000000..1951333d1 --- /dev/null +++ b/gr-blocks/grc/blocks_short_to_char.xml @@ -0,0 +1,28 @@ + + + + Short To Char + blocks_short_to_char + from gnuradio import blocks + blocks.short_to_char($vlen) + + Vec Length + vlen + 1 + int + + + in + short + $vlen + + + out + byte + $vlen + + -- cgit From 9482c8986d0a7bd4772a78972880a9e574531052 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 28 Jun 2012 09:27:59 -0700 Subject: blocks: added gr::blocks::short_to_float --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_short_to_float.xml | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 gr-blocks/grc/blocks_short_to_float.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 64af22cfd..f277706f6 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -56,5 +56,6 @@ blocks_int_to_float blocks_interleaved_short_to_complex blocks_short_to_char + blocks_short_to_float diff --git a/gr-blocks/grc/blocks_short_to_float.xml b/gr-blocks/grc/blocks_short_to_float.xml new file mode 100644 index 000000000..23ea019bc --- /dev/null +++ b/gr-blocks/grc/blocks_short_to_float.xml @@ -0,0 +1,35 @@ + + + + Short To Float + blocks_short_to_float + from gnuradio import blocks + blocks.short_to_float($vlen, $scale) + set_scale($scale) + + Vec Length + vlen + 1 + int + + + Scale + scale + 1 + real + + + in + short + $vlen + + + out + float + $vlen + + -- cgit From a3b74a25fcba67f61bf3cabb25286201f1263b0a Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 28 Jun 2012 09:46:38 -0700 Subject: blocks: added gr::blocks::uchar_to_float --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_uchar_to_float.xml | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 gr-blocks/grc/blocks_uchar_to_float.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index f277706f6..d32147987 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -57,5 +57,6 @@ blocks_interleaved_short_to_complex blocks_short_to_char blocks_short_to_float + blocks_uchar_to_float diff --git a/gr-blocks/grc/blocks_uchar_to_float.xml b/gr-blocks/grc/blocks_uchar_to_float.xml new file mode 100644 index 000000000..eb2b5505e --- /dev/null +++ b/gr-blocks/grc/blocks_uchar_to_float.xml @@ -0,0 +1,20 @@ + + + + UChar To Float + blocks_uchar_to_float + from gnuradio import blocks + blocks.uchar_to_float() + + in + byte + + + out + float + + -- cgit From f2e815329402f170231c054e108b531094d046be Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Fri, 29 Jun 2012 08:10:15 -0700 Subject: blocks: added gr::blocks::conjugate_cc --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_conjugate_cc.xml | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 gr-blocks/grc/blocks_conjugate_cc.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index d32147987..197daa0f6 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -36,6 +36,7 @@ blocks_multiply_xx blocks_multiply_const_vxx blocks_sub_xx + blocks_conjugate_cc Stream Type Conversions (New) diff --git a/gr-blocks/grc/blocks_conjugate_cc.xml b/gr-blocks/grc/blocks_conjugate_cc.xml new file mode 100644 index 000000000..152f797b2 --- /dev/null +++ b/gr-blocks/grc/blocks_conjugate_cc.xml @@ -0,0 +1,20 @@ + + + + Complex Conjugate + blocks_conjugate_cc + from gnuradio import blocks + blocks.conjugate_cc() + + in + complex + + + out + complex + + -- cgit From bfcc9dc634cc8d7da77b109a7ad9cd90714fd768 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Fri, 29 Jun 2012 08:30:23 -0700 Subject: blocks: added gr::blocks::integrate_XX with ss ii ff cc --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_integrate_xx.xml | 50 +++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 gr-blocks/grc/blocks_integrate_xx.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 197daa0f6..d7cbbeb55 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -37,6 +37,7 @@ blocks_multiply_const_vxx blocks_sub_xx blocks_conjugate_cc + blocks_integrate_xx Stream Type Conversions (New) diff --git a/gr-blocks/grc/blocks_integrate_xx.xml b/gr-blocks/grc/blocks_integrate_xx.xml new file mode 100644 index 000000000..13c2ec3c8 --- /dev/null +++ b/gr-blocks/grc/blocks_integrate_xx.xml @@ -0,0 +1,50 @@ + + + + Integrate + blocks_integrate_xx + from gnuradio import blocks + blocks.integrate_$(type.fcn)($decim) + + IO Type + type + enum + + + + + + + Decimation + decim + int + + + in + $type + + + out + $type + + -- cgit From ee1a53b4a971e4b9623f504628231a273157f462 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 30 Jun 2012 08:26:58 -0700 Subject: blocks: aded gr::blocks::multiply_conjugate_cc --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_multiply_conjugate_cc.xml | 35 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 gr-blocks/grc/blocks_multiply_conjugate_cc.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index d7cbbeb55..638fb5941 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -35,6 +35,7 @@ blocks_divide_xx blocks_multiply_xx blocks_multiply_const_vxx + blocks_multiply_conjugate_cc blocks_sub_xx blocks_conjugate_cc blocks_integrate_xx diff --git a/gr-blocks/grc/blocks_multiply_conjugate_cc.xml b/gr-blocks/grc/blocks_multiply_conjugate_cc.xml new file mode 100644 index 000000000..cf0acf4d8 --- /dev/null +++ b/gr-blocks/grc/blocks_multiply_conjugate_cc.xml @@ -0,0 +1,35 @@ + + + + Multiply Conjugate + blocks_multiply_conjugate_cc + from gnuradio import blocks + blocks.multiply_conjugate_cc($vlen) + + Vec Length + vlen + 1 + int + + $vlen > 0 + + in0 + complex + $vlen + + + in1 + complex + $vlen + + + out + complex + $vlen + + -- cgit From 70d89e2051264876055fe9f73cbcb2823806b3ee Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sun, 1 Jul 2012 09:15:14 -0700 Subject: blocks: added gr::blocks::nlog10_ff --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_nlog10_ff.xml | 42 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 gr-blocks/grc/blocks_nlog10_ff.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 638fb5941..721a6d238 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -39,6 +39,7 @@ blocks_sub_xx blocks_conjugate_cc blocks_integrate_xx + blocks_nlog10_ff Stream Type Conversions (New) diff --git a/gr-blocks/grc/blocks_nlog10_ff.xml b/gr-blocks/grc/blocks_nlog10_ff.xml new file mode 100644 index 000000000..884f4a444 --- /dev/null +++ b/gr-blocks/grc/blocks_nlog10_ff.xml @@ -0,0 +1,42 @@ + + + + Log10 + blocks_nlog10_ff + from gnuradio import blocks + blocks.nlog10_ff($n, $vlen, $k) + + n + n + 1 + real + + + k + k + 0 + real + + + Vec Length + vlen + 1 + int + + $vlen >= 1 + + in + float + $vlen + + + out + float + $vlen + + -- cgit From cc085e128901a9f3e8bfcc45d1834a62d747726c Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Mon, 2 Jul 2012 08:36:46 -0700 Subject: blocks: added gr::blocks::add_XX (bb ss ii) --- gr-blocks/grc/blocks_and_xx.xml | 48 +++++++++++++++++++++++++++++++++++++ gr-blocks/grc/blocks_block_tree.xml | 6 ++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 gr-blocks/grc/blocks_and_xx.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_and_xx.xml b/gr-blocks/grc/blocks_and_xx.xml new file mode 100644 index 000000000..317a0f645 --- /dev/null +++ b/gr-blocks/grc/blocks_and_xx.xml @@ -0,0 +1,48 @@ + + + + And + blocks_and_xx + from gnuradio import blocks + blocks.and_$(type.fcn)() + + IO Type + type + enum + + + + + + Num Inputs + num_inputs + 2 + int + + $num_inputs >= 2 + + in + $type + $num_inputs + + + out + $type + + diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 721a6d238..3aed8dc22 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -27,7 +27,7 @@ ################################################### --> - + Math Operations (New) blocks_add_xx @@ -41,6 +41,10 @@ blocks_integrate_xx blocks_nlog10_ff + + Boolean Operations (New) + blocks_and_xx.xml + Stream Type Conversions (New) blocks_char_to_float -- cgit From 025f323d9857715a31a1117693c5debd19393a46 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Mon, 2 Jul 2012 09:13:13 -0700 Subject: blocks: added gr::blocks::and_const_XX (bb ss ii) --- gr-blocks/grc/blocks_and_const_xx.xml | 48 +++++++++++++++++++++++++++++++++++ gr-blocks/grc/blocks_block_tree.xml | 1 + 2 files changed, 49 insertions(+) create mode 100644 gr-blocks/grc/blocks_and_const_xx.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_and_const_xx.xml b/gr-blocks/grc/blocks_and_const_xx.xml new file mode 100644 index 000000000..d0abbfe51 --- /dev/null +++ b/gr-blocks/grc/blocks_and_const_xx.xml @@ -0,0 +1,48 @@ + + + + And Const + blocks_and_const_xx + from gnuradio import blocks + blocks.and_const_$(type.fcn)($const) + set_k($const) + + IO Type + type + enum + + + + + + Constant + const + 0 + int + + + in + $type + + + out + $type + + diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 3aed8dc22..e5566ee43 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -44,6 +44,7 @@ Boolean Operations (New) blocks_and_xx.xml + blocks_and_const_xx.xml Stream Type Conversions (New) -- cgit From 84f9822b4a8fe4290e971c09b2bd99f1bf59517b Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 3 Jul 2012 09:49:20 -0700 Subject: blocks: added gr::blocks::not_XX (bb ss ii) --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_not_xx.xml | 40 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 gr-blocks/grc/blocks_not_xx.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index e5566ee43..bc2a6fa4e 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -45,6 +45,7 @@ Boolean Operations (New) blocks_and_xx.xml blocks_and_const_xx.xml + blocks_not_xx.xml Stream Type Conversions (New) diff --git a/gr-blocks/grc/blocks_not_xx.xml b/gr-blocks/grc/blocks_not_xx.xml new file mode 100644 index 000000000..fe8916d8b --- /dev/null +++ b/gr-blocks/grc/blocks_not_xx.xml @@ -0,0 +1,40 @@ + + + + Not + blocks_not_xx + from gnuradio import blocks + blocks.not_$(type.fcn)() + + IO Type + type + enum + + + + + + in + $type + + + out + $type + + -- cgit From 4c85f46aee089432b090b988dedbc42091084ba3 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Wed, 4 Jul 2012 07:11:51 -0700 Subject: blocks: added gr::blocks::or_XX (bb ss ii) --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_or_xx.xml | 48 +++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 gr-blocks/grc/blocks_or_xx.xml (limited to 'gr-blocks/grc') 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 @@ blocks_and_xx.xml blocks_and_const_xx.xml blocks_not_xx.xml + blocks_or_xx.xml Stream Type Conversions (New) 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 @@ + + + + Or + blocks_or_xx + from gnuradio import blocks + blocks.or_$(type.fcn)() + + IO Type + type + enum + + + + + + Num Inputs + num_inputs + 2 + int + + $num_inputs >= 2 + + in + $type + $num_inputs + + + out + $type + + -- cgit From a76cd7d47576054d7fac37710a8f79b908d18b00 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Wed, 4 Jul 2012 07:22:49 -0700 Subject: blocks: added gr::blocks::xor_XX (bb ss ii) --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_xor_xx.xml | 48 +++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 gr-blocks/grc/blocks_xor_xx.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index e2658a373..853086858 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -47,6 +47,7 @@ blocks_and_const_xx.xml blocks_not_xx.xml blocks_or_xx.xml + blocks_xor_xx.xml Stream Type Conversions (New) diff --git a/gr-blocks/grc/blocks_xor_xx.xml b/gr-blocks/grc/blocks_xor_xx.xml new file mode 100644 index 000000000..d2886a4e0 --- /dev/null +++ b/gr-blocks/grc/blocks_xor_xx.xml @@ -0,0 +1,48 @@ + + + + Xor + blocks_xor_xx + from gnuradio import blocks + blocks.xor_$(type.fcn)() + + IO Type + type + enum + + + + + + Num Inputs + num_inputs + 2 + int + + $num_inputs >= 2 + + in + $type + $num_inputs + + + out + $type + + -- cgit From 44647064669928517b233ca26bd97cd87847a235 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 5 Jul 2012 09:25:29 -0700 Subject: blocks: added gr::blocks::deinterleave --- gr-blocks/grc/blocks_block_tree.xml | 4 +++ gr-blocks/grc/blocks_deinterleave.xml | 67 +++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 gr-blocks/grc/blocks_deinterleave.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 853086858..e4aed9809 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -71,4 +71,8 @@ blocks_short_to_float blocks_uchar_to_float + + Stream Operations (New) + blocks_deinterleave.xml + diff --git a/gr-blocks/grc/blocks_deinterleave.xml b/gr-blocks/grc/blocks_deinterleave.xml new file mode 100644 index 000000000..103091324 --- /dev/null +++ b/gr-blocks/grc/blocks_deinterleave.xml @@ -0,0 +1,67 @@ + + + + Deinterleave + blocks_deinterleave + from gnuradio import blocks + blocks.deinterleave($type.size*$vlen) + + IO Type + type + enum + + + + + + + + Num Streams + num_streams + 2 + int + + + Vec Length + vlen + 1 + int + + $num_streams > 0 + $vlen >= 1 + + in + $type + $vlen + + + out + $type + $vlen + $num_streams + + -- cgit From 27694edd168bc1260ff04950e837a6580afc49ab Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Fri, 6 Jul 2012 08:17:40 -0700 Subject: blocks: added gr::blocks::interleave --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_interleave.xml | 67 +++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 gr-blocks/grc/blocks_interleave.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index e4aed9809..dfbe88b05 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -74,5 +74,6 @@ Stream Operations (New) blocks_deinterleave.xml + blocks_interleave.xml diff --git a/gr-blocks/grc/blocks_interleave.xml b/gr-blocks/grc/blocks_interleave.xml new file mode 100644 index 000000000..f01a3be6d --- /dev/null +++ b/gr-blocks/grc/blocks_interleave.xml @@ -0,0 +1,67 @@ + + + + Interleave + blocks_interleave + from gnuradio import blocks + blocks.interleave($type.size*$vlen) + + IO Type + type + enum + + + + + + + + Num Streams + num_streams + 2 + int + + + Vec Length + vlen + 1 + int + + $num_streams > 0 + $vlen >= 1 + + in + $type + $vlen + $num_streams + + + out + $type + $vlen + + -- cgit From 4e06f35f611aff2e1d4983327da54cf63e5b9ada Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Sat, 7 Jul 2012 07:06:51 -0700 Subject: blocks: added gr::blocks::keep_one_in_n --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_keep_one_in_n.xml | 67 ++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 gr-blocks/grc/blocks_keep_one_in_n.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index dfbe88b05..37cd2fc4d 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -75,5 +75,6 @@ Stream Operations (New) blocks_deinterleave.xml blocks_interleave.xml + blocks_keep_one_in_n.xml diff --git a/gr-blocks/grc/blocks_keep_one_in_n.xml b/gr-blocks/grc/blocks_keep_one_in_n.xml new file mode 100644 index 000000000..4289a984f --- /dev/null +++ b/gr-blocks/grc/blocks_keep_one_in_n.xml @@ -0,0 +1,67 @@ + + + + Keep 1 in N + blocks_keep_one_in_n + from gnuradio import blocks + blocks.keep_one_in_n($type.size*$vlen, $n) + set_n($n) + + Type + type + enum + + + + + + + + N + n + 1 + int + + + Vec Length + vlen + 1 + int + + $n > 0 + $vlen > 0 + + in + $type + $vlen + + + out + $type + $vlen + + -- cgit From bbd91d7a08bfc0c229267e5dc848d1f57d629373 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 19 Jul 2012 06:27:19 -0700 Subject: blocks: added gr::blocks::keep_m_in_n --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_keep_m_in_n.xml | 76 ++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 gr-blocks/grc/blocks_keep_m_in_n.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 37cd2fc4d..c2e45b9eb 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -75,6 +75,7 @@ Stream Operations (New) blocks_deinterleave.xml blocks_interleave.xml + blocks_keep_m_in_n.xml blocks_keep_one_in_n.xml diff --git a/gr-blocks/grc/blocks_keep_m_in_n.xml b/gr-blocks/grc/blocks_keep_m_in_n.xml new file mode 100644 index 000000000..9e861749b --- /dev/null +++ b/gr-blocks/grc/blocks_keep_m_in_n.xml @@ -0,0 +1,76 @@ + + + + Keep M in N + blocks_keep_m_in_n + from gnuradio import blocks + blocks.keep_m_in_n($type.size, $m, $n, $offset) + set_offset($offset) + set_m($m) + set_n($n) + + Type + type + enum + + + + + + + + M + m + 1 + int + + + N + n + 2 + int + + + initial offset + offset + 0 + int + + $n > 0 + $m > 0 + $m < $n + + in + $type + 1 + + + out + $type + 1 + + -- cgit From 66f49de1986dd531bee011299d4b1f7c62872d39 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 19 Jul 2012 07:02:45 -0700 Subject: blocks: added gr::blocks::repeat --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_repeat.xml | 64 +++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 gr-blocks/grc/blocks_repeat.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index c2e45b9eb..557bf64db 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -77,5 +77,6 @@ blocks_interleave.xml blocks_keep_m_in_n.xml blocks_keep_one_in_n.xml + blocks_repeat.xml diff --git a/gr-blocks/grc/blocks_repeat.xml b/gr-blocks/grc/blocks_repeat.xml new file mode 100644 index 000000000..c6c17c990 --- /dev/null +++ b/gr-blocks/grc/blocks_repeat.xml @@ -0,0 +1,64 @@ + + + + Repeat + blocks_repeat + from gnuradio import blocks + blocks.repeat($type.size*$vlen, $interp) + + Type + type + enum + + + + + + + + Interpolation + interp + int + + + Vec Length + vlen + 1 + int + + $vlen > 0 + + in + $type + $vlen + + + out + $type + $vlen + + -- cgit From 0a5bb996ca4f4bb350cf91b00b4c3db5a5c4eb75 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Wed, 29 Aug 2012 09:29:50 -0700 Subject: blocks: added gr::blocks::stream_mux --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_stream_mux.xml | 75 +++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 gr-blocks/grc/blocks_stream_mux.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 557bf64db..8f98f15e0 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -78,5 +78,6 @@ blocks_keep_m_in_n.xml blocks_keep_one_in_n.xml blocks_repeat.xml + stream_mux.xml diff --git a/gr-blocks/grc/blocks_stream_mux.xml b/gr-blocks/grc/blocks_stream_mux.xml new file mode 100644 index 000000000..5e56a65d9 --- /dev/null +++ b/gr-blocks/grc/blocks_stream_mux.xml @@ -0,0 +1,75 @@ + + + + Stream Mux + blocks_stream_mux + from gnuradio import blocks + blocks.stream_mux($type.size*$vlen, $lengths) + + Type + type + enum + + + + + + + + Lengths + lengths + 1, 1 + int_vector + + + Num Inputs + num_inputs + 2 + int + + + Vec Length + vlen + 1 + int + + $num_inputs > 0 + $num_inputs == len($lengths) + $vlen > 0 + + in + $type + $vlen + $num_inputs + + + out + $type + $vlen + + -- cgit From b434b7329301fee49ab82a81ac68517f8ab042eb Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 30 Aug 2012 14:29:28 -0700 Subject: blocks: added gr::blocks::stream_to_streams --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_stream_to_streams.xml | 67 ++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 gr-blocks/grc/blocks_stream_to_streams.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 8f98f15e0..076c1b221 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -79,5 +79,6 @@ blocks_keep_one_in_n.xml blocks_repeat.xml stream_mux.xml + stream_to_streams.xml diff --git a/gr-blocks/grc/blocks_stream_to_streams.xml b/gr-blocks/grc/blocks_stream_to_streams.xml new file mode 100644 index 000000000..c164e477b --- /dev/null +++ b/gr-blocks/grc/blocks_stream_to_streams.xml @@ -0,0 +1,67 @@ + + + + Stream to Streams + blocks_stream_to_streams + from gnuradio import blocks + blocks.stream_to_streams($type.size*$vlen, $num_streams) + + IO Type + type + enum + + + + + + + + Num Streams + num_streams + 2 + int + + + Vec Length + vlen + 1 + int + + $num_streams > 0 + $vlen >= 1 + + in + $type + $vlen + + + out + $type + $vlen + $num_streams + + -- cgit From 0aec5b7f568b0cfc320a202631757efc247aca6e Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 4 Sep 2012 15:21:35 -0700 Subject: blocks: added gr::blocks::stream_to_vector --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_stream_to_vector.xml | 66 +++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 gr-blocks/grc/blocks_stream_to_vector.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 076c1b221..6bd39c4f4 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -80,5 +80,6 @@ blocks_repeat.xml stream_mux.xml stream_to_streams.xml + stream_to_vector.xml diff --git a/gr-blocks/grc/blocks_stream_to_vector.xml b/gr-blocks/grc/blocks_stream_to_vector.xml new file mode 100644 index 000000000..8965dfbfe --- /dev/null +++ b/gr-blocks/grc/blocks_stream_to_vector.xml @@ -0,0 +1,66 @@ + + + + Stream to Vector + blocks_stream_to_vector + from gnuradio import blocks + blocks.stream_to_vector($type.size*$vlen, $num_items) + + IO Type + type + enum + + + + + + + + Num Items + num_items + 2 + int + + + Vec Length + vlen + 1 + int + + $num_items > 0 + $vlen >= 1 + + in + $type + $vlen + + + out + $type + $vlen*$num_items + + -- cgit From 2065177207d9f504fdcd374ed6567379c51c7a06 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 4 Sep 2012 15:38:17 -0700 Subject: blocks: added gr::blocks::streams_to_stream --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_streams_to_stream.xml | 67 ++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 gr-blocks/grc/blocks_streams_to_stream.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 6bd39c4f4..1bcf672b9 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -81,5 +81,6 @@ stream_mux.xml stream_to_streams.xml stream_to_vector.xml + streams_to_stream.xml diff --git a/gr-blocks/grc/blocks_streams_to_stream.xml b/gr-blocks/grc/blocks_streams_to_stream.xml new file mode 100644 index 000000000..2aa17dbe2 --- /dev/null +++ b/gr-blocks/grc/blocks_streams_to_stream.xml @@ -0,0 +1,67 @@ + + + + Streams to Stream + blocks_streams_to_stream + from gnuradio import blocks + blocks.streams_to_stream($type.size*$vlen, $num_streams) + + IO Type + type + enum + + + + + + + + Num Streams + num_streams + 2 + int + + + Vec Length + vlen + 1 + int + + $num_streams > 0 + $vlen >= 1 + + in + $type + $vlen + $num_streams + + + out + $type + $vlen + + -- cgit From 14a6b7beb247128408a98acd77cef66eaef2b4c3 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 4 Sep 2012 16:01:42 -0700 Subject: blocks: added gr::blocks::streams_to_vector --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_streams_to_vector.xml | 67 ++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 gr-blocks/grc/blocks_streams_to_vector.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 1bcf672b9..6be3a21ef 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -82,5 +82,6 @@ stream_to_streams.xml stream_to_vector.xml streams_to_stream.xml + streams_to_vector.xml diff --git a/gr-blocks/grc/blocks_streams_to_vector.xml b/gr-blocks/grc/blocks_streams_to_vector.xml new file mode 100644 index 000000000..dc371f021 --- /dev/null +++ b/gr-blocks/grc/blocks_streams_to_vector.xml @@ -0,0 +1,67 @@ + + + + Streams to Vector + blocks_streams_to_vector + from gnuradio import blocks + blocks.streams_to_vector($type.size*$vlen, $num_streams) + + IO Type + type + enum + + + + + + + + Num Streams + num_streams + 2 + int + + + Vec Length + vlen + 1 + int + + $num_streams > 0 + $vlen >= 1 + + in + $type + $vlen + $num_streams + + + out + $type + $vlen*$num_streams + + -- cgit From 73d59860c4cc0e2b22c21d56cd5cdfcb969263eb Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 4 Sep 2012 16:25:00 -0700 Subject: blocks: added gr::blocks::vector_to_stream --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_vector_to_stream.xml | 66 +++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 gr-blocks/grc/blocks_vector_to_stream.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 6be3a21ef..3d66110e5 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -83,5 +83,6 @@ stream_to_vector.xml streams_to_stream.xml streams_to_vector.xml + vector_to_stream.xml diff --git a/gr-blocks/grc/blocks_vector_to_stream.xml b/gr-blocks/grc/blocks_vector_to_stream.xml new file mode 100644 index 000000000..a4a77bef8 --- /dev/null +++ b/gr-blocks/grc/blocks_vector_to_stream.xml @@ -0,0 +1,66 @@ + + + + Vector to Stream + blocks_vector_to_stream + from gnuradio import blocks + blocks.vector_to_stream($type.size*$vlen, $num_items) + + IO Type + type + enum + + + + + + + + Num Items + num_items + 2 + int + + + Vec Length + vlen + 1 + int + + $num_items > 0 + $vlen >= 1 + + in + $type + $vlen*$num_items + + + out + $type + $vlen + + -- cgit From c5ddf4c26bf8bc049622b2e9ffcdcdba3265b580 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Tue, 4 Sep 2012 16:39:30 -0700 Subject: blocks: added gr::blocks::vector_to_streams --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_vector_to_streams.xml | 67 ++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 gr-blocks/grc/blocks_vector_to_streams.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 3d66110e5..94d09e9eb 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -84,5 +84,6 @@ streams_to_stream.xml streams_to_vector.xml vector_to_stream.xml + vector_to_streams.xml diff --git a/gr-blocks/grc/blocks_vector_to_streams.xml b/gr-blocks/grc/blocks_vector_to_streams.xml new file mode 100644 index 000000000..6a246b98d --- /dev/null +++ b/gr-blocks/grc/blocks_vector_to_streams.xml @@ -0,0 +1,67 @@ + + + + Vector to Streams + blocks_vector_to_streams + from gnuradio import blocks + blocks.vector_to_streams($type.size*$vlen, $num_streams) + + IO Type + type + enum + + + + + + + + Num Streams + num_streams + 2 + int + + + Vec Length + vlen + 1 + int + + $num_streams > 0 + $vlen >= 1 + + in + $type + $vlen*$num_streams + + + out + $type + $vlen + $num_streams + + -- cgit From 2d2afd3b387bd3426cc30239f679d48cefe9eb93 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Wed, 5 Sep 2012 12:42:10 -0700 Subject: blocks: added gr::blocks::file_source --- gr-blocks/grc/blocks_block_tree.xml | 4 ++ gr-blocks/grc/blocks_file_source.xml | 74 ++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 gr-blocks/grc/blocks_file_source.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 94d09e9eb..cceb6c802 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -28,6 +28,10 @@ --> + + Sources (New) + blocks_file_source + Math Operations (New) blocks_add_xx diff --git a/gr-blocks/grc/blocks_file_source.xml b/gr-blocks/grc/blocks_file_source.xml new file mode 100644 index 000000000..753465bb3 --- /dev/null +++ b/gr-blocks/grc/blocks_file_source.xml @@ -0,0 +1,74 @@ + + + + File Source + blocks_file_source + from gnuradio import blocks + blocks.file_source($type.size*$vlen, $file, $repeat) + + File + file + + file_open + + + Output Type + type + enum + + + + + + + + Repeat + repeat + True + enum + + + + + Vec Length + vlen + 1 + int + + $vlen > 0 + + out + $type + $vlen + + -- cgit