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

[trondeau]

Author: trondeau
Date: 2007-02-19 15:52:35 -0700 (Mon, 19 Feb 2007)
New Revision: 4526

Modified:
   
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
   
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/receive_path.py
   
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/transmit_path.py
Log:
updating some script functionality

Modified: 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
  2007-02-19 22:52:08 UTC (rev 4525)
+++ 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
  2007-02-19 22:52:35 UTC (rev 4526)
@@ -118,6 +118,9 @@
         """
         return self.subdev.set_auto_tr(enable)
         
+    def interp(self):
+        return self._interp
+
     def add_options(normal, expert):
         """
         Adds usrp-specific options to the Options Parser
@@ -139,6 +142,15 @@
     # Make a static method to call before instantiation
     add_options = staticmethod(add_options)
 
+    def _print_verbage(self):
+        """
+        Prints information about the transmit path
+        """
+        print "Using TX d'board %s"    % (self.subdev.side_and_name(),)
+        print "modulation:      %s"    % (self._modulator_class.__name__)
+        print "interp:          %3d"   % (self._interp)
+        print "Tx Frequency:    %s"    % 
(eng_notation.num_to_str(self._tx_freq))
+        
 
 def add_freq_option(parser):
     """

Modified: 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/receive_path.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/receive_path.py
       2007-02-19 22:52:08 UTC (rev 4525)
+++ 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/receive_path.py
       2007-02-19 22:52:35 UTC (rev 4526)
@@ -35,65 +35,25 @@
 # /////////////////////////////////////////////////////////////////////////////
 
 class receive_path(gr.hier_block):
-    def __init__(self, fg, demod_class, rx_callback, options):
+    def __init__(self, fg, rx_callback, options):
 
         options = copy.copy(options)    # make a copy so we can destructively 
modify
 
-        self._verbose            = options.verbose
-        self._rx_freq            = options.rx_freq         # receiver's center 
frequency
-        self._rx_gain            = options.rx_gain         # receiver's gain
-        self._rx_subdev_spec     = options.rx_subdev_spec  # daughterboard to 
use
-        self._bitrate            = options.bitrate         # desired bit rate
-        self._decim              = options.decim           # Decimating rate 
for the USRP (prelim)
-        self._samples_per_symbol = options.samples_per_symbol  # desired 
samples/symbol
-        self._fft_length         = options.fft_length      # number of bins in 
the FFT
-        self._occupied_tones     = options.occupied_tones  # number of used 
carriers
-        self._cp_length          = options.cp_length       # length of the 
cyclic prefix
-        self._fusb_block_size    = options.fusb_block_size # usb info for USRP
-        self._fusb_nblocks       = options.fusb_nblocks    # usb info for USRP
+        self._verbose     = options.verbose
+        self._log         = options.log
+        self._rx_callback = rx_callback      # this callback is fired when 
there's a packet available
 
-        self._rx_callback   = rx_callback      # this callback is fired when 
there's a packet available
+        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 ] 
+        self.chan_filt = gr.fft_filter_ccc(1, chan_coeffs)
 
-        if self._rx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --rx-freq FREQ must be 
specified\n")
-            raise SystemExit
-
-        # Set up USRP source; also adjusts decim, samples_per_symbol, and 
bitrate
-        self._setup_usrp_source()
-
-        ok = self.set_freq(self._rx_freq)
-        if not ok:
-            print "Failed to set Rx frequency to %s" % 
(eng_notation.num_to_str(self._rx_freq))
-            raise ValueError, eng_notation.num_to_str(self._rx_freq)
-    
-        g = self.subdev.gain_range()
-        if options.show_rx_gain_range:
-            print "Rx Gain Range: minimum = %g, maximum = %g, step size = %g" \
-                  % (g[0], g[1], g[2])
-
-        self.set_gain(options.rx_gain)
-
-        self.set_auto_tr(True)                 # enable Auto Transmit/Receive 
switching
-
-        # copy the final answers back into options for use by demodulator
-        options.samples_per_symbol = self._samples_per_symbol
-        options.bitrate = self._bitrate
-        options.decim = self._decim
-
-        # Design filter to get actual channel we want
-        sw_decim = 1
-        chan_coeffs = gr.firdes.low_pass (1.0,                  # gain
-                                          sw_decim * self._samples_per_symbol, 
# sampling rate
-                                          1.0,                  # midpoint of 
trans. band
-                                          0.1,                  # width of 
trans. band
-                                          gr.firdes.WIN_HANN)   # filter type 
-
-        # Decimating channel filter
-        # complex in and out, float taps
-        self.chan_filt = gr.fft_filter_ccc(sw_decim, chan_coeffs)
-        #self.chan_filt = gr.fir_filter_ccf(sw_decim, chan_coeffs)
-
-        self.ofdm_demod = ofdm.ofdm_demod(fg, occupied_tones, fftsize, 
symbol_length, rho)
+        self.ofdm_demod = ofdm.ofdm_demod(fg, options)
         
         # receiver
         self.packet_receiver = \
@@ -112,69 +72,10 @@
         # Display some information about the setup
         if self._verbose:
             self._print_verbage()
-            
-        fg.connect(self.u, self.chan_filt, self.packet_receiver)
-        gr.hier_block.__init__(self, fg, None, None)
-
-    def _setup_usrp_source(self):
-        self.u = usrp.source_c (fusb_block_size=self._fusb_block_size,
-                                fusb_nblocks=self._fusb_nblocks)
-        adc_rate = self.u.adc_rate()
-
-        # derive values of bitrate, samples_per_symbol, and decim from desired 
info
-        (self._bitrate, self._samples_per_symbol, self._decim) = \
-            pick_rx_bitrate(self._bitrate, 
self._demod_class.bits_per_symbol(), \
-                            self._samples_per_symbol, self._decim, adc_rate)
-
-        self.u.set_decim_rate(self._decim)
-
-        # determine the daughterboard subdevice we're using
-        if self._rx_subdev_spec is None:
-            self._rx_subdev_spec = usrp.pick_rx_subdevice(self.u)
-        self.subdev = usrp.selected_subdev(self.u, self._rx_subdev_spec)
-
-        self.u.set_mux(usrp.determine_rx_mux_value(self.u, 
self._rx_subdev_spec))
-
-    def set_freq(self, target_freq):
-        """
-        Set the center frequency we're interested in.
-
-        @param target_freq: frequency in Hz
-        @rypte: bool
-
-        Tuning is a two step process.  First we ask the front-end to
-        tune as close to the desired frequency as it can.  Then we use
-        the result of that operation and our target_frequency to
-        determine the value for the digital up converter.
-        """
-        r = self.u.tune(0, self.subdev, target_freq)
-        if r:
-            return True
-
-        return False
-
-    def set_gain(self, gain):
-        """
-        Sets the analog gain in the USRP
-        """
-        if gain is None:
-            r = self.subdev.gain_range()
-            gain = (r[0] + r[1])/2               # set gain to midpoint
-        self.gain = gain
-        return self.subdev.set_gain(gain)
-
-    def set_auto_tr(self, enable):
-        return self.subdev.set_auto_tr(enable)
         
-    def bitrate(self):
-        return self._bitrate
+        fg.connect(self.chan_filt, self.packet_receiver)
+        gr.hier_block.__init__(self, fg, self.chan_filt, None)
 
-    def samples_per_symbol(self):
-        return self._samples_per_symbol
-
-    def decim(self):
-        return self._decim
-
     def carrier_sensed(self):
         """
         Return True if we think carrier is present.
@@ -202,23 +103,7 @@
         """
         Adds receiver-specific options to the Options Parser
         """
-        add_freq_option(normal)
-        if not normal.has_option("--bitrate"):
-            normal.add_option("-r", "--bitrate", type="eng_float", 
default=None,
-                              help="specify bitrate.  samples-per-symbol and 
interp/decim will be derived.")
-        normal.add_option("-R", "--rx-subdev-spec", type="subdev", 
default=None,
-                          help="select USRP Rx side A or B")
-        normal.add_option("", "--rx-gain", type="eng_float", default=None, 
metavar="GAIN",
-                          help="set receiver gain in dB [default=midpoint].  
See also --show-rx-gain-range")
-        normal.add_option("", "--show-rx-gain-range", action="store_true", 
default=False, 
-                          help="print min and max Rx gain available on 
selected daughterboard")
         normal.add_option("-v", "--verbose", action="store_true", 
default=False)
-        expert.add_option("-S", "--samples-per-symbol", type="int", 
default=None,
-                          help="set samples/symbol [default=%default]")
-        expert.add_option("", "--rx-freq", type="eng_float", default=None,
-                          help="set Rx frequency to FREQ [default=%default]", 
metavar="FREQ")
-        expert.add_option("-d", "--decim", type="intx", default=None,
-                          help="set fpga decimation rate to DECIM 
[default=%default]")
         expert.add_option("", "--log", action="store_true", default=False,
                           help="Log all parts of flow graph to files (CAUTION: 
lots of data)")
 
@@ -236,19 +121,3 @@
         print "bitrate:         %sb/s" % 
(eng_notation.num_to_str(self._bitrate))
         print "samples/symbol:  %3d"   % (self._samples_per_symbol)
         print "decim:           %3d"   % (self._decim)
-        print "Rx Frequency:    %s"    % 
(eng_notation.num_to_str(self._rx_freq))
-        # print "Rx Frequency:    %f"    % (self._rx_freq)
-
-def add_freq_option(parser):
-    """
-    Hackery that has the -f / --freq option set both tx_freq and rx_freq
-    """
-    def freq_callback(option, opt_str, value, parser):
-        parser.values.rx_freq = value
-        parser.values.tx_freq = value
-
-    if not parser.has_option('--freq'):
-        parser.add_option('-f', '--freq', type="eng_float",
-                          action="callback", callback=freq_callback,
-                          help="set Tx and/or Rx frequency to FREQ 
[default=%default]",
-                          metavar="FREQ")

Modified: 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/transmit_path.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/transmit_path.py
      2007-02-19 22:52:08 UTC (rev 4525)
+++ 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/transmit_path.py
      2007-02-19 22:52:35 UTC (rev 4526)
@@ -83,9 +83,6 @@
     def samples_per_symbol(self):
         return self._samples_per_symbol
 
-    def interp(self):
-        return self._interp
-
     def add_options(normal, expert):
         """
         Adds transmitter-specific options to the Options Parser
@@ -103,14 +100,5 @@
         """
         Prints information about the transmit path
         """
-        print "Using TX d'board %s"    % (self.subdev.side_and_name(),)
         print "Tx amplitude     %s"    % (self._tx_amplitude)
-        print "modulation:      %s"    % (self._modulator_class.__name__)
-        print "bitrate:         %sb/s" % 
(eng_notation.num_to_str(self._bitrate))
-        print "samples/symbol:  %3d"   % (self._samples_per_symbol)
-        print "interp:          %3d"   % (self._interp)
-        print "FFT length:      %3d"   % (self._fft_length)
-        print "Occupied Tones:  %3d"   % (self._occupied_tones)
-        print "CP length:       %3d"   % (self._cp_length)
-        print "Tx Frequency:    %s"    % 
(eng_notation.num_to_str(self._tx_freq))