diff options
Diffstat (limited to 'gr-usrp2')
| -rw-r--r-- | gr-usrp2/Makefile.am | 6 | ||||
| -rw-r--r-- | gr-usrp2/grc/.gitignore | 2 | ||||
| -rw-r--r-- | gr-usrp2/grc/Makefile.am | 33 | ||||
| -rw-r--r-- | gr-usrp2/grc/gnuradio-usrp2_probe.desktop | 7 | ||||
| -rwxr-xr-x | gr-usrp2/grc/usrp2_probe | 163 | ||||
| -rw-r--r-- | gr-usrp2/grc/usrp2_probe.xml | 33 | ||||
| -rw-r--r-- | gr-usrp2/grc/usrp2_sink_xxxx.xml | 121 | ||||
| -rw-r--r-- | gr-usrp2/grc/usrp2_source_xxxx.xml | 119 | ||||
| -rw-r--r-- | gr-usrp2/src/.gitignore | 5 | ||||
| -rw-r--r-- | gr-usrp2/src/Makefile.am | 48 | ||||
| -rw-r--r-- | gr-usrp2/src/Makefile.swig.gen | 256 | ||||
| -rw-r--r-- | gr-usrp2/src/__init__.py | 28 | ||||
| -rw-r--r-- | gr-usrp2/src/gnuradio/.gitignore | 2 | ||||
| -rw-r--r-- | gr-usrp2/src/gnuradio/usrp2.scm | 79 | ||||
| -rwxr-xr-x | gr-usrp2/src/qa_usrp2.py | 2 | ||||
| -rw-r--r-- | gr-usrp2/src/run_guile_tests.in | 14 | ||||
| -rw-r--r-- | gr-usrp2/src/usrp2.test | 37 | ||||
| -rw-r--r-- | gr-usrp2/src/usrp2_swig.i (renamed from gr-usrp2/src/usrp2.i) | 12 |
18 files changed, 755 insertions, 212 deletions
diff --git a/gr-usrp2/Makefile.am b/gr-usrp2/Makefile.am index 2a0fbe203..f6120884a 100644 --- a/gr-usrp2/Makefile.am +++ b/gr-usrp2/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2006,2008,2009 Free Software Foundation, Inc. +# Copyright 2001,2006,2008,2009,2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,5 +23,9 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src +if PYTHON +SUBDIRS += grc +endif + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnuradio-usrp2.pc 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 @@ +<?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></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> 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 @@ +<?xml version="1.0"?> +<!-- +################################################### +##USRP2 Sink +## Note: the center freq must be set after the lo offset +################################################### + --> +<block> + <name>USRP2 Sink</name> + <key>usrp2_sink_xxxx</key> + <category>USRP</category> + <import>from gnuradio import usrp2</import> + <make>#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)</make> + <callback>set_interp($interpolation)</callback> + <callback>#if $lo_offset() != float('inf') +self.$(id).set_lo_offset($lo_offset) +#end if +self.$(id).set_center_freq($frequency)</callback> + <callback>set_gain($gain)</callback> + <param> + <name>Output Type</name> + <key>type</key> + <type>enum</type> + <option> + <name>Complex</name> + <key>complex</key> + <opt>fcn:32fc</opt> + <opt>vlen:1</opt> + </option> + <option> + <name>Short</name> + <key>short</key> + <opt>fcn:16sc</opt> + <opt>vlen:2</opt> + </option> + </param> + <param> + <name>Interface</name> + <key>interface</key> + <value></value> + <type>string</type> + </param> + <param> + <name>MAC Addr</name> + <key>mac_addr</key> + <value></value> + <type>string</type> + </param> + <param> + <name>Interpolation</name> + <key>interpolation</key> + <type>int</type> + </param> + <param> + <name>Frequency (Hz)</name> + <key>frequency</key> + <type>real</type> + </param> + <param> + <name>LO Offset (Hz)</name> + <key>lo_offset</key> + <value>float('inf')</value> + <type>real</type> + <hide>#if $lo_offset() == float('inf') then 'part' else 'none'#</hide> + <option> + <name>Default</name> + <key>float('inf')</key> + </option> + </param> + <param> + <name>Gain (dB)</name> + <key>gain</key> + <value>0</value> + <type>real</type> + </param> + <param> + <name>Clock Source</name> + <key>usrp2_clock_src</key> + <value>usrp2.MC_WE_DONT_LOCK</value> + <type>enum</type> + <option> + <name>Internal</name> + <key>usrp2.MC_WE_DONT_LOCK</key> + </option> + <option> + <name>External SMA</name> + <key>usrp2.MC_WE_LOCK_TO_SMA</key> + </option> + <option> + <name>External MIMO</name> + <key>usrp2.MC_WE_LOCK_TO_MIMO</key> + </option> + </param> + <sink> + <name>in</name> + <type>$type</type> + <vlen>$type.vlen</vlen> + </sink> + <doc> +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. + </doc> +</block> 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 @@ +<?xml version="1.0"?> +<!-- +################################################### +##USRP2 Source +## Note: the center freq must be set after the lo offset +################################################### + --> +<block> + <name>USRP2 Source</name> + <key>usrp2_source_xxxx</key> + <category>USRP</category> + <import>from gnuradio import usrp2</import> + <make>#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)</make> + <callback>set_decim($decimation)</callback> + <callback>#if $lo_offset() != float('inf') +self.$(id).set_lo_offset($lo_offset) +#end if +self.$(id).set_center_freq($frequency)</callback> + <callback>set_gain($gain)</callback> + <param> + <name>Output Type</name> + <key>type</key> + <type>enum</type> + <option> + <name>Complex</name> + <key>complex</key> + <opt>fcn:32fc</opt> + <opt>vlen:1</opt> + </option> + <option> + <name>Short</name> + <key>short</key> + <opt>fcn:16sc</opt> + <opt>vlen:2</opt> + </option> + </param> + <param> + <name>Interface</name> + <key>interface</key> + <value></value> + <type>string</type> + </param> + <param> + <name>MAC Addr</name> + <key>mac_addr</key> + <value></value> + <type>string</type> + </param> + <param> + <name>Decimation</name> + <key>decimation</key> + <type>int</type> + </param> + <param> + <name>Frequency (Hz)</name> + <key>frequency</key> + <type>real</type> + </param> + <param> + <name>LO Offset (Hz)</name> + <key>lo_offset</key> + <value>float('inf')</value> + <type>real</type> + <hide>#if $lo_offset() == float('inf') then 'part' else 'none'#</hide> + <option> + <name>Default</name> + <key>float('inf')</key> + </option> + </param> + <param> + <name>Gain (dB)</name> + <key>gain</key> + <value>0</value> + <type>real</type> + </param> + <param> + <name>Clock Source</name> + <key>usrp2_clock_src</key> + <value>usrp2.MC_WE_DONT_LOCK</value> + <type>enum</type> + <option> + <name>Internal</name> + <key>usrp2.MC_WE_DONT_LOCK</key> + </option> + <option> + <name>External SMA</name> + <key>usrp2.MC_WE_LOCK_TO_SMA</key> + </option> + <option> + <name>External MIMO</name> + <key>usrp2.MC_WE_LOCK_TO_MIMO</key> + </option> + </param> + <source> + <name>out</name> + <type>$type</type> + <vlen>$type.vlen</vlen> + </source> + <doc> +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. + </doc> +</block> diff --git a/gr-usrp2/src/.gitignore b/gr-usrp2/src/.gitignore index 6f241fe83..71f825820 100644 --- a/gr-usrp2/src/.gitignore +++ b/gr-usrp2/src/.gitignore @@ -4,6 +4,11 @@ /.deps /usrp2.py /usrp2.cc +/usrp2_python.cc /run_tests /test_gr_usrp2 /*.pyc +/guile +/python +/usrp2_swig.py +/run_guile_tests diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index 0d55d73ba..a84637f73 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -20,21 +20,18 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig -# ---------------------------------------------------------------------- -# Local Python files, not installed -# -# qa_usrp2.py -# ---------------------------------------------------------------------- +TESTS = +EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA) +DISTCLEANFILES += run_tests run_guile_tests noinst_PYTHON = qa_usrp2.py +noinst_GUILE = usrp2.test -# ---------------------------------------------------------------------- -# Miscellaneous build operations -# ---------------------------------------------------------------------- - -EXTRA_DIST = run_tests.in -DISTCLEANFILES = run_tests +if GUILE +nobase_guile_DATA = gnuradio/usrp2.scm +endif # ---------------------------------------------------------------------- # C++ block API interface librar(ies) @@ -80,38 +77,39 @@ noinst_HEADERS = \ rx_16sc_handler.h \ rx_32fc_handler.h -if PYTHON # ---------------------------------------------------------------------- -# Python SWIG wrapper around C++ library +# SWIG wrappers around C++ library # # usrp2.py # _usrp2.so # ---------------------------------------------------------------------- -TESTS = run_tests TOP_SWIG_IFILES = \ - usrp2.i + usrp2_swig.i # Install so that they end up available as: # import gnuradio.usrp2 # This ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio -usrp2_pythondir_category = \ - gnuradio +# ${prefix}/lib/python${python_version}/site-packages/gnuradio/usrp2 +usrp2_swig_pythondir_category = \ + gnuradio/usrp2 # additional arguments to the SWIG command -usrp2_swig_args = \ +usrp2_swig_swig_args = \ $(USRP2_INCLUDES) # additional libraries for linking with the SWIG-generated library -usrp2_la_swig_libadd = \ +usrp2_swig_la_swig_libadd = \ libgnuradio-usrp2.la -include $(top_srcdir)/Makefile.swig +# additional Python files to be installed along with the SWIG-generated one +usrp2_swig_python = \ + __init__.py -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +if PYTHON +TESTS += run_tests +endif -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +if GUILE +TESTS += run_guile_tests endif diff --git a/gr-usrp2/src/Makefile.swig.gen b/gr-usrp2/src/Makefile.swig.gen index 24d9f17c0..d791ae2fa 100644 --- a/gr-usrp2/src/Makefile.swig.gen +++ b/gr-usrp2/src/Makefile.swig.gen @@ -20,27 +20,37 @@ # Boston, MA 02110-1301, USA. # -# Makefile.swig.gen for usrp2.i +# Makefile.swig.gen for usrp2_swig.i ## Default install locations for these files: ## ## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/usrp2 +## ${prefix}/lib/python${python_version}/site-packages/[category]/usrp2_swig ## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/usrp2 +## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/usrp2_swig ## ## The following can be overloaded to change the install location, but ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -usrp2_pythondir_category ?= gnuradio/usrp2 -usrp2_pylibdir_category ?= $(usrp2_pythondir_category) -usrp2_pythondir = $(pythondir)/$(usrp2_pythondir_category) -usrp2_pylibdir = $(pyexecdir)/$(usrp2_pylibdir_category) +usrp2_swig_pythondir_category ?= gnuradio/usrp2_swig +usrp2_swig_pylibdir_category ?= $(usrp2_swig_pythondir_category) +usrp2_swig_pythondir = $(pythondir)/$(usrp2_swig_pythondir_category) +usrp2_swig_pylibdir = $(pyexecdir)/$(usrp2_swig_pylibdir_category) + +# The .so libraries for the guile modules get installed whereever guile +# is installed, usually /usr/lib/guile/gnuradio/ +# FIXME: determince whether these should be installed with gnuradio. +usrp2_swig_scmlibdir = $(libdir) + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/usrp2_swig +# FIXME: determince whether these should be installed with gnuradio. +usrp2_swig_scmdir = $(guiledir) ## SWIG headers are always installed into the same directory. -usrp2_swigincludedir = $(swigincludedir) +usrp2_swig_swigincludedir = $(swigincludedir) ## This is a template file for a "generated" Makefile addition (in ## this case, "Makefile.swig.gen"). By including the top-level @@ -57,203 +67,79 @@ usrp2_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/usrp2-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -swig_built_sources += usrp2.py usrp2.cc - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . -usrp2_swiginclude_HEADERS = \ - usrp2.i \ - $(usrp2_swiginclude_headers) +usrp2_swig_swiginclude_HEADERS = \ + usrp2_swig.i \ + $(usrp2_swig_swiginclude_headers) + +if PYTHON +usrp2_swig_pylib_LTLIBRARIES = \ + _usrp2_swig.la -usrp2_pylib_LTLIBRARIES = \ - _usrp2.la +_usrp2_swig_la_SOURCES = \ + python/usrp2_swig.cc \ + $(usrp2_swig_la_swig_sources) -_usrp2_la_SOURCES = \ - usrp2.cc \ - $(usrp2_la_swig_sources) +usrp2_swig_python_PYTHON = \ + usrp2_swig.py \ + $(usrp2_swig_python) -_usrp2_la_LIBADD = \ +_usrp2_swig_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ - $(usrp2_la_swig_libadd) + $(usrp2_swig_la_swig_libadd) -_usrp2_la_LDFLAGS = \ +_usrp2_swig_la_LDFLAGS = \ $(STD_SWIG_LA_LD_FLAGS) \ - $(usrp2_la_swig_ldflags) + $(usrp2_swig_la_swig_ldflags) -_usrp2_la_CXXFLAGS = \ +_usrp2_swig_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ - $(usrp2_la_swig_cxxflags) + -I$(top_builddir) \ + $(usrp2_swig_la_swig_cxxflags) -usrp2_python_PYTHON = \ - usrp2.py \ - $(usrp2_python) +python/usrp2_swig.cc: usrp2_swig.py +usrp2_swig.py: usrp2_swig.i -## Entry rule for running SWIG +# Include the python dependencies for this file +-include python/usrp2_swig.d -usrp2.h usrp2.py usrp2.cc: usrp2.i -## This rule will get called only when MAKE decides that one of the -## targets needs to be created or re-created, because: -## -## * The .i file is newer than any or all of the generated files; -## -## * Any or all of the .cc, .h, or .py files does not exist and is -## needed (in the case this file is not needed, the rule for it is -## ignored); or -## -## * Some SWIG-based dependecy of the .cc file isn't met and hence the -## .cc file needs be be regenerated. Explanation: Because MAKE -## knows how to handle dependencies for .cc files (regardless of -## their name or extension), then the .cc file is used as a target -## instead of the .i file -- but with the dependencies of the .i -## file. It is this last reason why the line: -## -## if test -f $@; then :; else -## -## cannot be used in this case: If a .i file dependecy is not met, -## then the .cc file needs to be rebuilt. But if the stamp is newer -## than the .cc file, and the .cc file exists, then in the original -## version (with the 'test' above) the internal MAKE call will not -## be issued and hence the .cc file will not be rebuilt. -## -## Once execution gets to here, it should always proceed no matter the -## state of a stamp (as discussed in link above). The -## $(DEPDIR)/usrp2-generate stuff is used to allow for parallel -## builds to "do the right thing". The stamp has no relationship with -## either the target files or dependency file; it is used solely for -## the protection of multiple builds during a given call to MAKE. -## -## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM -## (15). At a caught signal, the quoted command will be issued before -## exiting. In this case, remove any stamp, whether temporary of not. -## The trap is valid until the process exits; the process includes all -## commands appended via "\"s. -## - trap 'rm -rf $(DEPDIR)/usrp2-generate-*' 1 2 13 15; \ -## -## Create a temporary directory, which acts as a lock. The first -## process to create the directory will succeed and issue the MAKE -## command to do the actual work, while all subsequent processes will -## fail -- leading them to wait for the first process to finish. -## - if mkdir $(DEPDIR)/usrp2-generate-lock 2>/dev/null; then \ -## -## This code is being executed by the first process to succeed in -## creating the directory lock. -## -## Remove the stamp associated with this filename. -## - rm -f $(DEPDIR)/usrp2-generate-stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp2-generate-stamp WHAT=$<; \ -## -## Now that the .cc, .h, and .py files have been (re)created from the -## .i file, future checking of this rule during the same MAKE -## execution will come back that the rule doesn't need to be executed -## because none of the conditions mentioned at the start of this rule -## will be positive. Remove the the directory lock, which frees up -## any waiting process(es) to continue. -## - rmdir $(DEPDIR)/usrp2-generate-lock; \ - else \ -## -## This code is being executed by any follower processes while the -## directory lock is in place. -## -## Wait until the first process is done, testing once per second. -## - while test -d $(DEPDIR)/usrp2-generate-lock; do \ - sleep 1; \ - done; \ -## -## Succeed if and only if the first process succeeded; exit this -## process returning the status of the generated stamp. -## - test -f $(DEPDIR)/usrp2-generate-stamp; \ - exit $$?; \ - fi; +endif # end of if python -$(DEPDIR)/usrp2-generate-stamp: -## This rule will be called only by the first process issuing the -## above rule to succeed in creating the lock directory, after -## removing the actual stamp file in order to guarantee that MAKE will -## execute this rule. -## -## Call SWIG to generate the various output files; special -## post-processing on 'mingw32' host OS for the dependency file. -## - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp2_swig_args) \ - -MD -MF $(DEPDIR)/usrp2.Std \ - -module usrp2 -o usrp2.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/usrp2.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp2.Std \ - > $(DEPDIR)/usrp2.Sd; \ - $(RM) $(DEPDIR)/usrp2.Std; \ - $(MV) $(DEPDIR)/usrp2.Sd $(DEPDIR)/usrp2.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/usrp2.S*; exit 1; \ - fi; -## -## Mess with the SWIG output .Std dependency file, to create a -## dependecy file valid for the input .i file: Basically, simulate the -## dependency file created for libraries by GNU's libtool for C++, -## where all of the dependencies for the target are first listed, then -## each individual dependency is listed as a target with no further -## dependencies. -## -## (1) remove the current dependency file -## - $(RM) $(DEPDIR)/usrp2.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/usrp2.Std $(DEPDIR)/usrp2.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/usrp2.d -## -## (4) from the SWIG file, remove the first line (the target); remove -## trailing " \" and " " from each line. Append ":" to each line, -## followed by 2 carriage returns, then append this to the end of -## the dependency file. -## - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp2.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp2.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/usrp2.Std -## -## Create the stamp for this filename generation, to signal success in -## executing this rule; allows other threads waiting on this process -## to continue. -## - touch $(DEPDIR)/usrp2-generate-stamp +if GUILE + +usrp2_swig_scmlib_LTLIBRARIES = \ + libguile-gnuradio-usrp2_swig.la +libguile_gnuradio_usrp2_swig_la_SOURCES = \ + guile/usrp2_swig.cc \ + $(usrp2_swig_la_swig_sources) +nobase_usrp2_swig_scm_DATA = \ + gnuradio/usrp2_swig.scm \ + gnuradio/usrp2_swig-primitive.scm +libguile_gnuradio_usrp2_swig_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(usrp2_swig_la_swig_libadd) +libguile_gnuradio_usrp2_swig_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(usrp2_swig_la_swig_ldflags) +libguile_gnuradio_usrp2_swig_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(usrp2_swig_la_swig_cxxflags) + +guile/usrp2_swig.cc: gnuradio/usrp2_swig.scm +gnuradio/usrp2_swig.scm: usrp2_swig.i +gnuradio/usrp2_swig-primitive.scm: gnuradio/usrp2_swig.scm + +# Include the guile dependencies for this file +-include guile/usrp2_swig.d -# KLUDGE: Force runtime include of a SWIG dependency file. This is -# not guaranteed to be portable, but will probably work. If it works, -# we have accurate dependencies for our swig stuff, which is good. +endif # end of GUILE -@am__include@ @am__quote@./$(DEPDIR)/usrp2.d@am__quote@ diff --git a/gr-usrp2/src/__init__.py b/gr-usrp2/src/__init__.py new file mode 100644 index 000000000..fd4289af5 --- /dev/null +++ b/gr-usrp2/src/__init__.py @@ -0,0 +1,28 @@ +# +# Copyright 2008,2010 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. +# + +# The presence of this file turns this directory into a Python package + +# Add SWIG generated code to this namespace +from usrp2_swig import * + +# Add other content from pure-Python modules here + diff --git a/gr-usrp2/src/gnuradio/.gitignore b/gr-usrp2/src/gnuradio/.gitignore new file mode 100644 index 000000000..3c1ff87f5 --- /dev/null +++ b/gr-usrp2/src/gnuradio/.gitignore @@ -0,0 +1,2 @@ +usrp2_swig.scm +usrp2_swig-primitive.scm diff --git a/gr-usrp2/src/gnuradio/usrp2.scm b/gr-usrp2/src/gnuradio/usrp2.scm new file mode 100644 index 000000000..7ead5015d --- /dev/null +++ b/gr-usrp2/src/gnuradio/usrp2.scm @@ -0,0 +1,79 @@ +;;; +;;; Copyright 2010 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 this program. If not, see <http://www.gnu.org/licenses/>. +;;; + +;;; Module that re-exports the usrp2_swig module and adds convenience functions + +(define-module (gnuradio usrp2) + #:use-module (oop goops) + #:use-module (gnuradio export-safely) + #:use-module (gnuradio usrp2_swig) + #:duplicates (merge-generics replace check)) + +(re-export-all '(gnuradio usrp2_swig)) + +;; Utilities (guaranteed not to leak the allocated object) +(define (call-with-long-ptr fn) + (let ((ptr #f)) + (dynamic-wind + (lambda () (set! ptr (gr:make-long-ptr))) + (lambda () (and (fn ptr) (gr:deref-long-ptr ptr))) + (lambda () (gr:free-long-ptr ptr))))) + +(define (call-with-int-ptr fn) + (let ((ptr #f)) + (dynamic-wind + (lambda () (set! ptr (gr:make-int-ptr))) + (lambda () (and (fn ptr) (gr:deref-int-ptr ptr))) + (lambda () (gr:free-int-ptr ptr))))) + +(define (call-with-uint16-ptr fn) + (let ((ptr #f)) + (dynamic-wind + (lambda () (set! ptr (gr:make-uint16-ptr))) + (lambda () (and (fn ptr) (gr:deref-uint16-ptr ptr))) + (lambda () (gr:free-uint16-ptr ptr))))) + + +;;; scheme-ish convenience functions + +(define-method (gr:set-center-freq self freq) + (let ((tr (make <tune-result>))) + (if (gr:-real-set-center-freq self freq tr) + tr + #f))) + +(define-method (gr:fpga-master-clock-freq self) + (call-with-long-ptr (lambda (ptr) (gr:-real-fpga-master-clock-freq self ptr)))) + +(define-method (gr:adc-rate self) + (call-with-long-ptr (lambda (ptr) (gr:-real-adc-rate self ptr)))) + +(define-method (gr:dac-rate self) + (call-with-long-ptr (lambda (ptr) (gr:-real-dac-rate self ptr)))) + +(define-method (gr:daughterboard-id self) + (call-with-int-ptr (lambda (ptr) (gr:-real-daugherboard-id self ptr)))) + +;; (define-method (gr:default-tx-scale-iq self) ...) FIXME + +(define-method (gr:read-gpio self) + (call-with-uint16-ptr (lambda (ptr) (gr:-real-read-gpio self ptr)))) + +;; Export them +(export-safely gr:set-center-freq gr:fpga-master-clock-freq gr:adc-rate gr:dac-rate gr:daughterboard-id gr:read-gpio) diff --git a/gr-usrp2/src/qa_usrp2.py b/gr-usrp2/src/qa_usrp2.py index cc994b1e9..33e44aeed 100755 --- a/gr-usrp2/src/qa_usrp2.py +++ b/gr-usrp2/src/qa_usrp2.py @@ -21,7 +21,7 @@ # from gnuradio import gr, gr_unittest -import usrp2 +import usrp2_swig class test_usrp2(gr_unittest.TestCase): diff --git a/gr-usrp2/src/run_guile_tests.in b/gr-usrp2/src/run_guile_tests.in new file mode 100644 index 000000000..5d08b0dd5 --- /dev/null +++ b/gr-usrp2/src/run_guile_tests.in @@ -0,0 +1,14 @@ +#!/bin/sh + +. @top_builddir@/setup_guile_test_env + +# 1st argument is absolute path to hand coded guile source directory +# 2nd argument is absolute path to component C++ shared library build directory +# 3nd argument is absolute path to component SWIG build directory + +add_local_paths \ + @srcdir@ \ + @abs_builddir@ \ + @abs_builddir@ + +@GUILE@ -e main -c '(use-modules (gnuradio test-suite guile-test))' -t @srcdir@ diff --git a/gr-usrp2/src/usrp2.test b/gr-usrp2/src/usrp2.test new file mode 100644 index 000000000..69544c5e6 --- /dev/null +++ b/gr-usrp2/src/usrp2.test @@ -0,0 +1,37 @@ +;;; -*- Scheme -*- +;;; +;;; Copyright 2010 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 this program. If not, see <http://www.gnu.org/licenses/>. +;;; + +;;; If you're using Emacs's Scheme mode: +;;; (put 'with-test-prefix 'scheme-indent-function 1) + +;;; See the comments in gnuradio/test-suite/lib.scm for info on writing tests. +;;; See also the very end of the file, where the test-equal, test-eqv +;;; and test-eq macros are defined. + +(define-module (test-module) + #:use-module (oop goops) + #:use-module (gnuradio core) + #:use-module (gnuradio test-suite lib) + #:duplicates (merge-generics replace check)) + +;;; Just see if we can import the module... +;;; They may not have a USRP2 attached, powered up etc. + +(use-modules (gnuradio usrp2)) diff --git a/gr-usrp2/src/usrp2.i b/gr-usrp2/src/usrp2_swig.i index 2a79fad44..6e8fa1960 100644 --- a/gr-usrp2/src/usrp2.i +++ b/gr-usrp2/src/usrp2_swig.i @@ -228,6 +228,7 @@ uint16_t *make_uint16_ptr(); int deref_uint16_ptr(uint16_t *l); void free_uint16_ptr(uint16_t *l); +#ifdef SWIGPYTHON // create a more pythonic interface %pythoncode %{ @@ -347,3 +348,14 @@ usrp2_sink_32fc_sptr.read_gpio = __read_gpio usrp2_sink_16sc_sptr.read_gpio = __read_gpio %} +#endif + +#if SWIGGUILE +%scheme %{ +(load-extension-global "libguile-gnuradio-usrp2_swig" "scm_init_gnuradio_usrp2_swig_module") +%} + +%goops %{ +(use-modules (gnuradio gnuradio_core_runtime)) +%} +#endif |