Merge branch 'upstream' into dfsg-orig

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

diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 9eda2fdcf80fa113638e63dcba8fc9d92c1bf627..8d91258e516f08417a64f361c0ff2007b57da3db 100644 (file)
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -20,7 +20,9 @@
                <block>gr_udp_source</block>
                <block>audio_source</block>
                <block>gr_wavfile_source</block>
+               <block>gr_message_source</block>
                <block>pad_source</block>
+               <block>virtual_source</block>
        </cat>
        <cat>
                <name>Sinks</name>
@@ -32,7 +34,9 @@
                <block>gr_udp_sink</block>
                <block>audio_sink</block>
                <block>gr_wavfile_sink</block>
+               <block>gr_message_sink</block>
                <block>pad_sink</block>
+               <block>virtual_sink</block>
        </cat>
        <cat>
                <name>Graphical Sinks</name>
@@ -42,6 +46,7 @@
                <block>wxgui_constellationsink2</block>
                <block>wxgui_waterfallsink2</block>
                <block>wxgui_histosink2</block>
+               <block>wxgui_termsink</block>
        </cat>
        <cat>
                <name>Operators</name>
@@ -105,8 +110,10 @@
 
                <block>gr_stream_to_vector</block>
                <block>gr_vector_to_stream</block>
-               
+
                <block>blks2_stream_to_vector_decimator</block>
+
+               <block>gr_stream_mux</block>
        </cat>
        <cat>
                <name>Misc Conversions</name>
@@ -120,9 +127,9 @@
        <cat>
                <name>Synchronizers</name>
                <block>gr_clock_recovery_mm_xx</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>
 
@@ -130,6 +137,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>
@@ -163,7 +172,7 @@
                <block>band_pass_filter</block>
                <block>band_reject_filter</block>
                <block>root_raised_cosine_filter</block>
-               <!-- Filters that take taps as aruments -->
+               <!-- Filters that take taps as arguments -->
                <block>gr_fir_filter_xxx</block>
                <block>gr_interp_fir_filter_xxx</block>
                <block>gr_fft_filter_xxx</block>
@@ -174,6 +183,8 @@
                <!-- Filter banks -->
                <block>blks2_synthesis_filterbank</block>
                <block>blks2_analysis_filterbank</block>
+               <!-- Polyphase filters -->
+               <block>blks2_pfb_arb_resampler_ccf</block>
                <!-- Other filters -->
                <block>gr_single_pole_iir_filter_xx</block>
                <block>gr_hilbert_fc</block>
@@ -215,6 +226,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>
 
@@ -244,6 +258,12 @@
                <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>
+               <block>blks2_cvsd_encode</block>
+               <block>blks2_cvsd_decode</block>
        </cat>
        <cat>
                <name>Probes</name>
@@ -289,6 +309,7 @@
                <block>gr_skiphead</block>
 
                <block>gr_kludge_copy</block>
+               <block>gr_copy</block>
                <block>gr_nop</block>
 
                <block>xmlrpc_server</block>