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
---
gr-utils/src/python/usrp_fft.py | 4 ++--
gr-utils/src/python/usrp_oscope.py | 4 ++--
gr-utils/src/python/usrp_siggen.py | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
(limited to 'gr-utils/src/python')
diff --git a/gr-utils/src/python/usrp_fft.py b/gr-utils/src/python/usrp_fft.py
index fcf4c0535d..4aa70adab9 100755
--- a/gr-utils/src/python/usrp_fft.py
+++ b/gr-utils/src/python/usrp_fft.py
@@ -37,9 +37,9 @@ def pick_subdevice(u):
If there's a daughterboard on B, select B.
Otherwise, select A.
"""
- if u.db[0][0].dbid() >= 0: # dbid is < 0 if there's no d'board or a problem
+ if u.db(0, 0).dbid() >= 0: # dbid is < 0 if there's no d'board or a problem
return (0, 0)
- if u.db[1][0].dbid() >= 0:
+ if u.db(0, 0).dbid() >= 0:
return (1, 0)
return (0, 0)
diff --git a/gr-utils/src/python/usrp_oscope.py b/gr-utils/src/python/usrp_oscope.py
index d3223cba31..f4a539dd59 100755
--- a/gr-utils/src/python/usrp_oscope.py
+++ b/gr-utils/src/python/usrp_oscope.py
@@ -40,9 +40,9 @@ def pick_subdevice(u):
If there's a daughterboard on B, select B.
Otherwise, select A.
"""
- if u.db[0][0].dbid() >= 0: # dbid is < 0 if there's no d'board or a problem
+ if u.db(0, 0).dbid() >= 0: # dbid is < 0 if there's no d'board or a problem
return (0, 0)
- if u.db[1][0].dbid() >= 0:
+ if u.db(0, 0).dbid() >= 0:
return (1, 0)
return (0, 0)
diff --git a/gr-utils/src/python/usrp_siggen.py b/gr-utils/src/python/usrp_siggen.py
index fe29787f9a..3e7751c00f 100755
--- a/gr-utils/src/python/usrp_siggen.py
+++ b/gr-utils/src/python/usrp_siggen.py
@@ -118,7 +118,7 @@ class my_top_block(gr.top_block):
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:
#print "r.baseband_freq =", eng_notation.num_to_str(r.baseband_freq)
#print "r.dxc_freq =", eng_notation.num_to_str(r.dxc_freq)
@@ -200,5 +200,6 @@ def main ():
except KeyboardInterrupt:
pass
+
if __name__ == '__main__':
main ()
--
cgit v1.2.3