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

[trondeau]

Author: trondeau
Date: 2007-02-19 11:54:43 -0700 (Mon, 19 Feb 2007)
New Revision: 4505

Added:
   
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/fusb_options.py
Modified:
   
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
   
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/transmit_path.py
Log:
modifications to get OFDM transmitter working with USRP

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 18:50:10 UTC (rev 4504)
+++ 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
  2007-02-19 18:54:43 UTC (rev 4505)
@@ -30,12 +30,139 @@
 
 # from current dir
 from transmit_path import transmit_path
+from pick_bitrate import pick_tx_bitrate
+import ofdm, fusb_options
 
-class my_graph(gr.flow_graph):
-    def __init__(self, callback, occupied_tones, fftsize, symbol_length, rho):
+class usrp_graph(gr.flow_graph):
+    def __init__(self, options):
         gr.flow_graph.__init__(self)
-        self.txpath = transmit_path(self, occupied_tones, fftsize, 
symbol_length)
 
+        self._tx_freq            = options.tx_freq         # tranmitter's 
center frequency
+        self._tx_subdev_spec     = options.tx_subdev_spec  # daughterboard to 
use
+        self._bitrate            = options.bitrate         # desired bit rate
+        self._interp             = options.interp          # interpolating 
rate for the USRP (prelim)
+        self._samples_per_symbol = options.samples_per_symbol  # desired 
samples/baud
+        self._fusb_block_size    = options.fusb_block_size # usb info for USRP
+        self._fusb_nblocks       = options.fusb_nblocks    # usb info for USRP
+
+        if self._tx_freq is None:
+            sys.stderr.write("-f FREQ or --freq FREQ or --tx-freq FREQ must be 
specified\n")
+            raise SystemExit
+
+        # Set up USRP sink; also adjusts interp, samples_per_symbol, and 
bitrate
+        self._setup_usrp_sink()
+
+        # copy the final answers back into options for use by modulator
+        options.samples_per_symbol = self._samples_per_symbol
+        options.bitrate = self._bitrate
+        options.interp = self._interp
+
+        self.txpath = transmit_path(self, options)
+
+        self.connect(self.txpath, self.u)
+
+    def _setup_usrp_sink(self):
+        """
+        Creates a USRP sink, determines the settings for best bitrate,
+        and attaches to the transmitter's subdevice.
+        """
+        self.u = usrp.sink_c(fusb_block_size=self._fusb_block_size,
+                             fusb_nblocks=self._fusb_nblocks)
+        dac_rate = self.u.dac_rate();
+
+        # derive values of bitrate, samples_per_symbol, and interp from 
desired info
+        (self._bitrate, self._samples_per_symbol, self._interp) = \
+            pick_tx_bitrate(self._bitrate, 1,
+                            self._samples_per_symbol, self._interp, dac_rate)
+        
+        self.u.set_interp_rate(self._interp)
+
+        # determine the daughterboard subdevice we're using
+        if self._tx_subdev_spec is None:
+            self._tx_subdev_spec = usrp.pick_tx_subdevice(self.u)
+        self.u.set_mux(usrp.determine_tx_mux_value(self.u, 
self._tx_subdev_spec))
+        self.subdev = usrp.selected_subdev(self.u, self._tx_subdev_spec)
+
+        # Set center frequency of USRP
+        ok = self.set_freq(self._tx_freq)
+        if not ok:
+            print "Failed to set Tx frequency to %s" % 
(eng_notation.num_to_str(self._tx_freq),)
+            raise ValueError
+
+        # Set the USRP for maximum transmit gain
+        # (Note that on the RFX cards this is a nop.)
+        self.set_gain(self.subdev.gain_range()[0])
+
+        # enable Auto Transmit/Receive switching
+        self.set_auto_tr(True)
+
+    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(self.subdev._which, self.subdev, target_freq)
+        if r:
+            return True
+
+        return False
+        
+    def set_gain(self, gain):
+        """
+        Sets the analog gain in the USRP
+        """
+        self.gain = gain
+        self.subdev.set_gain(gain)
+
+    def set_auto_tr(self, enable):
+        """
+        Turns on auto transmit/receive of USRP daughterboard (if exits; else 
ignored)
+        """
+        return self.subdev.set_auto_tr(enable)
+        
+    def add_options(normal, expert):
+        """
+        Adds usrp-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("-T", "--tx-subdev-spec", type="subdev", 
default=None,
+                          help="select USRP Tx side A or B")
+        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("", "--tx-freq", type="eng_float", default=None,
+                          help="set transmit frequency to FREQ 
[default=%default]", metavar="FREQ")
+        expert.add_option("-i", "--interp", type="intx", default=None,
+                          help="set fpga interpolation rate to INTERP 
[default=%default]")
+    # Make a static method to call before instantiation
+    add_options = staticmethod(add_options)
+
+
+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")
+
 # /////////////////////////////////////////////////////////////////////////////
 #                                   main
 # /////////////////////////////////////////////////////////////////////////////
@@ -45,8 +172,29 @@
     def send_pkt(payload='', eof=False):
         return fg.txpath.send_pkt(payload, eof)
 
+    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
+    expert_grp = parser.add_option_group("Expert")
+    parser.add_option("-s", "--size", type="eng_float", default=1450,
+                      help="set packet size [default=%default]")
+    parser.add_option("-M", "--megabytes", type="eng_float", default=1.0,
+                      help="set megabytes to transmit [default=%default]")
+    parser.add_option("-r", "--sample-rate", type="eng_float", default=1e5,
+                      help="set sample rate to RATE (%default)") 
+
+    usrp_graph.add_options(parser, expert_grp)
+    transmit_path.add_options(parser, expert_grp)
+    ofdm.ofdm_mod.add_options(parser, expert_grp)
+    fusb_options.add_options(expert_grp)
+
+    (options, args) = parser.parse_args ()
+
+    if(options.mtu < options.size):
+        sys.stderr.write("MTU (%.0f) must be larger than the packet size 
(%.0f)\n"
+                         % (options.mtu, options.size))
+        sys.exit(1)
+
     # build the graph
-    fg = my_graph(rx_callback, options)
+    fg = usrp_graph(options)
 
     r = gr.enable_realtime_scheduling()
     if r != gr.RT_OK:

Added: 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/fusb_options.py
===================================================================
--- 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/fusb_options.py
                               (rev 0)
+++ 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/fusb_options.py
       2007-02-19 18:54:43 UTC (rev 4505)
@@ -0,0 +1,31 @@
+#
+# Copyright 2006 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+def add_options(parser):
+    """
+    Add Fast USB specifc options to command line parser.
+    
+    @param parser: instance of OptionParser
+    """
+    parser.add_option("-B", "--fusb-block-size", type="int", default=0,
+                      help="specify fast usb block size [default=%default]")
+    parser.add_option("-N", "--fusb-nblocks", type="int", default=0,
+                      help="specify number of fast usb blocks 
[default=%default]")

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 18:50:10 UTC (rev 4504)
+++ 
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/ofdm/transmit_path.py
      2007-02-19 18:54:43 UTC (rev 4505)
@@ -27,7 +27,6 @@
 import sys
 
 # from current dir
-from pick_bitrate import pick_tx_bitrate
 import ofdm
 
 # /////////////////////////////////////////////////////////////////////////////
@@ -35,7 +34,7 @@
 # /////////////////////////////////////////////////////////////////////////////
 
 class transmit_path(gr.hier_block): 
-    def __init__(self, fg, modulator_class, options):
+    def __init__(self, fg, options):
         '''
         See below for what options should hold
         '''
@@ -43,60 +42,15 @@
         options = copy.copy(options)    # make a copy so we can destructively 
modify
 
         self._verbose            = options.verbose
-        self._tx_freq            = options.tx_freq         # tranmitter's 
center frequency
         self._tx_amplitude       = options.tx_amplitude    # digital amplitude 
sent to USRP
-        self._tx_subdev_spec     = options.tx_subdev_spec  # daughterboard to 
use
-        self._bitrate            = options.bitrate         # desired bit rate
-        self._interp             = options.interp          # interpolating 
rate for the USRP (prelim)
-        self._samples_per_symbol = options.samples_per_symbol  # desired 
samples/baud
-        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
     
-        if self._tx_freq is None:
-            sys.stderr.write("-f FREQ or --freq FREQ or --tx-freq FREQ must be 
specified\n")
-            raise SystemExit
-
-        if self._fft_length < self.occupied_tones:
-            sys.stderr.write("occupied tones must be less than FFT length\n")
-            raise SystemExit
-        if self._fft_length < self._cp_length:
-            sys.stderr.write("cyclic prefix length  must be less than FFT 
length\n")
-            raise SystemExit
-
-        # Set up USRP sink; also adjusts interp, samples_per_symbol, and 
bitrate
-        self._setup_usrp_sink()
-
-        # copy the final answers back into options for use by modulator
-        options.samples_per_symbol = self._samples_per_symbol
-        options.bitrate = self._bitrate
-        options.interp = self._interp
-
-        # Set center frequency of USRP
-        ok = self.set_freq(self._tx_freq)
-        if not ok:
-            print "Failed to set Tx frequency to %s" % 
(eng_notation.num_to_str(self._tx_freq),)
-            raise ValueError
-
-        # Set the USRP for maximum transmit gain
-        # (Note that on the RFX cards this is a nop.)
-        self.set_gain(self.subdev.gain_range()[0])
-
-        # enable Auto Transmit/Receive switching
-        self.set_auto_tr(True)
-
-
-        symbol_length = self._fft_length + self._cp_length
-        self.ofdm_mod = ofdm.ofdm_mod(fg, self._occupied_tones, 
self.fft_length, symbol_length)
-        # transmitter
+        self.ofdm_mod = ofdm.ofdm_mod(fg, options)
         self.packet_transmitter = \
-            blks.mod_pkts(fg,
-                          self.ofdm_mod,
-                          access_code=None,
-                          msgq_limit=4,
-                          pad_for_usrp=True)
+            blks.mod_ofdm_pkts(fg,
+                               self.ofdm_mod,
+                               access_code=None,
+                               msgq_limit=4,
+                               pad_for_usrp=True)
 
         self.amp = gr.multiply_const_cc(1)
         self.set_tx_amplitude(self._tx_amplitude)
@@ -106,57 +60,9 @@
             self._print_verbage()
 
         # Create and setup transmit path flow graph
-        fg.connect(self.packet_transmitter, self.amp, self.u)
-        gr.hier_block.__init__(self, fg, None, None)
+        fg.connect(self.packet_transmitter, self.amp)
+        gr.hier_block.__init__(self, fg, None, self.amp)
 
-    def _setup_usrp_sink(self):
-        """
-        Creates a USRP sink, determines the settings for best bitrate,
-        and attaches to the transmitter's subdevice.
-        """
-        self.u = usrp.sink_c(fusb_block_size=self._fusb_block_size,
-                             fusb_nblocks=self._fusb_nblocks)
-        dac_rate = self.u.dac_rate();
-
-        # derive values of bitrate, samples_per_symbol, and interp from 
desired info
-        (self._bitrate, self._samples_per_symbol, self._interp) = \
-            pick_tx_bitrate(self._bitrate, 
self._modulator_class.bits_per_symbol(),
-                            self._samples_per_symbol, self._interp, dac_rate)
-        
-        self.u.set_interp_rate(self._interp)
-
-        # determine the daughterboard subdevice we're using
-        if self._tx_subdev_spec is None:
-            self._tx_subdev_spec = usrp.pick_tx_subdevice(self.u)
-        self.u.set_mux(usrp.determine_tx_mux_value(self.u, 
self._tx_subdev_spec))
-        self.subdev = usrp.selected_subdev(self.u, self._tx_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(self.subdev._which, self.subdev, target_freq)
-        if r:
-            return True
-
-        return False
-        
-    def set_gain(self, gain):
-        """
-        Sets the analog gain in the USRP
-        """
-        self.gain = gain
-        self.subdev.set_gain(gain)
-
     def set_tx_amplitude(self, ampl):
         """
         Sets the transmit amplitude sent to the USRP
@@ -165,12 +71,6 @@
         self._tx_amplitude = max(0.0, min(ampl, 32767.0))
         self.amp.set_k(self._tx_amplitude)
         
-    def set_auto_tr(self, enable):
-        """
-        Turns on auto transmit/receive of USRP daughterboard (if exits; else 
ignored)
-        """
-        return self.subdev.set_auto_tr(enable)
-        
     def send_pkt(self, payload='', eof=False):
         """
         Calls the transmitter method to send a packet
@@ -190,22 +90,9 @@
         """
         Adds transmitter-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("-T", "--tx-subdev-spec", type="subdev", 
default=None,
-                          help="select USRP Tx side A or B")
         normal.add_option("", "--tx-amplitude", type="eng_float", 
default=12000, metavar="AMPL",
                           help="set transmitter digital amplitude: 0 <= AMPL < 
32768 [default=%default]")
         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("", "--tx-freq", type="eng_float", default=None,
-                          help="set transmit frequency to FREQ 
[default=%default]", metavar="FREQ")
-        expert.add_option("-i", "--interp", type="intx", default=None,
-                          help="set fpga interpolation rate to INTERP 
[default=%default]")
         expert.add_option("", "--log", action="store_true", default=False,
                           help="Log all parts of flow graph to file (CAUTION: 
lots of data)")
 
@@ -227,17 +114,3 @@
         print "CP length:       %3d"   % (self._cp_length)
         print "Tx Frequency:    %s"    % 
(eng_notation.num_to_str(self._tx_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")