[Commit-gnuradio] r3641 - gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general

[eb]

Author: eb
Date: 2006-09-25 15:11:44 -0600 (Mon, 25 Sep 2006)
New Revision: 3641

Modified:
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
Log:
clamp max error value in costas loop

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
      2006-09-25 21:09:03 UTC (rev 3640)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
      2006-09-25 21:11:44 UTC (rev 3641)
@@ -104,6 +104,10 @@
     optr[i] = iptr[i] * nco_out;
     
     error = (*this.*d_phase_detector)(optr[i]);
+    if (error > 1)
+      error = 1;
+    else if (error < -1)
+      error = -1;
     
     d_freq = d_freq + d_beta * error;
     d_phase = d_phase + d_freq + d_alpha * error;
@@ -118,8 +122,10 @@
     else if (d_freq < d_min_freq)
       d_freq = d_min_freq;
     
-    if (write_foptr)
+    if (write_foptr){
       foptr[i] = gr_complex(d_freq,0);
+      //foptr[i] = gr_complex(error, 0);
+    }
   }
   return noutput_items;
 }