summaryrefslogtreecommitdiff
path: root/grc/scripts
diff options
context:
space:
mode:
authorjblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>2009-02-17 23:03:39 +0000
committerjblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>2009-02-17 23:03:39 +0000
commit9030fb71746966a9ef6eb6ae2dc0aebdc6016987 (patch)
treea2f6a296048eeb1363cd8c77b68b36177473c1b4 /grc/scripts
parenteb2648dc72e7edb0adb0d810fc4166633c26aea0 (diff)
usrp methods for computing the mux for dual subdevices
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10457 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc/scripts')
-rwxr-xr-xgrc/scripts/usrp_probe9
1 files changed, 2 insertions, 7 deletions
diff --git a/grc/scripts/usrp_probe b/grc/scripts/usrp_probe
index ac786075ca..3d7b6f0cbb 100755
--- a/grc/scripts/usrp_probe
+++ b/grc/scripts/usrp_probe
@@ -81,19 +81,14 @@ class USRPProbeWindow(gtk.Window):
"""Probe the USRP device and copy the results into the query text box."""
dboard = usrp_dboard_param.evaluate()
side = {'a': 0, 'b': 1}[dboard[-1]]
- if dboard.startswith('rx'): #for the rx query, use the source and rx methods
- make = usrp.source_c
- get_mux = usrp.determine_rx_mux_value
- elif dboard.startswith('tx'): #for the tx query, use the sink and tx methods
- make = usrp.sink_c
- get_mux = usrp.determine_tx_mux_value
+ if dboard.startswith('rx'): make = usrp.source_c
+ elif dboard.startswith('tx'): make = usrp.sink_c
try:
u = make(which=usrp_which_param.evaluate())
subdev_spec = (side, 0)
subdev = usrp.selected_subdev(u, subdev_spec) #get the subdev
msg = ">>> USRP Probe\n"
msg = "%s\nName:\n\t%s\n"%(msg, str(subdev.name()))
- msg = "%s\nAutomated Mux:\n\t0x%08x\n"%(msg, 0xFFFFFFFFL & long(get_mux(u, subdev_spec))) #ensure that the value is displayed as: 8 nibbles, unsigned, hex
msg = "%s\nConverter Rate:\n\t%s\n"%(msg, u.converter_rate())
msg = "%s\nUses Quadrature:\n\t%s\n"%(msg, str(subdev.is_quadrature()))
gain_min, gain_max, gain_step = subdev.gain_range()