[Commit-gnuradio] r7586 - in gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src: lib/gengen python/gnuradio/blks2impl

[trondeau]

Author: trondeau
Date: 2008-02-06 08:05:51 -0700 (Wed, 06 Feb 2008)
New Revision: 7586

Modified:
   
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
   
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
Log:
Had to revert to the old peak detector to get rid of the stall issue. Still 
skipping some packets, but it's almost there. I think the peak detector issue 
still needs some work and the answer lies somewhere between this one and 
peak_detector2_fb.

Modified: 
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
 2008-02-06 15:01:03 UTC (rev 7585)
+++ 
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/lib/gengen/gr_peak_detector_XX.cc.t
 2008-02-06 15:05:51 UTC (rev 7586)
@@ -105,6 +105,6 @@
   }
   else {   // only return up to passing the threshold
     //printf("Leave in State 1, only produced %d of 
%d\n",peak_ind,noutput_items);
-    return peak_ind;
+    return peak_ind+1;
   }
 }

Modified: 
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
   2008-02-06 15:01:03 UTC (rev 7585)
+++ 
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
   2008-02-06 15:05:51 UTC (rev 7586)
@@ -86,9 +86,9 @@
         self.sigmix = gr.multiply_cc()
 
         #ML measurements input to sampler block and detect
-        #self.sub1 = gr.add_const_ff(-1)
-        #self.pk_detect = gr.peak_detector_fb(0.20, 0.20, 30, 0.001)
-        self.pk_detect = gr.peak_detector2_fb(9)
+        self.sub1 = gr.add_const_ff(-1)
+        self.pk_detect = gr.peak_detector_fb(0.20, 0.20, 30, 0.001)
+        #self.pk_detect = gr.peak_detector2_fb(9)
         #self.pk_detect = gr.threshold_detector_fb(0.5)
         self.regen = gr.regenerate_bb(symbol_length)
 
@@ -123,8 +123,8 @@
         self.matched_filter = gr.fir_filter_fff(1,matched_filter_taps)
         self.connect(self.normalize, self.matched_filter)
         
-        #self.connect(self.matched_filter, self.sub1, self.pk_detect)
-        self.connect(self.matched_filter, self.pk_detect)
+        self.connect(self.matched_filter, self.sub1, self.pk_detect)
+        #self.connect(self.matched_filter, self.pk_detect)
         self.connect(self.pk_detect, self.regen)
         self.connect(self.regen, (self.sampler,1))
         self.connect(self.pk_detect, (self.sample_and_hold,1))