From af609b2ba2abcff069412e1348156dcec7981ff8 Mon Sep 17 00:00:00 2001
From: Tom
Date: Tue, 6 Oct 2009 17:49:49 -0700
Subject: Adding more outputs for debugging.

---
 .../src/lib/filter/gr_pfb_clock_sync_ccf.cc          | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc
index b67efc52d..79779c91c 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc
+++ b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.cc
@@ -209,9 +209,12 @@ gr_pfb_clock_sync_ccf::general_work (int noutput_items,
   gr_complex *in = (gr_complex *) input_items[0];
   gr_complex *out = (gr_complex *) output_items[0];
 
-  float *err;
-  if(ninput_items.size() == 2)
+  float *err, *outrate, *outk;
+  if(output_items.size() > 2) {
     err = (float *) output_items[1];
+    outrate = (float*)output_items[2];
+    outk = (float*)output_items[3];
+  }
   
   if (d_updated) {
     d_updated = false;
@@ -230,9 +233,6 @@ gr_pfb_clock_sync_ccf::general_work (int noutput_items,
     out[i] = d_filters[filtnum]->filter(&in[count]);
     error =  (out[i] * d_diff_filters[filtnum]->filter(&in[count])).real();
 
-    if(ninput_items.size() == 2)
-      err[i] = error;
-
     d_k = d_k + d_alpha*error + d_rate;
     d_rate = d_rate + d_beta*error;
     while(d_k >= d_nfilters) {
@@ -247,8 +247,14 @@ gr_pfb_clock_sync_ccf::general_work (int noutput_items,
     i++;
     count += d_sps;
 
-    printf("error: %f  k: %f  rate: %f\n",
-	   error, d_k, d_rate);
+    if(output_items.size() > 2) {
+      err[i] = error;
+      outrate[i] = d_rate;
+      outk[i] = d_k;
+    }
+
+    //printf("error: %f  k: %f  rate: %f\n",
+    //	   error, d_k, d_rate);
   }
 
   // Set the start index at the next entrance to the work function
-- 
cgit 


From 10a573eb24a2c78c090a7a62614a8610f4ee17e1 Mon Sep 17 00:00:00 2001
From: Tom
Date: Tue, 6 Oct 2009 17:56:25 -0700
Subject: Adding ports to GRC file for new debug outputs

---
 grc/blocks/gr_pfb_clock_sync.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/grc/blocks/gr_pfb_clock_sync.xml b/grc/blocks/gr_pfb_clock_sync.xml
index 9e2f3fa9c..3a066c23c 100644
--- a/grc/blocks/gr_pfb_clock_sync.xml
+++ b/grc/blocks/gr_pfb_clock_sync.xml
@@ -50,4 +50,14 @@
 		<type>float</type>
 		<optional>1</optional>
 	</source>
+	<source>
+		<name>rate</name>
+		<type>float</type>
+		<optional>1</optional>
+	</source>
+	<source>
+		<name>phase</name>
+		<type>float</type>
+		<optional>1</optional>
+	</source>
 </block>
-- 
cgit