probe for the usrp2
authorjblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>
Tue, 20 Jan 2009 22:44:51 +0000 (22:44 +0000)
committerjblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5>
Tue, 20 Jan 2009 22:44:51 +0000 (22:44 +0000)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10271 221aa14e-8319-0410-a670-987f0aec2ac5

grc/data/platforms/python/blocks/Makefile.am
grc/data/platforms/python/blocks/usrp2_probe.xml [new file with mode: 0644]
grc/data/platforms/python/blocks/usrp_probe.xml
grc/freedesktop/Makefile.am
grc/freedesktop/gnuradio-usrp2_probe.desktop [new file with mode: 0644]
grc/freedesktop/grc_setup_freedesktop.in
grc/scripts/Makefile.am
grc/scripts/grc
grc/scripts/usrp2_probe [new file with mode: 0755]
grc/scripts/usrp_probe

index badc6dc97f57f894dae134873a1e8dda17849f4b..9eadba4874a8ecd4774e9e74b051fa674c0f27ce 100644 (file)
@@ -192,13 +192,14 @@ dist_ourdata_DATA = \
        trellis_siso_f.xml \
        trellis_viterbi_combined_xx.xml \
        trellis_viterbi_x.xml \
+       usrp2_probe.xml \
+       usrp2_sink_xxxx.xml \
+       usrp2_source_xxxx.xml \
        usrp_dual_sink_x.xml \
        usrp_dual_source_x.xml \
        usrp_probe.xml \
        usrp_simple_sink_x.xml \
        usrp_simple_source_x.xml \
-       usrp2_sink_xxxx.xml \
-       usrp2_source_xxxx.xml \
        variable.xml \
        variable_chooser.xml \
        variable_sink.xml \
diff --git a/grc/data/platforms/python/blocks/usrp2_probe.xml b/grc/data/platforms/python/blocks/usrp2_probe.xml
new file mode 100644 (file)
index 0000000..afe5cf4
--- /dev/null
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##USRP2 Probe:
+##     This block should not appear in the tree.
+###################################################
+ -->
+<block>
+       <name>USRP2 Probe</name>
+       <key>usrp2_probe</key>
+       <make></make>
+       <param>
+               <name>Interface</name>
+               <key>interface</key>
+               <value>eth0</value>
+               <type>string</type>
+       </param>
+       <param>
+               <name>Type</name>
+               <key>type</key>
+               <value>rx</value>
+               <type>enum</type>
+               <option>
+                       <name>RX</name>
+                       <key>rx</key>
+               </option>
+               <option>
+                       <name>TX</name>
+                       <key>tx</key>
+               </option>
+       </param>
+       <doc>Press "Probe" to retrieve USRP2 information...</doc>
+</block>
index 11a83584c767fe52d607f89e23a78d85e991bc3a..5fd4e17f43a0f82467ccfaad0c0d17ff93e0b1b7 100644 (file)
@@ -36,4 +36,5 @@
                        <key>tx_b</key>
                </option>
        </param>
+       <doc>Press "Probe" to retrieve USRP information...</doc>
 </block>
index 36a88de758b369ed3e2aa943c2813fdd06afacf6..fab6f87adce81026bb430ffdfcc9515738dde6dd 100644 (file)
@@ -31,6 +31,7 @@ dist_ourdata_DATA = \
        grc-icon-32.png \
        gnuradio-grc.xml \
        gnuradio-grc.desktop \
+       gnuradio-usrp2_probe.desktop \
        gnuradio-usrp_probe.desktop
 
 dist_bin_SCRIPTS = grc_setup_freedesktop
diff --git a/grc/freedesktop/gnuradio-usrp2_probe.desktop b/grc/freedesktop/gnuradio-usrp2_probe.desktop
new file mode 100644 (file)
index 0000000..c71a092
--- /dev/null
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=USRP2 Probe
+Exec=usrp2_probe
+Categories=Development;
+Icon=gnuradio-grc
index 2714356a2372721284b56d8aab9c06270ee2c526..33fc4e1ac6b53439ac4f359b7815ebc23c9b77c3 100644 (file)
@@ -8,6 +8,7 @@
 ##################################################
 
 ICON_SIZES="32 48 64 128 256"
+MENU_ITEMS="grc usrp2_probe usrp_probe"
 if [ -n "$2" ]; then
        SRCDIR="$2"
 else
@@ -27,8 +28,9 @@ case "$1" in
        echo "Install mime type"
        xdg-mime install ${SRCDIR}/gnuradio-grc.xml
        echo "Install menu items"
-       xdg-desktop-menu install ${SRCDIR}/gnuradio-grc.desktop
-       xdg-desktop-menu install ${SRCDIR}/gnuradio-usrp_probe.desktop
+       for menu_item in ${MENU_ITEMS}; do \
+               xdg-desktop-menu install ${SRCDIR}/gnuradio-${menu_item}.desktop; \
+       done
        echo "Done!"
        echo ""
        ;;
@@ -44,8 +46,9 @@ case "$1" in
        echo "Uninstall mime type"
        xdg-mime uninstall ${SRCDIR}/gnuradio-grc.xml
        echo "Uninstall menu items"
-       xdg-desktop-menu uninstall gnuradio-grc.desktop
-       xdg-desktop-menu uninstall gnuradio-usrp_probe.desktop
+       for menu_item in ${MENU_ITEMS}; do \
+               xdg-desktop-menu uninstall gnuradio-${menu_item}.desktop; \
+       done
        echo "Done!"
        echo ""
        ;;
index 27ffabc53dc04fbf472a51de96749504c9e1b7f6..35c75d5feb5ba3a54fcdcd77942c6b8926920d64 100644 (file)
@@ -21,4 +21,4 @@
 
 include $(top_srcdir)/grc/Makefile.inc
 
-dist_bin_SCRIPTS = grc usrp_probe
+dist_bin_SCRIPTS = grc usrp2_probe usrp_probe
index 94fb4294c99a3fad800ae37e3789395a55e44653..e74d98616982fed87d187ef38ba3abe47430dd05 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-Copyright 2008 Free Software Foundation, Inc.
+Copyright 2009 Free Software Foundation, Inc.
 This file is part of GNU Radio
 
 GNU Radio Companion is free software; you can redistribute it and/or
diff --git a/grc/scripts/usrp2_probe b/grc/scripts/usrp2_probe
new file mode 100755 (executable)
index 0000000..deb2e53
--- /dev/null
@@ -0,0 +1,159 @@
+#!/usr/bin/env python
+"""
+Copyright 2009 Free Software Foundation, Inc.
+This file is part of GNU Radio
+
+GNU Radio Companion is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+GNU Radio Companion is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+"""
+
+from gnuradio import usrp2
+import subprocess
+import os
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import gobject
+
+from gnuradio.grc.gui.Dialogs import TextDisplay
+
+from gnuradio.grc.platforms.python.Platform import Platform
+platform = Platform(block_paths_internal_only=['usrp2_probe.xml'])
+
+from gnuradio.grc.platforms.gui.Platform import Platform
+platform = Platform(platform)
+
+flow_graph = platform.get_new_flow_graph()
+block = flow_graph.get_new_block('usrp2_probe')
+
+##all params
+usrp_interface_param = block.get_param('interface')
+usrp_type_param = block.get_param('type')
+
+class USRP2ProbeWindow(gtk.Window):
+       """
+       The main window for USRP Dignostics.
+       """
+
+       def delete_event(self, widget, event, data=None): return False
+
+       def destroy(self, widget, data=None): gtk.main_quit()
+
+       def __init__(self):
+               """
+               USRP2ProbeWindow contructor.
+               Create a new gtk Dialog with a close button, USRP2 input paramaters, and output labels.
+               """
+               self.usrp2_macs = list()
+               gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
+               #quit signals
+               self.connect("delete_event", self.delete_event)
+               self.connect("destroy", self.destroy)
+               #set the title
+               self.set_title('USRP2 Probe')
+               #create decorative frame
+               frame = gtk.Frame()
+               self.add(frame)
+               #create vbox for storage
+               vbox = gtk.VBox()
+               frame.add(vbox)
+               vbox.pack_start(usrp_interface_param.get_input_object(), False)
+               vbox.pack_start(usrp_type_param.get_input_object(), False)
+               #make the tree model for holding mac addrs
+               self.treestore = gtk.TreeStore(gobject.TYPE_STRING)
+               self.treeview = gtk.TreeView(self.treestore)
+               self.treeview.set_enable_search(False) #disable pop up search box
+               self.treeview.add_events(gtk.gdk.BUTTON_PRESS_MASK)
+               self.treeview.connect('button_press_event', self._handle_selection)
+               selection = self.treeview.get_selection()
+               selection.set_mode('single')
+               selection.connect('changed', self._handle_selection)
+               renderer = gtk.CellRendererText()
+               column = gtk.TreeViewColumn('Select a USRP2 MAC Address', renderer, text=0)
+               self.treeview.append_column(column)
+               vbox.pack_start(self.treeview, False)
+               #create probe button
+               self.probe_button = gtk.Button('Probe')
+               self.probe_button.connect('clicked', self._probe_usrp2)
+               vbox.pack_start(self.probe_button, False)
+               #Create a text box for USRP queries
+               self.query_buffer = TextDisplay()
+               self.query_buffer.set_text(block.get_doc())
+               vbox.pack_start(self.query_buffer)
+               self.show_all()
+               self.treeview.hide()
+
+       def _probe_usrp2(self, widget=None):
+               """Probe the USRP2 device and copy the results into the query text box."""
+               #call find usrps
+               args = ['find_usrps']
+               interface = usrp_interface_param.evaluate()
+               if interface: args.extend(['-e', interface])
+               p = subprocess.Popen(args=args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False, universal_newlines=True)
+               msg = p.stdout.read()
+               #extract mac addrs
+               self.usrp2_macs = map(lambda l: l.split()[0], filter(lambda l: l.count(':') >= 5, msg.strip().splitlines()))
+               #set the tree store with the mac addrs
+               self.treestore.clear()
+               for usrp2_mac in self.usrp2_macs:
+                       self.treestore.append(None, (usrp2_mac,))
+               #set the text with the error message for 0 found, hide the list
+               #when only 1 usrp2, auto handle selection, hide the list
+               #for multiple usrp2, show the list
+               if not self.usrp2_macs:
+                       self.treeview.hide()
+                       self.query_buffer.set_text(msg)
+               elif len(self.usrp2_macs) == 1:
+                       self.treeview.hide()
+                       self.query_buffer.set_text('')
+                       self._handle_selection()
+               else:
+                       self.treeview.show()
+                       self.query_buffer.set_text('')
+
+       def _handle_selection(self, *args, **kwargs):
+               """A selection change or click occured."""
+               #get the mac addr
+               selection = self.treeview.get_selection()
+               treestore, iter = selection.get_selected()
+               mac_addr = iter and treestore.get_value(iter, 0) or ''
+               if not mac_addr and len(self.usrp2_macs) > 1:
+                       return #no empty mac addrs for when multiple found
+               #make the usrp2 object
+               make, rate_attr = {
+                       'rx': (usrp2.source_32fc, 'adc_rate'),
+                       'tx': (usrp2.sink_32fc, 'dac_rate'),
+               }[usrp_type_param.evaluate()]
+               try:
+                       u = make(usrp_interface_param.evaluate(), mac_addr)
+                       msg = ">>> USRP2 Probe\n"
+                       msg = "%s\nMAC Addr:\n\t%s\n"%(msg, u.mac_addr())
+                       msg = "%s\nName (ID):\n\t%s\n"%(msg, u.daughterboard_id())
+                       msg = "%s\nConverter Rate:\n\t%s Hz\n"%(msg, getattr(u, rate_attr)())
+                       gain_min, gain_max, gain_step = u.gain_range()
+                       msg = "%s\nGain Range (min, max, step size):\n\t%s\n\t%s\n\t%s\n"%(msg, gain_min, gain_max, gain_step)
+                       freq_min, freq_max = u.freq_range()
+                       msg = "%s\nFreq Range (min, max):\n\t%s Hz\n\t%s Hz\n"%(msg, freq_min, freq_max)
+                       self.query_buffer.set_text(msg)
+               except Exception, e: #display the error message
+                       self.query_buffer.set_text('>>> Error\n%s'%str(e))
+
+if __name__ == '__main__':
+       #setup icon using icon theme
+       try: gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0))
+       except: pass
+       #enter the mainloop
+       USRP2ProbeWindow()
+       gtk.main()
index c926034823a0595a9c663b5b9209bd391847b682..bff6e147960befc2484d46d4004c498bc14c072e 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-Copyright 2008 Free Software Foundation, Inc.
+Copyright 2009 Free Software Foundation, Inc.
 This file is part of GNU Radio
 
 GNU Radio Companion is free software; you can redistribute it and/or
@@ -68,12 +68,12 @@ class USRPProbeWindow(gtk.Window):
                frame.add(vbox)
                vbox.pack_start(usrp_number_param.get_input_object(), False)
                vbox.pack_start(usrp_dboard_param.get_input_object(), False)
-               self.diagnose_button = gtk.Button('Probe')
-               self.diagnose_button.connect('clicked', self._probe_usrp)
-               vbox.pack_start(self.diagnose_button, False)
+               self.probe_button = gtk.Button('Probe')
+               self.probe_button.connect('clicked', self._probe_usrp)
+               vbox.pack_start(self.probe_button, False)
                #Create a text box for USRP queries
                self.query_buffer = TextDisplay()
-               self.query_buffer.set_text('Press "Probe" to retrieve USRP information...')
+               self.query_buffer.set_text(block.get_doc())
                vbox.pack_start(self.query_buffer)
                self.show_all()
 
@@ -114,8 +114,5 @@ if __name__ == '__main__':
        try: gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0))
        except: pass
        #enter the mainloop
-       gtk.gdk.threads_init()
-       gtk.gdk.threads_enter()
        USRPProbeWindow()
        gtk.main()
-       gtk.gdk.threads_leave()