[Commit-gnuradio] r6841 - gnuradio/trunk/gnuradio-core/src/lib/general

[n4hy]

Author: n4hy
Date: 2007-11-08 15:53:13 -0700 (Thu, 08 Nov 2007)
New Revision: 6841

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
Log:
oops, meant to do that in our branch

Modified: 
gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc     
2007-11-08 22:43:26 UTC (rev 6840)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc     
2007-11-08 22:53:13 UTC (rev 6841)
@@ -151,22 +151,19 @@
       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);

Modified: 
gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc     
2007-11-08 22:43:26 UTC (rev 6840)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_clock_recovery_mm_ff.cc     
2007-11-08 22:53:13 UTC (rev 6841)
@@ -118,13 +118,12 @@
     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);