[Commit-gnuradio] r10631 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/python/gnuradio/gr gr-radio-astronomy/src/python

[jcorgan]

Author: jcorgan
Date: 2009-03-17 08:56:56 -0600 (Tue, 17 Mar 2009)
New Revision: 10631

Modified:
   gnuradio/branches/releases/3.2/
   gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
   
gnuradio/branches/releases/3.2/gr-radio-astronomy/src/python/usrp_ra_receiver.py
Log:
Applied changeset r10629 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,10587,10596-10600,10623-10624
   + /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-10600,10623-10624,10629


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,10587,10596-10599,10623-10624
   + 
/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-10599,10623-10624,10629

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-03-17 14:48:19 UTC (rev 10630)
+++ 
gnuradio/branches/releases/3.2/gr-radio-astronomy/src/python/usrp_ra_receiver.py
    2009-03-17 14:56:56 UTC (rev 10631)
@@ -599,24 +599,12 @@
                Set the center frequency we're interested in.
 
                @param target_freq: frequency in Hz
-               @rypte: bool
 
-               Tuning is a two step process.  First we ask the front-end to
-               tune as close to the desired frequency as it can.  Then we use
-               the result of that operation and our target_frequency to
-               determine the value for the digital down converter.
                """
                #
-               # Everything except BASIC_RX should support usrp.tune()
                #
-               if not (self.cardtype == usrp_dbid.BASIC_RX):
-                       r = usrp.tune(self.u, self.subdev[0].which(), 
self.subdev[0], target_freq)
-                       r = usrp.tune(self.u, self.subdev[1].which(), 
self.subdev[1], target_freq)
-               else:
-                       r = self.u.set_rx_freq(0, target_freq)
-                       f = self.u.rx_freq(0)
-                       if abs(f-target_freq) > 2.0e3:
-                               r = 0
+               r = usrp.tune(self.u, self.subdev[0].which(), self.subdev[0], 
target_freq)
+               r = usrp.tune(self.u, self.subdev[1].which(), self.subdev[1], 
target_freq)
                if r:
                        self.myform['freq'].set_value(target_freq)         # 
update displayed value
                        #
@@ -628,9 +616,8 @@
                        self.centerfreq = target_freq
                        self.observing -= delta
                        self.scope.set_baseband_freq (self.observing)
-                       if not self.cardtype == usrp_dbid.BASIC_RX:
-                               
self.myform['baseband'].set_value(r.baseband_freq)
-                               self.myform['ddc'].set_value(r.dxc_freq)
+                       self.myform['baseband'].set_value(r.baseband_freq)
+                       self.myform['ddc'].set_value(r.dxc_freq)
                        
                        if (self.use_notches):
                                self.compute_notch_taps(self.notches)