diff options
| author | Josh Blum | 2011-09-28 22:16:41 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-09-28 22:16:41 -0700 |
| commit | 3f7db0afa99caeecb18428d7514dadd380d88d56 (patch) | |
| tree | b513683057e96d03ff8138100d6059d80e7b3265 /grc/blocks/block_tree.xml | |
| parent | 60fd23a703bb16065717159bdd5ec9edf03d7302 (diff) | |
| parent | 9e73c4e8372bc581d686d5e82a808894d41523ec (diff) | |
| download | gnuradio-3f7db0afa99caeecb18428d7514dadd380d88d56.tar.gz gnuradio-3f7db0afa99caeecb18428d7514dadd380d88d56.tar.bz2 gnuradio-3f7db0afa99caeecb18428d7514dadd380d88d56.zip | |
Merge branch 'next' into digital
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
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
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> |