projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'wip/pager' of git@gnuradio.org:jcorgan
[debian/gnuradio]
/
grc
/
blocks
/
block_tree.xml
diff --git
a/grc/blocks/block_tree.xml
b/grc/blocks/block_tree.xml
index 296f0ee911b505298cc893675656aa1cd88f74e1..57703f6d69f4f01e78aa18f6d0169d885ea3863d 100644
(file)
--- a/
grc/blocks/block_tree.xml
+++ b/
grc/blocks/block_tree.xml
@@
-46,6
+46,7
@@
<block>wxgui_constellationsink2</block>
<block>wxgui_waterfallsink2</block>
<block>wxgui_histosink2</block>
<block>wxgui_constellationsink2</block>
<block>wxgui_waterfallsink2</block>
<block>wxgui_histosink2</block>
+ <block>wxgui_termsink</block>
</cat>
<cat>
<name>Operators</name>
</cat>
<cat>
<name>Operators</name>
@@
-109,8
+110,10
@@
<block>gr_stream_to_vector</block>
<block>gr_vector_to_stream</block>
<block>gr_stream_to_vector</block>
<block>gr_vector_to_stream</block>
-
+
<block>blks2_stream_to_vector_decimator</block>
<block>blks2_stream_to_vector_decimator</block>
+
+ <block>gr_stream_mux</block>
</cat>
<cat>
<name>Misc Conversions</name>
</cat>
<cat>
<name>Misc Conversions</name>
@@
-124,6
+127,7
@@
<cat>
<name>Synchronizers</name>
<block>gr_clock_recovery_mm_xx</block>
<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_costas_loop_cc</block>
<block>gr_dd_mpsk_sync_cc</block>
@@
-167,7
+171,7
@@
<block>band_pass_filter</block>
<block>band_reject_filter</block>
<block>root_raised_cosine_filter</block>
<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 ar
g
uments -->
<block>gr_fir_filter_xxx</block>
<block>gr_interp_fir_filter_xxx</block>
<block>gr_fft_filter_xxx</block>
<block>gr_fir_filter_xxx</block>
<block>gr_interp_fir_filter_xxx</block>
<block>gr_fft_filter_xxx</block>
@@
-178,7
+182,7
@@
<!-- Filter banks -->
<block>blks2_synthesis_filterbank</block>
<block>blks2_analysis_filterbank</block>
<!-- Filter banks -->
<block>blks2_synthesis_filterbank</block>
<block>blks2_analysis_filterbank</block>
- <!-- Polyphase filers -->
+ <!-- Polyphase fil
t
ers -->
<block>blks2_pfb_arb_resampler_ccf</block>
<!-- Other filters -->
<block>gr_single_pole_iir_filter_xx</block>
<block>blks2_pfb_arb_resampler_ccf</block>
<!-- Other filters -->
<block>gr_single_pole_iir_filter_xx</block>
@@
-221,6
+225,9
@@
<block>blks2_dxpsk_mod</block>
<block>blks2_dxpsk_demod</block>
<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>
<block>blks2_gmsk_mod</block>
<block>blks2_gmsk_demod</block>
@@
-300,6
+307,7
@@
<block>gr_skiphead</block>
<block>gr_kludge_copy</block>
<block>gr_skiphead</block>
<block>gr_kludge_copy</block>
+ <block>gr_copy</block>
<block>gr_nop</block>
<block>xmlrpc_server</block>
<block>gr_nop</block>
<block>xmlrpc_server</block>