[Commit-gnuradio] r10409 - gnuradio/branches/releases/3.2/gr-radio-astronomy/src/python

[jcorgan]

Author: jcorgan
Date: 2009-02-08 14:00:30 -0700 (Sun, 08 Feb 2009)
New Revision: 10409

Modified:
   
gnuradio/branches/releases/3.2/gr-radio-astronomy/src/python/usrp_ra_receiver.py
Log:
Merged r10374 from trunk into release 3.2 branch.  Branch passes distcheck.

Modified: 
gnuradio/branches/releases/3.2/gr-radio-astronomy/src/python/usrp_ra_receiver.py
===================================================================
--- 
gnuradio/branches/releases/3.2/gr-radio-astronomy/src/python/usrp_ra_receiver.py
    2009-02-08 20:54:00 UTC (rev 10408)
+++ 
gnuradio/branches/releases/3.2/gr-radio-astronomy/src/python/usrp_ra_receiver.py
    2009-02-08 21:00:30 UTC (rev 10409)
@@ -227,9 +227,16 @@
                #
                if (self.setimode):
                        options.decim = 256
+               
+               if (self.dual_mode == True and self.decim <= 4):
+                       print "Cannot use decim <= 4 with dual_mode"
+                       sys.exit(1)
 
                if (self.dual_mode == False and self.interferometer == False):
-                       self.u = 
usrp.source_c(decim_rate=options.decim,fusb_block_size=8192)
+                       if (options.decim > 4):
+                               self.u = 
usrp.source_c(decim_rate=options.decim,fusb_block_size=8192)
+                       else:
+                               self.u = 
usrp.source_c(decim_rate=options.decim,fusb_block_size=8192, 
fpga_filename="std_4rx_0tx.rbf")
                        self.u.set_mux(usrp.determine_rx_mux_value(self.u, 
options.rx_subdev_spec))
                        # determine the daughterboard subdevice we're using
                        self.subdev[0] = usrp.selected_subdev(self.u, 
options.rx_subdev_spec)