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-noaa | |
| parent | 2930f1b4265b794599d814e9a3d68fd03bde010f (diff) | |
docs: fixes for merge conflicts and differences between master/next.
Diffstat (limited to 'gr-noaa')
| -rw-r--r-- | gr-noaa/include/noaa/hrpt_decoder.h | 4 | ||||
| -rw-r--r-- | gr-noaa/include/noaa/hrpt_deframer.h | 4 | ||||
| -rw-r--r-- | gr-noaa/include/noaa/hrpt_pll_cf.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/gr-noaa/include/noaa/hrpt_decoder.h b/gr-noaa/include/noaa/hrpt_decoder.h index bfc9b79be6..0eab88375a 100644 --- a/gr-noaa/include/noaa/hrpt_decoder.h +++ b/gr-noaa/include/noaa/hrpt_decoder.h @@ -29,6 +29,10 @@ namespace gr { namespace noaa { + /*! + * \brief NOAA HRPT Decoder + * \ingroup noaa_blk + */ class NOAA_API hrpt_decoder : virtual public gr_sync_block { public: diff --git a/gr-noaa/include/noaa/hrpt_deframer.h b/gr-noaa/include/noaa/hrpt_deframer.h index 53a051ede2..4e319b9054 100644 --- a/gr-noaa/include/noaa/hrpt_deframer.h +++ b/gr-noaa/include/noaa/hrpt_deframer.h @@ -29,6 +29,10 @@ namespace gr { namespace noaa { + /*! + * \brief NOAA HRPT Deframer + * \ingroup noaa_blk + */ class NOAA_API hrpt_deframer : virtual public gr_block { public: diff --git a/gr-noaa/include/noaa/hrpt_pll_cf.h b/gr-noaa/include/noaa/hrpt_pll_cf.h index 0e13c01ddd..b9d746b90c 100644 --- a/gr-noaa/include/noaa/hrpt_pll_cf.h +++ b/gr-noaa/include/noaa/hrpt_pll_cf.h @@ -29,6 +29,10 @@ namespace gr { namespace noaa { + /*! + * \brief NOAA HRPT PLL + * \ingroup noaa_blk + */ class NOAA_API hrpt_pll_cf : virtual public gr_sync_block { public: |