summaryrefslogtreecommitdiff
path: root/gr-digital/grc
diff options
context:
space:
mode:
authorTom Rondeau2011-04-07 09:54:31 -0400
committerTom Rondeau2011-04-07 09:54:31 -0400
commit9fc0750bbe5987efe36c571526e432f6ed6858bb (patch)
treec83f48b081af77e8d57ce6169e991b3a80d8282b /gr-digital/grc
parent5addd18bf0b5d4900220adc5da571d789a0d7fea (diff)
downloadgnuradio-9fc0750bbe5987efe36c571526e432f6ed6858bb.tar.gz
gnuradio-9fc0750bbe5987efe36c571526e432f6ed6858bb.tar.bz2
gnuradio-9fc0750bbe5987efe36c571526e432f6ed6858bb.zip
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.
Diffstat (limited to 'gr-digital/grc')
-rw-r--r--gr-digital/grc/Makefile.am3
-rw-r--r--gr-digital/grc/digital_block_tree.xml1
-rw-r--r--gr-digital/grc/digital_cma_equalizer_cc.xml35
3 files changed, 38 insertions, 1 deletions
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
diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml
index c3c29d232..353aa3e1d 100644
--- a/gr-digital/grc/digital_block_tree.xml
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -9,5 +9,6 @@
<cat>
<name>Digital</name>
<block>digital_costas_loop_cc</block>
+ <block>digital_cma_equalizer_cc</block>
</cat>
</cat>
diff --git a/gr-digital/grc/digital_cma_equalizer_cc.xml b/gr-digital/grc/digital_cma_equalizer_cc.xml
new file mode 100644
index 000000000..9de103e76
--- /dev/null
+++ b/gr-digital/grc/digital_cma_equalizer_cc.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## CMA Equalizer
+###################################################
+ -->
+<block>
+ <name>CMA Equalizer</name>
+ <key>digital_cma_equalizer_cc</key>
+ <import>from gnuradio import digital</import>
+ <make>digital.cma_equalizer_cc($num_taps, $modulus, $mu)</make>
+ <param>
+ <name>Num. Taps</name>
+ <key>num_taps</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Modulus</name>
+ <key>modulus</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Mu</name>
+ <key>mu</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>