diff options
Diffstat (limited to 'gr-uhd/apps')
| -rwxr-xr-x | gr-uhd/apps/uhd_fft | 6 | ||||
| -rwxr-xr-x | gr-uhd/apps/uhd_rx_cfile | 22 | ||||
| -rw-r--r-- | gr-uhd/apps/uhd_siggen_base.py | 6 |
3 files changed, 27 insertions, 7 deletions
diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft index 8bb5e0d2b..7af2c5326 100755 --- a/gr-uhd/apps/uhd_fft +++ b/gr-uhd/apps/uhd_fft @@ -196,18 +196,18 @@ class app_top_block(stdgui2.std_top_block): callback=self.set_gain) try: - mboard_id = self.u.get_usrp_info().get("mboard_id").split(" ")[0] + mboard_id = self.u.get_usrp_info().get("mboard_id") mboard_serial = self.u.get_usrp_info().get("mboard_serial") if mboard_serial == "": mboard_serial = "no serial" - dboard_id = self.u.get_usrp_info().get("rx_id").split(" ")[0].split(",")[0] + dboard_subdev_name = self.u.get_usrp_info().get("rx_subdev_name") dboard_serial = self.u.get_usrp_info().get("rx_serial") if dboard_serial == "": dboard_serial = "no serial" subdev = self.u.get_subdev_spec() antenna = self.u.get_antenna() - usrp_config_val = "%s (%s), %s (%s, %s, %s)" % (mboard_id, mboard_serial, dboard_id, dboard_serial, subdev, antenna) + usrp_config_val = "%s (%s), %s (%s, %s, %s)" % (mboard_id, mboard_serial, dboard_subdev_name, dboard_serial, subdev, antenna) except: usrp_config_val = "Not implemented in this version." diff --git a/gr-uhd/apps/uhd_rx_cfile b/gr-uhd/apps/uhd_rx_cfile index fb639623e..62874771c 100755 --- a/gr-uhd/apps/uhd_rx_cfile +++ b/gr-uhd/apps/uhd_rx_cfile @@ -91,7 +91,27 @@ class rx_cfile_block(gr.top_block): input_rate = self._u.get_samp_rate() if options.verbose: - print "Args: ", options.args + try: + info = self._u.get_usrp_info() + + mboard_id = info.get("mboard_id").split(" ")[0] + if info.get("mboard_serial") == "": + mboard_serial = "no serial" + else: + mboard_serial = info.get("mboard_serial") + + rx_id = info.get("rx_id").split(" ")[0] + if info.get("rx_serial") == "": + rx_serial = "no serial" + else: + rx_serial = info.get("rx_serial") + rx_antenna = info.get("rx_antenna") + rx_subdev_spec = info.get("rx_subdev_spec") + + print "Motherboard: %s (%s)" % (mboard_id, mboard_serial) + print "Daughterboard: %s (%s, %s, %s)" % (rx_id, rx_serial, rx_antenna, rx_subdev_spec) + except: + print "Args: ", options.args print "Rx gain:", options.gain print "Rx baseband frequency:", n2s(tr.actual_rf_freq) print "Rx DDC frequency:", n2s(tr.actual_dsp_freq) diff --git a/gr-uhd/apps/uhd_siggen_base.py b/gr-uhd/apps/uhd_siggen_base.py index 5fa881e42..8c69da1cc 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: |