From 815825e592749cce670a8a945ea2b23a0c2db35e Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 12 Nov 2009 10:58:55 -0800 Subject: [PATCH] howto: add GRC wrappers to squaring blocks --- gr-howto-write-a-block/Makefile.am | 2 +- gr-howto-write-a-block/Makefile.common | 3 ++ gr-howto-write-a-block/configure.ac | 1 + gr-howto-write-a-block/grc/.gitignore | 2 ++ gr-howto-write-a-block/grc/Makefile.am | 29 +++++++++++++++++++ .../grc/howto_square2_ff.xml | 18 ++++++++++++ .../grc/howto_square_ff.xml | 18 ++++++++++++ 7 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 gr-howto-write-a-block/grc/.gitignore create mode 100644 gr-howto-write-a-block/grc/Makefile.am create mode 100644 gr-howto-write-a-block/grc/howto_square2_ff.xml create mode 100644 gr-howto-write-a-block/grc/howto_square_ff.xml diff --git a/gr-howto-write-a-block/Makefile.am b/gr-howto-write-a-block/Makefile.am index ce2e4e8c..d5c46498 100644 --- a/gr-howto-write-a-block/Makefile.am +++ b/gr-howto-write-a-block/Makefile.am @@ -31,7 +31,7 @@ EXTRA_DIST = \ Makefile.swig.gen.t \ version.sh -SUBDIRS = config lib swig python +SUBDIRS = config lib swig python grc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = diff --git a/gr-howto-write-a-block/Makefile.common b/gr-howto-write-a-block/Makefile.common index 4b808112..c81bc780 100644 --- a/gr-howto-write-a-block/Makefile.common +++ b/gr-howto-write-a-block/Makefile.common @@ -50,6 +50,9 @@ swigincludedir = $(grincludedir)/swig grpythondir = $(pythondir)/gnuradio grpyexecdir = $(pyexecdir)/gnuradio +# Data directory for grc block wrappers +grc_blocksdir = $(prefix)/share/gnuradio/grc/blocks + # Don't assume that make predefines $(RM), because BSD make does # not. We define it now in configure.ac using AM_PATH_PROG, but now # here have to add a -f to be like GNU make. diff --git a/gr-howto-write-a-block/configure.ac b/gr-howto-write-a-block/configure.ac index 8241f7ec..9525ac0e 100644 --- a/gr-howto-write-a-block/configure.ac +++ b/gr-howto-write-a-block/configure.ac @@ -72,6 +72,7 @@ dnl AX_BOOST_WSERIALIZATION AC_CONFIG_FILES([\ Makefile \ config/Makefile \ + grc/Makefile \ lib/Makefile \ python/Makefile \ python/run_tests \ diff --git a/gr-howto-write-a-block/grc/.gitignore b/gr-howto-write-a-block/grc/.gitignore new file mode 100644 index 00000000..b336cc7c --- /dev/null +++ b/gr-howto-write-a-block/grc/.gitignore @@ -0,0 +1,2 @@ +/Makefile +/Makefile.in diff --git a/gr-howto-write-a-block/grc/Makefile.am b/gr-howto-write-a-block/grc/Makefile.am new file mode 100644 index 00000000..32dcf1b9 --- /dev/null +++ b/gr-howto-write-a-block/grc/Makefile.am @@ -0,0 +1,29 @@ +# +# Copyright 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, +# Boston, MA 02110-1301, USA. +# + +include $(top_srcdir)/Makefile.common + +grcblocksdir = $(grc_blocksdir) + +dist_grcblocks_DATA = \ + howto_square_ff.xml \ + howto_square2_ff.xml + diff --git a/gr-howto-write-a-block/grc/howto_square2_ff.xml b/gr-howto-write-a-block/grc/howto_square2_ff.xml new file mode 100644 index 00000000..2b46106e --- /dev/null +++ b/gr-howto-write-a-block/grc/howto_square2_ff.xml @@ -0,0 +1,18 @@ + + + Square2 + howto_square2_ff + HOWTO + from gnuradio import howto + howto.square2_ff() + + + in + float + + + + out + float + + diff --git a/gr-howto-write-a-block/grc/howto_square_ff.xml b/gr-howto-write-a-block/grc/howto_square_ff.xml new file mode 100644 index 00000000..ed318bfc --- /dev/null +++ b/gr-howto-write-a-block/grc/howto_square_ff.xml @@ -0,0 +1,18 @@ + + + Square + howto_square_ff + HOWTO + from gnuradio import howto + howto.square_ff() + + + in + float + + + + out + float + + -- 2.39.5