[Commit-gnuradio] r7299 - gnuradio/branches/releases/3.1/gr-utils/src/python

[jcorgan]

Author: jcorgan
Date: 2007-12-27 14:46:33 -0700 (Thu, 27 Dec 2007)
New Revision: 7299

Modified:
   gnuradio/branches/releases/3.1/gr-utils/src/python/usrp_fft.py
   gnuradio/branches/releases/3.1/gr-utils/src/python/usrp_oscope.py
Log:
Applied changeset r7236 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/gr-utils/src/python/usrp_fft.py
===================================================================
--- gnuradio/branches/releases/3.1/gr-utils/src/python/usrp_fft.py      
2007-12-27 21:32:26 UTC (rev 7298)
+++ gnuradio/branches/releases/3.1/gr-utils/src/python/usrp_fft.py      
2007-12-27 21:46:33 UTC (rev 7299)
@@ -69,6 +69,8 @@
                           help="Enable waterfall display")
         parser.add_option("-8", "--width-8", action="store_true", 
default=False,
                           help="Enable 8-bit samples across USB")
+        parser.add_option( "--no-hb", action="store_true", default=False,
+                          help="don't use halfband filter in usrp")
         parser.add_option("-S", "--oscilloscope", action="store_true", 
default=False,
                           help="Enable oscilloscope display")
         (options, args) = parser.parse_args()
@@ -79,8 +81,17 @@
         self.show_debug_info = True
         
         # build the graph
+        if options.no_hb or (options.decim<8):
+          #Min decimation of this firmware is 4. 
+          #contains 4 Rx paths without halfbands and 0 tx paths.
+          self.fpga_filename="std_4rx_0tx.rbf"
+          self.u = usrp.source_c(which=options.which, 
decim_rate=options.decim, fpga_filename=self.fpga_filename)
+        else:
+          #Min decimation of standard firmware is 8. 
+          #standard fpga firmware "std_2rxhb_2tx.rbf" 
+          #contains 2 Rx paths with halfband filters and 2 tx paths (the 
default)
+          self.u = usrp.source_c(which=options.which, decim_rate=options.decim)
 
-        self.u = usrp.source_c(which=options.which, decim_rate=options.decim)
         if options.rx_subdev_spec is None:
             options.rx_subdev_spec = pick_subdevice(self.u)
         self.u.set_mux(usrp.determine_rx_mux_value(self.u, 
options.rx_subdev_spec))

Modified: gnuradio/branches/releases/3.1/gr-utils/src/python/usrp_oscope.py
===================================================================
--- gnuradio/branches/releases/3.1/gr-utils/src/python/usrp_oscope.py   
2007-12-27 21:32:26 UTC (rev 7298)
+++ gnuradio/branches/releases/3.1/gr-utils/src/python/usrp_oscope.py   
2007-12-27 21:46:33 UTC (rev 7299)
@@ -65,6 +65,8 @@
                           help="set gain in dB (default is midpoint)")
         parser.add_option("-8", "--width-8", action="store_true", 
default=False,
                           help="Enable 8-bit samples across USB")
+        parser.add_option( "--no-hb", action="store_true", default=False,
+                          help="don't use halfband filter in usrp")
         parser.add_option("-C", "--basic-complex", action="store_true", 
default=False,
                           help="Use both inputs of a basicRX or LFRX as a 
single Complex input channel")
         parser.add_option("-D", "--basic-dualchan", action="store_true", 
default=False,
@@ -87,7 +89,17 @@
           self.num_inputs=2
         else:
           self.num_inputs=1
-        self.u = usrp.source_c(nchan=self.num_inputs,decim_rate=options.decim)
+        if options.no_hb or (options.decim<8):
+          #Min decimation of this firmware is 4. 
+          #contains 4 Rx paths without halfbands and 0 tx paths.
+          self.fpga_filename="std_4rx_0tx.rbf"
+          self.u = 
usrp.source_c(nchan=self.num_inputs,decim_rate=options.decim, 
fpga_filename=self.fpga_filename)
+        else:
+          #Min decimation of standard firmware is 8. 
+          #standard fpga firmware "std_2rxhb_2tx.rbf" 
+          #contains 2 Rx paths with halfband filters and 2 tx paths (the 
default)
+          self.u = 
usrp.source_c(nchan=self.num_inputs,decim_rate=options.decim)
+
         if options.rx_subdev_spec is None:
             options.rx_subdev_spec = pick_subdevice(self.u)