Skip to content

Commit 9ce3e6b

Browse files
trondeautrondeau
committed
grc: removed 'old' grc keys from block_tree.
This does not remove the actual GRC files, just how we find them in the block tree structure of GRC. Renames all blocks not updated to 3.7 style as "(old)" in name.
1 parent f518ef3 commit 9ce3e6b

File tree

190 files changed

+457
-648
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+457
-648
lines changed

‎gr-analog/grc/analog_block_tree.xml

+7-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@
2929
<cat>
3030
<name></name> <!-- Blank for Root Name -->
3131
<cat>
32-
<name>Level Controls</name>
32+
<name>Level Controllers</name>
3333
<block>analog_agc_xx</block>
3434
<block>analog_agc2_xx</block>
35-
<block>analog_dpll_bb</block>
3635
<block>analog_feedforward_agc_cc</block>
3736
<block>analog_ctcss_squelch_ff</block>
3837
<block>analog_pwr_squelch_xx</block>
@@ -47,7 +46,7 @@
4746
<block>analog_quadrature_demod_cf</block>
4847
</cat>
4948
<cat>
50-
<name>Sources</name>
49+
<name>Waveform Generators</name>
5150
<block>analog_sig_source_x</block>
5251
<block>analog_noise_source_x</block>
5352
</cat>
@@ -58,7 +57,11 @@
5857
<block>analog_pll_refout_cc</block>
5958
</cat>
6059
<cat>
61-
<name>Probes</name>
60+
<name>Peak Detectors</name>
61+
<block>analog_dpll_bb</block>
62+
</cat>
63+
<cat>
64+
<name>Measurement Tools</name>
6265
<block>analog_probe_avg_mag_sqrd_x</block>
6366
</cat>
6467
</cat>

‎gr-audio/grc/audio_sink.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<block>
88
<name>Audio Sink</name>
99
<key>audio_sink</key>
10-
<category>Sinks</category>
10+
<category>Audio</category>
1111
<throttle>1</throttle>
1212
<import>from gnuradio import audio</import>
1313
<make>audio.sink($samp_rate, $device_name, $ok_to_block)</make>

‎gr-audio/grc/audio_source.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<block>
88
<name>Audio Source</name>
99
<key>audio_source</key>
10-
<category>Sources</category>
10+
<category>Audio</category>
1111
<throttle>1</throttle>
1212
<import>from gnuradio import audio</import>
1313
<make>audio.source($samp_rate, $device_name, $ok_to_block)</make>

‎gr-blocks/grc/blocks_block_tree.xml

+113-87
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,53 @@
2929
<cat>
3030
<name></name> <!-- Blank for Root Name -->
3131
<cat>
32-
<name>Sources (New)</name>
33-
<block>blocks_file_source</block>
34-
<block>blocks_file_descriptor_source</block>
35-
<block>blocks_file_meta_source</block>
36-
<block>blocks_pdu_to_tagged_stream</block>
37-
<block>blocks_message_source</block>
38-
<block>blocks_message_burst_source</block>
39-
<block>blocks_udp_source</block>
32+
<name>Audio</name>
4033
<block>blocks_wavfile_source</block>
41-
<block>blocks_vector_source_x</block>
42-
<block>blocks_null_source</block>
34+
<block>blocks_wavfile_sink</block>
35+
</cat>
36+
<cat>
37+
<name>Boolean Operators</name>
38+
<block>blocks_and_xx</block>
39+
<block>blocks_and_const_xx</block>
40+
<block>blocks_not_xx</block>
41+
<block>blocks_or_xx</block>
42+
<block>blocks_xor_xx</block>
43+
</cat>
44+
<cat>
45+
<name>Byte Operators</name>
46+
<block>blocks_packed_to_unpacked_xx</block>
47+
<block>blocks_unpacked_to_packed_xx</block>
48+
<block>blocks_pack_k_bits_bb</block>
49+
<block>blocks_unpack_k_bits_bb</block>
50+
<block>blocks_repack_bits_bb</block>
4351
</cat>
4452
<cat>
45-
<name>Sinks (New)</name>
53+
<name>Debug Tools</name>
54+
<block>blocks_vector_sink_x</block>
55+
<block>blocks_tag_debug</block>
56+
<block>blocks_message_debug</block>
57+
</cat>
58+
<cat>
59+
<name>File Operators</name>
60+
<block>blocks_wavfile_source</block>
61+
<block>blocks_wavfile_sink</block>
62+
<block>blocks_file_source</block>
4663
<block>blocks_file_sink</block>
64+
<block>blocks_file_descriptor_source</block>
4765
<block>blocks_file_descriptor_sink</block>
66+
<block>blocks_file_meta_source</block>
4867
<block>blocks_file_meta_sink</block>
49-
<block>blocks_tagged_stream_to_pdu</block>
50-
<block>blocks_tag_debug</block>
51-
<block>blocks_message_sink</block>
5268
<block>blocks_tagged_file_sink</block>
53-
<block>blocks_udp_sink</block>
54-
<block>blocks_wavfile_sink</block>
55-
<block>blocks_vector_sink_x</block>
56-
<block>blocks_null_sink</block>
5769
</cat>
5870
<cat>
59-
<name>Math Operations (New) </name>
71+
<name>Level Controllers</name>
72+
<block>blocks_mute_xx</block>
73+
<block>blocks_sample_and_hold_xx</block>
74+
<block>blocks_moving_average_xx</block>
75+
<block>blocks_threshold_ff</block>
76+
</cat>
77+
<cat>
78+
<name>Math Operators</name>
6079
<block>blocks_add_xx</block>
6180
<block>blocks_add_const_vxx</block>
6281
<block>blocks_divide_xx</block>
@@ -71,99 +90,106 @@
7190
<block>blocks_transcendental</block>
7291
<block>blocks_argmax_xx</block>
7392
<block>blocks_max_xx</block>
93+
</cat>
94+
<cat>
95+
<name>Measurement Tools</name>
96+
<block>blocks_message_debug</block>
97+
<block>blocks_tag_debug</block>
98+
<block>blocks_probe_signal_x</block>
99+
<block>blocks_probe_signal_vx</block>
100+
<block>blocks_probe_rate</block>
101+
</cat>
102+
<cat>
103+
<name>Message Tools</name>
104+
<block>blocks_message_source</block>
105+
<block>blocks_message_sink</block>
106+
<block>blocks_message_burst_source</block>
107+
<block>blocks_message_strobe</block>
108+
<block>blocks_message_debug</block>
109+
<block>blocks_pdu_to_tagged_stream</block>
110+
<block>blocks_tagged_stream_to_pdu</block>
111+
</cat>
112+
<cat>
113+
<name>Misc</name>
114+
<block>blocks_throttle</block>
115+
<block>blocks_vector_source_x</block>
116+
<block>blocks_head</block>
117+
<block>blocks_skiphead</block>
118+
<block>blocks_delay</block>
119+
<block>blocks_null_source</block>
120+
<block>blocks_null_sink</block>
121+
<block>blocks_copy</block>
122+
<block>blocks_nop</block>
123+
</cat>
124+
<cat>
125+
<name>Modulators</name>
74126
<block>blocks_vco_f</block>
75127
</cat>
76128
<cat>
77-
<name>Boolean Operations (New) </name>
78-
<block>blocks_and_xx</block>
79-
<block>blocks_and_const_xx</block>
80-
<block>blocks_not_xx</block>
81-
<block>blocks_or_xx</block>
82-
<block>blocks_xor_xx</block>
129+
<name>Networking Tools</name>
130+
<block>blocks_tuntap_pdu</block>
131+
<block>blocks_socket_pdu</block>
132+
<block>blocks_udp_source</block>
133+
<block>blocks_udp_sink</block>
83134
</cat>
84135
<cat>
85-
<name>Stream Type Conversions (New) </name>
86-
<block>blocks_char_to_float</block>
87-
<block>blocks_char_to_short</block>
88-
<block>blocks_complex_to_interleaved_short</block>
89-
<block>blocks_complex_to_float</block>
90-
<block>blocks_complex_to_imag</block>
91-
<block>blocks_complex_to_real</block>
92-
<block>blocks_complex_to_mag</block>
93-
<block>blocks_complex_to_mag_squared</block>
94-
<block>blocks_complex_to_arg</block>
95-
<block>blocks_float_to_char</block>
96-
<block>blocks_float_to_complex</block>
97-
<block>blocks_float_to_int</block>
98-
<block>blocks_float_to_short</block>
99-
<block>blocks_float_to_uchar</block>
100-
<block>blocks_int_to_float</block>
101-
<block>blocks_interleaved_short_to_complex</block>
102-
<block>blocks_short_to_char</block>
103-
<block>blocks_repack_bits_bb</block>
104-
<block>blocks_short_to_float</block>
105-
<block>blocks_uchar_to_float</block>
136+
<name>Peak Detectors</name>
137+
<block>blocks_burst_tagger</block>
138+
<block>blocks_peak_detector_xb</block>
139+
<block>blocks_peak_detector2_fb</block>
140+
<block>blocks_plateau_detector_fb</block>
106141
</cat>
107142
<cat>
108-
<name>Stream Operations (New) </name>
109-
<block>blocks_delay</block>
143+
<name>Stream Operators</name>
110144
<block>blocks_deinterleave</block>
111145
<block>blocks_interleave</block>
112146
<block>blocks_keep_m_in_n</block>
113147
<block>blocks_keep_one_in_n</block>
114-
<block>blocks_repeat</block>
115148
<block>blocks_stream_mux</block>
116149
<block>blocks_stream_to_streams</block>
117150
<block>blocks_stream_to_vector</block>
118151
<block>blocks_streams_to_stream</block>
119152
<block>blocks_streams_to_vector</block>
120153
<block>blocks_vector_to_stream</block>
121154
<block>blocks_vector_to_streams</block>
122-
<block>blocks_peak_detector_xb</block>
123-
<block>blocks_peak_detector2_fb</block>
124-
<block>blocks_plateau_detector_fb</block>
125-
<block>blocks_regenerate_bb</block>
126-
<block>blocks_stretch_ff</block>
127-
<block>blocks_threshold_ff</block>
128-
<block>blocks_burst_tagger</block>
155+
<block>blocks_patterned_interleaver</block>
129156
<block>blocks_endian_swap</block>
130157
<block>blocks_vector_insert_x</block>
158+
<block>blocks_tagged_stream_mux</block>
159+
<block>blocks_repeat</block>
160+
<block>blocks_regenerate_bb</block>
161+
<block>blocks_stretch_ff</block>
131162
</cat>
132163
<cat>
133-
<name>Misc Conversions (New) </name>
134-
<block>blocks_packed_to_unpacked_xx</block>
135-
<block>blocks_unpacked_to_packed_xx</block>
136-
<block>blocks_pack_k_bits_bb</block>
137-
<block>blocks_unpack_k_bits_bb</block>
138-
</cat>
139-
<cat>
140-
<name>Misc (New) </name>
141-
<block>blocks_throttle</block>
142-
<block>blocks_probe_rate</block>
143-
<block>blocks_head</block>
144-
<block>blocks_skiphead</block>
145-
<block>blocks_copy</block>
146-
<block>blocks_nop</block>
147-
</cat>
148-
<cat>
149-
<name>Networking</name>
150-
<block>blocks_tuntap_pdu</block>
151-
<block>blocks_socket_pdu</block>
164+
<name>Stream Tag Tools</name>
165+
<block>blocks_tag_debug</block>
166+
<block>blocks_tagged_file_sink</block>
167+
<block>blocks_tagged_stream_mux</block>
152168
</cat>
153169
<cat>
154-
<name>Level Controls (New)</name>
155-
<block>blocks_mute_xx</block>
156-
<block>blocks_sample_and_hold_xx</block>
157-
<block>blocks_moving_average_xx</block>
170+
<name>Type Converters</name>
171+
<block>blocks_char_to_float</block>
172+
<block>blocks_char_to_short</block>
173+
<block>blocks_complex_to_interleaved_short</block>
174+
<block>blocks_complex_to_float</block>
175+
<block>blocks_complex_to_imag</block>
176+
<block>blocks_complex_to_real</block>
177+
<block>blocks_complex_to_mag</block>
178+
<block>blocks_complex_to_mag_squared</block>
179+
<block>blocks_complex_to_arg</block>
180+
<block>blocks_float_to_char</block>
181+
<block>blocks_float_to_complex</block>
182+
<block>blocks_float_to_int</block>
183+
<block>blocks_float_to_short</block>
184+
<block>blocks_float_to_uchar</block>
185+
<block>blocks_int_to_float</block>
186+
<block>blocks_interleaved_short_to_complex</block>
187+
<block>blocks_short_to_char</block>
188+
<block>blocks_short_to_float</block>
189+
<block>blocks_uchar_to_float</block>
158190
</cat>
159191
<cat>
160-
<name>Probes (New)</name>
161-
<block>blocks_probe_signal_x</block>
162-
<block>blocks_probe_signal_vx</block>
192+
<name>Waveform Generators</name>
193+
<block>blocks_vco_f</block>
163194
</cat>
164-
<cat>
165-
<name>Message Tools (New)</name>
166-
<block>blocks_message_strobe</block>
167-
<block>blocks_message_debug</block>
168-
</cat>
169195
</cat>

‎gr-blocks/grc/blocks_probe_signal_vx.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
###################################################
66
-->
77
<block>
8-
<name>Probe Signal</name>
8+
<name>Probe Signal Vector</name>
99
<key>blocks_probe_signal_vx</key>
1010
<import>from gnuradio import blocks</import>
1111
<make>blocks.probe_signal_v$(type.fcn)($vlen)</make>

‎gr-blocks/grc/blocks_tagged_stream_mux.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<block>
22
<name>Tagged Stream Mux</name>
33
<key>blocks_tagged_stream_mux</key>
4-
<category>Stream Operations</category>
54
<import>from gnuradio import blocks</import>
65
<make>blocks.tagged_stream_mux($type.size*$vlen, $lengthtagname)</make>
76
<param>

0 commit comments

Comments
 (0)