From 07bd878bc30f7ab54afc1e2f0055419388c3c992 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 13 Mar 2011 17:33:33 -0700 Subject: grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc Moved grc xml files, python wrappers (USRP1 only), probe apps + freedesktop files. When the gr-usrp and gr-usrp2 directories are removed, grc will not have to change. Minor change: the freedesktop files are always installed now. This does not mean that they are installed properly with xdg, it just means that the runtime can have access to the icons. --- gr-usrp2/grc/.gitignore | 2 + gr-usrp2/grc/Makefile.am | 33 ++++++ gr-usrp2/grc/gnuradio-usrp2_probe.desktop | 7 ++ gr-usrp2/grc/usrp2_probe | 163 ++++++++++++++++++++++++++++++ gr-usrp2/grc/usrp2_probe.xml | 33 ++++++ gr-usrp2/grc/usrp2_sink_xxxx.xml | 121 ++++++++++++++++++++++ gr-usrp2/grc/usrp2_source_xxxx.xml | 119 ++++++++++++++++++++++ 7 files changed, 478 insertions(+) create mode 100644 gr-usrp2/grc/.gitignore create mode 100644 gr-usrp2/grc/Makefile.am create mode 100644 gr-usrp2/grc/gnuradio-usrp2_probe.desktop create mode 100755 gr-usrp2/grc/usrp2_probe create mode 100644 gr-usrp2/grc/usrp2_probe.xml create mode 100644 gr-usrp2/grc/usrp2_sink_xxxx.xml create mode 100644 gr-usrp2/grc/usrp2_source_xxxx.xml (limited to 'gr-usrp2/grc') diff --git a/gr-usrp2/grc/.gitignore b/gr-usrp2/grc/.gitignore new file mode 100644 index 000000000..b336cc7ce --- /dev/null +++ b/gr-usrp2/grc/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gr-usrp2/grc/Makefile.am b/gr-usrp2/grc/Makefile.am new file mode 100644 index 000000000..2502bf363 --- /dev/null +++ b/gr-usrp2/grc/Makefile.am @@ -0,0 +1,33 @@ +# +# Copyright 2011 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio 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 3, or (at your option) +# any later version. +# +# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/Makefile.common + +dist_bin_SCRIPTS = usrp2_probe + +grcblocksdir = $(grc_blocksdir) +dist_grcblocks_DATA = \ + usrp2_probe.xml \ + usrp2_source_xxxx.xml \ + usrp2_sink_xxxx.xml + +ourdatadir = $(pkgdatadir)/grc/freedesktop +dist_ourdata_DATA = gnuradio-usrp2_probe.desktop diff --git a/gr-usrp2/grc/gnuradio-usrp2_probe.desktop b/gr-usrp2/grc/gnuradio-usrp2_probe.desktop new file mode 100644 index 000000000..c71a092b1 --- /dev/null +++ b/gr-usrp2/grc/gnuradio-usrp2_probe.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=USRP2 Probe +Exec=usrp2_probe +Categories=Development; +Icon=gnuradio-grc diff --git a/gr-usrp2/grc/usrp2_probe b/gr-usrp2/grc/usrp2_probe new file mode 100755 index 000000000..38c8f655c --- /dev/null +++ b/gr-usrp2/grc/usrp2_probe @@ -0,0 +1,163 @@ +#!/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.python.Platform import 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') + +def get_input(param): + param.validate() + input = param.get_input() + return input + +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(get_input(usrp_interface_param), False) + vbox.pack_start(get_input(usrp_type_param), 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 = sorted(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()] + interface = usrp_interface_param.evaluate() + try: + if not interface and not mac_addr: u = make() + elif not mac_addr: u = make(interface) + else: u = make(interface, 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() diff --git a/gr-usrp2/grc/usrp2_probe.xml b/gr-usrp2/grc/usrp2_probe.xml new file mode 100644 index 000000000..cc3f9c2fd --- /dev/null +++ b/gr-usrp2/grc/usrp2_probe.xml @@ -0,0 +1,33 @@ + + + + USRP2 Probe + usrp2_probe + + + Interface + interface + + string + + + Type + type + rx + enum + + + + Press "Probe" to retrieve USRP2 information... + diff --git a/gr-usrp2/grc/usrp2_sink_xxxx.xml b/gr-usrp2/grc/usrp2_sink_xxxx.xml new file mode 100644 index 000000000..74995da99 --- /dev/null +++ b/gr-usrp2/grc/usrp2_sink_xxxx.xml @@ -0,0 +1,121 @@ + + + + USRP2 Sink + usrp2_sink_xxxx + USRP + from gnuradio import usrp2 + #if not $interface() and not $mac_addr() +usrp2.sink_$(type.fcn)() +#elif not $mac_addr() +usrp2.sink_$(type.fcn)($interface) +#else +usrp2.sink_$(type.fcn)($interface, $mac_addr) +#end if +self.$(id).set_interp($interpolation) +#if $lo_offset() != float('inf') +self.$(id).set_lo_offset($lo_offset) +#end if +self.$(id).set_center_freq($frequency) +self.$(id).set_gain($gain) +self.$(id).config_mimo($usrp2_clock_src) + set_interp($interpolation) + #if $lo_offset() != float('inf') +self.$(id).set_lo_offset($lo_offset) +#end if +self.$(id).set_center_freq($frequency) + set_gain($gain) + + Output Type + type + enum + + + + + Interface + interface + + string + + + MAC Addr + mac_addr + + string + + + Interpolation + interpolation + int + + + Frequency (Hz) + frequency + real + + + LO Offset (Hz) + lo_offset + float('inf') + real + #if $lo_offset() == float('inf') then 'part' else 'none'# + + + + Gain (dB) + gain + 0 + real + + + Clock Source + usrp2_clock_src + usrp2.MC_WE_DONT_LOCK + enum + + + + + + in + $type + $type.vlen + + +The USRP2 sink inputs 100 Megasamples per second / interpolation. + +Input amplitude should be between 0.0 and 1.0. + +To use the default ethernet device, leave interface blank. \ +For systems with only 1 USRP2, you may leave the mac address blank. \ +For multi-USRP2 systems, specify the mac address in the form 00:50:C2:85:3x:xx. + + diff --git a/gr-usrp2/grc/usrp2_source_xxxx.xml b/gr-usrp2/grc/usrp2_source_xxxx.xml new file mode 100644 index 000000000..a23c5bc5c --- /dev/null +++ b/gr-usrp2/grc/usrp2_source_xxxx.xml @@ -0,0 +1,119 @@ + + + + USRP2 Source + usrp2_source_xxxx + USRP + from gnuradio import usrp2 + #if not $interface() and not $mac_addr() +usrp2.source_$(type.fcn)() +#elif not $mac_addr() +usrp2.source_$(type.fcn)($interface) +#else +usrp2.source_$(type.fcn)($interface, $mac_addr) +#end if +self.$(id).set_decim($decimation) +#if $lo_offset() != float('inf') +self.$(id).set_lo_offset($lo_offset) +#end if +self.$(id).set_center_freq($frequency) +self.$(id).set_gain($gain) +self.$(id).config_mimo($usrp2_clock_src) + set_decim($decimation) + #if $lo_offset() != float('inf') +self.$(id).set_lo_offset($lo_offset) +#end if +self.$(id).set_center_freq($frequency) + set_gain($gain) + + Output Type + type + enum + + + + + Interface + interface + + string + + + MAC Addr + mac_addr + + string + + + Decimation + decimation + int + + + Frequency (Hz) + frequency + real + + + LO Offset (Hz) + lo_offset + float('inf') + real + #if $lo_offset() == float('inf') then 'part' else 'none'# + + + + Gain (dB) + gain + 0 + real + + + Clock Source + usrp2_clock_src + usrp2.MC_WE_DONT_LOCK + enum + + + + + + out + $type + $type.vlen + + +The USRP2 source outputs 100 Megasamples per second / decimation. + +To use the default ethernet device, leave interface blank. \ +For systems with only 1 USRP2, you may leave the mac address blank. \ +For multi-USRP2 systems, specify the mac address in the form 00:50:C2:85:3x:xx. + + -- cgit