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

[eb]

Author: eb
Date: 2009-05-22 16:00:53 -0600 (Fri, 22 May 2009)
New Revision: 11089

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc
Log:
Backed out [10702] because it was causing a problem with an existing
application.  gr_mpsk_receiver_cc.cc needs some TLC.  The constellations
are pretty large even in high SNR environments.



Modified: gnuradio/trunk/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 
2009-05-22 21:22:22 UTC (rev 11088)
+++ gnuradio/trunk/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc 
2009-05-22 22:00:53 UTC (rev 11089)
@@ -257,7 +257,7 @@
   phase_error = gr_branchless_clip(phase_error, 1.0);
     
   d_freq += d_beta*phase_error;             // adjust frequency based on error
-  d_phase += d_alpha*phase_error;  // adjust phase based on error
+  d_phase += d_freq + d_alpha*phase_error;  // adjust phase based on error
 
   // Make sure we stay within +-2pi
   while(d_phase > M_TWOPI)