3 files changed, 10 insertions, 10 deletions
diff --git a/gnuradio-examples/python/usrp/fm_tx4.py b/gnuradio-examples/python/usrp/fm_tx4.py
index a71eeaa5aa..a51668dde8 100755
--- a/gnuradio-examples/python/usrp/fm_tx4.py
+++ b/gnuradio-examples/python/usrp/fm_tx4.py
@@ -43,7 +43,7 @@ import math
 import sys
 
 from gnuradio.wxgui import stdgui2, fftsink2
-from gnuradio import tx_debug_gui
+#from gnuradio import tx_debug_gui
 import wx
 
 
@@ -84,8 +84,8 @@ class fm_tx_block(stdgui2.std_top_block):
                            help="set Tx frequency to FREQ [required]", metavar="FREQ")
         parser.add_option("-n", "--nchannels", type="int", default=4,
                            help="number of Tx channels [1,4]")
-        parser.add_option("","--debug", action="store_true", default=False,
-                          help="Launch Tx debugger")
+        #parser.add_option("","--debug", action="store_true", default=False,
+        #                  help="Launch Tx debugger")
         (options, args) = parser.parse_args ()
 
         if len(args) != 0:
@@ -158,9 +158,9 @@ class fm_tx_block(stdgui2.std_top_block):
             vbox.Add (post_mod.win, 1, wx.EXPAND)
             
 
-        if options.debug:
-            self.debugger = tx_debug_gui.tx_debug_gui(self.subdev)
-            self.debugger.Show(True)
+        #if options.debug:
+        #    self.debugger = tx_debug_gui.tx_debug_gui(self.subdev)
+        #    self.debugger.Show(True)
 
 
     def set_freq(self, target_freq):
@@ -177,7 +177,7 @@ class fm_tx_block(stdgui2.std_top_block):
         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)
diff --git a/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py b/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
index 499c7230be..15fdf2831c 100755
--- a/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
+++ b/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
@@ -112,7 +112,7 @@ class my_top_block(gr.top_block):
         self.usrp_rate = self.dac_rate / self.usrp_interp    # 320 kS/s
 
         # we're using both daughterboard slots, thus subdev is a 2-tuple
-        self.subdev = (self.u.db[0][0], self.u.db[1][0])
+        self.subdev = (self.u.db(0, 0), self.u.db(1, 0))
         print "Using TX d'board %s" % (self.subdev[0].side_and_name(),)
         print "Using TX d'board %s" % (self.subdev[1].side_and_name(),)
         
@@ -161,7 +161,7 @@ class my_top_block(gr.top_block):
         """
 
         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)
diff --git a/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py b/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
index 35f015215b..3ce1e0c49f 100755
--- a/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
+++ b/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
@@ -337,7 +337,7 @@ class transmit_path(gr.hier_block2):
         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