oops, meant to do that in our branch

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6841 221aa14e-8319-0410-a670-987f0aec2ac5

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 df78651666bffbe90388367304b157882b12b5ec..bab0e938b6b1562b03b3a53247a85a4323940db6 100644 (file)
--- 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 e77b5e4a0237187c163d774c359bddcb966a7938..49447b43a2e9417a070787f8ef759a0ce41cc7d3 100644 (file)
--- 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);