summaryrefslogtreecommitdiff
path: root/gr-uhd/apps/uhd_siggen_base.py
diff options
context:
space:
mode:
authorBen Reynwar <ben@reynwar.net>2012-04-30 09:20:59 -0700
committerBen Reynwar <ben@reynwar.net>2012-04-30 09:20:59 -0700
commit2817cf14147d6da2e7ef051fbbbf8228fd1c07ba (patch)
tree0695ce3bcdbd75784198c28e6cb963c99ae5d0f6 /gr-uhd/apps/uhd_siggen_base.py
parente7f45e3c513242706a9e4aa36e99e33e79e66d4f (diff)
parentd7ecbd12be995ad6db7a53a5d6dd3fcb205c07ea (diff)
Merge branch 'master' of http://gnuradio.org/git/gnuradio
Diffstat (limited to 'gr-uhd/apps/uhd_siggen_base.py')
-rw-r--r--gr-uhd/apps/uhd_siggen_base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-uhd/apps/uhd_siggen_base.py b/gr-uhd/apps/uhd_siggen_base.py
index 5fa881e429..8c69da1ccb 100644
--- a/gr-uhd/apps/uhd_siggen_base.py
+++ b/gr-uhd/apps/uhd_siggen_base.py
@@ -110,11 +110,11 @@ class top_block(gr.top_block, pubsub):
# Setup USRP Configuration value
try:
usrp_info = self._u.get_usrp_info()
- mboard_id = usrp_info.get("mboard_id").split(" ")[0]
+ mboard_id = usrp_info.get("mboard_id")
mboard_serial = usrp_info.get("mboard_serial")
if mboard_serial == "":
mboard_serial = "no serial"
- dboard_id = usrp_info.get("tx_id").split(" ")[0].split(",")[0]
+ dboard_subdev_name = usrp_info.get("tx_subdev_name")
dboard_serial = usrp_info.get("tx_serial")
if dboard_serial == "":
dboard_serial = "no serial"
@@ -122,7 +122,7 @@ class top_block(gr.top_block, pubsub):
antenna = self._u.get_antenna()
desc_key_str = "Motherboard: %s [%s]\n" % (mboard_id, mboard_serial)
- desc_key_str += "Daughterboard: %s [%s]\n" % (dboard_id, dboard_serial)
+ desc_key_str += "Daughterboard: %s [%s]\n" % (dboard_subdev_name, dboard_serial)
desc_key_str += "Subdev: %s\n" % subdev
desc_key_str += "Antenna: %s" % antenna
except: