diff options
| author | Josh Blum | 2011-10-11 21:35:35 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-10-11 21:35:35 -0700 |
| commit | 1259a01a9479071bd1729a9c9496444f0a72509b (patch) | |
| tree | 55350454454a119fb230cdbaadfb27d361f191ec /gr-vocoder/include/vocoder_cvsd_encode_sb.h | |
| parent | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff) | |
| parent | 06860c309153890a6a42babfbedf230eb24f0042 (diff) | |
| download | gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.gz gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.bz2 gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts:
gr-digital/include/digital_constellation.h
Diffstat (limited to 'gr-vocoder/include/vocoder_cvsd_encode_sb.h')
| -rw-r--r-- | gr-vocoder/include/vocoder_cvsd_encode_sb.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gr-vocoder/include/vocoder_cvsd_encode_sb.h b/gr-vocoder/include/vocoder_cvsd_encode_sb.h index 4a2d31147..b36edaf8b 100644 --- a/gr-vocoder/include/vocoder_cvsd_encode_sb.h +++ b/gr-vocoder/include/vocoder_cvsd_encode_sb.h @@ -30,9 +30,11 @@ class vocoder_cvsd_encode_sb; typedef boost::shared_ptr<vocoder_cvsd_encode_sb> vocoder_cvsd_encode_sb_sptr; /*! - * \brief Constructor parameters to initialize the CVSD encoder. The default - * values are modeled after the Bluetooth standard and should not be changed - * except by an advanced user + * \brief Constructor parameters to initialize the CVSD encoder. The + * default values are modeled after the Bluetooth standard and should + * not be changed except by an advanced user + * + * \ingroup vocoder_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" |