[Commit-gnuradio] r7838 - gnuradio/branches/developers/trondeau/ofdmtiming/gnuradio-core/src/python/gnuradio/blks2impl

[trondeau]

Author: trondeau
Date: 2008-02-26 11:51:18 -0700 (Tue, 26 Feb 2008)
New Revision: 7838

Modified:
   
gnuradio/branches/developers/trondeau/ofdmtiming/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
   
gnuradio/branches/developers/trondeau/ofdmtiming/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
Log:
Passing control signal between ofdm sampler (still in sync block, but probably 
should be removed) to frame acquisition block to correct symbol timing issues.

Modified: 
gnuradio/branches/developers/trondeau/ofdmtiming/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdmtiming/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
       2008-02-26 18:22:38 UTC (rev 7837)
+++ 
gnuradio/branches/developers/trondeau/ofdmtiming/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
       2008-02-26 18:51:18 UTC (rev 7838)
@@ -99,7 +99,9 @@
                                                         cp_length, ks[0])
 
         self.connect(self, self.chan_filt)
-        self.connect(self.chan_filt, self.ofdm_sync, self.fft_demod, 
(self.ofdm_frame_acq,0))
+        self.connect(self.chan_filt, self.ofdm_sync)
+        self.connect((self.ofdm_sync,0), self.fft_demod, 
(self.ofdm_frame_acq,0))
+        self.connect((self.ofdm_sync,0), (self.ofdm_frame_acq,1))
         self.connect((self.ofdm_frame_acq,0), (self,0))
         self.connect((self.ofdm_frame_acq,1), (self,1))
 

Modified: 
gnuradio/branches/developers/trondeau/ofdmtiming/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdmtiming/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
        2008-02-26 18:22:38 UTC (rev 7837)
+++ 
gnuradio/branches/developers/trondeau/ofdmtiming/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
        2008-02-26 18:51:18 UTC (rev 7838)
@@ -35,7 +35,7 @@
         
        gr.hier_block2.__init__(self, "ofdm_sync_pn",
                                gr.io_signature(1, 1, gr.sizeof_gr_complex), # 
Input signature
-                               gr.io_signature(1, 1, 
gr.sizeof_gr_complex*fft_length)) # Output signature
+                               gr.io_signature2(2, 2, 
gr.sizeof_gr_complex*fft_length, gr.sizeof_char*fft_length)) # Output signature
 
         # FIXME: when converting to hier_block2's, the output signature
         # should be the output of the divider (the normalized peaks) and
@@ -89,11 +89,7 @@
         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)
 
-        # FIXME: If sampler doesn't get proper input, it can completely
-        # stall the flowgraph.
         self.sampler = gr.ofdm_sampler(fft_length,symbol_length)
 
         self.connect(self, self.input)
@@ -125,19 +121,18 @@
         
         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.sampler,1))
         self.connect(self.pk_detect, (self.sample_and_hold,1))
 
         # Set output from sampler
-        self.connect(self.sampler, (self,0))
+        self.connect((self.sampler,0), (self,0))
+        self.connect((self.sampler,1), (self,1))
 
         if logging:
             self.connect(self.matched_filter, gr.file_sink(gr.sizeof_float, 
"ofdm_sync_pn-mf_f.dat"))
             self.connect(self.normalize, gr.file_sink(gr.sizeof_float, 
"ofdm_sync_pn-theta_f.dat"))
             self.connect(self.angle, gr.file_sink(gr.sizeof_float, 
"ofdm_sync_pn-epsilon_f.dat"))
             self.connect(self.pk_detect, gr.file_sink(gr.sizeof_char, 
"ofdm_sync_pn-peaks_b.dat"))
-            self.connect(self.regen, gr.file_sink(gr.sizeof_char, 
"ofdm_sync_pn-regen_b.dat"))
             self.connect(self.sigmix, gr.file_sink(gr.sizeof_gr_complex, 
"ofdm_sync_pn-sigmix_c.dat"))
             self.connect(self.sampler, 
gr.file_sink(gr.sizeof_gr_complex*fft_length, "ofdm_sync_pn-sampler_c.dat"))
             self.connect(self.sample_and_hold, gr.file_sink(gr.sizeof_float, 
"ofdm_sync_pn-sample_and_hold_f.dat"))