diff options
| author | n4hy | 2007-11-08 22:53:13 +0000 |
|---|---|---|
| committer | n4hy | 2007-11-08 22:53:13 +0000 |
| commit | 6ddab26f99d1ebc27374ef9efe840329d498d86c (patch) | |
| tree | 635d35200e211ece0202cbbf06abc472380ae03a /gnuradio-core/src | |
| parent | a6adc4cc6d35860a8b9b6b2cb1e3abb17b74552b (diff) | |
| download | gnuradio-6ddab26f99d1ebc27374ef9efe840329d498d86c.tar.gz gnuradio-6ddab26f99d1ebc27374ef9efe840329d498d86c.tar.bz2 gnuradio-6ddab26f99d1ebc27374ef9efe840329d498d86c.zip | |
oops, meant to do that in our branch
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6841 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc | 9 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc index df7865166..bab0e938b 100644 --- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc +++ b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc @@ -151,22 +151,19 @@ gr_clock_recovery_mm_cc::general_work (int noutput_items, out[oo++] = d_p_0T; // limit mm_val -#if 0 + if (mm_val > 1.0) mm_val = 1.0; else if (mm_val < -1.0) mm_val = -1.0; -#endif - gr_branchless_clip(mm_val,1.0); + d_omega = d_omega + d_gain_omega * mm_val; -#if 0 if (d_omega > d_max_omega) d_omega = d_max_omega; else if (d_omega < d_min_omega) d_omega = d_min_omega; -#endif - d_omega = 1.0+gr_branchless_clip(d_omega,d_omega_relative_limit); + d_mu = d_mu + d_omega + d_gain_mu * mm_val; ii += (int)floor(d_mu); d_mu -= floor(d_mu); diff --git a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc index e77b5e4a0..49447b43a 100644 --- a/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc +++ b/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc @@ -118,13 +118,12 @@ gr_clock_recovery_mm_ff::general_work (int noutput_items, d_last_sample = out[oo]; d_omega = d_omega + d_gain_omega * mm_val; -#if 0 + if (d_omega > d_max_omega) d_omega = d_max_omega; else if (d_omega < d_min_omega) d_omega = d_min_omega; -#endif - d_omega = gr_branchless_clip(d_omega-d_omega_mid,d_omega_relative_limit); + d_mu = d_mu + d_omega + d_gain_mu * mm_val; ii += (int) floor(d_mu); |