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.

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

diff --git a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc b/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc
index e1580ffb5fc7ec3f0306b15035589666c7947149..cdb5bdc0ea49801f157a2226b80b23830e1ecf15 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc
+++ b/gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc
@@ -257,7 +257,7 @@ gr_mpsk_receiver_cc::phase_error_tracking(gr_complex sample)
   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)