diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-09-24 17:32:41 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-09-24 17:32:41 -0400 |
| commit | e98373d0d79b3f231248d939101ddfdc650c49d2 (patch) | |
| tree | a7ceb7e4a8149adc2e3b18ea08a73d9d214857d8 /gr-digital/lib/clock_recovery_mm_cc_impl.h | |
| parent | e08e2b33f4e709d88040b50cd11b4c948a3de965 (diff) | |
digital: applying same fix of the complex M&M clock recovery block as the float vrsion.
Diffstat (limited to 'gr-digital/lib/clock_recovery_mm_cc_impl.h')
| -rw-r--r-- | gr-digital/lib/clock_recovery_mm_cc_impl.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gr-digital/lib/clock_recovery_mm_cc_impl.h b/gr-digital/lib/clock_recovery_mm_cc_impl.h index a2208350dd..4597360a2f 100644 --- a/gr-digital/lib/clock_recovery_mm_cc_impl.h +++ b/gr-digital/lib/clock_recovery_mm_cc_impl.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2011,2012 Free Software Foundation, Inc. + * Copyright 2004,2011,2012,2014 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -52,21 +52,15 @@ namespace gr { void set_gain_mu (float gain_mu) { d_gain_mu = gain_mu; } void set_gain_omega (float gain_omega) { d_gain_omega = gain_omega; } void set_mu (float mu) { d_mu = mu; } - void set_omega (float omega) { - d_omega = omega; - d_min_omega = omega*(1.0 - d_omega_relative_limit); - d_max_omega = omega*(1.0 + d_omega_relative_limit); - d_omega_mid = 0.5*(d_min_omega+d_max_omega); - } + void set_omega (float omega); private: float d_mu; // fractional sample position [0.0, 1.0] float d_omega; // nominal frequency float d_gain_omega; // gain for adjusting omega - float d_min_omega; // minimum allowed omega - float d_max_omega; // maximum allowed omeg float d_omega_relative_limit; // used to compute min and max omega float d_omega_mid; // average omega + float d_omega_lim; // actual omega clipping limit float d_gain_mu; // gain for adjusting mu gr_complex d_last_sample; |