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

5 files changed, 80 insertions, 4 deletions

diff --git a/gr-digital/swig/Makefile.am b/gr-digital/swig/Makefile.am
index edbda6bda..1e5c1de6d 100644
--- a/gr-digital/swig/Makefile.am
+++ b/gr-digital/swig/Makefile.am
@@ -60,6 +60,7 @@ digital_swig_swiginclude_headers =	\
 	digital_constellation.i		\
 	digital_costas_loop_cc.i	\
 	digital_cma_equalizer_cc.i	\
+	digital_lms_dd_equalizer_cc.i	\
 	digital_kurtotic_equalizer_cc.i
 
 if GUILE
diff --git a/gr-digital/swig/digital_cma_equalizer_cc.i b/gr-digital/swig/digital_cma_equalizer_cc.i
index 346b744db..183e43ef9 100644
--- a/gr-digital/swig/digital_cma_equalizer_cc.i
+++ b/gr-digital/swig/digital_cma_equalizer_cc.i
@@ -27,16 +27,18 @@ GR_SWIG_BLOCK_MAGIC(digital,cma_equalizer_cc)
 %import "gr_adaptive_fir_ccc.i"
 
 digital_cma_equalizer_cc_sptr
-digital_make_cma_equalizer_cc(int num_taps,
-			      float modulus,
-			      float mu);
+digital_make_cma_equalizer_cc(int num_taps, float modulus,
+			      float mu, int sps);
 
 class digital_cma_equalizer_cc : public gr_adaptive_fir_ccc
 {
 private:
-  digital_cma_equalizer_cc(int num_taps, float modulus, float mu);
+  digital_cma_equalizer_cc(int num_taps, float modulus,
+			   float mu, int sps);
 
 public:
+  float get_gain();
   void set_gain(float mu);
+  float get_modulus();
   void set_modulus(float mod);
 };
diff --git a/gr-digital/swig/digital_constellation.i b/gr-digital/swig/digital_constellation.i
index 0eb0c59e2..7296ca114 100644
--- a/gr-digital/swig/digital_constellation.i
+++ b/gr-digital/swig/digital_constellation.i
@@ -118,6 +118,10 @@ public:
 			     unsigned int n_sectors);
 };
 
+/*
+  BPSK Constellation
+*/
+
 class digital_constellation_bpsk;
 typedef boost::shared_ptr<digital_constellation_bpsk> digital_constellation_bpsk_sptr;
 %template(digital_constellation_bpsk_sptr) boost::shared_ptr<digital_constellation_bpsk>;
@@ -131,6 +135,10 @@ public:
   digital_constellation_bpsk ();
 };
 
+/*
+  QPSK Constellation
+*/
+
 class digital_constellation_qpsk;
 typedef boost::shared_ptr<digital_constellation_qpsk> digital_constellation_qpsk_sptr;
 %template(digital_constellation_qpsk_sptr) boost::shared_ptr<digital_constellation_qpsk>;
@@ -144,3 +152,20 @@ public:
   digital_constellation_qpsk ();
 };
 
+
+/*
+  8PSK Constellation
+*/
+
+class digital_constellation_8psk;
+typedef boost::shared_ptr<digital_constellation_8psk> digital_constellation_8psk_sptr;
+%template(digital_constellation_8psk_sptr) boost::shared_ptr<digital_constellation_8psk>;
+%rename(constellation_8psk) digital_make_constellation_8psk;
+digital_constellation_8psk_sptr digital_make_constellation_8psk();
+%ignore digital_constellation_8psk;
+
+class digital_constellation_8psk : public digital_constellation
+{
+public:
+  digital_constellation_8psk ();
+};
diff --git a/gr-digital/swig/digital_lms_dd_equalizer_cc.i b/gr-digital/swig/digital_lms_dd_equalizer_cc.i
new file mode 100644
index 000000000..bd5c6ae29
--- /dev/null
+++ b/gr-digital/swig/digital_lms_dd_equalizer_cc.i
@@ -0,0 +1,46 @@
+/* -*- 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,lms_dd_equalizer_cc)
+
+// retrieve info on the base class, without generating wrappers since
+// the base class has a pure virual method.
+%import "gr_adaptive_fir_ccc.i"
+
+
+digital_lms_dd_equalizer_cc_sptr
+digital_make_lms_dd_equalizer_cc (int num_taps,
+				  float mu, int sps,
+				  digital_constellation_sptr cnst);
+
+class digital_lms_dd_equalizer_cc : public gr_sync_block
+{
+private:
+  digital_lms_dd_equalizer_cc (int num_taps,
+			       float mu, int sps,
+			       digital_constellation_sptr cnst);
+
+public:
+  float get_gain();
+  void  set_gain(float mu);
+};
diff --git a/gr-digital/swig/digital_swig.i b/gr-digital/swig/digital_swig.i
index 73d8edd8d..d87bdd852 100644
--- a/gr-digital/swig/digital_swig.i
+++ b/gr-digital/swig/digital_swig.i
@@ -25,12 +25,14 @@
 #include "digital_constellation.h"
 #include "digital_costas_loop_cc.h"
 #include "digital_cma_equalizer_cc.h"
+#include "digital_lms_dd_equalizer_cc.h"
 #include "digital_kurtotic_equalizer_cc.h"
 %}
 
 %include "digital_constellation.i"
 %include "digital_costas_loop_cc.i"
 %include "digital_cma_equalizer_cc.i"
+%include "digital_lms_dd_equalizer_cc.i"
 %include "digital_kurtotic_equalizer_cc.i"
 
 #if SWIGGUILE