[Commit-gnuradio] r5601 - in gnuradio/branches/features/ofdm/receiver: gnuradio-core/src/python/gnuradio/blksimpl gnuradio-examples/python/ofdm

[trondeau]

Author: trondeau
Date: 2007-06-01 18:28:16 -0600 (Fri, 01 Jun 2007)
New Revision: 5601

Modified:
   
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
   
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
   
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/receive_path.py
Log:
added channel filter and noise, remove some logging. OFDM working with noise 
and fine frequency offset; has an initial transient problem.

Modified: 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
===================================================================
--- 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
        2007-06-01 23:44:20 UTC (rev 5600)
+++ 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
        2007-06-02 00:28:16 UTC (rev 5601)
@@ -80,14 +80,6 @@
         self.fg.connect(self.c2mag,(self.diff,0))
         self.fg.connect(self.moving_sum_filter,(self.diff,1))
 
-
-        self.fg.connect(self.input, gr.file_sink(gr.sizeof_gr_complex, 
"input.dat"))
-        self.fg.connect(self.delay, gr.file_sink(gr.sizeof_gr_complex, 
"g.dat"))
-        self.fg.connect(self.conjg, gr.file_sink(gr.sizeof_gr_complex, 
"g1.dat"))
-        self.fg.connect(self.mixer, gr.file_sink(gr.sizeof_gr_complex, 
"k.dat"))
-        self.fg.connect(self.movingsum2, gr.file_sink(gr.sizeof_gr_complex, 
"h.dat"))
-                     
-
         #ML measurements input to sampler block and detect
         nco_sensitivity = 1.0/fft_length
         self.f2c = gr.float_to_complex()

Modified: 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
===================================================================
--- 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
    2007-06-01 23:44:20 UTC (rev 5600)
+++ 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
    2007-06-02 00:28:16 UTC (rev 5601)
@@ -70,7 +70,7 @@
         power_in_signal = 1
         noise_power_in_channel = power_in_signal/SNR
         noise_voltage = math.sqrt(noise_power_in_channel/2.0)
-        noise_voltage=0.0
+        #noise_voltage=0.0
         print "Power in signal: ", power_in_signal
         print "Noise power in channel: ", noise_power_in_channel
         print "Noise voltage: ", noise_voltage

Modified: 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/receive_path.py
===================================================================
--- 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/receive_path.py
      2007-06-01 23:44:20 UTC (rev 5600)
+++ 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/receive_path.py
      2007-06-02 00:28:16 UTC (rev 5601)
@@ -43,7 +43,7 @@
         self._log         = options.log
         self._rx_callback = rx_callback      # this callback is fired when 
there's a packet available
 
-        if 0:
+        if 1:
             bw = (float(options.occupied_tones) / float(options.fft_length)) / 
2.0
             tb = bw*0.08