diff options
| -rw-r--r-- | cmake/Modules/GnuradioConfig.cmake.in | 3 | ||||
| -rw-r--r-- | docs/doxygen/Doxyfile.in | 13 | ||||
| -rw-r--r-- | docs/doxygen/other/components.dox | 1 | ||||
| -rw-r--r-- | docs/doxygen/other/group_defs.dox | 8 | ||||
| -rw-r--r-- | docs/sphinx/source/index.rst | 38 | ||||
| -rw-r--r-- | docs/sphinx/source/pager_blocks.rst | 10 | ||||
| -rw-r--r-- | gr-analog/include/gnuradio/analog/frequency_modulator_fc.h | 2 | ||||
| -rw-r--r-- | gr-digital/lib/correlate_access_code_bb_impl.cc | 10 | ||||
| -rw-r--r-- | gr-digital/lib/correlate_access_code_bb_ts_impl.cc | 11 | ||||
| -rw-r--r-- | gr-digital/lib/correlate_access_code_ff_ts_impl.cc | 11 | ||||
| -rw-r--r-- | gr-digital/lib/correlate_access_code_tag_bb_impl.cc | 13 | ||||
| -rw-r--r-- | gr-digital/lib/correlate_access_code_tag_ff_impl.cc | 13 | ||||
| -rw-r--r-- | gr-qtgui/lib/time_sink_c_impl.cc | 13 | ||||
| -rw-r--r-- | gr-qtgui/lib/time_sink_f_impl.cc | 13 |
14 files changed, 42 insertions, 117 deletions
diff --git a/cmake/Modules/GnuradioConfig.cmake.in b/cmake/Modules/GnuradioConfig.cmake.in index b323a0d911..328e7769cc 100644 --- a/cmake/Modules/GnuradioConfig.cmake.in +++ b/cmake/Modules/GnuradioConfig.cmake.in @@ -124,12 +124,9 @@ GR_MODULE(AUDIO gnuradio-audio gnuradio/audio/api.h gnuradio-audio) GR_MODULE(BLOCKS gnuradio-blocks gnuradio/blocks/api.h gnuradio-blocks) GR_MODULE(CHANNELS gnuradio-channels gnuradio/channels/api.h gnuradio-channels) GR_MODULE(DIGITAL gnuradio-digital gnuradio/digital/api.h gnuradio-digital) -GR_MODULE(FCD gnuradio-fcd gnuradio/fcd_api.h gnuradio-fcd) GR_MODULE(FEC gnuradio-fec gnuradio/fec/api.h gnuradio-fec) GR_MODULE(FFT gnuradio-fft gnuradio/fft/api.h gnuradio-fft) GR_MODULE(FILTER gnuradio-filter gnuradio/filter/api.h gnuradio-filter) -GR_MODULE(NOAA gnuradio-noaa gnuradio/noaa/api.h gnuradio-noaa) -GR_MODULE(PAGER gnuradio-pager gnuradio/pager/api.h gnuradio-pager) GR_MODULE(QTGUI gnuradio-qtgui gnuradio/qtgui/api.h gnuradio-qtgui) GR_MODULE(TRELLIS gnuradio-trellis gnuradio/trellis/api.h gnuradio-trellis) GR_MODULE(UHD gnuradio-uhd gnuradio/uhd/api.h gnuradio-uhd) diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index 830bf54e9f..c47a758a5a 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -157,18 +157,12 @@ STRIP_FROM_INC_PATH = @CMAKE_SOURCE_DIR@/gnuradio-runtime/include \ @CMAKE_BINARY_DIR@/gr-digital/include \ @CMAKE_SOURCE_DIR@/gr-dtv/include \ @CMAKE_BINARY_DIR@/gr-dtv/include \ - @CMAKE_SOURCE_DIR@/gr-fcd/include \ - @CMAKE_BINARY_DIR@/gr-fcd/include \ @CMAKE_SOURCE_DIR@/gr-fec/include \ @CMAKE_BINARY_DIR@/gr-fec/include \ @CMAKE_SOURCE_DIR@/gr-fft/include \ @CMAKE_BINARY_DIR@/gr-fft/include \ @CMAKE_SOURCE_DIR@/gr-filter/include \ @CMAKE_BINARY_DIR@/gr-filter/include \ - @CMAKE_SOURCE_DIR@/gr-noaa/include \ - @CMAKE_BINARY_DIR@/gr-noaa/include \ - @CMAKE_SOURCE_DIR@/gr-pager/include \ - @CMAKE_BINARY_DIR@/gr-pager/include \ @CMAKE_SOURCE_DIR@/gr-qtgui/include \ @CMAKE_BINARY_DIR@/gr-qtgui/include \ @CMAKE_SOURCE_DIR@/gr-trellis/include \ @@ -749,7 +743,6 @@ EXCLUDE = @abs_top_srcdir@/volk \ @abs_top_builddir@/gnuradio-runtime/python/gnuradio/gr/gr_threading.py \ @abs_top_builddir@/gnuradio-runtime/python/gnuradio/gr/gr_threading_23.py \ @abs_top_builddir@/gnuradio-runtime/python/gnuradio/gr/gr_threading_24.py \ - @abs_top_builddir@/gr-pager/swig/pager_swig.py \ @abs_top_builddir@/gr-trellis/doc \ @abs_top_builddir@/gr-trellis/swig/trellis_swig.py \ @abs_top_builddir@/gr-video-sdl/swig/video_sdl_swig.py \ @@ -783,18 +776,12 @@ EXCLUDE = @abs_top_srcdir@/volk \ @abs_top_builddir@/gr-dtv/lib/dvbs2 \ @abs_top_srcdir@/gr-dtv/lib/dvbt2 \ @abs_top_builddir@/gr-dtv/lib/dvbr2 \ - @abs_top_srcdir@/gr-fcd/lib \ - @abs_top_builddir@/gr-fcd/lib \ @abs_top_srcdir@/gr-fec/lib \ @abs_top_builddir@/gr-fec/lib \ @abs_top_srcdir@/gr-filter/lib \ @abs_top_builddir@/gr-filter/lib \ @abs_top_srcdir@/gr-fft/lib \ @abs_top_builddir@/gr-fft/lib \ - @abs_top_srcdir@/gr-noaa/lib \ - @abs_top_builddir@/gr-noaa/lib \ - @abs_top_srcdir@/gr-pager/lib \ - @abs_top_builddir@/gr-pager/lib \ @abs_top_srcdir@/gr-qtgui/lib \ @abs_top_builddir@/gr-qtgui/lib \ @abs_top_srcdir@/gr-trellis/lib \ diff --git a/docs/doxygen/other/components.dox b/docs/doxygen/other/components.dox index b1f88d20b6..2b6fc2091a 100644 --- a/docs/doxygen/other/components.dox +++ b/docs/doxygen/other/components.dox @@ -32,7 +32,6 @@ All our in-tree components have their own top-level documentation: \li \subpage page_ctrlport \li \subpage page_digital \li \subpage page_packet_comms -\li \subpage page_fcd \li \subpage page_fec \li \subpage page_fft \li \subpage page_filter diff --git a/docs/doxygen/other/group_defs.dox b/docs/doxygen/other/group_defs.dox index fecde8c9c6..7ec67bde23 100644 --- a/docs/doxygen/other/group_defs.dox +++ b/docs/doxygen/other/group_defs.dox @@ -29,7 +29,6 @@ /*! \defgroup deprecated_blk Deprecated */ /*! \defgroup equalizers_blk Equalizers */ /*! \defgroup error_coding_blk Error Coding and Decoding */ -/*! \defgroup fcd_blk FCD Interface */ /*! \defgroup file_operators_blk File Operators */ /*! \defgroup filter_blk Filters */ /*! \defgroup fourier_analysis_blk Fourier Analysis */ @@ -41,11 +40,9 @@ /*! \defgroup misc_blk Miscellaneous */ /*! \defgroup modulators_blk Modulators and Demodulators */ /*! \defgroup networking_tools_blk Networking Tools */ -/*! \defgroup noaa_blk NOAA Blocks */ /*! \defgroup ofdm_blk OFDM Blocks */ /*! \defgroup packet_operators_blk Packet/Frame Operators */ /*! \defgroup peak_detectors_blk Peak Detectors */ -/*! \defgroup pager_blk Pager Blocks */ /*! \defgroup qtgui_blk QT Graphical Interfaces */ /*! \defgroup resamplers_blk Resamplers */ /*! \defgroup stream_operators_blk Streams Operators */ @@ -76,11 +73,6 @@ * @{ */ -/*! - * \defgroup pager Pager - * Pager Applications - */ - /*! @} */ /*! \defgroup hardware Misc Hardware Control */ diff --git a/docs/sphinx/source/index.rst b/docs/sphinx/source/index.rst index 26936dfedf..763c04e0a5 100644 --- a/docs/sphinx/source/index.rst +++ b/docs/sphinx/source/index.rst @@ -13,12 +13,9 @@ gnuradio blocks_comedi <comedi_blocks> blocks_digital <digital_blocks> blocks_dtv <dtv_blocks> - blocks_fcd <fcd_blocks> blocks_fec <fec_blocks> blocks_fft <fft_blocks> blocks_filter <filter_blocks> - blocks_noaa <noaa_blocks> - blocks_pager <pager_blocks> blocks_qtgui <qtgui_blocks> blocks_trellis <trellis_blocks> blocks_uhd <uhd_blocks> @@ -522,15 +519,6 @@ Error Coding Blocks gnuradio.fec.tagged_encoder -FCD Blocks ----------- - -.. autosummary:: - :nosignatures: - - gnuradio.fcd.source_c - - File Operator Blocks -------------------- @@ -855,17 +843,6 @@ Networking Tools Blocks gnuradio.blocks.udp_source -NOAA Blocks ------------ - -.. autosummary:: - :nosignatures: - - gnuradio.noaa.hrpt_decoder - gnuradio.noaa.hrpt_deframer - gnuradio.noaa.hrpt_pll_cf - - OFDM Blocks ----------- @@ -909,20 +886,7 @@ Packet Operator Blocks gnuradio.digital.simple_correlator gnuradio.digital.simple_framer - -Pager Blocks ------------- - -.. autosummary:: - :nosignatures: - - gnuradio.pager.flex_deinterleave - gnuradio.pager.flex_frame - gnuradio.pager.flex_parse - gnuradio.pager.flex_sync - gnuradio.pager.slicer_fb - - + Peak Detector Blocks -------------------- diff --git a/docs/sphinx/source/pager_blocks.rst b/docs/sphinx/source/pager_blocks.rst deleted file mode 100644 index 5eef083aa5..0000000000 --- a/docs/sphinx/source/pager_blocks.rst +++ /dev/null @@ -1,10 +0,0 @@ -gnuradio.pager -============== - -.. automodule:: gnuradio.pager - -.. autoblock:: gnuradio.pager.flex_deinterleave -.. autoblock:: gnuradio.pager.flex_frame -.. autoblock:: gnuradio.pager.flex_parse -.. autoblock:: gnuradio.pager.flex_sync -.. autoblock:: gnuradio.pager.slicer_fb diff --git a/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h index 137b492863..75f4fccb99 100644 --- a/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h +++ b/gr-analog/include/gnuradio/analog/frequency_modulator_fc.h @@ -49,7 +49,7 @@ namespace gr { * systems and 75 KHz for wideband FM, like audio broadcast FM * stations. * - * In this block, the input argument is \p sensivity, not the + * In this block, the input argument is \p sensitivity, not the * frequency deviation. The sensitivity specifies how much the * phase changes based on the new input sample. Given a maximum * deviation, \f$ f_{\Delta} \f$, and sample rate \f$f_s\f$, the diff --git a/gr-digital/lib/correlate_access_code_bb_impl.cc b/gr-digital/lib/correlate_access_code_bb_impl.cc index 532871a407..a01eb6a2b5 100644 --- a/gr-digital/lib/correlate_access_code_bb_impl.cc +++ b/gr-digital/lib/correlate_access_code_bb_impl.cc @@ -27,14 +27,13 @@ #include "correlate_access_code_bb_impl.h" #include <gnuradio/io_signature.h> #include <gnuradio/blocks/count_bits.h> +#include <boost/format.hpp> #include <stdexcept> #include <cstdio> namespace gr { namespace digital { -#define VERBOSE 0 - correlate_access_code_bb::sptr correlate_access_code_bb::make(const std::string &access_code, int threshold) { @@ -51,6 +50,7 @@ namespace gr { d_threshold(threshold) { if(!set_access_code(access_code)) { + GR_LOG_ERROR(d_logger, "access_code is > 64 bits"); throw std::out_of_range ("access_code is > 64 bits"); } } @@ -109,14 +109,12 @@ namespace gr { // test for access code with up to threshold errors new_flag = (nwrong <= d_threshold); -#if VERBOSE if(new_flag) { - fprintf(stderr, "access code found: %llx\n", d_access_code); + GR_LOG_DEBUG(d_logger, boost::format("access code found: %llx") % d_access_code); } else { - fprintf(stderr, "%llx ==> %llx\n", d_access_code, d_data_reg); + GR_LOG_DEBUG(d_logger, boost::format("%llx ==> %llx") % d_access_code % d_data_reg); } -#endif // shift in new data and new flag d_data_reg = (d_data_reg << 1) | (in[i] & 0x1); diff --git a/gr-digital/lib/correlate_access_code_bb_ts_impl.cc b/gr-digital/lib/correlate_access_code_bb_ts_impl.cc index e2fe37d8bb..91b57feac3 100644 --- a/gr-digital/lib/correlate_access_code_bb_ts_impl.cc +++ b/gr-digital/lib/correlate_access_code_bb_ts_impl.cc @@ -26,6 +26,7 @@ #include "correlate_access_code_bb_ts_impl.h" #include <gnuradio/io_signature.h> +#include <boost/format.hpp> #include <stdexcept> #include <volk/volk.h> #include <cstdio> @@ -34,8 +35,6 @@ namespace gr { namespace digital { -#define VERBOSE 0 - correlate_access_code_bb_ts::sptr correlate_access_code_bb_ts::make(const std::string &access_code, int threshold, @@ -58,6 +57,7 @@ namespace gr { set_tag_propagation_policy(TPP_DONT); if(!set_access_code(access_code)) { + GR_LOG_ERROR(d_logger, "access_code is > 64 bits"); throw std::out_of_range ("access_code is > 64 bits"); } @@ -91,10 +91,9 @@ namespace gr { for(unsigned i=0; i < d_len; i++){ d_access_code = (d_access_code << 1) | (access_code[i] & 1); } - if(VERBOSE) { - std::cerr << "Access code: " << std::hex << d_access_code << std::dec << std::endl; - std::cerr << "Mask: " << std::hex << d_mask << std::dec << std::endl; - } + + GR_LOG_DEBUG(d_logger, boost::format("Access code: %llx") % d_access_code); + GR_LOG_DEBUG(d_logger, boost::format("Mask: %llx") % d_mask); return true; } diff --git a/gr-digital/lib/correlate_access_code_ff_ts_impl.cc b/gr-digital/lib/correlate_access_code_ff_ts_impl.cc index dfbac40505..21ff3fbda0 100644 --- a/gr-digital/lib/correlate_access_code_ff_ts_impl.cc +++ b/gr-digital/lib/correlate_access_code_ff_ts_impl.cc @@ -27,6 +27,7 @@ #include "correlate_access_code_ff_ts_impl.h" #include <gnuradio/io_signature.h> #include <gnuradio/math.h> +#include <boost/format.hpp> #include <stdexcept> #include <volk/volk.h> #include <cstdio> @@ -35,8 +36,6 @@ namespace gr { namespace digital { -#define VERBOSE 0 - correlate_access_code_ff_ts::sptr correlate_access_code_ff_ts::make(const std::string &access_code, int threshold, @@ -58,6 +57,7 @@ namespace gr { set_tag_propagation_policy(TPP_DONT); if(!set_access_code(access_code)) { + GR_LOG_ERROR(d_logger, "access_code is > 64 bits"); throw std::out_of_range ("access_code is > 64 bits"); } @@ -91,10 +91,9 @@ namespace gr { for(unsigned i=0; i < d_len; i++){ d_access_code = (d_access_code << 1) | (access_code[i] & 1); } - if(VERBOSE) { - std::cerr << "Access code: " << std::hex << d_access_code << std::dec << std::endl; - std::cerr << "Mask: " << std::hex << d_mask << std::dec << std::endl; - } + + GR_LOG_DEBUG(d_logger, boost::format("Access code: %llx") % d_access_code); + GR_LOG_DEBUG(d_logger, boost::format("Mask: %llx") % d_mask); return true; } diff --git a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc index de2e1a06c3..753efa7a51 100644 --- a/gr-digital/lib/correlate_access_code_tag_bb_impl.cc +++ b/gr-digital/lib/correlate_access_code_tag_bb_impl.cc @@ -26,6 +26,7 @@ #include "correlate_access_code_tag_bb_impl.h" #include <gnuradio/io_signature.h> +#include <boost/format.hpp> #include <stdexcept> #include <volk/volk.h> #include <cstdio> @@ -34,8 +35,6 @@ namespace gr { namespace digital { -#define VERBOSE 0 - correlate_access_code_tag_bb::sptr correlate_access_code_tag_bb::make(const std::string &access_code, int threshold, @@ -56,6 +55,7 @@ namespace gr { d_threshold(threshold), d_len(0) { if(!set_access_code(access_code)) { + GR_LOG_ERROR(d_logger, "access_code is > 64 bits"); throw std::out_of_range ("access_code is > 64 bits"); } @@ -85,10 +85,8 @@ namespace gr { d_access_code = (d_access_code << 1) | (access_code[i] & 1); } - if(VERBOSE) { - std::cerr << "Access code: " << std::hex << d_access_code << std::dec << std::endl; - std::cerr << "Mask: " << std::hex << d_mask << std::dec << std::endl; - } + GR_LOG_DEBUG(d_logger, boost::format("Access code: %llx") % d_access_code); + GR_LOG_DEBUG(d_logger, boost::format("Mask: %llx") % d_mask); return true; } @@ -116,8 +114,7 @@ namespace gr { // shift in new data d_data_reg = (d_data_reg << 1) | (in[i] & 0x1); if(nwrong <= d_threshold) { - if(VERBOSE) - std::cerr << "writing tag at sample " << abs_out_sample_cnt + i << std::endl; + GR_LOG_DEBUG(d_logger, boost::format("writing tag at sample %llu") % (abs_out_sample_cnt + i)); add_item_tag(0, //stream ID abs_out_sample_cnt + i, //sample d_key, //frame info diff --git a/gr-digital/lib/correlate_access_code_tag_ff_impl.cc b/gr-digital/lib/correlate_access_code_tag_ff_impl.cc index 5f44ddeeeb..6efacbb08b 100644 --- a/gr-digital/lib/correlate_access_code_tag_ff_impl.cc +++ b/gr-digital/lib/correlate_access_code_tag_ff_impl.cc @@ -27,6 +27,7 @@ #include "correlate_access_code_tag_ff_impl.h" #include <gnuradio/io_signature.h> #include <gnuradio/math.h> +#include <boost/format.hpp> #include <stdexcept> #include <volk/volk.h> #include <cstdio> @@ -35,8 +36,6 @@ namespace gr { namespace digital { -#define VERBOSE 0 - correlate_access_code_tag_ff::sptr correlate_access_code_tag_ff::make(const std::string &access_code, int threshold, @@ -57,6 +56,7 @@ namespace gr { d_threshold(threshold), d_len(0) { if(!set_access_code(access_code)) { + GR_LOG_ERROR(d_logger, "access_code is > 64 bits"); throw std::out_of_range ("access_code is > 64 bits"); } @@ -86,10 +86,8 @@ namespace gr { d_access_code = (d_access_code << 1) | (access_code[i] & 1); } - if(VERBOSE) { - std::cerr << "Access code: " << std::hex << d_access_code << std::dec << std::endl; - std::cerr << "Mask: " << std::hex << d_mask << std::dec << std::endl; - } + GR_LOG_DEBUG(d_logger, boost::format("Access code: %llx") % d_access_code); + GR_LOG_DEBUG(d_logger, boost::format("Mask: %llx") % d_mask); return true; } @@ -117,8 +115,7 @@ namespace gr { // shift in new data d_data_reg = (d_data_reg << 1) | (gr::branchless_binary_slicer(in[i]) & 0x1); if(nwrong <= d_threshold) { - if(VERBOSE) - std::cerr << "writing tag at sample " << abs_out_sample_cnt + i << std::endl; + GR_LOG_DEBUG(d_logger, boost::format("writing tag at sample %llu") % (abs_out_sample_cnt + i)); add_item_tag(0, //stream ID abs_out_sample_cnt + i, //sample d_key, //frame info diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index 25d5a687d1..a6b1afc3f9 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -563,12 +563,15 @@ namespace gr { nr, nr + nitems + 1, d_trigger_tag_key); if(tags.size() > 0) { - d_triggered = true; trigger_index = tags[0].offset - nr; - d_start = d_index + trigger_index - d_trigger_delay - 1; - d_end = d_start + d_size; - d_trigger_count = 0; - _adjust_tags(-d_start); + int start = d_index + trigger_index - d_trigger_delay - 1; + if (start >= 0) { + d_triggered = true; + d_start = start; + d_end = d_start + d_size; + d_trigger_count = 0; + _adjust_tags(-d_start); + } } } diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index 419a9243c4..2b3527702d 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -558,12 +558,15 @@ namespace gr { nr, nr + nitems + 1, d_trigger_tag_key); if(tags.size() > 0) { - d_triggered = true; trigger_index = tags[0].offset - nr; - d_start = d_index + trigger_index - d_trigger_delay - 1; - d_end = d_start + d_size; - d_trigger_count = 0; - _adjust_tags(-d_start); + int start = d_index + trigger_index - d_trigger_delay - 1; + if (start >= 0) { + d_triggered = true; + d_start = start; + d_end = d_start + d_size; + d_trigger_count = 0; + _adjust_tags(-d_start); + } } } |