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_cma_equalizer_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_cma_equalizer_cc.h')
| -rw-r--r-- | gr-digital/include/digital_cma_equalizer_cc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-digital/include/digital_cma_equalizer_cc.h b/gr-digital/include/digital_cma_equalizer_cc.h index 69e2f657a3..0d703789a9 100644 --- a/gr-digital/include/digital_cma_equalizer_cc.h +++ b/gr-digital/include/digital_cma_equalizer_cc.h @@ -37,6 +37,7 @@ 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 * * The error value and tap update equations (for p=2) can be found in: * |