diff options
| author | Håkon Vågsether <haakonsv@gmail.com> | 2018-11-24 20:59:49 +0100 |
|---|---|---|
| committer | Håkon Vågsether <haakonsv@gmail.com> | 2018-12-18 23:23:22 +0100 |
| commit | 4c4cfa3af3a48121b6107ad44b33e1ab88f619eb (patch) | |
| tree | 143dad70a9d297033d0d2477b8b11f38fcfdb294 /gr-blocks/grc | |
| parent | 817e84ff6f2ccfeac8ee3167408e42329b3bdc7b (diff) | |
Updated C++ header file names for gr-blocks' blocks
Diffstat (limited to 'gr-blocks/grc')
28 files changed, 30 insertions, 30 deletions
diff --git a/gr-blocks/grc/blocks_abs_xx.block.yml b/gr-blocks/grc/blocks_abs_xx.block.yml index 6b27ecb235..f78086352c 100644 --- a/gr-blocks/grc/blocks_abs_xx.block.yml +++ b/gr-blocks/grc/blocks_abs_xx.block.yml @@ -31,7 +31,7 @@ templates: make: blocks.abs_${type.fcn}(${vlen}) cpp_templates: - includes: ['#include <gnuradio/blocks/abs_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/abs_blk.h>'] declarations: 'blocks::abs_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::abs_${type.fcn}::make(${vlen});' diff --git a/gr-blocks/grc/blocks_add_const_vxx.block.yml b/gr-blocks/grc/blocks_add_const_vxx.block.yml index 6724a818de..b42ea616d0 100644 --- a/gr-blocks/grc/blocks_add_const_vxx.block.yml +++ b/gr-blocks/grc/blocks_add_const_vxx.block.yml @@ -43,7 +43,7 @@ templates: - set_k(${const}) cpp_templates: - includes: ['#include <gnuradio/blocks/add_const_${"v" if context.get("vlen")() > 1 else ""}${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/add_const_${"v" if context.get("vlen")() > 1 else ""}.h>'] declarations: 'blocks::add_const_${"v" if context.get("vlen")() > 1 else ""}${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::add_const_${"v" if context.get("vlen")() > 1 else ""}${type.fcn}::make(${const});' callbacks: diff --git a/gr-blocks/grc/blocks_add_xx.block.yml b/gr-blocks/grc/blocks_add_xx.block.yml index 115e6aa48a..b9f5f76dc4 100644 --- a/gr-blocks/grc/blocks_add_xx.block.yml +++ b/gr-blocks/grc/blocks_add_xx.block.yml @@ -41,7 +41,7 @@ templates: make: blocks.add_v${type.fcn}(${vlen}) cpp_templates: - includes: ['#include <gnuradio/blocks/add_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/add_blk.h>'] declarations: 'blocks::add_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::add_${type.fcn}::make(${vlen});' diff --git a/gr-blocks/grc/blocks_and_const_xx.block.yml b/gr-blocks/grc/blocks_and_const_xx.block.yml index ebccde8f4c..c6faf7c283 100644 --- a/gr-blocks/grc/blocks_and_const_xx.block.yml +++ b/gr-blocks/grc/blocks_and_const_xx.block.yml @@ -30,7 +30,7 @@ templates: - set_k(${const}) cpp_templates: - includes: ['#include <gnuradio/blocks/and_const_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/and_const.h>'] declarations: 'blocks::and_const_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::and_const_${type.fcn}::make(${const});' callbacks: diff --git a/gr-blocks/grc/blocks_and_xx.block.yml b/gr-blocks/grc/blocks_and_xx.block.yml index 7a9a38461b..b8771648c8 100644 --- a/gr-blocks/grc/blocks_and_xx.block.yml +++ b/gr-blocks/grc/blocks_and_xx.block.yml @@ -33,7 +33,7 @@ templates: make: blocks.and_${type.fcn}() cpp_templates: - includes: ['#include <gnuradio/blocks/and_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/and_blk.h>'] declarations: 'blocks::and_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::and_${type.fcn}::make();' diff --git a/gr-blocks/grc/blocks_argmax_xx.block.yml b/gr-blocks/grc/blocks_argmax_xx.block.yml index 903d84008d..86acef1df3 100644 --- a/gr-blocks/grc/blocks_argmax_xx.block.yml +++ b/gr-blocks/grc/blocks_argmax_xx.block.yml @@ -44,7 +44,7 @@ templates: make: blocks.argmax_${type.fcn}(${vlen}) cpp_templates: - includes: ['#include <gnuradio/blocks/argmax_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/argmax.h>'] declarations: 'blocks::argmax_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::argmax_${type.fcn}::make(${vlen});' diff --git a/gr-blocks/grc/blocks_divide_XX.block.yml b/gr-blocks/grc/blocks_divide_XX.block.yml index ef82e7f3d4..aff3c838f1 100644 --- a/gr-blocks/grc/blocks_divide_XX.block.yml +++ b/gr-blocks/grc/blocks_divide_XX.block.yml @@ -41,7 +41,7 @@ templates: make: blocks.divide_${type.fcn}(${vlen}) cpp_templates: - includes: ['#include <gnuradio/blocks/divide_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/divide.h>'] declarations: 'blocks::divide_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::divide_${type.fcn}::make(${vlen});' diff --git a/gr-blocks/grc/blocks_integrate_xx.block.yml b/gr-blocks/grc/blocks_integrate_xx.block.yml index 6524d3a4df..c342f53b88 100644 --- a/gr-blocks/grc/blocks_integrate_xx.block.yml +++ b/gr-blocks/grc/blocks_integrate_xx.block.yml @@ -34,7 +34,7 @@ templates: make: blocks.integrate_${type.fcn}(${decim}, ${vlen}) cpp_templates: - includes: ['#include <gnuradio/blocks/integrate_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/integrate.h>'] declarations: 'blocks::integrate_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::integrate_${type.fcn}::make(${decim}, ${vlen});' diff --git a/gr-blocks/grc/blocks_max_xx.block.yml b/gr-blocks/grc/blocks_max_xx.block.yml index bc927790bf..f1b88eb9d1 100644 --- a/gr-blocks/grc/blocks_max_xx.block.yml +++ b/gr-blocks/grc/blocks_max_xx.block.yml @@ -46,7 +46,7 @@ templates: make: blocks.max_${type.fcn}(${vlen}, ${vlen_out}) cpp_templates: - includes: ['#include <gnuradio/blocks/max_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/max_blk.h>'] declarations: 'blocks::max_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::make_${type.fcn}::make(${vlen}, ${vlen_out});' diff --git a/gr-blocks/grc/blocks_min_xx.block.yml b/gr-blocks/grc/blocks_min_xx.block.yml index 672eb80fbb..9152a8500e 100644 --- a/gr-blocks/grc/blocks_min_xx.block.yml +++ b/gr-blocks/grc/blocks_min_xx.block.yml @@ -46,7 +46,7 @@ templates: make: blocks.min_${type.fcn}(${vlen},${vlen_out}) cpp_templates: - includes: ['#include <gnuradio/blocks/min_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/min_blk.h>'] declarations: 'blocks::min_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::min_${type.fcn}::make(${vlen},${vlen_out});' diff --git a/gr-blocks/grc/blocks_moving_average_xx.block.yml b/gr-blocks/grc/blocks_moving_average_xx.block.yml index 059ae16cf1..6618a8f790 100644 --- a/gr-blocks/grc/blocks_moving_average_xx.block.yml +++ b/gr-blocks/grc/blocks_moving_average_xx.block.yml @@ -48,7 +48,7 @@ templates: - set_length_and_scale(${length}, ${scale}) cpp_templates: - includes: ['#include <gnuradio/blocks/moving_average_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/moving_average.h>'] declarations: 'blocks::moving_average_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::moving_average_${type.fcn}::make(${length}, ${scale}, ${max_iter}, ${vlen});' callbacks: diff --git a/gr-blocks/grc/blocks_multiply_const_xx.block.yml b/gr-blocks/grc/blocks_multiply_const_xx.block.yml index 293850c807..07d3aed32b 100644 --- a/gr-blocks/grc/blocks_multiply_const_xx.block.yml +++ b/gr-blocks/grc/blocks_multiply_const_xx.block.yml @@ -41,7 +41,7 @@ templates: - set_k(${const}) cpp_templates: - includes: ['#include <gnuradio/multiply_const_${type.fcn}.h>'] + includes: ['#include <gnuradio/multiply_const.h>'] declarations: 'blocks::multiply_const_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::multiply_const_${type.fcn}::make(${const}, ${vlen});' callbacks: diff --git a/gr-blocks/grc/blocks_multiply_matrix_xx.block.yml b/gr-blocks/grc/blocks_multiply_matrix_xx.block.yml index b680816aa4..df67194777 100644 --- a/gr-blocks/grc/blocks_multiply_matrix_xx.block.yml +++ b/gr-blocks/grc/blocks_multiply_matrix_xx.block.yml @@ -46,7 +46,7 @@ templates: - set_A(${A}) cpp_templates: - includes: ['#include <gnuradio/blocks/multiply_matrix_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/multiply_matrix.h>'] declarations: 'blocks::multiply_matrix_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::multiply_matrix_${type.fcn}::make(${A}, ${tag_propagation_policy});' callbacks: diff --git a/gr-blocks/grc/blocks_multiply_xx.block.yml b/gr-blocks/grc/blocks_multiply_xx.block.yml index cb82e84e84..00cebbb895 100644 --- a/gr-blocks/grc/blocks_multiply_xx.block.yml +++ b/gr-blocks/grc/blocks_multiply_xx.block.yml @@ -41,8 +41,8 @@ templates: make: blocks.multiply_v${type.fcn}(${vlen}) cpp_templates: - includes: ['#include <gnuradio/blocks/multiply_v.h>'] - declarations: 'blocks::multiply_v::sptr ${id};' - make: 'this->${id} = blocks::multiply_v${type.fcn}::make(${vlen});' + includes: ['#include <gnuradio/blocks/multiply.h>'] + declarations: 'blocks::multiply_${type.fcn}::sptr ${id};' + make: 'this->${id} = blocks::multiply_${type.fcn}::make(${vlen});' file_format: 1 diff --git a/gr-blocks/grc/blocks_mute_xx.block.yml b/gr-blocks/grc/blocks_mute_xx.block.yml index 45d5827edf..9ce550c192 100644 --- a/gr-blocks/grc/blocks_mute_xx.block.yml +++ b/gr-blocks/grc/blocks_mute_xx.block.yml @@ -34,7 +34,7 @@ templates: - set_mute(bool(${mute})) cpp_templates: - includes: ['#include <gnuradio/blocks/mute_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/mute.h>'] declarations: 'blocks::mute_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::mute_${type.fcn}::(bool(${mute}));' callbacks: diff --git a/gr-blocks/grc/blocks_not_xx.block.yml b/gr-blocks/grc/blocks_not_xx.block.yml index 7d7c33009f..c6e21d9a0a 100644 --- a/gr-blocks/grc/blocks_not_xx.block.yml +++ b/gr-blocks/grc/blocks_not_xx.block.yml @@ -24,7 +24,7 @@ templates: make: blocks.not_${type.fcn}() cpp_templates: - includes: ['#include <gnuradio/blocks/not_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/not_blk.h>'] declarations: 'blocks::not_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::not_${type.fcn}::make();' diff --git a/gr-blocks/grc/blocks_or_xx.block.yml b/gr-blocks/grc/blocks_or_xx.block.yml index a15c41d6e0..b1348703f1 100644 --- a/gr-blocks/grc/blocks_or_xx.block.yml +++ b/gr-blocks/grc/blocks_or_xx.block.yml @@ -33,7 +33,7 @@ templates: make: blocks.or_${type.fcn}() cpp_templates: - includes: ['#include <gnuradio/blocks/or_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/or_blk.h>'] declarations: 'blocks::or_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::or_${type.fcn}::make();' diff --git a/gr-blocks/grc/blocks_packed_to_unpacked_xx.block.yml b/gr-blocks/grc/blocks_packed_to_unpacked_xx.block.yml index 4f65a3f53e..296cfd6b63 100644 --- a/gr-blocks/grc/blocks_packed_to_unpacked_xx.block.yml +++ b/gr-blocks/grc/blocks_packed_to_unpacked_xx.block.yml @@ -44,7 +44,7 @@ templates: cpp_templates: - includes: ['#include <gnuradio/blocks/packed_to_unpacked_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/packed_to_unpacked.h>'] declarations: 'blocks::packed_to_unpacked_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::packed_to_unpacked_${type.fcn}::make(${bits_per_chunk}, ${endianness});' translations: diff --git a/gr-blocks/grc/blocks_peak_detector_xb.block.yml b/gr-blocks/grc/blocks_peak_detector_xb.block.yml index 4ceaf260ce..a921c626f4 100644 --- a/gr-blocks/grc/blocks_peak_detector_xb.block.yml +++ b/gr-blocks/grc/blocks_peak_detector_xb.block.yml @@ -46,7 +46,7 @@ templates: - set_alpha(${alpha}) cpp_templates: - includes: ['#include <gnuradio/blocks/peak_detector_${type.fcn}b.h>'] + includes: ['#include <gnuradio/blocks/peak_detector.h>'] declarations: 'blocks::peak_detector_${type.fcn}b::sptr ${id};' make: 'this->${id} = blocks::peak_detector_${type.fcn}b::make(${threshold_factor_rise}, ${threshold_factor_fall}, ${look_ahead}, ${alpha});' diff --git a/gr-blocks/grc/blocks_probe_signal_vx.block.yml b/gr-blocks/grc/blocks_probe_signal_vx.block.yml index ac5ce54a84..98ca992f96 100644 --- a/gr-blocks/grc/blocks_probe_signal_vx.block.yml +++ b/gr-blocks/grc/blocks_probe_signal_vx.block.yml @@ -29,7 +29,7 @@ templates: make: blocks.probe_signal_v${type.fcn}(${vlen}) cpp_templates: - includes: ['#include <gnuradio/blocks/probe_signal_v${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/probe_signal_v.h>'] declarations: 'blocks::probe_signal_v${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::probe_signal_v${type.fcn}::make(${vlen});' diff --git a/gr-blocks/grc/blocks_probe_signal_x.block.yml b/gr-blocks/grc/blocks_probe_signal_x.block.yml index e26ce2d40e..082d2e1e01 100644 --- a/gr-blocks/grc/blocks_probe_signal_x.block.yml +++ b/gr-blocks/grc/blocks_probe_signal_x.block.yml @@ -20,7 +20,7 @@ templates: make: blocks.probe_signal_${type.fcn}() cpp_templates: - includes: ['#include <gnuradio/blocks/probe_signal_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/probe_signal.h>'] declarations: 'blocks::probe_signal_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::probe_signal_${type.fcn}::make();' diff --git a/gr-blocks/grc/blocks_sample_and_hold_xx.block.yml b/gr-blocks/grc/blocks_sample_and_hold_xx.block.yml index 1d3d12c016..39765f5b8d 100644 --- a/gr-blocks/grc/blocks_sample_and_hold_xx.block.yml +++ b/gr-blocks/grc/blocks_sample_and_hold_xx.block.yml @@ -27,7 +27,7 @@ templates: make: blocks.sample_and_hold_${type.fcn}() cpp_templates: - includes: ['#include <gnuradio/blocks/sample_and_hold_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/sample_and_hold.h>'] declarations: 'blocks::sample_and_hold_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::sample_and_hold_${type.fcn}::make();' diff --git a/gr-blocks/grc/blocks_sub_xx.block.yml b/gr-blocks/grc/blocks_sub_xx.block.yml index ec5000a31e..191f8f9746 100644 --- a/gr-blocks/grc/blocks_sub_xx.block.yml +++ b/gr-blocks/grc/blocks_sub_xx.block.yml @@ -41,7 +41,7 @@ templates: make: blocks.sub_${type.fcn}(${vlen}) cpp_templates: - includes: ['#include <gnuradio/blocks/sub_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/sub.h>'] declarations: 'blocks::sub_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::sub_${type.fcn}::make(${vlen});' diff --git a/gr-blocks/grc/blocks_unpacked_to_packed_xx.block.yml b/gr-blocks/grc/blocks_unpacked_to_packed_xx.block.yml index 11e4433527..41c1860a76 100644 --- a/gr-blocks/grc/blocks_unpacked_to_packed_xx.block.yml +++ b/gr-blocks/grc/blocks_unpacked_to_packed_xx.block.yml @@ -43,7 +43,7 @@ templates: make: blocks.unpacked_to_packed_${type.fcn}(${bits_per_chunk}, ${endianness}) cpp_templates: - includes: ['#include <gnuradio/blocks/unpacked_to_packed_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/unpacked_to_packed.h>'] declarations: 'blocks::unpacked_to_packed_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::unpacked_to_packed_${type.fcn}::make(${bits_per_chunk}, ${endianness});' diff --git a/gr-blocks/grc/blocks_vector_insert_x.block.yml b/gr-blocks/grc/blocks_vector_insert_x.block.yml index 61c17b703c..d849d04cf1 100644 --- a/gr-blocks/grc/blocks_vector_insert_x.block.yml +++ b/gr-blocks/grc/blocks_vector_insert_x.block.yml @@ -37,7 +37,7 @@ templates: make: blocks.vector_insert_${type.fcn}(${vector}, ${period}, ${offset}) cpp_templates: - includes: ['#include <gnuradio/blocks/vector_insert_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/vector_insert.h>'] declarations: 'blocks::vector_insert_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::vector_insert_${type.fcn}::make(${vector}, ${period}, ${offset});' diff --git a/gr-blocks/grc/blocks_vector_sink_x.block.yml b/gr-blocks/grc/blocks_vector_sink_x.block.yml index 1c2f5a13e5..e5b65cb22e 100644 --- a/gr-blocks/grc/blocks_vector_sink_x.block.yml +++ b/gr-blocks/grc/blocks_vector_sink_x.block.yml @@ -34,7 +34,7 @@ templates: make: blocks.vector_sink_${type.fcn}(${vlen}, ${reserve_items}) cpp_templates: - includes: ['#include <gnuradio/blocks/vector_sink_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/vector_sink.h>'] declarations: 'blocks::vector_sink_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::vector_sink_${type.fcn}::make(${vlen}, ${reserve_items});' diff --git a/gr-blocks/grc/blocks_vector_source_x.block.yml b/gr-blocks/grc/blocks_vector_source_x.block.yml index ccf7b65783..7f452d5d1a 100644 --- a/gr-blocks/grc/blocks_vector_source_x.block.yml +++ b/gr-blocks/grc/blocks_vector_source_x.block.yml @@ -46,7 +46,7 @@ templates: - set_data(${vector}, ${tags}) cpp_templates: - includes: ['#include <gnuradio/blocks/vector_source_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/vector_source.h>'] declarations: 'blocks::vector_source_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::vector_source_${type.fcn}::make(${vector}, ${repeat}, ${vlen}, ${tags});' callbacks: diff --git a/gr-blocks/grc/blocks_xor_xx.block.yml b/gr-blocks/grc/blocks_xor_xx.block.yml index c94c4796be..d2ff0164f0 100644 --- a/gr-blocks/grc/blocks_xor_xx.block.yml +++ b/gr-blocks/grc/blocks_xor_xx.block.yml @@ -33,7 +33,7 @@ templates: make: blocks.xor_${type.fcn}() cpp_templates: - includes: ['#include <gnuradio/blocks/xor_${type.fcn}.h>'] + includes: ['#include <gnuradio/blocks/xor_blk.h>'] declarations: 'blocks::xor_${type.fcn}::sptr ${id};' make: 'this->${id} = blocks::xor_${type.fcn}::make();' |