updated digital to use installed usrp options

6 files changed, 3 insertions, 367 deletions

diff --git a/gnuradio-examples/python/digital/Makefile.am b/gnuradio-examples/python/digital/Makefile.am
index 64ce4ec46..e32180cd4 100644
--- a/gnuradio-examples/python/digital/Makefile.am
+++ b/gnuradio-examples/python/digital/Makefile.am
@@ -25,7 +25,6 @@ ourdatadir = $(exampledir)/digital
 
 dist_ourdata_DATA =		\
 	README			\
-	generic_usrp.py		\
 	pick_bitrate.py		\
 	qt_digital_window.ui	\
 	qt_digital_window.py	\
@@ -33,7 +32,6 @@ dist_ourdata_DATA =		\
 	qt_rx_window.py		\
 	receive_path.py		\
 	transmit_path.py	\
-	usrp_options.py \
 	usrp_receive_path.py \
 	usrp_transmit_path.py
 
diff --git a/gnuradio-examples/python/digital/benchmark_qt_rx.py b/gnuradio-examples/python/digital/benchmark_qt_rx.py
index 33cf94a5c..0cbb68d23 100755
--- a/gnuradio-examples/python/digital/benchmark_qt_rx.py
+++ b/gnuradio-examples/python/digital/benchmark_qt_rx.py
@@ -25,6 +25,7 @@ from gnuradio import usrp
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
+from gnuradio import usrp_options
 
 import random
 import struct
@@ -33,7 +34,6 @@ import sys
 # from current dir
 from receive_path import receive_path
 from pick_bitrate import pick_rx_bitrate
-import usrp_options
 
 try:
     from gnuradio.qtgui import qtgui
diff --git a/gnuradio-examples/python/digital/generic_usrp.py b/gnuradio-examples/python/digital/generic_usrp.py
deleted file mode 100644
index c7ccbe53c..000000000
--- a/gnuradio-examples/python/digital/generic_usrp.py
+++ /dev/null
@@ -1,239 +0,0 @@
-#
-# Copyright 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.
-#
-
-USRP1_TYPE = 'usrp1'
-USRP2_TYPE = 'usrp2'
-DUMMY_TYPE = 'dummy'
-#usrp2 rates common for decim and interp
-_USRP2_RATES = range(4, 128+1, 1) + range(130, 256+1, 2) + range(260, 512+1, 4)
-#dummy common rates
-_DUMMY_XRATES = range(4, 512, 2)
-_DUMMY_CONVERTER_RATE = 100e6
-#dummy freq result
-class _dummy_freq_result(object):
-    def __init__(self, target_freq):
-        self.baseband_freq = target_freq
-        self.dxc_freq = 0
-        self.residual_freq = 0
-from gnuradio import gr, usrp, usrp2
-
-########################################################################
-# generic usrp common stuff
-########################################################################
-class _generic_usrp_base(object):
-
-    def __init__(self, which=0, subdev_spec=None, interface="", mac_addr="",
-        fusb_block_size=0, fusb_nblocks=0, usrpx=None, lo_offset=None, gain=None):
-        self._lo_offset = lo_offset
-        #usrp options
-        self._which = which
-        self._subdev_spec = subdev_spec
-        #usrp2 options
-        self._interface = interface
-        self._mac_addr = mac_addr
-        #fusb options
-        self._fusb_block_size = fusb_block_size
-        self._fusb_nblocks = fusb_nblocks
-        #pick which usrp model
-        if usrpx == '0': self._setup_usrpx(DUMMY_TYPE)
-        elif usrpx == '1' or self._subdev_spec: self._setup_usrpx(USRP1_TYPE)
-        elif usrpx == '2' or self._mac_addr: self._setup_usrpx(USRP2_TYPE)
-        else: #automatic
-            try: self._setup_usrpx(USRP2_TYPE)
-            except:
-                try: self._setup_usrpx(USRP1_TYPE)
-                except: raise Exception, 'Failed to automatically setup a usrp device.'
-        #post usrp setup
-        if self._lo_offset is not None:
-            self.set_lo_offset(self._lo_offset)
-        self.set_gain(gain)
-        self.set_auto_tr(True)
-
-    def _setup_usrpx(self, type):
-        """
-        Call the appropriate setup method.
-        @param type the usrp type constant
-        """
-        self._type = type
-        if self._type == USRP1_TYPE: self._setup_usrp1()
-        elif self._type == USRP2_TYPE: self._setup_usrp2()
-        elif self._type == DUMMY_TYPE: self._setup_dummy()
-
-    def __str__(self):
-        if self._type == USRP1_TYPE: return self._subdev.side_and_name()
-        elif self._type == USRP2_TYPE:
-            return 'Interface: %s    MAC Address: %s    D-Board ID: 0x%.2x'%(
-                self._u.interface_name(), self._u.mac_addr(), self._u.daughterboard_id())
-        elif self._type == DUMMY_TYPE: return 'Dummy USRP Device'
-
-    def gain(self): return self._gain
-
-    def set_gain(self, gain=None):
-        #automatic gain calculation
-        r = self.gain_range()
-        if gain is None: gain = (r[0] + r[1])/2 # set gain to midpoint
-        #set gain for usrp
-        self._gain = gain
-        if self._type == USRP1_TYPE: return self._subdev.set_gain(gain)
-        elif self._type == USRP2_TYPE: return self._u.set_gain(gain)
-        elif self._type == DUMMY_TYPE: return True
-
-    def gain_range(self):
-        if self._type == USRP1_TYPE: return self._subdev.gain_range()
-        elif self._type == USRP2_TYPE: return self._u.gain_range()
-        elif self._type == DUMMY_TYPE: return (0, 0, 0)
-
-    def set_center_freq(self, target_freq):
-        if self._type == USRP1_TYPE:
-            return self._u.tune(self._dxc, self._subdev, target_freq)
-        elif self._type == USRP2_TYPE:
-            return self._u.set_center_freq(target_freq)
-        elif self._type == DUMMY_TYPE: return _dummy_freq_result(target_freq)
-
-    def freq_range(self):
-        if self._type == USRP1_TYPE: return self._subdev.freq_range()
-        elif self._type == USRP2_TYPE: return self._u.freq_range()
-        elif self._type == DUMMY_TYPE: return (-10e9, 10e9, 100e3)
-
-    def set_lo_offset(self, lo_offset):
-        if self._type == USRP1_TYPE: return self._subdev.set_lo_offset(lo_offset)
-        elif self._type == USRP2_TYPE: return self._u.set_lo_offset(lo_offset)
-        elif self._type == DUMMY_TYPE: return True
-
-    def set_auto_tr(self, enable):
-        if self._type == USRP1_TYPE: return self._subdev.set_auto_tr(enable)
-
-    def __del__(self):
-        try: # Avoid weak reference error
-            del self._u
-            del self._subdev
-        except: pass
-
-########################################################################
-# generic usrp source
-########################################################################
-class generic_usrp_source_c(_generic_usrp_base, gr.hier_block2):
-    """
-    Create a generic usrp source that represents usrp and usrp2.
-    Take usrp and usrp2 constructor arguments and try to figure out usrp or usrp2.
-    Provide generic access methods so the API looks the same for both.
-    """
-
-    def __init__(self, **kwargs):
-        gr.hier_block2.__init__(self, "generic_usrp_source",
-            gr.io_signature(0, 0, 0), # Input signature
-            gr.io_signature(1, 1, gr.sizeof_gr_complex)) # Output signature
-        _generic_usrp_base.__init__(self, **kwargs)
-        self.connect(self._u, self)
-
-    ####################################################################
-    # generic access methods
-    ####################################################################
-    def set_decim(self, decim):
-        if decim not in self.get_decim_rates(): return False
-        if self._type == USRP1_TYPE: return self._u.set_decim_rate(decim)
-        elif self._type == USRP2_TYPE: return self._u.set_decim(decim)
-        elif self._type == DUMMY_TYPE: return True
-
-    def get_decim_rates(self):
-        if self._type == USRP1_TYPE: return range(8, 256+1, 2) #default firmware w/ hb filters
-        if self._type == USRP2_TYPE: return _USRP2_RATES
-        elif self._type == DUMMY_TYPE: return _DUMMY_XRATES
-
-    def adc_rate(self):
-        if self._type == USRP1_TYPE: return self._u.adc_rate()
-        if self._type == USRP2_TYPE: return self._u.adc_rate()
-        elif self._type == DUMMY_TYPE: return _DUMMY_CONVERTER_RATE
-
-    ####################################################################
-    # setup usrp methods
-    ####################################################################
-    def _setup_usrp1(self):
-        self._u = usrp.source_c (self._which,
-                                fusb_block_size=self._fusb_block_size,
-                                fusb_nblocks=self._fusb_nblocks)
-        # determine the daughterboard subdevice we're using
-        if self._subdev_spec is None:
-            self._subdev_spec = usrp.pick_rx_subdevice(self._u)
-        self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
-        self._u.set_mux(usrp.determine_rx_mux_value(self._u, self._subdev_spec))
-        self._dxc = 0
-
-    def _setup_usrp2(self):
-        self._u = usrp2.source_32fc(self._interface, self._mac_addr)
-
-    def _setup_dummy(self): self._u = gr.null_source(gr.sizeof_gr_complex)
-
-########################################################################
-# generic usrp sink
-########################################################################
-class generic_usrp_sink_c(_generic_usrp_base, gr.hier_block2):
-    """
-    Create a generic usrp sink that represents usrp and usrp2.
-    Take usrp and usrp2 constructor arguments and try to figure out usrp or usrp2.
-    Provide generic access methods so the API looks the same for both.
-    """
-
-    def __init__(self, **kwargs):
-        gr.hier_block2.__init__(self, "generic_usrp_sink",
-            gr.io_signature(1, 1, gr.sizeof_gr_complex), # Input signature
-            gr.io_signature(0, 0, 0)) # Output signature
-        _generic_usrp_base.__init__(self, **kwargs)
-        if self._type == USRP1_TYPE: #scale 0.0 to 1.0 input for usrp1
-            self.connect(self, gr.multiply_const_cc((2**15)-1), self._u)
-        else: self.connect(self, self._u)
-
-    ####################################################################
-    # generic access methods
-    ####################################################################
-    def set_interp(self, interp):
-        if interp not in self.get_interp_rates(): return False
-        if self._type == USRP1_TYPE: return self._u.set_interp_rate(interp)
-        elif self._type == USRP2_TYPE: return self._u.set_interp(interp)
-        elif self._type == DUMMY_TYPE: return True
-
-    def get_interp_rates(self):
-        if self._type == USRP1_TYPE: return range(16, 512+1, 4)
-        if self._type == USRP2_TYPE: return _USRP2_RATES
-        elif self._type == DUMMY_TYPE: return _DUMMY_XRATES
-
-    def dac_rate(self):
-        if self._type == USRP1_TYPE: return self._u.dac_rate()
-        if self._type == USRP2_TYPE: return self._u.dac_rate()
-        elif self._type == DUMMY_TYPE: return _DUMMY_CONVERTER_RATE
-
-    ####################################################################
-    # setup usrp methods
-    ####################################################################
-    def _setup_usrp1(self):
-        self._u = usrp.sink_c (self._which,
-                                fusb_block_size=self._fusb_block_size,
-                                fusb_nblocks=self._fusb_nblocks)
-        # determine the daughterboard subdevice we're using
-        if self._subdev_spec is None:
-            self._subdev_spec = usrp.pick_tx_subdevice(self._u)
-        self._subdev = usrp.selected_subdev(self._u, self._subdev_spec)
-        self._u.set_mux(usrp.determine_tx_mux_value(self._u, self._subdev_spec))
-        self._dxc = self._subdev.which()
-
-    def _setup_usrp2(self): self._u = usrp2.sink_32fc(self._interface, self._mac_addr)
-
-    def _setup_dummy(self): self._u = gr.null_sink(gr.sizeof_gr_complex)
diff --git a/gnuradio-examples/python/digital/usrp_options.py b/gnuradio-examples/python/digital/usrp_options.py
deleted file mode 100644
index 380ef60f4..000000000
--- a/gnuradio-examples/python/digital/usrp_options.py
+++ /dev/null
@@ -1,123 +0,0 @@
-#
-# Copyright 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.
-#
-
-_parser_to_groups_dict = dict()
-class _parser_groups(object):
-    def __init__(self, parser):
-        self.usrpx_grp = parser.add_option_group("General USRP Options")
-        self.usrp1_grp = parser.add_option_group("USRP1 Specific Options")
-        self.usrp1exp_grp = parser.add_option_group("USRP1 Expert Options")
-        self.usrp2_grp = parser.add_option_group("USRP2 Specific Options")
-
-import generic_usrp
-
-def _add_options(parser):
-    """
-    Add options to manually choose between usrp or usrp2.
-    Add options for usb. Add options common to source and sink.
-    @param parser: instance of OptionParser
-    @return the parser group
-    """
-    #cache groups so they dont get added twice on tranceiver apps
-    if not _parser_to_groups_dict.has_key(parser): _parser_to_groups_dict[parser] = _parser_groups(parser)
-    pg = _parser_to_groups_dict[parser]
-    #pick usrp or usrp2
-    pg.usrpx_grp.add_option("-u", "--usrpx", type="string", default=None,
-                      help="specify which usrp model: 1 for USRP, 2 for USRP2 [default=auto]")
-    #fast usb options
-    pg.usrp1exp_grp.add_option("-B", "--fusb-block-size", type="int", default=0,
-                      help="specify fast usb block size [default=%default]")
-    pg.usrp1exp_grp.add_option("-N", "--fusb-nblocks", type="int", default=0,
-                      help="specify number of fast usb blocks [default=%default]")
-    #lo offset
-    pg.usrpx_grp.add_option("--lo-offset", type="eng_float", default=None,
-                      help="set LO Offset in Hz [default=automatic].")
-    #usrp options
-    pg.usrp1_grp.add_option("-w", "--which", type="int", default=0,
-                      help="select USRP board [default=%default]")
-    #usrp2 options
-    pg.usrp2_grp.add_option("-e", "--interface", type="string", default="eth0",
-                      help="Use USRP2 at specified Ethernet interface [default=%default]")
-    pg.usrp2_grp.add_option("-a", "--mac-addr", type="string", default="",
-                      help="Use USRP2 at specified MAC address [default=None]")
-    return pg
-
-def add_rx_options(parser):
-    """
-    Add receive specific usrp options.
-    @param parser: instance of OptionParser
-    """
-    pg = _add_options(parser)
-    pg.usrp1_grp.add_option("-R", "--rx-subdev-spec", type="subdev", default=None,
-                      help="select USRP Rx side A or B")
-    pg.usrpx_grp.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")
-    pg.usrpx_grp.add_option("--show-rx-gain-range", action="store_true", default=False, 
-                      help="print min and max Rx gain available on selected daughterboard")
-    pg.usrpx_grp.add_option("-d", "--decim", type="intx", default=None,
-                      help="set fpga decimation rate to DECIM [default=%default]")
-
-def create_usrp_source(options):
-    u = generic_usrp.generic_usrp_source_c(
-        usrpx=options.usrpx,
-        which=options.which,
-        subdev_spec=options.rx_subdev_spec,
-        interface=options.interface,
-        mac_addr=options.mac_addr,
-        fusb_block_size=options.fusb_block_size,
-        fusb_nblocks=options.fusb_nblocks,
-        lo_offset=options.lo_offset,
-        gain=options.rx_gain,
-    )
-    if options.show_rx_gain_range:
-        print "Rx Gain Range: minimum = %g, maximum = %g, step size = %g"%tuple(u.gain_range())
-    return u
-
-def add_tx_options(parser):
-    """
-    Add transmit specific usrp options.
-    @param parser: instance of OptionParser
-    """
-    pg = _add_options(parser)
-    pg.usrp1_grp.add_option("-T", "--tx-subdev-spec", type="subdev", default=None,
-                      help="select USRP Rx side A or B")
-    pg.usrpx_grp.add_option("--tx-gain", type="eng_float", default=None, metavar="GAIN",
-                      help="set transmitter gain in dB [default=midpoint].  See also --show-tx-gain-range")
-    pg.usrpx_grp.add_option("--show-tx-gain-range", action="store_true", default=False, 
-                      help="print min and max Tx gain available on selected daughterboard")
-    pg.usrpx_grp.add_option("-i", "--interp", type="intx", default=None,
-                      help="set fpga interpolation rate to INTERP [default=%default]")
-
-def create_usrp_sink(options):
-    u = generic_usrp.generic_usrp_sink_c(
-        usrpx=options.usrpx,
-        which=options.which,
-        subdev_spec=options.tx_subdev_spec,
-        interface=options.interface,
-        mac_addr=options.mac_addr,
-        fusb_block_size=options.fusb_block_size,
-        fusb_nblocks=options.fusb_nblocks,
-        lo_offset=options.lo_offset,
-        gain=options.tx_gain,
-    )
-    if options.show_tx_gain_range:
-        print "Tx Gain Range: minimum = %g, maximum = %g, step size = %g"%tuple(u.gain_range())
-    return u
diff --git a/gnuradio-examples/python/digital/usrp_receive_path.py b/gnuradio-examples/python/digital/usrp_receive_path.py
index fd47c2725..e28eb0a8c 100644
--- a/gnuradio-examples/python/digital/usrp_receive_path.py
+++ b/gnuradio-examples/python/digital/usrp_receive_path.py
@@ -20,7 +20,7 @@
 # 
 
 from gnuradio import gr
-import usrp_options
+from gnuradio import usrp_options
 import receive_path
 from pick_bitrate import pick_rx_bitrate
 from gnuradio import eng_notation
diff --git a/gnuradio-examples/python/digital/usrp_transmit_path.py b/gnuradio-examples/python/digital/usrp_transmit_path.py
index ed2603fa3..ad9f741a6 100644
--- a/gnuradio-examples/python/digital/usrp_transmit_path.py
+++ b/gnuradio-examples/python/digital/usrp_transmit_path.py
@@ -20,7 +20,7 @@
 # 
 
 from gnuradio import gr
-import usrp_options
+from gnuradio import usrp_options
 import transmit_path
 from pick_bitrate import pick_tx_bitrate
 from gnuradio import eng_notation