From 9fc0750bbe5987efe36c571526e432f6ed6858bb Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 7 Apr 2011 09:54:31 -0400 Subject: gr-digital: adding CMA equalizer to gr-digital. This replaces the gr_cma_equalizer_cc in gnuradio-core and uses the complex-in, complex-out, complex-taps version of the gr_adaptive_filter. --- gr-digital/lib/Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gr-digital/lib/Makefile.am') diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am index 83a06c898..cd80d7b1c 100644 --- a/gr-digital/lib/Makefile.am +++ b/gr-digital/lib/Makefile.am @@ -24,13 +24,15 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) # These headers get installed in ${prefix}/include/gnuradio -grinclude_HEADERS = \ - digital_costas_loop_cc.h +grinclude_HEADERS = \ + digital_costas_loop_cc.h \ + digital_cma_equalizer_cc.h lib_LTLIBRARIES = libgnuradio-digital.la -libgnuradio_digital_la_SOURCES = \ - digital_costas_loop_cc.cc +libgnuradio_digital_la_SOURCES = \ + digital_costas_loop_cc.cc \ + digital_cma_equalizer_cc.cc libgnuradio_digital_la_LIBADD = \ $(GNURADIO_CORE_LA) -- cgit From 20678e6dc1c2812a6b9abc3a8bf47f368a602f0d Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 8 Apr 2011 14:09:13 -0400 Subject: gr-digital: introducing a new blind equalizer based on minimizing the kurtosis. Does not work yet. --- gr-digital/lib/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gr-digital/lib/Makefile.am') diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am index cd80d7b1c..7113f94d2 100644 --- a/gr-digital/lib/Makefile.am +++ b/gr-digital/lib/Makefile.am @@ -26,13 +26,15 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ digital_costas_loop_cc.h \ - digital_cma_equalizer_cc.h + digital_cma_equalizer_cc.h \ + digital_kurtotic_equalizer_cc.h lib_LTLIBRARIES = libgnuradio-digital.la libgnuradio_digital_la_SOURCES = \ digital_costas_loop_cc.cc \ - digital_cma_equalizer_cc.cc + digital_cma_equalizer_cc.cc \ + digital_kurtotic_equalizer_cc.cc libgnuradio_digital_la_LIBADD = \ $(GNURADIO_CORE_LA) -- cgit From c6d7be41abc63a9e5b52a12ef05d578f09797054 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 8 Apr 2011 21:44:52 -0400 Subject: gr-digital: updating build for consetellation object move. --- gr-digital/lib/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gr-digital/lib/Makefile.am') diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am index 7113f94d2..6f641b745 100644 --- a/gr-digital/lib/Makefile.am +++ b/gr-digital/lib/Makefile.am @@ -25,6 +25,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ + digital_constellation.h \ digital_costas_loop_cc.h \ digital_cma_equalizer_cc.h \ digital_kurtotic_equalizer_cc.h @@ -32,6 +33,7 @@ grinclude_HEADERS = \ lib_LTLIBRARIES = libgnuradio-digital.la libgnuradio_digital_la_SOURCES = \ + digital_constellation.cc \ digital_costas_loop_cc.cc \ digital_cma_equalizer_cc.cc \ digital_kurtotic_equalizer_cc.cc -- cgit