diff options
| -rw-r--r-- | gr-filter/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-filter/examples/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-filter/grc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-filter/grc/fft_filter_xxx.xml | 59 | ||||
| -rw-r--r-- | gr-filter/grc/filter_block_tree.xml | 1 |
5 files changed, 67 insertions, 2 deletions
diff --git a/gr-filter/CMakeLists.txt b/gr-filter/CMakeLists.txt index 02b8f23fe..b77a3d9d4 100644 --- a/gr-filter/CMakeLists.txt +++ b/gr-filter/CMakeLists.txt @@ -42,6 +42,8 @@ GR_SET_GLOBAL(GR_FILTER_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/include ) +SET(GR_PKG_FILTER_EXAMPLES_DIR ${GR_PKG_DATA_DIR}/examples/filter) + ######################################################################## # Begin conditional configuration ######################################################################## @@ -91,7 +93,7 @@ if(ENABLE_PYTHON) add_subdirectory(python) add_subdirectory(grc) endif(ENABLE_PYTHON) -#add_subdirectory(examples) +add_subdirectory(examples) add_subdirectory(doc) ######################################################################## diff --git a/gr-filter/examples/CMakeLists.txt b/gr-filter/examples/CMakeLists.txt index c798a8403..12a3c42e0 100644 --- a/gr-filter/examples/CMakeLists.txt +++ b/gr-filter/examples/CMakeLists.txt @@ -22,6 +22,8 @@ include(GrPython) # Base stuff GR_PYTHON_INSTALL(PROGRAMS fir_filter_fff.py - DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR} + fir_filter_ccc.py + fft_filter_ccc.py + DESTINATION ${GR_PKG_FILTER_EXAMPLES_DIR} COMPONENT "filter_python" ) diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 79496183f..9b40395b8 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -19,6 +19,7 @@ install(FILES filter_block_tree.xml + fft_filter_xxx.xml DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "filter_python" ) diff --git a/gr-filter/grc/fft_filter_xxx.xml b/gr-filter/grc/fft_filter_xxx.xml new file mode 100644 index 000000000..29612dffd --- /dev/null +++ b/gr-filter/grc/fft_filter_xxx.xml @@ -0,0 +1,59 @@ +<?xml version="1.0"?> +<!-- +################################################### +##FFT Filter +################################################### + --> +<block> + <name>FFT Filter</name> + <key>fft_filter_xxx</key> + <import>from gnuradio import filter</import> + <import>from gnuradio.gr import firdes</import> + <make>filter.fft_filter_$(type)($decim, $taps, $nthreads)</make> + <callback>set_taps($taps)</callback> + <callback>set_nthreads($nthreads)</callback> + <param> + <name>Type</name> + <key>type</key> + <type>enum</type> + <option> + <name>Complex->Complex (Complex Taps)</name> + <key>ccc</key> + <opt>input:complex</opt> + <opt>output:complex</opt> + <opt>taps:complex_vector</opt> + </option> + <option> + <name>Float->Float (Real Taps)</name> + <key>fff</key> + <opt>input:float</opt> + <opt>output:float</opt> + <opt>taps:real_vector</opt> + </option> + </param> + <param> + <name>Decimation</name> + <key>decim</key> + <value>1</value> + <type>int</type> + </param> + <param> + <name>Taps</name> + <key>taps</key> + <type>$type.taps</type> + </param> + <param> + <name>Num. Threads</name> + <key>nthreads</key> + <value>1</value> + <type>int</type> + </param> + <sink> + <name>in</name> + <type>$type.input</type> + </sink> + <source> + <name>out</name> + <type>$type.output</type> + </source> +</block> diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index a97620db9..7d0559857 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -30,5 +30,6 @@ <name></name> <!-- Blank for Root Name --> <cat> <name>Filters</name> + <block>fft_filter_xxx</block> </cat> </cat> |