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/lib/CMakeLists.txt | 126 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 gr-blocks/lib/CMakeLists.txt (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt new file mode 100644 index 000000000..f5ed77f3b --- /dev/null +++ b/gr-blocks/lib/CMakeLists.txt @@ -0,0 +1,126 @@ +# 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. + +######################################################################## +# generate helper scripts to expand templated files +######################################################################## +include(GrPython) + +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py " +#!${PYTHON_EXECUTABLE} + +import sys, os, re +sys.path.append('${GR_CORE_PYTHONPATH}') +os.environ['srcdir'] = '${CMAKE_CURRENT_SOURCE_DIR}' +os.chdir('${CMAKE_CURRENT_BINARY_DIR}') + +if __name__ == '__main__': + import build_utils + root, inp = sys.argv[1:3] + for sig in sys.argv[3:]: + name = re.sub ('X+', sig, root) + d = build_utils.standard_dict(name, sig, 'blocks') + build_utils.expand_template(d, inp, '_impl') +") + +macro(expand_cc_h_impl root) + #make a list of all the generated files + unset(expanded_files_cc) + unset(expanded_files_h) + foreach(sig ${ARGN}) + string(REGEX REPLACE "X+" ${sig} name ${root}) + list(APPEND expanded_files_cc_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.cc) + list(APPEND expanded_files_h_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.h) + list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/../include/${name}.h) + endforeach(sig) + + #create a command to generate the _impl.cc files + add_custom_command( + OUTPUT ${expanded_files_cc_impl} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}_impl.cc.t + COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} + ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py + ${root} ${root}_impl.cc.t ${ARGN} + ) + + #create a command to generate the _impl.h files + add_custom_command( + OUTPUT ${expanded_files_h_impl} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${root}_impl.h.t + COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} + ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py + ${root} ${root}_impl.h.t ${ARGN} + ) + + #make _impl.cc source files depend on headers to force generation + set_source_files_properties(${expanded_files_cc_impl} + PROPERTIES OBJECT_DEPENDS "${expanded_files_h_impl}" + ) + + #make _impl.h source files depend on headers to force generation + set_source_files_properties(${expanded_files_h_impl} + PROPERTIES OBJECT_DEPENDS "${expanded_files_h}" + ) + + #install rules for the generated cc files + list(APPEND generated_sources ${expanded_files_cc_impl}) +endmacro(expand_cc_h_impl) + +######################################################################## +# Invoke macro to generate various sources +######################################################################## +expand_cc_h_impl(add_XX ss ii cc) + +######################################################################## +# Setup the include and linker paths +######################################################################## +include_directories( + ${GNURADIO_CORE_INCLUDE_DIRS} + ${VOLK_INCLUDE_DIRS} + ${GR_BLOCKS_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR}/../include +) + +include_directories(${BLOCKS_INCLUDE_DIRS}) +link_directories(${BLOCKS_LIBRARY_DIRS}) + +include_directories(${Boost_INCLUDE_DIRS}) +link_directories(${Boost_LIBRARY_DIRS}) + +######################################################################## +# Setup library +######################################################################## +list(APPEND gr_blocks_sources + ${generated_sources} + add_ff_impl.cc +) + +list(APPEND blocks_libs + gnuradio-core + ${Boost_LIBRARIES} + ${BLOCKS_LIBRARIES} +) + +add_library(gnuradio-blocks SHARED ${gr_blocks_sources}) +add_dependencies(gnuradio-blocks blocks_generated_includes) + +target_link_libraries(gnuradio-blocks ${blocks_libs}) +GR_LIBRARY_FOO(gnuradio-blocks RUNTIME_COMPONENT "blocks_runtime" DEVEL_COMPONENT "blocks_devel") -- 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/lib/CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index f5ed77f3b..334d18830 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -41,8 +41,8 @@ if __name__ == '__main__': macro(expand_cc_h_impl root) #make a list of all the generated files - unset(expanded_files_cc) - unset(expanded_files_h) + unset(expanded_files_cc_impl) + unset(expanded_files_h_impl) foreach(sig ${ARGN}) string(REGEX REPLACE "X+" ${sig} name ${root}) list(APPEND expanded_files_cc_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.cc) @@ -85,7 +85,8 @@ endmacro(expand_cc_h_impl) ######################################################################## # Invoke macro to generate various sources ######################################################################## -expand_cc_h_impl(add_XX ss ii cc) +expand_cc_h_impl(add_XX ss ii cc) +expand_cc_h_impl(add_const_XX ss ii ff cc) ######################################################################## # Setup the include and linker paths -- 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/lib/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 334d18830..7894c34ea 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -87,6 +87,7 @@ endmacro(expand_cc_h_impl) ######################################################################## expand_cc_h_impl(add_XX ss ii cc) expand_cc_h_impl(add_const_XX ss ii ff cc) +expand_cc_h_impl(multiply_XX ss ii) ######################################################################## # Setup the include and linker paths @@ -112,6 +113,8 @@ link_directories(${Boost_LIBRARY_DIRS}) list(APPEND gr_blocks_sources ${generated_sources} add_ff_impl.cc + multiply_cc_impl.cc + multiply_ff_impl.cc ) list(APPEND blocks_libs -- 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/lib/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 7894c34ea..8f433182c 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -85,9 +85,12 @@ endmacro(expand_cc_h_impl) ######################################################################## # Invoke macro to generate various sources ######################################################################## -expand_cc_h_impl(add_XX ss ii cc) -expand_cc_h_impl(add_const_XX ss ii ff cc) -expand_cc_h_impl(multiply_XX ss ii) +expand_cc_h_impl(add_XX ss ii cc) +expand_cc_h_impl(add_const_XX ss ii ff cc) +expand_cc_h_impl(add_const_vXX ss ii ff cc) +expand_cc_h_impl(multiply_XX ss ii) +expand_cc_h_impl(multiply_const_XX ss ii) +expand_cc_h_impl(multiply_const_vXX ss ii ff cc) ######################################################################## # Setup the include and linker paths @@ -115,6 +118,8 @@ list(APPEND gr_blocks_sources add_ff_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc + multiply_const_cc_impl.cc + multiply_const_ff_impl.cc ) list(APPEND blocks_libs -- 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/lib/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 8f433182c..6cdfdd03c 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -88,9 +88,11 @@ endmacro(expand_cc_h_impl) expand_cc_h_impl(add_XX ss ii cc) expand_cc_h_impl(add_const_XX ss ii ff cc) expand_cc_h_impl(add_const_vXX ss ii ff cc) +expand_cc_h_impl(divide_XX ss ii ff cc) expand_cc_h_impl(multiply_XX ss ii) expand_cc_h_impl(multiply_const_XX ss ii) expand_cc_h_impl(multiply_const_vXX ss ii ff cc) +expand_cc_h_impl(sub_XX ss ii ff cc) ######################################################################## # Setup the include and linker paths -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 6cdfdd03c..a3bb67e4d 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -118,6 +118,7 @@ link_directories(${Boost_LIBRARY_DIRS}) list(APPEND gr_blocks_sources ${generated_sources} add_ff_impl.cc + char_to_float_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index a3bb67e4d..501529dd9 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -119,6 +119,7 @@ list(APPEND gr_blocks_sources ${generated_sources} add_ff_impl.cc char_to_float_impl.cc + char_to_short_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 501529dd9..907ad672e 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -120,6 +120,7 @@ list(APPEND gr_blocks_sources add_ff_impl.cc char_to_float_impl.cc char_to_short_impl.cc + complex_to_interleaved_short_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 907ad672e..0adf3c9f7 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -121,6 +121,7 @@ list(APPEND gr_blocks_sources char_to_float_impl.cc char_to_short_impl.cc complex_to_interleaved_short_impl.cc + complex_to_float_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 0adf3c9f7..8622e7b67 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -122,6 +122,7 @@ list(APPEND gr_blocks_sources char_to_short_impl.cc complex_to_interleaved_short_impl.cc complex_to_float_impl.cc + complex_to_real_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 8622e7b67..612a56de0 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -123,6 +123,7 @@ list(APPEND gr_blocks_sources complex_to_interleaved_short_impl.cc complex_to_float_impl.cc complex_to_real_impl.cc + complex_to_imag_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 612a56de0..3c757fc0c 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -124,6 +124,7 @@ list(APPEND gr_blocks_sources complex_to_float_impl.cc complex_to_real_impl.cc complex_to_imag_impl.cc + complex_to_mag_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 3c757fc0c..ebaec1837 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -125,6 +125,7 @@ list(APPEND gr_blocks_sources complex_to_real_impl.cc complex_to_imag_impl.cc complex_to_mag_impl.cc + complex_to_mag_squared_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index ebaec1837..59419e202 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -126,6 +126,7 @@ list(APPEND gr_blocks_sources complex_to_imag_impl.cc complex_to_mag_impl.cc complex_to_mag_squared_impl.cc + complex_to_arg_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 59419e202..0d2385251 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -127,6 +127,7 @@ list(APPEND gr_blocks_sources complex_to_mag_impl.cc complex_to_mag_squared_impl.cc complex_to_arg_impl.cc + float_to_char_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 0d2385251..f1d04622d 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -128,6 +128,7 @@ list(APPEND gr_blocks_sources complex_to_mag_squared_impl.cc complex_to_arg_impl.cc float_to_char_impl.cc + float_to_complex_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index f1d04622d..e443d5488 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -77,7 +77,7 @@ macro(expand_cc_h_impl root) set_source_files_properties(${expanded_files_h_impl} PROPERTIES OBJECT_DEPENDS "${expanded_files_h}" ) - + #install rules for the generated cc files list(APPEND generated_sources ${expanded_files_cc_impl}) endmacro(expand_cc_h_impl) @@ -129,6 +129,8 @@ list(APPEND gr_blocks_sources complex_to_arg_impl.cc float_to_char_impl.cc float_to_complex_impl.cc + float_array_to_int.cc + float_to_int_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index e443d5488..f0f20fb5d 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -131,6 +131,7 @@ list(APPEND gr_blocks_sources float_to_complex_impl.cc float_array_to_int.cc float_to_int_impl.cc + float_to_short_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index f0f20fb5d..a6894f256 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -132,6 +132,8 @@ list(APPEND gr_blocks_sources float_array_to_int.cc float_to_int_impl.cc float_to_short_impl.cc + float_array_to_uchar.cc + float_to_uchar_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index a6894f256..16656dafc 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -134,6 +134,7 @@ list(APPEND gr_blocks_sources float_to_short_impl.cc float_array_to_uchar.cc float_to_uchar_impl.cc + int_to_float_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 16656dafc..21b17d315 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -135,6 +135,8 @@ list(APPEND gr_blocks_sources float_array_to_uchar.cc float_to_uchar_impl.cc int_to_float_impl.cc + interleaved_short_array_to_complex.cc + interleaved_short_to_complex_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_const_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 21b17d315..458a63221 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -141,6 +141,7 @@ list(APPEND gr_blocks_sources multiply_ff_impl.cc multiply_const_cc_impl.cc multiply_const_ff_impl.cc + short_to_char_impl.cc ) list(APPEND blocks_libs -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 458a63221..4551baeca 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -142,6 +142,7 @@ list(APPEND gr_blocks_sources multiply_const_cc_impl.cc multiply_const_ff_impl.cc short_to_char_impl.cc + short_to_float_impl.cc ) list(APPEND blocks_libs -- 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/lib/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 4551baeca..6974e7e92 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -143,6 +143,8 @@ list(APPEND gr_blocks_sources multiply_const_ff_impl.cc short_to_char_impl.cc short_to_float_impl.cc + uchar_array_to_float.cc + uchar_to_float_impl.cc ) list(APPEND blocks_libs -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 6974e7e92..8d433801d 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -127,6 +127,7 @@ list(APPEND gr_blocks_sources complex_to_mag_impl.cc complex_to_mag_squared_impl.cc complex_to_arg_impl.cc + conjugate_cc_impl.cc float_to_char_impl.cc float_to_complex_impl.cc float_array_to_int.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 8d433801d..e3a40dfc8 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -89,6 +89,7 @@ expand_cc_h_impl(add_XX ss ii cc) expand_cc_h_impl(add_const_XX ss ii ff cc) expand_cc_h_impl(add_const_vXX ss ii ff cc) expand_cc_h_impl(divide_XX ss ii ff cc) +expand_cc_h_impl(integrate_XX ss ii ff cc) expand_cc_h_impl(multiply_XX ss ii) expand_cc_h_impl(multiply_const_XX ss ii) expand_cc_h_impl(multiply_const_vXX ss ii ff cc) -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index e3a40dfc8..b73bf2994 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -141,6 +141,7 @@ list(APPEND gr_blocks_sources interleaved_short_to_complex_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc + multiply_conjugate_cc_impl.cc multiply_const_cc_impl.cc multiply_const_ff_impl.cc short_to_char_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index b73bf2994..cd07cef2f 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -144,6 +144,7 @@ list(APPEND gr_blocks_sources multiply_conjugate_cc_impl.cc multiply_const_cc_impl.cc multiply_const_ff_impl.cc + nlog10_ff_impl.cc short_to_char_impl.cc short_to_float_impl.cc uchar_array_to_float.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index cd07cef2f..4aa737b6f 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -88,6 +88,7 @@ endmacro(expand_cc_h_impl) expand_cc_h_impl(add_XX ss ii cc) expand_cc_h_impl(add_const_XX ss ii ff cc) expand_cc_h_impl(add_const_vXX ss ii ff cc) +expand_cc_h_impl(and_XX bb ss ii) expand_cc_h_impl(divide_XX ss ii ff cc) expand_cc_h_impl(integrate_XX ss ii ff cc) expand_cc_h_impl(multiply_XX ss ii) -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 4aa737b6f..9c67c7b03 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -89,6 +89,7 @@ expand_cc_h_impl(add_XX ss ii cc) expand_cc_h_impl(add_const_XX ss ii ff cc) expand_cc_h_impl(add_const_vXX ss ii ff cc) expand_cc_h_impl(and_XX bb ss ii) +expand_cc_h_impl(and_const_XX bb ss ii) expand_cc_h_impl(divide_XX ss ii ff cc) expand_cc_h_impl(integrate_XX ss ii ff cc) expand_cc_h_impl(multiply_XX ss ii) -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 9c67c7b03..3bf1db750 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -95,6 +95,7 @@ expand_cc_h_impl(integrate_XX ss ii ff cc) expand_cc_h_impl(multiply_XX ss ii) expand_cc_h_impl(multiply_const_XX ss ii) expand_cc_h_impl(multiply_const_vXX ss ii ff cc) +expand_cc_h_impl(not_XX bb ss ii) expand_cc_h_impl(sub_XX ss ii ff cc) ######################################################################## -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 3bf1db750..3e3650d67 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -96,6 +96,7 @@ expand_cc_h_impl(multiply_XX ss ii) expand_cc_h_impl(multiply_const_XX ss ii) expand_cc_h_impl(multiply_const_vXX ss ii ff cc) expand_cc_h_impl(not_XX bb ss ii) +expand_cc_h_impl(or_XX bb ss ii) expand_cc_h_impl(sub_XX ss ii ff cc) ######################################################################## -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 3e3650d67..77f0c6eca 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -98,6 +98,7 @@ expand_cc_h_impl(multiply_const_vXX ss ii ff cc) expand_cc_h_impl(not_XX bb ss ii) expand_cc_h_impl(or_XX bb ss ii) expand_cc_h_impl(sub_XX ss ii ff cc) +expand_cc_h_impl(xor_XX bb ss ii) ######################################################################## # Setup the include and linker paths -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 77f0c6eca..081064629 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -134,6 +134,7 @@ list(APPEND gr_blocks_sources complex_to_mag_squared_impl.cc complex_to_arg_impl.cc conjugate_cc_impl.cc + deinterleave_impl.cc float_to_char_impl.cc float_to_complex_impl.cc float_array_to_int.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 081064629..f224330d4 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -143,6 +143,7 @@ list(APPEND gr_blocks_sources float_array_to_uchar.cc float_to_uchar_impl.cc int_to_float_impl.cc + interleave_impl.cc interleaved_short_array_to_complex.cc interleaved_short_to_complex_impl.cc multiply_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index f224330d4..1e34b544f 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -146,6 +146,7 @@ list(APPEND gr_blocks_sources interleave_impl.cc interleaved_short_array_to_complex.cc interleaved_short_to_complex_impl.cc + keep_one_in_n_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc multiply_conjugate_cc_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 1e34b544f..e4aca48f0 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -146,6 +146,7 @@ list(APPEND gr_blocks_sources interleave_impl.cc interleaved_short_array_to_complex.cc interleaved_short_to_complex_impl.cc + keep_m_in_n_impl.cc keep_one_in_n_impl.cc multiply_cc_impl.cc multiply_ff_impl.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index e4aca48f0..9b0043d4b 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -154,6 +154,7 @@ list(APPEND gr_blocks_sources multiply_const_cc_impl.cc multiply_const_ff_impl.cc nlog10_ff_impl.cc + repeat_impl.cc short_to_char_impl.cc short_to_float_impl.cc uchar_array_to_float.cc -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 9b0043d4b..72e09d5f9 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -157,6 +157,7 @@ list(APPEND gr_blocks_sources repeat_impl.cc short_to_char_impl.cc short_to_float_impl.cc + stream_mux_impl.cc uchar_array_to_float.cc uchar_to_float_impl.cc ) -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 72e09d5f9..4cb3bc995 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -158,6 +158,7 @@ list(APPEND gr_blocks_sources short_to_char_impl.cc short_to_float_impl.cc stream_mux_impl.cc + stream_to_streams_impl.cc uchar_array_to_float.cc uchar_to_float_impl.cc ) -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 4cb3bc995..df0fa87af 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -159,6 +159,7 @@ list(APPEND gr_blocks_sources short_to_float_impl.cc stream_mux_impl.cc stream_to_streams_impl.cc + stream_to_vector_impl.cc uchar_array_to_float.cc uchar_to_float_impl.cc ) -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index df0fa87af..504aafaa2 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -160,6 +160,7 @@ list(APPEND gr_blocks_sources stream_mux_impl.cc stream_to_streams_impl.cc stream_to_vector_impl.cc + streams_to_stream_impl.cc uchar_array_to_float.cc uchar_to_float_impl.cc ) -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 504aafaa2..64436c07f 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -161,6 +161,7 @@ list(APPEND gr_blocks_sources stream_to_streams_impl.cc stream_to_vector_impl.cc streams_to_stream_impl.cc + streams_to_vector_impl.cc uchar_array_to_float.cc uchar_to_float_impl.cc ) -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 64436c07f..cdacd60c2 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -164,6 +164,7 @@ list(APPEND gr_blocks_sources streams_to_vector_impl.cc uchar_array_to_float.cc uchar_to_float_impl.cc + vector_to_stream_impl.cc ) list(APPEND blocks_libs -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index cdacd60c2..7db4d118c 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -165,6 +165,7 @@ list(APPEND gr_blocks_sources uchar_array_to_float.cc uchar_to_float_impl.cc vector_to_stream_impl.cc + vector_to_streams_impl.cc ) list(APPEND blocks_libs -- 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/lib/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-blocks/lib/CMakeLists.txt') diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt index 7db4d118c..b06f46675 100644 --- a/gr-blocks/lib/CMakeLists.txt +++ b/gr-blocks/lib/CMakeLists.txt @@ -135,6 +135,7 @@ list(APPEND gr_blocks_sources complex_to_arg_impl.cc conjugate_cc_impl.cc deinterleave_impl.cc + file_source_impl.cc float_to_char_impl.cc float_to_complex_impl.cc float_array_to_int.cc -- cgit