diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 13:56:45 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 14:10:00 -0400 |
| commit | f133e151935aae0f42978b12ae83722a4de88893 (patch) | |
| tree | b43e2549aba4f7ca30948acb24a46047aeab3586 | |
| parent | 8b1303bbb0bf72569a5149082796f50b6e8f9a5b (diff) | |
grc: fixing up new next structure blocks for GRC categories.
docs: also updating Doxygen category for all new/moved blocks.
33 files changed, 112 insertions, 142 deletions
diff --git a/docs/doxygen/other/group_defs.dox b/docs/doxygen/other/group_defs.dox index 1c96abf3dc..170465fa1c 100644 --- a/docs/doxygen/other/group_defs.dox +++ b/docs/doxygen/other/group_defs.dox @@ -15,6 +15,7 @@ /*! \defgroup channel_models_blk Channel Models */ /*! \defgroup channelizers_blk Channelizers */ /*! \defgroup coding_blk Information Coding and Decoding */ +/*! \defgroup controlport_blk ControlPort */ /*! \defgroup debug_tools_blk Debug Tools */ /*! \defgroup deprecated_blk Deprecated */ /*! \defgroup equalizers_blk Equalizers */ diff --git a/gr-analog/grc/analog_block_tree.xml b/gr-analog/grc/analog_block_tree.xml index cf58b3696b..6fdd139a85 100644 --- a/gr-analog/grc/analog_block_tree.xml +++ b/gr-analog/grc/analog_block_tree.xml @@ -60,6 +60,7 @@ <block>analog_sig_source_x</block> <block>analog_const_source_x</block> <block>analog_noise_source_x</block> + <block>analog_random_source_x</block> </cat> <cat> <name>Synchronizers</name> diff --git a/grc/blocks/random_source_x.xml b/gr-analog/grc/analog_random_source_x.xml index f826c77d16..e466c02fbe 100644 --- a/grc/blocks/random_source_x.xml +++ b/gr-analog/grc/analog_random_source_x.xml @@ -7,8 +7,8 @@ --> <block> <name>Random Source</name> - <key>random_source_x</key> - <import>from gnuradio import gr</import> + <key>analog_random_source_x</key> + <import>from gnuradio import blocks</import> <import>import numpy</import> <make>blocks.vector_source_$(type.fcn)(map(int, numpy.random.randint($min, $max, $num_samps)), $repeat)</make> <param> diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 04fe1f6955..a24e5b4231 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -49,11 +49,19 @@ <block>blocks_unpack_k_bits_bb</block> <block>blocks_repack_bits_bb</block> </cat> + <cat> + <name>Control Port</name> + <block>blocks_ctrlport_monitor</block> + <block>blocks_ctrlport_monitor_performance</block> + <block>blocks_ctrlport_probe2_c</block> + <block>blocks_ctrlport_probe_c</block> + </cat> <cat> <name>Debug Tools</name> <block>blocks_vector_sink_x</block> <block>blocks_tag_debug</block> <block>blocks_message_debug</block> + <block>blocks_random_pdu</block> </cat> <cat> <name>File Operators</name> @@ -98,6 +106,8 @@ <block>blocks_probe_signal_x</block> <block>blocks_probe_signal_vx</block> <block>blocks_probe_rate</block> + <block>blocks_ctrlport_probe2_c</block> + <block>blocks_ctrlport_probe_c</block> </cat> <cat> <name>Message Tools</name> @@ -108,6 +118,7 @@ <block>blocks_message_debug</block> <block>blocks_pdu_to_tagged_stream</block> <block>blocks_tagged_stream_to_pdu</block> + <block>blocks_random_pdu</block> </cat> <cat> <name>Misc</name> @@ -120,6 +131,8 @@ <block>blocks_null_sink</block> <block>blocks_copy</block> <block>blocks_nop</block> + <block>blocks_ctrlport_monitor</block> + <block>blocks_ctrlport_monitor_performance</block> </cat> <cat> <name>Modulators</name> @@ -150,6 +163,7 @@ <block>blocks_stream_to_vector</block> <block>blocks_streams_to_stream</block> <block>blocks_streams_to_vector</block> + <block>blocks_stream_to_vector_decimator</block> <block>blocks_vector_to_stream</block> <block>blocks_vector_to_streams</block> <block>blocks_patterned_interleaver</block> diff --git a/gr-blocks/grc/blocks_ctrlport_performance.xml b/gr-blocks/grc/blocks_ctrlport_performance.xml index 20b57025db..00be541547 100644 --- a/gr-blocks/grc/blocks_ctrlport_performance.xml +++ b/gr-blocks/grc/blocks_ctrlport_performance.xml @@ -24,7 +24,6 @@ <block> <name>CtrlPort Performance Monitor</name> <key>blocks_ctrlport_monitor_performance</key> - <category>Control Port</category> <import>from gnuradio.ctrlport.monitor import *</import> <make>not $en or monitor("gr-perf-monitorx")</make> <param> diff --git a/gr-blocks/grc/blocks_ctrlport_probe2_c.xml b/gr-blocks/grc/blocks_ctrlport_probe2_c.xml index 34f6dc0f50..3add69aa7b 100644 --- a/gr-blocks/grc/blocks_ctrlport_probe2_c.xml +++ b/gr-blocks/grc/blocks_ctrlport_probe2_c.xml @@ -24,7 +24,6 @@ <block> <name>Ctrlport Complex Probe (fixed len)</name> <key>blocks_ctrlport_probe2_c</key> - <category>Control Port</category> <import>from gnuradio import blocks</import> <make>blocks.ctrlport_probe2_c($name, $desc, $len)</make> <callback>set_length($len)</callback> diff --git a/gr-blocks/grc/blocks_ctrlport_probe_c.xml b/gr-blocks/grc/blocks_ctrlport_probe_c.xml index 3b17823931..00a3f9cad7 100644 --- a/gr-blocks/grc/blocks_ctrlport_probe_c.xml +++ b/gr-blocks/grc/blocks_ctrlport_probe_c.xml @@ -24,7 +24,6 @@ <block> <name>Ctrlport Complex Probe</name> <key>blocks_ctrlport_probe_c</key> - <category>Control Port</category> <import>from gnuradio import blocks</import> <make>blocks.ctrlport_probe_c($name, $desc)</make> diff --git a/gr-blocks/grc/blocks_ctrlport_viewer.xml b/gr-blocks/grc/blocks_ctrlport_viewer.xml index 99abd6d4bd..c8770d5dd9 100644 --- a/gr-blocks/grc/blocks_ctrlport_viewer.xml +++ b/gr-blocks/grc/blocks_ctrlport_viewer.xml @@ -24,7 +24,6 @@ <block> <name>CtrlPort Monitor</name> <key>blocks_ctrlport_monitor</key> - <category>Control Port</category> <import>from gnuradio.ctrlport.monitor import *</import> <make>not $en or monitor()</make> <param> diff --git a/gr-blocks/include/blocks/ctrlport_probe2_c.h b/gr-blocks/include/blocks/ctrlport_probe2_c.h index 9a6034fcca..736c23e4e7 100644 --- a/gr-blocks/include/blocks/ctrlport_probe2_c.h +++ b/gr-blocks/include/blocks/ctrlport_probe2_c.h @@ -31,7 +31,10 @@ namespace gr { /*! * \brief A ControlPort probe to export vectors of signals. + * \ingroup measurement_tools_blk + * \ingroup controlport_blk * + * \details * This block acts as a sink in the flowgraph but also exports * vectors of complex samples over ControlPort. This block holds * the latest \p len number of complex samples so that every query diff --git a/gr-blocks/include/blocks/ctrlport_probe_c.h b/gr-blocks/include/blocks/ctrlport_probe_c.h index 92fe8c5600..579621c680 100644 --- a/gr-blocks/include/blocks/ctrlport_probe_c.h +++ b/gr-blocks/include/blocks/ctrlport_probe_c.h @@ -33,7 +33,10 @@ namespace gr { /*! * \brief A ControlPort probe to export vectors of signals. + * \ingroup measurement_tools_blk + * \ingroup controlport_blk * + * \details * This block acts as a sink in the flowgraph but also exports * vectors of complex samples over ControlPort. This block simply * sends the current vector held in the work function when the diff --git a/gr-blocks/include/blocks/random_pdu.h b/gr-blocks/include/blocks/random_pdu.h index 5a13f5eca6..6cc7afaae3 100644 --- a/gr-blocks/include/blocks/random_pdu.h +++ b/gr-blocks/include/blocks/random_pdu.h @@ -31,7 +31,8 @@ namespace gr { /*! * \brief Sends a random PDU at intervals - * \ingroup source_blk + * \ingroup message_tools_blk + * \ingroup debug_tools_blk */ class BLOCKS_API random_pdu : virtual public gr_block { diff --git a/gr-channels/include/channels/channel_model.h b/gr-channels/include/channels/channel_model.h index 2fe73da90b..8e5430f05c 100644 --- a/gr-channels/include/channels/channel_model.h +++ b/gr-channels/include/channels/channel_model.h @@ -32,8 +32,9 @@ namespace gr { /*! * \brief channel simulator - * \ingroup misc_blk + * \ingroup channel_models_blk * + * \details * This block implements a basic channel model simulator that can * be used to help evaluate, design, and test various signals, * waveforms, and algorithms. This model allows the user to set diff --git a/gr-channels/include/channels/fading_model.h b/gr-channels/include/channels/fading_model.h index 651b087eb7..50632a61fc 100644 --- a/gr-channels/include/channels/fading_model.h +++ b/gr-channels/include/channels/fading_model.h @@ -32,12 +32,12 @@ namespace gr { /*! * \brief fading simulator - * \ingroup misc_blk + * \ingroup channel_models_blk * + * \details * This block implements a basic fading model simulator that can * be used to help evaluate, design, and test various signals, * waveforms, and algorithms. - * */ class CHANNELS_API fading_model : virtual public gr_sync_block { diff --git a/gr-digital/examples/demod/ber_simulation.grc b/gr-digital/examples/demod/ber_simulation.grc index d0bec741c3..72d52d3730 100644 --- a/gr-digital/examples/demod/ber_simulation.grc +++ b/gr-digital/examples/demod/ber_simulation.grc @@ -311,10 +311,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x</value> + <value>analog_random_source_x</value> </param> <param> <key>_enabled</key> @@ -666,13 +666,13 @@ <sink_key>1</sink_key> </connection> <connection> - <source_block_id>random_source_x</source_block_id> + <source_block_id>analog_random_source_x</source_block_id> <sink_block_id>blocks_throttle</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x</source_block_id> + <source_block_id>analog_random_source_x</source_block_id> <sink_block_id>digital_chunks_to_symbols_xx</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-digital/examples/demod/digital_freq_lock.grc b/gr-digital/examples/demod/digital_freq_lock.grc index 399d52488d..399d6a8e01 100644 --- a/gr-digital/examples/demod/digital_freq_lock.grc +++ b/gr-digital/examples/demod/digital_freq_lock.grc @@ -693,10 +693,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x</value> + <value>analog_random_source_x</value> </param> <param> <key>_enabled</key> @@ -869,7 +869,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x</source_block_id> + <source_block_id>analog_random_source_x</source_block_id> <sink_block_id>digital_psk_mod_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-digital/examples/demod/mpsk_demod.grc b/gr-digital/examples/demod/mpsk_demod.grc index c252bb6e4f..e6fc8a9d3e 100644 --- a/gr-digital/examples/demod/mpsk_demod.grc +++ b/gr-digital/examples/demod/mpsk_demod.grc @@ -84,10 +84,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x_0</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> @@ -538,7 +538,7 @@ </param> </block> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>digital_dxpsk_mod_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-digital/examples/demod/pam_sync.grc b/gr-digital/examples/demod/pam_sync.grc index d8497e423d..98b4d4a63d 100644 --- a/gr-digital/examples/demod/pam_sync.grc +++ b/gr-digital/examples/demod/pam_sync.grc @@ -130,10 +130,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x</value> + <value>analog_random_source_x</value> </param> <param> <key>_enabled</key> @@ -1354,7 +1354,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x</source_block_id> + <source_block_id>analog_random_source_x</source_block_id> <sink_block_id>digital_chunks_to_symbols_xx</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-digital/examples/demod/pam_timing.grc b/gr-digital/examples/demod/pam_timing.grc index 50dd8a1c86..0e4dd4933a 100644 --- a/gr-digital/examples/demod/pam_timing.grc +++ b/gr-digital/examples/demod/pam_timing.grc @@ -61,10 +61,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x</value> + <value>analog_random_source_x</value> </param> <param> <key>_enabled</key> @@ -1151,7 +1151,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x</source_block_id> + <source_block_id>analog_random_source_x</source_block_id> <sink_block_id>digital_chunks_to_symbols_xx</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-digital/grc/digital_block_tree.xml b/gr-digital/grc/digital_block_tree.xml index 46658b7065..048348f7c5 100644 --- a/gr-digital/grc/digital_block_tree.xml +++ b/gr-digital/grc/digital_block_tree.xml @@ -85,6 +85,7 @@ <block>digital_ofdm_cyclic_prefixer</block> <block>digital_ofdm_frame_acquisition</block> <block>digital_ofdm_frame_equalizer_vcvc</block> + <block>digital_ofdm_frame_sink</block> <block>digital_ofdm_insert_preamble</block> <block>digital_ofdm_sampler</block> <block>digital_ofdm_serializer_vcc</block> @@ -119,6 +120,7 @@ <cat> <name>Deprecated</name> <block>digital_correlate_access_code_bb</block> + <block>digital_correlate_access_code_tag_bb</block> <block>digital_simple_framer</block> <block>digital_simple_correlator</block> </cat> diff --git a/gr-fec/grc/fec_block_tree.xml b/gr-fec/grc/fec_block_tree.xml index 3b54719c94..1a0d2ec985 100644 --- a/gr-fec/grc/fec_block_tree.xml +++ b/gr-fec/grc/fec_block_tree.xml @@ -7,7 +7,7 @@ <cat> <name></name> <!-- Blank for Root Name --> <cat> - <name>FEC (New)</name> + <name>Error Coding</name> <block>fec_decode_ccsds_27_fb</block> <block>fec_encode_ccsds_27_bb</block> </cat> diff --git a/gr-fec/include/fec/decode_ccsds_27_fb.h b/gr-fec/include/fec/decode_ccsds_27_fb.h index 73d3ebbef0..f55f8d5c08 100644 --- a/gr-fec/include/fec/decode_ccsds_27_fb.h +++ b/gr-fec/include/fec/decode_ccsds_27_fb.h @@ -30,8 +30,9 @@ namespace gr { namespace fec { /*! \brief A rate 1/2, k=7 convolutional decoder for the CCSDS standard - * \ingroup ecc + * \ingroup error_coding_blk * + * \details * This block performs soft-decision convolutional decoding using the Viterbi * algorithm. * diff --git a/gr-fec/include/fec/encode_ccsds_27_bb.h b/gr-fec/include/fec/encode_ccsds_27_bb.h index 4a0fecd357..9f89982288 100644 --- a/gr-fec/include/fec/encode_ccsds_27_bb.h +++ b/gr-fec/include/fec/encode_ccsds_27_bb.h @@ -30,8 +30,9 @@ namespace gr { namespace fec { /*! \brief A rate 1/2, k=7 convolutional encoder for the CCSDS standard - * \ingroup ecc + * \ingroup error_coding_blk * + * \details * This block performs convolutional encoding using the CCSDS standard * polynomial ("Voyager"). * diff --git a/gr-fft/grc/fft_block_tree.xml b/gr-fft/grc/fft_block_tree.xml index aa1f94daa2..ca8ca7876c 100644 --- a/gr-fft/grc/fft_block_tree.xml +++ b/gr-fft/grc/fft_block_tree.xml @@ -32,10 +32,6 @@ <name>Fourier Analysis</name> <block>fft_vxx</block> <block>goertzel_fc</block> - </cat> - - <cat> - <name>Operators</name> <block>logpwrfft_x</block> </cat> </cat> diff --git a/gr-filter/grc/filter_block_tree.xml b/gr-filter/grc/filter_block_tree.xml index 898c77f0ac..614cfc0ec9 100644 --- a/gr-filter/grc/filter_block_tree.xml +++ b/gr-filter/grc/filter_block_tree.xml @@ -50,6 +50,7 @@ <name>Resamplers</name> <block>fractional_interpolator_xx</block> <block>pfb_arb_resampler_xxx</block> + <block>rational_resampler_xxx</block> <block>rational_resampler_base_xxx</block> </cat> <cat> @@ -59,7 +60,5 @@ <block>pfb_decimator_ccf</block> <block>pfb_interpolator_ccf</block> <block>pfb_synthesizer_ccf</block> - <block>rational_resampler_xxx</block> - <block>rational_resampler_base_xxx</block> </cat> </cat> diff --git a/gr-qtgui/grc/qtgui_block_tree.xml b/gr-qtgui/grc/qtgui_block_tree.xml index ac6eef7599..e9d57a664c 100644 --- a/gr-qtgui/grc/qtgui_block_tree.xml +++ b/gr-qtgui/grc/qtgui_block_tree.xml @@ -27,23 +27,29 @@ ################################################### --> <cat> - <name></name> <!-- Blank for Root Name --> - <cat> - <name>Instrumentation/QT</name> - <block>qtgui_freq_sink_x</block> - <block>qtgui_time_sink_x</block> - <block>qtgui_const_sink_x</block> - <block>qtgui_waterfall_sink_x</block> - <block>qtgui_time_raster_sink_x</block> - <block>qtgui_sink_x</block> - </cat> - <cat> - <name>GUI Widgets/QT</name> - <block>qtgui_tab_widget</block> - <block>variable_qtgui_range</block> - <block>variable_qtgui_chooser</block> - <block>variable_qtgui_check_box</block> - <block>variable_qtgui_entry</block> - <block>variable_qtgui_label</block> - </cat> + <name></name> <!-- Blank for Root Name --> + <cat> + <name>Instrumentation</name> + <cat> + <name>QT</name> + <block>qtgui_freq_sink_x</block> + <block>qtgui_time_sink_x</block> + <block>qtgui_const_sink_x</block> + <block>qtgui_waterfall_sink_x</block> + <block>qtgui_time_raster_sink_x</block> + <block>qtgui_sink_x</block> + </cat> + </cat> + <cat> + <name>GUI Widgets</name> + <cat> + <name>QT</name> + <block>qtgui_tab_widget</block> + <block>variable_qtgui_range</block> + <block>variable_qtgui_chooser</block> + <block>variable_qtgui_check_box</block> + <block>variable_qtgui_entry</block> + <block>variable_qtgui_label</block> + </cat> + </cat> </cat> diff --git a/gr-trellis/examples/grc/interference_cancellation.grc b/gr-trellis/examples/grc/interference_cancellation.grc index 4555a244a9..1c42a72f37 100644 --- a/gr-trellis/examples/grc/interference_cancellation.grc +++ b/gr-trellis/examples/grc/interference_cancellation.grc @@ -194,10 +194,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x_0</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> @@ -233,10 +233,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x_1</value> + <value>analog_random_source_x_1</value> </param> <param> <key>_enabled</key> @@ -1911,7 +1911,7 @@ </param> </block> <connection> - <source_block_id>random_source_x_1</source_block_id> + <source_block_id>analog_random_source_x_1</source_block_id> <sink_block_id>trellis_encoder_xx_1</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -1965,7 +1965,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>trellis_encoder_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -1977,7 +1977,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>blocks_sub_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -1995,7 +1995,7 @@ <sink_key>1</sink_key> </connection> <connection> - <source_block_id>random_source_x_1</source_block_id> + <source_block_id>analog_random_source_x_1</source_block_id> <sink_block_id>blocks_sub_xx_1</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -2073,7 +2073,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x_1</source_block_id> + <source_block_id>analog_random_source_x_1</source_block_id> <sink_block_id>blocks_sub_xx_3</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -2133,7 +2133,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>blocks_sub_xx_1_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-trellis/examples/grc/pccc.grc b/gr-trellis/examples/grc/pccc.grc index c0e587a09e..3563f2fe56 100644 --- a/gr-trellis/examples/grc/pccc.grc +++ b/gr-trellis/examples/grc/pccc.grc @@ -405,10 +405,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x_0</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> @@ -764,7 +764,7 @@ </param> </block> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>blocks_sub_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -800,7 +800,7 @@ <sink_key>1</sink_key> </connection> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>trellis_pccc_encoder_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-trellis/examples/grc/pccc1.grc b/gr-trellis/examples/grc/pccc1.grc index 4507cae890..c6c6773904 100644 --- a/gr-trellis/examples/grc/pccc1.grc +++ b/gr-trellis/examples/grc/pccc1.grc @@ -405,10 +405,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x_0</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> @@ -783,7 +783,7 @@ </param> </block> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>blocks_sub_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -825,7 +825,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>trellis_pccc_encoder_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-trellis/examples/grc/sccc.grc b/gr-trellis/examples/grc/sccc.grc index ec84665c14..3c10d0cece 100644 --- a/gr-trellis/examples/grc/sccc.grc +++ b/gr-trellis/examples/grc/sccc.grc @@ -84,10 +84,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x_0</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> @@ -764,7 +764,7 @@ </param> </block> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>blocks_sub_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -776,7 +776,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>trellis_sccc_encoder_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-trellis/examples/grc/sccc1.grc b/gr-trellis/examples/grc/sccc1.grc index 332ec6bdd7..4fdf81c811 100644 --- a/gr-trellis/examples/grc/sccc1.grc +++ b/gr-trellis/examples/grc/sccc1.grc @@ -84,10 +84,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x_0</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> @@ -783,7 +783,7 @@ </param> </block> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>blocks_sub_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> @@ -795,7 +795,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>trellis_sccc_encoder_xx_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-uhd/examples/grc/uhd_dpsk_mod.grc b/gr-uhd/examples/grc/uhd_dpsk_mod.grc index 8387890372..1e5bfd5ddb 100644 --- a/gr-uhd/examples/grc/uhd_dpsk_mod.grc +++ b/gr-uhd/examples/grc/uhd_dpsk_mod.grc @@ -242,10 +242,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x_0</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> @@ -2224,7 +2224,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>digital_dxpsk_mod_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/gr-uhd/examples/grc/uhd_tx_dpsk.grc b/gr-uhd/examples/grc/uhd_tx_dpsk.grc index b5f8e41054..5d57617673 100644 --- a/gr-uhd/examples/grc/uhd_tx_dpsk.grc +++ b/gr-uhd/examples/grc/uhd_tx_dpsk.grc @@ -319,10 +319,10 @@ </param> </block> <block> - <key>random_source_x</key> + <key>analog_random_source_x</key> <param> <key>id</key> - <value>random_source_x_0</value> + <value>analog_random_source_x_0</value> </param> <param> <key>_enabled</key> @@ -1256,7 +1256,7 @@ </param> </block> <connection> - <source_block_id>random_source_x_0</source_block_id> + <source_block_id>analog_random_source_x_0</source_block_id> <sink_block_id>digital_dxpsk_mod_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 897e4a14c2..ac172c7174 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -7,38 +7,6 @@ <cat> <name></name> <!-- Blank for Root Name --> <cat> - <name>Filters</name> - <!-- FIR convenience filters --> - <block>low_pass_filter</block> - <block>high_pass_filter</block> - <block>band_pass_filter</block> - <block>band_reject_filter</block> - <block>root_raised_cosine_filter</block> - <!-- Filter banks --> - <block>blks2_synthesis_filterbank</block> - <block>blks2_analysis_filterbank</block> - <!-- Other filters --> - <block>blks2_rational_resampler_xxx</block> - <block>gr_iqcomp_cc</block> - </cat> - <cat> - <name>Error Coding</name> - <block>gr_encode_ccsds_27_bb</block> - <block>gr_decode_ccsds_27_fb</block> - </cat> - <cat> - <name>Fourier Analysis</name> - <block>blks2_logpwrfft_x</block> - </cat> - <cat> - <name>Level Controllers</name> - <block>blks2_standard_squelch</block> - </cat> - <cat> - <name>Message Tools</name> - <block>gr_random_pdu</block> - </cat> - <cat> <name>Misc</name> <block>pad_source</block> <block>pad_sink</block> @@ -56,39 +24,16 @@ <block>xmlrpc_client</block> </cat> <cat> - <name>Modulators</name> - <block>blks2_wfm_tx</block> - <block>blks2_wfm_rcv</block> - <block>blks2_wfm_rcv_pll</block> - - <block>blks2_nbfm_tx</block> - <block>blks2_nbfm_rx</block> - - <block>blks2_am_demod_cf</block> - <block>blks2_fm_demod_cf</block> - <block>blks2_fm_deemph</block> - <block>blks2_fm_preemph</block> - </cat> - <cat> <name>Networking Tools</name> <block>blks2_tcp_source</block> <block>blks2_tcp_sink</block> </cat> <cat> - <name>Synchronizers</name> + <name>Packet Operators</name> <block>blks2_packet_decoder</block> <block>blks2_packet_encoder</block> </cat> <cat> - <name>Type Converters</name> - <block>blks2_stream_to_vector_decimator</block> - </cat> - <cat> - <name>Waveform Generators</name> - <block>const_source_x</block> - <block>random_source_x</block> - </cat> - <cat> <name>Variables</name> <block>variable</block> <block>variable_config</block> |