diff options
author | 2021-06-04 18:00:11 +0200 | |
---|---|---|
committer | 2021-06-21 07:48:34 -0400 | |
commit | 4f2da473c30fb5149d23f1d67728c1f08c5ca17d (patch) | |
tree | 4cec4e5300674401d77a690bf3c9bd05baa347f1 /gr-filter/grc | |
parent | grc: generating a simple cpp qt-gui flowgraph fails (diff) | |
download | gnuradio-4f2da473c30fb5149d23f1d67728c1f08c5ca17d.tar.xz gnuradio-4f2da473c30fb5149d23f1d67728c1f08c5ca17d.zip |
rebase
grc: cpp generation
set correct link entry in yml files for modern cmake.
Applying this fix simple flowgraphs containing signal sources and audi sinks etc. build and run
Signed-off-by: Volker Schroer <3470424+dl1ksv@users.noreply.github.com>
Diffstat (limited to 'gr-filter/grc')
26 files changed, 26 insertions, 26 deletions
diff --git a/gr-filter/grc/filter_band_pass_filter.block.yml b/gr-filter/grc/filter_band_pass_filter.block.yml index 391d1df3d..39bfce398 100644 --- a/gr-filter/grc/filter_band_pass_filter.block.yml +++ b/gr-filter/grc/filter_band_pass_filter.block.yml @@ -105,7 +105,7 @@ cpp_templates: ${width}, ${win}, ${beta})); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(firdes::${type.fcn}(${gain}, ${samp_rate}, ${low_cutoff_freq}, ${high_cutoff_freq}, ${width}, ${win}, ${beta})) diff --git a/gr-filter/grc/filter_band_reject_filter.block.yml b/gr-filter/grc/filter_band_reject_filter.block.yml index fc94d957c..22b5d285a 100644 --- a/gr-filter/grc/filter_band_reject_filter.block.yml +++ b/gr-filter/grc/filter_band_reject_filter.block.yml @@ -102,7 +102,7 @@ cpp_templates: ${width}, ${win}, ${beta})); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(firdes::${type.fcn}(${gain}, ${samp_rate}, ${low_cutoff_freq}, ${high_cutoff_freq}, ${width}, ${win}, ${beta})) diff --git a/gr-filter/grc/filter_dc_blocker_xx.block.yml b/gr-filter/grc/filter_dc_blocker_xx.block.yml index 703cb75f5..cdaa8ba08 100644 --- a/gr-filter/grc/filter_dc_blocker_xx.block.yml +++ b/gr-filter/grc/filter_dc_blocker_xx.block.yml @@ -37,7 +37,7 @@ cpp_templates: includes: ['#include <gnuradio/filter/dc_blocker_${type}.h>'] declarations: 'filter::dc_blocker_${type}::sptr ${id};' make: 'this->${id} = filter::dc_blocker_${type}::make(${length}, ${long_form});' - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] translations: 'True': 'true' 'False': 'false' diff --git a/gr-filter/grc/filter_fft_filter_xxx.block.yml b/gr-filter/grc/filter_fft_filter_xxx.block.yml index d9c0a4f4d..a8dd0be35 100644 --- a/gr-filter/grc/filter_fft_filter_xxx.block.yml +++ b/gr-filter/grc/filter_fft_filter_xxx.block.yml @@ -64,7 +64,7 @@ cpp_templates: taps, ${nthreads}); this->${id}.declare_sample_delay(${samp_delay}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(taps) - set_nthreads(${nthreads}) diff --git a/gr-filter/grc/filter_filter_delay_fc.block.yml b/gr-filter/grc/filter_filter_delay_fc.block.yml index 4cbdddfc3..18c1d3da6 100644 --- a/gr-filter/grc/filter_filter_delay_fc.block.yml +++ b/gr-filter/grc/filter_filter_delay_fc.block.yml @@ -31,6 +31,6 @@ cpp_templates: std::vector<float> taps = {${str(taps)[1:-1]}}; this->${id} = filter::fft_filter_${type}::make( taps); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] file_format: 1 diff --git a/gr-filter/grc/filter_filterbank_vcvcf.block.yml b/gr-filter/grc/filter_filterbank_vcvcf.block.yml index 291299b80..641ba3550 100644 --- a/gr-filter/grc/filter_filterbank_vcvcf.block.yml +++ b/gr-filter/grc/filter_filterbank_vcvcf.block.yml @@ -30,7 +30,7 @@ cpp_templates: make: |- this->${id} = filter::filterbank_vcvcf::make( ${taps}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(${taps}) diff --git a/gr-filter/grc/filter_fir_filter_xxx.block.yml b/gr-filter/grc/filter_fir_filter_xxx.block.yml index f1b2465a1..00293d6b8 100644 --- a/gr-filter/grc/filter_fir_filter_xxx.block.yml +++ b/gr-filter/grc/filter_fir_filter_xxx.block.yml @@ -60,7 +60,7 @@ cpp_templates: ${decim}, taps); this->${id}.declare_sample_delay(${samp_delay}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(taps) diff --git a/gr-filter/grc/filter_high_pass_filter.block.yml b/gr-filter/grc/filter_high_pass_filter.block.yml index bb5dbd5e6..2cf4f8234 100644 --- a/gr-filter/grc/filter_high_pass_filter.block.yml +++ b/gr-filter/grc/filter_high_pass_filter.block.yml @@ -88,7 +88,7 @@ cpp_templates: ${width}, ${win}, ${beta})); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(firdes::high_pass(${gain}, ${samp_rate}, ${cutoff_freq}, ${width}, ${win}, ${beta})) diff --git a/gr-filter/grc/filter_hilbert_fc.block.yml b/gr-filter/grc/filter_hilbert_fc.block.yml index 8745ffe99..84d1a8628 100644 --- a/gr-filter/grc/filter_hilbert_fc.block.yml +++ b/gr-filter/grc/filter_hilbert_fc.block.yml @@ -41,6 +41,6 @@ cpp_templates: ${num_taps}, ${win}, ${beta}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] file_format: 1 diff --git a/gr-filter/grc/filter_iir_filter_xxx.block.yml b/gr-filter/grc/filter_iir_filter_xxx.block.yml index 62cf39cae..45c42fc59 100644 --- a/gr-filter/grc/filter_iir_filter_xxx.block.yml +++ b/gr-filter/grc/filter_iir_filter_xxx.block.yml @@ -57,7 +57,7 @@ cpp_templates: fftaps, fbtaps, ${oldstyle}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(fftaps, fbtaps) translations: diff --git a/gr-filter/grc/filter_interp_fir_filter_xxx.block.yml b/gr-filter/grc/filter_interp_fir_filter_xxx.block.yml index 06a97f1f9..780c2dc40 100644 --- a/gr-filter/grc/filter_interp_fir_filter_xxx.block.yml +++ b/gr-filter/grc/filter_interp_fir_filter_xxx.block.yml @@ -56,7 +56,7 @@ cpp_templates: std::vector<int> taps = {${str(taps)[1:-1]}}; % endif this->${id} = filter::interp_fir_filter_${type}::make(${interp}, taps); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(${taps}) diff --git a/gr-filter/grc/filter_low_pass_filter.block.yml b/gr-filter/grc/filter_low_pass_filter.block.yml index 429f3e48e..307e67d9f 100644 --- a/gr-filter/grc/filter_low_pass_filter.block.yml +++ b/gr-filter/grc/filter_low_pass_filter.block.yml @@ -88,7 +88,7 @@ cpp_templates: ${width}, ${win.replace('firdes.', 'gr::filter::firdes::')}, ${beta})); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(gr::filter::firdes::low_pass(${gain}, ${samp_rate}, ${cutoff_freq}, ${width}, ${win.replace('firdes.', 'gr::filter::firdes::')}, ${beta})) diff --git a/gr-filter/grc/filter_mmse_resampler_xx.block.yml b/gr-filter/grc/filter_mmse_resampler_xx.block.yml index 1fa31910b..ac0de36e5 100644 --- a/gr-filter/grc/filter_mmse_resampler_xx.block.yml +++ b/gr-filter/grc/filter_mmse_resampler_xx.block.yml @@ -45,7 +45,7 @@ cpp_templates: this->${id} = filter::mmse_resampler_${type.fcn}::make( ${phase_shift}, ${resamp_ratio}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_resamp_ratio(${resamp_ratio}) diff --git a/gr-filter/grc/filter_pfb_arb_resampler.block.yml b/gr-filter/grc/filter_pfb_arb_resampler.block.yml index add43df14..cd5a7196b 100644 --- a/gr-filter/grc/filter_pfb_arb_resampler.block.yml +++ b/gr-filter/grc/filter_pfb_arb_resampler.block.yml @@ -93,7 +93,7 @@ cpp_templates: taps, ${nfilts}); this->${id}->declare_sample_delay(${samp_delay}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(taps) - set_rate(${rrate}) diff --git a/gr-filter/grc/filter_pfb_channelizer.block.yml b/gr-filter/grc/filter_pfb_channelizer.block.yml index a4ae233dd..fb3aa0cd3 100644 --- a/gr-filter/grc/filter_pfb_channelizer.block.yml +++ b/gr-filter/grc/filter_pfb_channelizer.block.yml @@ -71,7 +71,7 @@ cpp_templates: ${atten}); this->${id}.set_channel_map(${ch_map}); this->${id}.declare_sample_delay(${samp_delay}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(taps) - set_channel_map(${ch_map}) diff --git a/gr-filter/grc/filter_pfb_decimator.block.yml b/gr-filter/grc/filter_pfb_decimator.block.yml index b4946629f..1eda6efd9 100644 --- a/gr-filter/grc/filter_pfb_decimator.block.yml +++ b/gr-filter/grc/filter_pfb_decimator.block.yml @@ -73,7 +73,7 @@ cpp_templates: ${fft_rot}, ${fft_filts}); this->${id}.declare_sample_delay(${samp_delay}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(taps) - set_channel(int(${channel})) diff --git a/gr-filter/grc/filter_pfb_interpolator.block.yml b/gr-filter/grc/filter_pfb_interpolator.block.yml index ae7f7ba08..25bb815cd 100644 --- a/gr-filter/grc/filter_pfb_interpolator.block.yml +++ b/gr-filter/grc/filter_pfb_interpolator.block.yml @@ -50,7 +50,7 @@ cpp_templates: taps, ${atten}); this->${id}.declare_sample_delay(${samp_delay}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(taps) diff --git a/gr-filter/grc/filter_pfb_synthesizer.block.yml b/gr-filter/grc/filter_pfb_synthesizer.block.yml index e6cbbc8bb..a60c76b51 100644 --- a/gr-filter/grc/filter_pfb_synthesizer.block.yml +++ b/gr-filter/grc/filter_pfb_synthesizer.block.yml @@ -70,7 +70,7 @@ cpp_templates: ${twox}); this->${id}->set_channel_map(ch_map); this->${id}->declare_sample_delay(${samp_delay}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(taps) - set_channel_map(ch_map) diff --git a/gr-filter/grc/filter_rational_resampler_xxx.block.yml b/gr-filter/grc/filter_rational_resampler_xxx.block.yml index fcc9914b3..11040ee1a 100644 --- a/gr-filter/grc/filter_rational_resampler_xxx.block.yml +++ b/gr-filter/grc/filter_rational_resampler_xxx.block.yml @@ -89,7 +89,7 @@ cpp_templates: ${decim}, taps, ${fbw}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(${taps}) diff --git a/gr-filter/grc/filter_root_raised_cosine_filter.block.yml b/gr-filter/grc/filter_root_raised_cosine_filter.block.yml index a7abab165..6c83872e5 100644 --- a/gr-filter/grc/filter_root_raised_cosine_filter.block.yml +++ b/gr-filter/grc/filter_root_raised_cosine_filter.block.yml @@ -81,7 +81,7 @@ cpp_templates: ${sym_rate}, ${alpha}, ${ntaps})); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(firdes::root_raised_cosine(${gain}, ${samp_rate}, ${sym_rate}, ${alpha}, ${ntaps})) diff --git a/gr-filter/grc/filter_single_pole_iir_filter_xx.block.yml b/gr-filter/grc/filter_single_pole_iir_filter_xx.block.yml index 4c33ffcb1..c096d5ac6 100644 --- a/gr-filter/grc/filter_single_pole_iir_filter_xx.block.yml +++ b/gr-filter/grc/filter_single_pole_iir_filter_xx.block.yml @@ -40,7 +40,7 @@ cpp_templates: includes: ['#include <gnuradio/filter/single_pole_iir_filter_${type.fcn}.h>'] declarations: 'filter::single_pole_iir_filter_${type.fcn}::sptr ${id};' make: 'this->${id} = filter::single_pole_iir_filter_${type.fcn}::make(${alpha}, ${vlen});' - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] callbacks: - set_taps(${alpha}) diff --git a/gr-filter/grc/variable_band_pass_filter_taps.block.yml b/gr-filter/grc/variable_band_pass_filter_taps.block.yml index 1e9d52c41..9d4084160 100644 --- a/gr-filter/grc/variable_band_pass_filter_taps.block.yml +++ b/gr-filter/grc/variable_band_pass_filter_taps.block.yml @@ -53,7 +53,7 @@ cpp_templates: var_make: |- this->${id} = ${id} = firdes.${type}(${gain}, ${samp_rate}, ${low_cutoff_freq}, \ ${high_cutoff_freq}, ${width}, ${win}, ${beta}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] documentation: |- This is a convenience wrapper for calling firdes.band_pass() or firdes.complex_band_pass() diff --git a/gr-filter/grc/variable_band_reject_filter_taps.block.yml b/gr-filter/grc/variable_band_reject_filter_taps.block.yml index fa5177d85..4bf03a4fe 100644 --- a/gr-filter/grc/variable_band_reject_filter_taps.block.yml +++ b/gr-filter/grc/variable_band_reject_filter_taps.block.yml @@ -53,7 +53,7 @@ cpp_templates: var_make: |- this->${id} = ${id} = firdes.${type}(${gain}, ${samp_rate}, ${low_cutoff_freq},\ ${high_cutoff_freq}, ${width}, ${win}, ${beta}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] documentation: |- This is a convenience wrapper for calling firdes.band_reject() or firdes.complex_band_reject(). diff --git a/gr-filter/grc/variable_high_pass_filter_taps.block.yml b/gr-filter/grc/variable_high_pass_filter_taps.block.yml index 8d9a07d53..ef7f87bba 100644 --- a/gr-filter/grc/variable_high_pass_filter_taps.block.yml +++ b/gr-filter/grc/variable_high_pass_filter_taps.block.yml @@ -44,7 +44,7 @@ cpp_templates: var_make: |- this->${id} = ${id} = firdes.high_pass(${gain}, ${samp_rate}, ${cutoff_freq},\ ${width}, ${win}, ${beta}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] documentation: |- This variable is a convenience wrapper around a call to firdes.high_pass(...). diff --git a/gr-filter/grc/variable_low_pass_filter_taps.block.yml b/gr-filter/grc/variable_low_pass_filter_taps.block.yml index 15c6e1b89..5568ae67c 100644 --- a/gr-filter/grc/variable_low_pass_filter_taps.block.yml +++ b/gr-filter/grc/variable_low_pass_filter_taps.block.yml @@ -44,7 +44,7 @@ cpp_templates: var_make: |- this->${id} = ${id} = firdes.low_pass(${gain}, ${samp_rate}, ${cutoff_freq},\ ${width}, ${win}, ${beta}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] documentation: |- This variable is a convenience wrapper around a call to firdes.low_pass(...). diff --git a/gr-filter/grc/variable_rrc_filter_taps.block.yml b/gr-filter/grc/variable_rrc_filter_taps.block.yml index ff595ec3c..29a30def9 100644 --- a/gr-filter/grc/variable_rrc_filter_taps.block.yml +++ b/gr-filter/grc/variable_rrc_filter_taps.block.yml @@ -38,7 +38,7 @@ cpp_templates: var_make: |- this->${id} = ${id} = firdes.root_raised_cosine(${gain}, ${samp_rate},\ ${sym_rate}, ${alpha}, ${ntaps}); - link: ['gnuradio-filter'] + link: ['gnuradio::gnuradio-filter'] documentation: |- This is a convenience wrapper for calling firdes.root_raised_cosine(...). |