From 5d69a524f81f234b3fbc41d49ba18d6f6886baba Mon Sep 17 00:00:00 2001 From: jcorgan Date: Thu, 3 Aug 2006 04:51:51 +0000 Subject: Houston, we have a trunk. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3122 221aa14e-8319-0410-a670-987f0aec2ac5 --- gr-comedi/src/comedi.i | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 gr-comedi/src/comedi.i (limited to 'gr-comedi/src/comedi.i') diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i new file mode 100644 index 000000000..18f4f441f --- /dev/null +++ b/gr-comedi/src/comedi.i @@ -0,0 +1,76 @@ +/* -*- c++ -*- */ +/* + * Copyright 2005 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 2, 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., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +%feature("autodoc","1"); + +%include "exception.i" +%import "gnuradio.i" // the common stuff + +%{ +#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix +#include "comedi_sink_s.h" +#include "comedi_source_s.h" +#include +%} + +// ---------------------------------------------------------------- + +GR_SWIG_BLOCK_MAGIC(comedi,source_s) + +comedi_source_s_sptr +comedi_make_source_s (int sampling_freq, + const std::string dev = "" + ) throw (std::runtime_error); + +class comedi_source_s : public gr_sync_block { + + protected: + comedi_source_s (int sampling_freq, + const std::string device_name + ) throw (std::runtime_error); + + public: + ~comedi_source_s (); + + bool start(); + bool stop(); +}; + +// ---------------------------------------------------------------- + +GR_SWIG_BLOCK_MAGIC(comedi,sink_s) + +comedi_sink_s_sptr +comedi_make_sink_s (int sampling_freq, + const std::string dev = "" + ) throw (std::runtime_error); + +class comedi_sink_s : public gr_sync_block { + + protected: + comedi_sink_s (int sampling_freq, + const std::string device_name + ) throw (std::runtime_error); + + public: + ~comedi_sink_s (); +}; -- cgit From 86f5c92427b3f4bb30536d76cf63c3fca388fb2f Mon Sep 17 00:00:00 2001 From: eb Date: Wed, 13 Sep 2006 21:30:04 +0000 Subject: Updated FSF address in all files. Fixes ticket:51 git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3534 221aa14e-8319-0410-a670-987f0aec2ac5 --- gr-comedi/src/comedi.i | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gr-comedi/src/comedi.i') diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index 18f4f441f..90e886262 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. */ %feature("autodoc","1"); -- cgit From 937b719d2e57d0497293d603da10cac2532346f6 Mon Sep 17 00:00:00 2001 From: eb Date: Sat, 21 Jul 2007 03:44:38 +0000 Subject: Updated license from GPL version 2 or later to GPL version 3 or later. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6044 221aa14e-8319-0410-a670-987f0aec2ac5 --- gr-comedi/src/comedi.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-comedi/src/comedi.i') diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index 90e886262..ac0c0a3ed 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -6,7 +6,7 @@ * * 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 2, or (at your option) + * 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, -- cgit From 7783dc88c6acf839b59c7c3358094f85e0012ada Mon Sep 17 00:00:00 2001 From: jcorgan Date: Tue, 10 Feb 2009 04:53:37 +0000 Subject: Merged r10385:10413 from michaelld/swig_tweaks into trunk. Passes distcheck. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10414 221aa14e-8319-0410-a670-987f0aec2ac5 --- gr-comedi/src/comedi.i | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gr-comedi/src/comedi.i') diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index ac0c0a3ed..cdb77aee0 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2005 Free Software Foundation, Inc. + * Copyright 2005,2009 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -20,16 +20,11 @@ * Boston, MA 02110-1301, USA. */ -%feature("autodoc","1"); - -%include "exception.i" -%import "gnuradio.i" // the common stuff +%include "gnuradio.i" // the common stuff %{ -#include "gnuradio_swig_bug_workaround.h" // mandatory bug fix #include "comedi_sink_s.h" #include "comedi_source_s.h" -#include %} // ---------------------------------------------------------------- -- cgit From d94769a975612072dc03fa378bc79856c07cd66b Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 30 Oct 2010 12:14:41 -0600 Subject: add load-extension support --- gr-comedi/src/comedi.i | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gr-comedi/src/comedi.i') diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index cdb77aee0..499ccc598 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -69,3 +69,13 @@ class comedi_sink_s : public gr_sync_block { public: ~comedi_sink_s (); }; + +#if SWIGGUILE +%scheme %{ +(load-extension "libguile-comedi" "scm_init_gnuradio_comedi_module") +%} + +%goops %{ +(use-modules (gnuradio gnuradio_core_runtime)) +%} +#endif -- cgit From 0b5f66113f43d2ba94a1ca741b5ce65e1f9f2c02 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 23:30:54 -0800 Subject: Rename libguile- to libguile-gnuradio- to match guile library naming convention. The stuff in gnuradio-core ends up with funky names, but that could be fixed by renaming gnuradio_core_filter.i -> core_filter.i etc. --- gr-comedi/src/comedi.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-comedi/src/comedi.i') diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index 499ccc598..dadb57e90 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -72,7 +72,7 @@ class comedi_sink_s : public gr_sync_block { #if SWIGGUILE %scheme %{ -(load-extension "libguile-comedi" "scm_init_gnuradio_comedi_module") +(load-extension "libguile-gnuradio-comedi" "scm_init_gnuradio_comedi_module") %} %goops %{ -- cgit From 08907ee94fb6c34531d57b988324c67c26c8b747 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 10 Dec 2010 16:15:40 -0800 Subject: Use load-extension-global instead of load-extension --- gr-comedi/src/comedi.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-comedi/src/comedi.i') diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index dadb57e90..36865afbe 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -72,7 +72,7 @@ class comedi_sink_s : public gr_sync_block { #if SWIGGUILE %scheme %{ -(load-extension "libguile-gnuradio-comedi" "scm_init_gnuradio_comedi_module") +(load-extension-global "libguile-gnuradio-comedi" "scm_init_gnuradio_comedi_module") %} %goops %{ -- cgit From 6c50cfa96ee15892c67e56585ded57b0fe405f59 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 27 Nov 2011 16:41:29 -0500 Subject: docs: added python doxygen docs to gr-comedi --- gr-comedi/src/comedi.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-comedi/src/comedi.i') diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index 36865afbe..a15b4d3b9 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -22,6 +22,9 @@ %include "gnuradio.i" // the common stuff +//load generated python docstrings +%include "comedi_swig_doc.i" + %{ #include "comedi_sink_s.h" #include "comedi_source_s.h" -- cgit From 2bf64459036916258dcf3269cec47904fdeba8f6 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 1 Apr 2012 16:13:42 -0400 Subject: Removes all references to guile and scheme, which are no longer needed. The remaining pmt_serial_tags.scm is parsed by Python already. Future modifications could change this format to not confuse the point. --- gr-comedi/src/comedi.i | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gr-comedi/src/comedi.i') diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index a15b4d3b9..6fa4438fc 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -72,13 +72,3 @@ class comedi_sink_s : public gr_sync_block { public: ~comedi_sink_s (); }; - -#if SWIGGUILE -%scheme %{ -(load-extension-global "libguile-gnuradio-comedi" "scm_init_gnuradio_comedi_module") -%} - -%goops %{ -(use-modules (gnuradio gnuradio_core_runtime)) -%} -#endif -- cgit From f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 13 Apr 2012 18:36:53 -0400 Subject: Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future. The sed script was provided by Moritz Fischer. --- gr-comedi/src/comedi.i | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gr-comedi/src/comedi.i') diff --git a/gr-comedi/src/comedi.i b/gr-comedi/src/comedi.i index 6fa4438fc..d3660580a 100644 --- a/gr-comedi/src/comedi.i +++ b/gr-comedi/src/comedi.i @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2005,2009 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, -- cgit