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

[trondeau]

Author: trondeau
Date: 2007-02-21 15:34:55 -0700 (Wed, 21 Feb 2007)
New Revision: 4566

Modified:
   gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm.py
   
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
Log:
updates to example OFDM code

Modified: 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm.py    
    2007-02-21 22:24:26 UTC (rev 4565)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm.py    
    2007-02-21 22:34:55 UTC (rev 4566)
@@ -102,7 +102,7 @@
 
         # ML Sync
         self.ofdm_sync = ofdm_receiver(self.fg, self._fft_length, 
symbol_length, self._snr)
-        
+
         # OFDM Demod
         self.fft_demod = gr.fft_vcc(self._fft_length, True, win, True)
         self.ofdm_demod = gr.ofdm_bpsk_demapper(self._occupied_tones, 
self._fft_length)

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-21 22:24:26 UTC (rev 4565)
+++ 
gnuradio/branches/developers/n4hy/ofdm/gnuradio-examples/python/ofdm/ofdm_receiver.py
       2007-02-21 22:34:55 UTC (rev 4566)
@@ -84,11 +84,13 @@
         self.fg.connect(self.moving_sum_filter,(self.diff,1))
 
         #ML measurements input to sampler block and detect
+        nco_sensitivity = 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()
+        self.pkt_detect = gr.peak_detector_ff(0.2, 0.3, 30, 0.0001)
         self.sample_and_hold = gr.sample_and_hold_ff()
-        self.nco = gr.frequency_modulator_fc((1/(2*math.pi))/fft_length) 
#gr.vco_f(1, (1/(2*math.pi))/fft_length, 1)
+        self.nco = gr.frequency_modulator_fc(nco_sensitivity)
+        self.inv = gr.multiply_const_ff(-1)
         self.sigmix = gr.multiply_cc()
 
         # Mix the signal with an NCO controlled by the sync loop
@@ -97,19 +99,22 @@
         self.fg.connect(self.sigmix, (self.sampler,0))
 
         # use the sync loop values to set the sampler and the NCO
-        # diff = theta
-        # angle = epsilon
+        # 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))
         self.fg.connect(self.angle, (self.sample_and_hold,0))
-        self.fg.connect(self.sample_and_hold, self.nco)
+        self.fg.connect(self.sample_and_hold, self.inv, self.nco)
+        
 
-        if 1:
+        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"))
             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"))
+            self.fg.connect(self.sigmix, gr.file_sink(gr.sizeof_gr_complex, 
"output_c.dat"))
         
         gr.hier_block.__init__(self, fg, self.input, self.sampler)