[Commit-gnuradio] r9466 - in gnuradio/branches/features/gr-usrp2: gr-usrp2/src gr-utils/src/python

[jcorgan]

Author: jcorgan
Date: 2008-08-30 19:29:41 -0600 (Sat, 30 Aug 2008)
New Revision: 9466

Added:
   gnuradio/branches/features/gr-usrp2/gr-utils/src/python/usrp2_rx_cfile.py
Modified:
   gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i
   gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_32fc.cc
   gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_32fc.h
   gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.cc
   gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.h
   gnuradio/branches/features/gr-usrp2/gr-utils/src/python/Makefile.am
Log:
Added usrp2_rx_cfile.py, clean up

Modified: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i    2008-08-30 
23:00:50 UTC (rev 9465)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i    2008-08-31 
01:29:41 UTC (rev 9466)
@@ -71,13 +71,12 @@
 class usrp2_source_base : public gr_sync_block {
 
 protected:
-  usrp2_source_base(const std::string &name,
+  usrp2_source_base(const char *name,
                    gr_io_signature_sptr output_signature) 
     throw (std::runtime_error);
 
 public:
   ~usrp2_source_base();
-
 };
 
 // ----------------------------------------------------------------
@@ -85,15 +84,13 @@
 GR_SWIG_BLOCK_MAGIC(usrp2,source_32fc)
 
 usrp2_source_32fc_sptr
-usrp2_make_source_32fc(const std::string &ifc="eth0",
-                      const std::string &mac="") 
+usrp2_make_source_32fc(const std::string ifc, const std::string mac) 
   throw (std::runtime_error);
 
 class usrp2_source_32fc : public usrp2_source_base {
 
 protected:
-  usrp2_source_32fc(const std::string &ifc,
-                   const std::string &mac);
+  usrp2_source_32fc(const std::string &ifc, const std::string &mac);
 
 public:
   ~usrp2_source_32fc();

Modified: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_32fc.cc
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_32fc.cc       
2008-08-30 23:00:50 UTC (rev 9465)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_32fc.cc       
2008-08-31 01:29:41 UTC (rev 9466)
@@ -32,19 +32,17 @@
 #define USRP2_SOURCE_32FC_DEBUG 0
 
 usrp2_source_32fc_sptr
-usrp2_make_source_32fc(const std::string &interface,
-                   const std::string &mac_addr) 
+usrp2_make_source_32fc(const std::string &ifc, const std::string &mac_addr) 
   throw (std::runtime_error)
 {
-  return usrp2_source_32fc_sptr(new usrp2_source_32fc(interface, mac_addr));
+  return usrp2_source_32fc_sptr(new usrp2_source_32fc(ifc, mac_addr));
 }
 
-usrp2_source_32fc::usrp2_source_32fc(const std::string &interface,
-                                    const std::string &mac_addr) 
+usrp2_source_32fc::usrp2_source_32fc(const std::string &ifc, const std::string 
&mac_addr) 
   throw (std::runtime_error)
   : usrp2_source_base("usrp2_source_32fc",
                      gr_make_io_signature(1, 1, sizeof(gr_complex)),
-                     interface, mac_addr)
+                     ifc, mac_addr)
 {
   set_output_multiple(USRP2_MIN_RX_SAMPLES);
 }

Modified: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_32fc.h
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_32fc.h        
2008-08-30 23:00:50 UTC (rev 9465)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_32fc.h        
2008-08-31 01:29:41 UTC (rev 9466)
@@ -41,8 +41,7 @@
                         const std::string &mac) throw (std::runtime_error);
   
 protected:
-  usrp2_source_32fc(const std::string &ifc="eth0",
-                   const std::string &mac="") throw (std::runtime_error);
+  usrp2_source_32fc(const std::string &ifc, const std::string &mac) throw 
(std::runtime_error);
 
 public:
   ~usrp2_source_32fc();

Modified: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.cc
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.cc       
2008-08-30 23:00:50 UTC (rev 9465)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.cc       
2008-08-31 01:29:41 UTC (rev 9466)
@@ -30,9 +30,9 @@
 
 #define USRP2_SOURCE_BASE_DEBUG 0
 
-usrp2_source_base::usrp2_source_base(const std::string &name,
+usrp2_source_base::usrp2_source_base(const char *name,
                                     gr_io_signature_sptr output_signature,
-                                    const std::string &interface,
+                                    const std::string &ifc,
                                     const std::string &mac) 
   throw (std::runtime_error)
   : gr_sync_block(name,
@@ -40,7 +40,7 @@
                  output_signature),
     d_u2(usrp2::usrp2::sptr())
 {
-  d_u2 = usrp2::usrp2::make(interface, mac);
+  d_u2 = usrp2::usrp2::make(ifc, mac);
   if (!d_u2)
     throw std::runtime_error("Unable to initialize USRP2!");
 }

Modified: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.h
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.h        
2008-08-30 23:00:50 UTC (rev 9465)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.h        
2008-08-31 01:29:41 UTC (rev 9466)
@@ -33,10 +33,10 @@
 class usrp2_source_base : public gr_sync_block {
   
 protected:
-  usrp2_source_base(const std::string &name,
+  usrp2_source_base(const char *name,
                    gr_io_signature_sptr output_signature,
-                   const std::string &ifc = "eth0",
-                   const std::string &mac = "")
+                   const std::string &ifc,
+                   const std::string &mac)
     throw (std::runtime_error);
 
   usrp2::usrp2::sptr d_u2;

Modified: gnuradio/branches/features/gr-usrp2/gr-utils/src/python/Makefile.am
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-utils/src/python/Makefile.am 
2008-08-30 23:00:50 UTC (rev 9465)
+++ gnuradio/branches/features/gr-usrp2/gr-utils/src/python/Makefile.am 
2008-08-31 01:29:41 UTC (rev 9466)
@@ -47,6 +47,7 @@
     usrp_rx_nogui.py \
     usrp_siggen.py \
     usrp_test_counting.py \
-    usrp_test_loopback.py
+    usrp_test_loopback.py \
+    usrp2_rx_cfile.py
 
 MOSTLYCLEANFILES = *~ *.pyc

Added: gnuradio/branches/features/gr-usrp2/gr-utils/src/python/usrp2_rx_cfile.py
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-utils/src/python/usrp2_rx_cfile.py   
                        (rev 0)
+++ gnuradio/branches/features/gr-usrp2/gr-utils/src/python/usrp2_rx_cfile.py   
2008-08-31 01:29:41 UTC (rev 9466)
@@ -0,0 +1,120 @@
+#!/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, 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, int(options.nsamples)*2)
+            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
+    
+    options.output_shorts = False # Force off until source written
+    return (options, args[0])
+
+
+if __name__ == '__main__':
+    (options, filename) = get_options()
+    tb = rx_cfile_block(options, filename)
+    
+    try:
+        tb.run()
+    except KeyboardInterrupt:
+        pass


Property changes on: 
gnuradio/branches/features/gr-usrp2/gr-utils/src/python/usrp2_rx_cfile.py
___________________________________________________________________
Name: svn:executable
   + *