[Commit-gnuradio] r10618 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/python/gnuradio/gr gnuradio-examples/python/usrp gnuradio-examples/python/usrp2

[jcorgan]

Author: jcorgan
Date: 2009-03-15 14:07:08 -0600 (Sun, 15 Mar 2009)
New Revision: 10618

Modified:
   gnuradio/branches/releases/3.2/
   gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
   gnuradio/branches/releases/3.2/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
   
gnuradio/branches/releases/3.2/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py
Log:
Applied changeset r10587 to release 3.2 branch


Property changes on: gnuradio/branches/releases/3.2
___________________________________________________________________
Modified: svn:mergeinfo
   - /gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10596-10597,10600
   + /gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10597,10600


Property changes on: 
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10576,10582,10596-10597
   + 
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10576,10582,10587,10596-10597

Modified: 
gnuradio/branches/releases/3.2/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-examples/python/usrp/usrp_wfm_rcv.py    
    2009-03-15 20:04:45 UTC (rev 10617)
+++ 
gnuradio/branches/releases/3.2/gnuradio-examples/python/usrp/usrp_wfm_rcv.py    
    2009-03-15 20:07:08 UTC (rev 10618)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -93,8 +93,15 @@
         self.u.set_mux(usrp.determine_rx_mux_value(self.u, 
options.rx_subdev_spec))
         self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
         print "Using RX d'board %s" % (self.subdev.side_and_name(),)
+        dbid = self.subdev.dbid()
+        if not (dbid == usrp_dbid.BASIC_RX or
+                dbid == usrp_dbid.TV_RX or
+                dbid == usrp_dbid.TV_RX_REV_2 or
+                dbid == usrp_dbid.TV_RX_REV_3):
+            print "This daughterboard does not cover the required frequency 
range"
+            print "for this application.  Please use a BasicRX or TVRX 
daughterboard."
+            raw_input("Press ENTER to continue anyway, or Ctrl-C to exit.")
 
-
         chan_filt_coeffs = optfir.low_pass (1,           # gain
                                             usrp_rate,   # sampling rate
                                             80e3,        # passband cutoff

Modified: 
gnuradio/branches/releases/3.2/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py
===================================================================
--- 
gnuradio/branches/releases/3.2/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py  
    2009-03-15 20:04:45 UTC (rev 10617)
+++ 
gnuradio/branches/releases/3.2/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py  
    2009-03-15 20:07:08 UTC (rev 10618)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007,2008 Free Software Foundation, Inc.
+# Copyright 2005,2006,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -77,7 +77,17 @@
         audio_decimation = 10
         audio_rate = demod_rate / audio_decimation  # ~32 kHz
 
-        print "Using RX d'board 0x%04X" % (self.u.daughterboard_id(),)
+        #FIXME: need named constants and text descriptions available to 
(gr-)usrp2 even
+        #when usrp(1) module is not built.  A usrp_common module, perhaps?
+        dbid = self.u.daughterboard_id()
+        print "Using RX d'board 0x%04X" % (dbid,)
+        if not (dbid == 0x0001 or #usrp_dbid.BASIC_RX
+                dbid == 0x0003 or #usrp_dbid.TV_RX
+                dbid == 0x000c or #usrp_dbid.TV_RX_REV_2
+                dbid == 0x0040):  #usrp_dbid.TV_RX_REV_3    
+            print "This daughterboard does not cover the required frequency 
range"
+            print "for this application.  Please use a BasicRX or TVRX 
daughterboard."
+            raw_input("Press ENTER to continue anyway, or Ctrl-C to exit.")
 
         chan_filt_coeffs = optfir.low_pass (1,           # gain
                                             usrp_rate,   # sampling rate