diff options
| author | Josh Blum <josh@joshknows.com> | 2011-09-05 22:35:52 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-09-05 22:35:52 -0700 |
| commit | 7628cff158a4bddaef5f38dc649ea9047008ed48 (patch) | |
| tree | 18d32766d5dc97be3f24a5cedf38d018194d1f1c /grc/blocks/block_tree.xml | |
| parent | f535cd0f1fbc7cfc753f5abbe99251a50cd32acb (diff) | |
| parent | 65fbbb8f752ebf522ac2628f850445e66a278e2f (diff) | |
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h
gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h
gr-digital/lib/digital_constellation.h
gr-digital/lib/digital_constellation_receiver_cb.h
gr-digital/lib/digital_fll_band_edge_cc.h
gr-digital/lib/digital_mpsk_receiver_cc.h
Diffstat (limited to 'grc/blocks/block_tree.xml')
| -rw-r--r-- | grc/blocks/block_tree.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 0b641d79c5..f5365dcb51 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -121,14 +121,11 @@ <block>gr_costas_loop_cc</block> <block>gr_mpsk_sync_cc</block> - <block>gr_mpsk_receiver_cc</block> <block>gr_pll_carriertracking_cc</block> <block>gr_pll_freqdet_cf</block> <block>gr_pll_refout_cc</block> - <block>gr_fll_band_edge_cc</block> - <block>gr_correlate_access_code_bb</block> <block>gr_pn_correlator_cc</block> <block>gr_simple_correlator</block> @@ -197,6 +194,8 @@ <block>gr_phase_modulator_fc</block> <block>gr_quadrature_demod_cf</block> <block>gr_cpfsk_bc</block> + <block>gr_cpmmod_bc</block> + <block>gr_gmskmod_bc</block> <block>gr_diff_phasor_cc</block> <block>gr_constellation_decoder_cb</block> |