From 485be49c4f81db57a78e333e9bd99cd2c77b1e7a Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 28 Mar 2011 17:36:51 -0400 Subject: gr-digital: adding a new top-level block for digital comms work. --- gr-digital/grc/Makefile.am | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 gr-digital/grc/Makefile.am (limited to 'gr-digital/grc/Makefile.am') diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am new file mode 100644 index 000000000..062b85005 --- /dev/null +++ b/gr-digital/grc/Makefile.am @@ -0,0 +1,27 @@ +# +# 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. +# + +include $(top_srcdir)/Makefile.common + +grcblocksdir = $(grc_blocksdir) + +dist_grcblocks_DATA = + -- cgit From aa7098456732b705e8de1d939fe9ce96243816d9 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 28 Mar 2011 22:22:14 -0400 Subject: gr-digital: adding GRC components for Costas loop. --- gr-digital/grc/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gr-digital/grc/Makefile.am') diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am index 062b85005..2807b8f45 100644 --- a/gr-digital/grc/Makefile.am +++ b/gr-digital/grc/Makefile.am @@ -23,5 +23,6 @@ include $(top_srcdir)/Makefile.common grcblocksdir = $(grc_blocksdir) -dist_grcblocks_DATA = - +dist_grcblocks_DATA = \ + digital_block_tree.xml \ + digital_costas_loop_cc.xml \ No newline at end of file -- cgit 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/grc/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gr-digital/grc/Makefile.am') diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am index 2807b8f45..a3414c077 100644 --- a/gr-digital/grc/Makefile.am +++ b/gr-digital/grc/Makefile.am @@ -25,4 +25,5 @@ grcblocksdir = $(grc_blocksdir) dist_grcblocks_DATA = \ digital_block_tree.xml \ - digital_costas_loop_cc.xml \ No newline at end of file + digital_costas_loop_cc.xml \ + digital_cma_equalizer_cc.xml \ No newline at end of file -- 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/grc/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gr-digital/grc/Makefile.am') diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am index a3414c077..4cc2e8d9d 100644 --- a/gr-digital/grc/Makefile.am +++ b/gr-digital/grc/Makefile.am @@ -26,4 +26,5 @@ grcblocksdir = $(grc_blocksdir) dist_grcblocks_DATA = \ digital_block_tree.xml \ digital_costas_loop_cc.xml \ - digital_cma_equalizer_cc.xml \ No newline at end of file + digital_cma_equalizer_cc.xml \ + digital_kurtotic_equalizer_cc.xml \ No newline at end of file -- cgit From cd73f4af9ed50369c47655f9ebb29a4a1ad56f1d Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 9 Apr 2011 16:24:16 -0400 Subject: gr-digital: moved dbpsk, dqpsk, d8psk into the gr-digital space. Mods tested and working in GRC. --- gr-digital/grc/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gr-digital/grc/Makefile.am') diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am index 4cc2e8d9d..748511c1c 100644 --- a/gr-digital/grc/Makefile.am +++ b/gr-digital/grc/Makefile.am @@ -24,7 +24,8 @@ include $(top_srcdir)/Makefile.common grcblocksdir = $(grc_blocksdir) dist_grcblocks_DATA = \ - digital_block_tree.xml \ - digital_costas_loop_cc.xml \ - digital_cma_equalizer_cc.xml \ - digital_kurtotic_equalizer_cc.xml \ No newline at end of file + digital_block_tree.xml \ + digital_costas_loop_cc.xml \ + digital_cma_equalizer_cc.xml \ + digital_kurtotic_equalizer_cc.xml \ + digital_dxpsk_mod.xml \ No newline at end of file -- cgit From 6c3623b0b084ce9328557ebd3cd487c484ee1c5b Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 9 Apr 2011 18:36:27 -0400 Subject: gr-digital: adding dbpsk, dqpsk, and d8psk demodulators to gr-digital. --- gr-digital/grc/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gr-digital/grc/Makefile.am') diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am index 748511c1c..8d08c3f59 100644 --- a/gr-digital/grc/Makefile.am +++ b/gr-digital/grc/Makefile.am @@ -28,4 +28,5 @@ dist_grcblocks_DATA = \ digital_costas_loop_cc.xml \ digital_cma_equalizer_cc.xml \ digital_kurtotic_equalizer_cc.xml \ - digital_dxpsk_mod.xml \ No newline at end of file + digital_dxpsk_mod.xml \ + digital_dxpsk_demod.xml -- cgit From 0b3658687ac902763ffa4d1c0f574e470b3c28db Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Wed, 11 May 2011 00:17:09 -0700 Subject: Moved generic psk and qam modulation into gr-digital. --- gr-digital/grc/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gr-digital/grc/Makefile.am') diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am index 8d08c3f59..0057e0035 100644 --- a/gr-digital/grc/Makefile.am +++ b/gr-digital/grc/Makefile.am @@ -29,4 +29,8 @@ dist_grcblocks_DATA = \ digital_cma_equalizer_cc.xml \ digital_kurtotic_equalizer_cc.xml \ digital_dxpsk_mod.xml \ - digital_dxpsk_demod.xml + digital_dxpsk_demod.xml \ + digital_psk_mod.xml \ + digital_psk_demod.xml \ + digital_qam_mod.xml \ + digital_qam_demod.xml -- cgit From 92770a5a7fc8a662c33256a08e3eb16be593eb59 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 3 Jun 2011 17:56:47 -0400 Subject: digital: adding GRC block for LMS DD equalizer. --- gr-digital/grc/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-digital/grc/Makefile.am') diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am index 8d08c3f59..1c8ab9b33 100644 --- a/gr-digital/grc/Makefile.am +++ b/gr-digital/grc/Makefile.am @@ -27,6 +27,7 @@ dist_grcblocks_DATA = \ digital_block_tree.xml \ digital_costas_loop_cc.xml \ digital_cma_equalizer_cc.xml \ + digital_lms_dd_equalizer_cc.xml \ digital_kurtotic_equalizer_cc.xml \ digital_dxpsk_mod.xml \ digital_dxpsk_demod.xml -- cgit