summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreb2009-05-22 22:00:53 +0000
committereb2009-05-22 22:00:53 +0000
commit0c6596025f249002215f03ac61166a540ec31c75 (patch)
tree75160f94bfed9b4a79085a30c07d07982adea8e4
parent5a4b9ba9af590b2a269cb3e5872c85faa7c284d1 (diff)
downloadgnuradio-0c6596025f249002215f03ac61166a540ec31c75.tar.gz
gnuradio-0c6596025f249002215f03ac61166a540ec31c75.tar.bz2
gnuradio-0c6596025f249002215f03ac61166a540ec31c75.zip
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
-rw-r--r--gnuradio-core/src/lib/general/gr_mpsk_receiver_cc.cc2
1 files changed, 1 insertions, 1 deletions
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 e1580ffb5..cdb5bdc0e 100644
--- 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)