summaryrefslogtreecommitdiff
path: root/gr-digital/grc
diff options
context:
space:
mode:
Diffstat (limited to 'gr-digital/grc')
-rw-r--r--gr-digital/grc/CMakeLists.txt1
-rw-r--r--gr-digital/grc/Makefile.am1
-rw-r--r--gr-digital/grc/digital_block_tree.xml1
-rw-r--r--gr-digital/grc/digital_constellation_receiver_cb.xml40
-rw-r--r--gr-digital/grc/digital_qam_demod.xml2
5 files changed, 44 insertions, 1 deletions
diff --git a/gr-digital/grc/CMakeLists.txt b/gr-digital/grc/CMakeLists.txt
index e25c98faa..e94c53556 100644
--- a/gr-digital/grc/CMakeLists.txt
+++ b/gr-digital/grc/CMakeLists.txt
@@ -22,6 +22,7 @@ install(FILES
digital_binary_slicer_fb.xml
digital_clock_recovery_mm_xx.xml
digital_constellation_decoder_cb.xml
+ digital_constellation_receiver_cb.xml
digital_correlate_access_code_bb.xml
digital_costas_loop_cc.xml
digital_cma_equalizer_cc.xml
diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am
index b1ebba463..e6dd2aa92 100644
--- a/gr-digital/grc/Makefile.am
+++ b/gr-digital/grc/Makefile.am
@@ -28,6 +28,7 @@ dist_grcblocks_DATA = \
digital_binary_slicer_fb.xml \
digital_clock_recovery_mm_xx.xml \
digital_constellation_decoder_cb.xml \
+ digital_constellation_receiver_cb.xml \
digital_correlate_access_code_bb.xml \
digital_costas_loop_cc.xml \
digital_cma_equalizer_cc.xml \
diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml
index 84151c190..49a01973f 100644
--- a/gr-digital/grc/digital_block_tree.xml
+++ b/gr-digital/grc/digital_block_tree.xml
@@ -34,6 +34,7 @@
<block>digital_clock_recovery_mm_xx</block>
<block>digital_cma_equalizer_cc</block>
<block>digital_constellation_decoder_cb</block>
+ <block>digital_constellation_receiver_cb</block>
<block>digital_correlate_access_code_bb</block>
<block>digital_costas_loop_cc</block>
<block>digital_fll_band_edge_cc</block>
diff --git a/gr-digital/grc/digital_constellation_receiver_cb.xml b/gr-digital/grc/digital_constellation_receiver_cb.xml
new file mode 100644
index 000000000..36c8e1b30
--- /dev/null
+++ b/gr-digital/grc/digital_constellation_receiver_cb.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Constellation Receiver
+###################################################
+ -->
+<block>
+ <name>Constellation Receiver</name>
+ <key>digital_constellation_receiver_cb</key>
+ <import>from gnuradio import digital</import>
+ <make>digital.constellation_receiver_cb($constellation, $loop_bw, $fmin, $fmax)</make>
+ <param>
+ <name>Constellation Object</name>
+ <key>constellation</key>
+ <type>raw</type>
+ </param>
+ <param>
+ <name>Loop Bandwidth</name>
+ <key>loop_bw</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Minimum Freq Deviation</name>
+ <key>fmin</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Maximum Freq Deviation</name>
+ <key>fmax</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ </source>
+</block>
diff --git a/gr-digital/grc/digital_qam_demod.xml b/gr-digital/grc/digital_qam_demod.xml
index 4db1327e8..86080fff7 100644
--- a/gr-digital/grc/digital_qam_demod.xml
+++ b/gr-digital/grc/digital_qam_demod.xml
@@ -94,7 +94,7 @@
</param>
<param>
<name>Gray Code</name>
- <key>gray_coded</key>
+ <key>mod_code</key>
<type>enum</type>
<option>
<name>Yes</name>