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

[trondeau]

Author: trondeau
Date: 2007-02-19 14:37:36 -0700 (Mon, 19 Feb 2007)
New Revision: 4516

Removed:
   
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/transmit_path_simple.py
Modified:
   
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm.py
   gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/ofdm.py
   
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/receive_path_simple.py
Log:
work in progress

Modified: 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm.py
     2007-02-19 21:37:17 UTC (rev 4515)
+++ 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm.py
     2007-02-19 21:37:36 UTC (rev 4516)
@@ -29,7 +29,7 @@
 import random, time, struct, sys, math, os
 
 # from current dir
-from transmit_path_simple import transmit_path
+from transmit_path import transmit_path
 from receive_path_simple import receive_path
 import ofdm
 
@@ -48,6 +48,8 @@
         fg.connect(self.mixer_offset, (self.noise_adder,1))
         fg.connect(self.noise, (self.noise_adder,0))
 
+        print frequency_offset
+        print sample_rate
         gr.hier_block.__init__(self, fg, self.input, self.noise_adder)
 
 class my_graph(gr.flow_graph):
@@ -57,13 +59,13 @@
         channel_on = True
 
         SNR = 10.0**(options.snr/10.0)
-        frequency_offset = options.frequency_offset / options.fft_length
+        frequency_offset = options.frequency_offset #/ options.fft_length
         
         power_in_signal = options.occupied_tones
         noise_power_in_channel = power_in_signal/SNR
         noise_power_required = noise_power_in_channel * options.fft_length / 
options.occupied_tones
         noise_voltage = math.sqrt(noise_power_required)
-        
+
         self.txpath = transmit_path(self, options)
         self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate)
         self.rxpath = receive_path(self, callback, options)
@@ -111,6 +113,7 @@
     parser.add_option("", "--frequency-offset", type="eng_float", default=0,
                       help="set frequency offset introduced by channel 
[default=%default]")
     transmit_path.add_options(parser, expert_grp)
+    receive_path.add_options(parser, expert_grp)
     ofdm.ofdm_mod.add_options(parser, expert_grp)
     ofdm.ofdm_demod.add_options(parser, expert_grp)
     

Modified: 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/ofdm.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/ofdm.py   
    2007-02-19 21:37:17 UTC (rev 4515)
+++ 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/ofdm.py   
    2007-02-19 21:37:36 UTC (rev 4516)
@@ -101,17 +101,17 @@
         win = [1 for i in range(self._fft_length)]
 
         # ML Sync
-        self.ofdm_rx = ofdm_receiver(self.fg, self._fft_length, symbol_length, 
self._snr)
+        self.ofdm_sync = ofdm_receiver(self.fg, self._fft_length, 
symbol_length, self._snr)
         
         # OFDM Demod
         self.fftdemod = gr.fft_vcc(self._fft_length, True, win, True)
-        self.ofdm = gr.ofdm_bpsk_demapper(self._occupied_tones, 
self._fft_length)
+        self.ofdm_demod = gr.ofdm_bpsk_demapper(self._occupied_tones, 
self._fft_length)
 
         if options.verbose:
             self._print_verbage()
 
-        self.fg.connect(self.ofdm_rx, self.fftdemod, self.ofdm)
-        gr.hier_block.__init__(self, self.fg, self.ofdm_rx, self.ofdm)
+        self.fg.connect(self.ofdm_sync, self.fftdemod, self.ofdm_demod)
+        gr.hier_block.__init__(self, self.fg, self.ofdm_rx, self.ofdm_demod)
 
     def bits_per_symbol(self=None):   # staticmethod that's also callable on 
an instance
         return 1

Modified: 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/receive_path_simple.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/receive_path_simple.py
        2007-02-19 21:37:17 UTC (rev 4515)
+++ 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/receive_path_simple.py
        2007-02-19 21:37:36 UTC (rev 4516)
@@ -48,12 +48,16 @@
         print options.occupied_tones
         print options.fft_length
         print bw
-        chan_coeffs = gr.firdes.low_pass (1.0,                  # gain
-                                          2.0,                  # sampling rate
-                                          bw,                   # midpoint of 
trans. band
-                                          1*bw,               # width of 
trans. band
-                                          gr.firdes.WIN_KAISER)   # filter 
type 
 
+        if 0:
+            chan_coeffs = gr.firdes.low_pass (1.0,                  # gain
+                                              2.0,                  # sampling 
rate
+                                              bw,                   # midpoint 
of trans. band
+                                              1*bw,               # width of 
trans. band
+                                              gr.firdes.WIN_KAISER)   # filter 
type 
+        else:
+            chan_coeffs = [ 1.0, 0.0, 0 ] 
+
         # Decimating channel filter
         self.chan_filt = gr.fft_filter_ccc(sw_decim, chan_coeffs)
         
@@ -67,7 +71,7 @@
                                  callback=self._rx_callback,
                                  threshold=-1)
 
-        if 0:
+        if 1:
             fg.connect(self.chan_filt, self.packet_receiver)
             gr.hier_block.__init__(self, fg, self.chan_filt, None)
         else:

Deleted: 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/transmit_path_simple.py