[Commit-gnuradio] r10044 - in gnuradio/branches/features/cppdb/gnuradio-examples/python: digital digital-bert ofdm usrp

[jcorgan]

Author: jcorgan
Date: 2008-11-24 11:06:10 -0700 (Mon, 24 Nov 2008)
New Revision: 10044

Modified:
   
gnuradio/branches/features/cppdb/gnuradio-examples/python/digital-bert/benchmark_tx.py
   
gnuradio/branches/features/cppdb/gnuradio-examples/python/digital/transmit_path.py
   
gnuradio/branches/features/cppdb/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
   gnuradio/branches/features/cppdb/gnuradio-examples/python/ofdm/tunnel.py
   gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/fm_tx4.py
   
gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
   
gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
Log:
Updated examples to deal with Python API change from subdev._which to 
subdev.which()

Modified: 
gnuradio/branches/features/cppdb/gnuradio-examples/python/digital/transmit_path.py
===================================================================
--- 
gnuradio/branches/features/cppdb/gnuradio-examples/python/digital/transmit_path.py
  2008-11-24 17:48:21 UTC (rev 10043)
+++ 
gnuradio/branches/features/cppdb/gnuradio-examples/python/digital/transmit_path.py
  2008-11-24 18:06:10 UTC (rev 10044)
@@ -139,7 +139,7 @@
         the result of that operation and our target_frequency to
         determine the value for the digital up converter.
         """
-        r = self.u.tune(self.subdev._which, self.subdev, target_freq)
+        r = self.u.tune(self.subdev.which(), self.subdev, target_freq)
         if r:
             return True
 

Modified: 
gnuradio/branches/features/cppdb/gnuradio-examples/python/digital-bert/benchmark_tx.py
===================================================================
--- 
gnuradio/branches/features/cppdb/gnuradio-examples/python/digital-bert/benchmark_tx.py
      2008-11-24 17:48:21 UTC (rev 10043)
+++ 
gnuradio/branches/features/cppdb/gnuradio-examples/python/digital-bert/benchmark_tx.py
      2008-11-24 18:06:10 UTC (rev 10044)
@@ -60,7 +60,7 @@
            subdev_spec = usrp.pick_tx_subdevice(self._usrp)
        self._usrp.set_mux(usrp.determine_tx_mux_value(self._usrp, subdev_spec))
        self._subdev = usrp.selected_subdev(self._usrp, subdev_spec)
-       tr = usrp.tune(self._usrp, self._subdev._which, self._subdev, freq)
+       tr = usrp.tune(self._usrp, self._subdev.which(), self._subdev, freq)
         if not (tr):
             print "Failed to tune to center frequency!"
         else:

Modified: 
gnuradio/branches/features/cppdb/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
===================================================================
--- 
gnuradio/branches/features/cppdb/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
 2008-11-24 17:48:21 UTC (rev 10043)
+++ 
gnuradio/branches/features/cppdb/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
 2008-11-24 18:06:10 UTC (rev 10044)
@@ -98,7 +98,7 @@
         the result of that operation and our target_frequency to
         determine the value for the digital up converter.
         """
-        r = self.u.tune(self.subdev._which, self.subdev, target_freq)
+        r = self.u.tune(self.subdev.which(), self.subdev, target_freq)
         if r:
             return True
 

Modified: 
gnuradio/branches/features/cppdb/gnuradio-examples/python/ofdm/tunnel.py
===================================================================
--- gnuradio/branches/features/cppdb/gnuradio-examples/python/ofdm/tunnel.py    
2008-11-24 17:48:21 UTC (rev 10043)
+++ gnuradio/branches/features/cppdb/gnuradio-examples/python/ofdm/tunnel.py    
2008-11-24 18:06:10 UTC (rev 10044)
@@ -182,8 +182,8 @@
         the result of that operation and our target_frequency to
         determine the value for the digital up converter.
         """
-        r_snk = self.u_snk.tune(self.subdev._which, self.subdev, target_freq)
-        r_src = self.u_src.tune(self.subdev._which, self.subdev, target_freq)
+        r_snk = self.u_snk.tune(self.subdev.which(), self.subdev, target_freq)
+        r_src = self.u_src.tune(self.subdev.which(), self.subdev, target_freq)
         if r_snk and r_src:
             return True
 

Modified: 
gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/fm_tx4.py
===================================================================
--- gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/fm_tx4.py    
2008-11-24 17:48:21 UTC (rev 10043)
+++ gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/fm_tx4.py    
2008-11-24 18:06:10 UTC (rev 10044)
@@ -177,7 +177,7 @@
         any residual_freq to the s/w freq translater.
         """
 
-        r = self.u.tune(self.subdev._which, self.subdev, target_freq)
+        r = self.u.tune(self.subdev.which(), self.subdev, target_freq)
         if r:
             print "r.baseband_freq =", eng_notation.num_to_str(r.baseband_freq)
             print "r.dxc_freq      =", eng_notation.num_to_str(r.dxc_freq)

Modified: 
gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
===================================================================
--- 
gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
    2008-11-24 17:48:21 UTC (rev 10043)
+++ 
gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
    2008-11-24 18:06:10 UTC (rev 10044)
@@ -161,7 +161,7 @@
         """
 
         print "Tuning side %s to %sHz" % (("A", "B")[side], 
num_to_str(target_freq))
-        r = self.u.tune(self.subdev[side]._which, self.subdev[side], 
target_freq)
+        r = self.u.tune(self.subdev[side].which(), self.subdev[side], 
target_freq)
         if r:
             print "  r.baseband_freq =", num_to_str(r.baseband_freq)
             print "  r.dxc_freq      =", num_to_str(r.dxc_freq)

Modified: 
gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
===================================================================
--- 
gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py 
    2008-11-24 17:48:21 UTC (rev 10043)
+++ 
gnuradio/branches/features/cppdb/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py 
    2008-11-24 18:06:10 UTC (rev 10044)
@@ -337,7 +337,7 @@
         determine the value for the digital up converter.  Finally, we feed
         any residual_freq to the s/w freq translater.
         """
-        r = self.u.tune(self.subdev._which, self.subdev, target_freq)
+        r = self.u.tune(self.subdev.which(), self.subdev, target_freq)
         if r:
             # Use residual_freq in s/w freq translator
             return True