diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
| commit | c6dbde23b256a41b3d92cb4ad6b63287095d53c7 (patch) | |
| tree | 71db12ea2e1667770c22568dcdf5e0857d5f1e59 /gr-fft | |
| parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
| parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) | |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-fft')
| -rw-r--r-- | gr-fft/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-fft/gnuradio-fft.pc.in | 2 | ||||
| -rw-r--r-- | gr-fft/include/fft/api.h | 2 | ||||
| -rw-r--r-- | gr-fft/lib/CMakeLists.txt | 5 | ||||
| -rwxr-xr-x | gr-fft/python/fft/qa_fft.py | 12 | ||||
| -rwxr-xr-x | gr-fft/python/fft/qa_goertzel.py | 6 | ||||
| -rw-r--r-- | gr-fft/swig/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gr-fft/swig/fft_swig.i | 2 |
8 files changed, 17 insertions, 20 deletions
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt index aad510ff72..e9110e2137 100644 --- a/gr-fft/CMakeLists.txt +++ b/gr-fft/CMakeLists.txt @@ -30,10 +30,9 @@ find_package(FFTW3f) include(GrComponent) GR_REGISTER_COMPONENT("gr-fft" ENABLE_GR_FFT - ENABLE_GRUEL ENABLE_VOLK Boost_FOUND - ENABLE_GR_CORE + ENABLE_GNURADIO_RUNTIME ENABLE_GR_BLOCKS FFTW3F_FOUND ) diff --git a/gr-fft/gnuradio-fft.pc.in b/gr-fft/gnuradio-fft.pc.in index eb4ddfd9fa..ae3476fcf8 100644 --- a/gr-fft/gnuradio-fft.pc.in +++ b/gr-fft/gnuradio-fft.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: gnuradio-fft Description: GNU Radio's FFT signal processing blocks -Requires: gnuradio-core +Requires: gnuradio-runtime Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-fft Cflags: -I${includedir} diff --git a/gr-fft/include/fft/api.h b/gr-fft/include/fft/api.h index eef4563738..a569ceb265 100644 --- a/gr-fft/include/fft/api.h +++ b/gr-fft/include/fft/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_FFT_API_H #define INCLUDED_FFT_API_H -#include <gruel/attributes.h> +#include <attributes.h> #ifdef gnuradio_fft_EXPORTS # define FFT_API __GR_ATTR_EXPORT diff --git a/gr-fft/lib/CMakeLists.txt b/gr-fft/lib/CMakeLists.txt index 6516ad42d4..20fb338465 100644 --- a/gr-fft/lib/CMakeLists.txt +++ b/gr-fft/lib/CMakeLists.txt @@ -24,8 +24,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${GR_FFT_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} ) @@ -50,7 +49,7 @@ list(APPEND fft_sources ) list(APPEND fft_libs - gnuradio-core + gnuradio-runtime ${Boost_LIBRARIES} ${FFTW3F_LIBRARIES} ) diff --git a/gr-fft/python/fft/qa_fft.py b/gr-fft/python/fft/qa_fft.py index 8a989505b6..3c7aa995e4 100755 --- a/gr-fft/python/fft/qa_fft.py +++ b/gr-fft/python/fft/qa_fft.py @@ -86,11 +86,11 @@ class test_fft(gr_unittest.TestCase): (689.48553466796875-918.2142333984375j), (1646.539306640625-1694.1956787109375j)) - src = gr.vector_source_c(src_data) + src = blocks.vector_source_c(src_data) s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size) op = fft.fft_vcc(fft_size, True, [], False) v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size) - dst = gr.vector_sink_c() + dst = blocks.vector_sink_c() tb.connect(src, s2v, op, v2s, dst) tb.run() result_data = dst.data() @@ -140,11 +140,11 @@ class test_fft(gr_unittest.TestCase): expected_result = tuple([complex(primes[2*i], primes[2*i+1]) for i in range(fft_size)]) - src = gr.vector_source_c(src_data) + src = blocks.vector_source_c(src_data) s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size) op = fft.fft_vcc(fft_size, False, [], False) v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size) - dst = gr.vector_sink_c() + dst = blocks.vector_sink_c() tb.connect(src, s2v, op, v2s, dst) tb.run() result_data = dst.data() @@ -198,11 +198,11 @@ class test_fft(gr_unittest.TestCase): nthreads = 2 - src = gr.vector_source_c(src_data) + src = blocks.vector_source_c(src_data) s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size) op = fft.fft_vcc(fft_size, False, [], False, nthreads) v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size) - dst = gr.vector_sink_c() + dst = blocks.vector_sink_c() tb.connect(src, s2v, op, v2s, dst) tb.run() result_data = dst.data() diff --git a/gr-fft/python/fft/qa_goertzel.py b/gr-fft/python/fft/qa_goertzel.py index 0eb919f5a3..c2c5c565e7 100755 --- a/gr-fft/python/fft/qa_goertzel.py +++ b/gr-fft/python/fft/qa_goertzel.py @@ -22,7 +22,7 @@ from math import pi, cos -from gnuradio import gr, gr_unittest, fft +from gnuradio import gr, gr_unittest, fft, blocks class test_goertzel(gr_unittest.TestCase): @@ -36,9 +36,9 @@ class test_goertzel(gr_unittest.TestCase): return [cos(2*pi*x*freq/rate) for x in range(rate)] def transform(self, src_data, rate, freq): - src = gr.vector_source_f(src_data, False) + src = blocks.vector_source_f(src_data, False) dft = fft.goertzel_fc(rate, rate, freq) - dst = gr.vector_sink_c() + dst = blocks.vector_sink_c() self.tb.connect(src, dft, dst) self.tb.run() return dst.data() diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt index 13ade2c908..af2845edcf 100644 --- a/gr-fft/swig/CMakeLists.txt +++ b/gr-fft/swig/CMakeLists.txt @@ -25,15 +25,14 @@ include(GrSwig) set(GR_SWIG_INCLUDE_DIRS ${GR_FFT_INCLUDE_DIRS} - ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fft_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/fft) - +set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-fft) GR_SWIG_MAKE(fft_swig fft_swig.i) diff --git a/gr-fft/swig/fft_swig.i b/gr-fft/swig/fft_swig.i index 07fab34d4e..51e44cfe49 100644 --- a/gr-fft/swig/fft_swig.i +++ b/gr-fft/swig/fft_swig.i @@ -22,7 +22,7 @@ #define FFT_API -%include "gnuradio.i" +%include "runtime_swig.i" //load generated python docstrings %include "fft_swig_doc.i" |