[Commit-gnuradio] r10374 - gnuradio/trunk/gr-radio-astronomy/src/python

[mleech]

Author: mleech
Date: 2009-02-02 09:54:39 -0700 (Mon, 02 Feb 2009)
New Revision: 10374

Modified:
   gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py
Log:
Included support for decim=4, by loading non-default firmware.



Modified: gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py    
2009-02-02 14:53:09 UTC (rev 10373)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py    
2009-02-02 16:54:39 UTC (rev 10374)
@@ -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)