diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 11:50:35 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 12:37:40 -0400 |
| commit | 8b1303bbb0bf72569a5149082796f50b6e8f9a5b (patch) | |
| tree | 5809962a19338db21f28957535529552d12992a1 /gr-analog | |
| parent | 2930f1b4265b794599d814e9a3d68fd03bde010f (diff) | |
docs: fixes for merge conflicts and differences between master/next.
Diffstat (limited to 'gr-analog')
| -rw-r--r-- | gr-analog/include/analog/agc.h | 1 | ||||
| -rw-r--r-- | gr-analog/include/analog/agc2.h | 1 | ||||
| -rw-r--r-- | gr-analog/include/analog/sig_source_waveform.h | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/gr-analog/include/analog/agc.h b/gr-analog/include/analog/agc.h index 9418c1f8fb..ae3af7091d 100644 --- a/gr-analog/include/analog/agc.h +++ b/gr-analog/include/analog/agc.h @@ -33,6 +33,7 @@ namespace gr { /*! * \brief high performance Automatic Gain Control class for complex signals. + * \ingroup level_controllers_blk * * \details * For Power the absolute value of the complex number is used. diff --git a/gr-analog/include/analog/agc2.h b/gr-analog/include/analog/agc2.h index 89d4b43694..1e1f695fe9 100644 --- a/gr-analog/include/analog/agc2.h +++ b/gr-analog/include/analog/agc2.h @@ -33,6 +33,7 @@ namespace gr { /*! * \brief high performance Automatic Gain Control class + * \ingroup level_controllers_blk * * \details * For Power the absolute value of the complex number is used. diff --git a/gr-analog/include/analog/sig_source_waveform.h b/gr-analog/include/analog/sig_source_waveform.h index 3a9edb8f37..e3efeb1fbb 100644 --- a/gr-analog/include/analog/sig_source_waveform.h +++ b/gr-analog/include/analog/sig_source_waveform.h @@ -26,6 +26,10 @@ namespace gr { namespace analog { + /*! + * \brief Types of signal generator waveforms. + * \ingroup waveform_generators_blk + */ typedef enum { GR_CONST_WAVE = 100, GR_SIN_WAVE, |