diff options
Diffstat (limited to 'gr-channels')
| -rw-r--r-- | gr-channels/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-channels/gnuradio-channels.pc.in | 2 | ||||
| -rw-r--r-- | gr-channels/include/channels/api.h | 2 | ||||
| -rw-r--r-- | gr-channels/lib/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | gr-channels/lib/fading_model_impl.cc | 15 | ||||
| -rw-r--r-- | gr-channels/python/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | gr-channels/python/qa_channel_model.py | 9 | ||||
| -rw-r--r-- | gr-channels/python/qa_fading_model.py | 9 | ||||
| -rw-r--r-- | gr-channels/swig/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gr-channels/swig/channels_swig.i | 2 |
10 files changed, 22 insertions, 36 deletions
diff --git a/gr-channels/CMakeLists.txt b/gr-channels/CMakeLists.txt index 6a5d20edef..225a297f25 100644 --- a/gr-channels/CMakeLists.txt +++ b/gr-channels/CMakeLists.txt @@ -28,10 +28,9 @@ include(GrBoost) include(GrComponent) GR_REGISTER_COMPONENT("gr-channels" ENABLE_GR_CHANNELS - ENABLE_GRUEL ENABLE_VOLK Boost_FOUND - ENABLE_GR_CORE + ENABLE_GNURADIO_RUNTIME ENABLE_GR_BLOCKS ENABLE_GR_FFT ENABLE_GR_FILTER diff --git a/gr-channels/gnuradio-channels.pc.in b/gr-channels/gnuradio-channels.pc.in index 9e6192db2b..b730517984 100644 --- a/gr-channels/gnuradio-channels.pc.in +++ b/gr-channels/gnuradio-channels.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: gnuradio-channels Description: GNU Radio's channel model blocks -Requires: gnuradio-core gnuradio-filter +Requires: gnuradio-runtime gnuradio-filter Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-channels -lgnuradio-filter Cflags: -I${includedir} diff --git a/gr-channels/include/channels/api.h b/gr-channels/include/channels/api.h index 41e65ca7cd..808336b042 100644 --- a/gr-channels/include/channels/api.h +++ b/gr-channels/include/channels/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_CHANNELS_API_H #define INCLUDED_CHANNELS_API_H -#include <gruel/attributes.h> +#include <attributes.h> #ifdef gnuradio_channels_EXPORTS # define CHANNELS_API __GR_ATTR_EXPORT diff --git a/gr-channels/lib/CMakeLists.txt b/gr-channels/lib/CMakeLists.txt index b9ed2a4587..bd0151143d 100644 --- a/gr-channels/lib/CMakeLists.txt +++ b/gr-channels/lib/CMakeLists.txt @@ -27,8 +27,7 @@ include_directories( ${GR_BLOCKS_INCLUDE_DIRS} ${GR_FILTER_INCLUDE_DIRS} ${GR_ANALOG_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) @@ -49,7 +48,7 @@ list(APPEND channels_sources #Add Windows DLL resource file if using MSVC if(MSVC) - include(${CMAKE_INSTALL_PREFIX}/cmake/Modules/GrVersion.cmake) + include(${CMAKE_SOURCE_DIR}/cmake/Modules/GrVersion.cmake) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-channels.rc.in @@ -63,7 +62,7 @@ endif(MSVC) list(APPEND channels_libs volk - gnuradio-core + gnuradio-runtime gnuradio-filter gnuradio-analog gnuradio-blocks @@ -75,4 +74,4 @@ target_link_libraries(gnuradio-channels ${channels_libs}) GR_LIBRARY_FOO(gnuradio-channels RUNTIME_COMPONENT "channels_runtime" DEVEL_COMPONENT "channels_devel") add_dependencies(gnuradio-channels channels_generated_includes channels_generated_swigs - gnuradio-core gnuradio-filter gnuradio-analog gnuradio-blocks) + gnuradio-runtime gnuradio-filter gnuradio-analog gnuradio-blocks) diff --git a/gr-channels/lib/fading_model_impl.cc b/gr-channels/lib/fading_model_impl.cc index 080a3b8e06..ecebe4a069 100644 --- a/gr-channels/lib/fading_model_impl.cc +++ b/gr-channels/lib/fading_model_impl.cc @@ -135,21 +135,6 @@ namespace gr { pmt::mp(0), pmt::mp(1), pmt::mp(0.00001), "radians", "Maximum step size for random walk angle per sample", RPC_PRIVLVL_MIN, DISPTIME | DISPOPTSTRIP))); - - add_rpc_variable( - rpcbasic_sptr(new rpcbasic_register_get<fading_model, float >( - alias(), "step", - &fading_model::step, - pmt::mp(0), pmt::mp(8), pmt::mp(4), - "radians", "Maximum step size for random walk angle per sample", - RPC_PRIVLVL_MIN, DISPTIME | DISPOPTSTRIP))); - add_rpc_variable( - rpcbasic_sptr(new rpcbasic_register_set<fading_model, float >( - alias(), "step", - &fading_model::set_step, - pmt::mp(0), pmt::mp(1), pmt::mp(0.00001), - "radians", "Maximum step size for random walk angle per sample", - RPC_PRIVLVL_MIN, DISPTIME | DISPOPTSTRIP))); #endif /* GR_CTRLPORT */ } diff --git a/gr-channels/python/CMakeLists.txt b/gr-channels/python/CMakeLists.txt index ee58d5b164..92fe0ef220 100644 --- a/gr-channels/python/CMakeLists.txt +++ b/gr-channels/python/CMakeLists.txt @@ -37,6 +37,8 @@ list(APPEND GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/gr-channels/swig ${CMAKE_BINARY_DIR}/gr-analog/python ${CMAKE_BINARY_DIR}/gr-analog/swig + ${CMAKE_BINARY_DIR}/gr-blocks/python + ${CMAKE_BINARY_DIR}/gr-blocks/swig ) list(APPEND GR_TEST_TARGET_DEPS gnuradio-channels gnuradio-analog gnuradio-blocks) diff --git a/gr-channels/python/qa_channel_model.py b/gr-channels/python/qa_channel_model.py index 0a99477097..473650f1d7 100755 --- a/gr-channels/python/qa_channel_model.py +++ b/gr-channels/python/qa_channel_model.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2012 Free Software Foundation, Inc. +# Copyright 2012,2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -22,6 +22,7 @@ from gnuradio import gr, gr_unittest import analog_swig as analog +import blocks_swig as blocks import channels_swig as channels import math @@ -39,10 +40,10 @@ class test_channel_model(gr_unittest.TestCase): freq = 100 signal = analog.sig_source_c(fs, analog.GR_SIN_WAVE, freq, 1) - head = gr.head(gr.sizeof_gr_complex, N) + head = blocks.head(gr.sizeof_gr_complex, N) op = channels.channel_model(0.0, 0.0, 1.0, [1,], 0) - snk = gr.vector_sink_c() - snk1 = gr.vector_sink_c() + snk = blocks.vector_sink_c() + snk1 = blocks.vector_sink_c() op.set_noise_voltage(0.0) op.set_frequency_offset(0.0) diff --git a/gr-channels/python/qa_fading_model.py b/gr-channels/python/qa_fading_model.py index e8a066ccb5..5ad378075a 100644 --- a/gr-channels/python/qa_fading_model.py +++ b/gr-channels/python/qa_fading_model.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2012 Free Software Foundation, Inc. +# Copyright 2012,2013 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -22,6 +22,7 @@ from gnuradio import gr, gr_unittest import analog_swig as analog +import blocks_swig as blocks import channels_swig as channels import math @@ -41,11 +42,11 @@ class test_fading_model(gr_unittest.TestCase): fDTs = 0.01 K = 4 signal = analog.sig_source_c(fs, analog.GR_SIN_WAVE, freq, 1) - head = gr.head(gr.sizeof_gr_complex, N) + head = blocks.head(gr.sizeof_gr_complex, N) op = channels.fading_model(8, fDTs=fDTs, LOS=True, K=K, seed=0) - snk = gr.vector_sink_c() - snk1 = gr.vector_sink_c() + snk = blocks.vector_sink_c() + snk1 = blocks.vector_sink_c() self.assertAlmostEqual(K, op.K(), 4) self.assertAlmostEqual(fDTs, op.fDTs(), 4) diff --git a/gr-channels/swig/CMakeLists.txt b/gr-channels/swig/CMakeLists.txt index 1d5028172b..225ae7a461 100644 --- a/gr-channels/swig/CMakeLists.txt +++ b/gr-channels/swig/CMakeLists.txt @@ -26,14 +26,13 @@ include(GrSwig) set(GR_SWIG_INCLUDE_DIRS ${GR_CHANNELS_INCLUDE_DIRS} ${GR_FILTER_INCLUDE_DIRS} - ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/channels_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/channels) - +set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-channels) GR_SWIG_MAKE(channels_swig channels_swig.i) diff --git a/gr-channels/swig/channels_swig.i b/gr-channels/swig/channels_swig.i index fb284a74bd..bfd0f9a10a 100644 --- a/gr-channels/swig/channels_swig.i +++ b/gr-channels/swig/channels_swig.i @@ -22,7 +22,7 @@ #define CHANNELS_API -%include "gnuradio.i" +%include "runtime_swig.i" //load generated python docstrings %include "channels_swig_doc.i" |