diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-15 03:15:21 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-15 03:15:21 -0700 |
| commit | 928a9ada1c7caa739ee57f49da4446a04d301b12 (patch) | |
| tree | 7f19bec3e4a890aa7c9e1b19f159671d1a24f24c | |
| parent | c2c7d53afe862390ec1d6490309d2d0f4b96bf50 (diff) | |
analog: minor cleanup for added block
| -rw-r--r-- | gr-analog/include/analog/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-analog/lib/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-analog/python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-analog/swig/analog_swig.i | 6 |
4 files changed, 9 insertions, 6 deletions
diff --git a/gr-analog/include/analog/CMakeLists.txt b/gr-analog/include/analog/CMakeLists.txt index a44f119d36..f46960c984 100644 --- a/gr-analog/include/analog/CMakeLists.txt +++ b/gr-analog/include/analog/CMakeLists.txt @@ -93,6 +93,7 @@ install(FILES fmdet_cf.h frequency_modulator_fc.h phase_modulator_fc.h + plateau_detector_fb.h pll_carriertracking_cc.h pll_freqdet_cf.h pll_refout_cc.h @@ -105,7 +106,8 @@ install(FILES rail_ff.h rotator.h sig_source_waveform.h - simple_squelch_cc.h plateau_detector_fb.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/analog + simple_squelch_cc.h + DESTINATION ${GR_INCLUDE_DIR}/gnuradio/analog COMPONENT "analog_devel" ) diff --git a/gr-analog/lib/CMakeLists.txt b/gr-analog/lib/CMakeLists.txt index ecc459cd3a..396ff04654 100644 --- a/gr-analog/lib/CMakeLists.txt +++ b/gr-analog/lib/CMakeLists.txt @@ -121,6 +121,7 @@ list(APPEND analog_sources fmdet_cf_impl.cc frequency_modulator_fc_impl.cc phase_modulator_fc_impl.cc + plateau_detector_fb_impl.cc pll_carriertracking_cc_impl.cc pll_freqdet_cf_impl.cc pll_refout_cc_impl.cc @@ -157,7 +158,7 @@ list(APPEND analog_libs ${Boost_LIBRARIES} ) -add_library(gnuradio-analog SHARED ${analog_sources} plateau_detector_fb_impl.cc) +add_library(gnuradio-analog SHARED ${analog_sources}) target_link_libraries(gnuradio-analog ${analog_libs}) GR_LIBRARY_FOO(gnuradio-analog RUNTIME_COMPONENT "analog_runtime" DEVEL_COMPONENT "analog_devel") add_dependencies(gnuradio-analog analog_generated_includes analog_generated_swigs gnuradio-filter) diff --git a/gr-analog/python/CMakeLists.txt b/gr-analog/python/CMakeLists.txt index 5fabe75ca2..af4ed578f3 100644 --- a/gr-analog/python/CMakeLists.txt +++ b/gr-analog/python/CMakeLists.txt @@ -49,4 +49,4 @@ foreach(py_qa_test_file ${py_qa_test_files}) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) -GR_ADD_TEST(qa_plateau_detector_fb ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_plateau_detector_fb.py) + diff --git a/gr-analog/swig/analog_swig.i b/gr-analog/swig/analog_swig.i index ca9220f4c6..96f4e23a8c 100644 --- a/gr-analog/swig/analog_swig.i +++ b/gr-analog/swig/analog_swig.i @@ -46,6 +46,7 @@ #include "analog/noise_source_f.h" #include "analog/noise_source_c.h" #include "analog/phase_modulator_fc.h" +#include "analog/plateau_detector_fb.h" #include "analog/pll_carriertracking_cc.h" #include "analog/pll_freqdet_cf.h" #include "analog/pll_refout_cc.h" @@ -65,7 +66,6 @@ #include "analog/simple_squelch_cc.h" #include "analog/squelch_base_cc.h" #include "analog/squelch_base_ff.h" -#include "analog/plateau_detector_fb.h" %} %include "analog/cpm.h" @@ -86,6 +86,7 @@ %include "analog/noise_source_f.h" %include "analog/noise_source_c.h" %include "analog/phase_modulator_fc.h" +%include "analog/plateau_detector_fb.h" %include "analog/pll_carriertracking_cc.h" %include "analog/pll_freqdet_cf.h" %include "analog/pll_refout_cc.h" @@ -121,6 +122,7 @@ GR_SWIG_BLOCK_MAGIC2(analog, noise_source_i); GR_SWIG_BLOCK_MAGIC2(analog, noise_source_f); GR_SWIG_BLOCK_MAGIC2(analog, noise_source_c); GR_SWIG_BLOCK_MAGIC2(analog, phase_modulator_fc); +GR_SWIG_BLOCK_MAGIC2(analog, plateau_detector_fb); GR_SWIG_BLOCK_MAGIC2(analog, pll_carriertracking_cc); GR_SWIG_BLOCK_MAGIC2(analog, pll_freqdet_cf); GR_SWIG_BLOCK_MAGIC2(analog, pll_refout_cc); @@ -136,5 +138,3 @@ GR_SWIG_BLOCK_MAGIC2(analog, sig_source_i); GR_SWIG_BLOCK_MAGIC2(analog, sig_source_f); GR_SWIG_BLOCK_MAGIC2(analog, sig_source_c); GR_SWIG_BLOCK_MAGIC2(analog, simple_squelch_cc); -%include "analog/plateau_detector_fb.h" -GR_SWIG_BLOCK_MAGIC2(analog, plateau_detector_fb); |