[Commit-gnuradio] r7315 - gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl

[trondeau]

Author: trondeau
Date: 2008-01-01 06:46:57 -0700 (Tue, 01 Jan 2008)
New Revision: 7315

Modified:
   
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py
Log:
fixes a few problems with this block and added secondary trigger output.

Modified: 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py
  2008-01-01 13:45:49 UTC (rev 7314)
+++ 
gnuradio/branches/developers/trondeau/ofdm2/gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py
  2008-01-01 13:46:57 UTC (rev 7315)
@@ -24,23 +24,26 @@
 from gnuradio import gr
 
 class ofdm_sync_fixed(gr.hier_block2):
-    def __init__(self, fft_length, cp_length, snr):
+    def __init__(self, fft_length, cp_length, logging=False):
 
-        gr.hier_block2.__init__(self, "ofdm_demod",
+        gr.hier_block2.__init__(self, "ofdm_sync_fixed",
                                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)) # Output signature
 
-
         # Use a fixed trigger point instead of sync block
-        data = (fft_length+cp_len)*[0,]
-        data[(fft_length+cp_len)-1] = 1
-        peak_trigger = gr.vector_source_b(data, True)
-        self.sampler = gr.ofdm_sampler(fft_length,symbol_length)
-        
-        self.connect(self, peak_trigger, (self.sampler,1))
-        self.connect(self.sampler, self)
+        symbol_length = fft_length + cp_length
+        data = (symbol_length)*[0,]
+        data[(symbol_length)-1] = 1
+        self.peak_trigger = gr.vector_source_b(data, True)
+        self.sampler = gr.ofdm_sampler(fft_length, symbol_length)
 
-        if 1:
+        self.connect(self, (self.sampler,0))
+        self.connect(self.peak_trigger, (self.sampler,1))
+        self.connect(self.sampler, (self,0))
+        self.connect(self.peak_trigger, (self,1))
+
+        if logging:
+            self.connect(self.peak_trigger, gr.file_sink(gr.sizeof_char, 
"ofdm_sync_fixed-peaks_b.dat"))
             self.connect(self.sampler, 
gr.file_sink(gr.sizeof_gr_complex*fft_length,
                                                     
"ofdm_sync_fixed-sampler_c.dat"))