Merged r9433:9527 from features/gr-usrp2 into trunk. Adds usrp2 and gr-usrp2 top-level components. Trunk passes distcheck with mb-gcc installed, but currently not without them. The key issue is that when mb-gcc is not installed, the build system skips over the usrp2/firmware directory, and the firmware include files don't get put into the dist tarball. But we can't do the usual DIST_SUBDIRS method as the firmware is a subpackage.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9528 221aa14e-8319-0410-a670-987f0aec2ac5

3 files changed, 390 insertions, 1 deletions

diff --git a/gr-utils/src/python/Makefile.am b/gr-utils/src/python/Makefile.am
index 6852bbe1a..a48180b49 100644
--- a/gr-utils/src/python/Makefile.am
+++ b/gr-utils/src/python/Makefile.am
@@ -47,6 +47,8 @@ bin_SCRIPTS = \
     usrp_rx_nogui.py \
     usrp_siggen.py \
     usrp_test_counting.py \
-    usrp_test_loopback.py
+    usrp_test_loopback.py \
+    usrp2_fft.py \
+    usrp2_rx_cfile.py
 
 MOSTLYCLEANFILES = *~ *.pyc
diff --git a/gr-utils/src/python/usrp2_fft.py b/gr-utils/src/python/usrp2_fft.py
new file mode 100755
index 000000000..f4303f1f8
--- /dev/null
+++ b/gr-utils/src/python/usrp2_fft.py
@@ -0,0 +1,268 @@
+#!/usr/bin/env python
+#
+# Copyright 2004,2005,2007,2008 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 gr, gru
+from gnuradio import usrp2
+from gnuradio import eng_notation
+from gnuradio.eng_option import eng_option
+from gnuradio.wxgui import stdgui2, fftsink2, waterfallsink2, scopesink2, form, slider
+from optparse import OptionParser
+import wx
+import sys
+import numpy
+
+class app_top_block(stdgui2.std_top_block):
+    def __init__(self, frame, panel, vbox, argv):
+        stdgui2.std_top_block.__init__(self, frame, panel, vbox, argv)
+
+        self.frame = frame
+        self.panel = panel
+        
+        parser = OptionParser(option_class=eng_option)
+        parser.add_option("-e", "--interface", type="string", default="eth0",
+                          help="select Ethernet interface, default is eth0")
+        parser.add_option("-m", "--mac-addr", type="string", default="",
+                          help="select USRP by MAC address, default is auto-select")
+        #parser.add_option("-A", "--antenna", default=None,
+        #                  help="select Rx Antenna (only on RFX-series boards)")
+        parser.add_option("-d", "--decim", type="int", default=16,
+                          help="set fgpa decimation rate to DECIM [default=%default]")
+        parser.add_option("-f", "--freq", type="eng_float", default=None,
+                          help="set frequency to FREQ", metavar="FREQ")
+        parser.add_option("-g", "--gain", type="eng_float", default=None,
+                          help="set gain in dB (default is midpoint)")
+        parser.add_option("-W", "--waterfall", action="store_true", default=False,
+                          help="Enable waterfall display")
+        parser.add_option("-S", "--oscilloscope", action="store_true", default=False,
+                          help="Enable oscilloscope display")
+	parser.add_option("", "--avg-alpha", type="eng_float", default=1e-1,
+			  help="Set fftsink averaging factor, default=[%default]")
+	parser.add_option("", "--ref-scale", type="eng_float", default=1.0,
+			  help="Set dBFS=0dB input value, default=[%default]")
+        (options, args) = parser.parse_args()
+        if len(args) != 0:
+            parser.print_help()
+            sys.exit(1)
+	self.options = options
+        self.show_debug_info = True
+        
+        self.u = usrp2.source_32fc(options.interface, options.mac_addr)
+        self.u.set_decim(options.decim)
+        
+        #input_rate = self.u.adc_freq() / self.u.decim_rate()
+        input_rate = 100e6/options.decim
+        
+        if options.waterfall:
+            self.scope = \
+              waterfallsink2.waterfall_sink_c (panel, fft_size=1024, sample_rate=input_rate)
+        elif options.oscilloscope:
+            self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate)
+        else:
+            self.scope = fftsink2.fft_sink_c (panel, fft_size=1024, sample_rate=input_rate, 
+					      ref_scale=options.ref_scale, ref_level=0.0, y_divs = 10,
+					      avg_alpha=options.avg_alpha)
+
+        self.connect(self.u, self.scope)
+
+        self._build_gui(vbox)
+	self._setup_events()
+	
+        # set initial values
+
+        if options.gain is None:
+            # if no gain was specified, use the mid-point in dB
+            #g = self.subdev.gain_range()
+            #options.gain = float(g[0]+g[1])/2
+            options.gain = 0
+
+        if options.freq is None:
+            # if no freq was specified, use the mid-point
+            #r = self.subdev.freq_range()
+            #options.freq = float(r[0]+r[1])/2
+            options.freq = 0
+            
+        self.set_gain(options.gain)
+
+	#if options.antenna is not None:
+        #    print "Selecting antenna %s" % (options.antenna,)
+        #    self.subdev.select_rx_antenna(options.antenna)
+
+        if self.show_debug_info:
+            self.myform['decim'].set_value(options.decim)
+            self.myform['fs@usb'].set_value(100e6/options.decim) #self.u.adc_freq() / self.u.decim_rate())
+            #self.myform['dbname'].set_value(self.subdev.name())
+            self.myform['baseband'].set_value(0)
+            self.myform['ddc'].set_value(0)
+
+        if not(self.u.set_center_freq(options.freq)):
+            self._set_status_msg("Failed to set initial frequency")
+
+    def _set_status_msg(self, msg):
+        self.frame.GetStatusBar().SetStatusText(msg, 0)
+
+    def _build_gui(self, vbox):
+
+        def _form_set_freq(kv):
+            return self.set_freq(kv['freq'])
+            
+        vbox.Add(self.scope.win, 10, wx.EXPAND)
+        
+        # add control area at the bottom
+        self.myform = myform = form.form()
+        hbox = wx.BoxSizer(wx.HORIZONTAL)
+        hbox.Add((5,0), 0, 0)
+        myform['freq'] = form.float_field(
+            parent=self.panel, sizer=hbox, label="Center freq", weight=1,
+            callback=myform.check_input_and_call(_form_set_freq, self._set_status_msg))
+
+        hbox.Add((5,0), 0, 0)
+        #g = self.subdev.gain_range()
+        g = [0, 100, 1] #FIXME
+        myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, label="Gain",
+                                           weight=3,
+                                           min=int(g[0]), max=int(g[1]),
+                                           callback=self.set_gain)
+
+        hbox.Add((5,0), 0, 0)
+        vbox.Add(hbox, 0, wx.EXPAND)
+
+        self._build_subpanel(vbox)
+
+    def _build_subpanel(self, vbox_arg):
+        # build a secondary information panel (sometimes hidden)
+
+        # FIXME figure out how to have this be a subpanel that is always
+        # created, but has its visibility controlled by foo.Show(True/False)
+        
+        def _form_set_decim(kv):
+            return self.set_decim(kv['decim'])
+
+        if not(self.show_debug_info):
+            return
+
+        panel = self.panel
+        vbox = vbox_arg
+        myform = self.myform
+
+        #panel = wx.Panel(self.panel, -1)
+        #vbox = wx.BoxSizer(wx.VERTICAL)
+
+        hbox = wx.BoxSizer(wx.HORIZONTAL)
+        hbox.Add((5,0), 0)
+
+        myform['decim'] = form.int_field(
+            parent=panel, sizer=hbox, label="Decim",
+            callback=myform.check_input_and_call(_form_set_decim, self._set_status_msg))
+
+        hbox.Add((5,0), 1)
+        myform['fs@usb'] = form.static_float_field(
+            parent=panel, sizer=hbox, label="Fs@USB")
+
+        hbox.Add((5,0), 1)
+        myform['dbname'] = form.static_text_field(
+            parent=panel, sizer=hbox)
+
+        hbox.Add((5,0), 1)
+        myform['baseband'] = form.static_float_field(
+            parent=panel, sizer=hbox, label="Analog BB")
+
+        hbox.Add((5,0), 1)
+        myform['ddc'] = form.static_float_field(
+            parent=panel, sizer=hbox, label="DDC")
+
+        hbox.Add((5,0), 0)
+        vbox.Add(hbox, 0, wx.EXPAND)
+
+        
+    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 down converter.
+        """
+        r = self.u.set_center_freq(target_freq)
+        
+        if r:
+            self.myform['freq'].set_value(target_freq)     # update displayed value
+            if self.show_debug_info:
+                self.myform['baseband'].set_value(r.baseband_freq)
+                self.myform['ddc'].set_value(r.dxc_freq)
+	    if not self.options.oscilloscope:
+		self.scope.win.set_baseband_freq(target_freq)
+    	    return True
+
+        return False
+
+    def set_gain(self, gain):
+        self.myform['gain'].set_value(gain)     # update displayed value
+        self.u.set_gain(gain)
+
+    def set_decim(self, decim):
+        ok = self.u.set_decim(decim)
+        if not ok:
+            print "set_decim failed"
+        #input_rate = self.u.adc_freq() / self.u.decim_rate()
+        input_rate = 100e6/decim # FIXME
+        self.scope.set_sample_rate(input_rate)
+        if self.show_debug_info:  # update displayed values
+            self.myform['decim'].set_value(decim) #self.u.decim_rate())
+            self.myform['fs@usb'].set_value(input_rate) #self.u.adc_freq() / self.u.decim_rate())
+        return ok
+
+    def _setup_events(self):
+	if not self.options.waterfall and not self.options.oscilloscope:
+	    self.scope.win.Bind(wx.EVT_LEFT_DCLICK, self.evt_left_dclick)
+	    
+    def evt_left_dclick(self, event):
+	(ux, uy) = self.scope.win.GetXY(event)
+	if event.CmdDown():
+	    # Re-center on maximum power
+	    points = self.scope.win._points
+	    if self.scope.win.peak_hold:
+		if self.scope.win.peak_vals is not None:
+		    ind = numpy.argmax(self.scope.win.peak_vals)
+		else:
+		    ind = int(points.shape()[0]/2)
+	    else:
+        	ind = numpy.argmax(points[:,1])
+            (freq, pwr) = points[ind]
+	    target_freq = freq/self.scope.win._scale_factor
+	    print ind, freq, pwr
+            self.set_freq(target_freq)            
+	else:
+	    # Re-center on clicked frequency
+	    target_freq = ux/self.scope.win._scale_factor
+	    self.set_freq(target_freq)
+	    
+	
+def main ():
+    app = stdgui2.stdapp(app_top_block, "USRP2 FFT", nstatus=1)
+    app.MainLoop()
+
+if __name__ == '__main__':
+    main ()
diff --git a/gr-utils/src/python/usrp2_rx_cfile.py b/gr-utils/src/python/usrp2_rx_cfile.py
new file mode 100755
index 000000000..9ab28607d
--- /dev/null
+++ b/gr-utils/src/python/usrp2_rx_cfile.py
@@ -0,0 +1,119 @@
+#!/usr/bin/env python
+
+"""
+Read samples from the USRP2 and write to file formatted as binary
+outputs single precision complex float values or complex short values (interleaved 16 bit signed short integers).
+
+"""
+
+from gnuradio import gr, eng_notation
+from gnuradio import usrp2
+from gnuradio.eng_option import eng_option
+from optparse import OptionParser
+import sys
+
+n2s = eng_notation.num_to_str
+
+class rx_cfile_block(gr.top_block):
+
+    def __init__(self, options, filename):
+        gr.top_block.__init__(self)
+
+        # Create a USRP2 source
+        if options.output_shorts:
+            self._u = usrp2.source_16sc(options.interface, options.mac_addr)
+            self._sink = gr.file_sink(gr.sizeof_short*2, filename)
+        else:
+            self._u = usrp2.source_32fc(options.interface, options.mac_addr)
+            self._sink = gr.file_sink(gr.sizeof_gr_complex, filename)
+
+        # Set receiver decimation rate
+        self._u.set_decim(options.decim)
+
+        # Set receive daughterboard gain
+        if options.gain is None:
+            #g = self._u.gain_range()
+            #options.gain = float(g[0]+g[1])/2
+            options.gain = 0 # Until gain range is implemented
+        self._u.set_gain(options.gain)
+
+        # Set receive frequency
+        tr = self._u.set_center_freq(options.freq)
+        if tr == None:
+            sys.stderr.write('Failed to set center frequency\n')
+            raise SystemExit, 1
+
+        # Create head block if needed wire it up
+        if options.nsamples is None:
+            self.connect(self._u, self._sink)
+        else:
+            if options.output_shorts:
+                self._head = gr.head(gr.sizeof_short*2, int(options.nsamples))
+            else:
+                self._head = gr.head(gr.sizeof_gr_complex, int(options.nsamples))
+
+            self.connect(self._u, self._head, self._sink)
+
+        #input_rate = self.u.adc_freq() / self.u.decim_rate()
+        input_rate = 100e6/options.decim
+        
+        if options.verbose:
+            print "Network interface:", options.interface
+            print "USRP2 address:", self._u.mac_addr()
+            #print "Using RX d'board %s" % (self._u.rx_name(),)
+            print "Rx gain:", options.gain
+            print "Rx baseband frequency:", n2s(tr.baseband_freq)
+            print "Rx DDC frequency:", n2s(tr.dxc_freq)
+            print "Rx residual frequency:", n2s(tr.residual_freq)
+            print "Rx decimation rate:", options.decim
+            print "Rx sample rate:", n2s(input_rate)
+            if options.nsamples is None:
+                print "Receiving samples until Ctrl-C"
+            else:
+                print "Receving", n2s(options.nsamples), "samples"
+            if options.output_shorts:
+                print "Writing 16-bit complex shorts"
+            else:
+                print "Writing 32-bit complex floats"
+            print "Output filename:", filename
+        
+def get_options():
+    usage="%prog: [options] output_filename"
+    parser = OptionParser(option_class=eng_option, usage=usage)
+    parser.add_option("-e", "--interface", type="string", default="eth0",
+                      help="use specified Ethernet interface [default=%default]")
+    parser.add_option("-m", "--mac-addr", type="string", default="",
+                      help="use USRP2 at specified MAC address [default=None]")  
+    parser.add_option("-d", "--decim", type="int", default=16,
+                      help="set fgpa decimation rate to DECIM [default=%default]")
+    parser.add_option("-f", "--freq", type="eng_float", default=None,
+                      help="set frequency to FREQ", metavar="FREQ")
+    parser.add_option("-g", "--gain", type="eng_float", default=None,
+                      help="set gain in dB (default is midpoint)")
+    parser.add_option( "-s","--output-shorts", action="store_true", default=False,
+                      help="output interleaved shorts instead of complex floats")
+    parser.add_option("-N", "--nsamples", type="eng_float", default=None,
+                      help="number of samples to collect [default=+inf]")
+    parser.add_option("-v", "--verbose", action="store_true", default=False,
+                      help="verbose output")
+    (options, args) = parser.parse_args ()
+    if len(args) != 1:
+        parser.print_help()
+        raise SystemExit, 1
+    
+    if options.freq is None:
+        parser.print_help()
+        sys.stderr.write('You must specify the frequency with -f FREQ\n');
+        raise SystemExit, 1
+    
+    return (options, args[0])
+
+
+if __name__ == '__main__':
+    (options, filename) = get_options()
+    tb = rx_cfile_block(options, filename)
+    
+    try:
+        tb.run()
+    except KeyboardInterrupt:
+        pass