Moin,

Am Thu, 13 Jul 2006 13:44:50 -0400 schrieb Robert McGwier:

> Sorry.  I missed what you referred to in the early email.  I misread 
> it.  I agree that refout and carriertracking should not be doing the 
> same thing.  I will look at it.

In the meantime the docs have been updated so that carriertracking is
described to be mixing the input with the recovered carrier. Yet, the
code is still unchanged (e.g. carriertracking and refout still do
exactly the same). This took me several hours to figure out.

Attached is a trivial patch to fix that.

-- 
Henryk Plötz
Grüße aus Berlin
~~~~~~~ Un-CDs, nein danke! http://www.heise.de/ct/cd-register/ ~~~~~~~
~ Help Microsoft fight software piracy: Give Linux to a friend today! ~
Index: gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
===================================================================
--- gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc	(Revision 3290)
+++ gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc	(Arbeitskopie)
@@ -107,7 +107,7 @@
     else if (d_freq < d_min_freq)
       d_freq = d_min_freq;
     gr_sincosf(d_phase,&t_imag,&t_real);
-    optr[i] = gr_complex(t_real,t_imag);
+    optr[i] = iptr[i] * gr_complex(t_real,-t_imag);
     d_locksig = d_locksig * (1.0 - d_alpha) + d_alpha*(iptr[i].real() * t_real + iptr[i].imag() * t_imag);
     
     if ((d_squelch_enable) && !lock_detector())

Attachment: pgpx1QSZXhw6N.pgp
Description: PGP signature

_______________________________________________
Discuss-gnuradio mailing list
Discuss-gnuradio@gnu.org
http://lists.gnu.org/mailman/listinfo/discuss-gnuradio

Reply via email to