[Commit-gnuradio] r11198 - gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital

[trondeau]

Author: trondeau
Date: 2009-06-14 21:19:16 -0600 (Sun, 14 Jun 2009)
New Revision: 11198

Added:
   
gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/usrp_interface.py
Modified:
   
gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/benchmark_rx.py
Log:
Initial work to make abstracted layer out of USRP to allow easier transition to 
USRP2

Modified: 
gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/benchmark_rx.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/benchmark_rx.py
      2009-06-15 02:59:39 UTC (rev 11197)
+++ 
gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/benchmark_rx.py
      2009-06-15 03:19:16 UTC (rev 11198)
@@ -21,7 +21,6 @@
 # 
 
 from gnuradio import gr, gru, modulation_utils
-from gnuradio import usrp
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
@@ -32,6 +31,7 @@
 
 # from current dir
 from receive_path import receive_path
+from usrp_interface import usrp_interface
 
 #import os
 #print os.getpid()
@@ -51,77 +51,29 @@
             raise SystemExit
 
         # Set up USRP source
-        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()
+        self.airifc = usrp_interface(self._decim, self._rx_subdev_spec)
+        self.airifc.set_rx_freq(self._rx_freq)
+
         if options.show_rx_gain_range:
+            g = self.airifg.get_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
+            
+        self.airifc.set_gain(self._rx_gain)
 
         # Set up receive path
         self.rxpath = receive_path(demodulator, rx_callback, options) 
 
-        self.connect(self.u, self.rxpath)
+        self.connect(self.airifc.rx(), self.rxpath)
         
-    def _setup_usrp_source(self):
-        self.u = usrp.source_c ()
-        adc_rate = self.u.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 decim(self):
         return self._decim
 
     def add_options(normal, expert):
         """
-        Adds usrp-specific options to the Options Parser
+        Adds air interface-specific options to the Options Parser
         """
         add_freq_option(normal)
-        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, 
@@ -132,8 +84,6 @@
                           help="set Rx frequency to FREQ [default=%default]", 
metavar="FREQ")
         expert.add_option("-d", "--decim", type="intx", default=128,
                           help="set fpga decimation rate to DECIM 
[default=%default]")
-        expert.add_option("", "--snr", type="eng_float", default=30,
-                          help="set the SNR of the channel in dB 
[default=%default]")
    
 
     # Make a static method to call before instantiation
@@ -190,6 +140,7 @@
                             % (', '.join(demods.keys()),))
 
     my_top_block.add_options(parser, expert_grp)
+    usrp_interface.add_options(parser, expert_grp)
     receive_path.add_options(parser, expert_grp)
 
     for mod in demods.values():

Added: 
gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/usrp_interface.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/usrp_interface.py
                            (rev 0)
+++ 
gnuradio/branches/developers/trondeau/digital/gnuradio-examples/python/digital/usrp_interface.py
    2009-06-15 03:19:16 UTC (rev 11198)
@@ -0,0 +1,90 @@
+#!/usr/bin/env python
+#
+# Copyright 2005,2006,2007,2009 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 3, 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.
+# 
+
+from gnuradio import usrp
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+
+class usrp_interface:
+    def __init__(self, decim, subdevspec):
+        self._decim = decim
+        self._rx_subdev_spec = subdevspec
+        
+        self.u = usrp.source_c ()
+        adc_rate = self.u.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))
+
+        self.subdev.set_auto_tr(True)
+
+    def rx(self):
+        return self.u
+
+    def set_rx_freq(self, 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.
+        """
+
+        ok = self.u.tune(0, self.subdev, freq)
+        if not ok:
+            print "Failed to set Rx frequency to %s" % 
(eng_notation.num_to_str(freq))
+            raise ValueError, eng_notation.num_to_str(freq)
+
+        self._freq = freq
+        return ok
+
+    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(self._gain)
+
+    def add_options(normal, expert):
+        """
+        Adds usrp-specific options to the Options Parser
+        """
+        normal.add_option("-R", "--rx-subdev-spec", type="subdev", 
default=None,
+                          help="select USRP Rx side A or B")
+
+    # Make a static method to call before instantiation
+    add_options = staticmethod(add_options)