diff options
607 files changed, 1388 insertions, 1470 deletions
diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index 536661996b..aa4fc3b0be 100644 --- a/docs/doxygen/Doxyfile.in +++ b/docs/doxygen/Doxyfile.in @@ -674,13 +674,11 @@ EXCLUDE_SYMBOLS = ad9862 \ *app_top_block* \ *am_rx_graph* \ *_queue_watcher_thread* \ - *parse* \ *MyFrame* \ *MyApp* \ *PyObject* \ *wfm_rx_block* \ *_sptr* \ - *debug* \ *wfm_rx_sca_block* \ *tv_rx_block* \ *wxapt_rx_block* \ diff --git a/docs/doxygen/other/group_defs.dox b/docs/doxygen/other/group_defs.dox index 4aee49ec85..1c96abf3dc 100644 --- a/docs/doxygen/other/group_defs.dox +++ b/docs/doxygen/other/group_defs.dox @@ -8,32 +8,46 @@ * @{ */ -/*! \defgroup container_blk Top Block and Hierarchical Block Base Classes */ -/*! \defgroup source_blk Signal Sources */ -/*! \defgroup sink_blk Signal Sinks */ -/*! \defgroup filter_blk Filters */ -/*! \defgroup math_blk Mathematics */ -/*! \defgroup modulation_blk Signal Modulation */ -/*! \defgroup demodulation_blk Signal Demodulation */ -/*! \defgroup coding_blk Information Coding and Decoding*/ -/*! \defgroup sync_blk Synchronization */ -/*! \defgroup eq_blk Equalization */ -/*! \defgroup converter_blk Type Conversions */ -/*! \defgroup level_blk Signal Level Control (AGC) */ -/*! \defgroup dft_blk Fourier Transform */ -/*! \defgroup wavelet_blk Wavelet Transform */ -/*! \defgroup ofdm_blk OFDM Blocks */ -/*! \defgroup pager_blk Pager Blocks */ -/*! \defgroup misc_blk Miscellaneous Blocks */ -/*! \defgroup slicedice_blk Slicing and Dicing Streams */ -/*! \defgroup vocoder_blk Voice Encoders and Decoders */ -/*! \defgroup digital Digital Modulation Blocks */ -/*! \defgroup analog Analog Communications Blocks */ -/*! \defgroup qtgui_blk QT Graphical Interfaces */ -/*! \defgroup uhd_blk UHD Interface */ -/*! \defgroup audio_blk Audio Interface */ -/*! \defgroup pfb_blk Polyphase Filterbank */ -/*! \defgroup snr_blk SNR estimators */ +/*! \defgroup container_blk Top Block and Hierarchical Block Base Classes */ +/*! \defgroup audio_blk Audio Signals */ +/*! \defgroup boolean_operators_blk Boolean Operators */ +/*! \defgroup byte_operators_blk Byte Operators */ +/*! \defgroup channel_models_blk Channel Models */ +/*! \defgroup channelizers_blk Channelizers */ +/*! \defgroup coding_blk Information Coding and Decoding */ +/*! \defgroup debug_tools_blk Debug Tools */ +/*! \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 */ +/*! \defgroup instrumentation_blk Instrumentation Tools */ +/*! \defgroup level_controllers_blk Level Controllers */ +/*! \defgroup math_operators_blk Math Operators */ +/*! \defgroup measurement_tools_blk Measurement Tools */ +/*! \defgroup message_tools_blk Message Tools */ +/*! \defgroup misc_blk Miscellaneous */ +/*! \defgroup modulators_blk Modulators and Demodulators */ +/*! \defgroup networking_tools_blk Netwroking 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 */ +/*! \defgroup stream_tag_tools_blk Stream Tag Tools */ +/*! \defgroup symbol_coding_blk Symbol Coding */ +/*! \defgroup synchronizers_blk Synchronizers */ +/*! \defgroup trellis_coding_blk Trellis Coding */ +/*! \defgroup type_converters_blk Data Type Converters */ +/*! \defgroup uhd_blk UHD Interface */ +/*! \defgroup waveform_generators_blk Waveform Generators */ +/*! \defgroup wavelet_blk Wavelet Transforms */ +/*! \defgroup wxgui_blk WX Graphical Interfaces */ /*! * \defgroup base_blk Base classes for GR Blocks diff --git a/docs/doxygen/other/pfb_intro.dox b/docs/doxygen/other/pfb_intro.dox index 01d08b0fad..2d285f0027 100644 --- a/docs/doxygen/other/pfb_intro.dox +++ b/docs/doxygen/other/pfb_intro.dox @@ -5,8 +5,7 @@ Polyphase filterbanks (PFB) are a very powerful set of filtering tools that can efficiently perform many multi-rate signal processing tasks. GNU Radio has a set of polyphase filterbank blocks to be used -in all sorts of applications. These blocks and their documentation can -be found in \ref pfb_blk. +in all sorts of applications. \section Usage diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.h b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.h index d144c3eb46..27335702cb 100644 --- a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.h +++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.h @@ -28,7 +28,6 @@ /*! * \brief Adaptive FIR filter with gr_complex input, gr_complex output and float taps - * \ingroup filter_blk */ class GR_CORE_API gr_adaptive_fir_ccc : public gr_sync_decimator { diff --git a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h index 7ec78099f8..13f4f9620c 100644 --- a/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h +++ b/gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h @@ -28,7 +28,6 @@ /*! * \brief Adaptive FIR filter with gr_complex input, gr_complex output and float taps - * \ingroup filter_blk */ class GR_CORE_API gr_adaptive_fir_ccf : public gr_sync_decimator { diff --git a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h index e4d89a775c..5312a9f779 100644 --- a/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h +++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h @@ -48,11 +48,8 @@ typedef boost::shared_ptr<gr_dc_blocker_cc> gr_dc_blocker_cc_sptr; GR_CORE_API gr_dc_blocker_cc_sptr gr_make_dc_blocker_cc (int D=32, bool long_form=true); /*! - * \class gr_dc_blocker_cc * \brief a computationally efficient controllable DC blocker * - * \ingroup filter_blk - * * This block implements a computationally efficient DC blocker that produces * a tighter notch filter around DC for a smaller group delay than an * equivalent FIR filter or using a single pole IIR filter (though the IIR diff --git a/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h b/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h index d69f24835b..5a60ddce99 100644 --- a/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h +++ b/gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h @@ -49,11 +49,8 @@ typedef boost::shared_ptr<gr_dc_blocker_ff> gr_dc_blocker_ff_sptr; GR_CORE_API gr_dc_blocker_ff_sptr gr_make_dc_blocker_ff (int D=32, bool long_form=true); /*! - * \class gr_dc_blocker_ff * \brief a computationally efficient controllable DC blocker * - * \ingroup filter_blk - * * This block implements a computationally efficient DC blocker that produces * a tighter notch filter around DC for a smaller group delay than an * equivalent FIR filter or using a single pole IIR filter (though the IIR diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h index 4b478b65f7..5f648ee655 100644 --- a/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h +++ b/gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h @@ -36,7 +36,6 @@ class gri_fft_filter_ccc_generic; /*! * \brief Fast FFT filter with gr_complex input, gr_complex output and gr_complex taps - * \ingroup filter_blk */ class GR_CORE_API gr_fft_filter_ccc : public gr_sync_decimator { diff --git a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h index 309a551352..e2ca363d23 100644 --- a/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h +++ b/gnuradio-core/src/lib/filter/gr_fft_filter_fff.h @@ -36,7 +36,6 @@ class gri_fft_filter_fff_generic; /*! * \brief Fast FFT filter with float input, float output and float taps - * \ingroup filter_blk */ class GR_CORE_API gr_fft_filter_fff : public gr_sync_decimator { diff --git a/gnuradio-core/src/lib/filter/gr_filter_delay_fc.h b/gnuradio-core/src/lib/filter/gr_filter_delay_fc.h index fee11243a5..a80953c0b8 100644 --- a/gnuradio-core/src/lib/filter/gr_filter_delay_fc.h +++ b/gnuradio-core/src/lib/filter/gr_filter_delay_fc.h @@ -38,7 +38,6 @@ class gr_fir_fff; /*! * \brief Filter-Delay Combination Block. - * \ingroup filter_blk * * The block takes one or two float stream and outputs a complex * stream. If only one float stream is input, the real output is diff --git a/gnuradio-core/src/lib/filter/gr_fir_fcc_x86.h b/gnuradio-core/src/lib/filter/gr_fir_fcc_x86.h index 3fc6c4855b..dceb6d64ee 100644 --- a/gnuradio-core/src/lib/filter/gr_fir_fcc_x86.h +++ b/gnuradio-core/src/lib/filter/gr_fir_fcc_x86.h @@ -39,7 +39,7 @@ public: /*! * \brief SSE version of gr_fir_fcc - * \ingroup filter_blk + * \ingroup filter_primitive */ class GR_CORE_API gr_fir_fcc_sse : public gr_fir_fcc_simd { diff --git a/gnuradio-core/src/lib/filter/gr_fir_filter_XXX.h.t b/gnuradio-core/src/lib/filter/gr_fir_filter_XXX.h.t index b32e04bd35..ed72e82cec 100644 --- a/gnuradio-core/src/lib/filter/gr_fir_filter_XXX.h.t +++ b/gnuradio-core/src/lib/filter/gr_fir_filter_XXX.h.t @@ -39,7 +39,6 @@ class @FIR_TYPE@; /*! * \brief FIR filter with @I_TYPE@ input, @O_TYPE@ output and @TAP_TYPE@ taps - * \ingroup filter_blk */ class GR_CORE_API @NAME@ : public gr_sync_decimator { diff --git a/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h b/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h index 29c67895a4..c09dafe8e7 100644 --- a/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h +++ b/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h @@ -36,7 +36,6 @@ GR_CORE_API gr_fractional_interpolator_cc_sptr gr_make_fractional_interpolator_c /*! * \brief Interpolating mmse filter with gr_complex input, gr_complex output - * \ingroup filter_blk */ class GR_CORE_API gr_fractional_interpolator_cc : public gr_block { diff --git a/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h b/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h index 7e000a6d1c..b9074baedc 100644 --- a/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h +++ b/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h @@ -36,7 +36,6 @@ GR_CORE_API gr_fractional_interpolator_ff_sptr gr_make_fractional_interpolator_f /*! * \brief Interpolating mmse filter with float input, float output - * \ingroup filter_blk */ class GR_CORE_API gr_fractional_interpolator_ff : public gr_block { diff --git a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_XXX.h.t b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_XXX.h.t index 97d20e04f5..f596f9bd9a 100644 --- a/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_XXX.h.t +++ b/gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_XXX.h.t @@ -50,7 +50,6 @@ class @FIR_TYPE@; /*! * \brief FIR filter combined with frequency translation with @I_TYPE@ input, @O_TYPE@ output and @TAP_TYPE@ taps - * \ingroup filter_blk * * This class efficiently combines a frequency translation * (typically "down conversion") with a FIR filter (typically low-pass) diff --git a/gnuradio-core/src/lib/filter/gr_goertzel_fc.h b/gnuradio-core/src/lib/filter/gr_goertzel_fc.h index 5fb6e0ee05..da3b44d662 100644 --- a/gnuradio-core/src/lib/filter/gr_goertzel_fc.h +++ b/gnuradio-core/src/lib/filter/gr_goertzel_fc.h @@ -35,7 +35,6 @@ GR_CORE_API gr_goertzel_fc_sptr gr_make_goertzel_fc(int rate, int len, float fre /*! * \brief Goertzel single-bin DFT calculation. - * \ingroup dft_blk */ class GR_CORE_API gr_goertzel_fc : public gr_sync_decimator { diff --git a/gnuradio-core/src/lib/filter/gr_hilbert_fc.h b/gnuradio-core/src/lib/filter/gr_hilbert_fc.h index 2bb5ff9e37..a479c70bd2 100644 --- a/gnuradio-core/src/lib/filter/gr_hilbert_fc.h +++ b/gnuradio-core/src/lib/filter/gr_hilbert_fc.h @@ -39,7 +39,6 @@ class gr_fir_fff; /*! * \brief Hilbert transformer. - * \ingroup filter_blk * * real output is input appropriately delayed. * imaginary output is hilbert filtered (90 degree phase shift) diff --git a/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h b/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h index ab7065e921..e45bb9ca86 100644 --- a/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h +++ b/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h @@ -36,7 +36,6 @@ gr_make_iir_filter_ffd (const std::vector<double> &fftaps, /*! * \brief IIR filter with float input, float output and double taps - * \ingroup filter_blk * * This filter uses the Direct Form I implementation, where * \p fftaps contains the feed-forward taps, and \p fbtaps the feedback ones. diff --git a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_XXX.h.t b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_XXX.h.t index 83904dce21..fe0b9d92b2 100644 --- a/gnuradio-core/src/lib/filter/gr_interp_fir_filter_XXX.h.t +++ b/gnuradio-core/src/lib/filter/gr_interp_fir_filter_XXX.h.t @@ -39,7 +39,6 @@ class @FIR_TYPE@; /*! * \brief Interpolating FIR filter with @I_TYPE@ input, @O_TYPE@ output and @TAP_TYPE@ taps - * \ingroup filter_blk */ class GR_CORE_API @NAME@ : public gr_sync_interpolator { diff --git a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h index d92898a23e..1c3da10949 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h +++ b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h @@ -36,14 +36,10 @@ GR_CORE_API gr_pfb_arb_resampler_ccf_sptr gr_make_pfb_arb_resampler_ccf (float r class gr_fir_ccf; /*! - * \class gr_pfb_arb_resampler_ccf - * * \brief Polyphase filterbank arbitrary resampler with * gr_complex input, gr_complex output and float taps * - * \ingroup filter_blk - * \ingroup pfb_blk - * + * This block takes in a signal stream and performs arbitrary * resampling. The resampling rate can be any real * number <EM>r</EM>. The resampling is done by constructing diff --git a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h index d2e375210d..1aa55bc24e 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h +++ b/gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h @@ -36,14 +36,9 @@ GR_CORE_API gr_pfb_arb_resampler_fff_sptr gr_make_pfb_arb_resampler_fff (float r class gr_fir_fff; /*! - * \class gr_pfb_arb_resampler_fff - * * \brief Polyphase filterbank arbitrary resampler with * float input, float output and float taps * - * \ingroup filter_blk - * \ingroup pfb_blk - * * This block takes in a signal stream and performs arbitrary * resampling. The resampling rate can be any real * number <EM>r</EM>. The resampling is done by constructing diff --git a/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.h index 79ad322f9a..eaf06962a0 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.h +++ b/gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.h @@ -39,14 +39,9 @@ class gri_fft_complex; /*! - * \class gr_pfb_channelizer_ccf - * * \brief Polyphase filterbank channelizer with * gr_complex input, gr_complex output and float taps * - * \ingroup filter_blk - * \ingroup pfb_blk - * * This block takes in complex inputs and channelizes it to <EM>M</EM> * channels of equal bandwidth. Each of the resulting channels is * decimated to the new rate that is the input sampling rate diff --git a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h index 8715b4b106..01b5de77b8 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h +++ b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h @@ -39,13 +39,8 @@ GR_CORE_API gr_pfb_clock_sync_ccf_sptr gr_make_pfb_clock_sync_ccf (double sps, f class gr_fir_ccf; /*! - * \class gr_pfb_clock_sync_ccf - * * \brief Timing synchronizer using polyphase filterbanks * - * \ingroup filter_blk - * \ingroup pfb_blk - * * This block performs timing synchronization for PAM signals by * minimizing the derivative of the filtered signal, which in turn * maximizes the SNR and minimizes ISI. diff --git a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_fff.h b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_fff.h index 4909d556b9..6807f5761d 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_fff.h +++ b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_fff.h @@ -38,13 +38,8 @@ GR_CORE_API gr_pfb_clock_sync_fff_sptr gr_make_pfb_clock_sync_fff (double sps, f class gr_fir_fff; /*! - * \class gr_pfb_clock_sync_fff - * * \brief Timing synchronizer using polyphase filterbanks * - * \ingroup filter_blk - * \ingroup pfb_blk - * * This block performs timing synchronization for PAM signals by * minimizing the derivative of the filtered signal, which in turn * maximizes the SNR and minimizes ISI. diff --git a/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h index a2b347ae24..c882b21d9f 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h +++ b/gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h @@ -37,13 +37,9 @@ class gr_fir_ccf; class gri_fft_complex; /*! - * \class gr_pfb_decimator_ccf * \brief Polyphase filterbank bandpass decimator with gr_complex * input, gr_complex output and float taps * - * \ingroup filter_blk - * \ingroup pfb_blk - * * This block takes in a signal stream and performs interger down- * sampling (decimation) with a polyphase filterbank. The first input * is the integer specifying how much to decimate by. The second diff --git a/gnuradio-core/src/lib/filter/gr_pfb_interpolator_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_interpolator_ccf.h index aeae86e408..25322ecc0d 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_interpolator_ccf.h +++ b/gnuradio-core/src/lib/filter/gr_pfb_interpolator_ccf.h @@ -35,13 +35,9 @@ GR_CORE_API gr_pfb_interpolator_ccf_sptr gr_make_pfb_interpolator_ccf (unsigned class gr_fir_ccf; /*! - * \class gr_pfb_interpolator_ccf * \brief Polyphase filterbank interpolator with gr_complex input, * gr_complex output and float taps * - * \ingroup filter_blk - * \ingroup pfb_blk - * * This block takes in a signal stream and performs interger up- * sampling (interpolation) with a polyphase filterbank. The first * input is the integer specifying how much to interpolate by. The diff --git a/gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.h index 9e4f85497d..50c467cd31 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.h +++ b/gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.h @@ -38,13 +38,8 @@ class gri_fft_complex; /*! - * \class gr_pfb_synthesizer_ccf - * * \brief Polyphase synthesis filterbank with * gr_complex input, gr_complex output and float taps - * - * \ingroup filter_blk - * \ingroup pfb_blk */ class GR_CORE_API gr_pfb_synthesizer_ccf : public gr_sync_interpolator diff --git a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_XXX.h.t b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_XXX.h.t index 3eb85a9795..baa97e1ebf 100644 --- a/gnuradio-core/src/lib/filter/gr_rational_resampler_base_XXX.h.t +++ b/gnuradio-core/src/lib/filter/gr_rational_resampler_base_XXX.h.t @@ -43,7 +43,6 @@ class @FIR_TYPE@; /*! * \brief Rational Resampling Polyphase FIR filter with @I_TYPE@ input, @O_TYPE@ output and @TAP_TYPE@ taps - * \ingroup filter_blk */ class GR_CORE_API @NAME@ : public gr_block { diff --git a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h index 13c595826d..fdcd275ea9 100644 --- a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h +++ b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h @@ -37,7 +37,6 @@ gr_make_single_pole_iir_filter_cc (double alpha, unsigned int vlen=1); /*! * \brief single pole IIR filter with complex input, complex output - * \ingroup filter_blk * * The input and output satisfy a difference equation of the form \htmlonly diff --git a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h index 8dcdad2c94..13918deb70 100644 --- a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h +++ b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h @@ -36,7 +36,6 @@ gr_make_single_pole_iir_filter_ff (double alpha, unsigned int vlen=1); /*! * \brief single pole IIR filter with float input, float output - * \ingroup filter_blk * * The input and output satisfy a difference equation of the form \htmlonly diff --git a/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.h b/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.h index 648c2b8c54..478cc77202 100644 --- a/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.h +++ b/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.h @@ -31,7 +31,6 @@ class gri_fft_complex; /*! * \brief Fast FFT filter with gr_complex input, gr_complex output and gr_complex taps - * \ingroup filter_blk */ class GR_CORE_API gri_fft_filter_ccc_generic { diff --git a/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_sse.h b/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_sse.h index 64b8c0c153..7c6dcd18c8 100644 --- a/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_sse.h +++ b/gnuradio-core/src/lib/filter/gri_fft_filter_ccc_sse.h @@ -31,7 +31,6 @@ class gri_fft_complex; /*! * \brief Fast FFT filter with gr_complex input, gr_complex output and gr_complex taps - * \ingroup filter_blk */ class GR_CORE_API gri_fft_filter_ccc_sse { diff --git a/gnuradio-core/src/lib/general/gr_add_ff.h b/gnuradio-core/src/lib/general/gr_add_ff.h index ff5604c97d..51d7aceae9 100644 --- a/gnuradio-core/src/lib/general/gr_add_ff.h +++ b/gnuradio-core/src/lib/general/gr_add_ff.h @@ -34,7 +34,6 @@ gr_make_add_ff (size_t vlen=1); /*! * \brief Add streams of complex values - * \ingroup math_blk */ class GR_CORE_API gr_add_ff : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_additive_scrambler_bb.h b/gnuradio-core/src/lib/general/gr_additive_scrambler_bb.h index 1c336306d6..5c2a68b5c9 100644 --- a/gnuradio-core/src/lib/general/gr_additive_scrambler_bb.h +++ b/gnuradio-core/src/lib/general/gr_additive_scrambler_bb.h @@ -45,8 +45,6 @@ GR_CORE_API gr_additive_scrambler_bb_sptr gr_make_additive_scrambler_bb(int mask * the LFSR. Optionally, after 'count' bits have been processed, the shift * register is reset to the seed value. This allows processing fixed length * vectors of samples. - * - * \ingroup coding_blk */ class GR_CORE_API gr_additive_scrambler_bb : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_agc2_cc.h b/gnuradio-core/src/lib/general/gr_agc2_cc.h index 54bae1aae9..ce251fb1d7 100644 --- a/gnuradio-core/src/lib/general/gr_agc2_cc.h +++ b/gnuradio-core/src/lib/general/gr_agc2_cc.h @@ -35,7 +35,6 @@ gr_make_agc2_cc (float attack_rate = 1e-1, float decay_rate = 1e-2, float refere float gain = 1.0, float max_gain = 0.0); /*! * \brief high performance Automatic Gain Control class - * \ingroup level_blk * * For Power the absolute value of the complex number is used. */ diff --git a/gnuradio-core/src/lib/general/gr_agc2_ff.h b/gnuradio-core/src/lib/general/gr_agc2_ff.h index 48529948c0..e4e830a1bc 100644 --- a/gnuradio-core/src/lib/general/gr_agc2_ff.h +++ b/gnuradio-core/src/lib/general/gr_agc2_ff.h @@ -35,7 +35,6 @@ gr_make_agc2_ff (float attack_rate = 1e-1, float decay_rate = 1e-2, float refere /*! * \brief high performance Automatic Gain Control class * - * \ingroup level_blk * Power is approximated by absolute value */ diff --git a/gnuradio-core/src/lib/general/gr_agc_cc.h b/gnuradio-core/src/lib/general/gr_agc_cc.h index 9f35350dbd..62a6ffb15b 100644 --- a/gnuradio-core/src/lib/general/gr_agc_cc.h +++ b/gnuradio-core/src/lib/general/gr_agc_cc.h @@ -34,7 +34,6 @@ gr_make_agc_cc (float rate = 1e-4, float reference = 1.0, float gain = 1.0, float max_gain = 0.0); /*! * \brief high performance Automatic Gain Control class - * \ingroup level_blk * * For Power the absolute value of the complex number is used. */ diff --git a/gnuradio-core/src/lib/general/gr_agc_ff.h b/gnuradio-core/src/lib/general/gr_agc_ff.h index dc618213bb..14b418782d 100644 --- a/gnuradio-core/src/lib/general/gr_agc_ff.h +++ b/gnuradio-core/src/lib/general/gr_agc_ff.h @@ -35,7 +35,6 @@ gr_make_agc_ff (float rate = 1e-4, float reference = 1.0, /*! * \brief high performance Automatic Gain Control class - * \ingroup level_blk * * Power is approximated by absolute value */ diff --git a/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.h b/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.h index 1b71a3f4bc..56a7aaa7f5 100644 --- a/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.h +++ b/gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.h @@ -28,7 +28,6 @@ /*! * \brief align several complex short (interleaved short) input channels with corresponding unsigned 32 bit sample_counters (provided as interleaved 16 bit values) - * \ingroup misc * \param number of complex_short input channels (including the 32 bit counting channel) * \param align_interval is after how much samples (minimally) the sample-alignement is refreshed. Default is 128. * A bigger value means less processing power but also requests more buffer space, which has a maximum. @@ -37,7 +36,6 @@ * ninput_items_required = 32768 * max_possible_items_available = 16383 * If this is a filter, consider reducing the number of taps." - * \ingroup block * Pay attention on how you connect this block. * It expects a minimum of 2 usrp_source_s with nchan number of channels and FPGA_MODE_COUNTING_32BIT enabled. * This means that the first complex_short channel on every input is an interleaved 32 bit counter. diff --git a/gnuradio-core/src/lib/general/gr_bin_statistics_f.h b/gnuradio-core/src/lib/general/gr_bin_statistics_f.h index dd10759096..21401209cf 100644 --- a/gnuradio-core/src/lib/general/gr_bin_statistics_f.h +++ b/gnuradio-core/src/lib/general/gr_bin_statistics_f.h @@ -43,7 +43,6 @@ gr_make_bin_statistics_f(unsigned int vlen, // vector length /*! * \brief control scanning and record frequency domain statistics - * \ingroup sink_blk */ class GR_CORE_API gr_bin_statistics_f : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_burst_tagger.h b/gnuradio-core/src/lib/general/gr_burst_tagger.h index 9a7898b043..c0307ff254 100644 --- a/gnuradio-core/src/lib/general/gr_burst_tagger.h +++ b/gnuradio-core/src/lib/general/gr_burst_tagger.h @@ -33,7 +33,6 @@ GR_CORE_API gr_burst_tagger_sptr gr_make_burst_tagger(size_t itemsize); /*! * \brief output[i] = input[i] - * \ingroup misc_blk * */ class GR_CORE_API gr_burst_tagger : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_bytes_to_syms.h b/gnuradio-core/src/lib/general/gr_bytes_to_syms.h index 23e5c6b91b..1dc928ae6c 100644 --- a/gnuradio-core/src/lib/general/gr_bytes_to_syms.h +++ b/gnuradio-core/src/lib/general/gr_bytes_to_syms.h @@ -32,7 +32,6 @@ GR_CORE_API gr_bytes_to_syms_sptr gr_make_bytes_to_syms (); /*! * \brief Convert stream of bytes to stream of +/- 1 symbols - * \ingroup converter_blk * * input: stream of bytes; output: stream of float * diff --git a/gnuradio-core/src/lib/general/gr_char_to_float.h b/gnuradio-core/src/lib/general/gr_char_to_float.h index 5170c618c9..d216f3385c 100644 --- a/gnuradio-core/src/lib/general/gr_char_to_float.h +++ b/gnuradio-core/src/lib/general/gr_char_to_float.h @@ -34,7 +34,6 @@ gr_make_char_to_float (size_t vlen=1, float scale=1); /*! * \brief Convert stream of chars to a stream of float - * \ingroup converter_blk * * \param vlen vector length of data streams. * \param scale a scalar divider to change the output signal scale. diff --git a/gnuradio-core/src/lib/general/gr_char_to_short.h b/gnuradio-core/src/lib/general/gr_char_to_short.h index 7ac5e97b93..be316b0fb6 100644 --- a/gnuradio-core/src/lib/general/gr_char_to_short.h +++ b/gnuradio-core/src/lib/general/gr_char_to_short.h @@ -34,7 +34,6 @@ gr_make_char_to_short (size_t vlen=1); /*! * \brief Convert stream of chars to a stream of float - * \ingroup converter_blk * * \param vlen vector length of data streams. */ diff --git a/gnuradio-core/src/lib/general/gr_check_counting_s.h b/gnuradio-core/src/lib/general/gr_check_counting_s.h index 996fa3259f..c304f87d73 100644 --- a/gnuradio-core/src/lib/general/gr_check_counting_s.h +++ b/gnuradio-core/src/lib/general/gr_check_counting_s.h @@ -33,7 +33,6 @@ GR_CORE_API gr_check_counting_s_sptr gr_make_check_counting_s (bool do_32bit=fal /*! * \brief sink that checks if its input stream consists of a counting sequence. * \param do_32bit expect an interleaved 32 bit counter in stead of 16 bit counter (default false) - * \ingroup sink_blk * * This sink is typically used to test the USRP "Counting Mode" or "Counting mode 32 bit". */ diff --git a/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h b/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h index 2f980b427b..fcaef9085f 100644 --- a/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h +++ b/gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h @@ -34,7 +34,6 @@ GR_CORE_API gr_check_lfsr_32k_s_sptr gr_make_check_lfsr_32k_s (); /*! * \brief sink that checks if its input stream consists of a lfsr_32k sequence. - * \ingroup sink_blk * * This sink is typically used along with gr_lfsr_32k_source_s to test * the USRP using its digital loopback mode. diff --git a/gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.h b/gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.h index 66503413ff..5140f8d7af 100644 --- a/gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.h +++ b/gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.h @@ -35,7 +35,6 @@ gr_make_complex_to_interleaved_short (); /*! * \brief Convert stream of complex to a stream of interleaved shorts - * \ingroup converter_blk */ class GR_CORE_API gr_complex_to_interleaved_short : public gr_sync_interpolator diff --git a/gnuradio-core/src/lib/general/gr_complex_to_xxx.h b/gnuradio-core/src/lib/general/gr_complex_to_xxx.h index a2f06ea28c..450b94b069 100644 --- a/gnuradio-core/src/lib/general/gr_complex_to_xxx.h +++ b/gnuradio-core/src/lib/general/gr_complex_to_xxx.h @@ -50,7 +50,6 @@ GR_CORE_API gr_complex_to_arg_sptr gr_make_complex_to_arg (unsigned int vlen=1); /*! * \brief convert a stream of gr_complex to 1 or 2 streams of float - * \ingroup converter_blk * \param vlen vector len (default 1) */ class GR_CORE_API gr_complex_to_float : public gr_sync_block @@ -68,7 +67,6 @@ class GR_CORE_API gr_complex_to_float : public gr_sync_block /*! * \brief complex in, real out (float) - * \ingroup converter_blk * \param vlen vector len (default 1) */ class GR_CORE_API gr_complex_to_real : public gr_sync_block @@ -86,7 +84,6 @@ class GR_CORE_API gr_complex_to_real : public gr_sync_block /*! * \brief complex in, imaginary out (float) - * \ingroup converter_blk * \param vlen vector len (default 1) */ class GR_CORE_API gr_complex_to_imag : public gr_sync_block @@ -104,7 +101,6 @@ class GR_CORE_API gr_complex_to_imag : public gr_sync_block /*! * \brief complex in, magnitude out (float) - * \ingroup converter_blk * \param vlen vector len (default 1) */ class GR_CORE_API gr_complex_to_mag : public gr_sync_block @@ -123,7 +119,6 @@ class GR_CORE_API gr_complex_to_mag : public gr_sync_block /*! * \brief complex in, magnitude squared out (float) - * \ingroup converter_blk * \param vlen vector len (default 1) */ class GR_CORE_API gr_complex_to_mag_squared : public gr_sync_block @@ -141,7 +136,6 @@ class GR_CORE_API gr_complex_to_mag_squared : public gr_sync_block /*! * \brief complex in, angle out (float) - * \ingroup converter_blk * \param vlen vector len (default 1) */ class GR_CORE_API gr_complex_to_arg : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_conjugate_cc.h b/gnuradio-core/src/lib/general/gr_conjugate_cc.h index e0a2af7164..11d521475f 100644 --- a/gnuradio-core/src/lib/general/gr_conjugate_cc.h +++ b/gnuradio-core/src/lib/general/gr_conjugate_cc.h @@ -35,7 +35,6 @@ GR_CORE_API gr_conjugate_cc_sptr gr_make_conjugate_cc (); /*! * \brief output = complex conjugate of input - * \ingroup math_blk */ class GR_CORE_API gr_conjugate_cc : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_copy.h b/gnuradio-core/src/lib/general/gr_copy.h index b0769fa2b1..786ef8061b 100644 --- a/gnuradio-core/src/lib/general/gr_copy.h +++ b/gnuradio-core/src/lib/general/gr_copy.h @@ -33,7 +33,6 @@ GR_CORE_API gr_copy_sptr gr_make_copy(size_t itemsize); /*! * \brief output[i] = input[i] - * \ingroup misc_blk * * When enabled (default), this block copies its input to its output. * When disabled, this block drops its input on the floor. diff --git a/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h index 345d3004a5..804cdcdefb 100644 --- a/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h +++ b/gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h @@ -41,7 +41,6 @@ gr_make_correlate_access_code_tag_bb (const std::string &access_code, int thresh /*! * \brief Examine input for specified access code, one bit at a time. - * \ingroup sync_blk * * input: stream of bits, 1 bit per input byte (data in LSB) * output: unaltered stream of bits (plus tags) diff --git a/gnuradio-core/src/lib/general/gr_cpfsk_bc.h b/gnuradio-core/src/lib/general/gr_cpfsk_bc.h index 6ad2774b3a..348c303e64 100644 --- a/gnuradio-core/src/lib/general/gr_cpfsk_bc.h +++ b/gnuradio-core/src/lib/general/gr_cpfsk_bc.h @@ -32,7 +32,6 @@ GR_CORE_API gr_cpfsk_bc_sptr gr_make_cpfsk_bc(float k, float ampl, int samples_p /*! * \brief Perform continuous phase 2-level frequency shift keying modulation * on an input stream of unpacked bits. - * \ingroup modulation_blk * * \param k modulation index * \param ampl output amplitude diff --git a/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.h b/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.h index ef3d13ba7b..9d8a3ca8c4 100644 --- a/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.h +++ b/gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.h @@ -35,7 +35,6 @@ gr_make_ctcss_squelch_ff(int rate, float freq, float level=0.01, int len=0, int /*! * \brief gate or zero output if ctcss tone not present - * \ingroup level_blk */ class GR_CORE_API gr_ctcss_squelch_ff : public gr_squelch_base_ff { diff --git a/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.h b/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.h index df8e6f449d..15f0e6fff3 100644 --- a/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.h +++ b/gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.h @@ -34,7 +34,6 @@ typedef boost::shared_ptr<gr_decode_ccsds_27_fb> gr_decode_ccsds_27_fb_sptr; GR_CORE_API gr_decode_ccsds_27_fb_sptr gr_make_decode_ccsds_27_fb(); /*! \brief A rate 1/2, k=7 convolutional decoder for the CCSDS standard - * \ingroup ecc * * This block performs soft-decision convolutional decoding using the Viterbi * algorithm. diff --git a/gnuradio-core/src/lib/general/gr_deinterleave.h b/gnuradio-core/src/lib/general/gr_deinterleave.h index 0eecc44d13..3cc93b1a41 100644 --- a/gnuradio-core/src/lib/general/gr_deinterleave.h +++ b/gnuradio-core/src/lib/general/gr_deinterleave.h @@ -33,7 +33,6 @@ GR_CORE_API gr_deinterleave_sptr gr_make_deinterleave (size_t itemsize); /*! * \brief deinterleave a single input into N outputs - * \ingroup slicedice_blk */ class GR_CORE_API gr_deinterleave : public gr_sync_decimator { diff --git a/gnuradio-core/src/lib/general/gr_delay.h b/gnuradio-core/src/lib/general/gr_delay.h index ed05c47f43..2572355cc0 100644 --- a/gnuradio-core/src/lib/general/gr_delay.h +++ b/gnuradio-core/src/lib/general/gr_delay.h @@ -34,7 +34,6 @@ GR_CORE_API gr_delay_sptr gr_make_delay (size_t itemsize, int delay); /*! * \brief delay the input by a certain number of samples - * \ingroup misc_blk */ class GR_CORE_API gr_delay : public gr_block { diff --git a/gnuradio-core/src/lib/general/gr_descrambler_bb.h b/gnuradio-core/src/lib/general/gr_descrambler_bb.h index 333593caaf..c0657f46e9 100644 --- a/gnuradio-core/src/lib/general/gr_descrambler_bb.h +++ b/gnuradio-core/src/lib/general/gr_descrambler_bb.h @@ -39,8 +39,6 @@ GR_CORE_API gr_descrambler_bb_sptr gr_make_descrambler_bb(int mask, int seed, in * \param mask Polynomial mask for LFSR * \param seed Initial shift register contents * \param len Shift register length - * - * \ingroup coding_blk */ class GR_CORE_API gr_descrambler_bb : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_diff_decoder_bb.h b/gnuradio-core/src/lib/general/gr_diff_decoder_bb.h index c4ebbc4765..d6d51b5dea 100644 --- a/gnuradio-core/src/lib/general/gr_diff_decoder_bb.h +++ b/gnuradio-core/src/lib/general/gr_diff_decoder_bb.h @@ -33,7 +33,6 @@ GR_CORE_API gr_diff_decoder_bb_sptr gr_make_diff_decoder_bb (unsigned int modulu /*! * \brief y[0] = (x[0] - x[-1]) % M - * \ingroup coding_blk * * Differential decoder */ diff --git a/gnuradio-core/src/lib/general/gr_diff_encoder_bb.h b/gnuradio-core/src/lib/general/gr_diff_encoder_bb.h index e98876b700..556e9bdaf9 100644 --- a/gnuradio-core/src/lib/general/gr_diff_encoder_bb.h +++ b/gnuradio-core/src/lib/general/gr_diff_encoder_bb.h @@ -33,7 +33,6 @@ GR_CORE_API gr_diff_encoder_bb_sptr gr_make_diff_encoder_bb (unsigned int modulu /*! * \brief y[0] = (x[0] + y[-1]) % M - * \ingroup coding_blk * * Differential encoder */ diff --git a/gnuradio-core/src/lib/general/gr_diff_phasor_cc.h b/gnuradio-core/src/lib/general/gr_diff_phasor_cc.h index 21c4f616d5..6f4632c952 100644 --- a/gnuradio-core/src/lib/general/gr_diff_phasor_cc.h +++ b/gnuradio-core/src/lib/general/gr_diff_phasor_cc.h @@ -28,7 +28,6 @@ /*! * \brief Please fix my documentation! - * \ingroup misc */ class gr_diff_phasor_cc; typedef boost::shared_ptr<gr_diff_phasor_cc> gr_diff_phasor_cc_sptr; diff --git a/gnuradio-core/src/lib/general/gr_dpll_bb.h b/gnuradio-core/src/lib/general/gr_dpll_bb.h index a7df974fb4..4875600479 100644 --- a/gnuradio-core/src/lib/general/gr_dpll_bb.h +++ b/gnuradio-core/src/lib/general/gr_dpll_bb.h @@ -33,7 +33,6 @@ GR_CORE_API gr_dpll_bb_sptr gr_make_dpll_bb (float period, float gain); /*! * \brief Detect the peak of a signal - * \ingroup level_blk * * If a peak is detected, this block outputs a 1, * or it outputs 0's. diff --git a/gnuradio-core/src/lib/general/gr_encode_ccsds_27_bb.h b/gnuradio-core/src/lib/general/gr_encode_ccsds_27_bb.h index 94e9c33f1b..a480c0828f 100644 --- a/gnuradio-core/src/lib/general/gr_encode_ccsds_27_bb.h +++ b/gnuradio-core/src/lib/general/gr_encode_ccsds_27_bb.h @@ -30,7 +30,6 @@ typedef boost::shared_ptr<gr_encode_ccsds_27_bb> gr_encode_ccsds_27_bb_sptr; GR_CORE_API gr_encode_ccsds_27_bb_sptr gr_make_encode_ccsds_27_bb(); /*! \brief A rate 1/2, k=7 convolutional encoder for the CCSDS standard - * \ingroup ecc * * This block performs convolutional encoding using the CCSDS standard * polynomial ("Voyager"). diff --git a/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.h b/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.h index 45808752d3..33e5b9cc7b 100644 --- a/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.h +++ b/gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.h @@ -34,7 +34,6 @@ gr_make_fake_channel_encoder_pp(int input_vlen, int output_vlen); /*! * \brief pad packet with alternating 1,0 pattern. - * \ingroup coding_blk * * input: stream of byte vectors; output: stream of byte vectors */ @@ -66,7 +65,6 @@ gr_make_fake_channel_decoder_pp(int input_vlen, int output_vlen); /*! * \brief remove fake padding from packet - * \ingroup coding_blk * * input: stream of byte vectors; output: stream of byte vectors */ diff --git a/gnuradio-core/src/lib/general/gr_feedforward_agc_cc.h b/gnuradio-core/src/lib/general/gr_feedforward_agc_cc.h index 63e5e4c436..c76337a017 100644 --- a/gnuradio-core/src/lib/general/gr_feedforward_agc_cc.h +++ b/gnuradio-core/src/lib/general/gr_feedforward_agc_cc.h @@ -34,7 +34,6 @@ gr_make_feedforward_agc_cc(int nsamples, float reference = 1.0); /*! * \brief Non-causal AGC which computes required gain based on max absolute value over nsamples - * \ingroup level_blk */ class GR_CORE_API gr_feedforward_agc_cc : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_fft_vcc.h b/gnuradio-core/src/lib/general/gr_fft_vcc.h index db5690d41d..472e4d5e7f 100644 --- a/gnuradio-core/src/lib/general/gr_fft_vcc.h +++ b/gnuradio-core/src/lib/general/gr_fft_vcc.h @@ -36,7 +36,6 @@ gr_make_fft_vcc (int fft_size, bool forward, /*! * \brief Compute forward or reverse FFT. complex vector in / complex vector out. - * \ingroup dft_blk * * Abstract base class */ diff --git a/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h b/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h index 967ceaefb6..d6f825fe5e 100644 --- a/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h +++ b/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h @@ -35,7 +35,6 @@ gr_make_fft_vcc_fftw (int fft_size, bool forward, /*! * \brief Compute forward or reverse FFT. complex vector in / complex vector out. - * \ingroup dft_blk * * Concrete class that uses FFTW. */ diff --git a/gnuradio-core/src/lib/general/gr_fft_vfc.h b/gnuradio-core/src/lib/general/gr_fft_vfc.h index 35b95313d3..aba6e697a3 100644 --- a/gnuradio-core/src/lib/general/gr_fft_vfc.h +++ b/gnuradio-core/src/lib/general/gr_fft_vfc.h @@ -38,7 +38,6 @@ gr_make_fft_vfc (int fft_size, bool forward, /*! * \brief Compute forward FFT. float vector in / complex vector out. - * \ingroup dft_blk */ class GR_CORE_API gr_fft_vfc : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_float_to_char.h b/gnuradio-core/src/lib/general/gr_float_to_char.h index 2df50f18d5..92c828948d 100644 --- a/gnuradio-core/src/lib/general/gr_float_to_char.h +++ b/gnuradio-core/src/lib/general/gr_float_to_char.h @@ -34,7 +34,6 @@ gr_make_float_to_char (size_t vlen=1, float scale=1); /*! * \brief Convert stream of float to a stream of char - * \ingroup converter_blk * * \param vlen vector length of data streams. * \param scale a scalar multiplier to change the output signal scale. diff --git a/gnuradio-core/src/lib/general/gr_float_to_complex.h b/gnuradio-core/src/lib/general/gr_float_to_complex.h index 628b4a954e..87c4954c29 100644 --- a/gnuradio-core/src/lib/general/gr_float_to_complex.h +++ b/gnuradio-core/src/lib/general/gr_float_to_complex.h @@ -35,7 +35,6 @@ gr_make_float_to_complex (size_t vlen = 1); /*! * \brief Convert 1 or 2 streams of float to a stream of gr_complex - * \ingroup converter_blk */ class GR_CORE_API gr_float_to_complex : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_float_to_int.h b/gnuradio-core/src/lib/general/gr_float_to_int.h index c10ea739d2..f4053a7682 100644 --- a/gnuradio-core/src/lib/general/gr_float_to_int.h +++ b/gnuradio-core/src/lib/general/gr_float_to_int.h @@ -34,7 +34,6 @@ gr_make_float_to_int (size_t vlen=1, float scale=1); /*! * \brief Convert stream of float to a stream of short - * \ingroup converter_blk * * \param vlen vector length of data streams. * \param scale a scalar multiplier to change the output signal scale. diff --git a/gnuradio-core/src/lib/general/gr_float_to_short.h b/gnuradio-core/src/lib/general/gr_float_to_short.h index 9e43804f54..968d5fbc7f 100644 --- a/gnuradio-core/src/lib/general/gr_float_to_short.h +++ b/gnuradio-core/src/lib/general/gr_float_to_short.h @@ -34,7 +34,6 @@ gr_make_float_to_short (size_t vlen=1, float scale=1); /*! * \brief Convert stream of float to a stream of short - * \ingroup converter_blk * * \param vlen vector length of data streams. * \param scale a scalar multiplier to change the output signal scale. diff --git a/gnuradio-core/src/lib/general/gr_float_to_uchar.h b/gnuradio-core/src/lib/general/gr_float_to_uchar.h index 7fd947048a..ca7e3cf1ca 100644 --- a/gnuradio-core/src/lib/general/gr_float_to_uchar.h +++ b/gnuradio-core/src/lib/general/gr_float_to_uchar.h @@ -34,7 +34,6 @@ gr_make_float_to_uchar (); /*! * \brief Convert stream of float to a stream of unsigned char - * \ingroup converter_blk */ class GR_CORE_API gr_float_to_uchar : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_framer_sink_1.h b/gnuradio-core/src/lib/general/gr_framer_sink_1.h index 93e41745f3..796189bfc7 100644 --- a/gnuradio-core/src/lib/general/gr_framer_sink_1.h +++ b/gnuradio-core/src/lib/general/gr_framer_sink_1.h @@ -35,7 +35,6 @@ gr_make_framer_sink_1 (gr_msg_queue_sptr target_queue); /*! * \brief Given a stream of bits and access_code flags, assemble packets. - * \ingroup sink_blk * * input: stream of bytes from gr_correlate_access_code_bb * output: none. Pushes assembled packet into target queue diff --git a/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h b/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h index c680e96480..441610644e 100644 --- a/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h +++ b/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h @@ -33,7 +33,6 @@ GR_CORE_API gr_frequency_modulator_fc_sptr gr_make_frequency_modulator_fc (doubl /*! * \brief Frequency modulator block - * \ingroup modulation_blk * * float input; complex baseband output */ diff --git a/gnuradio-core/src/lib/general/gr_glfsr_source_b.h b/gnuradio-core/src/lib/general/gr_glfsr_source_b.h index 7549a76b32..4ac63f44c1 100644 --- a/gnuradio-core/src/lib/general/gr_glfsr_source_b.h +++ b/gnuradio-core/src/lib/general/gr_glfsr_source_b.h @@ -35,7 +35,6 @@ GR_CORE_API gr_glfsr_source_b_sptr gr_make_glfsr_source_b(int degree, bool repea /*! * \brief Galois LFSR pseudo-random source - * \ingroup source_blk */ class GR_CORE_API gr_glfsr_source_b : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_glfsr_source_f.h b/gnuradio-core/src/lib/general/gr_glfsr_source_f.h index 3549e3e5df..2f0c003f1c 100644 --- a/gnuradio-core/src/lib/general/gr_glfsr_source_f.h +++ b/gnuradio-core/src/lib/general/gr_glfsr_source_f.h @@ -35,7 +35,6 @@ GR_CORE_API gr_glfsr_source_f_sptr gr_make_glfsr_source_f(int degree, bool repea /*! * \brief Galois LFSR pseudo-random source generating float outputs -1.0 - 1.0 - * \ingroup source_blk */ class GR_CORE_API gr_glfsr_source_f : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_head.h b/gnuradio-core/src/lib/general/gr_head.h index 48415892dd..dd1b625d88 100644 --- a/gnuradio-core/src/lib/general/gr_head.h +++ b/gnuradio-core/src/lib/general/gr_head.h @@ -32,7 +32,6 @@ typedef boost::shared_ptr<gr_head> gr_head_sptr; /*! * \brief copies the first N items to the output then signals done - * \ingroup slicedice_blk * * Useful for building test cases */ diff --git a/gnuradio-core/src/lib/general/gr_int_to_float.h b/gnuradio-core/src/lib/general/gr_int_to_float.h index 6200c5be75..0b3be88a6e 100644 --- a/gnuradio-core/src/lib/general/gr_int_to_float.h +++ b/gnuradio-core/src/lib/general/gr_int_to_float.h @@ -34,7 +34,6 @@ gr_make_int_to_float (size_t vlen=1, float scale=1); /*! * \brief Convert stream of int to a stream of float - * \ingroup converter_blk * * \param vlen vector length of data streams. * \param scale a scalar divider to change the output signal scale. diff --git a/gnuradio-core/src/lib/general/gr_interleave.h b/gnuradio-core/src/lib/general/gr_interleave.h index 3b0202d008..c90a69ac45 100644 --- a/gnuradio-core/src/lib/general/gr_interleave.h +++ b/gnuradio-core/src/lib/general/gr_interleave.h @@ -33,7 +33,6 @@ GR_CORE_API gr_interleave_sptr gr_make_interleave (size_t itemsize); /*! * \brief interleave N inputs to a single output - * \ingroup slicedice_blk */ class GR_CORE_API gr_interleave : public gr_sync_interpolator { diff --git a/gnuradio-core/src/lib/general/gr_interleaved_short_to_complex.h b/gnuradio-core/src/lib/general/gr_interleaved_short_to_complex.h index 159d107b33..f43b38ae11 100644 --- a/gnuradio-core/src/lib/general/gr_interleaved_short_to_complex.h +++ b/gnuradio-core/src/lib/general/gr_interleaved_short_to_complex.h @@ -35,7 +35,6 @@ gr_make_interleaved_short_to_complex (); /*! * \brief Convert stream of interleaved shorts to a stream of complex - * \ingroup converter_blk */ class GR_CORE_API gr_interleaved_short_to_complex : public gr_sync_decimator diff --git a/gnuradio-core/src/lib/general/gr_iqcomp_cc.h b/gnuradio-core/src/lib/general/gr_iqcomp_cc.h index 2f5a44ebfb..21d57b0701 100644 --- a/gnuradio-core/src/lib/general/gr_iqcomp_cc.h +++ b/gnuradio-core/src/lib/general/gr_iqcomp_cc.h @@ -34,7 +34,6 @@ GR_CORE_API gr_iqcomp_cc_sptr gr_make_iqcomp_cc (float mu); /*! * \brief - * \ingroup misc_blk */ class GR_CORE_API gr_iqcomp_cc : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_keep_m_in_n.h b/gnuradio-core/src/lib/general/gr_keep_m_in_n.h index c6bf40ecf2..3e7482529d 100644 --- a/gnuradio-core/src/lib/general/gr_keep_m_in_n.h +++ b/gnuradio-core/src/lib/general/gr_keep_m_in_n.h @@ -35,7 +35,6 @@ gr_make_keep_m_in_n (size_t item_size, int m, int n, int offset); /*! * \brief decimate a stream, keeping one item out of every n. - * \ingroup slicedice_blk */ class GR_CORE_API gr_keep_m_in_n : public gr_block { diff --git a/gnuradio-core/src/lib/general/gr_keep_one_in_n.h b/gnuradio-core/src/lib/general/gr_keep_one_in_n.h index f37475204b..734716cfdf 100644 --- a/gnuradio-core/src/lib/general/gr_keep_one_in_n.h +++ b/gnuradio-core/src/lib/general/gr_keep_one_in_n.h @@ -35,7 +35,6 @@ gr_make_keep_one_in_n (size_t item_size, int n); /*! * \brief decimate a stream, keeping one item out of every n. - * \ingroup slicedice_blk */ class GR_CORE_API gr_keep_one_in_n : public gr_block { diff --git a/gnuradio-core/src/lib/general/gr_kludge_copy.h b/gnuradio-core/src/lib/general/gr_kludge_copy.h index 0bcf144699..4e93e52408 100644 --- a/gnuradio-core/src/lib/general/gr_kludge_copy.h +++ b/gnuradio-core/src/lib/general/gr_kludge_copy.h @@ -33,7 +33,6 @@ GR_CORE_API gr_kludge_copy_sptr gr_make_kludge_copy(size_t itemsize); /*! * \brief output[i] = input[i] - * \ingroup misc_blk * * This is a short term kludge to work around a problem with the hierarchical block impl. */ diff --git a/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h b/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h index db107652ad..cb5a4e9b5c 100644 --- a/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h +++ b/gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h @@ -34,7 +34,6 @@ GR_CORE_API gr_lfsr_32k_source_s_sptr gr_make_lfsr_32k_source_s (); /*! * \brief LFSR pseudo-random source with period of 2^15 bits (2^11 shorts) - * \ingroup source_blk * * This source is typically used along with gr_check_lfsr_32k_s to test * the USRP using its digital loopback mode. diff --git a/gnuradio-core/src/lib/general/gr_map_bb.h b/gnuradio-core/src/lib/general/gr_map_bb.h index 0a2f5a45f8..800ac1c851 100644 --- a/gnuradio-core/src/lib/general/gr_map_bb.h +++ b/gnuradio-core/src/lib/general/gr_map_bb.h @@ -32,7 +32,6 @@ GR_CORE_API gr_map_bb_sptr gr_make_map_bb(const std::vector<int> &map); /*! * \brief output[i] = map[input[i]] - * \ingroup coding_blk */ class GR_CORE_API gr_map_bb : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_message_strobe.h b/gnuradio-core/src/lib/general/gr_message_strobe.h index 89046ffc05..61cac50880 100644 --- a/gnuradio-core/src/lib/general/gr_message_strobe.h +++ b/gnuradio-core/src/lib/general/gr_message_strobe.h @@ -35,7 +35,6 @@ GR_CORE_API gr_message_strobe_sptr gr_make_message_strobe (pmt::pmt_t msg, float /*! * \brief Send message at defined interval - * \ingroup msg_blk */ class GR_CORE_API gr_message_strobe : public gr_block { diff --git a/gnuradio-core/src/lib/general/gr_multiply_cc.h b/gnuradio-core/src/lib/general/gr_multiply_cc.h index d25935b4ca..cff0c0713f 100644 --- a/gnuradio-core/src/lib/general/gr_multiply_cc.h +++ b/gnuradio-core/src/lib/general/gr_multiply_cc.h @@ -34,7 +34,6 @@ gr_make_multiply_cc (size_t vlen=1); /*! * \brief Multiply streams of complex values - * \ingroup math_blk */ class GR_CORE_API gr_multiply_cc : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_multiply_conjugate_cc.h b/gnuradio-core/src/lib/general/gr_multiply_conjugate_cc.h index 826e287714..61c2677400 100644 --- a/gnuradio-core/src/lib/general/gr_multiply_conjugate_cc.h +++ b/gnuradio-core/src/lib/general/gr_multiply_conjugate_cc.h @@ -35,7 +35,6 @@ gr_make_multiply_conjugate_cc (size_t vlen=1); /*! * \brief Multiplies a stream by the conjugate of the second stream - * \ingroup math_blk */ class GR_CORE_API gr_multiply_conjugate_cc : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_multiply_const_cc.h b/gnuradio-core/src/lib/general/gr_multiply_const_cc.h index 97962abc70..2f960a920a 100644 --- a/gnuradio-core/src/lib/general/gr_multiply_const_cc.h +++ b/gnuradio-core/src/lib/general/gr_multiply_const_cc.h @@ -34,7 +34,6 @@ gr_make_multiply_const_cc (gr_complex k, size_t vlen=1); /*! * \brief Multiply stream of complex values with a constant \p k - * \ingroup math_blk */ class GR_CORE_API gr_multiply_const_cc : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_multiply_const_ff.h b/gnuradio-core/src/lib/general/gr_multiply_const_ff.h index fac73f88a2..265a946df0 100644 --- a/gnuradio-core/src/lib/general/gr_multiply_const_ff.h +++ b/gnuradio-core/src/lib/general/gr_multiply_const_ff.h @@ -34,7 +34,6 @@ gr_make_multiply_const_ff (float k, size_t vlen=1); /*! * \brief Multiply stream of float values with a constant \p k - * \ingroup math_blk */ class GR_CORE_API gr_multiply_const_ff : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_multiply_ff.h b/gnuradio-core/src/lib/general/gr_multiply_ff.h index ed628385ce..e7adde7218 100644 --- a/gnuradio-core/src/lib/general/gr_multiply_ff.h +++ b/gnuradio-core/src/lib/general/gr_multiply_ff.h @@ -34,7 +34,6 @@ gr_make_multiply_ff (size_t vlen=1); /*! * \brief Multiply streams of complex values - * \ingroup math_blk */ class GR_CORE_API gr_multiply_ff : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_nlog10_ff.h b/gnuradio-core/src/lib/general/gr_nlog10_ff.h index cfeba3feeb..34084f2a09 100644 --- a/gnuradio-core/src/lib/general/gr_nlog10_ff.h +++ b/gnuradio-core/src/lib/general/gr_nlog10_ff.h @@ -32,7 +32,6 @@ GR_CORE_API gr_nlog10_ff_sptr gr_make_nlog10_ff (float n=1.0, unsigned vlen=1, f /*! * \brief output = n*log10(input) + k - * \ingroup math_blk */ class GR_CORE_API gr_nlog10_ff : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_nop.h b/gnuradio-core/src/lib/general/gr_nop.h index e0d59280f9..9fd1d13813 100644 --- a/gnuradio-core/src/lib/general/gr_nop.h +++ b/gnuradio-core/src/lib/general/gr_nop.h @@ -35,7 +35,6 @@ gr_make_nop (size_t sizeof_stream_item); /*! * \brief Does nothing. Used for testing only. - * \ingroup misc_blk */ class GR_CORE_API gr_nop : public gr_block { diff --git a/gnuradio-core/src/lib/general/gr_null_sink.h b/gnuradio-core/src/lib/general/gr_null_sink.h index 7374293295..9f1e0f99fb 100644 --- a/gnuradio-core/src/lib/general/gr_null_sink.h +++ b/gnuradio-core/src/lib/general/gr_null_sink.h @@ -35,7 +35,6 @@ gr_make_null_sink (size_t sizeof_stream_item); /*! * \brief Bit bucket - * \ingroup sink_blk */ class GR_CORE_API gr_null_sink : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_null_source.h b/gnuradio-core/src/lib/general/gr_null_source.h index 1c64e8bd98..0059d0310b 100644 --- a/gnuradio-core/src/lib/general/gr_null_source.h +++ b/gnuradio-core/src/lib/general/gr_null_source.h @@ -34,7 +34,6 @@ gr_make_null_source (size_t sizeof_stream_item); /*! * \brief A source of zeros. - * \ingroup source_blk */ class GR_CORE_API gr_null_source : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.h b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.h index a743e8c5a5..095316e07d 100644 --- a/gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.h +++ b/gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.h @@ -39,8 +39,6 @@ gr_make_ofdm_frame_sink2 (gr_constellation_sptr constell, /*! * \brief Takes an OFDM symbol in, demaps it into bits of 0's and 1's, packs * them into packets, and sends to to a message queue sink. - * \ingroup sink_blk - * \ingroup ofdm_blk * * NOTE: The mod input parameter simply chooses a pre-defined demapper/slicer. Eventually, * we want to be able to pass in a reference to an object to do the demapping and slicing diff --git a/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h b/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h index 8e1508c78b..4b9c1c20aa 100644 --- a/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h +++ b/gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h @@ -34,7 +34,6 @@ class gr_pack_k_bits_bb; /*! * \brief Converts a stream of bytes with 1 bit in the LSB to a byte with k relevent bits. - * \ingroup converter_blk */ class GR_CORE_API gr_pack_k_bits_bb : public gr_sync_decimator { diff --git a/gnuradio-core/src/lib/general/gr_packet_sink.h b/gnuradio-core/src/lib/general/gr_packet_sink.h index b4cb0b0f6e..cbb9b7715b 100644 --- a/gnuradio-core/src/lib/general/gr_packet_sink.h +++ b/gnuradio-core/src/lib/general/gr_packet_sink.h @@ -37,7 +37,6 @@ gr_make_packet_sink (const std::vector<unsigned char>& sync_vector, ); /*! * \brief process received bits looking for packet sync, header, and process bits into packet - * \ingroup sink_blk */ class GR_CORE_API gr_packet_sink : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h b/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h index 665a6b882c..2a37de2c7b 100644 --- a/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h +++ b/gnuradio-core/src/lib/general/gr_peak_detector2_fb.h @@ -35,7 +35,6 @@ GR_CORE_API gr_peak_detector2_fb_sptr gr_make_peak_detector2_fb (float threshold /*! * \brief Detect the peak of a signal - * \ingroup level_blk * * If a peak is detected, this block outputs a 1, * or it outputs 0's. A separate debug output may be connected, to diff --git a/gnuradio-core/src/lib/general/gr_phase_modulator_fc.h b/gnuradio-core/src/lib/general/gr_phase_modulator_fc.h index 07f3b82d4c..999d0f0123 100644 --- a/gnuradio-core/src/lib/general/gr_phase_modulator_fc.h +++ b/gnuradio-core/src/lib/general/gr_phase_modulator_fc.h @@ -33,7 +33,6 @@ GR_CORE_API gr_phase_modulator_fc_sptr gr_make_phase_modulator_fc (double sensit /*! * \brief Phase modulator block - * \ingroup modulation_blk * output=complex(cos(in*sensitivity),sin(in*sensitivity)) */ class GR_CORE_API gr_phase_modulator_fc : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h b/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h index b3bc5ddd0c..abcd0052c0 100644 --- a/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h +++ b/gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h @@ -36,7 +36,6 @@ GR_CORE_API gr_pll_carriertracking_cc_sptr gr_make_pll_carriertracking_cc (float /*! * \brief Implements a PLL which locks to the input frequency and outputs the * input signal mixed with that carrier. - * \ingroup sync_blk * * input: stream of complex; output: stream of complex * diff --git a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h b/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h index 3dfc8d7093..765e347fe4 100644 --- a/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h +++ b/gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h @@ -36,7 +36,6 @@ GR_CORE_API gr_pll_freqdet_cf_sptr gr_make_pll_freqdet_cf (float loop_bw, /*! * \brief Implements a PLL which locks to the input frequency and outputs * an estimate of that frequency. Useful for FM Demod. - * \ingroup sync_blk * * input: stream of complex; output: stream of floats * diff --git a/gnuradio-core/src/lib/general/gr_pll_refout_cc.h b/gnuradio-core/src/lib/general/gr_pll_refout_cc.h index ef5cd31e27..01555b569a 100644 --- a/gnuradio-core/src/lib/general/gr_pll_refout_cc.h +++ b/gnuradio-core/src/lib/general/gr_pll_refout_cc.h @@ -34,7 +34,6 @@ GR_CORE_API gr_pll_refout_cc_sptr gr_make_pll_refout_cc (float loop_bw, float max_freq, float min_freq); /*! * \brief Implements a PLL which locks to the input frequency and outputs a carrier - * \ingroup sync_blk * * input: stream of complex; output: stream of complex * diff --git a/gnuradio-core/src/lib/general/gr_pn_correlator_cc.h b/gnuradio-core/src/lib/general/gr_pn_correlator_cc.h index 69bd2c502f..db67ae5266 100644 --- a/gnuradio-core/src/lib/general/gr_pn_correlator_cc.h +++ b/gnuradio-core/src/lib/general/gr_pn_correlator_cc.h @@ -35,7 +35,6 @@ gr_make_pn_correlator_cc(int degree, int mask=0, int seed=1); /*! * \brief PN code sequential search correlator * - * \ingroup sync_blk * Receives complex baseband signal, outputs complex correlation against * reference PN code, one sample per PN code period */ diff --git a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.h b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.h index 2811677cfc..c1264c0ab5 100644 --- a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.h +++ b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.h @@ -34,7 +34,6 @@ gr_make_probe_avg_mag_sqrd_c (double threshold_db, double alpha = 0.0001); /*! * \brief compute avg magnitude squared. - * \ingroup sink_blk * * input: gr_complex * diff --git a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_cf.h b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_cf.h index bb5d1ebf91..495f758c17 100644 --- a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_cf.h +++ b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_cf.h @@ -34,7 +34,6 @@ gr_make_probe_avg_mag_sqrd_cf (double threshold_db, double alpha = 0.0001); /*! * \brief compute avg magnitude squared. - * \ingroup sink_blk * * input: gr_complex * output: gr_float diff --git a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.h b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.h index b2efcc64eb..7eac0302db 100644 --- a/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.h +++ b/gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.h @@ -34,7 +34,6 @@ gr_make_probe_avg_mag_sqrd_f (double threshold_db, double alpha = 0.0001); /*! * \brief compute avg magnitude squared. - * \ingroup sink_blk * * input: float * diff --git a/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.h b/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.h index b2b4624f58..b47acb9c37 100644 --- a/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.h +++ b/gnuradio-core/src/lib/general/gr_pwr_squelch_cc.h @@ -36,7 +36,6 @@ gr_make_pwr_squelch_cc(double db, double alpha = 0.0001, int ramp=0, bool gate=f /*! * \brief gate or zero output when input power below threshold - * \ingroup level_blk */ class GR_CORE_API gr_pwr_squelch_cc : public gr_squelch_base_cc { diff --git a/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.h b/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.h index d5148c4096..ab63f1b866 100644 --- a/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.h +++ b/gnuradio-core/src/lib/general/gr_pwr_squelch_ff.h @@ -36,7 +36,6 @@ gr_make_pwr_squelch_ff(double db, double alpha = 0.0001, int ramp=0, bool gate=f /*! * \brief gate or zero output when input power below threshold - * \ingroup level_blk */ class GR_CORE_API gr_pwr_squelch_ff : public gr_squelch_base_ff { diff --git a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h index 9f5976c971..eb3f1cb980 100644 --- a/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h +++ b/gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h @@ -32,7 +32,6 @@ GR_CORE_API gr_quadrature_demod_cf_sptr gr_make_quadrature_demod_cf (float gain) /*! * \brief quadrature demodulator: complex in, float out - * \ingroup demodulation_blk * * This can be used to demod FM, FSK, GMSK, etc. * The input is complex baseband. diff --git a/gnuradio-core/src/lib/general/gr_rail_ff.h b/gnuradio-core/src/lib/general/gr_rail_ff.h index 29db5b1fa1..b34194f936 100644 --- a/gnuradio-core/src/lib/general/gr_rail_ff.h +++ b/gnuradio-core/src/lib/general/gr_rail_ff.h @@ -28,7 +28,6 @@ /*! * \brief clips input values to min, max - * \ingroup misc */ class gr_rail_ff; diff --git a/gnuradio-core/src/lib/general/gr_random_pdu.h b/gnuradio-core/src/lib/general/gr_random_pdu.h index e6457d21b6..8b8beb676f 100644 --- a/gnuradio-core/src/lib/general/gr_random_pdu.h +++ b/gnuradio-core/src/lib/general/gr_random_pdu.h @@ -38,7 +38,6 @@ GR_CORE_API gr_random_pdu_sptr gr_make_random_pdu (int mintime, int maxtime); /*! * \brief Send message at defined interval - * \ingroup msg_blk */ class GR_CORE_API gr_random_pdu : public gr_block { diff --git a/gnuradio-core/src/lib/general/gr_regenerate_bb.h b/gnuradio-core/src/lib/general/gr_regenerate_bb.h index e820db69e8..20b6edc2ee 100644 --- a/gnuradio-core/src/lib/general/gr_regenerate_bb.h +++ b/gnuradio-core/src/lib/general/gr_regenerate_bb.h @@ -33,7 +33,6 @@ GR_CORE_API gr_regenerate_bb_sptr gr_make_regenerate_bb (int period, unsigned in /*! * \brief Detect the peak of a signal and repeat every period samples - * \ingroup level_blk * * If a peak is detected, this block outputs a 1 repeated every period samples * until reset by detection of another 1 on the input or stopped after max_regen diff --git a/gnuradio-core/src/lib/general/gr_repeat.h b/gnuradio-core/src/lib/general/gr_repeat.h index 548ca79f4d..f434eaf6d9 100644 --- a/gnuradio-core/src/lib/general/gr_repeat.h +++ b/gnuradio-core/src/lib/general/gr_repeat.h @@ -33,7 +33,6 @@ GR_CORE_API gr_repeat_sptr gr_make_repeat(size_t itemsize, int interp); /*! * \brief Repeat a sample 'interp' times in output stream - * \ingroup misc_blk */ class GR_CORE_API gr_repeat : public gr_sync_interpolator diff --git a/gnuradio-core/src/lib/general/gr_rms_cf.h b/gnuradio-core/src/lib/general/gr_rms_cf.h index 9e701aa6a0..809d937998 100644 --- a/gnuradio-core/src/lib/general/gr_rms_cf.h +++ b/gnuradio-core/src/lib/general/gr_rms_cf.h @@ -34,7 +34,6 @@ gr_make_rms_cf (double alpha = 0.0001); /*! * \brief RMS average power - * \ingroup math_blk */ class GR_CORE_API gr_rms_cf : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_rms_ff.h b/gnuradio-core/src/lib/general/gr_rms_ff.h index 30cf7f9d9f..34c1a2f4a8 100644 --- a/gnuradio-core/src/lib/general/gr_rms_ff.h +++ b/gnuradio-core/src/lib/general/gr_rms_ff.h @@ -34,7 +34,6 @@ gr_make_rms_ff (double alpha = 0.0001); /*! * \brief RMS average power - * \ingroup math_blk */ class GR_CORE_API gr_rms_ff : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_scrambler_bb.h b/gnuradio-core/src/lib/general/gr_scrambler_bb.h index edb429e0a0..f302077d01 100644 --- a/gnuradio-core/src/lib/general/gr_scrambler_bb.h +++ b/gnuradio-core/src/lib/general/gr_scrambler_bb.h @@ -39,8 +39,6 @@ GR_CORE_API gr_scrambler_bb_sptr gr_make_scrambler_bb(int mask, int seed, int le * \param mask Polynomial mask for LFSR * \param seed Initial shift register contents * \param len Shift register length - * - * \ingroup coding_blk */ class GR_CORE_API gr_scrambler_bb : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_short_to_char.h b/gnuradio-core/src/lib/general/gr_short_to_char.h index bf96211c7c..03b2dbfcfa 100644 --- a/gnuradio-core/src/lib/general/gr_short_to_char.h +++ b/gnuradio-core/src/lib/general/gr_short_to_char.h @@ -34,7 +34,6 @@ gr_make_short_to_char (size_t vlen=1); /*! * \brief Convert stream of short to a stream of float - * \ingroup converter_blk * * \param vlen vector length of data streams. */ diff --git a/gnuradio-core/src/lib/general/gr_short_to_float.h b/gnuradio-core/src/lib/general/gr_short_to_float.h index 362549e70a..78212fda49 100644 --- a/gnuradio-core/src/lib/general/gr_short_to_float.h +++ b/gnuradio-core/src/lib/general/gr_short_to_float.h @@ -34,7 +34,6 @@ gr_make_short_to_float (size_t vlen=1, float scale=1); /*! * \brief Convert stream of short to a stream of float - * \ingroup converter_blk * * \param vlen vector length of data streams. * \param scale a scalar divider to change the output signal scale. diff --git a/gnuradio-core/src/lib/general/gr_simple_correlator.h b/gnuradio-core/src/lib/general/gr_simple_correlator.h index 37d00c125e..9909d58755 100644 --- a/gnuradio-core/src/lib/general/gr_simple_correlator.h +++ b/gnuradio-core/src/lib/general/gr_simple_correlator.h @@ -36,7 +36,6 @@ GR_CORE_API gr_simple_correlator_sptr gr_make_simple_correlator (int payload_byt /*! * \brief inverse of gr_simple_framer (more or less) - * \ingroup sync_blk */ class GR_CORE_API gr_simple_correlator : public gr_block { diff --git a/gnuradio-core/src/lib/general/gr_simple_framer.h b/gnuradio-core/src/lib/general/gr_simple_framer.h index 76a4b7baba..de7a96321d 100644 --- a/gnuradio-core/src/lib/general/gr_simple_framer.h +++ b/gnuradio-core/src/lib/general/gr_simple_framer.h @@ -33,7 +33,6 @@ GR_CORE_API gr_simple_framer_sptr gr_make_simple_framer (int payload_bytesize); /*! * \brief add sync field, seq number and command field to payload - * \ingroup sync_blk */ class GR_CORE_API gr_simple_framer : public gr_block { diff --git a/gnuradio-core/src/lib/general/gr_simple_squelch_cc.h b/gnuradio-core/src/lib/general/gr_simple_squelch_cc.h index 4bf62c7ec6..a26f087a12 100644 --- a/gnuradio-core/src/lib/general/gr_simple_squelch_cc.h +++ b/gnuradio-core/src/lib/general/gr_simple_squelch_cc.h @@ -34,7 +34,6 @@ gr_make_simple_squelch_cc (double threshold_db, double alpha = 0.0001); /*! * \brief simple squelch block based on average signal power and threshold in dB. - * \ingroup level_blk */ class GR_CORE_API gr_simple_squelch_cc : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_skiphead.h b/gnuradio-core/src/lib/general/gr_skiphead.h index 899b40f27a..ff42a3eeda 100644 --- a/gnuradio-core/src/lib/general/gr_skiphead.h +++ b/gnuradio-core/src/lib/general/gr_skiphead.h @@ -36,7 +36,6 @@ gr_make_skiphead (size_t itemsize, uint64_t nitems_to_skip); /*! * \brief skips the first N items, from then on copies items to the output - * \ingroup slicedice_blk * * Useful for building test cases and sources which have metadata or junk at the start */ diff --git a/gnuradio-core/src/lib/general/gr_stream_mux.h b/gnuradio-core/src/lib/general/gr_stream_mux.h index 742bf082d1..fa1ee3e7ae 100644 --- a/gnuradio-core/src/lib/general/gr_stream_mux.h +++ b/gnuradio-core/src/lib/general/gr_stream_mux.h @@ -31,7 +31,6 @@ /*! * \brief Creates a stream muxing block to multiplex many streams into * one with a specified format. - * \ingroup converter_blk * * \param itemsize the item size of the stream * \param length a vector (list/tuple) specifying the number of diff --git a/gnuradio-core/src/lib/general/gr_stream_to_streams.h b/gnuradio-core/src/lib/general/gr_stream_to_streams.h index 117f57bf5e..f1d3b26975 100644 --- a/gnuradio-core/src/lib/general/gr_stream_to_streams.h +++ b/gnuradio-core/src/lib/general/gr_stream_to_streams.h @@ -34,7 +34,6 @@ gr_make_stream_to_streams (size_t item_size, size_t nstreams); /*! * \brief convert a stream of items into a N streams of items - * \ingroup slicedice_blk * * Converts a stream of N items into N streams of 1 item. * Repeat ad infinitum. diff --git a/gnuradio-core/src/lib/general/gr_stream_to_vector.h b/gnuradio-core/src/lib/general/gr_stream_to_vector.h index 362349965f..92d5e5a03e 100644 --- a/gnuradio-core/src/lib/general/gr_stream_to_vector.h +++ b/gnuradio-core/src/lib/general/gr_stream_to_vector.h @@ -35,7 +35,6 @@ gr_make_stream_to_vector (size_t item_size, size_t nitems_per_block); /*! * \brief convert a stream of items into a stream of blocks containing nitems_per_block - * \ingroup slicedice_blk */ class GR_CORE_API gr_stream_to_vector : public gr_sync_decimator { diff --git a/gnuradio-core/src/lib/general/gr_streams_to_stream.h b/gnuradio-core/src/lib/general/gr_streams_to_stream.h index f636837675..1af60ff53e 100644 --- a/gnuradio-core/src/lib/general/gr_streams_to_stream.h +++ b/gnuradio-core/src/lib/general/gr_streams_to_stream.h @@ -34,7 +34,6 @@ gr_make_streams_to_stream (size_t item_size, size_t nstreams); /*! * \brief Convert N streams of 1 item into a 1 stream of N items - * \ingroup slicedice_blk * * Convert N streams of 1 item into 1 stream of N items. * Repeat ad infinitum. diff --git a/gnuradio-core/src/lib/general/gr_streams_to_vector.h b/gnuradio-core/src/lib/general/gr_streams_to_vector.h index 1df2890999..3f94bfd7c8 100644 --- a/gnuradio-core/src/lib/general/gr_streams_to_vector.h +++ b/gnuradio-core/src/lib/general/gr_streams_to_vector.h @@ -35,7 +35,6 @@ gr_make_streams_to_vector (size_t item_size, size_t nstreams); /*! * \brief convert N streams of items to 1 stream of vector length N - * \ingroup slicedice_blk */ class GR_CORE_API gr_streams_to_vector : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_stretch_ff.h b/gnuradio-core/src/lib/general/gr_stretch_ff.h index f592c94a78..3578da8073 100644 --- a/gnuradio-core/src/lib/general/gr_stretch_ff.h +++ b/gnuradio-core/src/lib/general/gr_stretch_ff.h @@ -30,7 +30,6 @@ * \brief adjust y-range of an input vector by mapping to range * (max-of-input, stipulated-min). Primarily for spectral signature * matching by normalizing spectrum dynamic ranges. - * \ingroup misc_blk */ diff --git a/gnuradio-core/src/lib/general/gr_tag_debug.h b/gnuradio-core/src/lib/general/gr_tag_debug.h index 57578884a8..f919acfc4f 100644 --- a/gnuradio-core/src/lib/general/gr_tag_debug.h +++ b/gnuradio-core/src/lib/general/gr_tag_debug.h @@ -36,7 +36,6 @@ gr_make_tag_debug(size_t sizeof_stream_item, const std::string &name); /*! * \brief Bit bucket that prints out any tag received. - * \ingroup sink_blk * * This block collects all tags sent to it on all input ports and * displays them to stdout in a formatted way. The \p name parameter diff --git a/gnuradio-core/src/lib/general/gr_threshold_ff.h b/gnuradio-core/src/lib/general/gr_threshold_ff.h index 678f8b1d2d..0b76a8c99a 100644 --- a/gnuradio-core/src/lib/general/gr_threshold_ff.h +++ b/gnuradio-core/src/lib/general/gr_threshold_ff.h @@ -33,7 +33,6 @@ GR_CORE_API gr_threshold_ff_sptr gr_make_threshold_ff (float lo, float hi, float /*! * \brief Please fix my documentation - * \ingroup misc_blk */ class GR_CORE_API gr_threshold_ff : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_throttle.h b/gnuradio-core/src/lib/general/gr_throttle.h index 876d6d8269..0a7566b355 100644 --- a/gnuradio-core/src/lib/general/gr_throttle.h +++ b/gnuradio-core/src/lib/general/gr_throttle.h @@ -27,7 +27,6 @@ /*! * \brief throttle flow of samples such that the average rate does not exceed samples_per_sec. - * \ingroup misc_blk * * input: one stream of itemsize; output: one stream of itemsize * diff --git a/gnuradio-core/src/lib/general/gr_uchar_to_float.h b/gnuradio-core/src/lib/general/gr_uchar_to_float.h index c02601cca6..f7ea6134f7 100644 --- a/gnuradio-core/src/lib/general/gr_uchar_to_float.h +++ b/gnuradio-core/src/lib/general/gr_uchar_to_float.h @@ -34,7 +34,6 @@ gr_make_uchar_to_float (); /*! * \brief Convert stream of unsigned chars to a stream of float - * \ingroup converter_blk */ class GR_CORE_API gr_uchar_to_float : public gr_sync_block diff --git a/gnuradio-core/src/lib/general/gr_unpack_k_bits_bb.h b/gnuradio-core/src/lib/general/gr_unpack_k_bits_bb.h index c3ea28d3fa..becd5d4cdb 100644 --- a/gnuradio-core/src/lib/general/gr_unpack_k_bits_bb.h +++ b/gnuradio-core/src/lib/general/gr_unpack_k_bits_bb.h @@ -34,7 +34,6 @@ class gr_unpack_k_bits_bb; /*! * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB. - * \ingroup converter_blk */ class GR_CORE_API gr_unpack_k_bits_bb : public gr_sync_interpolator { diff --git a/gnuradio-core/src/lib/general/gr_vco_f.h b/gnuradio-core/src/lib/general/gr_vco_f.h index 83f6a9773e..d14318a9e5 100644 --- a/gnuradio-core/src/lib/general/gr_vco_f.h +++ b/gnuradio-core/src/lib/general/gr_vco_f.h @@ -28,7 +28,6 @@ /*! * \brief VCO - Voltage controlled oscillator - * \ingroup misc * * \param sampling_rate sampling rate (Hz) * \param sensitivity units are radians/sec/volt diff --git a/gnuradio-core/src/lib/general/gr_vector_map.h b/gnuradio-core/src/lib/general/gr_vector_map.h index f5492b1e3a..02f8dc72c8 100644 --- a/gnuradio-core/src/lib/general/gr_vector_map.h +++ b/gnuradio-core/src/lib/general/gr_vector_map.h @@ -55,8 +55,6 @@ gr_make_vector_map (size_t item_size, std::vector<size_t> in_vlens, * * \param mapping (vector of vectors of vectors of integers) how to * map elements from input to output vectors - * - * \ingroup slicedice_blk */ class GR_CORE_API gr_vector_map : public gr_sync_block { diff --git a/gnuradio-core/src/lib/general/gr_vector_to_stream.h b/gnuradio-core/src/lib/general/gr_vector_to_stream.h index 9fc8030f5b..edcb063b5c 100644 --- a/gnuradio-core/src/lib/general/gr_vector_to_stream.h +++ b/gnuradio-core/src/lib/general/gr_vector_to_stream.h @@ -35,7 +35,6 @@ gr_make_vector_to_stream (size_t item_size, size_t nitems_per_block); /*! * \brief convert a stream of blocks of nitems_per_block items into a stream of items - * \ingroup slicedice_blk */ class GR_CORE_API gr_vector_to_stream : public gr_sync_interpolator { diff --git a/gnuradio-core/src/lib/general/gr_vector_to_streams.h b/gnuradio-core/src/lib/general/gr_vector_to_streams.h index 8db4230536..a3122dcef1 100644 --- a/gnuradio-core/src/lib/general/gr_vector_to_streams.h +++ b/gnuradio-core/src/lib/general/gr_vector_to_streams.h @@ -35,7 +35,6 @@ gr_make_vector_to_streams (size_t item_size, size_t nstreams); /*! * \brief Convert 1 stream of vectors of length N to N streams of items - * \ingroup slicedice_blk */ class GR_CORE_API gr_vector_to_streams : public gr_sync_block { diff --git a/gnuradio-core/src/lib/gengen/gr_moving_average_XX.h.t b/gnuradio-core/src/lib/gengen/gr_moving_average_XX.h.t index 37678abe13..33563e14e2 100644 --- a/gnuradio-core/src/lib/gengen/gr_moving_average_XX.h.t +++ b/gnuradio-core/src/lib/gengen/gr_moving_average_XX.h.t @@ -36,7 +36,6 @@ GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (int length, @O_TYPE@ scale, int max /*! * \brief output is the moving sum of the last N samples, scaled by the scale factor - * \ingroup filter_blk * * max_iter limits how long we go without flushing the accumulator * This is necessary to avoid numerical instability for float and complex. diff --git a/gnuradio-core/src/lib/hier/gr_channel_model.h b/gnuradio-core/src/lib/hier/gr_channel_model.h index 5796a6db24..c531b454e3 100644 --- a/gnuradio-core/src/lib/hier/gr_channel_model.h +++ b/gnuradio-core/src/lib/hier/gr_channel_model.h @@ -40,7 +40,6 @@ GR_CORE_API gr_channel_model_sptr gr_make_channel_model(double noise_voltage=0.0 /*! * \brief channel simulator - * \ingroup misc_blk */ class GR_CORE_API gr_channel_model : public gr_hier_block2 { diff --git a/gr-analog/doc/analog.dox b/gr-analog/doc/analog.dox index d3af364f74..437eb05c74 100644 --- a/gr-analog/doc/analog.dox +++ b/gr-analog/doc/analog.dox @@ -11,7 +11,7 @@ imported as: \endcode See the Doxygen documentation for details about the blocks available -in this package. The relevant blocks are listed in the \ref analog group. +in this package. A quick listing of the details can be found in Python after importing by using: diff --git a/gr-analog/grc/analog_block_tree.xml b/gr-analog/grc/analog_block_tree.xml index b5b2ecd568..3991aee915 100644 --- a/gr-analog/grc/analog_block_tree.xml +++ b/gr-analog/grc/analog_block_tree.xml @@ -29,10 +29,9 @@ <cat> <name></name> <!-- Blank for Root Name --> <cat> - <name>Level Controls</name> + <name>Level Controllers</name> <block>analog_agc_xx</block> <block>analog_agc2_xx</block> - <block>analog_dpll_bb</block> <block>analog_feedforward_agc_cc</block> <block>analog_ctcss_squelch_ff</block> <block>analog_pwr_squelch_xx</block> @@ -47,7 +46,7 @@ <block>analog_quadrature_demod_cf</block> </cat> <cat> - <name>Sources</name> + <name>Waveform Generators</name> <block>analog_sig_source_x</block> <block>analog_noise_source_x</block> </cat> @@ -58,7 +57,11 @@ <block>analog_pll_refout_cc</block> </cat> <cat> - <name>Probes</name> + <name>Peak Detectors</name> + <block>analog_dpll_bb</block> + </cat> + <cat> + <name>Measurement Tools</name> <block>analog_probe_avg_mag_sqrd_x</block> </cat> </cat> diff --git a/gr-analog/include/analog/agc.h b/gr-analog/include/analog/agc.h index 92d777fa19..c939431fe4 100644 --- a/gr-analog/include/analog/agc.h +++ b/gr-analog/include/analog/agc.h @@ -34,6 +34,7 @@ namespace gr { /*! * \brief high performance Automatic Gain Control class for complex signals. * + * \details * For Power the absolute value of the complex number is used. */ class ANALOG_API agc_cc diff --git a/gr-analog/include/analog/agc2.h b/gr-analog/include/analog/agc2.h index 75a203e9fc..be28301070 100644 --- a/gr-analog/include/analog/agc2.h +++ b/gr-analog/include/analog/agc2.h @@ -34,6 +34,7 @@ namespace gr { /*! * \brief high performance Automatic Gain Control class * + * \details * For Power the absolute value of the complex number is used. */ class ANALOG_API agc2_cc diff --git a/gr-analog/include/analog/agc2_cc.h b/gr-analog/include/analog/agc2_cc.h index c922ccd4da..87e6200346 100644 --- a/gr-analog/include/analog/agc2_cc.h +++ b/gr-analog/include/analog/agc2_cc.h @@ -32,8 +32,9 @@ namespace gr { /*! * \brief high performance Automatic Gain Control class - * \ingroup level_blk + * \ingroup level_controllers_blk * + * \details * For Power the absolute value of the complex number is used. */ class ANALOG_API agc2_cc : virtual public gr_sync_block diff --git a/gr-analog/include/analog/agc2_ff.h b/gr-analog/include/analog/agc2_ff.h index 27dd6d92e5..b960493dca 100644 --- a/gr-analog/include/analog/agc2_ff.h +++ b/gr-analog/include/analog/agc2_ff.h @@ -32,8 +32,9 @@ namespace gr { /*! * \brief high performance Automatic Gain Control class + * \ingroup level_controllers_blk * - * \ingroup level_blk + * \details * Power is approximated by absolute value */ class ANALOG_API agc2_ff : virtual public gr_sync_block diff --git a/gr-analog/include/analog/agc_cc.h b/gr-analog/include/analog/agc_cc.h index b2b1a9b430..d516af4565 100644 --- a/gr-analog/include/analog/agc_cc.h +++ b/gr-analog/include/analog/agc_cc.h @@ -32,8 +32,9 @@ namespace gr { /*! * \brief high performance Automatic Gain Control class - * \ingroup level_blk + * \ingroup level_controllers_blk * + * \details * For Power the absolute value of the complex number is used. */ class ANALOG_API agc_cc : virtual public gr_sync_block diff --git a/gr-analog/include/analog/agc_ff.h b/gr-analog/include/analog/agc_ff.h index 30d1ae1fd9..3056b96476 100644 --- a/gr-analog/include/analog/agc_ff.h +++ b/gr-analog/include/analog/agc_ff.h @@ -32,8 +32,9 @@ namespace gr { /*! * \brief high performance Automatic Gain Control class - * \ingroup level_blk + * \ingroup level_controllers_blk * + * \details * Power is approximated by absolute value */ class ANALOG_API agc_ff : virtual public gr_sync_block diff --git a/gr-analog/include/analog/cpfsk_bc.h b/gr-analog/include/analog/cpfsk_bc.h index 904730e2b5..8150e0d08f 100644 --- a/gr-analog/include/analog/cpfsk_bc.h +++ b/gr-analog/include/analog/cpfsk_bc.h @@ -30,7 +30,7 @@ namespace gr { /*! * \brief Perform continuous phase 2-level frequency shift keying modulation * on an input stream of unpacked bits. - * \ingroup modulation_blk + * \ingroup modulators_blk */ class ANALOG_API cpfsk_bc : virtual public gr_sync_interpolator { diff --git a/gr-analog/include/analog/cpm.h b/gr-analog/include/analog/cpm.h index d22e02321c..205fcfe809 100644 --- a/gr-analog/include/analog/cpm.h +++ b/gr-analog/include/analog/cpm.h @@ -42,6 +42,7 @@ namespace gr { /*! \brief Return the taps for an interpolating FIR filter (gr_interp_fir_filter_fff). * + * \details * These taps represent the phase response \f$g(k)\f$ for use in a CPM modulator, * see also gr_cpmmod_bc. * diff --git a/gr-analog/include/analog/ctcss_squelch_ff.h b/gr-analog/include/analog/ctcss_squelch_ff.h index f880299173..471021d008 100644 --- a/gr-analog/include/analog/ctcss_squelch_ff.h +++ b/gr-analog/include/analog/ctcss_squelch_ff.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief gate or zero output if ctcss tone not present - * \ingroup level_blk + * \ingroup level_controllers_blk */ class ANALOG_API ctcss_squelch_ff : public squelch_base_ff, virtual public gr_block diff --git a/gr-analog/include/analog/dpll_bb.h b/gr-analog/include/analog/dpll_bb.h index 78efb8fde9..f25e860b2c 100644 --- a/gr-analog/include/analog/dpll_bb.h +++ b/gr-analog/include/analog/dpll_bb.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief Detect the peak of a signal - * \ingroup level_blk + * \ingroup peak_detectors_blk * + * \details * If a peak is detected, this block outputs a 1, * or it outputs 0's. */ diff --git a/gr-analog/include/analog/feedforward_agc_cc.h b/gr-analog/include/analog/feedforward_agc_cc.h index 9e259a4eba..13b4fe0486 100644 --- a/gr-analog/include/analog/feedforward_agc_cc.h +++ b/gr-analog/include/analog/feedforward_agc_cc.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Non-causal AGC which computes required gain based on max absolute value over nsamples - * \ingroup level_blk + * \ingroup level_controllers_blk */ class ANALOG_API feedforward_agc_cc : virtual public gr_sync_block { diff --git a/gr-analog/include/analog/fmdet_cf.h b/gr-analog/include/analog/fmdet_cf.h index 6878775e6c..bd26e39226 100644 --- a/gr-analog/include/analog/fmdet_cf.h +++ b/gr-analog/include/analog/fmdet_cf.h @@ -32,6 +32,7 @@ namespace gr { /*! * \brief Implements an IQ slope detector * + * \details * input: stream of complex; output: stream of floats * * This implements a limiting slope detector. The limiter is in diff --git a/gr-analog/include/analog/frequency_modulator_fc.h b/gr-analog/include/analog/frequency_modulator_fc.h index 8706d513a6..86f6d20d98 100644 --- a/gr-analog/include/analog/frequency_modulator_fc.h +++ b/gr-analog/include/analog/frequency_modulator_fc.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief Frequency modulator block - * \ingroup modulation_blk + * \ingroup modulators_blk * + * \details * float input; complex baseband output */ class ANALOG_API frequency_modulator_fc : virtual public gr_sync_block diff --git a/gr-analog/include/analog/lfsr.h b/gr-analog/include/analog/lfsr.h index 5cf2ec70df..bb5c4b0ea4 100644 --- a/gr-analog/include/analog/lfsr.h +++ b/gr-analog/include/analog/lfsr.h @@ -35,6 +35,7 @@ namespace gr { * polynomial mask * \ingroup misc * + * \details * Generates a maximal length pseudo-random sequence of length * 2^degree-1 * diff --git a/gr-analog/include/analog/noise_source_X.h.t b/gr-analog/include/analog/noise_source_X.h.t index 9d1be6fedf..9fa470c47d 100644 --- a/gr-analog/include/analog/noise_source_X.h.t +++ b/gr-analog/include/analog/noise_source_X.h.t @@ -35,7 +35,7 @@ namespace gr { /*! * \brief Random number source - * \ingroup source_blk + * \ingroup waveform_generators_blk * * \details * Generate random values from different distributions. @@ -47,11 +47,11 @@ namespace gr { // gr::analog::@BASE_NAME@::sptr typedef boost::shared_ptr<@BASE_NAME@> sptr; - /*! \brief Make a noise source + /*! Build a noise source * \param type the random distribution to use (see analog/noise_type.h) * \param ampl a scaling factor for the output * \param seed seed for random generators. Note that for uniform and - * Gaussian distributions, this should be a negative number. + * Gaussian distributions, this should be a negative number. */ static sptr make(noise_type_t type, float ampl, long seed); diff --git a/gr-analog/include/analog/phase_modulator_fc.h b/gr-analog/include/analog/phase_modulator_fc.h index 409de7804b..2ec7c1a3c4 100644 --- a/gr-analog/include/analog/phase_modulator_fc.h +++ b/gr-analog/include/analog/phase_modulator_fc.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief Phase modulator block - * \ingroup modulation_blk + * \ingroup modulators_blk * + * \details * output = complex(cos(in*sensitivity), sin(in*sensitivity)) * * Input stream 0: floats diff --git a/gr-analog/include/analog/plateau_detector_fb.h b/gr-analog/include/analog/plateau_detector_fb.h index 33629bd18b..767aafe23a 100644 --- a/gr-analog/include/analog/plateau_detector_fb.h +++ b/gr-analog/include/analog/plateau_detector_fb.h @@ -33,6 +33,7 @@ namespace gr { /*! * \brief Detects a plateau and marks the middle. * + * \details * Detect a plateau of a-priori known height. Input is a stream of floats, * the output is a stream of bytes. Whenever a plateau is detected, the * middle of that plateau is marked with a '1' on the output stream (all @@ -48,9 +49,6 @@ namespace gr { * * An implicit hysteresis is provided by the fact that after detecting one plateau, * it waits at least max_len samples before the next plateau can be detected. - * - * \ingroup analog - * */ class ANALOG_API plateau_detector_fb : virtual public gr_sync_block { diff --git a/gr-analog/include/analog/pll_carriertracking_cc.h b/gr-analog/include/analog/pll_carriertracking_cc.h index 3596429d49..bb92673185 100644 --- a/gr-analog/include/analog/pll_carriertracking_cc.h +++ b/gr-analog/include/analog/pll_carriertracking_cc.h @@ -32,8 +32,9 @@ namespace gr { /*! * \brief Implements a PLL which locks to the input frequency and outputs the * input signal mixed with that carrier. - * \ingroup sync_blk + * \ingroup synchronizers_blk * + * \details * Input stream 0: complex * Output stream 0: complex * diff --git a/gr-analog/include/analog/pll_freqdet_cf.h b/gr-analog/include/analog/pll_freqdet_cf.h index 613e85263f..a653261c30 100644 --- a/gr-analog/include/analog/pll_freqdet_cf.h +++ b/gr-analog/include/analog/pll_freqdet_cf.h @@ -32,8 +32,9 @@ namespace gr { /*! * \brief Implements a PLL which locks to the input frequency and outputs * an estimate of that frequency. Useful for FM Demod. - * \ingroup sync_blk + * \ingroup synchronizers_blk * + * \details * Input stream 0: complex * Output stream 0: float * diff --git a/gr-analog/include/analog/pll_refout_cc.h b/gr-analog/include/analog/pll_refout_cc.h index a18d177e6e..da15762779 100644 --- a/gr-analog/include/analog/pll_refout_cc.h +++ b/gr-analog/include/analog/pll_refout_cc.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief Implements a PLL which locks to the input frequency and outputs a carrier - * \ingroup sync_blk + * \ingroup synchronizers_blk * + * \details * Input stream 0: complex * Output stream 0: complex * diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_c.h b/gr-analog/include/analog/probe_avg_mag_sqrd_c.h index 9e62732a36..2fed4fff0b 100644 --- a/gr-analog/include/analog/probe_avg_mag_sqrd_c.h +++ b/gr-analog/include/analog/probe_avg_mag_sqrd_c.h @@ -30,8 +30,9 @@ namespace gr { /*! * \brief compute avg magnitude squared. - * \ingroup sink_blk + * \ingroup measurement_tools_blk * + * \details * Input stream 0: complex * * Compute a running average of the magnitude squared of the the diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h b/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h index b18916ae9b..303670adee 100644 --- a/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h +++ b/gr-analog/include/analog/probe_avg_mag_sqrd_cf.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief compute avg magnitude squared. - * \ingroup sink_blk + * \ingroup measurement_tools_blk * + * \details * Input stream 0: complex * Output stream 0: float * diff --git a/gr-analog/include/analog/probe_avg_mag_sqrd_f.h b/gr-analog/include/analog/probe_avg_mag_sqrd_f.h index fe9d27793f..2300f8bca1 100644 --- a/gr-analog/include/analog/probe_avg_mag_sqrd_f.h +++ b/gr-analog/include/analog/probe_avg_mag_sqrd_f.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief compute avg magnitude squared. - * \ingroup sink_blk + * \ingroup measurement_tools_blk * + * \details * input stream 0: float * * Compute a running average of the magnitude squared of the the diff --git a/gr-analog/include/analog/pwr_squelch_cc.h b/gr-analog/include/analog/pwr_squelch_cc.h index 79364a86b5..840669b6b7 100644 --- a/gr-analog/include/analog/pwr_squelch_cc.h +++ b/gr-analog/include/analog/pwr_squelch_cc.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief gate or zero output when input power below threshold - * \ingroup level_blk + * \ingroup level_controllers_blk */ class ANALOG_API pwr_squelch_cc : public squelch_base_cc, virtual public gr_block diff --git a/gr-analog/include/analog/pwr_squelch_ff.h b/gr-analog/include/analog/pwr_squelch_ff.h index 6fdebec746..9aca73a175 100644 --- a/gr-analog/include/analog/pwr_squelch_ff.h +++ b/gr-analog/include/analog/pwr_squelch_ff.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief gate or zero output when input power below threshold - * \ingroup level_blk + * \ingroup level_controllers_blk */ class ANALOG_API pwr_squelch_ff : public squelch_base_ff, virtual public gr_block diff --git a/gr-analog/include/analog/quadrature_demod_cf.h b/gr-analog/include/analog/quadrature_demod_cf.h index 916d8b2ece..919cf779f7 100644 --- a/gr-analog/include/analog/quadrature_demod_cf.h +++ b/gr-analog/include/analog/quadrature_demod_cf.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief quadrature demodulator: complex in, float out - * \ingroup demodulation_blk + * \ingroup modulators_blk * + * \details * This can be used to demod FM, FSK, GMSK, etc. * The input is complex baseband. */ diff --git a/gr-analog/include/analog/rail_ff.h b/gr-analog/include/analog/rail_ff.h index e51b2fc935..7771fd9e8e 100644 --- a/gr-analog/include/analog/rail_ff.h +++ b/gr-analog/include/analog/rail_ff.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief clips input values to min, max - * \ingroup misc + * \ingroup level_controllers_blk */ class ANALOG_API rail_ff : virtual public gr_sync_block { diff --git a/gr-analog/include/analog/sig_source_X.h.t b/gr-analog/include/analog/sig_source_X.h.t index 2915c2abe9..752fe4cd29 100644 --- a/gr-analog/include/analog/sig_source_X.h.t +++ b/gr-analog/include/analog/sig_source_X.h.t @@ -34,7 +34,7 @@ namespace gr { /*! * \brief signal generator with @TYPE@ output. - * \ingroup source_blk + * \ingroup waveform_generators_blk */ class ANALOG_API @BASE_NAME@ : virtual public gr_sync_block { @@ -43,7 +43,7 @@ namespace gr { typedef boost::shared_ptr<@BASE_NAME@> sptr; /*! - * \brief Make a signal source block. + * Build a signal source block. * * \param sampling_freq Sampling rate of signal. * \param waveform wavetform type. diff --git a/gr-analog/include/analog/simple_squelch_cc.h b/gr-analog/include/analog/simple_squelch_cc.h index 1e12646e4e..bf949e3d2e 100644 --- a/gr-analog/include/analog/simple_squelch_cc.h +++ b/gr-analog/include/analog/simple_squelch_cc.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief simple squelch block based on average signal power and threshold in dB. - * \ingroup level_blk + * \ingroup level_controllers_blk */ class ANALOG_API simple_squelch_cc : virtual public gr_sync_block { diff --git a/gr-audio/grc/audio_sink.xml b/gr-audio/grc/audio_sink.xml index 4a88a7fa27..9a70006e72 100644 --- a/gr-audio/grc/audio_sink.xml +++ b/gr-audio/grc/audio_sink.xml @@ -7,7 +7,7 @@ <block> <name>Audio Sink</name> <key>audio_sink</key> - <category>Sinks</category> + <category>Audio</category> <throttle>1</throttle> <import>from gnuradio import audio</import> <make>audio.sink($samp_rate, $device_name, $ok_to_block)</make> diff --git a/gr-audio/grc/audio_source.xml b/gr-audio/grc/audio_source.xml index d56e9153a5..0cb73a3ae9 100644 --- a/gr-audio/grc/audio_source.xml +++ b/gr-audio/grc/audio_source.xml @@ -7,7 +7,7 @@ <block> <name>Audio Source</name> <key>audio_source</key> - <category>Sources</category> + <category>Audio</category> <throttle>1</throttle> <import>from gnuradio import audio</import> <make>audio.source($samp_rate, $device_name, $ok_to_block)</make> diff --git a/gr-blocks/doc/blocks.dox b/gr-blocks/doc/blocks.dox index 110dcb677e..2809c6a943 100644 --- a/gr-blocks/doc/blocks.dox +++ b/gr-blocks/doc/blocks.dox @@ -11,7 +11,7 @@ imported as: \endcode See the Doxygen documentation for details about the blocks available -in this package. The relevant blocks are listed in the \ref digital group. +in this package. A quick listing of the details can be found in Python after importing by using: diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index e7b7bb2c04..04fe1f6955 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -29,34 +29,53 @@ <cat> <name></name> <!-- Blank for Root Name --> <cat> - <name>Sources (New)</name> - <block>blocks_file_source</block> - <block>blocks_file_descriptor_source</block> - <block>blocks_file_meta_source</block> - <block>blocks_pdu_to_tagged_stream</block> - <block>blocks_message_source</block> - <block>blocks_message_burst_source</block> - <block>blocks_udp_source</block> + <name>Audio</name> <block>blocks_wavfile_source</block> - <block>blocks_vector_source_x</block> - <block>blocks_null_source</block> + <block>blocks_wavfile_sink</block> + </cat> + <cat> + <name>Boolean Operators</name> + <block>blocks_and_xx</block> + <block>blocks_and_const_xx</block> + <block>blocks_not_xx</block> + <block>blocks_or_xx</block> + <block>blocks_xor_xx</block> + </cat> + <cat> + <name>Byte Operators</name> + <block>blocks_packed_to_unpacked_xx</block> + <block>blocks_unpacked_to_packed_xx</block> + <block>blocks_pack_k_bits_bb</block> + <block>blocks_unpack_k_bits_bb</block> + <block>blocks_repack_bits_bb</block> </cat> <cat> - <name>Sinks (New)</name> + <name>Debug Tools</name> + <block>blocks_vector_sink_x</block> + <block>blocks_tag_debug</block> + <block>blocks_message_debug</block> + </cat> + <cat> + <name>File Operators</name> + <block>blocks_wavfile_source</block> + <block>blocks_wavfile_sink</block> + <block>blocks_file_source</block> <block>blocks_file_sink</block> + <block>blocks_file_descriptor_source</block> <block>blocks_file_descriptor_sink</block> + <block>blocks_file_meta_source</block> <block>blocks_file_meta_sink</block> - <block>blocks_tagged_stream_to_pdu</block> - <block>blocks_tag_debug</block> - <block>blocks_message_sink</block> <block>blocks_tagged_file_sink</block> - <block>blocks_udp_sink</block> - <block>blocks_wavfile_sink</block> - <block>blocks_vector_sink_x</block> - <block>blocks_null_sink</block> </cat> <cat> - <name>Math Operations (New) </name> + <name>Level Controllers</name> + <block>blocks_mute_xx</block> + <block>blocks_sample_and_hold_xx</block> + <block>blocks_moving_average_xx</block> + <block>blocks_threshold_ff</block> + </cat> + <cat> + <name>Math Operators</name> <block>blocks_add_xx</block> <block>blocks_add_const_vxx</block> <block>blocks_divide_xx</block> @@ -71,47 +90,61 @@ <block>blocks_transcendental</block> <block>blocks_argmax_xx</block> <block>blocks_max_xx</block> + </cat> + <cat> + <name>Measurement Tools</name> + <block>blocks_message_debug</block> + <block>blocks_tag_debug</block> + <block>blocks_probe_signal_x</block> + <block>blocks_probe_signal_vx</block> + <block>blocks_probe_rate</block> + </cat> + <cat> + <name>Message Tools</name> + <block>blocks_message_source</block> + <block>blocks_message_sink</block> + <block>blocks_message_burst_source</block> + <block>blocks_message_strobe</block> + <block>blocks_message_debug</block> + <block>blocks_pdu_to_tagged_stream</block> + <block>blocks_tagged_stream_to_pdu</block> + </cat> + <cat> + <name>Misc</name> + <block>blocks_throttle</block> + <block>blocks_vector_source_x</block> + <block>blocks_head</block> + <block>blocks_skiphead</block> + <block>blocks_delay</block> + <block>blocks_null_source</block> + <block>blocks_null_sink</block> + <block>blocks_copy</block> + <block>blocks_nop</block> + </cat> + <cat> + <name>Modulators</name> <block>blocks_vco_f</block> </cat> <cat> - <name>Boolean Operations (New) </name> - <block>blocks_and_xx</block> - <block>blocks_and_const_xx</block> - <block>blocks_not_xx</block> - <block>blocks_or_xx</block> - <block>blocks_xor_xx</block> + <name>Networking Tools</name> + <block>blocks_tuntap_pdu</block> + <block>blocks_socket_pdu</block> + <block>blocks_udp_source</block> + <block>blocks_udp_sink</block> </cat> <cat> - <name>Stream Type Conversions (New) </name> - <block>blocks_char_to_float</block> - <block>blocks_char_to_short</block> - <block>blocks_complex_to_interleaved_short</block> - <block>blocks_complex_to_float</block> - <block>blocks_complex_to_imag</block> - <block>blocks_complex_to_real</block> - <block>blocks_complex_to_mag</block> - <block>blocks_complex_to_mag_squared</block> - <block>blocks_complex_to_arg</block> - <block>blocks_float_to_char</block> - <block>blocks_float_to_complex</block> - <block>blocks_float_to_int</block> - <block>blocks_float_to_short</block> - <block>blocks_float_to_uchar</block> - <block>blocks_int_to_float</block> - <block>blocks_interleaved_short_to_complex</block> - <block>blocks_short_to_char</block> - <block>blocks_repack_bits_bb</block> - <block>blocks_short_to_float</block> - <block>blocks_uchar_to_float</block> + <name>Peak Detectors</name> + <block>blocks_burst_tagger</block> + <block>blocks_peak_detector_xb</block> + <block>blocks_peak_detector2_fb</block> + <block>blocks_plateau_detector_fb</block> </cat> <cat> - <name>Stream Operations (New) </name> - <block>blocks_delay</block> + <name>Stream Operators</name> <block>blocks_deinterleave</block> <block>blocks_interleave</block> <block>blocks_keep_m_in_n</block> <block>blocks_keep_one_in_n</block> - <block>blocks_repeat</block> <block>blocks_stream_mux</block> <block>blocks_stream_to_streams</block> <block>blocks_stream_to_vector</block> @@ -119,51 +152,44 @@ <block>blocks_streams_to_vector</block> <block>blocks_vector_to_stream</block> <block>blocks_vector_to_streams</block> - <block>blocks_peak_detector_xb</block> - <block>blocks_peak_detector2_fb</block> - <block>blocks_plateau_detector_fb</block> - <block>blocks_regenerate_bb</block> - <block>blocks_stretch_ff</block> - <block>blocks_threshold_ff</block> - <block>blocks_burst_tagger</block> + <block>blocks_patterned_interleaver</block> <block>blocks_endian_swap</block> <block>blocks_vector_insert_x</block> + <block>blocks_tagged_stream_mux</block> + <block>blocks_repeat</block> + <block>blocks_regenerate_bb</block> + <block>blocks_stretch_ff</block> </cat> <cat> - <name>Misc Conversions (New) </name> - <block>blocks_packed_to_unpacked_xx</block> - <block>blocks_unpacked_to_packed_xx</block> - <block>blocks_pack_k_bits_bb</block> - <block>blocks_unpack_k_bits_bb</block> - </cat> - <cat> - <name>Misc (New) </name> - <block>blocks_throttle</block> - <block>blocks_probe_rate</block> - <block>blocks_head</block> - <block>blocks_skiphead</block> - <block>blocks_copy</block> - <block>blocks_nop</block> - </cat> - <cat> - <name>Networking</name> - <block>blocks_tuntap_pdu</block> - <block>blocks_socket_pdu</block> + <name>Stream Tag Tools</name> + <block>blocks_tag_debug</block> + <block>blocks_tagged_file_sink</block> + <block>blocks_tagged_stream_mux</block> </cat> <cat> - <name>Level Controls (New)</name> - <block>blocks_mute_xx</block> - <block>blocks_sample_and_hold_xx</block> - <block>blocks_moving_average_xx</block> + <name>Type Converters</name> + <block>blocks_char_to_float</block> + <block>blocks_char_to_short</block> + <block>blocks_complex_to_interleaved_short</block> + <block>blocks_complex_to_float</block> + <block>blocks_complex_to_imag</block> + <block>blocks_complex_to_real</block> + <block>blocks_complex_to_mag</block> + <block>blocks_complex_to_mag_squared</block> + <block>blocks_complex_to_arg</block> + <block>blocks_float_to_char</block> + <block>blocks_float_to_complex</block> + <block>blocks_float_to_int</block> + <block>blocks_float_to_short</block> + <block>blocks_float_to_uchar</block> + <block>blocks_int_to_float</block> + <block>blocks_interleaved_short_to_complex</block> + <block>blocks_short_to_char</block> + <block>blocks_short_to_float</block> + <block>blocks_uchar_to_float</block> </cat> <cat> - <name>Probes (New)</name> - <block>blocks_probe_signal_x</block> - <block>blocks_probe_signal_vx</block> + <name>Waveform Generators</name> + <block>blocks_vco_f</block> </cat> - <cat> - <name>Message Tools (New)</name> - <block>blocks_message_strobe</block> - <block>blocks_message_debug</block> - </cat> </cat> diff --git a/gr-blocks/grc/blocks_probe_signal_vx.xml b/gr-blocks/grc/blocks_probe_signal_vx.xml index f4e945ab0d..930a49643c 100644 --- a/gr-blocks/grc/blocks_probe_signal_vx.xml +++ b/gr-blocks/grc/blocks_probe_signal_vx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Probe Signal</name> + <name>Probe Signal Vector</name> <key>blocks_probe_signal_vx</key> <import>from gnuradio import blocks</import> <make>blocks.probe_signal_v$(type.fcn)($vlen)</make> diff --git a/gr-blocks/grc/blocks_tagged_stream_mux.xml b/gr-blocks/grc/blocks_tagged_stream_mux.xml index 40d98a3346..98c4b6dfb5 100644 --- a/gr-blocks/grc/blocks_tagged_stream_mux.xml +++ b/gr-blocks/grc/blocks_tagged_stream_mux.xml @@ -1,7 +1,6 @@ <block> <name>Tagged Stream Mux</name> <key>blocks_tagged_stream_mux</key> - <category>Stream Operations</category> <import>from gnuradio import blocks</import> <make>blocks.tagged_stream_mux($type.size*$vlen, $lengthtagname)</make> <param> diff --git a/gr-blocks/include/blocks/add_XX.h.t b/gr-blocks/include/blocks/add_XX.h.t index 607b820669..ffe08f683b 100644 --- a/gr-blocks/include/blocks/add_XX.h.t +++ b/gr-blocks/include/blocks/add_XX.h.t @@ -33,8 +33,9 @@ namespace gr { /*! * \brief output = sum (input_0, input_1, ...) - * \ingroup math_blk + * \ingroup math_operators_blk * + * \details * Add across all input streams. */ class BLOCKS_API @NAME@ : virtual public gr_sync_block diff --git a/gr-blocks/include/blocks/add_const_XX.h.t b/gr-blocks/include/blocks/add_const_XX.h.t index df968feac1..3a99978b6b 100644 --- a/gr-blocks/include/blocks/add_const_XX.h.t +++ b/gr-blocks/include/blocks/add_const_XX.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output = input + constant - * \ingroup math_blk + * \ingroup math_operators_blk */ class BLOCKS_API @NAME@ : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/add_const_vXX.h.t b/gr-blocks/include/blocks/add_const_vXX.h.t index c4cd49fa48..33a50a42ca 100644 --- a/gr-blocks/include/blocks/add_const_vXX.h.t +++ b/gr-blocks/include/blocks/add_const_vXX.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output = input + constant vector - * \ingroup math_blk + * \ingroup math_operators_blk */ class BLOCKS_API @NAME@ : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/add_ff.h b/gr-blocks/include/blocks/add_ff.h index 1e7350c1bb..6a9bbfbded 100644 --- a/gr-blocks/include/blocks/add_ff.h +++ b/gr-blocks/include/blocks/add_ff.h @@ -29,6 +29,13 @@ namespace gr { namespace blocks { + /*! + * \brief output = sum (input_0, input_1, ...) + * \ingroup math_operators_blk + * + * \details + * Add across all input streams. + */ class BLOCKS_API add_ff : virtual public gr_sync_block { public: diff --git a/gr-blocks/include/blocks/and_XX.h.t b/gr-blocks/include/blocks/and_XX.h.t index 68ddcc33d5..048e1bea57 100644 --- a/gr-blocks/include/blocks/and_XX.h.t +++ b/gr-blocks/include/blocks/and_XX.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output = input_0 & input_1 & , ... & input_N) - * \ingroup math_blk + * \ingroup boolean_operators_blk * * bitwise boolean and across all input streams. */ diff --git a/gr-blocks/include/blocks/and_const_XX.h.t b/gr-blocks/include/blocks/and_const_XX.h.t index 945a1f48b7..9e478819cb 100644 --- a/gr-blocks/include/blocks/and_const_XX.h.t +++ b/gr-blocks/include/blocks/and_const_XX.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output_N = input_N & value - * \ingroup math_blk + * \ingroup boolean_operators_blk * * bitwise boolean and of const to the data stream. */ diff --git a/gr-blocks/include/blocks/annotator_1to1.h b/gr-blocks/include/blocks/annotator_1to1.h index 6cc8db6eef..1c5ab038fc 100644 --- a/gr-blocks/include/blocks/annotator_1to1.h +++ b/gr-blocks/include/blocks/annotator_1to1.h @@ -32,6 +32,7 @@ namespace gr { /*! * \brief 1-to-1 stream annotator testing block. FOR TESTING PURPOSES ONLY. * + * \details * This block creates tags to be sent downstream every 10,000 * items it sees. The tags contain the name and ID of the * instantiated block, use "seq" as a key, and have a counter that diff --git a/gr-blocks/include/blocks/annotator_alltoall.h b/gr-blocks/include/blocks/annotator_alltoall.h index 558aea69ca..7bad73b291 100644 --- a/gr-blocks/include/blocks/annotator_alltoall.h +++ b/gr-blocks/include/blocks/annotator_alltoall.h @@ -32,6 +32,7 @@ namespace gr { /*! * \brief All-to-all stream annotator testing block. FOR TESTING PURPOSES ONLY. * + * \details * This block creates tags to be sent downstream every 10,000 * items it sees. The tags contain the name and ID of the * instantiated block, use "seq" as a key, and have a counter that diff --git a/gr-blocks/include/blocks/annotator_raw.h b/gr-blocks/include/blocks/annotator_raw.h index e835f0bd8d..afa0a364eb 100644 --- a/gr-blocks/include/blocks/annotator_raw.h +++ b/gr-blocks/include/blocks/annotator_raw.h @@ -33,6 +33,7 @@ namespace gr { /*! * \brief raw stream annotator testing block. * + * \details * This block creates arbitrary tags to be sent downstream blocks * to be sent are set manually via accessor methods and are sent * only once. diff --git a/gr-blocks/include/blocks/argmax_XX.h.t b/gr-blocks/include/blocks/argmax_XX.h.t index 4c25c1c8c4..93aa367260 100644 --- a/gr-blocks/include/blocks/argmax_XX.h.t +++ b/gr-blocks/include/blocks/argmax_XX.h.t @@ -35,8 +35,9 @@ namespace gr { * \brief Compares vectors from multiple streams and determines * the index in the vector and stream number where the maximum * value occurred. - * \ingroup math_blk + * \ingroup math_operators_blk * + * \details * Data is passed in as a vector of length \p vlen from multiple * input sources. It will look through these streams of \p vlen * data items and output two streams. diff --git a/gr-blocks/include/blocks/burst_tagger.h b/gr-blocks/include/blocks/burst_tagger.h index 408405f97b..312fb2ffbd 100644 --- a/gr-blocks/include/blocks/burst_tagger.h +++ b/gr-blocks/include/blocks/burst_tagger.h @@ -31,8 +31,10 @@ namespace gr { /*! * \brief Sets a burst on/off tag based on the value of the trigger input. - * \ingroup misc_blk + * \ingroup peak_detectors_blk + * \ingroup stream_tag_tools_blk * + * \details * This block takes two inputs, a signal stream on the input * stream 0 and a trigger stream of shorts on input stream 1. If * the trigger stream goes above 0, a tag with the key "burst" diff --git a/gr-blocks/include/blocks/char_to_float.h b/gr-blocks/include/blocks/char_to_float.h index 92a2dbf800..0002ceb30b 100644 --- a/gr-blocks/include/blocks/char_to_float.h +++ b/gr-blocks/include/blocks/char_to_float.h @@ -31,10 +31,7 @@ namespace gr { /*! * \brief Convert stream of chars to a stream of float - * \ingroup converter_blk - * - * \param vlen vector length of data streams. - * \param scale a scalar divider to change the output signal scale. + * \ingroup type_converters_blk */ class BLOCKS_API char_to_float : virtual public gr_sync_block { @@ -43,6 +40,12 @@ namespace gr { // gr::blocks::char_to_float_ff::sptr typedef boost::shared_ptr<char_to_float> sptr; + /*! + * Build a chars to float stream converter block. + * + * \param vlen vector length of data streams. + * \param scale a scalar divider to change the output signal scale. + */ static sptr make(size_t vlen=1, float scale=1.0); /*! diff --git a/gr-blocks/include/blocks/char_to_short.h b/gr-blocks/include/blocks/char_to_short.h index e2bb3a8590..fc9d3b4b52 100644 --- a/gr-blocks/include/blocks/char_to_short.h +++ b/gr-blocks/include/blocks/char_to_short.h @@ -31,9 +31,7 @@ namespace gr { /*! * \brief Convert stream of chars to a stream of short - * \ingroup converter_blk - * - * \param vlen vector length of data streams. + * \ingroup type_converters_blk */ class BLOCKS_API char_to_short : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/check_lfsr_32k_s.h b/gr-blocks/include/blocks/check_lfsr_32k_s.h index 4eba436e80..6eddd607b6 100644 --- a/gr-blocks/include/blocks/check_lfsr_32k_s.h +++ b/gr-blocks/include/blocks/check_lfsr_32k_s.h @@ -33,6 +33,7 @@ namespace gr { * \brief sink that checks if its input stream consists of a lfsr_32k sequence. * \ingroup sink_blk * + * \details * This sink is typically used along with * gr::blocks::lfsr_32k_source_s to test the USRP using its * digital loopback mode. diff --git a/gr-blocks/include/blocks/complex_to_arg.h b/gr-blocks/include/blocks/complex_to_arg.h index 5d38161d45..178f846704 100644 --- a/gr-blocks/include/blocks/complex_to_arg.h +++ b/gr-blocks/include/blocks/complex_to_arg.h @@ -31,16 +31,19 @@ namespace gr { /*! * \brief complex in, arg out (float) - * \ingroup converter_blk - * \param vlen vector len (default 1) + * \ingroup type_converters_blk */ class BLOCKS_API complex_to_arg : virtual public gr_sync_block { public: - // gr::blocks::complex_to_arg_ff::sptr typedef boost::shared_ptr<complex_to_arg> sptr; + /*! + * Build a complex to arg block. + * + * \param vlen vector len (default 1) + */ static sptr make(size_t vlen=1); }; diff --git a/gr-blocks/include/blocks/complex_to_float.h b/gr-blocks/include/blocks/complex_to_float.h index 322f67b624..7648648d6c 100644 --- a/gr-blocks/include/blocks/complex_to_float.h +++ b/gr-blocks/include/blocks/complex_to_float.h @@ -31,16 +31,19 @@ namespace gr { /*! * \brief convert a stream of gr_complex to 1 or 2 streams of float - * \ingroup converter_blk - * \param vlen vector len (default 1) + * \ingroup type_converters_blk */ class BLOCKS_API complex_to_float : virtual public gr_sync_block { public: - // gr::blocks::complex_to_float_ff::sptr typedef boost::shared_ptr<complex_to_float> sptr; + /*! + * Build a complex to float block. + * + * \param vlen vector len (default 1) + */ static sptr make(size_t vlen=1); }; diff --git a/gr-blocks/include/blocks/complex_to_imag.h b/gr-blocks/include/blocks/complex_to_imag.h index 71353a94a1..cb1d32fec6 100644 --- a/gr-blocks/include/blocks/complex_to_imag.h +++ b/gr-blocks/include/blocks/complex_to_imag.h @@ -31,16 +31,19 @@ namespace gr { /*! * \brief complex in, imag out (float) - * \ingroup converter_blk - * \param vlen vector len (default 1) + * \ingroup type_converters_blk */ class BLOCKS_API complex_to_imag : virtual public gr_sync_block { public: - // gr::blocks::complex_to_imag_ff::sptr typedef boost::shared_ptr<complex_to_imag> sptr; + /*! + * Build a complex to imaginary part block. + * + * \param vlen vector len (default 1) + */ static sptr make(size_t vlen=1); }; diff --git a/gr-blocks/include/blocks/complex_to_interleaved_short.h b/gr-blocks/include/blocks/complex_to_interleaved_short.h index f5e91123ce..c7304787a9 100644 --- a/gr-blocks/include/blocks/complex_to_interleaved_short.h +++ b/gr-blocks/include/blocks/complex_to_interleaved_short.h @@ -31,15 +31,17 @@ namespace gr { /*! * \brief Convert stream of complex to a stream of interleaved shorts - * \ingroup converter_blk + * \ingroup type_converters_blk */ class BLOCKS_API complex_to_interleaved_short : virtual public gr_sync_interpolator { public: - // gr::blocks::complex_to_interleaved_short::sptr typedef boost::shared_ptr<complex_to_interleaved_short> sptr; + /*! + * Build a complex to interleaved shorts block. + */ static sptr make(); }; diff --git a/gr-blocks/include/blocks/complex_to_mag.h b/gr-blocks/include/blocks/complex_to_mag.h index 7e03c1cac4..b1758fd3eb 100644 --- a/gr-blocks/include/blocks/complex_to_mag.h +++ b/gr-blocks/include/blocks/complex_to_mag.h @@ -31,16 +31,19 @@ namespace gr { /*! * \brief complex in, magnitude out (float) - * \ingroup converter_blk - * \param vlen vector len (default 1) + * \ingroup type_converters_blk */ class BLOCKS_API complex_to_mag : virtual public gr_sync_block { public: - // gr::blocks::complex_to_mag_ff::sptr typedef boost::shared_ptr<complex_to_mag> sptr; + /*! + * Build a complex to magnitude block. + * + * \param vlen vector len (default 1) + */ static sptr make(size_t vlen=1); }; diff --git a/gr-blocks/include/blocks/complex_to_mag_squared.h b/gr-blocks/include/blocks/complex_to_mag_squared.h index 9e122b4b1b..a7c464fbb0 100644 --- a/gr-blocks/include/blocks/complex_to_mag_squared.h +++ b/gr-blocks/include/blocks/complex_to_mag_squared.h @@ -31,16 +31,19 @@ namespace gr { /*! * \brief complex in, magnitude squared out (float) - * \ingroup converter_blk - * \param vlen vector len (default 1) + * \ingroup type_converters_blk */ class BLOCKS_API complex_to_mag_squared : virtual public gr_sync_block { public: - // gr::blocks::complex_to_mag_squared_ff::sptr typedef boost::shared_ptr<complex_to_mag_squared> sptr; + /*! + * Build a complex to magnitude squared block. + * + * \param vlen vector len (default 1) + */ static sptr make(size_t vlen=1); }; diff --git a/gr-blocks/include/blocks/complex_to_real.h b/gr-blocks/include/blocks/complex_to_real.h index a891c2e086..908ca9fc94 100644 --- a/gr-blocks/include/blocks/complex_to_real.h +++ b/gr-blocks/include/blocks/complex_to_real.h @@ -31,16 +31,19 @@ namespace gr { /*! * \brief complex in, real out (float) - * \ingroup converter_blk - * \param vlen vector len (default 1) + * \ingroup type_converters_blk */ class BLOCKS_API complex_to_real : virtual public gr_sync_block { public: - // gr::blocks::complex_to_real_ff::sptr typedef boost::shared_ptr<complex_to_real> sptr; + /*! + * Build a complex to real part block. + * + * \param vlen vector len (default 1) + */ static sptr make(size_t vlen=1); }; diff --git a/gr-blocks/include/blocks/conjugate_cc.h b/gr-blocks/include/blocks/conjugate_cc.h index 02297c56e2..92096eea31 100644 --- a/gr-blocks/include/blocks/conjugate_cc.h +++ b/gr-blocks/include/blocks/conjugate_cc.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief output = complex conjugate of input - * \ingroup math_blk + * \ingroup math_operators_blk */ class BLOCKS_API conjugate_cc : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/copy.h b/gr-blocks/include/blocks/copy.h index 5ed0ea0e92..a243a54917 100644 --- a/gr-blocks/include/blocks/copy.h +++ b/gr-blocks/include/blocks/copy.h @@ -33,6 +33,7 @@ namespace gr { * \brief output[i] = input[i] * \ingroup misc_blk * + * \details * When enabled (default), this block copies its input to its * output. When disabled, this block drops its input on the floor. */ diff --git a/gr-blocks/include/blocks/deinterleave.h b/gr-blocks/include/blocks/deinterleave.h index 24074d2fcf..bb6ad59a22 100644 --- a/gr-blocks/include/blocks/deinterleave.h +++ b/gr-blocks/include/blocks/deinterleave.h @@ -31,16 +31,19 @@ namespace gr { /*! * \brief deinterleave a single input into N outputs - * \ingroup slicedice_blk - * \param itemsize stream itemsize + * \ingroup stream_operators_blk */ class BLOCKS_API deinterleave : virtual public gr_sync_decimator { public: - // gr::blocks::deinterleave::sptr typedef boost::shared_ptr<deinterleave> sptr; + /*! + * Make a deinterleave block. + * + * \param itemsize stream itemsize + */ static sptr make(size_t itemsize); }; diff --git a/gr-blocks/include/blocks/divide_XX.h.t b/gr-blocks/include/blocks/divide_XX.h.t index 9a382e4a09..821a458ec4 100644 --- a/gr-blocks/include/blocks/divide_XX.h.t +++ b/gr-blocks/include/blocks/divide_XX.h.t @@ -33,8 +33,9 @@ namespace gr { /*! * \brief output = input_0 / input_1 / input_x ...) - * \ingroup math_blk + * \ingroup math_operators_blk * + * \details * Divide across all input streams. */ class BLOCKS_API @NAME@ : virtual public gr_sync_block diff --git a/gr-blocks/include/blocks/endian_swap.h b/gr-blocks/include/blocks/endian_swap.h index 4b5a76218e..c26a1d2aa4 100644 --- a/gr-blocks/include/blocks/endian_swap.h +++ b/gr-blocks/include/blocks/endian_swap.h @@ -31,9 +31,7 @@ namespace gr { /*! * \brief Convert stream of items into thier byte swapped version - * - * \param item_size_bytes number of bytes per item, 1=no-op, - * 2=uint16_t, 4=uint32_t, 8=uint64_t + * \ingroup stream_operators_blk */ class BLOCKS_API endian_swap : virtual public gr_sync_block { @@ -41,6 +39,12 @@ namespace gr { // gr::blocks::endian_swap::sptr typedef boost::shared_ptr<endian_swap> sptr; + /*! + * Make an endian swap block. + * + * \param item_size_bytes number of bytes per item, 1=no-op, + * 2=uint16_t, 4=uint32_t, 8=uint64_t + */ static sptr make(size_t item_size_bytes=1); }; diff --git a/gr-blocks/include/blocks/file_descriptor_sink.h b/gr-blocks/include/blocks/file_descriptor_sink.h index df59e24c0a..e98f918c14 100644 --- a/gr-blocks/include/blocks/file_descriptor_sink.h +++ b/gr-blocks/include/blocks/file_descriptor_sink.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Write stream to file descriptor. - * \ingroup sink_blk + * \ingroup file_operators_blk */ class BLOCKS_API file_descriptor_sink : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/file_descriptor_source.h b/gr-blocks/include/blocks/file_descriptor_source.h index ff4f14792b..ac827800cd 100644 --- a/gr-blocks/include/blocks/file_descriptor_source.h +++ b/gr-blocks/include/blocks/file_descriptor_source.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief Read stream from file descriptor. - * \ingroup source_blk + * \ingroup file_operators_blk */ class BLOCKS_API file_descriptor_source : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/file_meta_sink.h b/gr-blocks/include/blocks/file_meta_sink.h index ef64887cf9..763e0a2da0 100644 --- a/gr-blocks/include/blocks/file_meta_sink.h +++ b/gr-blocks/include/blocks/file_meta_sink.h @@ -45,8 +45,9 @@ namespace gr { /*! * \brief Write stream to file with meta-data headers. - * \ingroup sink_blk + * \ingroup file_operators_blk * + * \details * These files represent data as binary information in between * meta-data headers. The headers contain information about the * type of data and properties of the data in the next segment of diff --git a/gr-blocks/include/blocks/file_meta_source.h b/gr-blocks/include/blocks/file_meta_source.h index a992d52432..83997fc9b5 100644 --- a/gr-blocks/include/blocks/file_meta_source.h +++ b/gr-blocks/include/blocks/file_meta_source.h @@ -32,8 +32,9 @@ namespace gr { /*! * \brief Reads stream from file with meta-data headers. Headers * are parsed into tags. - * \ingroup source_blk + * \ingroup file_operators_blk * + * \details * The information in the metadata headers includes: * * rx_rate (double): sample rate of data. diff --git a/gr-blocks/include/blocks/file_sink.h b/gr-blocks/include/blocks/file_sink.h index 08c2adf1f7..c894defd78 100644 --- a/gr-blocks/include/blocks/file_sink.h +++ b/gr-blocks/include/blocks/file_sink.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief Write stream to file. - * \ingroup sink_blk + * \ingroup file_operators_blk */ class BLOCKS_API file_sink : virtual public gr_sync_block, virtual public file_sink_base diff --git a/gr-blocks/include/blocks/file_source.h b/gr-blocks/include/blocks/file_source.h index 1a12aa905d..6f1bc49ea1 100644 --- a/gr-blocks/include/blocks/file_source.h +++ b/gr-blocks/include/blocks/file_source.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Read stream from file - * \ingroup source_blk + * \ingroup file_operators_blk */ class BLOCKS_API file_source : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/float_to_char.h b/gr-blocks/include/blocks/float_to_char.h index de9ea85e33..c0193da573 100644 --- a/gr-blocks/include/blocks/float_to_char.h +++ b/gr-blocks/include/blocks/float_to_char.h @@ -31,18 +31,20 @@ namespace gr { /*! * \brief Convert stream of floats to a stream of char - * \ingroup converter_blk - * - * \param vlen vector length of data streams. - * \param scale a scalar multiplier to change the output signal scale. + * \ingroup type_converters_blk */ class BLOCKS_API float_to_char : virtual public gr_sync_block { public: - // gr::blocks::float_to_char_ff::sptr typedef boost::shared_ptr<float_to_char> sptr; + /*! + * Build a float to char block. + * + * \param vlen vector length of data streams. + * \param scale a scalar multiplier to change the output signal scale. + */ static sptr make(size_t vlen=1, float scale=1.0); /*! diff --git a/gr-blocks/include/blocks/float_to_complex.h b/gr-blocks/include/blocks/float_to_complex.h index 48c5b6ead4..aba9aed8c4 100644 --- a/gr-blocks/include/blocks/float_to_complex.h +++ b/gr-blocks/include/blocks/float_to_complex.h @@ -31,16 +31,19 @@ namespace gr { /*! * \brief one or two floats in, complex out - * \ingroup converter_blk - * \param vlen vector len (default 1) + * \ingroup type_converters_blk */ class BLOCKS_API float_to_complex : virtual public gr_sync_block { public: - // gr::blocks::float_to_complex_ff::sptr typedef boost::shared_ptr<float_to_complex> sptr; + /*! + * Build a float to complex block. + * + * \param vlen vector len (default 1) + */ static sptr make(size_t vlen=1); }; diff --git a/gr-blocks/include/blocks/float_to_int.h b/gr-blocks/include/blocks/float_to_int.h index 95c62e5162..3c8e7ad5ab 100644 --- a/gr-blocks/include/blocks/float_to_int.h +++ b/gr-blocks/include/blocks/float_to_int.h @@ -30,19 +30,21 @@ namespace gr { namespace blocks { /*! - * \brief Convert stream of floats to a stream of char - * \ingroup converter_blk - * - * \param vlen vector length of data streams. - * \param scale a scalar multiplier to change the output signal scale. + * \brief Convert stream of floats to a stream of ints. + * \ingroup type_converters_blk */ class BLOCKS_API float_to_int : virtual public gr_sync_block { public: - // gr::blocks::float_to_int_ff::sptr typedef boost::shared_ptr<float_to_int> sptr; + /*! + * Build a float to int block. + * + * \param vlen vector length of data streams. + * \param scale a scalar multiplier to change the output signal scale. + */ static sptr make(size_t vlen=1, float scale=1.0); /*! diff --git a/gr-blocks/include/blocks/float_to_short.h b/gr-blocks/include/blocks/float_to_short.h index 5f1ab3f958..8f5f60e55b 100644 --- a/gr-blocks/include/blocks/float_to_short.h +++ b/gr-blocks/include/blocks/float_to_short.h @@ -31,18 +31,20 @@ namespace gr { /*! * \brief Convert stream of floats to a stream of shorts - * \ingroup converter_blk - * - * \param vlen vector length of data streams. - * \param scale a scalar multiplier to change the output signal scale. + * \ingroup type_converters_blk */ class BLOCKS_API float_to_short : virtual public gr_sync_block { public: - // gr::blocks::float_to_short_ff::sptr typedef boost::shared_ptr<float_to_short> sptr; + /*! + * Build a float to short block. + * + * \param vlen vector length of data streams. + * \param scale a scalar multiplier to change the output signal scale. + */ static sptr make(size_t vlen=1, float scale=1.0); /*! diff --git a/gr-blocks/include/blocks/float_to_uchar.h b/gr-blocks/include/blocks/float_to_uchar.h index b5d0d08f7d..9bfaaa65aa 100644 --- a/gr-blocks/include/blocks/float_to_uchar.h +++ b/gr-blocks/include/blocks/float_to_uchar.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Convert stream of floats to a stream of unsigned chars - * \ingroup converter_blk + * \ingroup type_converters_blk */ class BLOCKS_API float_to_uchar : virtual public gr_sync_block { @@ -40,6 +40,9 @@ namespace gr { // gr::blocks::float_to_uchar_ff::sptr typedef boost::shared_ptr<float_to_uchar> sptr; + /*! + * Build a float to uchar block. + */ static sptr make(); }; diff --git a/gr-blocks/include/blocks/head.h b/gr-blocks/include/blocks/head.h index cc7d3808e5..4693f988b8 100644 --- a/gr-blocks/include/blocks/head.h +++ b/gr-blocks/include/blocks/head.h @@ -32,8 +32,9 @@ namespace gr { /*! * \brief copies the first N items to the output then signals done - * \ingroup slicedice_blk + * \ingroup misc_blk * + * \details * Useful for building test cases */ class BLOCKS_API head : virtual public gr_sync_block diff --git a/gr-blocks/include/blocks/int_to_float.h b/gr-blocks/include/blocks/int_to_float.h index ebee1c3c9e..179667e4df 100644 --- a/gr-blocks/include/blocks/int_to_float.h +++ b/gr-blocks/include/blocks/int_to_float.h @@ -30,19 +30,21 @@ namespace gr { namespace blocks { /*! - * \brief Convert stream of ints to a stream of floats - * \ingroup converter_blk - * - * \param vlen vector length of data streams. - * \param scale a scalar divider to change the output signal scale. + * \brief Convert stream of ints to a stream of floats. + * \ingroup type_converters_blk */ class BLOCKS_API int_to_float : virtual public gr_sync_block { public: - // gr::blocks::int_to_float_ff::sptr typedef boost::shared_ptr<int_to_float> sptr; + /*! + * Build an int to float block. + * + * \param vlen vector length of data streams. + * \param scale a scalar divider to change the output signal scale. + */ static sptr make(size_t vlen=1, float scale=1.0); /*! diff --git a/gr-blocks/include/blocks/integrate_XX.h.t b/gr-blocks/include/blocks/integrate_XX.h.t index 8a313a0ba9..45a49def0c 100644 --- a/gr-blocks/include/blocks/integrate_XX.h.t +++ b/gr-blocks/include/blocks/integrate_XX.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief Integrate successive samples and decimate - * \ingroup math_blk + * \ingroup math_operators_blk */ class BLOCKS_API @NAME@ : virtual public gr_sync_decimator { diff --git a/gr-blocks/include/blocks/interleave.h b/gr-blocks/include/blocks/interleave.h index e98d01df9b..043ad6d27b 100644 --- a/gr-blocks/include/blocks/interleave.h +++ b/gr-blocks/include/blocks/interleave.h @@ -31,16 +31,19 @@ namespace gr { /*! * \brief interleave N inputs into a single output - * \ingroup slicedice_blk - * \param itemsize stream itemsize + * \ingroup stream_operators_blk */ class BLOCKS_API interleave : virtual public gr_sync_interpolator { public: - // gr::blocks::interleave::sptr typedef boost::shared_ptr<interleave> sptr; + /*! + * Make a stream interleave block. + * + * \param itemsize stream itemsize + */ static sptr make(size_t itemsize); }; diff --git a/gr-blocks/include/blocks/interleaved_short_to_complex.h b/gr-blocks/include/blocks/interleaved_short_to_complex.h index 40e96fc46a..961ce59a66 100644 --- a/gr-blocks/include/blocks/interleaved_short_to_complex.h +++ b/gr-blocks/include/blocks/interleaved_short_to_complex.h @@ -31,15 +31,17 @@ namespace gr { /*! * \brief Convert stream of interleaved shorts to a stream of complex - * \ingroup converter_blk + * \ingroup type_converters_blk */ class BLOCKS_API interleaved_short_to_complex : virtual public gr_sync_decimator { public: - // gr::blocks::interleaved_short_to_complex::sptr typedef boost::shared_ptr<interleaved_short_to_complex> sptr; + /*! + * Build an interleaved short to complex block. + */ static sptr make(); }; diff --git a/gr-blocks/include/blocks/keep_m_in_n.h b/gr-blocks/include/blocks/keep_m_in_n.h index 806ec3de54..88d94fab85 100644 --- a/gr-blocks/include/blocks/keep_m_in_n.h +++ b/gr-blocks/include/blocks/keep_m_in_n.h @@ -30,8 +30,8 @@ namespace gr { namespace blocks { /*! - * \brief decimate a stream, keeping one item out of every n. - * \ingroup slicedice_blk + * \brief decimate a stream, keeping \p m items out of every \p n. + * \ingroup stream_operators_blk */ class BLOCKS_API keep_m_in_n : virtual public gr_block { @@ -40,6 +40,14 @@ namespace gr { // gr::blocks::keep_m_in_n::sptr typedef boost::shared_ptr<keep_m_in_n> sptr; + /*! + * Make a keep m in n block. + * + * \param itemsize stream itemsize + * \param m number of items to take in block of \p n items + * \param n block size in items + * \param offset initial item offset into the stream + */ static sptr make(size_t itemsize, int m, int n, int offset); virtual void set_m(int m) = 0; diff --git a/gr-blocks/include/blocks/keep_one_in_n.h b/gr-blocks/include/blocks/keep_one_in_n.h index c487849941..9cce1e93ed 100644 --- a/gr-blocks/include/blocks/keep_one_in_n.h +++ b/gr-blocks/include/blocks/keep_one_in_n.h @@ -30,8 +30,8 @@ namespace gr { namespace blocks { /*! - * \brief decimate a stream, keeping one item out of every n. - * \ingroup slicedice_blk + * \brief decimate a stream, keeping one item out of every \p n. + * \ingroup stream_operators_blk */ class BLOCKS_API keep_one_in_n : virtual public gr_block { @@ -40,6 +40,12 @@ namespace gr { // gr::blocks::keep_one_in_n::sptr typedef boost::shared_ptr<keep_one_in_n> sptr; + /*! + * Make a keep one in n block. + * + * \param itemsize stream itemsize + * \param n block size in items + */ static sptr make(size_t itemsize, int n); virtual void set_n(int n) = 0; diff --git a/gr-blocks/include/blocks/lfsr_15_1_0.h b/gr-blocks/include/blocks/lfsr_15_1_0.h index a79ed62eb8..b906844585 100644 --- a/gr-blocks/include/blocks/lfsr_15_1_0.h +++ b/gr-blocks/include/blocks/lfsr_15_1_0.h @@ -32,6 +32,7 @@ namespace gr { * \brief Linear Feedback Shift Register using primitive polynomial x^15 + x + 1 * \ingroup misc * + * \details * Generates a maximal length pseudo-random sequence of length * 2^15 - 1 bits. */ diff --git a/gr-blocks/include/blocks/lfsr_32k.h b/gr-blocks/include/blocks/lfsr_32k.h index 7e70f6512b..23954139d8 100644 --- a/gr-blocks/include/blocks/lfsr_32k.h +++ b/gr-blocks/include/blocks/lfsr_32k.h @@ -33,6 +33,7 @@ namespace gr { * \brief generate pseudo-random sequence of length 32768 bits. * \ingroup misc * + * \details * This is based on gri_lfsr_15_1_0 with an extra 0 added at the * end of the sequence. */ diff --git a/gr-blocks/include/blocks/lfsr_32k_source_s.h b/gr-blocks/include/blocks/lfsr_32k_source_s.h index c24cc31b29..9cc32fc2c9 100644 --- a/gr-blocks/include/blocks/lfsr_32k_source_s.h +++ b/gr-blocks/include/blocks/lfsr_32k_source_s.h @@ -34,6 +34,7 @@ namespace gr { * \brief LFSR pseudo-random source with period of 2^15 bits (2^11 shorts) * \ingroup source_blk * + * \details * This source is typically used along with gr::blocks::check_lfsr_32k_s to * test the USRP using its digital loopback mode. */ diff --git a/gr-blocks/include/blocks/max_XX.h.t b/gr-blocks/include/blocks/max_XX.h.t index 9e74bf3cac..738d7bb938 100644 --- a/gr-blocks/include/blocks/max_XX.h.t +++ b/gr-blocks/include/blocks/max_XX.h.t @@ -34,8 +34,9 @@ namespace gr { /*! * \brief Compares vectors from multiple streams and determines * the maximum value from each vector over all streams. - * \ingroup math_blk + * \ingroup math_operators_blk * + * \details * Data is passed in as a vector of length \p vlen from multiple * input sources. It will look through these streams of \p vlen * data items and output two streams. diff --git a/gr-blocks/include/blocks/message_burst_source.h b/gr-blocks/include/blocks/message_burst_source.h index 864d43452f..72997abf2c 100644 --- a/gr-blocks/include/blocks/message_burst_source.h +++ b/gr-blocks/include/blocks/message_burst_source.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief Turn received messages into a stream and tag them for UHD to send. - * \ingroup source_blk + * \ingroup message_tools_blk */ class BLOCKS_API message_burst_source : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/message_debug.h b/gr-blocks/include/blocks/message_debug.h index f0212331c2..59a778ba49 100644 --- a/gr-blocks/include/blocks/message_debug.h +++ b/gr-blocks/include/blocks/message_debug.h @@ -31,8 +31,11 @@ namespace gr { /*! * \brief Debug block for the message passing system. - * \ingroup sink_blk + * \ingroup message_tools_blk + * \ingroup measurement_tools_blk + * \ingroup debug_tools_blk * + * \details * The message debug block is used to capture and print or store * messages as they are received. Any block that generates a * message may connect that message port to one or more of the diff --git a/gr-blocks/include/blocks/message_sink.h b/gr-blocks/include/blocks/message_sink.h index 5d14836dd4..32d862b9d2 100644 --- a/gr-blocks/include/blocks/message_sink.h +++ b/gr-blocks/include/blocks/message_sink.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief Gather received items into messages and insert into msgq - * \ingroup sink_blk + * \ingroup message_tools_blk */ class BLOCKS_API message_sink : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/message_source.h b/gr-blocks/include/blocks/message_source.h index 5b55191880..4c0de84c14 100644 --- a/gr-blocks/include/blocks/message_source.h +++ b/gr-blocks/include/blocks/message_source.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief Turn received messages into a stream - * \ingroup source_blk + * \ingroup message_tools_blk */ class BLOCKS_API message_source : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/message_strobe.h b/gr-blocks/include/blocks/message_strobe.h index 6b427d539c..abd9b73596 100644 --- a/gr-blocks/include/blocks/message_strobe.h +++ b/gr-blocks/include/blocks/message_strobe.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief Send message at defined interval - * \ingroup msg_blk + * \ingroup message_tools_blk * + * \details * Takes a PMT message and sends it out every \p period_ms * milliseconds. Useful for testing/debugging the message system. */ diff --git a/gr-blocks/include/blocks/moving_average_XX.h.t b/gr-blocks/include/blocks/moving_average_XX.h.t index 6b7883fdd4..5b996bd4d5 100644 --- a/gr-blocks/include/blocks/moving_average_XX.h.t +++ b/gr-blocks/include/blocks/moving_average_XX.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output is the moving sum of the last N samples, scaled by the scale factor - * \ingroup filter_blk + * \ingroup level_controllers_blk */ class BLOCKS_API @NAME@ : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/multiply_XX.h.t b/gr-blocks/include/blocks/multiply_XX.h.t index 47ed3746c7..4ad25d35e9 100644 --- a/gr-blocks/include/blocks/multiply_XX.h.t +++ b/gr-blocks/include/blocks/multiply_XX.h.t @@ -33,8 +33,9 @@ namespace gr { /*! * \brief output = prod (input_0, input_1, ...) - * \ingroup math_blk + * \ingroup math_operators_blk * + * \details * Multiply across all input streams. */ class BLOCKS_API @NAME@ : virtual public gr_sync_block diff --git a/gr-blocks/include/blocks/multiply_cc.h b/gr-blocks/include/blocks/multiply_cc.h index 559fcda579..79533c2dc6 100644 --- a/gr-blocks/include/blocks/multiply_cc.h +++ b/gr-blocks/include/blocks/multiply_cc.h @@ -29,6 +29,13 @@ namespace gr { namespace blocks { + /*! + * \brief output = prod (input_0, input_1, ...) + * \ingroup math_operators_blk + * + * \details + * Multiply across all input streams. + */ class BLOCKS_API multiply_cc : virtual public gr_sync_block { public: diff --git a/gr-blocks/include/blocks/multiply_conjugate_cc.h b/gr-blocks/include/blocks/multiply_conjugate_cc.h index fc587ae2f7..7fa46f891e 100644 --- a/gr-blocks/include/blocks/multiply_conjugate_cc.h +++ b/gr-blocks/include/blocks/multiply_conjugate_cc.h @@ -29,6 +29,10 @@ namespace gr { namespace blocks { + /*! + * \brief Multiplies stream 0 by the complex conjugate of stream 1. + * \ingroup math_operators_blk + */ class BLOCKS_API multiply_conjugate_cc : virtual public gr_sync_block { public: diff --git a/gr-blocks/include/blocks/multiply_const_XX.h.t b/gr-blocks/include/blocks/multiply_const_XX.h.t index a7cd3a8583..4f5ac5c5a6 100644 --- a/gr-blocks/include/blocks/multiply_const_XX.h.t +++ b/gr-blocks/include/blocks/multiply_const_XX.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output = input * constant - * \ingroup math_blk + * \ingroup math_operators_blk */ class BLOCKS_API @NAME@ : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/multiply_const_cc.h b/gr-blocks/include/blocks/multiply_const_cc.h index 9572eaec70..3469b4df17 100644 --- a/gr-blocks/include/blocks/multiply_const_cc.h +++ b/gr-blocks/include/blocks/multiply_const_cc.h @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output = input * complex constant - * \ingroup math_blk + * \ingroup math_operators_blk */ class BLOCKS_API multiply_const_cc : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/multiply_const_ff.h b/gr-blocks/include/blocks/multiply_const_ff.h index d2d5e805cb..627e0c39a6 100644 --- a/gr-blocks/include/blocks/multiply_const_ff.h +++ b/gr-blocks/include/blocks/multiply_const_ff.h @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output = input * real constant - * \ingroup math_blk + * \ingroup math_operators_blk */ class BLOCKS_API multiply_const_ff : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/multiply_ff.h b/gr-blocks/include/blocks/multiply_ff.h index 683b540bbd..ef3f5109bd 100644 --- a/gr-blocks/include/blocks/multiply_ff.h +++ b/gr-blocks/include/blocks/multiply_ff.h @@ -29,6 +29,13 @@ namespace gr { namespace blocks { + /*! + * \brief output = prod (input_0, input_1, ...) + * \ingroup math_operators_blk + * + * \details + * Multiply across all input streams. + */ class BLOCKS_API multiply_ff : virtual public gr_sync_block { public: diff --git a/gr-blocks/include/blocks/mute_XX.h.t b/gr-blocks/include/blocks/mute_XX.h.t index 2b1c8b9a4d..b9a394df2f 100644 --- a/gr-blocks/include/blocks/mute_XX.h.t +++ b/gr-blocks/include/blocks/mute_XX.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output = input or zero if muted. - * \ingroup level_blk + * \ingroup level_controllers_blk */ class BLOCKS_API @NAME@ : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/nlog10_ff.h b/gr-blocks/include/blocks/nlog10_ff.h index cedd620fa0..7c4dfd8962 100644 --- a/gr-blocks/include/blocks/nlog10_ff.h +++ b/gr-blocks/include/blocks/nlog10_ff.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief output = n*log10(input) + k - * \ingroup math_blk + * \ingroup math_operators_blk */ class BLOCKS_API nlog10_ff : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/not_XX.h.t b/gr-blocks/include/blocks/not_XX.h.t index e406c82dc3..fc06327722 100644 --- a/gr-blocks/include/blocks/not_XX.h.t +++ b/gr-blocks/include/blocks/not_XX.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output = ~input - * \ingroup math_blk + * \ingroup boolean_operators_blk * * bitwise boolean not of input streams. */ diff --git a/gr-blocks/include/blocks/null_sink.h b/gr-blocks/include/blocks/null_sink.h index c13a7552c6..8e772ab61f 100644 --- a/gr-blocks/include/blocks/null_sink.h +++ b/gr-blocks/include/blocks/null_sink.h @@ -33,7 +33,7 @@ namespace gr { /*! * \brief Bit bucket. Use as a termination point when a sink is * required and we don't want to do anything real. - * \ingroup sink_blk + * \ingroup misc_blk */ class BLOCKS_API null_sink : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/null_source.h b/gr-blocks/include/blocks/null_source.h index 904a0c1ba3..fc782c1cb5 100644 --- a/gr-blocks/include/blocks/null_source.h +++ b/gr-blocks/include/blocks/null_source.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief A source of zeros used mainly for testing. - * \ingroup source_blk + * \ingroup misc_blk */ class BLOCKS_API null_source : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/or_XX.h.t b/gr-blocks/include/blocks/or_XX.h.t index 8bc9a080f6..67afe54ea9 100644 --- a/gr-blocks/include/blocks/or_XX.h.t +++ b/gr-blocks/include/blocks/or_XX.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output = input_0 | input_1 | , ... | input_N) - * \ingroup math_blk + * \ingroup boolean_operators_blk * * Bitwise boolean or across all input streams. */ diff --git a/gr-blocks/include/blocks/pack_k_bits_bb.h b/gr-blocks/include/blocks/pack_k_bits_bb.h index 5bf71c9c3e..41ae4bc418 100644 --- a/gr-blocks/include/blocks/pack_k_bits_bb.h +++ b/gr-blocks/include/blocks/pack_k_bits_bb.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief Converts a stream of bytes with 1 bit in the LSB to a * byte with k relevent bits. - * \ingroup converter_blk + * \ingroup byte_operators_blk */ class BLOCKS_API pack_k_bits_bb : virtual public gr_sync_decimator { diff --git a/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t b/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t index 9ab8b8bdfc..f95490f2d5 100644 --- a/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t +++ b/gr-blocks/include/blocks/packed_to_unpacked_XX.h.t @@ -34,8 +34,9 @@ namespace gr { /*! * \brief Convert a stream of packed bytes or shorts to stream of unpacked bytes or shorts. - * \ingroup converter_blk + * \ingroup byte_operators_blk * + * \details * input: stream of @I_TYPE@; output: stream of @O_TYPE@ * * This is the inverse of gr::blocks::unpacked_to_packed_XX. diff --git a/gr-blocks/include/blocks/patterned_interleaver.h b/gr-blocks/include/blocks/patterned_interleaver.h index cfcdac6e73..01e9a0d58f 100644 --- a/gr-blocks/include/blocks/patterned_interleaver.h +++ b/gr-blocks/include/blocks/patterned_interleaver.h @@ -1,3 +1,25 @@ +/* -*- c++ -*- */ +/* + * Copyright 2013 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + #ifndef INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H #define INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H @@ -7,17 +29,26 @@ namespace gr { namespace blocks { + /*! + * \brief Interleave items based on the provided vector \p pattern. + * \ingroup stream_operators_blk + */ class BLOCKS_API patterned_interleaver : virtual public gr_block { public: - typedef boost::shared_ptr<patterned_interleaver> sptr; + /*! + * Make a patterned interleaver block. + * + * \param itemsize stream itemsize + * \param pattern vector that represents the interleaving pattern + */ static sptr make(size_t itemsize, std::vector<int> pattern); }; } } -#endif +#endif /* INCLUDED_BLOCKS_PATTERNED_INTERLEAVER_H */ diff --git a/gr-blocks/include/blocks/pdu_to_tagged_stream.h b/gr-blocks/include/blocks/pdu_to_tagged_stream.h index cf64f41dc2..6a26673149 100644 --- a/gr-blocks/include/blocks/pdu_to_tagged_stream.h +++ b/gr-blocks/include/blocks/pdu_to_tagged_stream.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief Turns received PDUs into a tagged stream of items - * \ingroup source_blk + * \ingroup message_tools_blk */ class BLOCKS_API pdu_to_tagged_stream : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/peak_detector2_fb.h b/gr-blocks/include/blocks/peak_detector2_fb.h index 71afc3287b..aa30d46a04 100644 --- a/gr-blocks/include/blocks/peak_detector2_fb.h +++ b/gr-blocks/include/blocks/peak_detector2_fb.h @@ -31,19 +31,12 @@ namespace gr { /*! * \brief Detect the peak of a signal - * \ingroup level_blk + * \ingroup peak_detectors_blk * + * \details * If a peak is detected, this block outputs a 1, or it outputs * 0's. A separate debug output may be connected, to view the * internal EWMA described below. - * - * \param threshold_factor_rise The threshold factor determins - * when a peak is present. An EWMA average of the signal is - * calculated and when the value of the signal goes over - * threshold_factor_rise*average, we call the peak. - * \param look_ahead The look-ahead value is used when the - * threshold is found to locate the peak within this range. - * \param alpha The gain value of a single-pole moving average filter. */ class BLOCKS_API peak_detector2_fb : virtual public gr_sync_block { @@ -51,6 +44,17 @@ namespace gr { // gr::blocks::peak_detector2_fb::sptr typedef boost::shared_ptr<peak_detector2_fb> sptr; + /*! + * Build a peak detector block with float in, byte out. + * + * \param threshold_factor_rise The threshold factor determins + * when a peak is present. An EWMA average of the signal is + * calculated and when the value of the signal goes over + * threshold_factor_rise*average, we call the peak. + * \param look_ahead The look-ahead value is used when the + * threshold is found to locate the peak within this range. + * \param alpha The gain value of a single-pole moving average filter. + */ static sptr make(float threshold_factor_rise=7, int look_ahead=1000, float alpha=0.001); diff --git a/gr-blocks/include/blocks/peak_detector_XX.h.t b/gr-blocks/include/blocks/peak_detector_XX.h.t index fead53d208..8d42f42ea8 100644 --- a/gr-blocks/include/blocks/peak_detector_XX.h.t +++ b/gr-blocks/include/blocks/peak_detector_XX.h.t @@ -33,8 +33,9 @@ namespace gr { /*! * \brief Detect the peak of a signal - * \ingroup level_blk + * \ingroup peak_detectors_blk * + * \details * If a peak is detected, this block outputs a 1, * or it outputs 0's. */ diff --git a/gr-blocks/include/blocks/plateau_detector_fb.h b/gr-blocks/include/blocks/plateau_detector_fb.h index 041f9c1baf..119262d396 100644 --- a/gr-blocks/include/blocks/plateau_detector_fb.h +++ b/gr-blocks/include/blocks/plateau_detector_fb.h @@ -32,7 +32,9 @@ namespace gr { /*! * \brief Detects a plateau and marks the middle. + * \ingroup peak_detectors_blk * + * \details * Detect a plateau of a-priori known height. Input is a stream of floats, * the output is a stream of bytes. Whenever a plateau is detected, the * middle of that plateau is marked with a '1' on the output stream (all @@ -48,9 +50,6 @@ namespace gr { * * An implicit hysteresis is provided by the fact that after detecting one plateau, * it waits at least max_len samples before the next plateau can be detected. - * - * \ingroup level_blk - * */ class BLOCKS_API plateau_detector_fb : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/probe_rate.h b/gr-blocks/include/blocks/probe_rate.h index 3401d2acd1..fc0b9f29d4 100644 --- a/gr-blocks/include/blocks/probe_rate.h +++ b/gr-blocks/include/blocks/probe_rate.h @@ -31,6 +31,7 @@ namespace gr { /*! * \brief throughput measurement + * \ingroup measurement_tools_blk */ class BLOCKS_API probe_rate : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/probe_signal_X.h.t b/gr-blocks/include/blocks/probe_signal_X.h.t index 01b7bad0c4..fb0d84bb41 100644 --- a/gr-blocks/include/blocks/probe_signal_X.h.t +++ b/gr-blocks/include/blocks/probe_signal_X.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief Sink that allows a sample to be grabbed from Python. - * \ingroup sink_blk + * \ingroup measurement_tools_blk */ class BLOCKS_API @NAME@ : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/probe_signal_vX.h.t b/gr-blocks/include/blocks/probe_signal_vX.h.t index 487f280db4..77462dc658 100644 --- a/gr-blocks/include/blocks/probe_signal_vX.h.t +++ b/gr-blocks/include/blocks/probe_signal_vX.h.t @@ -35,6 +35,7 @@ namespace gr { /*! * \brief Sink that allows a vector of samples to be grabbed from Python. * \ingroup sink_blk + * \ingroup measurement_tools_blk */ class BLOCKS_API @NAME@ : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/regenerate_bb.h b/gr-blocks/include/blocks/regenerate_bb.h index 3063e70a7f..a2cc76737e 100644 --- a/gr-blocks/include/blocks/regenerate_bb.h +++ b/gr-blocks/include/blocks/regenerate_bb.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief Detect the peak of a signal and repeat every period samples - * \ingroup level_blk + * \ingroup stream_operators_blk * + * \details * If a peak is detected, this block outputs a 1 repeated every * period samples until reset by detection of another 1 on the * input or stopped after max_regen regenerations have occurred. diff --git a/gr-blocks/include/blocks/repack_bits_bb.h b/gr-blocks/include/blocks/repack_bits_bb.h index 9ade0a4353..268e4eefc5 100644 --- a/gr-blocks/include/blocks/repack_bits_bb.h +++ b/gr-blocks/include/blocks/repack_bits_bb.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief Pack \p k bits from the input stream onto \p k bits of the output stream. - * \ingroup blocks + * \ingroup byte_operators_blk * + * \details * No bits are lost here; any value for k and l (within [1, 8]) is allowed. * On every fresh input byte, it starts reading on the LSB, and starts copying * to the LSB as well. diff --git a/gr-blocks/include/blocks/repeat.h b/gr-blocks/include/blocks/repeat.h index 3f9f8e6fc2..b353205541 100644 --- a/gr-blocks/include/blocks/repeat.h +++ b/gr-blocks/include/blocks/repeat.h @@ -30,18 +30,21 @@ namespace gr { namespace blocks { /*! - * \brief repeat each input 'interp' times - * \ingroup slicedice_blk - * \param itemsize stream itemsize - * \param interp number of times to repeat + * \brief repeat each input \p repeat times + * \ingroup stream_operators_blk */ class BLOCKS_API repeat : virtual public gr_sync_interpolator { public: - // gr::blocks::repeat::sptr typedef boost::shared_ptr<repeat> sptr; + /*! + * Make a repeat block. + * + * \param itemsize stream itemsize + * \param repeat number of times to repeat the input + */ static sptr make(size_t itemsize, int repeat); }; diff --git a/gr-blocks/include/blocks/rms_cf.h b/gr-blocks/include/blocks/rms_cf.h index e73be6923a..94a17f7a67 100644 --- a/gr-blocks/include/blocks/rms_cf.h +++ b/gr-blocks/include/blocks/rms_cf.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief RMS average power - * \ingroup math_blk + * \ingroup math_operators_blk */ class BLOCKS_API rms_cf : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/rms_ff.h b/gr-blocks/include/blocks/rms_ff.h index 19fb0016d4..e202d79f2c 100644 --- a/gr-blocks/include/blocks/rms_ff.h +++ b/gr-blocks/include/blocks/rms_ff.h @@ -19,6 +19,7 @@ * the Free Software Foundation, Inc., 51 Franklin Street, * Boston, MA 02110-1301, USA. */ + #ifndef INCLUDED_BLOCKS_RMS_FF_H #define INCLUDED_BLOCKS_RMS_FF_H @@ -30,7 +31,7 @@ namespace gr { /*! * \brief RMS average power - * \ingroup math_blk + * \ingroup math_operators_blk */ class BLOCKS_API rms_ff : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/sample_and_hold_XX.h.t b/gr-blocks/include/blocks/sample_and_hold_XX.h.t index 3266523efb..0d2ecdc5d7 100644 --- a/gr-blocks/include/blocks/sample_and_hold_XX.h.t +++ b/gr-blocks/include/blocks/sample_and_hold_XX.h.t @@ -33,8 +33,9 @@ namespace gr { /*! * \brief sample and hold circuit - * \ingroup level_blk + * \ingroup level_controllers_blk * + * \details * Samples the data stream (input stream 0) and holds the value if * the control signal is 1 (intput stream 1). */ diff --git a/gr-blocks/include/blocks/short_to_char.h b/gr-blocks/include/blocks/short_to_char.h index eeb053b0ec..09e784f101 100644 --- a/gr-blocks/include/blocks/short_to_char.h +++ b/gr-blocks/include/blocks/short_to_char.h @@ -30,18 +30,20 @@ namespace gr { namespace blocks { /*! - * \brief Convert stream of shorts to a stream of chars - * \ingroup converter_blk - * - * \param vlen vector length of data streams. + * \brief Convert stream of shorts to a stream of chars. + * \ingroup type_converters_blk */ class BLOCKS_API short_to_char : virtual public gr_sync_block { public: - // gr::blocks::short_to_char_ff::sptr typedef boost::shared_ptr<short_to_char> sptr; + /*! + * Build a short to char block. + * + * \param vlen vector length of data streams. + */ static sptr make(size_t vlen=1); }; diff --git a/gr-blocks/include/blocks/short_to_float.h b/gr-blocks/include/blocks/short_to_float.h index c26addcd01..ec85e892ed 100644 --- a/gr-blocks/include/blocks/short_to_float.h +++ b/gr-blocks/include/blocks/short_to_float.h @@ -31,18 +31,20 @@ namespace gr { /*! * \brief Convert stream of shorts to a stream of floats - * \ingroup converter_blk - * - * \param vlen vector length of data streams. - * \param scale a scalar divider to change the output signal scale. + * \ingroup type_converters_blk */ class BLOCKS_API short_to_float : virtual public gr_sync_block { public: - // gr::blocks::short_to_float_ff::sptr typedef boost::shared_ptr<short_to_float> sptr; + /*! + * Build a short to float block. + * + * \param vlen vector length of data streams. + * \param scale a scalar divider to change the output signal scale. + */ static sptr make(size_t vlen=1, float scale=1.0); /*! diff --git a/gr-blocks/include/blocks/skiphead.h b/gr-blocks/include/blocks/skiphead.h index e6745af8ea..27a8afea92 100644 --- a/gr-blocks/include/blocks/skiphead.h +++ b/gr-blocks/include/blocks/skiphead.h @@ -32,8 +32,9 @@ namespace gr { /*! * \brief skips the first N items, from then on copies items to the output - * \ingroup slicedice_blk + * \ingroup misc_blk * + * \details * Useful for building test cases and sources which have metadata * or junk at the start */ diff --git a/gr-blocks/include/blocks/socket_pdu.h b/gr-blocks/include/blocks/socket_pdu.h index 58d5ad2628..8b3a196607 100644 --- a/gr-blocks/include/blocks/socket_pdu.h +++ b/gr-blocks/include/blocks/socket_pdu.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Creates socket interface and translates traffic to PDUs - * \ingroup net_blk + * \ingroup networking_tools_blk */ class BLOCKS_API socket_pdu : virtual public gr_block { diff --git a/gr-blocks/include/blocks/stream_mux.h b/gr-blocks/include/blocks/stream_mux.h index 58d564f9fe..0e29aab364 100644 --- a/gr-blocks/include/blocks/stream_mux.h +++ b/gr-blocks/include/blocks/stream_mux.h @@ -33,7 +33,9 @@ namespace gr { /*! * \brief Stream muxing block to multiplex many streams into * one with a specified format. + * \ingroup stream_operators_blk * + * \details * Muxes N streams together producing an output stream that * contains N0 items from the first stream, N1 items from the second, * etc. and repeats: @@ -50,7 +52,6 @@ namespace gr { /*! * \brief Creates a stream muxing block to multiplex many streams into * one with a specified format. - * \ingroup converter_blk * * \param itemsize the item size of the stream * \param lengths a vector (list/tuple) specifying the number of diff --git a/gr-blocks/include/blocks/stream_to_streams.h b/gr-blocks/include/blocks/stream_to_streams.h index fc39f1687f..e9b257575f 100644 --- a/gr-blocks/include/blocks/stream_to_streams.h +++ b/gr-blocks/include/blocks/stream_to_streams.h @@ -31,18 +31,24 @@ namespace gr { /*! * \brief convert a stream of items into a N streams of items - * \ingroup slicedice_blk + * \ingroup stream_operators_blk * + * \details * Converts a stream of N items into N streams of 1 item. * Repeat ad infinitum. */ class BLOCKS_API stream_to_streams : virtual public gr_sync_decimator { public: - // gr::blocks::stream_to_streams::sptr typedef boost::shared_ptr<stream_to_streams> sptr; + /*! + * Make a stream-to-streams block. + * + * \param itemsize the item size of the stream + * \param nstreams number of streams to split input into + */ static sptr make(size_t itemsize, size_t nstreams); }; diff --git a/gr-blocks/include/blocks/stream_to_vector.h b/gr-blocks/include/blocks/stream_to_vector.h index 8311eb3506..98325500b1 100644 --- a/gr-blocks/include/blocks/stream_to_vector.h +++ b/gr-blocks/include/blocks/stream_to_vector.h @@ -31,15 +31,20 @@ namespace gr { /*! * \brief convert a stream of items into a stream of blocks containing nitems_per_block - * \ingroup slicedice_blk + * \ingroup stream_operators_blk */ class BLOCKS_API stream_to_vector : virtual public gr_sync_decimator { public: - // gr::blocks::stream_to_vector::sptr typedef boost::shared_ptr<stream_to_vector> sptr; + /*! + * Make a stream-to-vector block. + * + * \param itemsize the item size of the stream + * \param nitems_per_block number of items to but into each vector (vector size) + */ static sptr make(size_t itemsize, size_t nitems_per_block); }; diff --git a/gr-blocks/include/blocks/streams_to_stream.h b/gr-blocks/include/blocks/streams_to_stream.h index 01dcd1be33..e677a18e2a 100644 --- a/gr-blocks/include/blocks/streams_to_stream.h +++ b/gr-blocks/include/blocks/streams_to_stream.h @@ -31,18 +31,24 @@ namespace gr { /*! * \brief Convert N streams of 1 item into a 1 stream of N items - * \ingroup slicedice_blk + * \ingroup stream_operators_blk * + * \details * Convert N streams of 1 item into 1 stream of N items. * Repeat ad infinitum. */ class BLOCKS_API streams_to_stream : virtual public gr_sync_interpolator { public: - // gr::blocks::streams_to_stream::sptr typedef boost::shared_ptr<streams_to_stream> sptr; + /*! + * Make a streams-to-stream block. + * + * \param itemsize the item size of the stream + * \param nstreams number of streams to combine + */ static sptr make(size_t itemsize, size_t nstreams); }; diff --git a/gr-blocks/include/blocks/streams_to_vector.h b/gr-blocks/include/blocks/streams_to_vector.h index ad55ac31f1..f4df16c9f4 100644 --- a/gr-blocks/include/blocks/streams_to_vector.h +++ b/gr-blocks/include/blocks/streams_to_vector.h @@ -31,15 +31,20 @@ namespace gr { /*! * \brief convert N streams of items to 1 stream of vector length N - * \ingroup slicedice_blk + * \ingroup stream_operators_blk */ class BLOCKS_API streams_to_vector : virtual public gr_sync_block { public: - // gr::blocks::streams_to_vector::sptr typedef boost::shared_ptr<streams_to_vector> sptr; + /*! + * Make a stream-to-vector block. + * + * \param itemsize the item size of the stream + * \param nstreams number of streams to combine into a vector (vector size) + */ static sptr make(size_t itemsize, size_t nstreams); }; diff --git a/gr-blocks/include/blocks/stretch_ff.h b/gr-blocks/include/blocks/stretch_ff.h index 5f98452a41..47bcb9ee87 100644 --- a/gr-blocks/include/blocks/stretch_ff.h +++ b/gr-blocks/include/blocks/stretch_ff.h @@ -33,7 +33,7 @@ namespace gr { * \brief adjust y-range of an input vector by mapping to range * (max-of-input, stipulated-min). Primarily for spectral * signature matching by normalizing spectrum dynamic ranges. - * \ingroup misc_blk + * \ingroup stream_operators_blk */ class BLOCKS_API stretch_ff : virtual public gr_sync_block { @@ -43,9 +43,10 @@ namespace gr { /*! * \brief Make a stretch block. + * * \param lo Set low value for range. * \param vlen vector length of input stream. - */ + */ static sptr make(float lo, size_t vlen=1); virtual float lo() const = 0; diff --git a/gr-blocks/include/blocks/sub_XX.h.t b/gr-blocks/include/blocks/sub_XX.h.t index 8202ac54b1..db854346f6 100644 --- a/gr-blocks/include/blocks/sub_XX.h.t +++ b/gr-blocks/include/blocks/sub_XX.h.t @@ -33,8 +33,9 @@ namespace gr { /*! * \brief output = input_0 - input_1 - ...) - * \ingroup math_blk + * \ingroup math_operators_blk * + * \details * Subtract across all input streams. */ class BLOCKS_API @NAME@ : virtual public gr_sync_block diff --git a/gr-blocks/include/blocks/tag_debug.h b/gr-blocks/include/blocks/tag_debug.h index 9d27a26ecd..8093a6152f 100644 --- a/gr-blocks/include/blocks/tag_debug.h +++ b/gr-blocks/include/blocks/tag_debug.h @@ -31,8 +31,11 @@ namespace gr { /*! * \brief Bit bucket that prints out any tag received. - * \ingroup sink_blk + * \ingroup measurement_tools_blk + * \ingroup stream_tag_tools_blk + * \ingroup debug_tools_blk * + * \details * This block collects all tags sent to it on all input ports and * displays them to stdout in a formatted way. The \p name * parameter is used to identify which debug sink generated the diff --git a/gr-blocks/include/blocks/tagged_file_sink.h b/gr-blocks/include/blocks/tagged_file_sink.h index 62da72f789..2014b66964 100644 --- a/gr-blocks/include/blocks/tagged_file_sink.h +++ b/gr-blocks/include/blocks/tagged_file_sink.h @@ -31,8 +31,10 @@ namespace gr { /*! * \brief A file sink that uses tags to save files. - * \ingroup sink_blk + * \ingroup file_operators_blk + * \ingroup stream_tag_tools_blk * + * \details * The sink uses a tag with the key 'burst' to trigger the saving * of the burst data to a new file. If the value of this tag is * True, it will open a new file and start writing all incoming diff --git a/gr-blocks/include/blocks/tagged_stream_mux.h b/gr-blocks/include/blocks/tagged_stream_mux.h index d271cf890f..2fa9b3f01d 100644 --- a/gr-blocks/include/blocks/tagged_stream_mux.h +++ b/gr-blocks/include/blocks/tagged_stream_mux.h @@ -30,8 +30,10 @@ namespace gr { /*! * \brief Combines tagged streams. + * \ingroup stream_operators_blk * - * Takes N streams as input. Each stream is tagged with packet lengths. + * \details + * Takes N streams as input. Each stream is tagged with packet lengths. * Packets are output sequentially from each input stream. * * The output signal has a new length tag, which is the sum of all @@ -39,8 +41,6 @@ namespace gr { * * All other tags are propagated as expected, i.e. they stay associated * with the same input item. - * - * \ingroup blocks */ class BLOCKS_API tagged_stream_mux : virtual public gr_tagged_stream_block { @@ -48,6 +48,8 @@ namespace gr { typedef boost::shared_ptr<tagged_stream_mux> sptr; /*! + * Make a tagged stream mux block. + * * \param itemsize Items size (number of bytes per item) * \param lengthtagname Length tag key */ diff --git a/gr-blocks/include/blocks/tagged_stream_to_pdu.h b/gr-blocks/include/blocks/tagged_stream_to_pdu.h index 32e72a7879..b990c44ab1 100644 --- a/gr-blocks/include/blocks/tagged_stream_to_pdu.h +++ b/gr-blocks/include/blocks/tagged_stream_to_pdu.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief Turns received stream data and tags into PDUs - * \ingroup source_blk + * \ingroup message_tools_blk */ class BLOCKS_API tagged_stream_to_pdu : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/threshold_ff.h b/gr-blocks/include/blocks/threshold_ff.h index 900e5c5bdb..6a20e7ed43 100644 --- a/gr-blocks/include/blocks/threshold_ff.h +++ b/gr-blocks/include/blocks/threshold_ff.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief Output a 1 or zero based on a threshold value. - * \ingroup misc_blk + * \ingroup level_controllers_blk * + * \details * Test the incoming signal against a threshold. If the signal * excedes the \p hi value, it will output a 1 until the signal * falls below the \p lo value. diff --git a/gr-blocks/include/blocks/throttle.h b/gr-blocks/include/blocks/throttle.h index 20d8037e10..d9d9f311c4 100644 --- a/gr-blocks/include/blocks/throttle.h +++ b/gr-blocks/include/blocks/throttle.h @@ -34,6 +34,7 @@ namespace gr { * not exceed samples_per_sec. * \ingroup misc_blk * + * \details * input: one stream of itemsize; output: one stream of itemsize * * N.B. this should only be used in GUI apps where there is no diff --git a/gr-blocks/include/blocks/transcendental.h b/gr-blocks/include/blocks/transcendental.h index f8a0d5d805..a3a483e8f3 100644 --- a/gr-blocks/include/blocks/transcendental.h +++ b/gr-blocks/include/blocks/transcendental.h @@ -32,7 +32,9 @@ namespace gr { /*! * \brief A block that performs various transcendental math operations. + * \ingroup math_operators_blk * + * \details * Possible function names can be found in the cmath library. IO * may be either complex or real, double or single precision. * diff --git a/gr-blocks/include/blocks/tuntap_pdu.h b/gr-blocks/include/blocks/tuntap_pdu.h index 70abb0bd5b..afa03cfb82 100644 --- a/gr-blocks/include/blocks/tuntap_pdu.h +++ b/gr-blocks/include/blocks/tuntap_pdu.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Creates TUNTAP interface and translates traffic to PDUs - * \ingroup net_blk + * \ingroup networking_tools_blk */ class BLOCKS_API tuntap_pdu : virtual public gr_block { diff --git a/gr-blocks/include/blocks/uchar_to_float.h b/gr-blocks/include/blocks/uchar_to_float.h index 033037e498..725c4e5021 100644 --- a/gr-blocks/include/blocks/uchar_to_float.h +++ b/gr-blocks/include/blocks/uchar_to_float.h @@ -31,15 +31,17 @@ namespace gr { /*! * \brief Convert stream of unsigned chars to a stream of floats - * \ingroup converter_blk + * \ingroup type_converters_blk */ class BLOCKS_API uchar_to_float : virtual public gr_sync_block { public: - // gr::blocks::uchar_to_float_ff::sptr typedef boost::shared_ptr<uchar_to_float> sptr; + /*! + * Build a uchar to float block. + */ static sptr make(); }; diff --git a/gr-blocks/include/blocks/udp_sink.h b/gr-blocks/include/blocks/udp_sink.h index 69c5f0ffae..9530217515 100644 --- a/gr-blocks/include/blocks/udp_sink.h +++ b/gr-blocks/include/blocks/udp_sink.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Write stream to an UDP socket. - * \ingroup sink_blk + * \ingroup networking_tools_blk */ class BLOCKS_API udp_sink : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/udp_source.h b/gr-blocks/include/blocks/udp_source.h index b72db30db0..4681b0b54a 100644 --- a/gr-blocks/include/blocks/udp_source.h +++ b/gr-blocks/include/blocks/udp_source.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Read stream from an UDP socket. - * \ingroup source_blk + * \ingroup networking_tools_blk */ class BLOCKS_API udp_source : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/unpack_k_bits_bb.h b/gr-blocks/include/blocks/unpack_k_bits_bb.h index b716ded1d3..a36cfb50e4 100644 --- a/gr-blocks/include/blocks/unpack_k_bits_bb.h +++ b/gr-blocks/include/blocks/unpack_k_bits_bb.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Converts a byte with k relevent bits to k output bytes with 1 bit in the LSB. - * \ingroup converter_blk + * \ingroup byte_operators_blk */ class BLOCKS_API unpack_k_bits_bb : virtual public gr_sync_interpolator { diff --git a/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t b/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t index 749f0e00f9..84f660b845 100644 --- a/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t +++ b/gr-blocks/include/blocks/unpacked_to_packed_XX.h.t @@ -34,8 +34,9 @@ namespace gr { /*! * \brief Convert a stream of unpacked bytes or shorts into a stream of packed bytes or shorts. - * \ingroup converter_blk + * \ingroup byte_operators_blk * + * \details * input: stream of @I_TYPE@; output: stream of @O_TYPE@ * * This is the inverse of gr::blocks::packed_to_unpacked_XX. diff --git a/gr-blocks/include/blocks/vco_f.h b/gr-blocks/include/blocks/vco_f.h index 0a5bf97d1f..7245f4c96b 100644 --- a/gr-blocks/include/blocks/vco_f.h +++ b/gr-blocks/include/blocks/vco_f.h @@ -31,8 +31,10 @@ namespace gr { /*! * \brief VCO - Voltage controlled oscillator - * \ingroup misc + * \ingroup modulators_blk + * \ingroup waveform_generators_blk * + * \details * input: float stream of control voltages; output: float oscillator output */ class BLOCKS_API vco_f : virtual public gr_sync_block diff --git a/gr-blocks/include/blocks/vector_insert_X.h.t b/gr-blocks/include/blocks/vector_insert_X.h.t index aeb4a5248a..c45e5152fa 100644 --- a/gr-blocks/include/blocks/vector_insert_X.h.t +++ b/gr-blocks/include/blocks/vector_insert_X.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief source of @TYPE@'s that gets its data from a vector - * \ingroup source_blk + * \ingroup stream_operators_blk */ class BLOCKS_API @NAME@ : virtual public gr_block { @@ -41,6 +41,13 @@ namespace gr { // gr::blocks::@NAME@::sptr typedef boost::shared_ptr<@NAME@> sptr; + /*! + * Make vector insert block. + * + * \param data vector of data to insert + * \param periodicity number of samples between when to send \p data + * \param offset initial item offset of first insert + */ static sptr make(const std::vector<@TYPE@> &data, int periodicity, int offset=0); diff --git a/gr-blocks/include/blocks/vector_map.h b/gr-blocks/include/blocks/vector_map.h index 64c8744975..77a7fc1865 100644 --- a/gr-blocks/include/blocks/vector_map.h +++ b/gr-blocks/include/blocks/vector_map.h @@ -34,6 +34,7 @@ namespace gr { * \brief Maps elements from a set of input vectors to a set of output vectors. * \ingroup slicedice_blk * + * \details * If in[i] is the input vector in the i'th stream then the output * vector in the j'th stream is: * diff --git a/gr-blocks/include/blocks/vector_sink_X.h.t b/gr-blocks/include/blocks/vector_sink_X.h.t index d15c795721..1d17700f5f 100644 --- a/gr-blocks/include/blocks/vector_sink_X.h.t +++ b/gr-blocks/include/blocks/vector_sink_X.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief @TYPE@ sink that writes to a vector - * \ingroup sink_blk + * \ingroup debug_tools_blk */ class BLOCKS_API @NAME@ : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/vector_source_X.h.t b/gr-blocks/include/blocks/vector_source_X.h.t index c68b638e62..8d3693f3ee 100644 --- a/gr-blocks/include/blocks/vector_source_X.h.t +++ b/gr-blocks/include/blocks/vector_source_X.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief source of @TYPE@'s that gets its data from a vector - * \ingroup source_blk + * \ingroup misc_blk */ class BLOCKS_API @NAME@ : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/vector_to_stream.h b/gr-blocks/include/blocks/vector_to_stream.h index 1e72f6d50b..2a02704287 100644 --- a/gr-blocks/include/blocks/vector_to_stream.h +++ b/gr-blocks/include/blocks/vector_to_stream.h @@ -31,15 +31,20 @@ namespace gr { /*! * \brief convert a stream of blocks of nitems_per_block items into a stream of items - * \ingroup slicedice_blk + * \ingroup stream_operators_blk */ class BLOCKS_API vector_to_stream : virtual public gr_sync_interpolator { public: - // gr::blocks::vector_to_stream::sptr typedef boost::shared_ptr<vector_to_stream> sptr; + /*! + * Make vector-to-stream block + * + * \param itemsize the item size of the stream + * \param nitems_per_block number of items per vector (vector size) + */ static sptr make(size_t itemsize, size_t nitems_per_block); }; diff --git a/gr-blocks/include/blocks/vector_to_streams.h b/gr-blocks/include/blocks/vector_to_streams.h index 1bc0758797..364bc9afbd 100644 --- a/gr-blocks/include/blocks/vector_to_streams.h +++ b/gr-blocks/include/blocks/vector_to_streams.h @@ -31,15 +31,21 @@ namespace gr { /*! * \brief Convert 1 stream of vectors of length N to N streams of items - * \ingroup slicedice_blk + * \ingroup stream_operators_blk */ class BLOCKS_API vector_to_streams : virtual public gr_sync_block { public: - // gr::blocks::vector_to_streams::sptr typedef boost::shared_ptr<vector_to_streams> sptr; + /*! + * Make vector-to-streams block + * + * \param itemsize the item size of the stream + * \param nstreams number of items per vector (vector size and + * number of streams produced) + */ static sptr make(size_t itemsize, size_t nstreams); }; diff --git a/gr-blocks/include/blocks/wavfile.h b/gr-blocks/include/blocks/wavfile.h index 690f8fc22a..b1993fa85a 100644 --- a/gr-blocks/include/blocks/wavfile.h +++ b/gr-blocks/include/blocks/wavfile.h @@ -55,6 +55,7 @@ namespace gr { /*! * \brief Read one sample from an open WAV file at the current position. * + * \details * Takes care of endianness. */ short int @@ -77,6 +78,7 @@ namespace gr { /*! * \brief Write one sample to an open WAV file at the current position. * + * \details * Takes care of endianness. */ void @@ -86,6 +88,7 @@ namespace gr { /*! * \brief Complete a WAV header * + * \details * Note: The stream position is changed during this function. If * anything needs to be written to the WAV file after calling this * function (which shouldn't happen), you need to fseek() to the diff --git a/gr-blocks/include/blocks/wavfile_sink.h b/gr-blocks/include/blocks/wavfile_sink.h index b095191d07..f380e055a2 100644 --- a/gr-blocks/include/blocks/wavfile_sink.h +++ b/gr-blocks/include/blocks/wavfile_sink.h @@ -31,11 +31,11 @@ namespace gr { /*! * \brief Write stream to a Microsoft PCM (.wav) file. + * \ingroup audio_blk * + * \details * Values must be floats within [-1;1]. * Check gr_make_wavfile_sink() for extra info. - * - * \ingroup sink_blk */ class BLOCKS_API wavfile_sink : virtual public gr_sync_block { @@ -44,10 +44,10 @@ namespace gr { typedef boost::shared_ptr<wavfile_sink> sptr; /* - * \p filename The .wav file to be opened - * \p n_channels Number of channels (2 = stereo or I/Q output) - * \p sample_rate Sample rate [S/s] - * \p bits_per_sample 16 or 8 bit, default is 16 + * \param filename The .wav file to be opened + * \param n_channels Number of channels (2 = stereo or I/Q output) + * \param sample_rate Sample rate [S/s] + * \param bits_per_sample 16 or 8 bit, default is 16 */ static sptr make(const char *filename, int n_channels, diff --git a/gr-blocks/include/blocks/wavfile_source.h b/gr-blocks/include/blocks/wavfile_source.h index 46cb82b698..5332a0c20e 100644 --- a/gr-blocks/include/blocks/wavfile_source.h +++ b/gr-blocks/include/blocks/wavfile_source.h @@ -31,11 +31,11 @@ namespace gr { /*! * \brief Read stream from a Microsoft PCM (.wav) file, output floats + * \ingroup audio_blk * + * \details * Unless otherwise called, values are within [-1;1]. * Check gr_make_wavfile_source() for extra info. - * - * \ingroup source_blk */ class BLOCKS_API wavfile_source : virtual public gr_sync_block { diff --git a/gr-blocks/include/blocks/xor_XX.h.t b/gr-blocks/include/blocks/xor_XX.h.t index ba0c508f6e..a890dbaf89 100644 --- a/gr-blocks/include/blocks/xor_XX.h.t +++ b/gr-blocks/include/blocks/xor_XX.h.t @@ -33,7 +33,7 @@ namespace gr { /*! * \brief output = input_0 ^ input_1 ^ , ... ^ input_N) - * \ingroup math_blk + * \ingroup boolean_operators_blk * * Bitwise boolean xor across all input streams. */ diff --git a/gr-digital/doc/digital.dox b/gr-digital/doc/digital.dox index 110dcb677e..2809c6a943 100644 --- a/gr-digital/doc/digital.dox +++ b/gr-digital/doc/digital.dox @@ -11,7 +11,7 @@ imported as: \endcode See the Doxygen documentation for details about the blocks available -in this package. The relevant blocks are listed in the \ref digital group. +in this package. A quick listing of the details can be found in Python after importing by using: diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml index 26c316bfd8..46658b7065 100644 --- a/gr-digital/grc/digital_block_tree.xml +++ b/gr-digital/grc/digital_block_tree.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- - Copyright 2011,2012 Free Software Foundation, Inc. + Copyright 2011-2013 Free Software Foundation, Inc. This file is part of GNU Radio @@ -26,73 +26,100 @@ ################################################### --> <cat> - <name></name> <!-- Blank for Root Name --> - <cat> - <name>Digital</name> - <block>digital_additive_scrambler_bb</block> - <block>digital_binary_slicer_fb</block> - <block>digital_bytes_to_syms</block> - <block>digital_chunks_to_symbols_xx</block> - <block>digital_clock_recovery_mm_xx</block> - <block>digital_cma_equalizer_cc</block> - <block>digital_constellation_decoder_cb</block> - <block>digital_constellation_receiver_cb</block> - <block>digital_correlate_access_code_bb</block> - <block>digital_costas_loop_cc</block> - <block>digital_crc32_bb</block> - <block>digital_descrambler_bb</block> - <block>digital_fll_band_edge_cc</block> - <block>digital_glfsr_source_x</block> - <block>digital_header_payload_demux</block> - <block>digital_kurtotic_equalizer_cc</block> - <block>digital_lms_dd_equalizer_cc</block> - <block>digital_map_bb</block> - <block>digital_mpsk_receiver_cc</block> - <block>digital_mpsk_snr_est_cc</block> - <block>digital_packet_headergenerator_bb</block> - <block>digital_packet_headergenerator_bb_default</block> - <block>digital_packet_headerparser_b</block> - <block>digital_packet_headerparser_b_default</block> - <block>digital_pfb_clock_sync_xxx</block> - <block>digital_pn_correlator_cc</block> - <block>digital_probe_density_b</block> - <block>digital_probe_mpsk_snr_est_c</block> - <block>digital_scrambler_bb</block> - <block>digital_diff_decoder_bb</block> - <block>digital_diff_encoder_bb</block> - <block>digital_diff_phasor_cc</block> - <block>digital_framer_sink_1</block> - <block>digital_packet_sink</block> - <block>digital_simple_framer</block> - <block>digital_simple_correlator</block> - </cat> - <cat> - <name>Digital Modulators</name> - <block>digital_dxpsk_mod</block> - <block>digital_dxpsk_demod</block> - <block>digital_psk_mod</block> - <block>digital_psk_demod</block> - <block>digital_qam_mod</block> - <block>digital_qam_demod</block> - <block>digital_gmskmod_bc</block> - <block>digital_cpmmod_bc</block> - <block>digital_gmsk_mod</block> - <block>digital_gmsk_demod</block> - </cat> - <cat> - <name>OFDM</name> - <block>digital_ofdm_mod</block> - <block>digital_ofdm_mod2</block> - <block>digital_ofdm_demod</block> - <block>digital_ofdm_carrier_allocator_cvc</block> - <block>digital_ofdm_chanest_vcvc</block> - <block>digital_ofdm_cyclic_prefixer</block> - <block>digital_ofdm_frame_acquisition</block> - <block>digital_ofdm_frame_equalizer_vcvc</block> - <block>digital_ofdm_insert_preamble</block> - <block>digital_ofdm_sampler</block> - <block>digital_ofdm_serializer_vcc</block> - <block>digital_ofdm_sync_pn</block> - <block>digital_ofdm_sync_sc_cfb</block> - </cat> + <name></name> <!-- Blank for Root Name --> + <cat> + <name>Coding</name> + <block>digital_additive_scrambler_bb</block> + <block>digital_descrambler_bb</block> + <block>digital_scrambler_bb</block> + </cat> + <cat> + <name>Equalizers</name> + <block>digital_cma_equalizer_cc</block> + <block>digital_lms_dd_equalizer_cc</block> + <block>digital_kurtotic_equalizer_cc</block> + </cat> + <cat> + <name>Measurement Tools</name> + <block>digital_mpsk_snr_est_cc</block> + <block>digital_probe_density_b</block> + <block>digital_probe_mpsk_snr_est_c</block> + </cat> + <cat> + <name>Modulators</name> + <block>digital_cpmmod_bc</block> + <block>digital_dxpsk_mod</block> + <block>digital_dxpsk_demod</block> + <block>digital_gfsk_mod</block> + <block>digital_gfsk_demod</block> + <block>digital_gmskmod_bc</block> + <block>digital_gmsk_mod</block> + <block>digital_gmsk_demod</block> + <block>digital_psk_mod</block> + <block>digital_psk_demod</block> + <block>digital_qam_mod</block> + <block>digital_qam_demod</block> + <block>digital_constellation_receiver_cb</block> + </cat> + <cat> + <name>Packet Operators</name> + <block>digital_correlate_access_code_bb</block> + <block>digital_crc32_bb</block> + <block>digital_framer_sink_1</block> + <block>digital_header_payload_demux</block> + <block>digital_packet_headergenerator_bb</block> + <block>digital_packet_headergenerator_bb_default</block> + <block>digital_packet_headerparser_b</block> + <block>digital_packet_headerparser_b_default</block> + <block>digital_packet_sink</block> + <block>digital_simple_framer</block> + <block>digital_simple_correlator</block> + </cat> + <cat> + <name>OFDM</name> + <block>digital_ofdm_mod</block> + <block>digital_ofdm_mod2</block> + <block>digital_ofdm_demod</block> + <block>digital_ofdm_carrier_allocator_cvc</block> + <block>digital_ofdm_chanest_vcvc</block> + <block>digital_ofdm_cyclic_prefixer</block> + <block>digital_ofdm_frame_acquisition</block> + <block>digital_ofdm_frame_equalizer_vcvc</block> + <block>digital_ofdm_insert_preamble</block> + <block>digital_ofdm_sampler</block> + <block>digital_ofdm_serializer_vcc</block> + <block>digital_ofdm_sync_pn</block> + <block>digital_ofdm_sync_sc_cfb</block> + </cat> + <cat> + <name>Symbol Coding</name> + <block>digital_binary_slicer_fb</block> + <block>digital_bytes_to_syms</block> + <block>digital_chunks_to_symbols_xx</block> + <block>digital_constellation_decoder_cb</block> + <block>digital_constellation_receiver_cb</block> + <block>digital_diff_decoder_bb</block> + <block>digital_diff_encoder_bb</block> + <block>digital_diff_phasor_cc</block> + <block>digital_map_bb</block> + </cat> + <cat> + <name>Synchronizers</name> + <block>digital_clock_recovery_mm_xx</block> + <block>digital_costas_loop_cc</block> + <block>digital_fll_band_edge_cc</block> + <block>digital_mpsk_receiver_cc</block> + <block>digital_pfb_clock_sync_xxx</block> + <block>digital_pn_correlator_cc</block> + </cat> + <cat> + <name>Waveform Generators</name> + <block>digital_glfsr_source_x</block> + </cat> + <cat> + <name>Deprecated</name> + <block>digital_correlate_access_code_bb</block> + <block>digital_simple_framer</block> + <block>digital_simple_correlator</block> + </cat> </cat> diff --git a/gr-digital/grc/digital_ofdm_mod2.xml b/gr-digital/grc/digital_ofdm_mod2.xml index 7de9ff7865..f2f69cd5d6 100644 --- a/gr-digital/grc/digital_ofdm_mod2.xml +++ b/gr-digital/grc/digital_ofdm_mod2.xml @@ -1,7 +1,6 @@ <block> <name>OFDM Mod 2</name> <key>digital_ofdm_mod2</key> - <category>OFDM</category> <import>from gnuradio import digital</import> <make>digital.ofdm_mod2(fft_len=$fft_len, cp_len=$cp_len, diff --git a/gr-digital/grc/digital_packet_headergenerator_bb_default.xml b/gr-digital/grc/digital_packet_headergenerator_bb_default.xml index 645b4cd250..e89c340bf1 100644 --- a/gr-digital/grc/digital_packet_headergenerator_bb_default.xml +++ b/gr-digital/grc/digital_packet_headergenerator_bb_default.xml @@ -1,5 +1,5 @@ <block> - <name>Packet Header Generator</name> + <name>Packet Header Generator (Default)</name> <key>digital_packet_headergenerator_bb_default</key> <import>from gnuradio import digital</import> <make>digital.packet_headergenerator_bb($header_len, $len_tag_key)</make> diff --git a/gr-digital/include/digital/header_payload_demux.h b/gr-digital/include/digital/header_payload_demux.h index 014e0304a2..1427062d77 100644 --- a/gr-digital/include/digital/header_payload_demux.h +++ b/gr-digital/include/digital/header_payload_demux.h @@ -30,8 +30,9 @@ namespace gr { /*! * \brief Header/Payload demuxer. - * \ingroup digital + * \ingroup packet_operators_blk * + * \details * This block is designed to handle packets from a bursty transmission. * Input 0 takes a continuous transmission of samples. * If used, input 1 is a trigger signal. In this case, a 1 on input 1 diff --git a/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h b/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h index 321c58473d..21a976071d 100644 --- a/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h +++ b/gr-digital/include/digital/ofdm_frame_equalizer_vcvc.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief OFDM frame equalizer - * \ingroup ofdm + * \ingroup ofdm_blk * * Performs equalization in one or two dimensions on a tagged OFDM frame. * Input: a tagged series of OFDM symbols. diff --git a/gr-digital/include/digital/packet_header_default.h b/gr-digital/include/digital/packet_header_default.h index d69a0f30a6..793eeb70ee 100644 --- a/gr-digital/include/digital/packet_header_default.h +++ b/gr-digital/include/digital/packet_header_default.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief Default header formatter for digital packet transmission. - * \ingroup digital + * \ingroup packet_operators_blk * + * \details * For bursty/packetized digital transmission, packets are usually prepended * with a packet header, containing the number of bytes etc. * This class is not a block, but a tool to create these packet header. diff --git a/gr-digital/include/digital/packet_headergenerator_bb.h b/gr-digital/include/digital/packet_headergenerator_bb.h index cec860fd55..426f49dee5 100644 --- a/gr-digital/include/digital/packet_headergenerator_bb.h +++ b/gr-digital/include/digital/packet_headergenerator_bb.h @@ -31,8 +31,9 @@ namespace gr { /*! * \brief Generates a header for a tagged, streamed packet. - * \ingroup digital + * \ingroup packet_operators_blk * + * \details * Input: A tagged stream. This is consumed entirely, it is not appended * to the output stream. * Output: An tagged stream containing the header. The details on the header diff --git a/gr-digital/include/digital/packet_headerparser_b.h b/gr-digital/include/digital/packet_headerparser_b.h index 2dc6a80717..cdf76f1209 100644 --- a/gr-digital/include/digital/packet_headerparser_b.h +++ b/gr-digital/include/digital/packet_headerparser_b.h @@ -31,12 +31,14 @@ namespace gr { /*! * \brief Post header metadata as a PMT - * \ingroup digital + * \ingroup packet_operators_blk * + * \details * In a sense, this is the inverse block to packet_headergenerator_bb. * The difference is, the parsed header is not output as a stream, * but as a PMT dictionary, which is published to message port with * the id "header_data". + * * The dictionary consists of the tags created by the header formatter * object. You should be able to use the exact same formatter object * as used on the Tx side in the packet_headergenerator_bb. diff --git a/gr-digital/include/digital_additive_scrambler_bb.h b/gr-digital/include/digital_additive_scrambler_bb.h index f1d0113e96..cb87e059b9 100644 --- a/gr-digital/include/digital_additive_scrambler_bb.h +++ b/gr-digital/include/digital_additive_scrambler_bb.h @@ -34,23 +34,16 @@ digital_make_additive_scrambler_bb(int mask, int seed, int len, int count=0); /*! + * \ingroup coding_blk * Scramble an input stream using an LFSR. This block works on the LSB only * of the input data stream, i.e., on an "unpacked binary" stream, and * produces the same format on its output. * - * \param mask Polynomial mask for LFSR - * \param seed Initial shift register contents - * \param len Shift register length - * \param count Number of bits after which shift register is reset, 0=never - * * The scrambler works by XORing the incoming bit stream by the output of * the LFSR. Optionally, after 'count' bits have been processed, the shift * register is reset to the seed value. This allows processing fixed length * vectors of samples. - * - * \ingroup coding_blk */ - class DIGITAL_API digital_additive_scrambler_bb : public gr_sync_block { friend DIGITAL_API digital_additive_scrambler_bb_sptr @@ -61,6 +54,14 @@ class DIGITAL_API digital_additive_scrambler_bb : public gr_sync_block int d_count; int d_bits; + /*! + * Build an additive scrambler block. + * + * \param mask Polynomial mask for LFSR + * \param seed Initial shift register contents + * \param len Shift register length + * \param count Number of bits after which shift register is reset, 0=never + */ digital_additive_scrambler_bb(int mask, int seed, int len, int count); diff --git a/gr-digital/include/digital_binary_slicer_fb.h b/gr-digital/include/digital_binary_slicer_fb.h index 35a7380fb9..914c7a195d 100644 --- a/gr-digital/include/digital_binary_slicer_fb.h +++ b/gr-digital/include/digital_binary_slicer_fb.h @@ -33,9 +33,9 @@ DIGITAL_API digital_binary_slicer_fb_sptr digital_make_binary_slicer_fb (); /*! * \brief slice float binary symbol outputting 1 bit output - * \ingroup converter_blk - * \ingroup digital + * \ingroup symbol_coding_blk * + * \details * x < 0 --> 0 * x >= 0 --> 1 */ diff --git a/gr-digital/include/digital_bytes_to_syms.h b/gr-digital/include/digital_bytes_to_syms.h index 3062366b95..7b4b4412d0 100644 --- a/gr-digital/include/digital_bytes_to_syms.h +++ b/gr-digital/include/digital_bytes_to_syms.h @@ -32,8 +32,9 @@ DIGITAL_API digital_bytes_to_syms_sptr digital_make_bytes_to_syms(); /*! * \brief Convert stream of bytes to stream of +/- 1 symbols - * \ingroup converter_blk + * \ingroup symbol_coding_blk * + * \details * input: stream of bytes; output: stream of float * * This block is deprecated. diff --git a/gr-digital/include/digital_chunks_to_symbols_XX.h.t b/gr-digital/include/digital_chunks_to_symbols_XX.h.t index 92b7c94d58..dbcd05967a 100644 --- a/gr-digital/include/digital_chunks_to_symbols_XX.h.t +++ b/gr-digital/include/digital_chunks_to_symbols_XX.h.t @@ -36,8 +36,9 @@ digital_make_@BASE_NAME@ (const std::vector<@O_TYPE@> &symbol_table, const int D /*! * \brief Map a stream of symbol indexes (unpacked bytes or shorts) to stream of float or complex constellation points in D dimensions (D = 1 by default) - * \ingroup converter_blk + * \ingroup symbol_coding_blk * + * \details * input: stream of @I_TYPE@; output: stream of @O_TYPE@ * * out[n D + k] = symbol_table[in[n] D + k], k=0,1,...,D-1 diff --git a/gr-digital/include/digital_clock_recovery_mm_cc.h b/gr-digital/include/digital_clock_recovery_mm_cc.h index a2577d5378..b5c125d24e 100644 --- a/gr-digital/include/digital_clock_recovery_mm_cc.h +++ b/gr-digital/include/digital_clock_recovery_mm_cc.h @@ -41,9 +41,9 @@ digital_make_clock_recovery_mm_cc (float omega, float gain_omega, /*! * \brief Mueller and Müller (M&M) based clock recovery block with complex input, complex output. - * \ingroup sync_blk - * \ingroup digital + * \ingroup synchronizers_blk * + * \details * This implements the Mueller and Müller (M&M) discrete-time * error-tracking synchronizer. * diff --git a/gr-digital/include/digital_clock_recovery_mm_ff.h b/gr-digital/include/digital_clock_recovery_mm_ff.h index 36749553fb..bec570be85 100644 --- a/gr-digital/include/digital_clock_recovery_mm_ff.h +++ b/gr-digital/include/digital_clock_recovery_mm_ff.h @@ -41,9 +41,9 @@ digital_make_clock_recovery_mm_ff (float omega, float gain_omega, /*! * \brief Mueller and Müller (M&M) based clock recovery block with float input, float output. - * \ingroup sync_blk - * \ingroup digital + * \ingroup synchronizers_blk * + * \details * This implements the Mueller and Müller (M&M) discrete-time error-tracking synchronizer. * * See "Digital Communication Receivers: Synchronization, Channel diff --git a/gr-digital/include/digital_cma_equalizer_cc.h b/gr-digital/include/digital_cma_equalizer_cc.h index 79e84ca4b3..606f13f9a0 100644 --- a/gr-digital/include/digital_cma_equalizer_cc.h +++ b/gr-digital/include/digital_cma_equalizer_cc.h @@ -36,9 +36,9 @@ digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps); /*! * \brief Implements constant modulus adaptive filter on complex stream - * \ingroup eq_blk - * \ingroup digital + * \ingroup equalizers_blk * + * \details * The error value and tap update equations (for p=2) can be found in: * * "D. Godard, "Self-Recovering Equalization and Carrier Tracking in diff --git a/gr-digital/include/digital_constellation_decoder_cb.h b/gr-digital/include/digital_constellation_decoder_cb.h index cce3a564f3..2f85cc5a0e 100644 --- a/gr-digital/include/digital_constellation_decoder_cb.h +++ b/gr-digital/include/digital_constellation_decoder_cb.h @@ -36,9 +36,7 @@ digital_make_constellation_decoder_cb (digital_constellation_sptr constellation) /*! * \brief Constellation Decoder - * \ingroup coding_blk - * \ingroup digital - * + * \ingroup symbol_coding_blk */ class DIGITAL_API digital_constellation_decoder_cb : public gr_block { diff --git a/gr-digital/include/digital_constellation_receiver_cb.h b/gr-digital/include/digital_constellation_receiver_cb.h index 92c31311f7..264e009515 100644 --- a/gr-digital/include/digital_constellation_receiver_cb.h +++ b/gr-digital/include/digital_constellation_receiver_cb.h @@ -42,10 +42,10 @@ digital_make_constellation_receiver_cb (digital_constellation_sptr constellation /*! * \brief This block does fine-phase and frequency locking and decision making. - * \ingroup sync_blk - * \ingroup demod_blk - * \ingroup digital + * \ingroup symbol_coding_blk + * \ingroup modulators_blk * + * \details * The phase and frequency synchronization are based on a Costas loop * that finds the error of the incoming signal point compared to its * nearest constellation point. The frequency and phase of the NCO are diff --git a/gr-digital/include/digital_correlate_access_code_bb.h b/gr-digital/include/digital_correlate_access_code_bb.h index 8095dd4090..0a7ca50a17 100644 --- a/gr-digital/include/digital_correlate_access_code_bb.h +++ b/gr-digital/include/digital_correlate_access_code_bb.h @@ -39,9 +39,10 @@ digital_make_correlate_access_code_bb (const std::string &access_code, int thres /*! * \brief Examine input for specified access code, one bit at a time. - * \ingroup sync_blk - * \ingroup digital + * \ingroup packet_operators_blk + * \ingroup deprecated_blk * + * \details * input: stream of bits, 1 bit per input byte (data in LSB) * output: stream of bits, 2 bits per output byte (data in LSB, flag in next higher bit) * diff --git a/gr-digital/include/digital_costas_loop_cc.h b/gr-digital/include/digital_costas_loop_cc.h index 4aab22fb45..67cfd6d5a5 100644 --- a/gr-digital/include/digital_costas_loop_cc.h +++ b/gr-digital/include/digital_costas_loop_cc.h @@ -28,13 +28,21 @@ #include <gri_control_loop.h> #include <stdexcept> #include <fstream> +#include <digital_api.h> + +class digital_costas_loop_cc; +typedef boost::shared_ptr<digital_costas_loop_cc> digital_costas_loop_cc_sptr; + +DIGITAL_API digital_costas_loop_cc_sptr +digital_make_costas_loop_cc (float loop_bw, int order + ) throw (std::invalid_argument); /*! * \brief A Costas loop carrier recovery module. - * \ingroup sync_blk - * \ingroup digital + * \ingroup synchronizers_blk * + * \details * The Costas loop locks to the center frequency of a signal and * downconverts it to baseband. The second (order=2) order loop is * used for BPSK where the real part of the output signal is the @@ -49,31 +57,6 @@ * processing, pp. 20-36, 2002. * * http://rfdesign.com/images/archive/0102Feigin20.pdf - * - * \param loop_bw internal 2nd order loop bandwidth (~ 2pi/100) - * \param order the loop order, either 2, 4, or 8 - */ - -#include <digital_api.h> - -class digital_costas_loop_cc; -typedef boost::shared_ptr<digital_costas_loop_cc> digital_costas_loop_cc_sptr; - - -DIGITAL_API digital_costas_loop_cc_sptr -digital_make_costas_loop_cc (float loop_bw, int order - ) throw (std::invalid_argument); - - -/*! - * \brief Carrier tracking PLL for QPSK - * \ingroup sync_blk - * input: complex; output: complex - * <br>The Costas loop can have two output streams: - * stream 1 is the baseband I and Q; - * stream 2 is the normalized frequency of the loop - * - * \p order must be 2, 4, or 8. */ class DIGITAL_API digital_costas_loop_cc : public gr_sync_block, public gri_control_loop { @@ -83,6 +66,16 @@ class DIGITAL_API digital_costas_loop_cc : public gr_sync_block, public gri_cont int d_order; + /*! + * \brief Carrier tracking PLL for QPSK + * input: complex; output: complex + * <br>The Costas loop can have two output streams: + * stream 1 is the baseband I and Q; + * stream 2 is the normalized frequency of the loop + * + * \param loop_bw internal 2nd order loop bandwidth (~ 2pi/100) + * \param order the loop order, either 2, 4, or 8 + */ digital_costas_loop_cc (float loop_bw, int order ) throw (std::invalid_argument); diff --git a/gr-digital/include/digital_cpmmod_bc.h b/gr-digital/include/digital_cpmmod_bc.h index f0f11ee30e..acc304b9c9 100644 --- a/gr-digital/include/digital_cpmmod_bc.h +++ b/gr-digital/include/digital_cpmmod_bc.h @@ -42,25 +42,9 @@ digital_make_cpmmod_bc(int type, float h, /*! * \brief Generic CPM modulator + * \ingroup modulators_blk * - * \ingroup modulation_blk - * \ingroup digital - * - * \param type The modulation type. Can be one of LREC, LRC, LSRC, TFM - * or GAUSSIAN. See gr_cpm::phase_response() for a - * detailed description. - * \param h The modulation index. \f$ h \cdot \pi\f$ is the maximum - * phase change that can occur between two symbols, i.e., if - * you only send ones, the phase will increase by \f$ h \cdot - * \pi\f$ every \p samples_per_sym samples. Set this to 0.5 - * for Minimum Shift Keying variants. - * \param samples_per_sym Samples per symbol. - * \param L The length of the phase duration in symbols. For L=1, this - * yields full- response CPM symbols, for L > 1, - * partial-response. - * \param beta For LSRC, this is the rolloff factor. For Gaussian - * pulses, this is the 3 dB time-bandwidth product. - * + * \details * Examples: * - Setting h = 0.5, L = 1, type = LREC yields MSK. * - Setting h = 0.5, type = GAUSSIAN and beta = 0.3 yields GMSK @@ -85,6 +69,24 @@ class DIGITAL_API digital_cpmmod_bc : public gr_hier_block2 gr_frequency_modulator_fc_sptr d_fm; protected: + /*! + * Build a generic CPM modulator block. + * + * \param type The modulation type. Can be one of LREC, LRC, LSRC, TFM + * or GAUSSIAN. See gr_cpm::phase_response() for a + * detailed description. + * \param h The modulation index. \f$ h \cdot \pi\f$ is the maximum + * phase change that can occur between two symbols, i.e., if + * you only send ones, the phase will increase by \f$ h \cdot + * \pi\f$ every \p samples_per_sym samples. Set this to 0.5 + * for Minimum Shift Keying variants. + * \param samples_per_sym Samples per symbol. + * \param L The length of the phase duration in symbols. For L=1, this + * yields full- response CPM symbols, for L > 1, + * partial-response. + * \param beta For LSRC, this is the rolloff factor. For Gaussian + * pulses, this is the 3 dB time-bandwidth product. + */ digital_cpmmod_bc(gr_cpm::cpm_type type, float h, unsigned samples_per_sym, unsigned L, double beta); diff --git a/gr-digital/include/digital_crc32_bb.h b/gr-digital/include/digital_crc32_bb.h index 1f4771e861..0aae26fad6 100644 --- a/gr-digital/include/digital_crc32_bb.h +++ b/gr-digital/include/digital_crc32_bb.h @@ -34,8 +34,9 @@ DIGITAL_API digital_crc32_bb_sptr digital_make_crc32_bb (bool check=false, const /*! * \brief Byte-stream CRC block - * \ingroup digital + * \ingroup packet_operators_blk * + * \details * Input: stream of bytes, which form a packet. The first byte of the packet * has a tag with key "length" and the value being the number of bytes in the * packet. diff --git a/gr-digital/include/digital_descrambler_bb.h b/gr-digital/include/digital_descrambler_bb.h index d503102a9e..112d9afb32 100644 --- a/gr-digital/include/digital_descrambler_bb.h +++ b/gr-digital/include/digital_descrambler_bb.h @@ -33,17 +33,11 @@ DIGITAL_API digital_descrambler_bb_sptr digital_make_descrambler_bb(int mask, int seed, int len); /*! + * \ingroup coding_blk * Descramble an input stream using an LFSR. This block works on the LSB only * of the input data stream, i.e., on an "unpacked binary" stream, and * produces the same format on its output. - * - * \param mask Polynomial mask for LFSR - * \param seed Initial shift register contents - * \param len Shift register length - * - * \ingroup coding_blk */ - class DIGITAL_API digital_descrambler_bb : public gr_sync_block { friend DIGITAL_API digital_descrambler_bb_sptr @@ -51,6 +45,13 @@ class DIGITAL_API digital_descrambler_bb : public gr_sync_block gr::analog::lfsr d_lfsr; + /*! + * Build a descrambler block. + * + * \param mask Polynomial mask for LFSR + * \param seed Initial shift register contents + * \param len Shift register length + */ digital_descrambler_bb(int mask, int seed, int len); public: diff --git a/gr-digital/include/digital_diff_decoder_bb.h b/gr-digital/include/digital_diff_decoder_bb.h index 928035d0e7..25e5a3fec4 100644 --- a/gr-digital/include/digital_diff_decoder_bb.h +++ b/gr-digital/include/digital_diff_decoder_bb.h @@ -34,8 +34,9 @@ digital_make_diff_decoder_bb(unsigned int modulus); /*! * \brief y[0] = (x[0] - x[-1]) % M - * \ingroup coding_blk + * \ingroup symbol_coding_blk * + * \details * Uses current and previous symbols and the alphabet modulus to * perform differential decoding. */ diff --git a/gr-digital/include/digital_diff_encoder_bb.h b/gr-digital/include/digital_diff_encoder_bb.h index d4be69cadd..4f7d6f0bed 100644 --- a/gr-digital/include/digital_diff_encoder_bb.h +++ b/gr-digital/include/digital_diff_encoder_bb.h @@ -34,8 +34,9 @@ digital_make_diff_encoder_bb(unsigned int modulus); /*! * \brief y[0] = (x[0] + y[-1]) % M - * \ingroup coding_blk + * \ingroup symbol_coding_blk * + * \details * Uses current and previous symbols and the alphabet modulus to * perform differential encoding. */ diff --git a/gr-digital/include/digital_diff_phasor_cc.h b/gr-digital/include/digital_diff_phasor_cc.h index 32a2464b28..f35867fa14 100644 --- a/gr-digital/include/digital_diff_phasor_cc.h +++ b/gr-digital/include/digital_diff_phasor_cc.h @@ -26,21 +26,21 @@ #include <digital_api.h> #include <gr_sync_block.h> +class digital_diff_phasor_cc; +typedef boost::shared_ptr<digital_diff_phasor_cc> digital_diff_phasor_cc_sptr; + +DIGITAL_API digital_diff_phasor_cc_sptr digital_make_diff_phasor_cc(); + /*! * \brief Differential decoding based on phase change. - * \ingroup coding_blk + * \ingroup symbol_coding_blk * + * \details * Uses the phase difference between two symbols to determine the * output symbol: * * out[i] = in[i] * conj(in[i-1]); */ -class digital_diff_phasor_cc; -typedef boost::shared_ptr<digital_diff_phasor_cc> digital_diff_phasor_cc_sptr; - -DIGITAL_API digital_diff_phasor_cc_sptr digital_make_diff_phasor_cc(); - - class DIGITAL_API digital_diff_phasor_cc : public gr_sync_block { friend DIGITAL_API digital_diff_phasor_cc_sptr diff --git a/gr-digital/include/digital_fll_band_edge_cc.h b/gr-digital/include/digital_fll_band_edge_cc.h index 68083bbaeb..906c004813 100644 --- a/gr-digital/include/digital_fll_band_edge_cc.h +++ b/gr-digital/include/digital_fll_band_edge_cc.h @@ -44,10 +44,9 @@ digital_make_fll_band_edge_cc(float samps_per_sym, /*! * \class digital_fll_band_edge_cc * \brief Frequency Lock Loop using band-edge filters + * \ingroup synchronizers_blk * - * \ingroup general - * \ingroup digital - * + * \details * The frequency lock loop derives a band-edge filter that covers the * upper and lower bandwidths of a digitally-modulated signal. The * bandwidth range is determined by the excess bandwidth (e.g., diff --git a/gr-digital/include/digital_framer_sink_1.h b/gr-digital/include/digital_framer_sink_1.h index bb82bf5a73..6edf1a66a5 100644 --- a/gr-digital/include/digital_framer_sink_1.h +++ b/gr-digital/include/digital_framer_sink_1.h @@ -35,8 +35,9 @@ digital_make_framer_sink_1(gr_msg_queue_sptr target_queue); /*! * \brief Given a stream of bits and access_code flags, assemble packets. - * \ingroup sink_blk + * \ingroup packet_operators_blk * + * \details * input: stream of bytes from gr_correlate_access_code_bb * output: none. Pushes assembled packet into target queue * diff --git a/gr-digital/include/digital_glfsr_source_b.h b/gr-digital/include/digital_glfsr_source_b.h index 92e5e81f5c..29d6040d14 100644 --- a/gr-digital/include/digital_glfsr_source_b.h +++ b/gr-digital/include/digital_glfsr_source_b.h @@ -38,14 +38,6 @@ digital_make_glfsr_source_b(int degree, bool repeat=true, /*! * \brief Galois LFSR pseudo-random source * \ingroup source_blk - * - * \param degree Degree of shift register must be in [1, 32]. If mask - * is 0, the degree determines a default mask (see - * digital_impl_glfsr.cc for the mapping). - * \param repeat Set to repeat sequence. - * \param mask Allows a user-defined bit mask for indexes of the shift - * register to feed back. - * \param seed Initial setting for values in shift register. */ class DIGITAL_API digital_glfsr_source_b : public gr_sync_block { @@ -60,6 +52,17 @@ class DIGITAL_API digital_glfsr_source_b : public gr_sync_block unsigned int d_index; unsigned int d_length; + /*! + * Build a Galois LFSR pseudo-random source generating block. + * + * \param degree Degree of shift register must be in [1, 32]. If mask + * is 0, the degree determines a default mask (see + * digital_impl_glfsr.cc for the mapping). + * \param repeat Set to repeat sequence. + * \param mask Allows a user-defined bit mask for indexes of the shift + * register to feed back. + * \param seed Initial setting for values in shift register. + */ digital_glfsr_source_b(int degree, bool repeat, int mask, int seed); diff --git a/gr-digital/include/digital_glfsr_source_f.h b/gr-digital/include/digital_glfsr_source_f.h index 77d7b0f741..eb5e9554b3 100644 --- a/gr-digital/include/digital_glfsr_source_f.h +++ b/gr-digital/include/digital_glfsr_source_f.h @@ -37,15 +37,7 @@ digital_make_glfsr_source_f(int degree, bool repeat=true, /*! * \brief Galois LFSR pseudo-random source generating float outputs -1.0 - 1.0. - * \ingroup source_blk - * - * \param degree Degree of shift register must be in [1, 32]. If mask - * is 0, the degree determines a default mask (see - * digital_impl_glfsr.cc for the mapping). - * \param repeat Set to repeat sequence. - * \param mask Allows a user-defined bit mask for indexes of the shift - * register to feed back. - * \param seed Initial setting for values in shift register. + * \ingroup waveform_generators_blk */ class DIGITAL_API digital_glfsr_source_f : public gr_sync_block { @@ -60,6 +52,17 @@ class DIGITAL_API digital_glfsr_source_f : public gr_sync_block unsigned int d_index; unsigned int d_length; + /*! + * Build a Galois LFSR pseudo-random source generating block. + * + * \param degree Degree of shift register must be in [1, 32]. If mask + * is 0, the degree determines a default mask (see + * digital_impl_glfsr.cc for the mapping). + * \param repeat Set to repeat sequence. + * \param mask Allows a user-defined bit mask for indexes of the shift + * register to feed back. + * \param seed Initial setting for values in shift register. + */ digital_glfsr_source_f(int degree, bool repeat, int mask, int seed); diff --git a/gr-digital/include/digital_gmskmod_bc.h b/gr-digital/include/digital_gmskmod_bc.h index 9f378c8a70..a13cb19aa7 100644 --- a/gr-digital/include/digital_gmskmod_bc.h +++ b/gr-digital/include/digital_gmskmod_bc.h @@ -36,15 +36,9 @@ digital_make_gmskmod_bc(unsigned samples_per_sym=2, /*! * \brief GMSK modulator + * \ingroup modulators_blk * - * \ingroup modulation_blk - * \ingroup digital - * - * \param samples_per_sym Samples per symbol. - * \param bt The 3 dB time-bandwidth product. - * \param L The length of the phase duration in symbols. The Gaussian - * pulse is truncated after L symbols. - * + * \details * The input of this block are symbols from an M-ary alphabet * +/-1, +/-3, ..., +/-(M-1). Usually, M = 2 and therefore, the * valid inputs are +/-1. @@ -55,6 +49,14 @@ class DIGITAL_API digital_gmskmod_bc : public digital_cpmmod_bc { friend DIGITAL_API digital_gmskmod_bc_sptr digital_make_gmskmod_bc(unsigned samples_per_sym, double bt, unsigned L); + /*! + * Build a GMSK modulator block. + * + * \param samples_per_sym Samples per symbol. + * \param bt The 3 dB time-bandwidth product. + * \param L The length of the phase duration in symbols. The Gaussian + * pulse is truncated after L symbols. + */ digital_gmskmod_bc(unsigned samples_per_sym, double bt, unsigned L); }; diff --git a/gr-digital/include/digital_kurtotic_equalizer_cc.h b/gr-digital/include/digital_kurtotic_equalizer_cc.h index fed88c3741..254f92db63 100644 --- a/gr-digital/include/digital_kurtotic_equalizer_cc.h +++ b/gr-digital/include/digital_kurtotic_equalizer_cc.h @@ -36,9 +36,9 @@ digital_make_kurtotic_equalizer_cc(int num_taps, float mu); /*! * \brief Implements a kurtosis-based adaptive equalizer on complex stream - * \ingroup eq_blk - * \ingroup digital + * \ingroup equalizers_blk * + * \details * "Y. Guo, J. Zhao, Y. Sun, "Sign kurtosis maximization based blind * equalization algorithm," IEEE Conf. on Control, Automation, * Robotics and Vision, Vol. 3, Dec. 2004, pp. 2052 - 2057." diff --git a/gr-digital/include/digital_lms_dd_equalizer_cc.h b/gr-digital/include/digital_lms_dd_equalizer_cc.h index 56871fa678..25918ffe19 100644 --- a/gr-digital/include/digital_lms_dd_equalizer_cc.h +++ b/gr-digital/include/digital_lms_dd_equalizer_cc.h @@ -36,9 +36,9 @@ DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (i /*! * \brief Least-Mean-Square Decision Directed Equalizer (complex in/out) - * \ingroup eq_blk - * \ingroup digital + * \ingroup equalizers_blk * + * \details * This block implements an LMS-based decision-directed equalizer. * It uses a set of weights, w, to correlate against the inputs, u, * and a decisions is then made from this output. The error diff --git a/gr-digital/include/digital_map_bb.h b/gr-digital/include/digital_map_bb.h index 4aca66fbe1..047cbceb8d 100644 --- a/gr-digital/include/digital_map_bb.h +++ b/gr-digital/include/digital_map_bb.h @@ -33,8 +33,9 @@ digital_make_map_bb(const std::vector<int> &map); /*! * \brief output[i] = map[input[i]] - * \ingroup coding_blk + * \ingroup symbol_coding_blk * + * \details * This block maps an incoming signal to the value in the map. * The block expects that the incoming signal has a maximum * value of len(map)-1. diff --git a/gr-digital/include/digital_mpsk_receiver_cc.h b/gr-digital/include/digital_mpsk_receiver_cc.h index 1f11a26b64..e883f3757a 100644 --- a/gr-digital/include/digital_mpsk_receiver_cc.h +++ b/gr-digital/include/digital_mpsk_receiver_cc.h @@ -46,10 +46,9 @@ digital_make_mpsk_receiver_cc (unsigned int M, float theta, /*! * \brief This block takes care of receiving M-PSK modulated signals * through phase, frequency, and symbol synchronization. - * \ingroup sync_blk - * \ingroup demod_blk - * \ingroup digital + * \ingroup synchronizers_blk * + * \details * This block takes care of receiving M-PSK modulated signals through * phase, frequency, and symbol synchronization. It performs carrier * frequency and phase locking as well as symbol timing recovery. It @@ -77,9 +76,7 @@ digital_make_mpsk_receiver_cc (unsigned int M, float theta, * optimized decision algorithms for BPSK and QPKS, but 8PSK uses * another brute force computation against all possible symbols. The * modifications to the M&M used here reduce self-noise. - * */ - class DIGITAL_API digital_mpsk_receiver_cc : public gr_block, public gri_control_loop { public: diff --git a/gr-digital/include/digital_mpsk_snr_est_cc.h b/gr-digital/include/digital_mpsk_snr_est_cc.h index 2cbd98bab8..5edba5c418 100644 --- a/gr-digital/include/digital_mpsk_snr_est_cc.h +++ b/gr-digital/include/digital_mpsk_snr_est_cc.h @@ -34,9 +34,10 @@ digital_make_mpsk_snr_est_cc(snr_est_type_t type, int tag_nsamples=10000, double alpha=0.001); -//! \brief A block for computing SNR of a signal. -/*! \ingroup snr_blk +/*! \brief A block for computing SNR of a signal. + * \ingroup measurement_tools_blk * + * \details * This block can be used to monitor and retrieve estimations of the * signal SNR. It is designed to work in a flowgraph and passes all * incoming data along to its output. diff --git a/gr-digital/include/digital_ofdm_chanest_vcvc.h b/gr-digital/include/digital_ofdm_chanest_vcvc.h index 74454a63b2..73516cd506 100644 --- a/gr-digital/include/digital_ofdm_chanest_vcvc.h +++ b/gr-digital/include/digital_ofdm_chanest_vcvc.h @@ -62,7 +62,7 @@ digital_make_ofdm_chanest_vcvc ( /*! * \brief Estimate channel and coarse frequency offset for OFDM from preambles * \ingroup ofdm_blk - * \ingroup sync_blk + * \ingroup syncronizers_blk * * Input: OFDM symbols (in frequency domain). The first one (or two) symbols are expected * to be synchronisation symbols, which are used to estimate the coarse freq offset diff --git a/gr-digital/include/digital_ofdm_equalizer_base.h b/gr-digital/include/digital_ofdm_equalizer_base.h index 178806a886..a8697835f2 100644 --- a/gr-digital/include/digital_ofdm_equalizer_base.h +++ b/gr-digital/include/digital_ofdm_equalizer_base.h @@ -35,7 +35,7 @@ typedef boost::shared_ptr<digital_ofdm_equalizer_1d_pilots> digital_ofdm_equaliz /* \brief Base class for implementation details of frequency-domain OFDM equalizers. * \ingroup ofdm_blk - * \ingroup eq_blk + * \ingroup equalizers_blk * */ class DIGITAL_API digital_ofdm_equalizer_base : public boost::enable_shared_from_this<digital_ofdm_equalizer_base> diff --git a/gr-digital/include/digital_ofdm_equalizer_simpledfe.h b/gr-digital/include/digital_ofdm_equalizer_simpledfe.h index 9fd6395904..b8dec4833e 100644 --- a/gr-digital/include/digital_ofdm_equalizer_simpledfe.h +++ b/gr-digital/include/digital_ofdm_equalizer_simpledfe.h @@ -67,7 +67,7 @@ digital_make_ofdm_equalizer_simpledfe( /* \brief Simple decision feedback equalizer for OFDM. * \ingroup ofdm_blk - * \ingroup eq_blk + * \ingroup equalizers_blk * * Equalizes an OFDM signal symbol by symbol using knowledge of the * complex modulations symbols. diff --git a/gr-digital/include/digital_ofdm_equalizer_static.h b/gr-digital/include/digital_ofdm_equalizer_static.h index 21f76fbc6a..03ffd441e5 100644 --- a/gr-digital/include/digital_ofdm_equalizer_static.h +++ b/gr-digital/include/digital_ofdm_equalizer_static.h @@ -57,7 +57,7 @@ digital_make_ofdm_equalizer_static( /* \brief Very simple static equalizer for OFDM. * \ingroup ofdm_blk - * \ingroup eq_blk + * \ingroup equalizers_blk * * This is an extremely simple equalizer. It will only work for high-SNR, very, very * slowly changing channels. diff --git a/gr-digital/include/digital_ofdm_frame_acquisition.h b/gr-digital/include/digital_ofdm_frame_acquisition.h index 9c2f602334..27920d36e3 100644 --- a/gr-digital/include/digital_ofdm_frame_acquisition.h +++ b/gr-digital/include/digital_ofdm_frame_acquisition.h @@ -39,7 +39,6 @@ DIGITAL_API digital_make_ofdm_frame_acquisition (unsigned int occupied_carriers, /*! * \brief take a vector of complex constellation points in from an FFT * and performs a correlation and equalization. - * \ingroup demodulation_blk * \ingroup ofdm_blk * * This block takes the output of an FFT of a received OFDM symbol and finds the diff --git a/gr-digital/include/digital_ofdm_frame_sink.h b/gr-digital/include/digital_ofdm_frame_sink.h index 5785d4be7b..eb2acb398f 100644 --- a/gr-digital/include/digital_ofdm_frame_sink.h +++ b/gr-digital/include/digital_ofdm_frame_sink.h @@ -39,7 +39,6 @@ digital_make_ofdm_frame_sink (const std::vector<gr_complex> &sym_position, /*! * \brief Takes an OFDM symbol in, demaps it into bits of 0's and 1's, packs * them into packets, and sends to to a message queue sink. - * \ingroup sink_blk * \ingroup ofdm_blk * * NOTE: The mod input parameter simply chooses a pre-defined demapper/slicer. Eventually, diff --git a/gr-digital/include/digital_ofdm_insert_preamble.h b/gr-digital/include/digital_ofdm_insert_preamble.h index fa44558add..5fac6d6023 100644 --- a/gr-digital/include/digital_ofdm_insert_preamble.h +++ b/gr-digital/include/digital_ofdm_insert_preamble.h @@ -35,7 +35,6 @@ digital_make_ofdm_insert_preamble(int fft_length, /*! * \brief insert "pre-modulated" preamble symbols before each payload. - * \ingroup sync_blk * \ingroup ofdm_blk * * <pre> diff --git a/gr-digital/include/digital_ofdm_mapper_bcv.h b/gr-digital/include/digital_ofdm_mapper_bcv.h index daed1eab29..a3b9c3b60f 100644 --- a/gr-digital/include/digital_ofdm_mapper_bcv.h +++ b/gr-digital/include/digital_ofdm_mapper_bcv.h @@ -39,7 +39,6 @@ digital_make_ofdm_mapper_bcv (const std::vector<gr_complex> &constellation, unsi * \brief take a stream of bytes in and map to a vector of complex * constellation points suitable for IFFT input to be used in an ofdm * modulator. Abstract class must be subclassed with specific mapping. - * \ingroup modulation_blk * \ingroup ofdm_blk */ diff --git a/gr-digital/include/digital_ofdm_sync_sc_cfb.h b/gr-digital/include/digital_ofdm_sync_sc_cfb.h index 36ea1b22fd..f58be3df59 100644 --- a/gr-digital/include/digital_ofdm_sync_sc_cfb.h +++ b/gr-digital/include/digital_ofdm_sync_sc_cfb.h @@ -37,8 +37,9 @@ digital_make_ofdm_sync_sc_cfb (int fft_len, int cp_len); /*! * \brief Schmidl & Cox synchronisation for OFDM * \ingroup ofdm_blk - * \ingroup sync_blk + * \ingroup synchronizers_blk * + * \details * Input: complex samples. * Output 0: Fine frequency offset, scaled by the OFDM symbol duration. * This is \f$\hat{\varphi}\f$ in [1]. The normalized frequency diff --git a/gr-digital/include/digital_packet_sink.h b/gr-digital/include/digital_packet_sink.h index 7ab41c0ef7..d9efa8f565 100644 --- a/gr-digital/include/digital_packet_sink.h +++ b/gr-digital/include/digital_packet_sink.h @@ -37,8 +37,9 @@ digital_make_packet_sink(const std::vector<unsigned char>& sync_vector, /*! * \brief process received bits looking for packet sync, header, and process bits into packet - * \ingroup sink_blk + * \ingroup packet_operators_blk * + * \details * input: stream of symbols to be sliced. * * output: none. Pushes assembled packet into target queue @@ -53,10 +54,6 @@ digital_make_packet_sink(const std::vector<unsigned char>& sync_vector, * This block is not very useful anymore as it only works with 2-level * modulations such as BPSK or GMSK. The block can generally be * replaced with a correlate access code and frame sink blocks. - * - * \param sync_vector The synchronization vector as a vector of 1's and 0's. - * \param target_queue The message queue that packets are sent to. - * \param threshold Number of bits that can be incorrect in the \p sync_vector. */ class DIGITAL_API digital_packet_sink : public gr_sync_block { @@ -89,6 +86,13 @@ class DIGITAL_API digital_packet_sink : public gr_sync_block int d_packetlen_cnt; // how many so far protected: + /*! + * Build a packet sink block. + * + * \param sync_vector The synchronization vector as a vector of 1's and 0's. + * \param target_queue The message queue that packets are sent to. + * \param threshold Number of bits that can be incorrect in the \p sync_vector. + */ digital_packet_sink(const std::vector<unsigned char>& sync_vector, gr_msg_queue_sptr target_queue, int threshold); diff --git a/gr-digital/include/digital_pfb_clock_sync_ccf.h b/gr-digital/include/digital_pfb_clock_sync_ccf.h index 1b403ab253..4a7cfc0019 100644 --- a/gr-digital/include/digital_pfb_clock_sync_ccf.h +++ b/gr-digital/include/digital_pfb_clock_sync_ccf.h @@ -40,13 +40,10 @@ digital_make_pfb_clock_sync_ccf(double sps, float loop_bw, class gr_fir_ccf; /*! - * \class digital_pfb_clock_sync_ccf - * * \brief Timing synchronizer using polyphase filterbanks + * \ingroup synchronizers_blk * - * \ingroup filter_blk - * \ingroup pfb_blk - * + * \details * This block performs timing synchronization for PAM signals by * minimizing the derivative of the filtered signal, which in turn * maximizes the SNR and minimizes ISI. diff --git a/gr-digital/include/digital_pfb_clock_sync_fff.h b/gr-digital/include/digital_pfb_clock_sync_fff.h index c7e8babd69..c19ebab0aa 100644 --- a/gr-digital/include/digital_pfb_clock_sync_fff.h +++ b/gr-digital/include/digital_pfb_clock_sync_fff.h @@ -40,13 +40,10 @@ digital_make_pfb_clock_sync_fff(double sps, float gain, class gr_fir_fff; /*! - * \class digital_pfb_clock_sync_fff - * * \brief Timing synchronizer using polyphase filterbanks + * \ingroup synchronizers_blk * - * \ingroup filter_blk - * \ingroup pfb_blk - * + * \details * This block performs timing synchronization for PAM signals by * minimizing the derivative of the filtered signal, which in turn * maximizes the SNR and minimizes ISI. diff --git a/gr-digital/include/digital_pn_correlator_cc.h b/gr-digital/include/digital_pn_correlator_cc.h index 87cc2ff93c..17fa795988 100644 --- a/gr-digital/include/digital_pn_correlator_cc.h +++ b/gr-digital/include/digital_pn_correlator_cc.h @@ -32,10 +32,10 @@ typedef boost::shared_ptr<digital_pn_correlator_cc> digital_pn_correlator_cc_spt DIGITAL_API digital_pn_correlator_cc_sptr digital_make_pn_correlator_cc(int degree, int mask=0, int seed=1); + /*! * \brief PN code sequential search correlator - * - * \ingroup sync_blk + * \ingroup synchronizers_blk * * Receives complex baseband signal, outputs complex correlation * against reference PN code, one sample per PN code period. The PN diff --git a/gr-digital/include/digital_probe_density_b.h b/gr-digital/include/digital_probe_density_b.h index 271ad2a072..65d33afcfa 100644 --- a/gr-digital/include/digital_probe_density_b.h +++ b/gr-digital/include/digital_probe_density_b.h @@ -31,6 +31,8 @@ DIGITAL_API digital_probe_density_b_sptr digital_make_probe_density_b(double alpha); /*! + * \ingroup measurement_tools_blk + * * This block maintains a running average of the input stream and * makes it available as an accessor function. The input stream * is type unsigned char. diff --git a/gr-digital/include/digital_probe_mpsk_snr_est_c.h b/gr-digital/include/digital_probe_mpsk_snr_est_c.h index a78e904124..70e0df6a8f 100644 --- a/gr-digital/include/digital_probe_mpsk_snr_est_c.h +++ b/gr-digital/include/digital_probe_mpsk_snr_est_c.h @@ -34,9 +34,10 @@ digital_make_probe_mpsk_snr_est_c(snr_est_type_t type, int msg_nsamples=10000, double alpha=0.001); -//! \brief A probe for computing SNR of a signal. -/*! \ingroup snr_blk +/*! \brief A probe for computing SNR of a signal. + * \ingroup measurement_tools_blk * + * \details * This is a probe block (a sink) that can be used to monitor and * retrieve estimations of the signal SNR. This probe is designed for * use with M-PSK signals especially. The type of estimator is @@ -61,8 +62,6 @@ class DIGITAL_API digital_probe_mpsk_snr_est_c : public gr_sync_block /*! Factory function returning shared pointer of this class * - * Parameters: - * * \param type: the type of estimator to use \ref ref_snr_est_types * "snr_est_type_t" for details about the available types. * \param msg_nsamples: [not implemented yet] after this many diff --git a/gr-digital/include/digital_scrambler_bb.h b/gr-digital/include/digital_scrambler_bb.h index cafb0e5f2c..c7ae7fa539 100644 --- a/gr-digital/include/digital_scrambler_bb.h +++ b/gr-digital/include/digital_scrambler_bb.h @@ -33,17 +33,11 @@ DIGITAL_API digital_scrambler_bb_sptr digital_make_scrambler_bb(int mask, int seed, int len); /*! + * \ingroup coding_blk * Scramble an input stream using an LFSR. This block works on the LSB only * of the input data stream, i.e., on an "unpacked binary" stream, and * produces the same format on its output. - * - * \param mask Polynomial mask for LFSR - * \param seed Initial shift register contents - * \param len Shift register length - * - * \ingroup coding_blk */ - class DIGITAL_API digital_scrambler_bb : public gr_sync_block { friend DIGITAL_API digital_scrambler_bb_sptr @@ -51,6 +45,13 @@ class DIGITAL_API digital_scrambler_bb : public gr_sync_block gr::analog::lfsr d_lfsr; + /*! + * Build a scrambler block. + * + * \param mask Polynomial mask for LFSR + * \param seed Initial shift register contents + * \param len Shift register length + */ digital_scrambler_bb(int mask, int seed, int len); public: diff --git a/gr-digital/include/digital_simple_correlator.h b/gr-digital/include/digital_simple_correlator.h index 716c6995ca..a8364810c6 100644 --- a/gr-digital/include/digital_simple_correlator.h +++ b/gr-digital/include/digital_simple_correlator.h @@ -33,7 +33,8 @@ DIGITAL_API digital_simple_correlator_sptr digital_make_simple_correlator(int pa /*! * \brief inverse of simple_framer (more or less) - * \ingroup sync_blk + * \ingroup packet_operators_blk + * \ingroup deprecated_blk */ class DIGITAL_API digital_simple_correlator : public gr_block { diff --git a/gr-digital/include/digital_simple_framer.h b/gr-digital/include/digital_simple_framer.h index b622ae5dd4..fcfdad1077 100644 --- a/gr-digital/include/digital_simple_framer.h +++ b/gr-digital/include/digital_simple_framer.h @@ -33,8 +33,10 @@ DIGITAL_API digital_simple_framer_sptr digital_make_simple_framer(int payload_by /*! * \brief add sync field, seq number and command field to payload - * \ingroup sync_blk + * \ingroup packet_operators_blk + * \ingroup deprecated_blk * + * \details * Takes in enough samples to create a full output frame. The frame is * prepended with the GRSF_SYNC (defind in * digital_simple_framer_sync.h) and an 8-bit sequence number. diff --git a/gr-fcd/grc/fcd_source_c.xml b/gr-fcd/grc/fcd_source_c.xml index f1726f88f2..b514c6126c 100644 --- a/gr-fcd/grc/fcd_source_c.xml +++ b/gr-fcd/grc/fcd_source_c.xml @@ -2,7 +2,7 @@ <block> <name>Funcube Dongle Source</name> <key>fcd_source_c</key> - <category>Sources</category> + <category>FCD</category> <throttle>1</throttle> <import>from gnuradio import fcd</import> <make>fcd.source_c($device_name) diff --git a/gr-fcd/include/fcd/fcd_source_c.h b/gr-fcd/include/fcd/fcd_source_c.h index 19c5890231..0fc7bb00d1 100644 --- a/gr-fcd/include/fcd/fcd_source_c.h +++ b/gr-fcd/include/fcd/fcd_source_c.h @@ -31,14 +31,18 @@ typedef boost::shared_ptr<fcd_source_c> fcd_source_c_sptr; /*! * \brief Return a shared_ptr to a new instance of fcd_source_c. * + * \details * This is effectively the public constructor. To avoid accidental use * of raw pointers, fcd_source_c's constructor is private. * fcd_make_source_c is the public interface for creating new instances. */ FCD_API fcd_source_c_sptr fcd_make_source_c(const std::string device_name = ""); -/*! \brief Funcube Dongle source block. +/*! + * \brief Funcube Dongle source block. + * \ingroup fcd_blk * + * \details * This class provides a Funcube Dongle soure block by wrapping the * USB audio interface and the USB HID control interface of the Funcube * Dongle into one convenient source block. diff --git a/gr-fft/grc/fft_block_tree.xml b/gr-fft/grc/fft_block_tree.xml index 3bda77eae1..3a81ee76e9 100644 --- a/gr-fft/grc/fft_block_tree.xml +++ b/gr-fft/grc/fft_block_tree.xml @@ -29,7 +29,7 @@ <cat> <name></name> <!-- Blank for Root Name --> <cat> - <name>FFT</name> + <name>Fourier Analysis</name> <block>fft_vxx</block> <block>goertzel_fc</block> </cat> diff --git a/gr-fft/include/fft/fft_vcc.h b/gr-fft/include/fft/fft_vcc.h index cb07b166d2..2f5b5a23f0 100644 --- a/gr-fft/include/fft/fft_vcc.h +++ b/gr-fft/include/fft/fft_vcc.h @@ -29,6 +29,10 @@ namespace gr { namespace fft { + /*! + * \brief Compute forward or reverse FFT. complex vector in / complex vector out. + * \ingroup fourier_analysis_blk + */ class FFT_API fft_vcc : virtual public gr_sync_block { public: @@ -36,13 +40,9 @@ namespace gr { // gr::fft::fft_vcc::sptr typedef boost::shared_ptr<fft_vcc> sptr; - /*! - * \brief Compute forward or reverse FFT. complex vector in / complex vector out. - * \ingroup dft_blk - */ static sptr make(int fft_size, bool forward, - const std::vector<float> &window, - bool shift=false, int nthreads=1); + const std::vector<float> &window, + bool shift=false, int nthreads=1); virtual void set_nthreads(int n) = 0; diff --git a/gr-fft/include/fft/fft_vfc.h b/gr-fft/include/fft/fft_vfc.h index ec441d66a8..89491113b6 100644 --- a/gr-fft/include/fft/fft_vfc.h +++ b/gr-fft/include/fft/fft_vfc.h @@ -29,6 +29,10 @@ namespace gr { namespace fft { + /*! + * \brief Compute forward or reverse FFT. float vector in / complex vector out. + * \ingroup fourier_analysis_blk + */ class FFT_API fft_vfc : virtual public gr_sync_block { public: @@ -36,10 +40,6 @@ namespace gr { // gr::fft::fft_vfc::sptr typedef boost::shared_ptr<fft_vfc> sptr; - /*! - * \brief Compute forward or reverse FFT. float vector in / complex vector out. - * \ingroup dft_blk - */ static sptr make(int fft_size, bool forward, const std::vector<float> &window, int nthreads=1); diff --git a/gr-fft/include/fft/goertzel_fc.h b/gr-fft/include/fft/goertzel_fc.h index 5b3c8f1c49..26b0d0d11c 100644 --- a/gr-fft/include/fft/goertzel_fc.h +++ b/gr-fft/include/fft/goertzel_fc.h @@ -29,6 +29,10 @@ namespace gr { namespace fft { + /*! + * \brief Goertzel single-bin DFT calculation. + * \ingroup fourier_analysis_blk + */ class FFT_API goertzel_fc : virtual public gr_sync_decimator { public: @@ -36,10 +40,6 @@ namespace gr { // gr::fft::goertzel_fc::sptr typedef boost::shared_ptr<goertzel_fc> sptr; - /*! - * \brief Goertzel single-bin DFT calculation. - * \ingroup dft_blk - */ static sptr make(int rate, int len, float freq); virtual void set_freq (float freq) = 0; diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 711ce4059f..e6347c269c 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -34,18 +34,27 @@ <block>fft_filter_xxx</block> <block>fir_filter_xxx</block> <block>filter_delay_fc</block> - <block>fractional_interpolator_xx</block> - <block>freq_xlating_fir_filter_xxx</block> <block>hilbert_fc</block> <block>iir_filter_ffd</block> <block>interp_fir_filter_xxx</block> + <block>single_pole_iir_filter_xx</block> + </cat> + <cat> + <name>Resamplers</name> + <block>fractional_interpolator_xx</block> <block>pfb_arb_resampler_xxx</block> + <block>rational_resampler_base_xxx</block> + </cat> + <cat> + <name>Channelizers</name> + <block>freq_xlating_fir_filter_xxx</block> <block>pfb_channelizer_ccf</block> <block>pfb_decimator_ccf</block> <block>pfb_interpolator_ccf</block> <block>pfb_synthesizer_ccf</block> - <block>rational_resampler_base_xxx</block> - <block>single_pole_iir_filter_xx</block> + </cat> + <cat> + <name>Channel Models</name> <block>channel_model</block> </cat> </cat> diff --git a/gr-filter/include/filter/adaptive_fir_ccc.h b/gr-filter/include/filter/adaptive_fir_ccc.h index 261259957f..e1eaf460ad 100644 --- a/gr-filter/include/filter/adaptive_fir_ccc.h +++ b/gr-filter/include/filter/adaptive_fir_ccc.h @@ -34,6 +34,7 @@ namespace gr { * \brief Adaptive FIR filter with gr_complex input, gr_complex output and gr_complex taps * \ingroup filter_blk * + * \details * This is a base class to implement an adaptive FIR * filter. Generally, another block will inherit from this one to * build a new type of adaptive filter such as an equalizer. diff --git a/gr-filter/include/filter/adaptive_fir_ccf.h b/gr-filter/include/filter/adaptive_fir_ccf.h index 0fd8d5746a..e296e42df1 100644 --- a/gr-filter/include/filter/adaptive_fir_ccf.h +++ b/gr-filter/include/filter/adaptive_fir_ccf.h @@ -33,6 +33,7 @@ namespace gr { * \brief Adaptive FIR filter with gr_complex input, gr_complex output and float taps * \ingroup filter_blk * + * \details * This is a base class to implement an adaptive FIR * filter. Generally, another block will inherit from this one to * build a new type of adaptive filter such as an equalizer. diff --git a/gr-filter/include/filter/channel_model.h b/gr-filter/include/filter/channel_model.h index 49c08181f7..47729ee5ab 100644 --- a/gr-filter/include/filter/channel_model.h +++ b/gr-filter/include/filter/channel_model.h @@ -32,8 +32,9 @@ namespace gr { /*! * \brief channel simulator - * \ingroup misc_blk + * \ingroup channel_models_blk * + * \details * This block implements a basic channel model simulator that can * be used to help evaluate, design, and test various signals, * waveforms, and algorithms. This model allows the user to set diff --git a/gr-filter/include/filter/dc_blocker_cc.h b/gr-filter/include/filter/dc_blocker_cc.h index df4c815d60..5ef75b48e4 100644 --- a/gr-filter/include/filter/dc_blocker_cc.h +++ b/gr-filter/include/filter/dc_blocker_cc.h @@ -29,6 +29,31 @@ namespace gr { namespace filter { + /*! + * \brief a computationally efficient controllable DC blocker + * \ingroup filter_blk + * + * \details + * This block implements a computationally efficient DC blocker that produces + * a tighter notch filter around DC for a smaller group delay than an + * equivalent FIR filter or using a single pole IIR filter (though the IIR + * filter is computationally cheaper). + * + * The block defaults to using a delay line of length 32 and the long form + * of the filter. Optionally, the delay line length can be changed to alter + * the width of the DC notch (longer lines will decrease the width). + * + * The long form of the filter produces a nearly flat response outside of + * the notch but at the cost of a group delay of 2D-2. + * + * The short form of the filter does not have as flat a response in the + * passband but has a group delay of only D-1 and is cheaper to compute. + * + * The theory behind this block can be found in the paper: + * + * <B><EM>R. Yates, "DC Blocker Algorithms," IEEE Signal Processing Magazine, + * Mar. 2008, pp 132-134.</EM></B> + */ class FILTER_API dc_blocker_cc : virtual public gr_sync_block { public: @@ -37,30 +62,7 @@ namespace gr { typedef boost::shared_ptr<dc_blocker_cc> sptr; /*! - * \class dc_blocker_cc - * \brief a computationally efficient controllable DC blocker - * - * \ingroup filter_blk - * - * This block implements a computationally efficient DC blocker that produces - * a tighter notch filter around DC for a smaller group delay than an - * equivalent FIR filter or using a single pole IIR filter (though the IIR - * filter is computationally cheaper). - * - * The block defaults to using a delay line of length 32 and the long form - * of the filter. Optionally, the delay line length can be changed to alter - * the width of the DC notch (longer lines will decrease the width). - * - * The long form of the filter produces a nearly flat response outside of - * the notch but at the cost of a group delay of 2D-2. - * - * The short form of the filter does not have as flat a response in the - * passband but has a group delay of only D-1 and is cheaper to compute. - * - * The theory behind this block can be found in the paper: - * - * <B><EM>R. Yates, "DC Blocker Algorithms," IEEE Signal Processing Magazine, - * Mar. 2008, pp 132-134.</EM></B> + * Make a DC blocker block. * * \param D (int) the length of the delay line * \param long_form (bool) whether to use long (true, default) or short form diff --git a/gr-filter/include/filter/dc_blocker_ff.h b/gr-filter/include/filter/dc_blocker_ff.h index 6ab4d5a3de..64f134e1ab 100644 --- a/gr-filter/include/filter/dc_blocker_ff.h +++ b/gr-filter/include/filter/dc_blocker_ff.h @@ -29,6 +29,34 @@ namespace gr { namespace filter { + /*! + * \brief a computationally efficient controllable DC blocker + * \ingroup filter_blk + * + * \details + * This block implements a computationally efficient DC blocker + * that produces a tighter notch filter around DC for a smaller + * group delay than an equivalent FIR filter or using a single + * pole IIR filter (though the IIR filter is computationally + * cheaper). + * + * The block defaults to using a delay line of length 32 and the + * long form of the filter. Optionally, the delay line length can + * be changed to alter the width of the DC notch (longer lines + * will decrease the width). + * + * The long form of the filter produces a nearly flat response + * outside of the notch but at the cost of a group delay of 2D-2. + * + * The short form of the filter does not have as flat a response + * in the passband but has a group delay of only D-1 and is + * cheaper to compute. + * + * The theory behind this block can be found in the paper: + * + * <B><EM>R. Yates, "DC Blocker Algorithms," IEEE Signal Processing Magazine, + * Mar. 2008, pp 132-134.</EM></B> + */ class FILTER_API dc_blocker_ff : virtual public gr_sync_block { public: @@ -37,30 +65,7 @@ namespace gr { typedef boost::shared_ptr<dc_blocker_ff> sptr; /*! - * \class dc_blocker_ff - * \brief a computationally efficient controllable DC blocker - * - * \ingroup filter_blk - * - * This block implements a computationally efficient DC blocker that produces - * a tighter notch filter around DC for a smaller group delay than an - * equivalent FIR filter or using a single pole IIR filter (though the IIR - * filter is computationally cheaper). - * - * The block defaults to using a delay line of length 32 and the long form - * of the filter. Optionally, the delay line length can be changed to alter - * the width of the DC notch (longer lines will decrease the width). - * - * The long form of the filter produces a nearly flat response outside of - * the notch but at the cost of a group delay of 2D-2. - * - * The short form of the filter does not have as flat a response in the - * passband but has a group delay of only D-1 and is cheaper to compute. - * - * The theory behind this block can be found in the paper: - * - * <B><EM>R. Yates, "DC Blocker Algorithms," IEEE Signal Processing Magazine, - * Mar. 2008, pp 132-134.</EM></B> + * Make a DC blocker block. * * \param D (int) the length of the delay line * \param long_form (bool) whether to use long (true, default) or short form diff --git a/gr-filter/include/filter/fft_filter.h b/gr-filter/include/filter/fft_filter.h index 8c7d6cf786..8bab289dac 100644 --- a/gr-filter/include/filter/fft_filter.h +++ b/gr-filter/include/filter/fft_filter.h @@ -31,6 +31,7 @@ namespace gr { namespace filter { namespace kernel { + /*! * \brief Fast FFT filter with float input, float output and float taps * \ingroup filter_blk diff --git a/gr-filter/include/filter/fft_filter_ccc.h b/gr-filter/include/filter/fft_filter_ccc.h index acec932775..38fef07f94 100644 --- a/gr-filter/include/filter/fft_filter_ccc.h +++ b/gr-filter/include/filter/fft_filter_ccc.h @@ -29,6 +29,29 @@ namespace gr { namespace filter { + /*! + * \brief Fast FFT filter with gr_complex input, gr_complex output and gr_complex taps + * \ingroup filter_blk + * + * \details + * This block implements a complex decimating filter using the + * fast convolution method via an FFT. The decimation factor is an + * interger that is greater than or equal to 1. + * + * The filter takes a set of complex (or real) taps to use in the + * filtering operation. These taps can be defined as anything that + * satisfies the user's filtering needs. For standard filters such + * as lowpass, highpass, bandpass, etc., the filter.firdes and + * filter.optfir classes provide convenient generating methods. + * + * This filter is implemented by using the FFTW package to perform + * the required FFTs. An optional argument, nthreads, may be + * passed to the constructor (or set using the set_nthreads member + * function) to split the FFT among N number of threads. This can + * improve performance on very large FFTs (that is, if the number + * of taps used is very large) if you have enough threads/cores to + * support it. + */ class FILTER_API fft_filter_ccc : virtual public gr_sync_decimator { public: @@ -36,35 +59,15 @@ namespace gr { typedef boost::shared_ptr<fft_filter_ccc> sptr; /*! - * \brief Fast FFT filter with gr_complex input, gr_complex output and gr_complex taps - * \ingroup filter_blk - * - * This block implements a complex decimating filter using the - * fast convolution method via an FFT. The decimation factor is - * an interger that is greater than or equal to 1. - * - * The filter takes a set of complex (or real) taps to use in - * the filtering operation. These taps can be defined as - * anything that satisfies the user's filtering needs. For - * standard filters such as lowpass, highpass, bandpass, etc., - * the filter.firdes and filter.optfir classes provide - * convenient generating methods. - * - * This filter is implemented by using the FFTW package to - * perform the required FFTs. An optional argument, nthreads, - * may be passed to the constructor (or set using the - * set_nthreads member function) to split the FFT among N number - * of threads. This can improve performance on very large FFTs - * (that is, if the number of taps used is very large) if you - * have enough threads/cores to support it. + * Build an FFT filter blocks. * * \param decimation >= 1 * \param taps complex filter taps * \param nthreads number of threads for the FFT to use */ static sptr make(int decimation, - const std::vector<gr_complex> &taps, - int nthreads=1); + const std::vector<gr_complex> &taps, + int nthreads=1); virtual void set_taps(const std::vector<gr_complex> &taps) = 0; virtual std::vector<gr_complex> taps() const = 0; diff --git a/gr-filter/include/filter/fft_filter_fff.h b/gr-filter/include/filter/fft_filter_fff.h index d8140325f2..0183234380 100644 --- a/gr-filter/include/filter/fft_filter_fff.h +++ b/gr-filter/include/filter/fft_filter_fff.h @@ -29,6 +29,29 @@ namespace gr { namespace filter { + /*! + * \brief Fast FFT filter with float input, float output and float taps + * \ingroup filter_blk + * + * \details + * This block implements a real-value decimating filter using the + * fast convolution method via an FFT. The decimation factor is an + * interger that is greater than or equal to 1. + * + * The filter takes a set of real-valued taps to use in the + * filtering operation. These taps can be defined as anything that + * satisfies the user's filtering needs. For standard filters such + * as lowpass, highpass, bandpass, etc., the filter.firdes and + * filter.optfir classes provide convenient generating methods. + * + * This filter is implemented by using the FFTW package to perform + * the required FFTs. An optional argument, nthreads, may be + * passed to the constructor (or set using the set_nthreads member + * function) to split the FFT among N number of threads. This can + * improve performance on very large FFTs (that is, if the number + * of taps used is very large) if you have enough threads/cores to + * support it. + */ class FILTER_API fft_filter_fff : virtual public gr_sync_decimator { public: @@ -36,35 +59,15 @@ namespace gr { typedef boost::shared_ptr<fft_filter_fff> sptr; /*! - * \brief Fast FFT filter with float input, float output and float taps - * \ingroup filter_blk - * - * This block implements a real-value decimating filter using - * the fast convolution method via an FFT. The decimation factor - * is an interger that is greater than or equal to 1. - * - * The filter takes a set of real-valued taps to use in - * the filtering operation. These taps can be defined as - * anything that satisfies the user's filtering needs. For - * standard filters such as lowpass, highpass, bandpass, etc., - * the filter.firdes and filter.optfir classes provide - * convenient generating methods. - * - * This filter is implemented by using the FFTW package to - * perform the required FFTs. An optional argument, nthreads, - * may be passed to the constructor (or set using the - * set_nthreads member function) to split the FFT among N number - * of threads. This can improve performance on very large FFTs - * (that is, if the number of taps used is very large) if you - * have enough threads/cores to support it. + * Build an FFT filter block. * * \param decimation >= 1 * \param taps float filter taps * \param nthreads number of threads for the FFT to use */ static sptr make(int decimation, - const std::vector<float> &taps, - int nthreads=1); + const std::vector<float> &taps, + int nthreads=1); virtual void set_taps(const std::vector<float> &taps) = 0; virtual std::vector<float> taps() const = 0; diff --git a/gr-filter/include/filter/filter_delay_fc.h b/gr-filter/include/filter/filter_delay_fc.h index 8a84a6a0e5..1d2222a830 100644 --- a/gr-filter/include/filter/filter_delay_fc.h +++ b/gr-filter/include/filter/filter_delay_fc.h @@ -29,6 +29,26 @@ namespace gr { namespace filter { + /*! + * \brief Filter-Delay Combination Block. + * \ingroup filter_blk + * + * \details + * The block takes one or two float stream and outputs a complex + * stream. + * + * If only one float stream is input, the real output is a delayed + * version of this input and the imaginary output is the filtered + * output. + * + * If two floats are connected to the input, then the real output + * is the delayed version of the first input, and the imaginary + * output is the filtered output. + * + * The delay in the real path accounts for the group delay + * introduced by the filter in the imaginary path. The filter taps + * needs to be calculated before initializing this block. + */ class FILTER_API filter_delay_fc : virtual public gr_sync_block { public: @@ -37,24 +57,7 @@ namespace gr { typedef boost::shared_ptr<filter_delay_fc> sptr; /*! - * \brief Filter-Delay Combination Block. - * \ingroup filter_blk - * - * The block takes one or two float stream and outputs a complex - * stream. - * - * If only one float stream is input, the real output is a - * delayed version of this input and the imaginary output is the - * filtered output. - * - * If two floats are connected to the input, then the real - * output is the delayed version of the first input, and the - * imaginary output is the filtered output. - * - * The delay in the real path accounts for the group delay - * introduced by the filter in the imaginary path. The filter - * taps needs to be calculated before initializing this block. - * + * Build a filter with delay block. */ static sptr make(const std::vector<float> &taps); }; diff --git a/gr-filter/include/filter/fir_filter_XXX.h.t b/gr-filter/include/filter/fir_filter_XXX.h.t index 98e82f510d..0621bd978c 100644 --- a/gr-filter/include/filter/fir_filter_XXX.h.t +++ b/gr-filter/include/filter/fir_filter_XXX.h.t @@ -35,6 +35,7 @@ namespace gr { * \brief FIR filter with @I_TYPE@ input, @O_TYPE@ output, and @TAP_TYPE@ taps * \ingroup filter_blk * + * \details * The fir_filter_XXX blocks create finite impulse response * (FIR) filters that perform the convolution in the time * domain: @@ -53,7 +54,6 @@ namespace gr { * These versions of the filter can also act as down-samplers * (or decimators) by specifying an integer value for \p * decimation. - * */ class FILTER_API @BASE_NAME@ : virtual public gr_sync_decimator { @@ -64,13 +64,12 @@ namespace gr { /*! * \brief FIR filter with @I_TYPE@ input, @O_TYPE@ output, and @TAP_TYPE@ taps - * \ingroup filter_blk * * \param decimation set the integer decimation rate * \param taps a vector/list of taps of type @TAP_TYPE@ */ static sptr make(int decimation, - const std::vector<@TAP_TYPE@> &taps); + const std::vector<@TAP_TYPE@> &taps); virtual void set_taps(const std::vector<@TAP_TYPE@> &taps) = 0; virtual std::vector<@TAP_TYPE@> taps() const = 0; diff --git a/gr-filter/include/filter/fractional_interpolator_cc.h b/gr-filter/include/filter/fractional_interpolator_cc.h index bb0e18932e..90060817fc 100644 --- a/gr-filter/include/filter/fractional_interpolator_cc.h +++ b/gr-filter/include/filter/fractional_interpolator_cc.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Interpolating MMSE filter with complex input, complex output - * \ingroup filter_blk + * \ingroup resamplers_blk */ class FILTER_API fractional_interpolator_cc : virtual public gr_block { diff --git a/gr-filter/include/filter/fractional_interpolator_ff.h b/gr-filter/include/filter/fractional_interpolator_ff.h index fc43c34570..131e9e541d 100644 --- a/gr-filter/include/filter/fractional_interpolator_ff.h +++ b/gr-filter/include/filter/fractional_interpolator_ff.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief Interpolating MMSE filter with float input, float output - * \ingroup filter_blk + * \ingroup resamplers_blk */ class FILTER_API fractional_interpolator_ff : virtual public gr_block { diff --git a/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t b/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t index 88e15f823d..7787db2b5c 100644 --- a/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t +++ b/gr-filter/include/filter/freq_xlating_fir_filter_XXX.h.t @@ -40,7 +40,7 @@ namespace gr { * \brief FIR filter combined with frequency translation with * @I_TYPE@ input, @O_TYPE@ output and @TAP_TYPE@ taps * - * \ingroup filter_blk + * \ingroup channelizers_blk * * This class efficiently combines a frequency translation * (typically "down conversion") with a FIR filter (typically diff --git a/gr-filter/include/filter/hilbert_fc.h b/gr-filter/include/filter/hilbert_fc.h index de7cd82b69..c0973415f3 100644 --- a/gr-filter/include/filter/hilbert_fc.h +++ b/gr-filter/include/filter/hilbert_fc.h @@ -30,6 +30,15 @@ namespace gr { namespace filter { + /*! + * \brief Hilbert transformer. + * \ingroup filter_blk + * + * \details + * real output is input appropriately delayed. + * imaginary output is hilbert filtered (90 degree phase shift) + * version of input. + */ class FILTER_API hilbert_fc : virtual public gr_sync_block { public: @@ -37,12 +46,7 @@ namespace gr { typedef boost::shared_ptr<hilbert_fc> sptr; /*! - * \brief Hilbert transformer. - * \ingroup filter_blk - * - * real output is input appropriately delayed. - * imaginary output is hilbert filtered (90 degree phase shift) - * version of input. + * Build a Hilbert transformer filter block. */ static sptr make(unsigned int ntaps); }; diff --git a/gr-filter/include/filter/iir_filter_ffd.h b/gr-filter/include/filter/iir_filter_ffd.h index 04dd1e7767..ef5302038d 100644 --- a/gr-filter/include/filter/iir_filter_ffd.h +++ b/gr-filter/include/filter/iir_filter_ffd.h @@ -33,6 +33,7 @@ namespace gr { * \brief IIR filter with float input, float output and double taps * \ingroup filter_blk * + * \details * This filter uses the Direct Form I implementation, where * \p fftaps contains the feed-forward taps, and \p fbtaps the feedback ones. * @@ -70,7 +71,7 @@ namespace gr { typedef boost::shared_ptr<iir_filter_ffd> sptr; static sptr make(const std::vector<double> &fftaps, - const std::vector<double> &fbtaps); + const std::vector<double> &fbtaps); virtual void set_taps(const std::vector<double> &fftaps, const std::vector<double> &fbtaps) = 0; diff --git a/gr-filter/include/filter/interp_fir_filter_XXX.h.t b/gr-filter/include/filter/interp_fir_filter_XXX.h.t index b66c9f6439..7deb269e3a 100644 --- a/gr-filter/include/filter/interp_fir_filter_XXX.h.t +++ b/gr-filter/include/filter/interp_fir_filter_XXX.h.t @@ -35,6 +35,7 @@ namespace gr { * \brief Interpolating FIR filter with @I_TYPE@ input, @O_TYPE@ output and @TAP_TYPE@ taps * \ingroup filter_blk * + * \details * The fir_filter_XXX blocks create finite impulse response * (FIR) filters that perform the convolution in the time * domain: @@ -63,7 +64,6 @@ namespace gr { /*! * \brief Interpolating FIR filter with @I_TYPE@ input, @O_TYPE@ output, and @TAP_TYPE@ taps - * \ingroup filter_blk * * \param interpolation set the integer interpolation rate * \param taps a vector/list of taps of type @TAP_TYPE@ diff --git a/gr-filter/include/filter/mmse_fir_interpolator_cc.h b/gr-filter/include/filter/mmse_fir_interpolator_cc.h index 0436b4a0ff..0af52be552 100644 --- a/gr-filter/include/filter/mmse_fir_interpolator_cc.h +++ b/gr-filter/include/filter/mmse_fir_interpolator_cc.h @@ -34,6 +34,7 @@ namespace gr { * \brief Compute intermediate samples between signal samples x(k*Ts) * \ingroup filter_primitive * + * \details * This implements a Mininum Mean Squared Error interpolator with * 8 taps. It is suitable for signals where the bandwidth of * interest B = 1/(4*Ts) Where Ts is the time between samples. @@ -46,7 +47,6 @@ namespace gr { * \li gnuradio-core/src/gen_interpolator_taps/README * \li gnuradio-core/src/gen_interpolator_taps/praxis.txt */ - class FILTER_API mmse_fir_interpolator_cc { public: diff --git a/gr-filter/include/filter/mmse_fir_interpolator_ff.h b/gr-filter/include/filter/mmse_fir_interpolator_ff.h index 4353aa94f1..c10fad3be1 100644 --- a/gr-filter/include/filter/mmse_fir_interpolator_ff.h +++ b/gr-filter/include/filter/mmse_fir_interpolator_ff.h @@ -34,6 +34,7 @@ namespace gr { * \brief Compute intermediate samples between signal samples x(k*Ts) * \ingroup filter_primitive * + * \details * This implements a Mininum Mean Squared Error interpolator with * 8 taps. It is suitable for signals where the bandwidth of * interest B = 1/(4*Ts) Where Ts is the time between samples. diff --git a/gr-filter/include/filter/pfb_arb_resampler_ccf.h b/gr-filter/include/filter/pfb_arb_resampler_ccf.h index a154e055a0..1adf511a14 100644 --- a/gr-filter/include/filter/pfb_arb_resampler_ccf.h +++ b/gr-filter/include/filter/pfb_arb_resampler_ccf.h @@ -31,14 +31,11 @@ namespace gr { namespace filter { /*! - * \class pfb_arb_resampler_ccf - * * \brief Polyphase filterbank arbitrary resampler with * gr_complex input, gr_complex output and float taps + * \ingroup resamplers_blk * - * \ingroup filter_blk - * \ingroup pfb_blk - * + * \details * This block takes in a signal stream and performs arbitrary * resampling. The resampling rate can be any real number * <EM>r</EM>. The resampling is done by constructing <EM>N</EM> diff --git a/gr-filter/include/filter/pfb_arb_resampler_fff.h b/gr-filter/include/filter/pfb_arb_resampler_fff.h index 38dcc7132b..5e1be5c026 100644 --- a/gr-filter/include/filter/pfb_arb_resampler_fff.h +++ b/gr-filter/include/filter/pfb_arb_resampler_fff.h @@ -31,14 +31,11 @@ namespace gr { namespace filter { /*! - * \class pfb_arb_resampler_fff - * * \brief Polyphase filterbank arbitrary resampler with * float input, float output and float taps + * \ingroup resamplers_blk * - * \ingroup filter_blk - * \ingroup pfb_blk - * + * \details * This block takes in a signal stream and performs arbitrary * resampling. The resampling rate can be any real number * <EM>r</EM>. The resampling is done by constructing <EM>N</EM> diff --git a/gr-filter/include/filter/pfb_channelizer_ccf.h b/gr-filter/include/filter/pfb_channelizer_ccf.h index 2ff83b5e7e..d0f1b67ad7 100644 --- a/gr-filter/include/filter/pfb_channelizer_ccf.h +++ b/gr-filter/include/filter/pfb_channelizer_ccf.h @@ -31,14 +31,11 @@ namespace gr { namespace filter { /*! - * \class pfb_channelizer_ccf - * * \brief Polyphase filterbank channelizer with * gr_complex input, gr_complex output and float taps + * \ingroup channelizers_blk * - * \ingroup filter_blk - * \ingroup pfb_blk - * + * \details * This block takes in complex inputs and channelizes it to <EM>M</EM> * channels of equal bandwidth. Each of the resulting channels is * decimated to the new rate that is the input sampling rate diff --git a/gr-filter/include/filter/pfb_decimator_ccf.h b/gr-filter/include/filter/pfb_decimator_ccf.h index bf9d0d9508..604688b459 100644 --- a/gr-filter/include/filter/pfb_decimator_ccf.h +++ b/gr-filter/include/filter/pfb_decimator_ccf.h @@ -31,13 +31,11 @@ namespace gr { namespace filter { /*! - * \class pfb_decimator_ccf * \brief Polyphase filterbank bandpass decimator with gr_complex * input, gr_complex output and float taps + * \ingroup channelizers_blk * - * \ingroup filter_blk - * \ingroup pfb_blk - * + * \details * This block takes in a signal stream and performs interger down- * sampling (decimation) with a polyphase filterbank. The first * input is the integer specifying how much to decimate by. The diff --git a/gr-filter/include/filter/pfb_interpolator_ccf.h b/gr-filter/include/filter/pfb_interpolator_ccf.h index df28ab64d6..de1b2b85f4 100644 --- a/gr-filter/include/filter/pfb_interpolator_ccf.h +++ b/gr-filter/include/filter/pfb_interpolator_ccf.h @@ -31,14 +31,11 @@ namespace gr { namespace filter { /*! - * \class gr_pfb_interpolator_ccf - * * \brief Polyphase filterbank interpolator with gr_complex input, * gr_complex output and float taps + * \ingroup channelizers_blk * - * \ingroup filter_blk - * \ingroup pfb_blk - * + * \details * This block takes in a signal stream and performs interger up- * sampling (interpolation) with a polyphase filterbank. The first * input is the integer specifying how much to interpolate by. The diff --git a/gr-filter/include/filter/pfb_synthesizer_ccf.h b/gr-filter/include/filter/pfb_synthesizer_ccf.h index faa16990cc..d434776229 100644 --- a/gr-filter/include/filter/pfb_synthesizer_ccf.h +++ b/gr-filter/include/filter/pfb_synthesizer_ccf.h @@ -31,15 +31,10 @@ namespace gr { namespace filter { /*! - * \class pfb_synthesizer_ccf - * * \brief Polyphase synthesis filterbank with * gr_complex input, gr_complex output and float taps - * - * \ingroup filter_blk - * \ingroup pfb_blk + * \ingroup channelizers_blk */ - class FILTER_API pfb_synthesizer_ccf : virtual public gr_sync_interpolator { public: diff --git a/gr-filter/include/filter/pm_remez.h b/gr-filter/include/filter/pm_remez.h index a57e9e276d..71283eec1c 100644 --- a/gr-filter/include/filter/pm_remez.h +++ b/gr-filter/include/filter/pm_remez.h @@ -32,9 +32,9 @@ namespace gr { namespace filter { /*! * \brief Parks-McClellan FIR filter design using Remez algorithm. - * * \ingroup filter_design * + * \details * Calculates the optimal (in the Chebyshev/minimax sense) FIR * filter inpulse reponse given a set of band edges, the desired * reponse on those bands, and the weight given to the error in diff --git a/gr-filter/include/filter/polyphase_filterbank.h b/gr-filter/include/filter/polyphase_filterbank.h index 33e9522e17..7190f3689f 100644 --- a/gr-filter/include/filter/polyphase_filterbank.h +++ b/gr-filter/include/filter/polyphase_filterbank.h @@ -33,13 +33,11 @@ namespace gr { namespace kernel { /*! - * \class polyphase_filterbank - * * \brief Polyphase filterbank parent class - * * \ingroup filter_blk * \ingroup pfb_blk * + * \details * This block takes in complex inputs and channelizes it to * <EM>M</EM> channels of equal bandwidth. Each of the resulting * channels is decimated to the new rate that is the input diff --git a/gr-filter/include/filter/rational_resampler_base_XXX.h.t b/gr-filter/include/filter/rational_resampler_base_XXX.h.t index e47a16ec6d..18398bbfe7 100644 --- a/gr-filter/include/filter/rational_resampler_base_XXX.h.t +++ b/gr-filter/include/filter/rational_resampler_base_XXX.h.t @@ -35,8 +35,7 @@ namespace gr { /*! * \brief Rational Resampling Polyphase FIR filter with @I_TYPE@ * input, @O_TYPE@ output and @TAP_TYPE@ taps. - * - *\ingroup filter_blk + * \ingroup resamplers_blk */ class FILTER_API @NAME@ : virtual public gr_block { @@ -45,8 +44,8 @@ namespace gr { typedef boost::shared_ptr<@BASE_NAME@> sptr; static sptr make(unsigned interpolation, - unsigned decimation, - const std::vector<@TAP_TYPE@> &taps); + unsigned decimation, + const std::vector<@TAP_TYPE@> &taps); virtual unsigned interpolation() const = 0; virtual unsigned decimation() const = 0; diff --git a/gr-filter/include/filter/single_pole_iir_filter_cc.h b/gr-filter/include/filter/single_pole_iir_filter_cc.h index 82febe8ec4..fd6f107b65 100644 --- a/gr-filter/include/filter/single_pole_iir_filter_cc.h +++ b/gr-filter/include/filter/single_pole_iir_filter_cc.h @@ -35,6 +35,7 @@ namespace gr { * \brief single pole IIR filter with complex input, complex output * \ingroup filter_blk * + * \details * The input and output satisfy a difference equation of the form \htmlonly \f{ diff --git a/gr-filter/include/filter/single_pole_iir_filter_ff.h b/gr-filter/include/filter/single_pole_iir_filter_ff.h index d85688db84..ae4792f3d6 100644 --- a/gr-filter/include/filter/single_pole_iir_filter_ff.h +++ b/gr-filter/include/filter/single_pole_iir_filter_ff.h @@ -35,6 +35,7 @@ namespace gr { * \brief single pole IIR filter with float input, float output * \ingroup filter_blk * + * \details * The input and output satisfy a difference equation of the form \htmlonly \f{ diff --git a/gr-noaa/lib/noaa_hrpt_decoder.h b/gr-noaa/lib/noaa_hrpt_decoder.h index 3b3214b721..27c6184b54 100644 --- a/gr-noaa/lib/noaa_hrpt_decoder.h +++ b/gr-noaa/lib/noaa_hrpt_decoder.h @@ -32,6 +32,10 @@ typedef boost::shared_ptr<noaa_hrpt_decoder> noaa_hrpt_decoder_sptr; NOAA_API noaa_hrpt_decoder_sptr noaa_make_hrpt_decoder(bool verbose, bool output_files); +/*! + * \brief NOAA HRPT Decoder + * \ingroup noaa_blk + */ class NOAA_API noaa_hrpt_decoder : public gr_sync_block { friend NOAA_API noaa_hrpt_decoder_sptr noaa_make_hrpt_decoder(bool verbose, bool output_files); diff --git a/gr-noaa/lib/noaa_hrpt_deframer.h b/gr-noaa/lib/noaa_hrpt_deframer.h index 475ad90f61..68e3ab5fac 100644 --- a/gr-noaa/lib/noaa_hrpt_deframer.h +++ b/gr-noaa/lib/noaa_hrpt_deframer.h @@ -32,6 +32,10 @@ typedef boost::shared_ptr<noaa_hrpt_deframer> noaa_hrpt_deframer_sptr; NOAA_API noaa_hrpt_deframer_sptr noaa_make_hrpt_deframer(); +/*! + * \brief NOAA HRPT Deframer + * \ingroup noaa_blk + */ class NOAA_API noaa_hrpt_deframer : public gr_block { friend NOAA_API noaa_hrpt_deframer_sptr noaa_make_hrpt_deframer(); diff --git a/gr-noaa/lib/noaa_hrpt_pll_cf.h b/gr-noaa/lib/noaa_hrpt_pll_cf.h index 178dccfb33..aff1602319 100644 --- a/gr-noaa/lib/noaa_hrpt_pll_cf.h +++ b/gr-noaa/lib/noaa_hrpt_pll_cf.h @@ -29,6 +29,10 @@ class noaa_hrpt_pll_cf; typedef boost::shared_ptr<noaa_hrpt_pll_cf> noaa_hrpt_pll_cf_sptr; +/*! + * \brief NOAA HRPT PLL + * \ingroup noaa_blk + */ NOAA_API noaa_hrpt_pll_cf_sptr noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset); diff --git a/gr-pager/lib/pager_flex_deinterleave.h b/gr-pager/lib/pager_flex_deinterleave.h index c702da23d7..d565167391 100644 --- a/gr-pager/lib/pager_flex_deinterleave.h +++ b/gr-pager/lib/pager_flex_deinterleave.h @@ -34,7 +34,6 @@ PAGER_API pager_flex_deinterleave_sptr pager_make_flex_deinterleave(); * \brief flex deinterleave description * \ingroup pager_blk */ - class PAGER_API pager_flex_deinterleave : public gr_sync_decimator { private: diff --git a/gr-pager/lib/pager_flex_frame.h b/gr-pager/lib/pager_flex_frame.h index 61973f7229..a2e8f23835 100644 --- a/gr-pager/lib/pager_flex_frame.h +++ b/gr-pager/lib/pager_flex_frame.h @@ -34,6 +34,7 @@ PAGER_API pager_flex_frame_sptr pager_make_flex_frame(); /*! * \brief flex_frame. + * \ingroup pager_blk */ class PAGER_API pager_flex_frame { // Constructor is private to force use of shared_ptr diff --git a/gr-pager/lib/pager_flex_sync.h b/gr-pager/lib/pager_flex_sync.h index b53737d121..bdb6fb0399 100644 --- a/gr-pager/lib/pager_flex_sync.h +++ b/gr-pager/lib/pager_flex_sync.h @@ -35,7 +35,6 @@ PAGER_API pager_flex_sync_sptr pager_make_flex_sync(); * \brief flex sync description * \ingroup pager_blk */ - class PAGER_API pager_flex_sync : public gr_block { private: diff --git a/gr-qtgui/grc/qtgui_check_box.xml b/gr-qtgui/grc/qtgui_check_box.xml index 95f4f968a6..3ac7cae134 100644 --- a/gr-qtgui/grc/qtgui_check_box.xml +++ b/gr-qtgui/grc/qtgui_check_box.xml @@ -8,7 +8,7 @@ <block> <name>QT GUI Check Box</name> <key>variable_qtgui_check_box</key> - <category>QT GUI Widgets</category> + <category>GUI Widgets/QT</category> <import>from PyQt4 import Qt</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $win = '_%s_check_box'%$id diff --git a/gr-qtgui/grc/qtgui_chooser.xml b/gr-qtgui/grc/qtgui_chooser.xml index cb50902897..98c94b5e5b 100644 --- a/gr-qtgui/grc/qtgui_chooser.xml +++ b/gr-qtgui/grc/qtgui_chooser.xml @@ -8,7 +8,7 @@ <block> <name>QT GUI Chooser</name> <key>variable_qtgui_chooser</key> - <category>QT GUI Widgets</category> + <category>GUI Widgets/QT</category> <import>from PyQt4 import Qt</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#slurp diff --git a/gr-qtgui/grc/qtgui_entry.xml b/gr-qtgui/grc/qtgui_entry.xml index 1a98402a0f..e27f260efe 100644 --- a/gr-qtgui/grc/qtgui_entry.xml +++ b/gr-qtgui/grc/qtgui_entry.xml @@ -8,7 +8,7 @@ <block> <name>QT GUI Entry</name> <key>variable_qtgui_entry</key> - <category>QT GUI Widgets</category> + <category>GUI Widgets/QT</category> <import>from PyQt4 import Qt</import> <import>from gnuradio import eng_notation</import> <var_make>self.$(id) = $(id) = $value</var_make> diff --git a/gr-qtgui/grc/qtgui_label.xml b/gr-qtgui/grc/qtgui_label.xml index 5049118c47..3c127edb96 100644 --- a/gr-qtgui/grc/qtgui_label.xml +++ b/gr-qtgui/grc/qtgui_label.xml @@ -8,7 +8,7 @@ <block> <name>QT GUI Label</name> <key>variable_qtgui_label</key> - <category>QT GUI Widgets</category> + <category>GUI Widgets/QT</category> <import>from PyQt4 import Qt</import> <import>from gnuradio import eng_notation</import> <var_make>self.$(id) = $(id) = $value</var_make> diff --git a/gr-qtgui/grc/qtgui_range.xml b/gr-qtgui/grc/qtgui_range.xml index 6b0555f98e..bc1c09cdea 100644 --- a/gr-qtgui/grc/qtgui_range.xml +++ b/gr-qtgui/grc/qtgui_range.xml @@ -8,7 +8,7 @@ <block> <name>QT GUI Range</name> <key>variable_qtgui_range</key> - <category>QT GUI Widgets</category> + <category>GUI Widgets/QT</category> <import>from PyQt4 import Qt</import> <import>import PyQt4.Qwt5 as Qwt</import> <var_make>self.$(id) = $(id) = $value</var_make> diff --git a/gr-qtgui/grc/qtgui_sink_x.xml b/gr-qtgui/grc/qtgui_sink_x.xml index 6488ac04cd..7a03205f5d 100644 --- a/gr-qtgui/grc/qtgui_sink_x.xml +++ b/gr-qtgui/grc/qtgui_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Sink</name> <key>qtgui_sink_x</key> - <category>QT GUI Widgets</category> + <category>Instrumentation/QT</category> <import>from PyQt4 import Qt</import> <import>from gnuradio.qtgui import qtgui</import> <import>from gnuradio.gr import firdes</import> diff --git a/gr-qtgui/grc/qtgui_tab_widget.xml b/gr-qtgui/grc/qtgui_tab_widget.xml index f900541093..f9de310c96 100644 --- a/gr-qtgui/grc/qtgui_tab_widget.xml +++ b/gr-qtgui/grc/qtgui_tab_widget.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Tab Widget</name> <key>qtgui_tab_widget</key> - <category>QT GUI Widgets</category> + <category>GUI Widgets/QT</category> <import>from PyQt4 import Qt</import> <make>#set $win = 'self.%s'%$id Qt.QTabWidget() diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml index 9c8da6fbcf..33e58425ca 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.xml +++ b/gr-qtgui/grc/qtgui_time_sink_x.xml @@ -7,7 +7,7 @@ <block> <name>QT GUI Time Sink</name> <key>qtgui_time_sink_x</key> - <category>QT GUI Widgets</category> + <category>Instrumentation/QT</category> <import>from PyQt4 import Qt</import> <import>from gnuradio.qtgui import qtgui</import> <import>from gnuradio.gr import firdes</import> diff --git a/gr-qtgui/include/qtgui_sink_c.h b/gr-qtgui/include/qtgui_sink_c.h index 68fff368a9..120c1c5c44 100644 --- a/gr-qtgui/include/qtgui_sink_c.h +++ b/gr-qtgui/include/qtgui_sink_c.h @@ -44,8 +44,10 @@ GR_QTGUI_API qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype, /*! * \brief A graphical sink to display freq, spec, time, and const plots. + * \ingroup instrumentation_blk * \ingroup qtgui_blk * + * \details * This is a QT-based graphical sink the takes a complex stream and * plots it. The default action is to plot the signal as a PSD (FFT), * spectrogram (waterfall), time domain I&Q, and constellation (I diff --git a/gr-qtgui/include/qtgui_sink_f.h b/gr-qtgui/include/qtgui_sink_f.h index 709f02a2f5..5f5a14a093 100644 --- a/gr-qtgui/include/qtgui_sink_f.h +++ b/gr-qtgui/include/qtgui_sink_f.h @@ -43,8 +43,10 @@ GR_QTGUI_API qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype, /*! * \brief A graphical sink to display freq, spec, and time. + * \ingroup instrumentation_blk * \ingroup qtgui_blk * + * \details * This is a QT-based graphical sink the takes a float stream and * plots it. The default action is to plot the signal as a PSD (FFT), * spectrogram (waterfall), and time domain plots. The plots may be diff --git a/gr-qtgui/include/qtgui_time_sink_c.h b/gr-qtgui/include/qtgui_time_sink_c.h index 561d796cfa..c440ba0984 100644 --- a/gr-qtgui/include/qtgui_time_sink_c.h +++ b/gr-qtgui/include/qtgui_time_sink_c.h @@ -41,8 +41,10 @@ GR_QTGUI_API qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, /*! * \brief A graphical sink to display multiple signals in time. + * \ingroup instrumentation_blk * \ingroup qtgui_blk * + * \details * This is a QT-based graphical sink the takes set of a complex * streams and plots them in the time domain. For each signal, both * the signal's I and Q parts are plotted, and they are all plotted diff --git a/gr-qtgui/include/qtgui_time_sink_f.h b/gr-qtgui/include/qtgui_time_sink_f.h index 993e0556cf..cd7bd75a00 100644 --- a/gr-qtgui/include/qtgui_time_sink_f.h +++ b/gr-qtgui/include/qtgui_time_sink_f.h @@ -41,8 +41,10 @@ GR_QTGUI_API qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw, /*! * \brief A graphical sink to display multiple signals in time. + * \ingroup instrumentation_blk * \ingroup qtgui_blk * + * \details * This is a QT-based graphical sink the takes set of a float streams * and plots them in the time domain. Each signal is plotted with a * different color, and the \a set_title and \a set_color functions diff --git a/gr-trellis/grc/trellis_encoder_xx.xml b/gr-trellis/grc/trellis_encoder_xx.xml index 639e948ec5..fe9c38f22c 100644 --- a/gr-trellis/grc/trellis_encoder_xx.xml +++ b/gr-trellis/grc/trellis_encoder_xx.xml @@ -8,7 +8,7 @@ <block> <name>Trellis Encoder</name> <key>trellis_encoder_xx</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.encoder_$(type)(trellis.fsm($fsm_args), $init_state)</make> <param> diff --git a/gr-trellis/grc/trellis_metrics_x.xml b/gr-trellis/grc/trellis_metrics_x.xml index 0bc349514b..f551bc1521 100644 --- a/gr-trellis/grc/trellis_metrics_x.xml +++ b/gr-trellis/grc/trellis_metrics_x.xml @@ -9,7 +9,7 @@ <block> <name>Trellis Metrics</name> <key>trellis_metrics_x</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis, digital</import> <make>trellis.metrics_$(type)($card, $dim, $table, $metric_type)</make> <callback>set_TABLE($table)</callback> diff --git a/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml b/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml index 005a88d668..2583f0858b 100644 --- a/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml +++ b/gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml @@ -9,7 +9,7 @@ <block> <name>PCCC Decoder Combo</name> <key>trellis_pccc_decoder_combined_xx</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis, digital</import> <make>trellis.pccc_decoder_combined_$(type)$(out_type)( trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, diff --git a/gr-trellis/grc/trellis_pccc_decoder_x.xml b/gr-trellis/grc/trellis_pccc_decoder_x.xml index c794478260..046731547b 100644 --- a/gr-trellis/grc/trellis_pccc_decoder_x.xml +++ b/gr-trellis/grc/trellis_pccc_decoder_x.xml @@ -9,7 +9,7 @@ <block> <name>PCCC Decoder</name> <key>trellis_pccc_decoder_x</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.pccc_decoder_$(out_type)( trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, diff --git a/gr-trellis/grc/trellis_pccc_encoder_xx.xml b/gr-trellis/grc/trellis_pccc_encoder_xx.xml index 6774f18d21..7441ba8fc9 100644 --- a/gr-trellis/grc/trellis_pccc_encoder_xx.xml +++ b/gr-trellis/grc/trellis_pccc_encoder_xx.xml @@ -8,7 +8,7 @@ <block> <name>PCCC Encoder</name> <key>trellis_pccc_encoder_xx</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.pccc_encoder_$(type)(trellis.fsm($o_fsm_args), $o_init_state, trellis.fsm($i_fsm_args), $i_init_state, trellis.interleaver($interleaver_args), $bl)</make> <param> diff --git a/gr-trellis/grc/trellis_permutation.xml b/gr-trellis/grc/trellis_permutation.xml index 2126933110..bf6fc3ff15 100644 --- a/gr-trellis/grc/trellis_permutation.xml +++ b/gr-trellis/grc/trellis_permutation.xml @@ -9,7 +9,7 @@ <block> <name>Trellis Permutation</name> <key>trellis_permutation</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.permutation($interleaver_size, $table, $syms_per_block, $type.size*$vlen)</make> <param> diff --git a/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml b/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml index 324f06e7f4..eee4e2b9e4 100644 --- a/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml +++ b/gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml @@ -9,7 +9,7 @@ <block> <name>SCCC Decoder Combo</name> <key>trellis_sccc_decoder_combined_xx</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis, digital</import> <make>trellis.sccc_decoder_combined_$(type)$(out_type)( trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, diff --git a/gr-trellis/grc/trellis_sccc_decoder_x.xml b/gr-trellis/grc/trellis_sccc_decoder_x.xml index 4bf8d26d56..ac65a6a49d 100644 --- a/gr-trellis/grc/trellis_sccc_decoder_x.xml +++ b/gr-trellis/grc/trellis_sccc_decoder_x.xml @@ -9,7 +9,7 @@ <block> <name>SCCC Decoder</name> <key>trellis_sccc_decoder_x</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.sccc_decoder_$(out_type)( trellis.fsm($o_fsm_args), $o_init_state, $o_final_state, diff --git a/gr-trellis/grc/trellis_sccc_encoder_xx.xml b/gr-trellis/grc/trellis_sccc_encoder_xx.xml index 54d9c1e014..f1054bf795 100644 --- a/gr-trellis/grc/trellis_sccc_encoder_xx.xml +++ b/gr-trellis/grc/trellis_sccc_encoder_xx.xml @@ -8,7 +8,7 @@ <block> <name>SCCC Encoder</name> <key>trellis_sccc_encoder_xx</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.sccc_encoder_$(type)(trellis.fsm($o_fsm_args), $o_init_state, trellis.fsm($i_fsm_args), $i_init_state, trellis.interleaver($interleaver_args), $bl)</make> <param> diff --git a/gr-trellis/grc/trellis_siso_combined_f.xml b/gr-trellis/grc/trellis_siso_combined_f.xml index a39986a86c..95eceeea31 100644 --- a/gr-trellis/grc/trellis_siso_combined_f.xml +++ b/gr-trellis/grc/trellis_siso_combined_f.xml @@ -9,7 +9,7 @@ <block> <name>SISO Combo</name> <key>trellis_siso_combined_f</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.siso_combined_f(trellis.fsm($fsm_args), $block_size, $init_state, $final_state, $a_post_in, $a_post_out, $siso_type, $dim, $table, $metric_type)</make> <param> diff --git a/gr-trellis/grc/trellis_siso_f.xml b/gr-trellis/grc/trellis_siso_f.xml index e3fb502b3c..523e6a3aac 100644 --- a/gr-trellis/grc/trellis_siso_f.xml +++ b/gr-trellis/grc/trellis_siso_f.xml @@ -9,7 +9,7 @@ <block> <name>SISO</name> <key>trellis_siso_f</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.siso_f(trellis.fsm($fsm_args), $block_size, $init_state, $final_state, $a_post_in, $a_post_out, $siso_type)</make> <param> diff --git a/gr-trellis/grc/trellis_viterbi_combined_xx.xml b/gr-trellis/grc/trellis_viterbi_combined_xx.xml index 85128714c6..7faf735fe1 100644 --- a/gr-trellis/grc/trellis_viterbi_combined_xx.xml +++ b/gr-trellis/grc/trellis_viterbi_combined_xx.xml @@ -9,7 +9,7 @@ <block> <name>Viterbi Combo</name> <key>trellis_viterbi_combined_xx</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis, digital</import> <make>trellis.viterbi_combined_$(type)$(out_type)(trellis.fsm($fsm_args), $block_size, $init_state, $final_state, $dim, $table, $metric_type)</make> <callback>set_TABLE($table)</callback> diff --git a/gr-trellis/grc/trellis_viterbi_x.xml b/gr-trellis/grc/trellis_viterbi_x.xml index d97e6707af..861b23f124 100644 --- a/gr-trellis/grc/trellis_viterbi_x.xml +++ b/gr-trellis/grc/trellis_viterbi_x.xml @@ -9,7 +9,7 @@ <block> <name>Viterbi</name> <key>trellis_viterbi_x</key> - <category>Error Correction/Trellis</category> + <category>Trellis Coding</category> <import>from gnuradio import trellis</import> <make>trellis.viterbi_$(type)(trellis.fsm($fsm_args), $block_size, $init_state, $final_state)</make> <param> diff --git a/gr-trellis/src/lib/fsm.h b/gr-trellis/src/lib/fsm.h index 47e467898a..99a5cce778 100644 --- a/gr-trellis/src/lib/fsm.h +++ b/gr-trellis/src/lib/fsm.h @@ -29,6 +29,7 @@ /*! * \brief Finite State Machine Specification class. + * \ingroup trellis_coding_blk * * An instance of this class represents a finite state machine specification (FSMS) * rather than the FSM itself. It particular the state of the FSM diff --git a/gr-trellis/src/lib/interleaver.h b/gr-trellis/src/lib/interleaver.h index fbd378d621..21735bd639 100644 --- a/gr-trellis/src/lib/interleaver.h +++ b/gr-trellis/src/lib/interleaver.h @@ -28,6 +28,7 @@ /*! * \brief INTERLEAVER class + * \ingroup trellis_coding_blk */ class TRELLIS_API interleaver { private: diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h index 2c2070522c..b799b5cc6d 100644 --- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h +++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h @@ -35,7 +35,7 @@ TRELLIS_API trellis_constellation_metrics_cf_sptr trellis_make_constellation_met /*! * \brief Evaluate metrics for use by the Viterbi algorithm. - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API trellis_constellation_metrics_cf : public gr_block { diff --git a/gr-trellis/src/lib/trellis_encoder_XX.h.t b/gr-trellis/src/lib/trellis_encoder_XX.h.t index 7c4250a929..d94ad80652 100644 --- a/gr-trellis/src/lib/trellis_encoder_XX.h.t +++ b/gr-trellis/src/lib/trellis_encoder_XX.h.t @@ -36,7 +36,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (const fsm &FSM, int ST); /*! * \brief Convolutional encoder. - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API @NAME@ : public gr_sync_block { diff --git a/gr-trellis/src/lib/trellis_metrics_X.h.t b/gr-trellis/src/lib/trellis_metrics_X.h.t index ab406c51ea..1bf61dd957 100644 --- a/gr-trellis/src/lib/trellis_metrics_X.h.t +++ b/gr-trellis/src/lib/trellis_metrics_X.h.t @@ -36,7 +36,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ (int O, int D, const std::vect /*! * \brief Evaluate metrics for use by the Viterbi algorithm. - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API @NAME@ : public gr_block { diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t index e9bc946818..3561bb5504 100644 --- a/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t +++ b/gr-trellis/src/lib/trellis_pccc_decoder_X.h.t @@ -46,7 +46,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ ( /*! - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API @NAME@ : public gr_block { diff --git a/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t index 6e45ea10ac..82216a0917 100644 --- a/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t +++ b/gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t @@ -51,7 +51,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ ( /*! - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API @NAME@ : public gr_block { diff --git a/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t b/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t index 75a22b829c..e4682558e2 100644 --- a/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t +++ b/gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t @@ -43,7 +43,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ ( /*! * \brief SCCC encoder. - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API @NAME@ : public gr_sync_block { diff --git a/gr-trellis/src/lib/trellis_permutation.h b/gr-trellis/src/lib/trellis_permutation.h index cc40518c2c..5669fdd4dd 100644 --- a/gr-trellis/src/lib/trellis_permutation.h +++ b/gr-trellis/src/lib/trellis_permutation.h @@ -35,7 +35,7 @@ TRELLIS_API trellis_permutation_sptr trellis_make_permutation (int K, const std: /*! * \brief Permutation. - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API trellis_permutation : public gr_sync_block { diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t index d6fb72f682..b0b0cd37a6 100644 --- a/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t +++ b/gr-trellis/src/lib/trellis_sccc_decoder_X.h.t @@ -46,7 +46,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ ( /*! - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API @NAME@ : public gr_block { diff --git a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t index 3fdc53c624..9b56e7167a 100644 --- a/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t +++ b/gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t @@ -51,7 +51,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ ( /*! - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API @NAME@ : public gr_block { diff --git a/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t b/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t index b16d7ffca9..655f2d1ee2 100644 --- a/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t +++ b/gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t @@ -43,7 +43,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ ( /*! * \brief SCCC encoder. - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API @NAME@ : public gr_sync_block { diff --git a/gr-trellis/src/lib/trellis_siso_combined_f.h b/gr-trellis/src/lib/trellis_siso_combined_f.h index 4b28e8de4a..d3b3b64189 100644 --- a/gr-trellis/src/lib/trellis_siso_combined_f.h +++ b/gr-trellis/src/lib/trellis_siso_combined_f.h @@ -47,7 +47,7 @@ TRELLIS_API trellis_siso_combined_f_sptr trellis_make_siso_combined_f ( ); /*! - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API trellis_siso_combined_f : public gr_block { diff --git a/gr-trellis/src/lib/trellis_siso_f.h b/gr-trellis/src/lib/trellis_siso_f.h index 9341f24683..52e6bf3eb0 100644 --- a/gr-trellis/src/lib/trellis_siso_f.h +++ b/gr-trellis/src/lib/trellis_siso_f.h @@ -44,7 +44,7 @@ TRELLIS_API trellis_siso_f_sptr trellis_make_siso_f ( /*! - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API trellis_siso_f : public gr_block { diff --git a/gr-trellis/src/lib/trellis_viterbi_X.h.t b/gr-trellis/src/lib/trellis_viterbi_X.h.t index c0400d3410..b2d5ee6495 100644 --- a/gr-trellis/src/lib/trellis_viterbi_X.h.t +++ b/gr-trellis/src/lib/trellis_viterbi_X.h.t @@ -42,7 +42,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ ( /*! - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API @NAME@ : public gr_block { diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t b/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t index c7e468e73b..07175bff7e 100644 --- a/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t +++ b/gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t @@ -45,7 +45,7 @@ TRELLIS_API @SPTR_NAME@ trellis_make_@BASE_NAME@ ( /*! - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API @NAME@ : public gr_block { diff --git a/gr-vocoder/doc/vocoder.dox b/gr-vocoder/doc/vocoder.dox index ff1c4b9ddb..3973ca56fc 100644 --- a/gr-vocoder/doc/vocoder.dox +++ b/gr-vocoder/doc/vocoder.dox @@ -11,8 +11,7 @@ normally imported as: \endcode See the Doxygen documentation for details about the blocks available -in this package. The relevant blocks are listed in the \ref -vocoder_blk group. +in this package. A quick listing of the details can be found in Python after importing by using: diff --git a/gr-vocoder/grc/vocoder_alaw_encode_sb.xml b/gr-vocoder/grc/vocoder_alaw_encode_sb.xml index 0ad8eca124..728158eec7 100644 --- a/gr-vocoder/grc/vocoder_alaw_encode_sb.xml +++ b/gr-vocoder/grc/vocoder_alaw_encode_sb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>g711 alaw Audio Encoder</name> + <name>g711 Alaw Audio Encoder</name> <key>vocoder_alaw_encode_sb</key> <import>from gnuradio import vocoder</import> <make>vocoder.alaw_encode_sb()</make> diff --git a/gr-vocoder/grc/vocoder_block_tree.xml b/gr-vocoder/grc/vocoder_block_tree.xml index ed3338d441..c96a5cc687 100644 --- a/gr-vocoder/grc/vocoder_block_tree.xml +++ b/gr-vocoder/grc/vocoder_block_tree.xml @@ -29,7 +29,7 @@ <cat> <name></name> <!-- Blank for Root Name --> <cat> - <name>Vocoders</name> + <name>Audio</name> <block>vocoder_alaw_decode_bs</block> <block>vocoder_alaw_encode_sb</block> <block>vocoder_codec2_decode_ps</block> diff --git a/gr-vocoder/grc/vocoder_ulaw_decode_bs.xml b/gr-vocoder/grc/vocoder_ulaw_decode_bs.xml index 5a7ccbb0e3..ca3c535c18 100644 --- a/gr-vocoder/grc/vocoder_ulaw_decode_bs.xml +++ b/gr-vocoder/grc/vocoder_ulaw_decode_bs.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Ulaw Audio Decoder</name> + <name>ulaw Audio Decoder</name> <key>vocoder_ulaw_decode_bs</key> <import>from gnuradio import vocoder</import> <make>vocoder.ulaw_decode_bs()</make> diff --git a/gr-vocoder/include/vocoder_alaw_decode_bs.h b/gr-vocoder/include/vocoder_alaw_decode_bs.h index 083be21000..935caef649 100644 --- a/gr-vocoder/include/vocoder_alaw_decode_bs.h +++ b/gr-vocoder/include/vocoder_alaw_decode_bs.h @@ -35,7 +35,7 @@ VOCODER_API vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs(); /*! * \brief This block performs alaw audio decoding. * - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_alaw_decode_bs : public gr_sync_block diff --git a/gr-vocoder/include/vocoder_alaw_encode_sb.h b/gr-vocoder/include/vocoder_alaw_encode_sb.h index c2609a95c6..7d3a8d7779 100644 --- a/gr-vocoder/include/vocoder_alaw_encode_sb.h +++ b/gr-vocoder/include/vocoder_alaw_encode_sb.h @@ -35,7 +35,7 @@ VOCODER_API vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb(); /*! * \brief This block performs g.711 alaw audio encoding. * - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_alaw_encode_sb : public gr_sync_block { diff --git a/gr-vocoder/include/vocoder_codec2_decode_ps.h b/gr-vocoder/include/vocoder_codec2_decode_ps.h index 9ceef79214..8ed3b15c9d 100644 --- a/gr-vocoder/include/vocoder_codec2_decode_ps.h +++ b/gr-vocoder/include/vocoder_codec2_decode_ps.h @@ -32,7 +32,7 @@ VOCODER_API vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps (); /*! * \brief CODEC2 Vocoder Decoder - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_codec2_decode_ps : public gr_sync_interpolator { void *d_codec2; diff --git a/gr-vocoder/include/vocoder_codec2_encode_sp.h b/gr-vocoder/include/vocoder_codec2_encode_sp.h index c24aca1c48..a8333ea342 100644 --- a/gr-vocoder/include/vocoder_codec2_encode_sp.h +++ b/gr-vocoder/include/vocoder_codec2_encode_sp.h @@ -32,7 +32,7 @@ VOCODER_API vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp (); /*! * \brief CODEC2 Vocoder Encoder - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_codec2_encode_sp : public gr_sync_decimator { void *d_codec2; diff --git a/gr-vocoder/include/vocoder_cvsd_decode_bs.h b/gr-vocoder/include/vocoder_cvsd_decode_bs.h index ebafeeb4ea..40deabe91b 100644 --- a/gr-vocoder/include/vocoder_cvsd_decode_bs.h +++ b/gr-vocoder/include/vocoder_cvsd_decode_bs.h @@ -35,7 +35,7 @@ typedef boost::shared_ptr<vocoder_cvsd_decode_bs> vocoder_cvsd_decode_bs_sptr; * values are modeled after the Bluetooth standard and should not be changed, * except by an advanced user * - * \ingroup vocoder_blk + * \ingroup audio_blk * * \param min_step Minimum step size used to update the internal reference. Default: "10" * \param max_step Maximum step size used to update the internal reference. Default: "1280" @@ -61,7 +61,7 @@ VOCODER_API vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_s * is modeled after the CVSD encoder/decoder specifications defined in the * Bluetooth standard. * - * \ingroup vocoder_blk + * \ingroup audio_blk * * CVSD is a method for encoding speech that seeks to reduce the * bandwidth required for digital voice transmission. CVSD takes diff --git a/gr-vocoder/include/vocoder_cvsd_encode_sb.h b/gr-vocoder/include/vocoder_cvsd_encode_sb.h index 876fd96de4..11bce25514 100644 --- a/gr-vocoder/include/vocoder_cvsd_encode_sb.h +++ b/gr-vocoder/include/vocoder_cvsd_encode_sb.h @@ -34,7 +34,7 @@ typedef boost::shared_ptr<vocoder_cvsd_encode_sb> vocoder_cvsd_encode_sb_sptr; * default values are modeled after the Bluetooth standard and should * not be changed except by an advanced user * - * \ingroup vocoder_blk + * \ingroup audio_blk * * \param min_step Minimum step size used to update the internal reference. Default: "10" * \param max_step Maximum step size used to update the internal reference. Default: "1280" @@ -61,7 +61,7 @@ VOCODER_API vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_st * is modeled after the CVSD encoder/decoder specifications defined in the * Bluetooth standard. * - * \ingroup vocoder_blk + * \ingroup audio_blk * * CVSD is a method for encoding speech that seeks to reduce the * bandwidth required for digital voice transmission. CVSD takes diff --git a/gr-vocoder/include/vocoder_g721_decode_bs.h b/gr-vocoder/include/vocoder_g721_decode_bs.h index 61a386ffca..0e74645f90 100644 --- a/gr-vocoder/include/vocoder_g721_decode_bs.h +++ b/gr-vocoder/include/vocoder_g721_decode_bs.h @@ -35,7 +35,7 @@ VOCODER_API vocoder_g721_decode_bs_sptr vocoder_make_g721_decode_bs(); /*! * \brief This block performs g721 audio decoding. * - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_g721_decode_bs : virtual public gr_sync_block diff --git a/gr-vocoder/include/vocoder_g721_encode_sb.h b/gr-vocoder/include/vocoder_g721_encode_sb.h index 694da92d6d..aa657da2fe 100644 --- a/gr-vocoder/include/vocoder_g721_encode_sb.h +++ b/gr-vocoder/include/vocoder_g721_encode_sb.h @@ -35,7 +35,7 @@ VOCODER_API vocoder_g721_encode_sb_sptr vocoder_make_g721_encode_sb(); /*! * \brief This block performs g721 audio encoding. * - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_g721_encode_sb : virtual public gr_sync_block diff --git a/gr-vocoder/include/vocoder_g723_24_decode_bs.h b/gr-vocoder/include/vocoder_g723_24_decode_bs.h index 6c0f09838f..0693c1a258 100644 --- a/gr-vocoder/include/vocoder_g723_24_decode_bs.h +++ b/gr-vocoder/include/vocoder_g723_24_decode_bs.h @@ -35,7 +35,7 @@ VOCODER_API vocoder_g723_24_decode_bs_sptr vocoder_make_g723_24_decode_bs(); /*! * \brief This block performs g723_24 audio decoding. * - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_g723_24_decode_bs : virtual public gr_sync_block diff --git a/gr-vocoder/include/vocoder_g723_24_encode_sb.h b/gr-vocoder/include/vocoder_g723_24_encode_sb.h index 105897583f..70e9496971 100644 --- a/gr-vocoder/include/vocoder_g723_24_encode_sb.h +++ b/gr-vocoder/include/vocoder_g723_24_encode_sb.h @@ -35,7 +35,7 @@ VOCODER_API vocoder_g723_24_encode_sb_sptr vocoder_make_g723_24_encode_sb(); /*! * \brief This block performs g723_24 audio encoding. * - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_g723_24_encode_sb : virtual public gr_sync_block diff --git a/gr-vocoder/include/vocoder_g723_40_decode_bs.h b/gr-vocoder/include/vocoder_g723_40_decode_bs.h index ce320a5266..29c8e2a712 100644 --- a/gr-vocoder/include/vocoder_g723_40_decode_bs.h +++ b/gr-vocoder/include/vocoder_g723_40_decode_bs.h @@ -35,7 +35,7 @@ VOCODER_API vocoder_g723_40_decode_bs_sptr vocoder_make_g723_40_decode_bs(); /*! * \brief This block performs g723_40 audio decoding. * - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_g723_40_decode_bs : virtual public gr_sync_block diff --git a/gr-vocoder/include/vocoder_g723_40_encode_sb.h b/gr-vocoder/include/vocoder_g723_40_encode_sb.h index eb732e73e2..d9a2427691 100644 --- a/gr-vocoder/include/vocoder_g723_40_encode_sb.h +++ b/gr-vocoder/include/vocoder_g723_40_encode_sb.h @@ -35,7 +35,7 @@ VOCODER_API vocoder_g723_40_encode_sb_sptr vocoder_make_g723_40_encode_sb(); /*! * \brief This block performs g723_40 audio encoding. * - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_g723_40_encode_sb : virtual public gr_sync_block diff --git a/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h index 3af249436c..64e8ca5765 100644 --- a/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h +++ b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h @@ -33,7 +33,7 @@ VOCODER_API vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps (); /*! * \brief GSM 06.10 Full Rate Vocoder Decoder - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_gsm_fr_decode_ps : public gr_sync_interpolator { struct gsm_state *d_gsm; diff --git a/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h b/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h index 2b65b5b44e..7d12a4778a 100644 --- a/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h +++ b/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h @@ -33,7 +33,7 @@ VOCODER_API vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp (); /*! * \brief GSM 06.10 Full Rate Vocoder Encoder - * \ingroup vocoder_blk + * \ingroup audio_blk * * shorts in; 33 byte packets out */ diff --git a/gr-vocoder/include/vocoder_ulaw_decode_bs.h b/gr-vocoder/include/vocoder_ulaw_decode_bs.h index e25e9cdcf5..b6d41af28b 100644 --- a/gr-vocoder/include/vocoder_ulaw_decode_bs.h +++ b/gr-vocoder/include/vocoder_ulaw_decode_bs.h @@ -35,7 +35,7 @@ VOCODER_API vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs(); /*! * \brief This block performs ulaw audio decoding. * - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_ulaw_decode_bs : public gr_sync_block diff --git a/gr-vocoder/include/vocoder_ulaw_encode_sb.h b/gr-vocoder/include/vocoder_ulaw_encode_sb.h index 702017d42a..3a4422a384 100644 --- a/gr-vocoder/include/vocoder_ulaw_encode_sb.h +++ b/gr-vocoder/include/vocoder_ulaw_encode_sb.h @@ -35,7 +35,7 @@ VOCODER_API vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb(); /*! * \brief This block performs g.711 ulaw audio encoding. * - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API vocoder_ulaw_encode_sb : public gr_sync_block { diff --git a/gr-wxgui/grc/notebook.xml b/gr-wxgui/grc/notebook.xml index bb3de51cb3..5f30c06201 100644 --- a/gr-wxgui/grc/notebook.xml +++ b/gr-wxgui/grc/notebook.xml @@ -7,7 +7,7 @@ <block> <name>WX GUI Notebook</name> <key>notebook</key> - <category>WX GUI Widgets</category> + <category>GUI Widgets/WX</category> <import>from grc_gnuradio import wxgui as grc_wxgui</import> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' self.$(id) = wx.Notebook($(parent).GetWin(), style=$style) diff --git a/gr-wxgui/grc/variable_check_box.xml b/gr-wxgui/grc/variable_check_box.xml index 0c7bd10815..75dae78215 100644 --- a/gr-wxgui/grc/variable_check_box.xml +++ b/gr-wxgui/grc/variable_check_box.xml @@ -8,7 +8,7 @@ <block> <name>WX GUI Check Box</name> <key>variable_check_box</key> - <category>WX GUI Widgets</category> + <category>GUI Widgets/WX</category> <import>from gnuradio.wxgui import forms</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' diff --git a/gr-wxgui/grc/variable_chooser.xml b/gr-wxgui/grc/variable_chooser.xml index e16e88c5da..ef75a04337 100644 --- a/gr-wxgui/grc/variable_chooser.xml +++ b/gr-wxgui/grc/variable_chooser.xml @@ -9,7 +9,7 @@ <block> <name>WX GUI Chooser</name> <key>variable_chooser</key> - <category>WX GUI Widgets</category> + <category>GUI Widgets/WX</category> <import>from gnuradio.wxgui import forms</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' diff --git a/gr-wxgui/grc/variable_slider.xml b/gr-wxgui/grc/variable_slider.xml index 5e3c175aa4..96c0b5ec70 100644 --- a/gr-wxgui/grc/variable_slider.xml +++ b/gr-wxgui/grc/variable_slider.xml @@ -8,7 +8,7 @@ <block> <name>WX GUI Slider</name> <key>variable_slider</key> - <category>WX GUI Widgets</category> + <category>GUI Widgets/WX</category> <import>from gnuradio.wxgui import forms</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' diff --git a/gr-wxgui/grc/variable_static_text.xml b/gr-wxgui/grc/variable_static_text.xml index cd122e76a1..d68b00a1dd 100644 --- a/gr-wxgui/grc/variable_static_text.xml +++ b/gr-wxgui/grc/variable_static_text.xml @@ -8,7 +8,7 @@ <block> <name>WX GUI Static Text</name> <key>variable_static_text</key> - <category>WX GUI Widgets</category> + <category>GUI Widgets/WX</category> <import>from gnuradio.wxgui import forms</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' diff --git a/gr-wxgui/grc/variable_text_box.xml b/gr-wxgui/grc/variable_text_box.xml index afff839cfd..a2cf1a8220 100644 --- a/gr-wxgui/grc/variable_text_box.xml +++ b/gr-wxgui/grc/variable_text_box.xml @@ -8,7 +8,7 @@ <block> <name>WX GUI Text Box</name> <key>variable_text_box</key> - <category>WX GUI Widgets</category> + <category>GUI Widgets/WX</category> <import>from gnuradio.wxgui import forms</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' diff --git a/gr-wxgui/grc/wxgui_constellationsink2.xml b/gr-wxgui/grc/wxgui_constellationsink2.xml index f9df9d4acd..62cadfc9a2 100644 --- a/gr-wxgui/grc/wxgui_constellationsink2.xml +++ b/gr-wxgui/grc/wxgui_constellationsink2.xml @@ -7,7 +7,7 @@ <block> <name>WX GUI Constellation Sink</name> <key>wxgui_constellationsink2</key> - <category>WX GUI Widgets</category> + <category>Instrumentation/WX</category> <import>from gnuradio.wxgui import constsink_gl</import> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' constsink_gl.const_sink_c( diff --git a/gr-wxgui/grc/wxgui_fftsink2.xml b/gr-wxgui/grc/wxgui_fftsink2.xml index 74ee5b173e..4a6237143b 100644 --- a/gr-wxgui/grc/wxgui_fftsink2.xml +++ b/gr-wxgui/grc/wxgui_fftsink2.xml @@ -7,7 +7,7 @@ <block> <name>WX GUI FFT Sink</name> <key>wxgui_fftsink2</key> - <category>WX GUI Widgets</category> + <category>Instrumentation/WX</category> <import>from gnuradio import window</import> <import>from gnuradio.wxgui import fftsink2</import> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' diff --git a/gr-wxgui/grc/wxgui_histosink2.xml b/gr-wxgui/grc/wxgui_histosink2.xml index f4f6a29597..aed7781798 100644 --- a/gr-wxgui/grc/wxgui_histosink2.xml +++ b/gr-wxgui/grc/wxgui_histosink2.xml @@ -7,7 +7,7 @@ <block> <name>WX GUI Histo Sink</name> <key>wxgui_histosink2</key> - <category>WX GUI Widgets</category> + <category>Instrumentation/WX</category> <import>from gnuradio.wxgui import histosink_gl</import> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' histosink_gl.histo_sink_f( diff --git a/gr-wxgui/grc/wxgui_numbersink2.xml b/gr-wxgui/grc/wxgui_numbersink2.xml index 2559266101..6f93714dba 100644 --- a/gr-wxgui/grc/wxgui_numbersink2.xml +++ b/gr-wxgui/grc/wxgui_numbersink2.xml @@ -7,7 +7,7 @@ <block> <name>WX GUI Number Sink</name> <key>wxgui_numbersink2</key> - <category>WX GUI Widgets</category> + <category>Instrumentation/WX</category> <import>from gnuradio.wxgui import numbersink2</import> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' numbersink2.$(type.fcn)( diff --git a/gr-wxgui/grc/wxgui_scopesink2.xml b/gr-wxgui/grc/wxgui_scopesink2.xml index dbf983e112..64db47a055 100644 --- a/gr-wxgui/grc/wxgui_scopesink2.xml +++ b/gr-wxgui/grc/wxgui_scopesink2.xml @@ -7,7 +7,7 @@ <block> <name>WX GUI Scope Sink</name> <key>wxgui_scopesink2</key> - <category>WX GUI Widgets</category> + <category>Instrumentation/WX</category> <import>from gnuradio.wxgui import scopesink2</import> <import>from gnuradio import gr</import> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' diff --git a/gr-wxgui/grc/wxgui_termsink.xml b/gr-wxgui/grc/wxgui_termsink.xml index 3e35c75788..2a7623d9d7 100644 --- a/gr-wxgui/grc/wxgui_termsink.xml +++ b/gr-wxgui/grc/wxgui_termsink.xml @@ -7,7 +7,7 @@ <block> <name>WX GUI Terminal Sink</name> <key>wxgui_termsink</key> - <category>WX GUI Widgets</category> + <category>Instrumentation/WX</category> <import>from gnuradio.wxgui import termsink</import> diff --git a/gr-wxgui/grc/wxgui_waterfallsink2.xml b/gr-wxgui/grc/wxgui_waterfallsink2.xml index 8921e87f9a..94de667e02 100644 --- a/gr-wxgui/grc/wxgui_waterfallsink2.xml +++ b/gr-wxgui/grc/wxgui_waterfallsink2.xml @@ -7,7 +7,7 @@ <block> <name>WX GUI Waterfall Sink</name> <key>wxgui_waterfallsink2</key> - <category>WX GUI Widgets</category> + <category>Instrumentation/WX</category> <import>from gnuradio import window</import> <import>from gnuradio.wxgui import waterfallsink2</import> <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' diff --git a/grc/blocks/blks2_pfb_arb_resampler.xml b/grc/blocks/blks2_pfb_arb_resampler.xml index b58e70f1cb..aef83dd91a 100644 --- a/grc/blocks/blks2_pfb_arb_resampler.xml +++ b/grc/blocks/blks2_pfb_arb_resampler.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Polyphase Resampler</name> + <name>Polyphase Resampler (old)</name> <key>blks2_pfb_arb_resampler_ccf</key> <import>from gnuradio import blks2</import> <import>from gnuradio.gr import firdes</import> diff --git a/grc/blocks/blks2_pfb_channelizer.xml b/grc/blocks/blks2_pfb_channelizer.xml index 5a93c08664..6184749cd0 100644 --- a/grc/blocks/blks2_pfb_channelizer.xml +++ b/grc/blocks/blks2_pfb_channelizer.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Polyphase Channelizer</name> + <name>Polyphase Channelizer (old)</name> <key>blks2_pfb_channelizer_ccf</key> <import>from gnuradio import blks2</import> <import>from gnuradio.gr import firdes</import> diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index dcd6c54483..897e4a14c2 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -7,168 +7,6 @@ <cat> <name></name> <!-- Blank for Root Name --> <cat> - <name>Sources</name> - <block>const_source_x</block> - <block>gr_sig_source_x</block> - <block>gr_noise_source_x</block> - <block>gr_vector_source_x</block> - <block>random_source_x</block> - <block>gr_glfsr_source_x</block> - <block>gr_null_source</block> - <block>gr_file_source</block> - <block>blks2_tcp_source</block> - <block>gr_udp_source</block> - <block>gr_wavfile_source</block> - <block>gr_message_source</block> - <block>gr_message_burst_source</block> - <block>pad_source</block> - <block>virtual_source</block> - </cat> - <cat> - <name>Sinks</name> - <block>gr_vector_sink_x</block> - <block>gr_null_sink</block> - <block>gr_file_sink</block> - <block>blks2_tcp_sink</block> - <block>gr_udp_sink</block> - <block>gr_wavfile_sink</block> - <block>gr_message_sink</block> - <block>pad_sink</block> - <block>virtual_sink</block> - <block>gr_tag_debug</block> - </cat> - <cat> - <name>Message Tools</name> - <block>gr_message_debug</block> - <block>gr_message_strobe</block> - <block>gr_pdu_to_tagged_stream</block> - <block>gr_tagged_stream_to_pdu</block> - <block>gr_tuntap_pdu</block> - <block>gr_socket_pdu</block> - <block>gr_random_pdu</block> - </cat> - <cat> - <name>Operators</name> - <block>gr_add_xx</block> - <block>gr_sub_xx</block> - <block>gr_multiply_xx</block> - <block>gr_divide_xx</block> - <block>gr_nlog10_ff</block> - <block>gr_transcendental</block> - <block>gr_add_const_vxx</block> - <block>gr_multiply_const_vxx</block> - <block>gr_and_const_xx</block> - - <block>gr_not_xx</block> - <block>gr_and_xx</block> - <block>gr_or_xx</block> - <block>gr_xor_xx</block> - - <block>gr_max_xx</block> - <block>gr_argmax_xx</block> - <block>gr_rms_xx</block> - <block>gr_integrate_xx</block> - - <block>gr_conjugate_cc</block> - - <block>gr_fft_vxx</block> - <block>blks2_logpwrfft_x</block> - <block>gr_vector_insert_x</block> - - <block>gr_endian_swap</block> - </cat> - <cat> - <name>Type Conversions</name> - <block>gr_complex_to_arg</block> - <block>gr_complex_to_mag</block> - <block>gr_complex_to_mag_squared</block> - <block>gr_complex_to_real</block> - <block>gr_complex_to_imag</block> - - <block>gr_complex_to_float</block> - <block>gr_float_to_complex</block> - - <block>gr_float_to_int</block> - <block>gr_float_to_short</block> - <block>gr_short_to_float</block> - <block>gr_short_to_char</block> - - <block>gr_int_to_float</block> - - <block>gr_float_to_char</block> - <block>gr_char_to_float</block> - <block>gr_char_to_short</block> - - <block>gr_float_to_uchar</block> - <block>gr_uchar_to_float</block> - - <block>gr_complex_to_interleaved_short</block> - <block>gr_interleaved_short_to_complex</block> - </cat> - <cat> - <name>Stream Conversions</name> - <block>gr_interleave</block> - <block>gr_deinterleave</block> - - <block>gr_streams_to_stream</block> - <block>gr_stream_to_streams</block> - - <block>gr_streams_to_vector</block> - <block>gr_vector_to_streams</block> - - <block>gr_stream_to_vector</block> - <block>gr_vector_to_stream</block> - - <block>blks2_stream_to_vector_decimator</block> - - <block>gr_stream_mux</block> - <block>gr_burst_tagger</block> - </cat> - <cat> - <name>Misc Conversions</name> - <block>gr_unpacked_to_packed_xx</block> - <block>gr_packed_to_unpacked_xx</block> - <block>gr_unpack_k_bits_bb</block> - <block>gr_pack_k_bits_bb</block> - <block>gr_chunks_to_symbols_xx</block> - <block>gr_map_bb</block> - </cat> - <cat> - <name>Synchronizers</name> - <block>gr_pfb_clock_sync_xxx</block> - - <block>gr_mpsk_sync_cc</block> - - <block>gr_pll_carriertracking_cc</block> - <block>gr_pll_freqdet_cf</block> - <block>gr_pll_refout_cc</block> - - <block>gr_pn_correlator_cc</block> - <block>gr_simple_correlator</block> - <block>gr_simple_framer</block> - - <block>blks2_packet_decoder</block> - <block>blks2_packet_encoder</block> - </cat> - <cat> - <name>Level Controls</name> - <block>gr_dpll_bb</block> - <block>gr_peak_detector_xb</block> - <block>gr_peak_detector2_fb</block> - <block>gr_sample_and_hold_xx</block> - - <block>gr_agc_xx</block> - <block>gr_agc2_xx</block> - <block>gr_feedforward_agc_cc</block> - - <block>gr_mute_xx</block> - <block>gr_simple_squelch_cc</block> - <block>blks2_standard_squelch</block> - <block>gr_pwr_squelch_xx</block> - <block>gr_ctcss_squelch_ff</block> - <block>gr_threshold_ff</block> - </cat> - <cat> <name>Filters</name> <!-- FIR convenience filters --> <block>low_pass_filter</block> @@ -176,47 +14,49 @@ <block>band_pass_filter</block> <block>band_reject_filter</block> <block>root_raised_cosine_filter</block> - <!-- Filters that take taps as arguments --> - <block>gr_fir_filter_xxx</block> - <block>gr_interp_fir_filter_xxx</block> - <block>gr_fft_filter_xxx</block> - <block>gr_freq_xlating_fir_filter_xxx</block> - <block>gr_iir_filter_ffd</block> - <block>gr_filter_delay_fc</block> - <block>gr_channel_model</block> <!-- Filter banks --> <block>blks2_synthesis_filterbank</block> <block>blks2_analysis_filterbank</block> - <!-- Polyphase filters --> - <block>blks2_pfb_arb_resampler_ccf</block> - <block>blks2_pfb_channelizer_ccf</block> - <block>gr_pfb_synthesizer_ccf</block> <!-- Other filters --> - <block>gr_single_pole_iir_filter_xx</block> - <block>gr_hilbert_fc</block> - <block>gr_goertzel_fc</block> - <block>gr_rational_resampler_base_xxx</block> <block>blks2_rational_resampler_xxx</block> - <block>gr_fractional_interpolator_xx</block> - <block>gr_keep_one_in_n</block> - <block>gr_keep_m_in_n</block> - <block>gr_moving_average_xx</block> <block>gr_iqcomp_cc</block> - <block>gr_dc_blocker</block> </cat> <cat> - <name>Modulators</name> - <block>gr_vco_f</block> - <block>gr_frequency_modulator_fc</block> - <block>gr_phase_modulator_fc</block> - <block>gr_quadrature_demod_cf</block> - <block>gr_cpfsk_bc</block> + <name>Error Coding</name> + <block>gr_encode_ccsds_27_bb</block> + <block>gr_decode_ccsds_27_fb</block> + </cat> + <cat> + <name>Fourier Analysis</name> + <block>blks2_logpwrfft_x</block> + </cat> + <cat> + <name>Level Controllers</name> + <block>blks2_standard_squelch</block> + </cat> + <cat> + <name>Message Tools</name> + <block>gr_random_pdu</block> + </cat> + <cat> + <name>Misc</name> + <block>pad_source</block> + <block>pad_sink</block> + <block>virtual_source</block> + <block>virtual_sink</block> - <block>gr_diff_phasor_cc</block> + <block>note</block> + <block>import</block> - <block>gr_diff_encoder_bb</block> - <block>gr_diff_decoder_bb</block> + <block>blks2_selector</block> + <block>blks2_valve</block> + <block>blks2_error_rate</block> + <block>xmlrpc_server</block> + <block>xmlrpc_client</block> + </cat> + <cat> + <name>Modulators</name> <block>blks2_wfm_tx</block> <block>blks2_wfm_rcv</block> <block>blks2_wfm_rcv_pll</block> @@ -230,25 +70,23 @@ <block>blks2_fm_preemph</block> </cat> <cat> - <name>Error Correction</name> - <cat> - <name>Trellis</name> - </cat> - - <block>gr_encode_ccsds_27_bb</block> - <block>gr_decode_ccsds_27_fb</block> + <name>Networking Tools</name> + <block>blks2_tcp_source</block> + <block>blks2_tcp_sink</block> </cat> <cat> - <name>Line Coding</name> - <block>gr_scrambler_bb</block> - <block>gr_descrambler_bb</block> - <block>gr_additive_scrambler_bb</block> + <name>Synchronizers</name> + <block>blks2_packet_decoder</block> + <block>blks2_packet_encoder</block> </cat> <cat> - <name>Probes</name> - <block>gr_probe_avg_mag_sqrd_x</block> - <block>gr_probe_density_b</block> - <block>gr_probe_signal_f</block> + <name>Type Converters</name> + <block>blks2_stream_to_vector_decimator</block> + </cat> + <cat> + <name>Waveform Generators</name> + <block>const_source_x</block> + <block>random_source_x</block> </cat> <cat> <name>Variables</name> @@ -257,27 +95,4 @@ <block>variable_function_probe</block> <block>parameter</block> </cat> - <cat> - <name>Misc</name> - <block>note</block> - <block>import</block> - - <block>gr_throttle</block> - <block>gr_delay</block> - <block>gr_repeat</block> - - <block>blks2_selector</block> - <block>blks2_valve</block> - <block>blks2_error_rate</block> - - <block>gr_head</block> - <block>gr_skiphead</block> - - <block>gr_kludge_copy</block> - <block>gr_copy</block> - <block>gr_nop</block> - - <block>xmlrpc_server</block> - <block>xmlrpc_client</block> - </cat> </cat> diff --git a/grc/blocks/gr_add_const_vxx.xml b/grc/blocks/gr_add_const_vxx.xml index 9f1c545ab8..360433cd7b 100644 --- a/grc/blocks/gr_add_const_vxx.xml +++ b/grc/blocks/gr_add_const_vxx.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Add Const</name> + <name>Add Const (old)</name> <key>gr_add_const_vxx</key> <import>from gnuradio import gr</import> <make>gr.add_const_v$(type.fcn)($const)</make> diff --git a/grc/blocks/gr_add_xx.xml b/grc/blocks/gr_add_xx.xml index 97ed9283c2..14b8ad16a5 100644 --- a/grc/blocks/gr_add_xx.xml +++ b/grc/blocks/gr_add_xx.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Add</name> + <name>Add (old)</name> <key>gr_add_xx</key> <import>from gnuradio import gr</import> <make>gr.add_v$(type.fcn)($vlen)</make> diff --git a/grc/blocks/gr_additive_scrambler_bb.xml b/grc/blocks/gr_additive_scrambler_bb.xml index a15d6eefbe..754303f881 100644 --- a/grc/blocks/gr_additive_scrambler_bb.xml +++ b/grc/blocks/gr_additive_scrambler_bb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Additive Scrambler</name> + <name>Additive Scrambler (old)</name> <key>gr_additive_scrambler_bb</key> <import>from gnuradio import gr</import> <make>gr.additive_scrambler_bb($mask, $seed, $len, $count)</make> diff --git a/grc/blocks/gr_agc2_xx.xml b/grc/blocks/gr_agc2_xx.xml index 55b20d4e82..54b0f80e8e 100644 --- a/grc/blocks/gr_agc2_xx.xml +++ b/grc/blocks/gr_agc2_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>AGC2</name> + <name>AGC2 (old)</name> <key>gr_agc2_xx</key> <import>from gnuradio import gr</import> <make>gr.agc2_$(type.fcn)($attack_rate, $decay_rate, $reference, $gain, $max_gain)</make> diff --git a/grc/blocks/gr_agc_xx.xml b/grc/blocks/gr_agc_xx.xml index c87d239edd..a63ce5890b 100644 --- a/grc/blocks/gr_agc_xx.xml +++ b/grc/blocks/gr_agc_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>AGC</name> + <name>AGC (old)</name> <key>gr_agc_xx</key> <import>from gnuradio import gr</import> <make>gr.agc_$(type.fcn)($rate, $reference, $gain, $max_gain)</make> diff --git a/grc/blocks/gr_and_const_xx.xml b/grc/blocks/gr_and_const_xx.xml index dc96493111..1e7e6a1c43 100644 --- a/grc/blocks/gr_and_const_xx.xml +++ b/grc/blocks/gr_and_const_xx.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>And Const</name> + <name>And Const (old)</name> <key>gr_and_const_xx</key> <import>from gnuradio import gr</import> <make>gr.and_const_$(type.fcn)($const)</make> diff --git a/grc/blocks/gr_and_xx.xml b/grc/blocks/gr_and_xx.xml index 9ed0060906..ffeb872038 100644 --- a/grc/blocks/gr_and_xx.xml +++ b/grc/blocks/gr_and_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>And</name> + <name>And (old)</name> <key>gr_and_xx</key> <import>from gnuradio import gr</import> <make>gr.and_$(type.fcn)()</make> diff --git a/grc/blocks/gr_argmax_xx.xml b/grc/blocks/gr_argmax_xx.xml index 95269292e7..8c6a7ad7a9 100644 --- a/grc/blocks/gr_argmax_xx.xml +++ b/grc/blocks/gr_argmax_xx.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Argmax</name> + <name>Argmax (old)</name> <key>gr_argmax_xx</key> <import>from gnuradio import gr</import> <make>gr.argmax_$(type.fcn)($vlen)</make> diff --git a/grc/blocks/gr_burst_tagger.xml b/grc/blocks/gr_burst_tagger.xml index 58c909999a..349b56ac9d 100644 --- a/grc/blocks/gr_burst_tagger.xml +++ b/grc/blocks/gr_burst_tagger.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Burst Tagger</name> + <name>Burst Tagger (old)</name> <key>gr_burst_tagger</key> <import>from gnuradio import gr</import> <make>gr.burst_tagger($type.size) diff --git a/grc/blocks/gr_channel_model.xml b/grc/blocks/gr_channel_model.xml index d0d178d345..d0d5889f56 100644 --- a/grc/blocks/gr_channel_model.xml +++ b/grc/blocks/gr_channel_model.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Channel Model</name> + <name>Channel Model (old)</name> <key>gr_channel_model</key> <import>from gnuradio import gr</import> <import>from gnuradio.gr import firdes</import> diff --git a/grc/blocks/gr_char_to_float.xml b/grc/blocks/gr_char_to_float.xml index 838b6a203d..282fbd23b2 100644 --- a/grc/blocks/gr_char_to_float.xml +++ b/grc/blocks/gr_char_to_float.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Char To Float</name> + <name>Char To Float (old)</name> <key>gr_char_to_float</key> <import>from gnuradio import gr</import> <make>gr.char_to_float($vlen, $scale)</make> diff --git a/grc/blocks/gr_char_to_short.xml b/grc/blocks/gr_char_to_short.xml index 57261e0845..27b89b0780 100644 --- a/grc/blocks/gr_char_to_short.xml +++ b/grc/blocks/gr_char_to_short.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Char To Short</name> + <name>Char To Short (old)</name> <key>gr_char_to_short</key> <import>from gnuradio import gr</import> <make>gr.char_to_short($vlen)</make> diff --git a/grc/blocks/gr_chunks_to_symbols.xml b/grc/blocks/gr_chunks_to_symbols.xml index e9da38e9a5..60528f7cde 100644 --- a/grc/blocks/gr_chunks_to_symbols.xml +++ b/grc/blocks/gr_chunks_to_symbols.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Chunks to Symbols</name> + <name>Chunks to Symbols (old)</name> <key>gr_chunks_to_symbols_xx</key> <import>from gnuradio import gr</import> <make>gr.chunks_to_symbols_$(in_type.fcn)$(out_type.fcn)($symbol_table, $dimension)</make> diff --git a/grc/blocks/gr_complex_to_arg.xml b/grc/blocks/gr_complex_to_arg.xml index a7bbacd74f..e740ecd3e7 100644 --- a/grc/blocks/gr_complex_to_arg.xml +++ b/grc/blocks/gr_complex_to_arg.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Complex to Arg</name> + <name>Complex to Arg (old)</name> <key>gr_complex_to_arg</key> <import>from gnuradio import gr</import> <make>gr.complex_to_arg($vlen)</make> diff --git a/grc/blocks/gr_complex_to_float.xml b/grc/blocks/gr_complex_to_float.xml index 05681b0b90..4d9ae13610 100644 --- a/grc/blocks/gr_complex_to_float.xml +++ b/grc/blocks/gr_complex_to_float.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Complex To Float</name> + <name>Complex To Float (old)</name> <key>gr_complex_to_float</key> <import>from gnuradio import gr</import> <make>gr.complex_to_float($vlen)</make> diff --git a/grc/blocks/gr_complex_to_imag.xml b/grc/blocks/gr_complex_to_imag.xml index 7c120eedda..1ea5b2ce99 100644 --- a/grc/blocks/gr_complex_to_imag.xml +++ b/grc/blocks/gr_complex_to_imag.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Complex to Imag</name> + <name>Complex to Imag (old)</name> <key>gr_complex_to_imag</key> <import>from gnuradio import gr</import> <make>gr.complex_to_imag($vlen)</make> diff --git a/grc/blocks/gr_complex_to_interleaved_short.xml b/grc/blocks/gr_complex_to_interleaved_short.xml index 5e999599ac..28a503b8b0 100644 --- a/grc/blocks/gr_complex_to_interleaved_short.xml +++ b/grc/blocks/gr_complex_to_interleaved_short.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Complex To IShort</name> + <name>Complex To IShort (old)</name> <key>gr_complex_to_interleaved_short</key> <import>from gnuradio import gr</import> <make>gr.complex_to_interleaved_short()</make> diff --git a/grc/blocks/gr_complex_to_mag.xml b/grc/blocks/gr_complex_to_mag.xml index adc95f2075..d4308cf166 100644 --- a/grc/blocks/gr_complex_to_mag.xml +++ b/grc/blocks/gr_complex_to_mag.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Complex to Mag</name> + <name>Complex to Mag (old)</name> <key>gr_complex_to_mag</key> <import>from gnuradio import gr</import> <make>gr.complex_to_mag($vlen)</make> diff --git a/grc/blocks/gr_complex_to_mag_squared.xml b/grc/blocks/gr_complex_to_mag_squared.xml index cd23bfb5c5..ac8110bac9 100644 --- a/grc/blocks/gr_complex_to_mag_squared.xml +++ b/grc/blocks/gr_complex_to_mag_squared.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Complex to Mag^2</name> + <name>Complex to Mag^2 (old)</name> <key>gr_complex_to_mag_squared</key> <import>from gnuradio import gr</import> <make>gr.complex_to_mag_squared($vlen)</make> diff --git a/grc/blocks/gr_complex_to_real.xml b/grc/blocks/gr_complex_to_real.xml index ae9ec7b142..b0955516c6 100644 --- a/grc/blocks/gr_complex_to_real.xml +++ b/grc/blocks/gr_complex_to_real.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Complex to Real</name> + <name>Complex to Real (old)</name> <key>gr_complex_to_real</key> <import>from gnuradio import gr</import> <make>gr.complex_to_real($vlen)</make> diff --git a/grc/blocks/gr_conjugate_cc.xml b/grc/blocks/gr_conjugate_cc.xml index 0b4deb3472..0f7ded3c69 100644 --- a/grc/blocks/gr_conjugate_cc.xml +++ b/grc/blocks/gr_conjugate_cc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Complex Conjugate</name> + <name>Complex Conjugate (old)</name> <key>gr_conjugate_cc</key> <import>from gnuradio import gr</import> <make>gr.conjugate_cc()</make> diff --git a/grc/blocks/gr_copy.xml b/grc/blocks/gr_copy.xml index 8b12eaca78..fda3e14fca 100644 --- a/grc/blocks/gr_copy.xml +++ b/grc/blocks/gr_copy.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Copy</name> + <name>Copy (old)</name> <key>gr_copy</key> <import>from gnuradio import gr</import> <make>gr.copy($type.size*$vlen) diff --git a/grc/blocks/gr_cpfsk_bc.xml b/grc/blocks/gr_cpfsk_bc.xml index d5549d933f..d4692eaf98 100644 --- a/grc/blocks/gr_cpfsk_bc.xml +++ b/grc/blocks/gr_cpfsk_bc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>CPFSK</name> + <name>CPFSK (old)</name> <key>gr_cpfsk_bc</key> <import>from gnuradio import gr</import> <make>gr.cpfsk_bc($k, $amplitude, $samples_per_symbol)</make> diff --git a/grc/blocks/gr_ctcss_squelch_ff.xml b/grc/blocks/gr_ctcss_squelch_ff.xml index a34c75374c..d248c19993 100644 --- a/grc/blocks/gr_ctcss_squelch_ff.xml +++ b/grc/blocks/gr_ctcss_squelch_ff.xml @@ -27,7 +27,7 @@ ################################################### --> <block> - <name>CTCSS Squelch</name> + <name>CTCSS Squelch (old)</name> <key>gr_ctcss_squelch_ff</key> <import>from gnuradio import gr</import> <make>gr.ctcss_squelch_ff($rate, $freq, $level, $len, $ramp, $gate)</make> diff --git a/grc/blocks/gr_dc_blocker.xml b/grc/blocks/gr_dc_blocker.xml index 05c3420747..a710c1ea08 100644 --- a/grc/blocks/gr_dc_blocker.xml +++ b/grc/blocks/gr_dc_blocker.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>DC Blocker</name> + <name>DC Blocker (old)</name> <key>gr_dc_blocker</key> <import>from gnuradio import gr</import> <make>gr.dc_blocker_$(type)($length, $long_form)</make> diff --git a/grc/blocks/gr_deinterleave.xml b/grc/blocks/gr_deinterleave.xml index a7482978c0..b600cf0262 100644 --- a/grc/blocks/gr_deinterleave.xml +++ b/grc/blocks/gr_deinterleave.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Deinterleave</name> + <name>Deinterleave (old)</name> <key>gr_deinterleave</key> <import>from gnuradio import gr</import> <make>gr.deinterleave($type.size*$vlen)</make> diff --git a/grc/blocks/gr_delay.xml b/grc/blocks/gr_delay.xml index 5cc411a782..fa6715df11 100644 --- a/grc/blocks/gr_delay.xml +++ b/grc/blocks/gr_delay.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Delay</name> + <name>Delay (old)</name> <key>gr_delay</key> <import>from gnuradio import gr</import> <make>gr.delay($type.size*$vlen, $delay)</make> diff --git a/grc/blocks/gr_descrambler_bb.xml b/grc/blocks/gr_descrambler_bb.xml index 5cfbcc203e..cd14b234df 100644 --- a/grc/blocks/gr_descrambler_bb.xml +++ b/grc/blocks/gr_descrambler_bb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Descrambler</name> + <name>Descrambler (old)</name> <key>gr_descrambler_bb</key> <import>from gnuradio import gr</import> <make>gr.descrambler_bb($mask, $seed, $len)</make> diff --git a/grc/blocks/gr_diff_decoder_bb.xml b/grc/blocks/gr_diff_decoder_bb.xml index ea7cf17343..bfb6e3e120 100644 --- a/grc/blocks/gr_diff_decoder_bb.xml +++ b/grc/blocks/gr_diff_decoder_bb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Differential Decoder</name> + <name>Differential Decoder (old)</name> <key>gr_diff_decoder_bb</key> <import>from gnuradio import gr</import> <make>gr.diff_decoder_bb($modulus)</make> diff --git a/grc/blocks/gr_diff_encoder_bb.xml b/grc/blocks/gr_diff_encoder_bb.xml index 21241eac22..b589f31361 100644 --- a/grc/blocks/gr_diff_encoder_bb.xml +++ b/grc/blocks/gr_diff_encoder_bb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Differential Encoder</name> + <name>Differential Encoder (old)</name> <key>gr_diff_encoder_bb</key> <import>from gnuradio import gr</import> <make>gr.diff_encoder_bb($modulus)</make> diff --git a/grc/blocks/gr_diff_phasor_cc.xml b/grc/blocks/gr_diff_phasor_cc.xml index 2b2d7e372c..d7a3445b6c 100644 --- a/grc/blocks/gr_diff_phasor_cc.xml +++ b/grc/blocks/gr_diff_phasor_cc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Differential Phasor</name> + <name>Differential Phasor (old)</name> <key>gr_diff_phasor_cc</key> <import>from gnuradio import gr</import> <make>gr.diff_phasor_cc()</make> diff --git a/grc/blocks/gr_divide_xx.xml b/grc/blocks/gr_divide_xx.xml index 04667bc2ac..5f95515e4b 100644 --- a/grc/blocks/gr_divide_xx.xml +++ b/grc/blocks/gr_divide_xx.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Divide</name> + <name>Divide (old)</name> <key>gr_divide_xx</key> <import>from gnuradio import gr</import> <make>gr.divide_$(type.fcn)($vlen)</make> diff --git a/grc/blocks/gr_dpll_bb.xml b/grc/blocks/gr_dpll_bb.xml index 044d398ff1..add6e31930 100644 --- a/grc/blocks/gr_dpll_bb.xml +++ b/grc/blocks/gr_dpll_bb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Detect Peak</name> + <name>Detect Peak (old)</name> <key>gr_dpll_bb</key> <import>from gnuradio import gr</import> <make>gr.dpll_bb($period, $gain)</make> diff --git a/grc/blocks/gr_endian_swap.xml b/grc/blocks/gr_endian_swap.xml index aa564026cd..f826d42d44 100644 --- a/grc/blocks/gr_endian_swap.xml +++ b/grc/blocks/gr_endian_swap.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Endian Swap</name> + <name>Endian Swap (old)</name> <key>gr_endian_swap</key> <import>from gnuradio import gr</import> <make>gr.endian_swap($type.size)</make> diff --git a/grc/blocks/gr_feedforward_agc_cc.xml b/grc/blocks/gr_feedforward_agc_cc.xml index 24e80953f4..7af013cebb 100644 --- a/grc/blocks/gr_feedforward_agc_cc.xml +++ b/grc/blocks/gr_feedforward_agc_cc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Feed Forward AGC</name> + <name>Feed Forward AGC (old)</name> <key>gr_feedforward_agc_cc</key> <import>from gnuradio import gr</import> <make>gr.feedforward_agc_cc($num_samples, $reference)</make> diff --git a/grc/blocks/gr_fft_filter_xxx.xml b/grc/blocks/gr_fft_filter_xxx.xml index 5b4cd83cca..1147fc099d 100644 --- a/grc/blocks/gr_fft_filter_xxx.xml +++ b/grc/blocks/gr_fft_filter_xxx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>FFT Filter</name> + <name>FFT Filter (old)</name> <key>gr_fft_filter_xxx</key> <import>from gnuradio import gr</import> <import>from gnuradio.gr import firdes</import> diff --git a/grc/blocks/gr_fft_vxx.xml b/grc/blocks/gr_fft_vxx.xml index 565354e415..3bf7b4f1e1 100644 --- a/grc/blocks/gr_fft_vxx.xml +++ b/grc/blocks/gr_fft_vxx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>FFT</name> + <name>FFT (old)</name> <key>gr_fft_vxx</key> <import>from gnuradio import gr</import> <import>from gnuradio import window</import> diff --git a/grc/blocks/gr_file_sink.xml b/grc/blocks/gr_file_sink.xml index d0a693900f..7399192f1d 100644 --- a/grc/blocks/gr_file_sink.xml +++ b/grc/blocks/gr_file_sink.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>File Sink</name> + <name>File Sink (old)</name> <key>gr_file_sink</key> <import>from gnuradio import gr</import> <make>gr.file_sink($type.size*$vlen, $file) diff --git a/grc/blocks/gr_file_source.xml b/grc/blocks/gr_file_source.xml index 5f0e16b279..0eb2b37b11 100644 --- a/grc/blocks/gr_file_source.xml +++ b/grc/blocks/gr_file_source.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>File Source</name> + <name>File Source (old)</name> <key>gr_file_source</key> <import>from gnuradio import gr</import> <make>gr.file_source($type.size*$vlen, $file, $repeat)</make> diff --git a/grc/blocks/gr_filter_delay_fc.xml b/grc/blocks/gr_filter_delay_fc.xml index 30d65bf825..731eaf395c 100644 --- a/grc/blocks/gr_filter_delay_fc.xml +++ b/grc/blocks/gr_filter_delay_fc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Filter Delay</name> + <name>Filter Delay (old)</name> <key>gr_filter_delay_fc</key> <import>from gnuradio import gr</import> <import>from gnuradio.gr import firdes</import> diff --git a/grc/blocks/gr_fir_filter_xxx.xml b/grc/blocks/gr_fir_filter_xxx.xml index c4de8f539d..f2dad1dd46 100644 --- a/grc/blocks/gr_fir_filter_xxx.xml +++ b/grc/blocks/gr_fir_filter_xxx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Decimating FIR Filter</name> + <name>Decimating FIR Filter (old)</name> <key>gr_fir_filter_xxx</key> <import>from gnuradio import gr</import> <import>from gnuradio.gr import firdes</import> diff --git a/grc/blocks/gr_float_to_char.xml b/grc/blocks/gr_float_to_char.xml index 1fa500e3cf..68b12f3847 100644 --- a/grc/blocks/gr_float_to_char.xml +++ b/grc/blocks/gr_float_to_char.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Float To Char</name> + <name>Float To Char (old)</name> <key>gr_float_to_char</key> <import>from gnuradio import gr</import> <make>gr.float_to_char($vlen, $scale)</make> diff --git a/grc/blocks/gr_float_to_complex.xml b/grc/blocks/gr_float_to_complex.xml index a42cff3589..30bc1cd379 100644 --- a/grc/blocks/gr_float_to_complex.xml +++ b/grc/blocks/gr_float_to_complex.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Float To Complex</name> + <name>Float To Complex (old)</name> <key>gr_float_to_complex</key> <import>from gnuradio import gr</import> <make>gr.float_to_complex($vlen)</make> diff --git a/grc/blocks/gr_float_to_int.xml b/grc/blocks/gr_float_to_int.xml index b43c208a5a..3999cab6a7 100644 --- a/grc/blocks/gr_float_to_int.xml +++ b/grc/blocks/gr_float_to_int.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Float To Int</name> + <name>Float To Int (old)</name> <key>gr_float_to_int</key> <import>from gnuradio import gr</import> <make>gr.float_to_int($vlen, $scale)</make> diff --git a/grc/blocks/gr_float_to_short.xml b/grc/blocks/gr_float_to_short.xml index 4f76b8f580..14e4dd2cb3 100644 --- a/grc/blocks/gr_float_to_short.xml +++ b/grc/blocks/gr_float_to_short.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Float To Short</name> + <name>Float To Short (old)</name> <key>gr_float_to_short</key> <import>from gnuradio import gr</import> <make>gr.float_to_short($vlen, $scale)</make> diff --git a/grc/blocks/gr_float_to_uchar.xml b/grc/blocks/gr_float_to_uchar.xml index aa804d7d93..0ff345f0d3 100644 --- a/grc/blocks/gr_float_to_uchar.xml +++ b/grc/blocks/gr_float_to_uchar.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Float To UChar</name> + <name>Float To UChar (old)</name> <key>gr_float_to_uchar</key> <import>from gnuradio import gr</import> <make>gr.float_to_uchar()</make> diff --git a/grc/blocks/gr_fractional_interpolator_xx.xml b/grc/blocks/gr_fractional_interpolator_xx.xml index 8d65ff8bfc..022dcc6a69 100644 --- a/grc/blocks/gr_fractional_interpolator_xx.xml +++ b/grc/blocks/gr_fractional_interpolator_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Fractional Interpolator</name> + <name>Fractional Interpolator (old)</name> <key>gr_fractional_interpolator_xx</key> <import>from gnuradio import gr</import> <make>gr.fractional_interpolator_$(type.fcn)($phase_shift, $interp_ratio)</make> diff --git a/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml b/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml index e3ee66977d..ddbc69ec0d 100644 --- a/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml +++ b/grc/blocks/gr_freq_xlating_fir_filter_xxx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Frequency Xlating FIR Filter</name> + <name>Frequency Xlating FIR Filter (old)</name> <key>gr_freq_xlating_fir_filter_xxx</key> <import>from gnuradio import gr</import> <import>from gnuradio.gr import firdes</import> diff --git a/grc/blocks/gr_frequency_modulator_fc.xml b/grc/blocks/gr_frequency_modulator_fc.xml index d5f8fcfe35..d8da95b29f 100644 --- a/grc/blocks/gr_frequency_modulator_fc.xml +++ b/grc/blocks/gr_frequency_modulator_fc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Frequency Mod</name> + <name>Frequency Mod (old)</name> <key>gr_frequency_modulator_fc</key> <import>from gnuradio import gr</import> <make>gr.frequency_modulator_fc($sensitivity)</make> diff --git a/grc/blocks/gr_glfsr_source_x.xml b/grc/blocks/gr_glfsr_source_x.xml index 88fb66797b..4aa4b5d774 100644 --- a/grc/blocks/gr_glfsr_source_x.xml +++ b/grc/blocks/gr_glfsr_source_x.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>GLFSR Source</name> + <name>GLFSR Source (old)</name> <key>gr_glfsr_source_x</key> <import>from gnuradio import gr</import> <make>gr.glfsr_source_$(type.fcn)($degree, $repeat, $mask, $seed)</make> diff --git a/grc/blocks/gr_goertzel_fc.xml b/grc/blocks/gr_goertzel_fc.xml index f27d9582ea..5907bd0304 100644 --- a/grc/blocks/gr_goertzel_fc.xml +++ b/grc/blocks/gr_goertzel_fc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Goertzel</name> + <name>Goertzel (old)</name> <key>gr_goertzel_fc</key> <import>from gnuradio import gr</import> <make>gr.goertzel_fc($rate, $len, $freq)</make> diff --git a/grc/blocks/gr_head.xml b/grc/blocks/gr_head.xml index e5ff7f6aad..cb93071676 100644 --- a/grc/blocks/gr_head.xml +++ b/grc/blocks/gr_head.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Head</name> + <name>Head (old)</name> <key>gr_head</key> <import>from gnuradio import gr</import> <make>gr.head($type.size*$vlen, $num_items)</make> diff --git a/grc/blocks/gr_hilbert_fc.xml b/grc/blocks/gr_hilbert_fc.xml index 165e8da237..08dbe6386f 100644 --- a/grc/blocks/gr_hilbert_fc.xml +++ b/grc/blocks/gr_hilbert_fc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Hilbert</name> + <name>Hilbert (old)</name> <key>gr_hilbert_fc</key> <import>from gnuradio import gr</import> <make>gr.hilbert_fc($num_taps)</make> diff --git a/grc/blocks/gr_iir_filter_ffd.xml b/grc/blocks/gr_iir_filter_ffd.xml index 9799150e80..ffad5be165 100644 --- a/grc/blocks/gr_iir_filter_ffd.xml +++ b/grc/blocks/gr_iir_filter_ffd.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>IIR Filter</name> + <name>IIR Filter (old)</name> <key>gr_iir_filter_ffd</key> <import>from gnuradio import gr</import> <make>gr.iir_filter_ffd($fftaps, $fbtaps)</make> diff --git a/grc/blocks/gr_int_to_float.xml b/grc/blocks/gr_int_to_float.xml index 7430fec728..3a68282c40 100644 --- a/grc/blocks/gr_int_to_float.xml +++ b/grc/blocks/gr_int_to_float.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Int To Float</name> + <name>Int To Float (old)</name> <key>gr_int_to_float</key> <import>from gnuradio import gr</import> <make>gr.int_to_float($vlen, $scale)</make> diff --git a/grc/blocks/gr_integrate_xx.xml b/grc/blocks/gr_integrate_xx.xml index d0ebd42e2d..e3adb1d976 100644 --- a/grc/blocks/gr_integrate_xx.xml +++ b/grc/blocks/gr_integrate_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Integrate</name> + <name>Integrate (old)</name> <key>gr_integrate_xx</key> <import>from gnuradio import gr</import> <make>gr.integrate_$(type.fcn)($decim)</make> diff --git a/grc/blocks/gr_interleave.xml b/grc/blocks/gr_interleave.xml index 3db16ab552..6d3920d685 100644 --- a/grc/blocks/gr_interleave.xml +++ b/grc/blocks/gr_interleave.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Interleave</name> + <name>Interleave (old)</name> <key>gr_interleave</key> <import>from gnuradio import gr</import> <make>gr.interleave($type.size*$vlen)</make> diff --git a/grc/blocks/gr_interleaved_short_to_complex.xml b/grc/blocks/gr_interleaved_short_to_complex.xml index e3023e499d..edfe82f120 100644 --- a/grc/blocks/gr_interleaved_short_to_complex.xml +++ b/grc/blocks/gr_interleaved_short_to_complex.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>IShort To Complex</name> + <name>IShort To Complex (old)</name> <key>gr_interleaved_short_to_complex</key> <import>from gnuradio import gr</import> <make>gr.interleaved_short_to_complex()</make> diff --git a/grc/blocks/gr_interp_fir_filter_xxx.xml b/grc/blocks/gr_interp_fir_filter_xxx.xml index 55375ae021..66046d6081 100644 --- a/grc/blocks/gr_interp_fir_filter_xxx.xml +++ b/grc/blocks/gr_interp_fir_filter_xxx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Interpolating FIR Filter</name> + <name>Interpolating FIR Filter (old)</name> <key>gr_interp_fir_filter_xxx</key> <import>from gnuradio import gr</import> <import>from gnuradio.gr import firdes</import> diff --git a/grc/blocks/gr_keep_m_in_n.xml b/grc/blocks/gr_keep_m_in_n.xml index 35a1561764..34717cf5dc 100644 --- a/grc/blocks/gr_keep_m_in_n.xml +++ b/grc/blocks/gr_keep_m_in_n.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Keep M in N</name> + <name>Keep M in N (old)</name> <key>gr_keep_m_in_n</key> <import>from gnuradio import gr</import> <make>gr.keep_m_in_n($type.size, $m, $n, $offset)</make> diff --git a/grc/blocks/gr_keep_one_in_n.xml b/grc/blocks/gr_keep_one_in_n.xml index 21595b7559..dc382c30ef 100644 --- a/grc/blocks/gr_keep_one_in_n.xml +++ b/grc/blocks/gr_keep_one_in_n.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Keep 1 in N</name> + <name>Keep 1 in N (old)</name> <key>gr_keep_one_in_n</key> <import>from gnuradio import gr</import> <make>gr.keep_one_in_n($type.size*$vlen, $n)</make> diff --git a/grc/blocks/gr_kludge_copy.xml b/grc/blocks/gr_kludge_copy.xml index 8058b082db..fca60fcca0 100644 --- a/grc/blocks/gr_kludge_copy.xml +++ b/grc/blocks/gr_kludge_copy.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Kludge Copy</name> + <name>Kludge Copy (old)</name> <key>gr_kludge_copy</key> <import>from gnuradio import gr</import> <make>gr.kludge_copy($type.size*$vlen)</make> diff --git a/grc/blocks/gr_map_bb.xml b/grc/blocks/gr_map_bb.xml index 20d6bd2b44..a9964bff34 100644 --- a/grc/blocks/gr_map_bb.xml +++ b/grc/blocks/gr_map_bb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Map</name> + <name>Map (old)</name> <key>gr_map_bb</key> <import>from gnuradio import gr</import> <make>gr.map_bb($map)</make> diff --git a/grc/blocks/gr_max_xx.xml b/grc/blocks/gr_max_xx.xml index 9dbbe60e56..5718e8b5ba 100644 --- a/grc/blocks/gr_max_xx.xml +++ b/grc/blocks/gr_max_xx.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Max</name> + <name>Max (old)</name> <key>gr_max_xx</key> <import>from gnuradio import gr</import> <make>gr.max_$(type.fcn)($vlen)</make> diff --git a/grc/blocks/gr_message_burst_source.xml b/grc/blocks/gr_message_burst_source.xml index e835d2a2ce..0ec3adee14 100644 --- a/grc/blocks/gr_message_burst_source.xml +++ b/grc/blocks/gr_message_burst_source.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Message Burst Source</name> + <name>Message Burst Source (old)</name> <key>gr_message_burst_source</key> <import>from gnuradio import gr</import> <make>gr.message_burst_source($type.size*$vlen, $(id)_msgq_in)</make> diff --git a/grc/blocks/gr_message_debug.xml b/grc/blocks/gr_message_debug.xml index 964f957569..5aec5d0683 100644 --- a/grc/blocks/gr_message_debug.xml +++ b/grc/blocks/gr_message_debug.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Message Debug</name> + <name>Message Debug (old)</name> <key>gr_message_debug</key> <import>from gnuradio import gr</import> <make>gr.message_debug()</make> diff --git a/grc/blocks/gr_message_sink.xml b/grc/blocks/gr_message_sink.xml index 18e92adb97..3929d5a66d 100644 --- a/grc/blocks/gr_message_sink.xml +++ b/grc/blocks/gr_message_sink.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Message Sink</name> + <name>Message Sink (old)</name> <key>gr_message_sink</key> <import>from gnuradio import gr</import> <make>gr.message_sink($type.size*$vlen, $(id)_msgq_out, $dont_block)</make> diff --git a/grc/blocks/gr_message_source.xml b/grc/blocks/gr_message_source.xml index 72367b21b0..b54e83c1c2 100644 --- a/grc/blocks/gr_message_source.xml +++ b/grc/blocks/gr_message_source.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Message Source</name> + <name>Message Source (old)</name> <key>gr_message_source</key> <import>from gnuradio import gr</import> <make>gr.message_source($type.size*$vlen, $(id)_msgq_in)</make> diff --git a/grc/blocks/gr_message_strobe.xml b/grc/blocks/gr_message_strobe.xml index 60a7724dfc..596f84d8ba 100644 --- a/grc/blocks/gr_message_strobe.xml +++ b/grc/blocks/gr_message_strobe.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Message Strobe</name> + <name>Message Strobe (old)</name> <key>gr_message_strobe</key> <import>from gnuradio import gr</import> <import>from gruel import pmt</import> diff --git a/grc/blocks/gr_moving_average_xx.xml b/grc/blocks/gr_moving_average_xx.xml index b70943c785..6334f53c56 100644 --- a/grc/blocks/gr_moving_average_xx.xml +++ b/grc/blocks/gr_moving_average_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Moving Average</name> + <name>Moving Average (old)</name> <key>gr_moving_average_xx</key> <import>from gnuradio import gr</import> <make>gr.moving_average_$(type.fcn)($length, $scale, $max_iter)</make> diff --git a/grc/blocks/gr_mpsk_sync_cc.xml b/grc/blocks/gr_mpsk_sync_cc.xml deleted file mode 100644 index fd08f8340b..0000000000 --- a/grc/blocks/gr_mpsk_sync_cc.xml +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##MPSK Sync -################################################### - --> -<block> - <name>MPSK Sync</name> - <key>gr_mpsk_sync_cc</key> - <import>from gnuradio import gr</import> - <make>gr.mpsk_sync_cc($alpha, $beta, $max_freq, $min_freq, $ref_phase, $omega, $gain_omega, $mu, $gain_mu)</make> - <callback>set_mu($mu)</callback> - <callback>set_gain_mu($gain_mu)</callback> - <callback>set_omega($omega)</callback> - <callback>set_gain_omega($gain_omega)</callback> - <param> - <name>Alpha</name> - <key>alpha</key> - <type>real</type> - </param> - <param> - <name>Beta</name> - <key>beta</key> - <type>real</type> - </param> - <param> - <name>Max Freq</name> - <key>max_freq</key> - <type>real</type> - </param> - <param> - <name>Min Freq</name> - <key>min_freq</key> - <type>real</type> - </param> - <param> - <name>Reference Phase</name> - <key>ref_phase</key> - <type>real</type> - </param> - <param> - <name>Omega</name> - <key>omega</key> - <type>real</type> - </param> - <param> - <name>Gain Omega</name> - <key>gain_omega</key> - <type>real</type> - </param> - <param> - <name>Mu</name> - <key>mu</key> - <type>real</type> - </param> - <param> - <name>Gain Mu</name> - <key>gain_mu</key> - <type>real</type> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> - <source> - <name>out</name> - <type>complex</type> - </source> -</block> diff --git a/grc/blocks/gr_multiply_const_vxx.xml b/grc/blocks/gr_multiply_const_vxx.xml index 1309d75cde..98c69fa31a 100644 --- a/grc/blocks/gr_multiply_const_vxx.xml +++ b/grc/blocks/gr_multiply_const_vxx.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Multiply Const</name> + <name>Multiply Const (old)</name> <key>gr_multiply_const_vxx</key> <import>from gnuradio import gr</import> <make>gr.multiply_const_v$(type.fcn)($const)</make> diff --git a/grc/blocks/gr_multiply_xx.xml b/grc/blocks/gr_multiply_xx.xml index 60f65c2745..4ff9e1c5ef 100644 --- a/grc/blocks/gr_multiply_xx.xml +++ b/grc/blocks/gr_multiply_xx.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Multiply</name> + <name>Multiply (old)</name> <key>gr_multiply_xx</key> <import>from gnuradio import gr</import> <make>gr.multiply_v$(type.fcn)($vlen)</make> diff --git a/grc/blocks/gr_mute_xx.xml b/grc/blocks/gr_mute_xx.xml index a9a857c6a1..0ca593b854 100644 --- a/grc/blocks/gr_mute_xx.xml +++ b/grc/blocks/gr_mute_xx.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Mute</name> + <name>Mute (old)</name> <key>gr_mute_xx</key> <import>from gnuradio import gr</import> <make>gr.mute_$(type.fcn)(bool($mute))</make> diff --git a/grc/blocks/gr_nlog10_ff.xml b/grc/blocks/gr_nlog10_ff.xml index 9350782368..4d4efe4ce9 100644 --- a/grc/blocks/gr_nlog10_ff.xml +++ b/grc/blocks/gr_nlog10_ff.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Log10</name> + <name>Log10 (old)</name> <key>gr_nlog10_ff</key> <import>from gnuradio import gr</import> <make>gr.nlog10_ff($n, $vlen, $k)</make> diff --git a/grc/blocks/gr_noise_source_x.xml b/grc/blocks/gr_noise_source_x.xml index 72daaaa209..c37127977b 100644 --- a/grc/blocks/gr_noise_source_x.xml +++ b/grc/blocks/gr_noise_source_x.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Noise Source</name> + <name>Noise Source (old)</name> <key>gr_noise_source_x</key> <import>from gnuradio import gr</import> <make>gr.noise_source_$(type.fcn)($noise_type, $amp, $seed)</make> diff --git a/grc/blocks/gr_nop.xml b/grc/blocks/gr_nop.xml index bd884d6b8b..65f24b0ade 100644 --- a/grc/blocks/gr_nop.xml +++ b/grc/blocks/gr_nop.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Nop</name> + <name>Nop (old)</name> <key>gr_nop</key> <import>from gnuradio import gr</import> <make>gr.nop($type.size*$vlen)</make> diff --git a/grc/blocks/gr_not_xx.xml b/grc/blocks/gr_not_xx.xml index 1c2bb87096..0dcbbf8e6c 100644 --- a/grc/blocks/gr_not_xx.xml +++ b/grc/blocks/gr_not_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Not</name> + <name>Not (old)</name> <key>gr_not_xx</key> <import>from gnuradio import gr</import> <make>gr.not_$(type.fcn)()</make> diff --git a/grc/blocks/gr_null_sink.xml b/grc/blocks/gr_null_sink.xml index ed106b4950..497f3a85ab 100644 --- a/grc/blocks/gr_null_sink.xml +++ b/grc/blocks/gr_null_sink.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Null Sink</name> + <name>Null Sink (old)</name> <key>gr_null_sink</key> <import>from gnuradio import gr</import> <make>gr.null_sink($type.size*$vlen)</make> diff --git a/grc/blocks/gr_null_source.xml b/grc/blocks/gr_null_source.xml index 6132eae3cb..42d5b2edbb 100644 --- a/grc/blocks/gr_null_source.xml +++ b/grc/blocks/gr_null_source.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Null Source</name> + <name>Null Source (old)</name> <key>gr_null_source</key> <import>from gnuradio import gr</import> <make>gr.null_source($type.size*$vlen)</make> diff --git a/grc/blocks/gr_or_xx.xml b/grc/blocks/gr_or_xx.xml index b374aa22ab..4d29dc1495 100644 --- a/grc/blocks/gr_or_xx.xml +++ b/grc/blocks/gr_or_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Or</name> + <name>Or (old)</name> <key>gr_or_xx</key> <import>from gnuradio import gr</import> <make>gr.or_$(type.fcn)()</make> diff --git a/grc/blocks/gr_pack_k_bits_bb.xml b/grc/blocks/gr_pack_k_bits_bb.xml index 34e64a5d96..958e308c6a 100644 --- a/grc/blocks/gr_pack_k_bits_bb.xml +++ b/grc/blocks/gr_pack_k_bits_bb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Pack K Bits</name> + <name>Pack K Bits (old)</name> <key>gr_pack_k_bits_bb</key> <import>from gnuradio import gr</import> <make>gr.pack_k_bits_bb($k)</make> diff --git a/grc/blocks/gr_packed_to_unpacked_xx.xml b/grc/blocks/gr_packed_to_unpacked_xx.xml index c1477dd9ca..ffba71cce3 100644 --- a/grc/blocks/gr_packed_to_unpacked_xx.xml +++ b/grc/blocks/gr_packed_to_unpacked_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Packed to Unpacked</name> + <name>Packed to Unpacked (old)</name> <key>gr_packed_to_unpacked_xx</key> <import>from gnuradio import gr</import> <make>gr.packed_to_unpacked_$(type.fcn)($bits_per_chunk, $endianness)</make> diff --git a/grc/blocks/gr_pdu_to_tagged_stream.xml b/grc/blocks/gr_pdu_to_tagged_stream.xml index 6d2fea97e7..2d4a517129 100644 --- a/grc/blocks/gr_pdu_to_tagged_stream.xml +++ b/grc/blocks/gr_pdu_to_tagged_stream.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>PDU to Tagged Stream</name> + <name>PDU to Tagged Stream (old)</name> <key>gr_pdu_to_tagged_stream</key> <import>from gnuradio import gr</import> <make>gr.pdu_to_tagged_stream($type.tv)</make> diff --git a/grc/blocks/gr_peak_detector2_fb.xml b/grc/blocks/gr_peak_detector2_fb.xml index 128c6244f7..998d97a9d2 100644 --- a/grc/blocks/gr_peak_detector2_fb.xml +++ b/grc/blocks/gr_peak_detector2_fb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Peak Detector2</name> + <name>Peak Detector2 (old)</name> <key>gr_peak_detector2_fb</key> <import>from gnuradio import gr</import> <make>gr.peak_detector2_fb($threshold_factor_rise, $look_ahead, $alpha)</make> diff --git a/grc/blocks/gr_peak_detector_xb.xml b/grc/blocks/gr_peak_detector_xb.xml index 394b0697f8..a789b372b9 100644 --- a/grc/blocks/gr_peak_detector_xb.xml +++ b/grc/blocks/gr_peak_detector_xb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Peak Detector</name> + <name>Peak Detector (old)</name> <key>gr_peak_detector_xb</key> <import>from gnuradio import gr</import> <make>gr.peak_detector_$(type.fcn)b($threshold_factor_rise, $threshold_factor_fall, $look_ahead, $alpha)</make> diff --git a/grc/blocks/gr_pfb_clock_sync.xml b/grc/blocks/gr_pfb_clock_sync.xml index 3e5e65d127..d469e065d6 100644 --- a/grc/blocks/gr_pfb_clock_sync.xml +++ b/grc/blocks/gr_pfb_clock_sync.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Polyphase Clock Sync</name> + <name>Polyphase Clock Sync (old)</name> <key>gr_pfb_clock_sync_xxx</key> <import>from gnuradio import gr</import> <make>gr.pfb_clock_sync_$(type)($sps, $alpha, $taps, $filter_size, $init_phase, $max_dev, $osps) diff --git a/grc/blocks/gr_pfb_synthesizer.xml b/grc/blocks/gr_pfb_synthesizer.xml index 49e5cb0321..b78d345586 100644 --- a/grc/blocks/gr_pfb_synthesizer.xml +++ b/grc/blocks/gr_pfb_synthesizer.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Polyphase Synthesizer</name> + <name>Polyphase Synthesizer (old)</name> <key>gr_pfb_synthesizer_ccf</key> <import>from gnuradio import gr</import> <import>from gnuradio.gr import firdes</import> diff --git a/grc/blocks/gr_phase_modulator_fc.xml b/grc/blocks/gr_phase_modulator_fc.xml index 758c50863b..bcde45a635 100644 --- a/grc/blocks/gr_phase_modulator_fc.xml +++ b/grc/blocks/gr_phase_modulator_fc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Phase Mod</name> + <name>Phase Mod (old)</name> <key>gr_phase_modulator_fc</key> <import>from gnuradio import gr</import> <make>gr.phase_modulator_fc($sensitivity)</make> diff --git a/grc/blocks/gr_pll_carriertracking_cc.xml b/grc/blocks/gr_pll_carriertracking_cc.xml index 27e6732482..cb90b197d6 100644 --- a/grc/blocks/gr_pll_carriertracking_cc.xml +++ b/grc/blocks/gr_pll_carriertracking_cc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>PLL Carrier Tracking</name> + <name>PLL Carrier Tracking (old)</name> <key>gr_pll_carriertracking_cc</key> <import>from gnuradio import gr</import> <make>gr.pll_carriertracking_cc($w, $max_freq, $min_freq)</make> diff --git a/grc/blocks/gr_pll_freqdet_cf.xml b/grc/blocks/gr_pll_freqdet_cf.xml index d6e4694f00..b73cd6ff10 100644 --- a/grc/blocks/gr_pll_freqdet_cf.xml +++ b/grc/blocks/gr_pll_freqdet_cf.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>PLL Freq Det</name> + <name>PLL Freq Det (old)</name> <key>gr_pll_freqdet_cf</key> <import>from gnuradio import gr</import> <make>gr.pll_freqdet_cf($w, $max_freq, $min_freq)</make> diff --git a/grc/blocks/gr_pll_refout_cc.xml b/grc/blocks/gr_pll_refout_cc.xml index b231ddd19a..a92bf2c3ed 100644 --- a/grc/blocks/gr_pll_refout_cc.xml +++ b/grc/blocks/gr_pll_refout_cc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>PLL Ref Out</name> + <name>PLL Ref Out (old)</name> <key>gr_pll_refout_cc</key> <import>from gnuradio import gr</import> <make>gr.pll_refout_cc($w, $max_freq, $min_freq)</make> diff --git a/grc/blocks/gr_pn_correlator_cc.xml b/grc/blocks/gr_pn_correlator_cc.xml index 094f46cdfd..54d512a28b 100644 --- a/grc/blocks/gr_pn_correlator_cc.xml +++ b/grc/blocks/gr_pn_correlator_cc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>PN Correlator</name> + <name>PN Correlator (old)</name> <key>gr_pn_correlator_cc</key> <import>from gnuradio import gr</import> <make>gr.pn_correlator_cc($degree, $mask, $seed)</make> diff --git a/grc/blocks/gr_probe_avg_mag_sqrd_x.xml b/grc/blocks/gr_probe_avg_mag_sqrd_x.xml index 6bf706ae1c..65fd0e763b 100644 --- a/grc/blocks/gr_probe_avg_mag_sqrd_x.xml +++ b/grc/blocks/gr_probe_avg_mag_sqrd_x.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Probe Avg Mag^2</name> + <name>Probe Avg Mag^2 (old)</name> <key>gr_probe_avg_mag_sqrd_x</key> <import>from gnuradio import gr</import> <make>gr.probe_avg_mag_sqrd_$(type)($threshold, $alpha)</make> diff --git a/grc/blocks/gr_probe_density_b.xml b/grc/blocks/gr_probe_density_b.xml index 3a91256aa5..84dec814a5 100644 --- a/grc/blocks/gr_probe_density_b.xml +++ b/grc/blocks/gr_probe_density_b.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Probe Density</name> + <name>Probe Density (old)</name> <key>gr_probe_density_b</key> <import>from gnuradio import gr</import> <make>gr.probe_density_b($alpha)</make> diff --git a/grc/blocks/gr_probe_signal_f.xml b/grc/blocks/gr_probe_signal_f.xml index 5c38e816f0..731da6f49b 100644 --- a/grc/blocks/gr_probe_signal_f.xml +++ b/grc/blocks/gr_probe_signal_f.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Probe Signal</name> + <name>Probe Signal (old)</name> <key>gr_probe_signal_f</key> <import>from gnuradio import gr</import> <make>gr.probe_signal_f()</make> diff --git a/grc/blocks/gr_pwr_squelch_xx.xml b/grc/blocks/gr_pwr_squelch_xx.xml index 08d6211770..12bd337ebd 100644 --- a/grc/blocks/gr_pwr_squelch_xx.xml +++ b/grc/blocks/gr_pwr_squelch_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Power Squelch</name> + <name>Power Squelch (old)</name> <key>gr_pwr_squelch_xx</key> <import>from gnuradio import gr</import> <make>gr.pwr_squelch_$(type.fcn)($threshold, $alpha, $ramp, $gate)</make> diff --git a/grc/blocks/gr_quadrature_demod_cf.xml b/grc/blocks/gr_quadrature_demod_cf.xml index fad0b3879c..ed0f326a4b 100644 --- a/grc/blocks/gr_quadrature_demod_cf.xml +++ b/grc/blocks/gr_quadrature_demod_cf.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Quadrature Demod</name> + <name>Quadrature Demod (old)</name> <key>gr_quadrature_demod_cf</key> <import>from gnuradio import gr</import> <make>gr.quadrature_demod_cf($gain)</make> diff --git a/grc/blocks/gr_rational_resampler_base_xxx.xml b/grc/blocks/gr_rational_resampler_base_xxx.xml index 4b7720173c..7bdf0577e0 100644 --- a/grc/blocks/gr_rational_resampler_base_xxx.xml +++ b/grc/blocks/gr_rational_resampler_base_xxx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Rational Resampler Base</name> + <name>Rational Resampler Base (old)</name> <key>gr_rational_resampler_base_xxx</key> <import>from gnuradio import gr</import> <import>from gnuradio.gr import firdes</import> diff --git a/grc/blocks/gr_repeat.xml b/grc/blocks/gr_repeat.xml index ba652a4d79..6555e391fa 100644 --- a/grc/blocks/gr_repeat.xml +++ b/grc/blocks/gr_repeat.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Repeat</name> + <name>Repeat (old)</name> <key>gr_repeat</key> <import>from gnuradio import gr</import> <make>gr.repeat($type.size*$vlen, $interp)</make> diff --git a/grc/blocks/gr_rms_xx.xml b/grc/blocks/gr_rms_xx.xml index 1e0947192b..e878871e8e 100644 --- a/grc/blocks/gr_rms_xx.xml +++ b/grc/blocks/gr_rms_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>RMS</name> + <name>RMS (old)</name> <key>gr_rms_xx</key> <import>from gnuradio import gr</import> <make>gr.rms_$(type.fcn)f($alpha)</make> diff --git a/grc/blocks/gr_sample_and_hold_xx.xml b/grc/blocks/gr_sample_and_hold_xx.xml index 2a036c3fdb..82400cf84e 100644 --- a/grc/blocks/gr_sample_and_hold_xx.xml +++ b/grc/blocks/gr_sample_and_hold_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Sample and Hold</name> + <name>Sample and Hold (old)</name> <key>gr_sample_and_hold_xx</key> <import>from gnuradio import gr</import> <make>gr.sample_and_hold_$(type.fcn)()</make> diff --git a/grc/blocks/gr_scrambler_bb.xml b/grc/blocks/gr_scrambler_bb.xml index d079c4015f..17270eafc1 100644 --- a/grc/blocks/gr_scrambler_bb.xml +++ b/grc/blocks/gr_scrambler_bb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Scrambler</name> + <name>Scrambler (old)</name> <key>gr_scrambler_bb</key> <import>from gnuradio import gr</import> <make>gr.scrambler_bb($mask, $seed, $len)</make> diff --git a/grc/blocks/gr_short_to_char.xml b/grc/blocks/gr_short_to_char.xml index 9c41da84ef..2021eaf838 100644 --- a/grc/blocks/gr_short_to_char.xml +++ b/grc/blocks/gr_short_to_char.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Short To Char</name> + <name>Short To Char (old)</name> <key>gr_short_to_char</key> <import>from gnuradio import gr</import> <make>gr.short_to_char($vlen)</make> diff --git a/grc/blocks/gr_short_to_float.xml b/grc/blocks/gr_short_to_float.xml index 529f8c78cb..bf3657b638 100644 --- a/grc/blocks/gr_short_to_float.xml +++ b/grc/blocks/gr_short_to_float.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Short To Float</name> + <name>Short To Float (old)</name> <key>gr_short_to_float</key> <import>from gnuradio import gr</import> <make>gr.short_to_float($vlen, $scale)</make> diff --git a/grc/blocks/gr_sig_source_x.xml b/grc/blocks/gr_sig_source_x.xml index 644cf52d0c..fcb36b9a1c 100644 --- a/grc/blocks/gr_sig_source_x.xml +++ b/grc/blocks/gr_sig_source_x.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Signal Source</name> + <name>Signal Source (old)</name> <key>gr_sig_source_x</key> <import>from gnuradio import gr</import> <make>gr.sig_source_$(type.fcn)($samp_rate, $waveform, $freq, $amp, $offset)</make> diff --git a/grc/blocks/gr_simple_correlator.xml b/grc/blocks/gr_simple_correlator.xml index 820523a644..c6c076b8be 100644 --- a/grc/blocks/gr_simple_correlator.xml +++ b/grc/blocks/gr_simple_correlator.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Simple Correlator</name> + <name>Simple Correlator (old)</name> <key>gr_simple_correlator</key> <import>from gnuradio import gr</import> <make>gr.simple_correlator($payload_bytesize)</make> diff --git a/grc/blocks/gr_simple_framer.xml b/grc/blocks/gr_simple_framer.xml index 2a0295c417..aa194d7ab2 100644 --- a/grc/blocks/gr_simple_framer.xml +++ b/grc/blocks/gr_simple_framer.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Simple Framer</name> + <name>Simple Framer (old)</name> <key>gr_simple_framer</key> <import>from gnuradio import gr</import> <make>gr.simple_framer($payload_bytesize)</make> diff --git a/grc/blocks/gr_simple_squelch_cc.xml b/grc/blocks/gr_simple_squelch_cc.xml index 5c0727f5f8..1be4b662e6 100644 --- a/grc/blocks/gr_simple_squelch_cc.xml +++ b/grc/blocks/gr_simple_squelch_cc.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Simple Squelch</name> + <name>Simple Squelch (old)</name> <key>gr_simple_squelch_cc</key> <import>from gnuradio import gr</import> <make>gr.simple_squelch_cc($threshold, $alpha)</make> diff --git a/grc/blocks/gr_single_pole_iir_filter_xx.xml b/grc/blocks/gr_single_pole_iir_filter_xx.xml index 50cf4a82d8..8d8b455a46 100644 --- a/grc/blocks/gr_single_pole_iir_filter_xx.xml +++ b/grc/blocks/gr_single_pole_iir_filter_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Single Pole IIR Filter</name> + <name>Single Pole IIR Filter (old)</name> <key>gr_single_pole_iir_filter_xx</key> <import>from gnuradio import gr</import> <make>gr.single_pole_iir_filter_$(type.fcn)($alpha, $vlen)</make> diff --git a/grc/blocks/gr_skiphead.xml b/grc/blocks/gr_skiphead.xml index 0849ad2981..be1c0c7655 100644 --- a/grc/blocks/gr_skiphead.xml +++ b/grc/blocks/gr_skiphead.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Skip Head</name> + <name>Skip Head (old)</name> <key>gr_skiphead</key> <import>from gnuradio import gr</import> <make>gr.skiphead($type.size*$vlen, $num_items)</make> diff --git a/grc/blocks/gr_socket_pdu.xml b/grc/blocks/gr_socket_pdu.xml index a175c36991..020958d739 100644 --- a/grc/blocks/gr_socket_pdu.xml +++ b/grc/blocks/gr_socket_pdu.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Socket PDU</name> + <name>Socket PDU (old)</name> <key>gr_socket_pdu</key> <import>from gnuradio import gr</import> <make>gr.socket_pdu($type, $host, $port, $mtu)</make> diff --git a/grc/blocks/gr_stream_mux.xml b/grc/blocks/gr_stream_mux.xml index 8efe7b6555..53ce31bc96 100644 --- a/grc/blocks/gr_stream_mux.xml +++ b/grc/blocks/gr_stream_mux.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Stream Mux</name> + <name>Stream Mux (old)</name> <key>gr_stream_mux</key> <import>from gnuradio import gr</import> <make>gr.stream_mux($type.size*$vlen, $lengths)</make> diff --git a/grc/blocks/gr_stream_to_streams.xml b/grc/blocks/gr_stream_to_streams.xml index 82542b8d44..7f99aae1b6 100644 --- a/grc/blocks/gr_stream_to_streams.xml +++ b/grc/blocks/gr_stream_to_streams.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Stream to Streams</name> + <name>Stream to Streams (old)</name> <key>gr_stream_to_streams</key> <import>from gnuradio import gr</import> <make>gr.stream_to_streams($type.size*$vlen, $num_streams)</make> diff --git a/grc/blocks/gr_stream_to_vector.xml b/grc/blocks/gr_stream_to_vector.xml index 296d786f8c..83d20607cc 100644 --- a/grc/blocks/gr_stream_to_vector.xml +++ b/grc/blocks/gr_stream_to_vector.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Stream to Vector</name> + <name>Stream to Vector (old)</name> <key>gr_stream_to_vector</key> <import>from gnuradio import gr</import> <make>gr.stream_to_vector($type.size*$vlen, $num_items)</make> diff --git a/grc/blocks/gr_streams_to_stream.xml b/grc/blocks/gr_streams_to_stream.xml index 7aadd7eef2..eed8be6d37 100644 --- a/grc/blocks/gr_streams_to_stream.xml +++ b/grc/blocks/gr_streams_to_stream.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Streams to Stream</name> + <name>Streams to Stream (old)</name> <key>gr_streams_to_stream</key> <import>from gnuradio import gr</import> <make>gr.streams_to_stream($type.size*$vlen, $num_streams)</make> diff --git a/grc/blocks/gr_streams_to_vector.xml b/grc/blocks/gr_streams_to_vector.xml index 4ecdcb2d41..944a511996 100644 --- a/grc/blocks/gr_streams_to_vector.xml +++ b/grc/blocks/gr_streams_to_vector.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Streams to Vector</name> + <name>Streams to Vector (old)</name> <key>gr_streams_to_vector</key> <import>from gnuradio import gr</import> <make>gr.streams_to_vector($type.size*$vlen, $num_streams)</make> diff --git a/grc/blocks/gr_sub_xx.xml b/grc/blocks/gr_sub_xx.xml index c677747da9..54c7883aff 100644 --- a/grc/blocks/gr_sub_xx.xml +++ b/grc/blocks/gr_sub_xx.xml @@ -6,7 +6,7 @@ ################################################### --> <block> - <name>Subtract</name> + <name>Subtract (old)</name> <key>gr_sub_xx</key> <import>from gnuradio import gr</import> <make>gr.sub_$(type.fcn)($vlen)</make> diff --git a/grc/blocks/gr_tag_debug.xml b/grc/blocks/gr_tag_debug.xml index 4af7729be9..c3ac63735c 100644 --- a/grc/blocks/gr_tag_debug.xml +++ b/grc/blocks/gr_tag_debug.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Tag Debug</name> + <name>Tag Debug (old)</name> <key>gr_tag_debug</key> <import>from gnuradio import gr</import> <make>gr.tag_debug($type.size*$vlen, $name)</make> diff --git a/grc/blocks/gr_tagged_stream_to_pdu.xml b/grc/blocks/gr_tagged_stream_to_pdu.xml index e2f754c9eb..75b4ab5d1f 100644 --- a/grc/blocks/gr_tagged_stream_to_pdu.xml +++ b/grc/blocks/gr_tagged_stream_to_pdu.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Tagged Stream to PDU</name> + <name>Tagged Stream to PDU (old)</name> <key>gr_tagged_stream_to_pdu</key> <import>from gnuradio import gr</import> <make>gr.tagged_stream_to_pdu($type.tv)</make> diff --git a/grc/blocks/gr_threshold_ff.xml b/grc/blocks/gr_threshold_ff.xml index 740ce5794c..12650297a7 100644 --- a/grc/blocks/gr_threshold_ff.xml +++ b/grc/blocks/gr_threshold_ff.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Threshold</name> + <name>Threshold (old)</name> <key>gr_threshold_ff</key> <import>from gnuradio import gr</import> <make>gr.threshold_ff($low, $high, $init)</make> diff --git a/grc/blocks/gr_throttle.xml b/grc/blocks/gr_throttle.xml index e3a5a2ba19..978aa29662 100644 --- a/grc/blocks/gr_throttle.xml +++ b/grc/blocks/gr_throttle.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Throttle</name> + <name>Throttle (old)</name> <key>gr_throttle</key> <throttle>1</throttle> <import>from gnuradio import gr</import> diff --git a/grc/blocks/gr_transcendental.xml b/grc/blocks/gr_transcendental.xml index eede447f98..2862fb17e6 100644 --- a/grc/blocks/gr_transcendental.xml +++ b/grc/blocks/gr_transcendental.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Transcendental</name> + <name>Transcendental (old)</name> <key>gr_transcendental</key> <import>from gnuradio import gr</import> <make>gr.transcendental($name, "$type")</make> diff --git a/grc/blocks/gr_tuntap_pdu.xml b/grc/blocks/gr_tuntap_pdu.xml index f169345afa..eff31219fb 100644 --- a/grc/blocks/gr_tuntap_pdu.xml +++ b/grc/blocks/gr_tuntap_pdu.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>TunTap PDU</name> + <name>TunTap PDU (old)</name> <key>gr_tuntap_pdu</key> <import>from gnuradio import gr</import> <make>gr.tuntap_pdu($ifn, $mtu)</make> diff --git a/grc/blocks/gr_uchar_to_float.xml b/grc/blocks/gr_uchar_to_float.xml index 0a5f7f96a5..8e270681e0 100644 --- a/grc/blocks/gr_uchar_to_float.xml +++ b/grc/blocks/gr_uchar_to_float.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>UChar To Float</name> + <name>UChar To Float (old)</name> <key>gr_uchar_to_float</key> <import>from gnuradio import gr</import> <make>gr.uchar_to_float()</make> diff --git a/grc/blocks/gr_udp_sink.xml b/grc/blocks/gr_udp_sink.xml index 45f81075f0..006848048a 100644 --- a/grc/blocks/gr_udp_sink.xml +++ b/grc/blocks/gr_udp_sink.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>UDP Sink</name> + <name>UDP Sink (old)</name> <key>gr_udp_sink</key> <import>from gnuradio import gr</import> <make>gr.udp_sink($type.size*$vlen, $ipaddr, $port, $psize, $eof)</make> diff --git a/grc/blocks/gr_udp_source.xml b/grc/blocks/gr_udp_source.xml index a1b961651f..f74d58e74e 100644 --- a/grc/blocks/gr_udp_source.xml +++ b/grc/blocks/gr_udp_source.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>UDP Source</name> + <name>UDP Source (old)</name> <key>gr_udp_source</key> <import>from gnuradio import gr</import> <make>gr.udp_source($type.size*$vlen, $ipaddr, $port, $psize, $eof, $wait)</make> diff --git a/grc/blocks/gr_unpack_k_bits_bb.xml b/grc/blocks/gr_unpack_k_bits_bb.xml index 9917644ab5..ce6f19b072 100644 --- a/grc/blocks/gr_unpack_k_bits_bb.xml +++ b/grc/blocks/gr_unpack_k_bits_bb.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Unpack K Bits</name> + <name>Unpack K Bits (old)</name> <key>gr_unpack_k_bits_bb</key> <import>from gnuradio import gr</import> <make>gr.unpack_k_bits_bb($k)</make> diff --git a/grc/blocks/gr_unpacked_to_packed_xx.xml b/grc/blocks/gr_unpacked_to_packed_xx.xml index 427c800824..3366d65055 100644 --- a/grc/blocks/gr_unpacked_to_packed_xx.xml +++ b/grc/blocks/gr_unpacked_to_packed_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Unpacked to Packed</name> + <name>Unpacked to Packed (old)</name> <key>gr_unpacked_to_packed_xx</key> <import>from gnuradio import gr</import> <make>gr.unpacked_to_packed_$(type.fcn)($bits_per_chunk, $endianness)</make> diff --git a/grc/blocks/gr_vco_f.xml b/grc/blocks/gr_vco_f.xml index e49c539651..196f56a2d0 100644 --- a/grc/blocks/gr_vco_f.xml +++ b/grc/blocks/gr_vco_f.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>VCO</name> + <name>VCO (old)</name> <key>gr_vco_f</key> <import>from gnuradio import gr</import> <make>gr.vco_f($samp_rate, $sensitivity, $amplitude)</make> diff --git a/grc/blocks/gr_vector_insert_x.xml b/grc/blocks/gr_vector_insert_x.xml index f9ce1f6544..8d8e869381 100644 --- a/grc/blocks/gr_vector_insert_x.xml +++ b/grc/blocks/gr_vector_insert_x.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Vector Insert</name> + <name>Vector Insert (old)</name> <key>gr_vector_insert_x</key> <import>from gnuradio import gr</import> <make>gr.vector_insert_$(type.fcn)($vector, $period, $offset)</make> diff --git a/grc/blocks/gr_vector_sink_x.xml b/grc/blocks/gr_vector_sink_x.xml index 3bd998698f..e71480565f 100644 --- a/grc/blocks/gr_vector_sink_x.xml +++ b/grc/blocks/gr_vector_sink_x.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Vector Sink</name> + <name>Vector Sink (old)</name> <key>gr_vector_sink_x</key> <import>from gnuradio import gr</import> <make>gr.vector_sink_$(type.fcn)($vlen)</make> diff --git a/grc/blocks/gr_vector_source_x.xml b/grc/blocks/gr_vector_source_x.xml index b3e595a453..7d00feb16a 100644 --- a/grc/blocks/gr_vector_source_x.xml +++ b/grc/blocks/gr_vector_source_x.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Vector Source</name> + <name>Vector Source (old)</name> <key>gr_vector_source_x</key> <import>from gnuradio import gr</import> <make>gr.vector_source_$(type.fcn)($vector, $repeat, $vlen, $tags) diff --git a/grc/blocks/gr_vector_to_stream.xml b/grc/blocks/gr_vector_to_stream.xml index d56d340677..1091116fab 100644 --- a/grc/blocks/gr_vector_to_stream.xml +++ b/grc/blocks/gr_vector_to_stream.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Vector to Stream</name> + <name>Vector to Stream (old)</name> <key>gr_vector_to_stream</key> <import>from gnuradio import gr</import> <make>gr.vector_to_stream($type.size*$vlen, $num_items)</make> diff --git a/grc/blocks/gr_vector_to_streams.xml b/grc/blocks/gr_vector_to_streams.xml index 86cb56813c..29ee2d1321 100644 --- a/grc/blocks/gr_vector_to_streams.xml +++ b/grc/blocks/gr_vector_to_streams.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Vector to Streams</name> + <name>Vector to Streams (old)</name> <key>gr_vector_to_streams</key> <import>from gnuradio import gr</import> <make>gr.vector_to_streams($type.size*$vlen, $num_streams)</make> diff --git a/grc/blocks/gr_wavfile_sink.xml b/grc/blocks/gr_wavfile_sink.xml index 651e16cb6b..a1c002a3f9 100644 --- a/grc/blocks/gr_wavfile_sink.xml +++ b/grc/blocks/gr_wavfile_sink.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Wav File Sink</name> + <name>Wav File Sink (old)</name> <key>gr_wavfile_sink</key> <import>from gnuradio import gr</import> <make>gr.wavfile_sink($file, $nchan, $samp_rate, $bits_per_sample)</make> diff --git a/grc/blocks/gr_wavfile_source.xml b/grc/blocks/gr_wavfile_source.xml index 433bb0af21..80c864e12a 100644 --- a/grc/blocks/gr_wavfile_source.xml +++ b/grc/blocks/gr_wavfile_source.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Wav File Source</name> + <name>Wav File Source (old)</name> <key>gr_wavfile_source</key> <import>from gnuradio import gr</import> <make>gr.wavfile_source($file, $repeat)</make> diff --git a/grc/blocks/gr_xor_xx.xml b/grc/blocks/gr_xor_xx.xml index c014cbe577..79d97b0f5b 100644 --- a/grc/blocks/gr_xor_xx.xml +++ b/grc/blocks/gr_xor_xx.xml @@ -5,7 +5,7 @@ ################################################### --> <block> - <name>Xor</name> + <name>Xor (old)</name> <key>gr_xor_xx</key> <import>from gnuradio import gr</import> <make>gr.xor_$(type.fcn)()</make> |