Merge branch 'master' into 8psk

11 files changed, 462 insertions, 4 deletions

diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4
index 2d571d970..111b0ae43 100644
--- a/config/grc_gr_uhd.m4
+++ b/config/grc_gr_uhd.m4
@@ -48,6 +48,7 @@ AC_DEFUN([GRC_GR_UHD],[
         gr-uhd/swig/Makefile \
         gr-uhd/swig/run_tests \
         gr-uhd/swig/run_guile_tests \
+        gr-uhd/apps/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gr-uhd,[
diff --git a/config/usrp_sdcc.m4 b/config/usrp_sdcc.m4
index 86f6429e5..3aae0bfa6 100644
--- a/config/usrp_sdcc.m4
+++ b/config/usrp_sdcc.m4
@@ -24,7 +24,7 @@ AC_DEFUN([USRP_SDCC],
 	AC_CHECK_PROG(XAS, asx8051, asx8051 -plosgff,no)
 
 	if test "$XCC" = "no" -o "$XAS" = "no" ; then
-		AC_MSG_RESULT([USRP requires sdcc. sdcc not found. See http://sdcc.sf.net])
+		AC_MSG_RESULT([USRP requires sdcc version 2. sdcc not found. See http://sdcc.sf.net])
 		sdccok=no
 	else
 		sdcc_version_min=$1
diff --git a/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h b/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h
index 4ba05d709..55f8412ce 100644
--- a/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h
+++ b/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h
@@ -47,7 +47,9 @@ class gr_frequency_modulator_fc : public gr_sync_block
   gr_frequency_modulator_fc (double sensitivity);
 
  public:
-
+  void set_sensitivity(float sens) { d_sensitivity = sens; }
+  float get_sensitivity() { return d_sensitivity; }
+  
   int work (int noutput_items,
 	    gr_vector_const_void_star &input_items,
 	    gr_vector_void_star &output_items);
diff --git a/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.i b/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.i
index 612b59026..04d9a41ba 100644
--- a/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.i
+++ b/gnuradio-core/src/lib/general/gr_frequency_modulator_fc.i
@@ -28,4 +28,7 @@ class gr_frequency_modulator_fc : public gr_sync_block
 {
  private:
   gr_frequency_modulator_fc (double sensitivity);
+public:
+  void set_sensitivity(float sens) { d_sensitivity = sens; }
+  float get_sensitivity() { return d_sensitivity; }
 };
diff --git a/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py b/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py
index 1783660d6..2b94c458e 100755
--- a/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py
+++ b/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py
@@ -87,7 +87,8 @@ class wfm_rx_block (stdgui2.std_top_block):
                 dbid == 0x0040 or #usrp_dbid.TV_RX_REV_3
                 dbid == 0x0043 or #usrp_dbid.TV_RX_MIMO
                 dbid == 0x0044 or #usrp_dbid.TV_RX_REV_2_MIMO
-                dbid == 0x0045 ): #usrp_dbid.TV_RX_REV_3_MIMO
+                dbid == 0x0045 or #usrp_dbid.TV_RX_REV_3_MIMO
+                dbid == 0x0053 ): #usrp_dbid.WBX
             print "This daughterboard does not cover the required frequency range"
             print "for this application.  Please use a BasicRX or TVRX daughterboard."
             raw_input("Press ENTER to continue anyway, or Ctrl-C to exit.")
diff --git a/gr-uhd/Makefile.am b/gr-uhd/Makefile.am
index f9473bea3..ea16c863c 100644
--- a/gr-uhd/Makefile.am
+++ b/gr-uhd/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = include lib
+SUBDIRS = include lib apps
 
 if PYTHON
 SUBDIRS += swig grc
diff --git a/gr-uhd/apps/.gitignore b/gr-uhd/apps/.gitignore
new file mode 100644
index 000000000..22a4e7292
--- /dev/null
+++ b/gr-uhd/apps/.gitignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+
diff --git a/gr-uhd/apps/Makefile.am b/gr-uhd/apps/Makefile.am
new file mode 100644
index 000000000..9bb9b6cdd
--- /dev/null
+++ b/gr-uhd/apps/Makefile.am
@@ -0,0 +1,32 @@
+#
+# Copyright 2011 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.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+EXTRA_DIST += \
+    $(bin_SCRIPTS)
+
+ourpythondir = $(grpythondir)
+
+bin_SCRIPTS = \
+    uhd_fft.py \
+    uhd_rx_cfile.py
+
diff --git a/gr-uhd/apps/uhd_fft.py b/gr-uhd/apps/uhd_fft.py
new file mode 100755
index 000000000..dd5514183
--- /dev/null
+++ b/gr-uhd/apps/uhd_fft.py
@@ -0,0 +1,267 @@
+#!/usr/bin/env python
+#
+# Copyright 2011 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 uhd
+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("-a", "--address", type="string", default="addr=192.168.10.2",
+                          help="Address of UHD device, [default=%default]")
+        parser.add_option("-A", "--antenna", type="string", default="RX2",
+                          help="select Rx Antenna where appropriate")
+        parser.add_option("-s", "--samp-rate", type="eng_float", default=1e6,
+                          help="set sample rate (bandwidth) [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]")
+        parser.add_option("--fft-size", type="int", default=1024,
+                          help="Set number of FFT bins [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 = uhd.usrp_source(device_addr=options.address,
+                                 io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                 num_channels=1)
+        self.u.set_clock_config(uhd.clock_config.internal(), uhd.ALL_MBOARDS)
+
+        self.u.set_samp_rate(options.samp_rate)
+        input_rate = self.u.get_samp_rate()
+        
+        if options.waterfall:
+            self.scope = \
+              waterfallsink2.waterfall_sink_c (panel, fft_size=1024, sample_rate=input_rate)
+            self.frame.SetMinSize((800, 420))
+        elif options.oscilloscope:
+            self.scope = scopesink2.scope_sink_c(panel, sample_rate=input_rate)
+            self.frame.SetMinSize((800, 600))
+        else:
+            self.scope = fftsink2.fft_sink_c (panel,
+                                              fft_size=options.fft_size,
+                                              sample_rate=input_rate, 
+					      ref_scale=options.ref_scale,
+                                              ref_level=20.0,
+                                              y_divs = 12,
+					      avg_alpha=options.avg_alpha)
+            self.frame.SetMinSize((800, 420))
+
+        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.u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2
+
+        if options.freq is None:
+            # if no freq was specified, use the mid-point
+            r = self.u.get_freq_range()
+            options.freq = float(r.start()+r.stop())/2
+            
+        self.set_gain(options.gain)
+
+        self.u.set_antenna(options.antenna, 0)
+
+        if self.show_debug_info:
+            self.myform['samprate'].set_value(self.u.get_samp_rate())
+            self.myform['fs@gbe'].set_value(input_rate)
+            self.myform['baseband'].set_value(0)
+            self.myform['ddc'].set_value(0)
+
+        if not(self.set_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.u.get_gain_range()
+
+	# some configurations don't have gain control
+	if g.stop() > g.start():
+    	    myform['gain'] = form.slider_field(parent=self.panel, sizer=hbox, label="Gain",
+                                               weight=3,
+                                               min=int(g.start()), max=int(g.stop()),
+                                               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_samp_rate(kv):
+            return self.set_samp_rate(kv['samprate'])
+
+        if not(self.show_debug_info):
+            return
+
+        panel = self.panel
+        vbox = vbox_arg
+        myform = self.myform
+
+        hbox = wx.BoxSizer(wx.HORIZONTAL)
+
+        hbox.Add((5,0), 0)
+        myform['samprate'] = form.float_field(
+            parent=panel, sizer=hbox, label="Sample Rate",
+            callback=myform.check_input_and_call(_form_set_samp_rate, self._set_status_msg))
+
+        hbox.Add((5,0), 1)
+        myform['fs@gbe'] = form.static_float_field(
+            parent=panel, sizer=hbox, label="Fs@GbE")
+
+        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, 0)
+
+        if r:
+            self.myform['freq'].set_value(target_freq)     # update displayed value
+            if self.show_debug_info:
+                self.myform['baseband'].set_value(r.actual_inter_freq)
+                self.myform['ddc'].set_value(r.actual_dsp_freq)
+	    if not self.options.oscilloscope:
+		self.scope.set_baseband_freq(target_freq)
+    	    return True
+
+        return False
+
+    def set_gain(self, gain):
+	if self.myform.has_key('gain'):
+    	    self.myform['gain'].set_value(gain)     # update displayed value
+        self.u.set_gain(gain, 0)
+
+    def set_samp_rate(self, samp_rate):
+        ok = self.u.set_samp_rate(samp_rate)
+        input_rate = self.u.get_samp_rate()
+        self.scope.set_sample_rate(input_rate)
+        if self.show_debug_info:  # update displayed values
+            self.myform['samprate'].set_value(self.u.get_samp_rate())
+            self.myform['fs@gbe'].set_value(input_rate)
+
+        # uhd set_samp_rate never fails; always falls back to closest requested.
+        return True  
+
+    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, "UHD FFT", nstatus=1)
+    app.MainLoop()
+
+if __name__ == '__main__':
+    main ()
diff --git a/gr-uhd/apps/uhd_rx_cfile.py b/gr-uhd/apps/uhd_rx_cfile.py
new file mode 100755
index 000000000..897029f17
--- /dev/null
+++ b/gr-uhd/apps/uhd_rx_cfile.py
@@ -0,0 +1,148 @@
+#!/usr/bin/env python
+#
+# Copyright 2011 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.
+# 
+
+"""
+Read samples from a UHD device 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 uhd
+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 UHD device source
+        if options.output_shorts:
+            self._u = uhd.usrp_source(device_addr=options.address,
+                                     io_type=uhd.io_type.COMPLEX_INT16,
+                                     num_channels=1)
+            self._sink = gr.file_sink(gr.sizeof_short*2, filename)
+        else:
+            self._u = uhd.usrp_source(device_addr=options.address,
+                                     io_type=uhd.io_type.COMPLEX_FLOAT32,
+                                     num_channels=1)
+            self._sink = gr.file_sink(gr.sizeof_gr_complex, filename)
+
+        # Set receiver sample rate
+        self._u.set_samp_rate(options.samp_rate)
+
+        # Set receive daughterboard gain
+        if options.gain is None:
+            g = self._u.get_gain_range()
+            options.gain = float(g.start()+g.stop())/2
+	    print "Using mid-point gain of", options.gain, "(", g.start(), "-", g.stop(), ")"
+        self._u.set_gain(options.gain)
+
+        # Set the antenna
+        self._u.set_antenna(options.antenna, 0)
+
+        # Set frequency (tune request takes lo_offset)
+        if(options.lo_offset is not None):
+            treq = uhd.tune_request(options.freq, options.lo_offset)
+        else:
+            treq = uhd.tune_request(options.freq)
+        tr = self._u.set_center_freq(treq)
+        if tr == None:
+            sys.stderr.write('Failed to set center frequency\n')
+            raise SystemExit, 1
+
+        # Create head block if needed and 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.get_samp_rate()
+        
+        if options.verbose:
+            print "Address:", options.address
+            print "Rx gain:", options.gain
+            print "Rx baseband frequency:", n2s(tr.actual_inter_freq)
+            print "Rx DDC frequency:", n2s(tr.actual_dsp_freq)
+            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("-a", "--address", type="string", default="addr=192.168.10.2",
+                      help="Address of UHD device, [default=%default]")
+    parser.add_option("-A", "--antenna", type="string", default="RX2",
+                      help="select Rx Antenna where appropriate")
+    parser.add_option("", "--samp-rate", type="eng_float", default=1e6,
+                      help="set sample rate (bandwidth) [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")
+    parser.add_option("", "--lo-offset", type="eng_float", default=None,
+                      help="set daughterboard LO offset to OFFSET [default=hw default]")
+
+    (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
diff --git a/grc/blocks/gr_frequency_modulator_fc.xml b/grc/blocks/gr_frequency_modulator_fc.xml
index f18d9f1e1..d5f8fcfe3 100644
--- a/grc/blocks/gr_frequency_modulator_fc.xml
+++ b/grc/blocks/gr_frequency_modulator_fc.xml
@@ -9,6 +9,7 @@
 	<key>gr_frequency_modulator_fc</key>
 	<import>from gnuradio import gr</import>
 	<make>gr.frequency_modulator_fc($sensitivity)</make>
+	<callback>set_sensitivity($sensitivity)</callback>
 	<param>
 		<name>Sensitivity</name>
 		<key>sensitivity</key>