[Commit-gnuradio] r3615 - gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general

[eb]

Author: eb
Date: 2006-09-22 11:52:55 -0600 (Fri, 22 Sep 2006)
New Revision: 3615

Modified:
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/Makefile.am
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
   
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.h
Log:
minor tweaks

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/Makefile.am
       2006-09-22 17:12:15 UTC (rev 3614)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/Makefile.am
       2006-09-22 17:52:55 UTC (rev 3615)
@@ -319,8 +319,8 @@
        gr_vector_to_stream.h           \
        gr_vector_to_streams.h          \
        gri_add_const_ss.h              \
+       gri_agc_cc.h                    \
        gri_agc_ff.h                    \
-       gri_agc_cc.h                    \
        gri_agc2_cc.h                   \
        gri_agc2_ff.h                   \
        gri_char_to_float.h             \
@@ -441,8 +441,8 @@
        gr_vector_to_stream.i           \
        gr_vector_to_streams.i          \
        gr_unpack_k_bits_bb.i           \
+       gri_agc_cc.i                    \
        gri_agc_ff.i                    \
-       gri_agc_cc.i                    \
        gri_agc2_cc.i                   \
        gri_agc2_ff.i                   
 

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
        2006-09-22 17:12:15 UTC (rev 3614)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_clock_recovery_mm_cc.cc
        2006-09-22 17:52:55 UTC (rev 3615)
@@ -48,7 +48,7 @@
                                                  float gain_mu, float 
omega_relative_limit)
   : gr_block ("clock_recovery_mm_cc",
              gr_make_io_signature (1, 1, sizeof (gr_complex)),
-             gr_make_io_signature (1, 1, sizeof (gr_complex))),
+             gr_make_io_signature (1, 2, sizeof (gr_complex))),
     d_mu (mu), d_omega(omega), d_gain_omega(gain_omega), 
     d_omega_relative_limit(omega_relative_limit), 
     d_gain_mu(gain_mu), d_last_sample(0), d_interp(new 
gri_mmse_fir_interpolator_cc()),
@@ -119,6 +119,9 @@
 {
   const gr_complex *in = (const gr_complex *) input_items[0];
   gr_complex *out = (gr_complex *) output_items[0];
+  gr_complex *foptr = (gr_complex *) output_items[1];
+
+  bool write_foptr = output_items.size() >= 2;
   
   int  ii = 0;                         // input index
   int  oo = 0;                         // output index
@@ -165,6 +168,10 @@
       printf("%f\t%f\n", d_omega, d_mu);
     }
 
+    // write the error signal to the second output
+    if (write_foptr)
+      foptr[oo-1] = gr_complex(d_mu,0);
+
     if (ii < 0)        // clamp it.  This should only happen with bogus input
       ii = 0;
   }

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
      2006-09-22 17:12:15 UTC (rev 3614)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gr_costas_loop_cc.cc
      2006-09-22 17:52:55 UTC (rev 3615)
@@ -118,8 +118,6 @@
     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;
     if (write_foptr)
       foptr[i] = gr_complex(d_freq,0);
   }

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
      2006-09-22 17:12:15 UTC (rev 3614)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
      2006-09-22 17:52:55 UTC (rev 3615)
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _GRI_AGC_CC_H_
-#define _GRI_AGC_CC_H_
+#ifndef INCLUDED_GRI_AGC_CC_H
+#define INCLUDED_GRI_AGC_CC_H
 
 #include <math.h>
 
@@ -71,4 +71,4 @@
   float _max_gain;             // max allowable gain
 };
 
-#endif /* _GRI_AGC_CC_H_ */
+#endif /* INCLUDED_GRI_AGC_CC_H */

Modified: 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.h
===================================================================
--- 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.h
      2006-09-22 17:12:15 UTC (rev 3614)
+++ 
gnuradio/branches/developers/eb/digital-wip/gnuradio-core/src/lib/general/gri_agc_ff.h
      2006-09-22 17:52:55 UTC (rev 3615)
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef _GRI_AGC_H_
-#define _GRI_AGC_H_
+#ifndef INCLUDED_GRI_AGC_FF_H
+#define INCLUDED_GRI_AGC_FF_H
 
 #include <math.h>
 
@@ -68,4 +68,5 @@
   float _max_gain;             // maximum gain
 };
 
-#endif /* _GRI_AGC_FF_H_ */
+#endif /* INCLUDED_GRI_AGC_FF_H */
+