[Commit-gnuradio] r3562 - in gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src: lib/general python/gnuradio/blksimpl

[trondeau]

Author: trondeau
Date: 2006-09-18 14:07:24 -0600 (Mon, 18 Sep 2006)
New Revision: 3562

Modified:
   
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
   
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/bpsk.py
   
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
   
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
   
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
Log:
fixing a few more bugs with debugging

Modified: 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
       2006-09-18 17:28:37 UTC (rev 3561)
+++ 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
       2006-09-18 20:07:24 UTC (rev 3562)
@@ -92,7 +92,7 @@
 {
   const gr_complex *iptr = (gr_complex *) input_items[0];
   gr_complex *optr = (gr_complex *) output_items[0];
-  gr_complex *foptr = (gr_complex*)output_items[1];
+  gr_complex *err_out = (gr_complex*)output_items[1];
 
   float error;
   gr_complex nco_out;
@@ -116,9 +116,9 @@
     else if (d_freq < d_min_freq)
       d_freq = d_min_freq;
     
-    //    fprintf(stderr, "Costas frequency = %f\terror = %f\n", d_freq, 
error);
-    // d_freq_out << d_freq << std::endl;
-    foptr[i] = gr_complex(d_freq,0);
+    if(output_items.size() == 2)
+      err_out[i] = gr_complex(d_freq,0);
   }
+
   return noutput_items;
 }

Modified: 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/bpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/bpsk.py
       2006-09-18 17:28:37 UTC (rev 3561)
+++ 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/bpsk.py
       2006-09-18 20:07:24 UTC (rev 3562)
@@ -84,10 +84,10 @@
                 ntaps)
        self.rrc_filter = gr.interp_fir_filter_ccf(spb, self.rrc_taps)
 
-        if verbose:
+        if verbose == True:
             self.verbose()
            
-        if debug:
+        if debug == True:
             self.debug()
 
        # Connect and Initialize base class
@@ -215,10 +215,10 @@
         # unpack the k bit vector into a stream of bits
         self.unpack = gr.unpack_k_bits_bb(self.bits_per_baud())
 
-        if verbose:
+        if verbose == True:
             self.verbose()
            
-        if debug:
+        if debug == True:
             self.debug()
 
         # Connect and Initialize base class
@@ -245,6 +245,8 @@
                         gr.file_sink(gr.sizeof_gr_complex, "agc.dat"))
         self.fg.connect(self.costas_loop,
                         gr.file_sink(gr.sizeof_gr_complex, "costas_loop.dat"))
+        self.fg.connect((self.costas_loop,1),
+                        gr.file_sink(gr.sizeof_gr_complex, "costas_error.dat"))
         self.fg.connect(self.rrc_filter,
                         gr.file_sink(gr.sizeof_gr_complex, "rrc.dat"))
         self.fg.connect(self.clock_recovery,

Modified: 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
      2006-09-18 17:28:37 UTC (rev 3561)
+++ 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
      2006-09-18 20:07:24 UTC (rev 3562)
@@ -97,10 +97,10 @@
         fg.connect(self.bytes2chunks, self.gray_coder, self.diffenc,
                    self.chunks2symbols, self.rrc_filter)
 
-        if verbose:
+        if verbose == True:
             self.verbose()
             
-        if debug:
+        if debug == True:
             self.debug()
             
        # Initialize base class
@@ -234,10 +234,10 @@
         # unpack the k bit vector into a stream of bits
         self.unpack = gr.unpack_k_bits_bb(self.bits_per_baud())
 
-        if verbose:
+        if verbose == True:
             self.verbose()
-
-        if debug:
+        
+        if debug == True:
             self.debug()
 
         # Connect and Initialize base class

Modified: 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
      2006-09-18 17:28:37 UTC (rev 3561)
+++ 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
      2006-09-18 20:07:24 UTC (rev 3562)
@@ -93,10 +93,10 @@
 
        self.rrc_filter = gr.interp_fir_filter_ccf(spb, self.rrc_taps)
 
-        if verbose:
+        if verbose == True:
             self.verbose()
         
-        if debug:
+        if debug == True:
             self.debug()
             
        # Connect & Initialize base class
@@ -232,10 +232,10 @@
         # unpack the k bit vector into a stream of bits
         self.unpack = gr.unpack_k_bits_bb(self.bits_per_baud())
 
-        if verbose:
+        if verbose == True:
             self.verbose()
         
-        if debug:
+        if debug == True:
             self.debug()
  
         # Connect & Initialize base class

Modified: 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
       2006-09-18 17:28:37 UTC (rev 3561)
+++ 
gnuradio/branches/developers/trondeau/wip2/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py
       2006-09-18 20:07:24 UTC (rev 3562)
@@ -83,10 +83,10 @@
        # FM modulation
        self.fmmod = gr.frequency_modulator_fc(sensitivity)
                
-        if verbose:
+        if verbose == True:
             self.verbose()
          
-        if debug:
+        if debug == True:
             self.debug()
 
        # Connect & Initialize base class
@@ -199,10 +199,10 @@
         # slice the floats at 0, outputting 1 bit (the LSB of the output byte) 
per sample
         self.slicer = gr.binary_slicer_fb()
 
-        if verbose:
+        if verbose == True:
             self.verbose()
          
-        if debug:
+        if debug == True:
             self.debug()
 
        # Connect & Initialize base class