summaryrefslogtreecommitdiff
path: root/gr-uhd/apps
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2012-04-05 09:09:46 -0700
committerNicholas Corgan <nick.corgan@ettus.com>2012-04-05 09:09:46 -0700
commit11d61c53c7ea781f474c6e34155139b0b2bb0df6 (patch)
tree8aa094dad8816a842724d47d67cb77c989195f1b /gr-uhd/apps
parent27dd737afdab4123e40a1b886635b387b3c063c6 (diff)
gr-uhd: minor aesthetic and consistency changes
Diffstat (limited to 'gr-uhd/apps')
-rwxr-xr-xgr-uhd/apps/uhd_fft.py7
-rwxr-xr-xgr-uhd/apps/uhd_siggen.py2
2 files changed, 4 insertions, 5 deletions
diff --git a/gr-uhd/apps/uhd_fft.py b/gr-uhd/apps/uhd_fft.py
index a3858e3412..5637c24a7f 100755
--- a/gr-uhd/apps/uhd_fft.py
+++ b/gr-uhd/apps/uhd_fft.py
@@ -197,15 +197,14 @@ class app_top_block(stdgui2.std_top_block):
callback=self.set_gain)
try:
- usrp_config_val = "%s (%s), %s (%s, %s, %s)" % (self.u.get_usrp_rx_info().get("mboard_id").split(" ")[0], self.u.get_usrp_rx_info().get("mboard_serial"),
- self.u.get_usrp_rx_info().get("rx_id").split(" ")[0].split(",")[0], self.u.get_usrp_rx_info().get("rx_serial"), self.u.get_subdev_spec(), self.u.get_antenna())
+ usrp_config_val = "%s (%s), %s (%s, %s, %s)" % (self.u.get_usrp_info().get("mboard_id").split(" ")[0], self.u.get_usrp_info().get("mboard_serial"),
+ self.u.get_usrp_info().get("rx_id").split(" ")[0].split(",")[0], self.u.get_usrp_info().get("rx_serial"), self.u.get_subdev_spec(), self.u.get_antenna())
except:
usrp_config_val = "Not implemented in this version."
uhd_box = forms.static_box_sizer(parent=self.panel,
label="UHD (%s)" % (uhd.get_version_string()),
- orient=wx.HORIZONTAL,
- bold=True)
+ orient=wx.HORIZONTAL)
usrp_config_form = forms.static_text(
parent=self.panel,
sizer=uhd_box,
diff --git a/gr-uhd/apps/uhd_siggen.py b/gr-uhd/apps/uhd_siggen.py
index ff36b4f4d7..095b7dcf0a 100755
--- a/gr-uhd/apps/uhd_siggen.py
+++ b/gr-uhd/apps/uhd_siggen.py
@@ -109,7 +109,7 @@ class top_block(gr.top_block, pubsub):
# Setup USRP Configuration value
try:
- usrp_info = self._u.get_usrp_tx_info()
+ usrp_info = self._u.get_usrp_info()
usrp_mb = usrp_info.get("mboard_id").split(" ")[0]
usrp_mbs = usrp_info.get("mboard_serial")
usrp_db = usrp_info.get("tx_id").split(" ")[0]