diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-11 21:35:35 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-10-11 21:35:35 -0700 |
| commit | 1259a01a9479071bd1729a9c9496444f0a72509b (patch) | |
| tree | 55350454454a119fb230cdbaadfb27d361f191ec /gr-digital/include/digital_costas_loop_cc.h | |
| parent | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff) | |
| parent | 06860c309153890a6a42babfbedf230eb24f0042 (diff) | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts:
gr-digital/include/digital_constellation.h
Diffstat (limited to 'gr-digital/include/digital_costas_loop_cc.h')
| -rw-r--r-- | gr-digital/include/digital_costas_loop_cc.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gr-digital/include/digital_costas_loop_cc.h b/gr-digital/include/digital_costas_loop_cc.h index c787263410..c8c722c938 100644 --- a/gr-digital/include/digital_costas_loop_cc.h +++ b/gr-digital/include/digital_costas_loop_cc.h @@ -30,8 +30,10 @@ #include <fstream> -/*! \brief A Costas loop carrier recovery module. +/*! + * \brief A Costas loop carrier recovery module. * \ingroup sync_blk + * \ingroup digital * * The Costas loop locks to the center frequency of a signal and * downconverts it to baseband. The second (order=2) order loop is @@ -42,9 +44,9 @@ * * More details can be found online: * - * J. Feigin, "Practical Costas loop design: Designing a simple and inexpensive - * BPSK Costas loop carrier recovery circuit," RF signal processing, pp. 20-36, - * 2002. + * J. Feigin, "Practical Costas loop design: Designing a simple and + * inexpensive BPSK Costas loop carrier recovery circuit," RF signal + * processing, pp. 20-36, 2002. * * http://rfdesign.com/images/archive/0102Feigin20.pdf * |