summaryrefslogtreecommitdiff
path: root/gr-digital/swig
diff options
context:
space:
mode:
authorTom Rondeau2011-07-10 20:29:27 -0400
committerTom Rondeau2011-07-10 20:29:27 -0400
commitf232855f93d4bccf08b9836943b55c25c2ef0055 (patch)
tree68859b16d3728935e30b2a883289591c4b3ac27c /gr-digital/swig
parent7dfb50a3deec474bb8896cfbfc8d51928908bd17 (diff)
downloadgnuradio-f232855f93d4bccf08b9836943b55c25c2ef0055.tar.gz
gnuradio-f232855f93d4bccf08b9836943b55c25c2ef0055.tar.bz2
gnuradio-f232855f93d4bccf08b9836943b55c25c2ef0055.zip
digital: moving more constellation blocks into gr-digital. Builds, make check needs work.
Diffstat (limited to 'gr-digital/swig')
-rw-r--r--gr-digital/swig/Makefile.am16
-rw-r--r--gr-digital/swig/digital_constellation.i2
-rw-r--r--gr-digital/swig/digital_constellation_decoder_cb.i38
-rw-r--r--gr-digital/swig/digital_constellation_receiver_cb.i47
-rw-r--r--gr-digital/swig/digital_swig.i4
5 files changed, 100 insertions, 7 deletions
diff --git a/gr-digital/swig/Makefile.am b/gr-digital/swig/Makefile.am
index 69adf2568..b9ebf4cc5 100644
--- a/gr-digital/swig/Makefile.am
+++ b/gr-digital/swig/Makefile.am
@@ -26,7 +26,8 @@ TESTS =
EXTRA_DIST += $(nobase_guile_DATA)
AM_CPPFLAGS = \
- -I$(top_srcdir)/gr-digital/lib \
+ -I$(abs_top_srcdir)/gr-digital/lib \
+ -I$(abs_top_builddir)/gr-digital/lib \
$(STD_DEFINES_AND_INCLUDES) \
$(PYTHON_CPPFLAGS) \
$(WITH_INCLUDES)
@@ -56,14 +57,17 @@ digital_swig_la_swig_libadd = \
$(abs_top_builddir)/gr-digital/lib/libgnuradio-digital.la
# additional SWIG files to be installed
-digital_swig_swiginclude_headers = \
- digital_constellation.i \
- digital_costas_loop_cc.i \
- digital_cma_equalizer_cc.i \
- digital_lms_dd_equalizer_cc.i \
+digital_swig_swiginclude_headers = \
+ digital_constellation.i \
+ digital_constellation_receiver_cb.i \
+ digital_constellation_decoder_cb.i \
+ digital_costas_loop_cc.i \
+ digital_cma_equalizer_cc.i \
+ digital_lms_dd_equalizer_cc.i \
digital_kurtotic_equalizer_cc.i
digital_swig_swig_args = \
+ -I$(abs_top_srcdir)/gr-digital/lib \
-I$(abs_top_builddir)/gr-digital/lib
if GUILE
diff --git a/gr-digital/swig/digital_constellation.i b/gr-digital/swig/digital_constellation.i
index 40dd28a2b..ae31d443e 100644
--- a/gr-digital/swig/digital_constellation.i
+++ b/gr-digital/swig/digital_constellation.i
@@ -24,7 +24,7 @@
%template(unsigned_int_vector) std::vector<unsigned int>;
// Make sure metric types get SWIGed.
-%include digital_metric_type.h
+%include "digital_metric_type.h"
class digital_constellation;
typedef boost::shared_ptr<digital_constellation> digital_constellation_sptr;
diff --git a/gr-digital/swig/digital_constellation_decoder_cb.i b/gr-digital/swig/digital_constellation_decoder_cb.i
new file mode 100644
index 000000000..53d3fe8e0
--- /dev/null
+++ b/gr-digital/swig/digital_constellation_decoder_cb.i
@@ -0,0 +1,38 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2006, 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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(digital,constellation_decoder_cb)
+
+digital_constellation_decoder_cb_sptr
+digital_make_constellation_decoder_cb (digital_constellation_sptr constellation);
+
+class digital_constellation_decoder_cb : public gr_sync_block
+{
+ private:
+ digital_constellation_decoder_cb (digital_constellation_sptr constellation);
+
+ friend digital_constellation_decoder_cb_sptr
+ gr_make_constellation_decoder_cb (digital_constellation_sptr constellation);
+
+ public:
+ ~digital_constellation_decoder_cb();
+};
diff --git a/gr-digital/swig/digital_constellation_receiver_cb.i b/gr-digital/swig/digital_constellation_receiver_cb.i
new file mode 100644
index 000000000..6ced92551
--- /dev/null
+++ b/gr-digital/swig/digital_constellation_receiver_cb.i
@@ -0,0 +1,47 @@
+/* -*- c++ -*- */
+/*
+ * 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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(digital,constellation_receiver_cb);
+
+%import "digital_constellation.i"
+
+digital_constellation_receiver_cb_sptr
+digital_make_constellation_receiver_cb (digital_constellation_sptr constellation,
+ float alpha, float beta,
+ float fmin, float fmax);
+
+class digital_constellation_receiver_cb : public gr_block
+{
+ private:
+ digital_constellation_receiver_cb (digital_contellation_sptr constellation,
+ float alpha, float beta,
+ float fmin, float fmax);
+public:
+ float alpha() const { return d_alpha; }
+ float beta() const { return d_beta; }
+ float freq() const { return d_freq; }
+ float phase() const { return d_phase; }
+ void set_alpha(float alpha) { d_alpha = alpha; }
+ void set_beta(float beta) { d_beta = beta; }
+ void set_freq(float freq) { d_freq = freq; }
+ void set_phase(float phase) { d_phase = phase; }
+};
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
index d87bdd852..26a9dd130 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -27,6 +27,8 @@
#include "digital_cma_equalizer_cc.h"
#include "digital_lms_dd_equalizer_cc.h"
#include "digital_kurtotic_equalizer_cc.h"
+#include "digital_constellation_receiver_cb.h"
+#include "digital_constellation_decoder_cb.h"
%}
%include "digital_constellation.i"
@@ -34,6 +36,8 @@
%include "digital_cma_equalizer_cc.i"
%include "digital_lms_dd_equalizer_cc.i"
%include "digital_kurtotic_equalizer_cc.i"
+%include "digital_constellation_receiver_cb.i"
+%include "digital_constellation_decoder_cb.i"
#if SWIGGUILE
%scheme %{