Merge branch 'patches/marcus/gr_and_const'

[debian/gnuradio] / grc / blocks / block_tree.xml

diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 5d1d510239d84833dadcfb839454888df26ceb0a..610a881026c12075b7c6ddfbb67bc42281cb990e 100644 (file)
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -58,6 +58,7 @@
 
                <block>gr_add_const_vxx</block>
                <block>gr_multiply_const_vxx</block>
+               <block>gr_and_const_xx</block>
 
                <block>gr_not_xx</block>
                <block>gr_and_xx</block>
@@ -127,10 +128,9 @@
        <cat>
                <name>Synchronizers</name>
                <block>gr_clock_recovery_mm_xx</block>
-               <block>gr_pfb_clock_sync_ccf</block>
+               <block>gr_pfb_clock_sync_xxx</block>
 
                <block>gr_costas_loop_cc</block>
-               <block>gr_dd_mpsk_sync_cc</block>
                <block>gr_mpsk_sync_cc</block>
                <block>gr_mpsk_receiver_cc</block>
 
@@ -138,6 +138,8 @@
                <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>
@@ -225,6 +227,9 @@
                <block>blks2_dxpsk_mod</block>
                <block>blks2_dxpsk_demod</block>
 
+               <block>blks2_dxpsk2_mod</block>
+               <block>blks2_dxpsk2_demod</block>
+
                <block>blks2_gmsk_mod</block>
                <block>blks2_gmsk_demod</block>
 
@@ -254,6 +259,7 @@
                <name>Line Coding</name>
                <block>gr_scrambler_bb</block>
                <block>gr_descrambler_bb</block>
+               <block>gr_additive_scrambler_bb</block>
        </cat>
        <cat>
                <name>Vocoders</name>