[Commit-gnuradio] r5993 - grc/trunk/src/SignalBlockDefs

[jblum]

Author: jblum
Date: 2007-07-16 16:55:36 -0600 (Mon, 16 Jul 2007)
New Revision: 5993

Modified:
   grc/trunk/src/SignalBlockDefs/USRP.py
Log:
usrp: raise error for invalid frequencies

Modified: grc/trunk/src/SignalBlockDefs/USRP.py
===================================================================
--- grc/trunk/src/SignalBlockDefs/USRP.py       2007-07-16 22:41:44 UTC (rev 
5992)
+++ grc/trunk/src/SignalBlockDefs/USRP.py       2007-07-16 22:55:36 UTC (rev 
5993)
@@ -22,6 +22,7 @@
 
 from DataTypes import *
 from gnuradio import gr
+import sys
 
 ####################################################################
 #      Constants
@@ -95,14 +96,13 @@
        @param verbose if true, print usrp tuning information
        """
        r = u.tune(which, subdev, freq)
-       if verbose:     
-               if r:
+       if verbose and r:       
                        print subdev.side_and_name()
                        print "  r.baseband_freq =", r.baseband_freq
                        print "  r.dxc_freq      =", r.dxc_freq
                        print "  r.residual_freq =", r.residual_freq
                        print "  r.inverted      =", r.inverted
-               else: print "  Failed!" 
+       elif not r: raise ValueError, '"%s" is not a valid frequency for this 
sub-device\n'%freq
                
 def _setup_rx_subdev(fg, u, subdev_spec, ddc, gain, freq, auto_tr=None, 
rx_ant=None):
        """