[Commit-gnuradio] r4552 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen

[trondeau]

Author: trondeau
Date: 2007-02-20 16:48:33 -0700 (Tue, 20 Feb 2007)
New Revision: 4552

Modified:
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/Makefile.am
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
Log:
fixed bugs and Makefile

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/Makefile.am 
    2007-02-20 23:31:18 UTC (rev 4551)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/Makefile.am 
    2007-02-20 23:48:33 UTC (rev 4552)
@@ -71,6 +71,9 @@
        gr_packed_to_unpacked_XX.cc.t   \
        gr_packed_to_unpacked_XX.h.t    \
        gr_packed_to_unpacked_XX.i.t    \
+       gr_peak_detector_XX.cc.t        \
+       gr_peak_detector_XX.h.t         \
+       gr_peak_detector_XX.i.t         \
        gr_sig_source_X.cc.t            \
        gr_sig_source_X.h.t             \
        gr_sig_source_X.i.t             \

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
        2007-02-20 23:31:18 UTC (rev 4551)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
        2007-02-20 23:48:33 UTC (rev 4552)
@@ -58,8 +58,8 @@
     d_avg = (alpha)*iptr[i] + (1-alpha)*d_avg;
   }
 
-  for (int i = 1; i < noutput_items; i++){
-    if( (iptr[i-1] > d_avg*0.25) && (iptr[i-1] > iptr[i])) {
+  for (int i = 0; i < noutput_items; i++){
+    if(iptr[i] > d_avg*0.25) {
       if(d_found==0) {
        d_found = 1;
        for(int j = 0; j < 10; j++) {
@@ -69,19 +69,19 @@
        }
       
        if(d_found) {
-         optr[i-1] = (@O_TYPE@)1;
+         optr[i] = (@O_TYPE@)1;
        }
        else {
-         optr[i-1] = (@O_TYPE@)0;
+         optr[i] = (@O_TYPE@)0;
        }
       }
       else {
-       optr[i-1] = (@O_TYPE@)0;
+       optr[i] = (@O_TYPE@)0;
       }
     }
     else {
       d_found = 0;
-      optr[i-1] = (@O_TYPE@)0;
+      optr[i] = (@O_TYPE@)0;
     }
   }
   return noutput_items;