diff options
| author | Tom Rondeau | 2012-02-24 15:59:20 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-02-24 15:59:20 -0500 |
| commit | 49bba6365830b1ec66caa28c67be49d2ab091d9e (patch) | |
| tree | 1c9f9ce240abaadfb8ea37c8b6aab3e26331b082 /gr-digital | |
| parent | e5bf23ddd93ba33fe92a835b24482fd4cf9ec3aa (diff) | |
| parent | ee91264a484d35e4927d69f079db3b3e33f480b4 (diff) | |
| download | gnuradio-49bba6365830b1ec66caa28c67be49d2ab091d9e.tar.gz gnuradio-49bba6365830b1ec66caa28c67be49d2ab091d9e.tar.bz2 gnuradio-49bba6365830b1ec66caa28c67be49d2ab091d9e.zip | |
Merge branch 'master' into next
Conflicts:
gr-digital/grc/Makefile.am
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/grc/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-digital/grc/digital_block_tree.xml | 1 | ||||
| -rw-r--r-- | gr-digital/grc/digital_constellation_receiver_cb.xml | 40 |
3 files changed, 42 insertions, 0 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/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> |