Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital

Conflicts: gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h gr-digital/lib/digital_constellation.h gr-digital/lib/digital_constellation_receiver_cb.h gr-digital/lib/digital_fll_band_edge_cc.h gr-digital/lib/digital_mpsk_receiver_cc.h
author: Josh Blum <josh@joshknows.com> 2011-09-05 22:35:52 -0700
committer: Josh Blum <josh@joshknows.com> 2011-09-05 22:35:52 -0700
commit: 7628cff158a4bddaef5f38dc649ea9047008ed48 (patch)
tree: 18d32766d5dc97be3f24a5cedf38d018194d1f1c /gr-digital/swig
parent: f535cd0f1fbc7cfc753f5abbe99251a50cd32acb (diff)
parent: 65fbbb8f752ebf522ac2628f850445e66a278e2f (diff)
9 files changed, 218 insertions, 34 deletions
diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt
index b62c024e06..5c6477aa18 100644
--- a/gr-digital/swig/CMakeLists.txt
+++ b/gr-digital/swig/CMakeLists.txt
@@ -30,10 +30,11 @@ SET(GR_SWIG_INCLUDE_DIRS
 
 SET(GR_SWIG_LIBRARIES gnuradio-digital)
 
+GR_SWIG_MAKE(digital_hier digital_hier.i)
 GR_SWIG_MAKE(digital_swig digital_swig.i)
 
 GR_SWIG_INSTALL(
-    TARGETS digital_swig
+    TARGETS digital_hier digital_swig
     DESTINATION ${GR_PYTHON_DIR}/gnuradio/digital
     COMPONENT "digital_python"
 )
diff --git a/gr-digital/swig/Makefile.am b/gr-digital/swig/Makefile.am
index c0d28c24c6..6604665b0f 100644
--- a/gr-digital/swig/Makefile.am
+++ b/gr-digital/swig/Makefile.am
@@ -26,8 +26,7 @@ TESTS =
 EXTRA_DIST += $(nobase_guile_DATA)
 
 AM_CPPFLAGS = \
-	-I$(abs_top_srcdir)/gr-digital/lib \
-	-I$(abs_top_builddir)/gr-digital/lib \
+	$(GR_DIGITAL_INCLUDES) \
 	$(STD_DEFINES_AND_INCLUDES) \
 	$(PYTHON_CPPFLAGS) \
 	$(WITH_INCLUDES)
@@ -43,6 +42,7 @@ noinst_GUILE  = digital.test
 ##############################
 # SWIG interface and library
 TOP_SWIG_IFILES = \
+	digital_hier.i \
 	digital_swig.i
 
 # Install so that they end up available as:
@@ -73,9 +73,11 @@ digital_swig_swiginclude_headers =		\
 	digital_kurtotic_equalizer_cc.i		\
 	digital_mpsk_receiver_cc.i
 
+digital_hier_swig_args = \
+	$(GR_DIGITAL_INCLUDES)
+
 digital_swig_swig_args = \
-	-I$(abs_top_srcdir)/gr-digital/lib \
-	-I$(abs_top_builddir)/gr-digital/lib
+	$(GR_DIGITAL_INCLUDES)
 
 if GUILE
 TESTS += run_guile_tests
diff --git a/gr-digital/swig/Makefile.swig.gen b/gr-digital/swig/Makefile.swig.gen
index bd9aabcea1..95d6aea899 100644
--- a/gr-digital/swig/Makefile.swig.gen
+++ b/gr-digital/swig/Makefile.swig.gen
@@ -101,8 +101,7 @@ _digital_swig_la_LDFLAGS =			\
 
 _digital_swig_la_CXXFLAGS =			\
 	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(digital_swig_la_swig_cxxflags)
+	-I$(top_builddir)
 
 python/digital_swig.cc: digital_swig.py
 digital_swig.py: digital_swig.i
@@ -143,3 +142,148 @@ gnuradio/digital_swig-primitive.scm: gnuradio/digital_swig.scm
 endif				# end of GUILE
 
 
+# -*- Makefile -*-
+#
+# Copyright 2009,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.
+# 
+
+# Makefile.swig.gen for digital_hier.i
+
+## Default install locations for these files:
+##
+## Default location for the Python directory is:
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/digital_hier
+## Default location for the Python exec directory is:
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/digital_hier
+##
+## 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.
+
+digital_hier_pythondir_category ?= gnuradio/digital_hier
+digital_hier_pylibdir_category ?= $(digital_hier_pythondir_category)
+digital_hier_pythondir = $(pythondir)/$(digital_hier_pythondir_category)
+digital_hier_pylibdir = $(pyexecdir)/$(digital_hier_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.
+digital_hier_scmlibdir = $(libdir)
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/digital_hier
+# FIXME: determince whether these should be installed with gnuradio.
+digital_hier_scmdir = $(guiledir)
+
+## SWIG headers are always installed into the same directory.
+
+digital_hier_swigincludedir = $(swigincludedir)
+
+## This is a template file for a "generated" Makefile addition (in
+## this case, "Makefile.swig.gen").  By including the top-level
+## Makefile.swig, this file will be used to generate the SWIG
+## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
+## SWIG .i files to generated wrappings for; there can be more than 1
+## so long as the names are unique (no sorting is done on the
+## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
+## file will generate .cc, .py, and possibly .h files -- meaning that
+## all of these files will have the same base name (that provided for
+## the SWIG .i file).
+##
+## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
+## right thing.  For more info, see <
+## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
+
+## Other cleaned files: dependency files generated by SWIG or this Makefile
+
+MOSTLYCLEANFILES += $(DEPDIR)/*.S*
+
+## Various SWIG variables.  These can be overloaded in the including
+## Makefile.am by setting the variable value there, then including
+## Makefile.swig .
+
+digital_hier_swiginclude_HEADERS =		\
+	digital_hier.i			\
+	$(digital_hier_swiginclude_headers)
+
+if PYTHON
+digital_hier_pylib_LTLIBRARIES =		\
+	_digital_hier.la
+
+_digital_hier_la_SOURCES = 			\
+	python/digital_hier.cc		\
+	$(digital_hier_la_swig_sources)
+
+digital_hier_python_PYTHON =			\
+	digital_hier.py			\
+	$(digital_hier_python)
+
+_digital_hier_la_LIBADD =			\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(digital_hier_la_swig_libadd)
+
+_digital_hier_la_LDFLAGS =			\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(digital_hier_la_swig_ldflags)
+
+_digital_hier_la_CXXFLAGS =			\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(digital_hier_la_swig_cxxflags)
+
+python/digital_hier.cc: digital_hier.py
+digital_hier.py: digital_hier.i 
+
+# Include the python dependencies for this file
+-include python/digital_hier.d
+
+endif		# end of if python
+
+if GUILE
+
+digital_hier_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-digital_hier.la
+libguile_gnuradio_digital_hier_la_SOURCES =	\
+	guile/digital_hier.cc			\
+	$(digital_hier_la_swig_sources)
+nobase_digital_hier_scm_DATA = 		\
+	gnuradio/digital_hier.scm 		\
+	gnuradio/digital_hier-primitive.scm
+libguile_gnuradio_digital_hier_la_LIBADD = 	\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(digital_hier_la_swig_libadd)
+libguile_gnuradio_digital_hier_la_LDFLAGS = 	\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(digital_hier_la_swig_ldflags)
+libguile_gnuradio_digital_hier_la_CXXFLAGS = 	\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(digital_hier_la_swig_cxxflags)
+
+guile/digital_hier.cc: gnuradio/digital_hier.scm
+gnuradio/digital_hier.scm: digital_hier.i
+gnuradio/digital_hier-primitive.scm: gnuradio/digital_hier.scm
+
+# Include the guile dependencies for this file
+-include guile/digital_hier.d
+
+endif				# end of GUILE
+
+
diff --git a/gr-digital/swig/digital_constellation.i b/gr-digital/swig/digital_constellation.i
index ae31d443e6..7e0ad6afec 100644
--- a/gr-digital/swig/digital_constellation.i
+++ b/gr-digital/swig/digital_constellation.i
@@ -50,6 +50,7 @@ public:
   unsigned int arity ();
   digital_constellation_sptr base ();
   bool apply_pre_diff_code();
+  void set_pre_diff_code(bool a);
   std::vector<unsigned int> pre_diff_code();
   unsigned int rotational_symmetry();
   unsigned int dimensionality();
@@ -152,6 +153,23 @@ public:
   digital_constellation_qpsk ();
 };
 
+/*
+  DQPSK Constellation
+*/
+
+class digital_constellation_dqpsk;
+typedef boost::shared_ptr<digital_constellation_dqpsk> digital_constellation_dqpsk_sptr;
+%template(digital_constellation_dqpsk_sptr) boost::shared_ptr<digital_constellation_dqpsk>;
+%rename(constellation_dqpsk) digital_make_constellation_dqpsk;
+digital_constellation_dqpsk_sptr digital_make_constellation_dqpsk();
+%ignore digital_constellation_dqpsk;
+
+class digital_constellation_dqpsk : public digital_constellation
+{
+public:
+  digital_constellation_dqpsk ();
+};
+
 
 /*
   8PSK Constellation
diff --git a/gr-digital/swig/digital_constellation_receiver_cb.i b/gr-digital/swig/digital_constellation_receiver_cb.i
index e4be5f39f1..9c4ba645e0 100644
--- a/gr-digital/swig/digital_constellation_receiver_cb.i
+++ b/gr-digital/swig/digital_constellation_receiver_cb.i
@@ -28,23 +28,9 @@ digital_constellation_receiver_cb_sptr
 digital_make_constellation_receiver_cb (digital_constellation_sptr constellation,
 					float loop_bw, float fmin, float fmax);
 
-class digital_constellation_receiver_cb : public gr_block
+class digital_constellation_receiver_cb : public gr_block, public gri_control_loop
 {
  private:
   digital_constellation_receiver_cb (digital_contellation_sptr constellation,
 				     float loop_bw, float fmin, float fmax);
-public:
-  void set_loop_bandwidth(float bw);
-  void set_damping_factor(float df);
-  void set_alpha(float alpha);
-  void set_beta(float beta);
-  void set_frequency(float freq);
-  void set_phase(float phase);
-
-  float get_loop_bandwidth() const;
-  float get_damping_factor() const;
-  float get_alpha() const;
-  float get_beta() const;
-  float get_frequency() const;
-  float get_phase() const;
 };
diff --git a/gr-digital/swig/digital_fll_band_edge_cc.i b/gr-digital/swig/digital_fll_band_edge_cc.i
index f022bc7e18..3efcb89ed1 100644
--- a/gr-digital/swig/digital_fll_band_edge_cc.i
+++ b/gr-digital/swig/digital_fll_band_edge_cc.i
@@ -27,7 +27,7 @@ digital_fll_band_edge_cc_sptr digital_make_fll_band_edge_cc (float samps_per_sym
 							     int filter_size,
 							     float bandwidth);
 
-class digital_fll_band_edge_cc : public gr_sync_block
+class digital_fll_band_edge_cc : public gr_sync_block, public gri_control_loop
 {
  private:
   digital_fll_band_edge_cc (float samps_per_sym, float rolloff,
diff --git a/gr-digital/swig/digital_hier.i b/gr-digital/swig/digital_hier.i
new file mode 100644
index 0000000000..e004461d26
--- /dev/null
+++ b/gr-digital/swig/digital_hier.i
@@ -0,0 +1,40 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2009,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, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef SWIGIMPORTED
+%module(directors="1") digital_hier
+#endif
+
+ //%feature("autodoc", "1");		// generate python docstrings
+
+%include "gnuradio.i"				// the common stuff
+
+%include "_digital_hier.i"
+
+#if SWIGGUILE
+%scheme %{
+(load-extension-global "libguile-gnuradio-digital_hier" "scm_init_gnuradio_digital_hier_module")
+%}
+
+%goops %{
+  (use-modules (gnuradio gnuradio_core_runtime))
+%}
+#endif
diff --git a/gr-digital/swig/digital_mpsk_receiver_cc.i b/gr-digital/swig/digital_mpsk_receiver_cc.i
index cdc9f661b5..b51411f6fb 100644
--- a/gr-digital/swig/digital_mpsk_receiver_cc.i
+++ b/gr-digital/swig/digital_mpsk_receiver_cc.i
@@ -23,16 +23,16 @@
 GR_SWIG_BLOCK_MAGIC(digital,mpsk_receiver_cc);
 
 digital_mpsk_receiver_cc_sptr digital_make_mpsk_receiver_cc (unsigned int M, float theta,
-							     float alpha, float beta,
+							     float loop_bw,
 							     float fmin, float fmax,
 							     float mu, float gain_mu, 
 							     float omega, float gain_omega,
 							     float omega_rel);
-class digital_mpsk_receiver_cc : public gr_block
+class digital_mpsk_receiver_cc : public gr_block, public gri_control_loop
 {
  private:
   digital_mpsk_receiver_cc (unsigned int M,float theta,
-			    float alpha, float beta,
+			    float loop_bw,
 			    float fmin, float fmax,
 			    float mu, float gain_mu, 
 			    float omega, float gain_omega, float omega_rel);
@@ -49,12 +49,4 @@ public:
   }
   void set_gain_mu (float gain_mu) { d_gain_mu = gain_mu; }
   void set_gain_omega (float gain_omega) { d_gain_omega = gain_omega; }
-  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 0328ca2fcc..ca50f9c501 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -40,6 +40,7 @@
 #include "digital_mpsk_receiver_cc.h"
 %}
 
+%include "digital_hier.i"
 %include "digital_binary_slicer_fb.i"
 %include "digital_clock_recovery_mm_cc.i"
 %include "digital_clock_recovery_mm_ff.i"
author	Josh Blum <josh@joshknows.com>	2011-09-05 22:35:52 -0700
committer	Josh Blum <josh@joshknows.com>	2011-09-05 22:35:52 -0700
commit	7628cff158a4bddaef5f38dc649ea9047008ed48 (patch)
tree	18d32766d5dc97be3f24a5cedf38d018194d1f1c /gr-digital/swig
parent	f535cd0f1fbc7cfc753f5abbe99251a50cd32acb (diff)
parent	65fbbb8f752ebf522ac2628f850445e66a278e2f (diff)