diff options
| author | Tom Rondeau | 2011-09-26 23:23:14 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-09-26 23:23:14 -0400 |
| commit | 4fec8eba2eb3d362319c8e09bf370edaa10cd1b9 (patch) | |
| tree | e41ff025b20b5c4ad8928fa0651a06dca884dc6f /grc/blocks/block_tree.xml | |
| parent | 79e7183bda0e3850c79dee7f086a8676311607fa (diff) | |
| parent | e3b56bfd879f16c2fa1f284f330ed3df6a211ec1 (diff) | |
| download | gnuradio-4fec8eba2eb3d362319c8e09bf370edaa10cd1b9.tar.gz gnuradio-4fec8eba2eb3d362319c8e09bf370edaa10cd1b9.tar.bz2 gnuradio-4fec8eba2eb3d362319c8e09bf370edaa10cd1b9.zip | |
Merge branch 'next' into digital
Conflicts:
gnuradio-core/src/lib/general/general.i
gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py
gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py
gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
gr-digital/lib/digital_constellation_receiver_cb.cc
gr-digital/python/Makefile.am
gr-digital/python/__init__.py
gr-digital/python/generic_mod_demod.py
gr-digital/python/pkt.py
gr-digital/python/psk2.py
gr-digital/python/qam.py
Diffstat (limited to 'grc/blocks/block_tree.xml')
| -rw-r--r-- | grc/blocks/block_tree.xml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index c729d4903..ea7d744d4 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -145,6 +145,7 @@ <block>gr_simple_squelch_cc</block> <block>blks2_standard_squelch</block> <block>gr_pwr_squelch_xx</block> + <block>gr_ctcss_squelch_ff</block> <block>gr_threshold_ff</block> </cat> <cat> @@ -222,13 +223,6 @@ <name>Error Correction</name> <cat> <name>Trellis</name> - <block>trellis_encoder_xx</block> - <block>trellis_metrics_x</block> - <block>trellis_permutation</block> - <block>trellis_siso_combined_f</block> - <block>trellis_siso_f</block> - <block>trellis_viterbi_combined_xx</block> - <block>trellis_viterbi_x</block> </cat> <block>gr_encode_ccsds_27_bb</block> |