diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-08-15 08:46:11 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-08-16 15:24:43 -0700 |
| commit | 593b2e33b7daaf8c40674ea7d6a352c991784b44 (patch) | |
| tree | d339709e1547146f89179032b06f710ccd25fab4 | |
| parent | b4e10733401dee8c31b26ee2fc6d896ae14e8773 (diff) | |
uhd: if B2X0 is connected, change USRP config info strings to account for lack of daughterboard
| -rwxr-xr-x | gr-uhd/apps/uhd_fft | 5 | ||||
| -rwxr-xr-x | gr-uhd/apps/uhd_rx_cfile | 5 | ||||
| -rw-r--r-- | gr-uhd/apps/uhd_siggen_base.py | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/gr-uhd/apps/uhd_fft b/gr-uhd/apps/uhd_fft index 800a5fab84..c1ccc33261 100755 --- a/gr-uhd/apps/uhd_fft +++ b/gr-uhd/apps/uhd_fft @@ -211,7 +211,10 @@ class app_top_block(stdgui2.std_top_block): 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_subdev_name, dboard_serial, subdev, antenna) + if "B200" in mboard_id or "B210" in mboard_id: + usrp_config_val = "%s (%s), %s (%s, %s)" % (mboard_id, mboard_serial, dboard_subdev_name, subdev, antenna) + else: + 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 5531bb35b8..9f5ef19893 100755 --- a/gr-uhd/apps/uhd_rx_cfile +++ b/gr-uhd/apps/uhd_rx_cfile @@ -110,7 +110,10 @@ class rx_cfile_block(gr.top_block): 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) + if "B200" in mboard_id or "B210" in mboard_id: + print "Daughterboard: %s (%s, %s)" % (mboard_id, rx_antenna, rx_subdev_spec) + else: + 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 diff --git a/gr-uhd/apps/uhd_siggen_base.py b/gr-uhd/apps/uhd_siggen_base.py index 6b51bfcb50..84dff1f504 100644 --- a/gr-uhd/apps/uhd_siggen_base.py +++ b/gr-uhd/apps/uhd_siggen_base.py @@ -124,7 +124,10 @@ 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_subdev_name, dboard_serial) + if "B200" in mboard_id or "B210" in mboard_id: + desc_key_str += "Daughterboard: %s\n" % dboard_subdev_name + else: + 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: |