summaryrefslogtreecommitdiff
path: root/gr-digital
diff options
context:
space:
mode:
authorTom Rondeau2012-02-20 10:17:53 -0500
committerTom Rondeau2012-02-20 10:17:53 -0500
commite4693dfbab735914db1947031c62eef7844e7393 (patch)
tree946154ef78fc14ff9bdb965aefe70970181bb57f /gr-digital
parent34508cd9001ecd8eef2fcfb3a087c573072b83ef (diff)
parent99c60be53afc087922d11f0626303c8178f0ac7f (diff)
downloadgnuradio-e4693dfbab735914db1947031c62eef7844e7393.tar.gz
gnuradio-e4693dfbab735914db1947031c62eef7844e7393.tar.bz2
gnuradio-e4693dfbab735914db1947031c62eef7844e7393.zip
Merge branch 'maint'
Diffstat (limited to 'gr-digital')
-rw-r--r--gr-digital/include/digital_costas_loop_cc.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/gr-digital/include/digital_costas_loop_cc.h b/gr-digital/include/digital_costas_loop_cc.h
index c8c722c93..4aab22fb4 100644
--- a/gr-digital/include/digital_costas_loop_cc.h
+++ b/gr-digital/include/digital_costas_loop_cc.h
@@ -50,11 +50,8 @@
*
* http://rfdesign.com/images/archive/0102Feigin20.pdf
*
- * \param alpha the loop gain used for phase adjustment
- * \param beta the loop gain for frequency adjustments
- * \param max_freq the maximum frequency deviation (radians/sample) the loop can handle
- * \param min_freq the minimum frequency deviation (radians/sample) the loop can handle
- * \param order the loop order, either 2 or 4
+ * \param loop_bw internal 2nd order loop bandwidth (~ 2pi/100)
+ * \param order the loop order, either 2, 4, or 8
*/
#include <digital_api.h>
@@ -76,7 +73,7 @@ digital_make_costas_loop_cc (float loop_bw, int order
* stream 1 is the baseband I and Q;
* stream 2 is the normalized frequency of the loop
*
- * \p order must be 2 or 4.
+ * \p order must be 2, 4, or 8.
*/
class DIGITAL_API digital_costas_loop_cc : public gr_sync_block, public gri_control_loop
{