From 72c625f7e50b65dc3b642112762e9eb1d633bd42 Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Wed, 24 Dec 2008 08:10:48 +0000
Subject: Merged r10071:10164 from features/cppdb-test into trunk.  Implements
 the fully native C++ API for the USRP.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10165 221aa14e-8319-0410-a670-987f0aec2ac5
---
 gnuradio-examples/python/usrp/fm_tx4.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'gnuradio-examples/python/usrp/fm_tx4.py')

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)
-- 
cgit v1.2.3