[Commit-gnuradio] r4581 - gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm

[trondeau]

Author: trondeau
Date: 2007-02-21 22:26:27 -0700 (Wed, 21 Feb 2007)
New Revision: 4581

Modified:
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
Log:
adding trigger to receiver to pass over sync block

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
       2007-02-22 05:01:13 UTC (rev 4580)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
       2007-02-22 05:26:27 UTC (rev 4581)
@@ -84,10 +84,10 @@
         self.fg.connect(self.moving_sum_filter,(self.diff,1))
 
         #ML measurements input to sampler block and detect
-        nco_sensitivity = 1.0/fft_length
+        nco_sensitivity = 0 #1.0/fft_length
         self.f2c = gr.float_to_complex()
         self.sampler = gr.ofdm_sampler(fft_length,symbol_length)
-        self.pkt_detect = gr.peak_detector_ff(0.2, 0.3, 30, 0.0001)
+        self.pkt_detect = gr.peak_detector_ff(0.2, 0.25, 30, 0.0001)
         self.sample_and_hold = gr.sample_and_hold_ff()
         self.nco = gr.frequency_modulator_fc(nco_sensitivity)
         self.inv = gr.multiply_const_ff(-1)
@@ -98,12 +98,28 @@
         self.fg.connect(self.nco, (self.sigmix,1))
         self.fg.connect(self.sigmix, (self.sampler,0))
 
+        sample_trigger = 1
+        if sample_trigger:
+            # for testing
+            peak_null = gr.null_sink(gr.sizeof_float)
+            data = 640*[0,]
+            data[639] = 1
+            peak_trigger = gr.vector_source_f(data, True)
+
+            self.fg.connect(self.pkt_detect, peak_null)
+            self.fg.connect(peak_trigger, self.f2c, (self.sampler,1))
+            self.fg.connect(peak_trigger, (self.sample_and_hold,1))
+            
         # use the sync loop values to set the sampler and the NCO
         # self.diff = theta
         # self.angle = epsilon
+                          
         self.fg.connect(self.diff, self.pkt_detect)
-        self.fg.connect(self.pkt_detect, self.f2c, (self.sampler,1))
-        self.fg.connect(self.pkt_detect, (self.sample_and_hold,1))
+        
+        if not sample_trigger:
+            self.fg.connect(self.pkt_detect, self.f2c, (self.sampler,1))
+            self.fg.connect(self.pkt_detect, (self.sample_and_hold,1))
+            
         self.fg.connect(self.angle, (self.sample_and_hold,0))
         self.fg.connect(self.sample_and_hold, self.inv, self.nco)
         
@@ -111,7 +127,12 @@
         if 0:
             self.fg.connect(self.diff, gr.file_sink(gr.sizeof_float, 
"theta_f.dat"))
             self.fg.connect(self.angle, gr.file_sink(gr.sizeof_float, 
"epsilon_f.dat"))
-            self.fg.connect(self.pkt_detect, gr.file_sink(gr.sizeof_float, 
"peaks_f.dat"))
+
+            if sample_trigger:
+                self.fg.connect(peak_trigger, gr.file_sink(gr.sizeof_float, 
"peaks_f.dat"))
+            else:
+                self.fg.connect(self.pkt_detect, gr.file_sink(gr.sizeof_float, 
"peaks_f.dat"))
+                
             self.fg.connect(self.sample_and_hold, 
gr.file_sink(gr.sizeof_float, "sample_and_hold_f.dat"))
             self.fg.connect(self.nco, gr.file_sink(gr.sizeof_gr_complex, 
"nco_c.dat"))
             self.fg.connect(self.input, gr.file_sink(gr.sizeof_gr_complex, 
"input_c.dat"))