[Commit-gnuradio] r7585 - gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/python/gnuradio/blks2impl

[trondeau]

Author: trondeau
Date: 2008-02-06 08:01:03 -0700 (Wed, 06 Feb 2008)
New Revision: 7585

Modified:
   
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
   
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
Log:
does not pass peak detector signal to frame acquisition. With this check in, 
OFDM over the air is mostly working again. It skips every few packets due to 
the regenerated signal triggering the ofdm sampler. All modulations work, even 
QAM256 and I can even get a few good packets with a good SNR through the USRPs. 
The system can mostly start and stop ok, but someimtes it hangs when the 
transmit side stops.

Modified: 
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
  2008-02-06 14:57:20 UTC (rev 7584)
+++ 
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
  2008-02-06 15:01:03 UTC (rev 7585)
@@ -100,7 +100,6 @@
 
         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.ofdm_sync,1), (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/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 14:57:20 UTC (rev 7584)
+++ 
gnuradio/branches/developers/trondeau/ofdmfix/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py
   2008-02-06 15:01:03 UTC (rev 7585)
@@ -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_signature2(2, 2, 
gr.sizeof_gr_complex*fft_length, gr.sizeof_char)) # Output signature
+                               gr.io_signature(1, 1, 
gr.sizeof_gr_complex*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
@@ -131,7 +131,6 @@
 
         # Set output from sampler
         self.connect(self.sampler, (self,0))
-        self.connect(self.pk_detect, (self,1))
 
         if logging:
             self.connect(self.matched_filter, gr.file_sink(gr.sizeof_float, 
"ofdm_sync_pn-mf_f.dat"))