Skip to content

Commit f133e15

Browse files
trondeautrondeau
committed
grc: fixing up new next structure blocks for GRC categories.
docs: also updating Doxygen category for all new/moved blocks.
1 parent 8b1303b commit f133e15

33 files changed

+112
-142
lines changed

‎docs/doxygen/other/group_defs.dox

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
/*! \defgroup channel_models_blk Channel Models */
1616
/*! \defgroup channelizers_blk Channelizers */
1717
/*! \defgroup coding_blk Information Coding and Decoding */
18+
/*! \defgroup controlport_blk ControlPort */
1819
/*! \defgroup debug_tools_blk Debug Tools */
1920
/*! \defgroup deprecated_blk Deprecated */
2021
/*! \defgroup equalizers_blk Equalizers */

‎gr-analog/grc/analog_block_tree.xml

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<block>analog_sig_source_x</block>
6161
<block>analog_const_source_x</block>
6262
<block>analog_noise_source_x</block>
63+
<block>analog_random_source_x</block>
6364
</cat>
6465
<cat>
6566
<name>Synchronizers</name>

‎grc/blocks/random_source_x.xml ‎gr-analog/grc/analog_random_source_x.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
-->
88
<block>
99
<name>Random Source</name>
10-
<key>random_source_x</key>
11-
<import>from gnuradio import gr</import>
10+
<key>analog_random_source_x</key>
11+
<import>from gnuradio import blocks</import>
1212
<import>import numpy</import>
1313
<make>blocks.vector_source_$(type.fcn)(map(int, numpy.random.randint($min, $max, $num_samps)), $repeat)</make>
1414
<param>

‎gr-blocks/grc/blocks_block_tree.xml

+14
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,19 @@
4949
<block>blocks_unpack_k_bits_bb</block>
5050
<block>blocks_repack_bits_bb</block>
5151
</cat>
52+
<cat>
53+
<name>Control Port</name>
54+
<block>blocks_ctrlport_monitor</block>
55+
<block>blocks_ctrlport_monitor_performance</block>
56+
<block>blocks_ctrlport_probe2_c</block>
57+
<block>blocks_ctrlport_probe_c</block>
58+
</cat>
5259
<cat>
5360
<name>Debug Tools</name>
5461
<block>blocks_vector_sink_x</block>
5562
<block>blocks_tag_debug</block>
5663
<block>blocks_message_debug</block>
64+
<block>blocks_random_pdu</block>
5765
</cat>
5866
<cat>
5967
<name>File Operators</name>
@@ -98,6 +106,8 @@
98106
<block>blocks_probe_signal_x</block>
99107
<block>blocks_probe_signal_vx</block>
100108
<block>blocks_probe_rate</block>
109+
<block>blocks_ctrlport_probe2_c</block>
110+
<block>blocks_ctrlport_probe_c</block>
101111
</cat>
102112
<cat>
103113
<name>Message Tools</name>
@@ -108,6 +118,7 @@
108118
<block>blocks_message_debug</block>
109119
<block>blocks_pdu_to_tagged_stream</block>
110120
<block>blocks_tagged_stream_to_pdu</block>
121+
<block>blocks_random_pdu</block>
111122
</cat>
112123
<cat>
113124
<name>Misc</name>
@@ -120,6 +131,8 @@
120131
<block>blocks_null_sink</block>
121132
<block>blocks_copy</block>
122133
<block>blocks_nop</block>
134+
<block>blocks_ctrlport_monitor</block>
135+
<block>blocks_ctrlport_monitor_performance</block>
123136
</cat>
124137
<cat>
125138
<name>Modulators</name>
@@ -150,6 +163,7 @@
150163
<block>blocks_stream_to_vector</block>
151164
<block>blocks_streams_to_stream</block>
152165
<block>blocks_streams_to_vector</block>
166+
<block>blocks_stream_to_vector_decimator</block>
153167
<block>blocks_vector_to_stream</block>
154168
<block>blocks_vector_to_streams</block>
155169
<block>blocks_patterned_interleaver</block>

‎gr-blocks/grc/blocks_ctrlport_performance.xml

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<block>
2525
<name>CtrlPort Performance Monitor</name>
2626
<key>blocks_ctrlport_monitor_performance</key>
27-
<category>Control Port</category>
2827
<import>from gnuradio.ctrlport.monitor import *</import>
2928
<make>not $en or monitor("gr-perf-monitorx")</make>
3029
<param>

‎gr-blocks/grc/blocks_ctrlport_probe2_c.xml

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<block>
2525
<name>Ctrlport Complex Probe (fixed len)</name>
2626
<key>blocks_ctrlport_probe2_c</key>
27-
<category>Control Port</category>
2827
<import>from gnuradio import blocks</import>
2928
<make>blocks.ctrlport_probe2_c($name, $desc, $len)</make>
3029
<callback>set_length($len)</callback>

‎gr-blocks/grc/blocks_ctrlport_probe_c.xml

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<block>
2525
<name>Ctrlport Complex Probe</name>
2626
<key>blocks_ctrlport_probe_c</key>
27-
<category>Control Port</category>
2827
<import>from gnuradio import blocks</import>
2928
<make>blocks.ctrlport_probe_c($name, $desc)</make>
3029

‎gr-blocks/grc/blocks_ctrlport_viewer.xml

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<block>
2525
<name>CtrlPort Monitor</name>
2626
<key>blocks_ctrlport_monitor</key>
27-
<category>Control Port</category>
2827
<import>from gnuradio.ctrlport.monitor import *</import>
2928
<make>not $en or monitor()</make>
3029
<param>

‎gr-blocks/include/blocks/ctrlport_probe2_c.h

+3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ namespace gr {
3131

3232
/*!
3333
* \brief A ControlPort probe to export vectors of signals.
34+
* \ingroup measurement_tools_blk
35+
* \ingroup controlport_blk
3436
*
37+
* \details
3538
* This block acts as a sink in the flowgraph but also exports
3639
* vectors of complex samples over ControlPort. This block holds
3740
* the latest \p len number of complex samples so that every query

‎gr-blocks/include/blocks/ctrlport_probe_c.h

+3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ namespace gr {
3333

3434
/*!
3535
* \brief A ControlPort probe to export vectors of signals.
36+
* \ingroup measurement_tools_blk
37+
* \ingroup controlport_blk
3638
*
39+
* \details
3740
* This block acts as a sink in the flowgraph but also exports
3841
* vectors of complex samples over ControlPort. This block simply
3942
* sends the current vector held in the work function when the

‎gr-blocks/include/blocks/random_pdu.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ namespace gr {
3131

3232
/*!
3333
* \brief Sends a random PDU at intervals
34-
* \ingroup source_blk
34+
* \ingroup message_tools_blk
35+
* \ingroup debug_tools_blk
3536
*/
3637
class BLOCKS_API random_pdu : virtual public gr_block
3738
{

‎gr-channels/include/channels/channel_model.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ namespace gr {
3232

3333
/*!
3434
* \brief channel simulator
35-
* \ingroup misc_blk
35+
* \ingroup channel_models_blk
3636
*
37+
* \details
3738
* This block implements a basic channel model simulator that can
3839
* be used to help evaluate, design, and test various signals,
3940
* waveforms, and algorithms. This model allows the user to set

‎gr-channels/include/channels/fading_model.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ namespace gr {
3232

3333
/*!
3434
* \brief fading simulator
35-
* \ingroup misc_blk
35+
* \ingroup channel_models_blk
3636
*
37+
* \details
3738
* This block implements a basic fading model simulator that can
3839
* be used to help evaluate, design, and test various signals,
3940
* waveforms, and algorithms.
40-
*
4141
*/
4242
class CHANNELS_API fading_model : virtual public gr_sync_block
4343
{

‎gr-digital/examples/demod/ber_simulation.grc

+4-4
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,10 @@
311311
</param>
312312
</block>
313313
<block>
314-
<key>random_source_x</key>
314+
<key>analog_random_source_x</key>
315315
<param>
316316
<key>id</key>
317-
<value>random_source_x</value>
317+
<value>analog_random_source_x</value>
318318
</param>
319319
<param>
320320
<key>_enabled</key>
@@ -666,13 +666,13 @@
666666
<sink_key>1</sink_key>
667667
</connection>
668668
<connection>
669-
<source_block_id>random_source_x</source_block_id>
669+
<source_block_id>analog_random_source_x</source_block_id>
670670
<sink_block_id>blocks_throttle</sink_block_id>
671671
<source_key>0</source_key>
672672
<sink_key>0</sink_key>
673673
</connection>
674674
<connection>
675-
<source_block_id>random_source_x</source_block_id>
675+
<source_block_id>analog_random_source_x</source_block_id>
676676
<sink_block_id>digital_chunks_to_symbols_xx</sink_block_id>
677677
<source_key>0</source_key>
678678
<sink_key>0</sink_key>

‎gr-digital/examples/demod/digital_freq_lock.grc

+3-3
Original file line numberDiff line numberDiff line change
@@ -693,10 +693,10 @@
693693
</param>
694694
</block>
695695
<block>
696-
<key>random_source_x</key>
696+
<key>analog_random_source_x</key>
697697
<param>
698698
<key>id</key>
699-
<value>random_source_x</value>
699+
<value>analog_random_source_x</value>
700700
</param>
701701
<param>
702702
<key>_enabled</key>
@@ -869,7 +869,7 @@
869869
<sink_key>0</sink_key>
870870
</connection>
871871
<connection>
872-
<source_block_id>random_source_x</source_block_id>
872+
<source_block_id>analog_random_source_x</source_block_id>
873873
<sink_block_id>digital_psk_mod_0</sink_block_id>
874874
<source_key>0</source_key>
875875
<sink_key>0</sink_key>

‎gr-digital/examples/demod/mpsk_demod.grc

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@
8484
</param>
8585
</block>
8686
<block>
87-
<key>random_source_x</key>
87+
<key>analog_random_source_x</key>
8888
<param>
8989
<key>id</key>
90-
<value>random_source_x_0</value>
90+
<value>analog_random_source_x_0</value>
9191
</param>
9292
<param>
9393
<key>_enabled</key>
@@ -538,7 +538,7 @@
538538
</param>
539539
</block>
540540
<connection>
541-
<source_block_id>random_source_x_0</source_block_id>
541+
<source_block_id>analog_random_source_x_0</source_block_id>
542542
<sink_block_id>digital_dxpsk_mod_0</sink_block_id>
543543
<source_key>0</source_key>
544544
<sink_key>0</sink_key>

‎gr-digital/examples/demod/pam_sync.grc

+3-3
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@
130130
</param>
131131
</block>
132132
<block>
133-
<key>random_source_x</key>
133+
<key>analog_random_source_x</key>
134134
<param>
135135
<key>id</key>
136-
<value>random_source_x</value>
136+
<value>analog_random_source_x</value>
137137
</param>
138138
<param>
139139
<key>_enabled</key>
@@ -1354,7 +1354,7 @@
13541354
<sink_key>0</sink_key>
13551355
</connection>
13561356
<connection>
1357-
<source_block_id>random_source_x</source_block_id>
1357+
<source_block_id>analog_random_source_x</source_block_id>
13581358
<sink_block_id>digital_chunks_to_symbols_xx</sink_block_id>
13591359
<source_key>0</source_key>
13601360
<sink_key>0</sink_key>

‎gr-digital/examples/demod/pam_timing.grc

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
</param>
6262
</block>
6363
<block>
64-
<key>random_source_x</key>
64+
<key>analog_random_source_x</key>
6565
<param>
6666
<key>id</key>
67-
<value>random_source_x</value>
67+
<value>analog_random_source_x</value>
6868
</param>
6969
<param>
7070
<key>_enabled</key>
@@ -1151,7 +1151,7 @@
11511151
<sink_key>0</sink_key>
11521152
</connection>
11531153
<connection>
1154-
<source_block_id>random_source_x</source_block_id>
1154+
<source_block_id>analog_random_source_x</source_block_id>
11551155
<sink_block_id>digital_chunks_to_symbols_xx</sink_block_id>
11561156
<source_key>0</source_key>
11571157
<sink_key>0</sink_key>

‎gr-digital/grc/digital_block_tree.xml

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
<block>digital_ofdm_cyclic_prefixer</block>
8686
<block>digital_ofdm_frame_acquisition</block>
8787
<block>digital_ofdm_frame_equalizer_vcvc</block>
88+
<block>digital_ofdm_frame_sink</block>
8889
<block>digital_ofdm_insert_preamble</block>
8990
<block>digital_ofdm_sampler</block>
9091
<block>digital_ofdm_serializer_vcc</block>
@@ -119,6 +120,7 @@
119120
<cat>
120121
<name>Deprecated</name>
121122
<block>digital_correlate_access_code_bb</block>
123+
<block>digital_correlate_access_code_tag_bb</block>
122124
<block>digital_simple_framer</block>
123125
<block>digital_simple_correlator</block>
124126
</cat>

‎gr-fec/grc/fec_block_tree.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<cat>
88
<name></name> <!-- Blank for Root Name -->
99
<cat>
10-
<name>FEC (New)</name>
10+
<name>Error Coding</name>
1111
<block>fec_decode_ccsds_27_fb</block>
1212
<block>fec_encode_ccsds_27_bb</block>
1313
</cat>

‎gr-fec/include/fec/decode_ccsds_27_fb.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ namespace gr {
3030
namespace fec {
3131

3232
/*! \brief A rate 1/2, k=7 convolutional decoder for the CCSDS standard
33-
* \ingroup ecc
33+
* \ingroup error_coding_blk
3434
*
35+
* \details
3536
* This block performs soft-decision convolutional decoding using the Viterbi
3637
* algorithm.
3738
*

‎gr-fec/include/fec/encode_ccsds_27_bb.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,9 @@ namespace gr {
3030
namespace fec {
3131

3232
/*! \brief A rate 1/2, k=7 convolutional encoder for the CCSDS standard
33-
* \ingroup ecc
33+
* \ingroup error_coding_blk
3434
*
35+
* \details
3536
* This block performs convolutional encoding using the CCSDS standard
3637
* polynomial ("Voyager").
3738
*

‎gr-fft/grc/fft_block_tree.xml

-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
<name>Fourier Analysis</name>
3333
<block>fft_vxx</block>
3434
<block>goertzel_fc</block>
35-
</cat>
36-
37-
<cat>
38-
<name>Operators</name>
3935
<block>logpwrfft_x</block>
4036
</cat>
4137
</cat>

‎gr-filter/grc/filter_block_tree.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<name>Resamplers</name>
5151
<block>fractional_interpolator_xx</block>
5252
<block>pfb_arb_resampler_xxx</block>
53+
<block>rational_resampler_xxx</block>
5354
<block>rational_resampler_base_xxx</block>
5455
</cat>
5556
<cat>
@@ -59,7 +60,5 @@
5960
<block>pfb_decimator_ccf</block>
6061
<block>pfb_interpolator_ccf</block>
6162
<block>pfb_synthesizer_ccf</block>
62-
<block>rational_resampler_xxx</block>
63-
<block>rational_resampler_base_xxx</block>
6463
</cat>
6564
</cat>

0 commit comments

Comments
 (0)