Added C++ support to gr-analog, gr-blocks and grc

author: Håkon Vågsether <haakonsv@gmail.com> 2017-12-21 00:07:28 +0100
committer: Håkon Vågsether <haakonsv@gmail.com> 2018-12-18 23:17:34 +0100
commit: 612c65091a748eb85a8dea2d9414f0486777fb17 (patch)
tree: bb83a329c3f15ddfa3b2f19abc24f38c5638e356 /gr-blocks/grc
parent: bac53b29f7008b33667a7c2c481ace02d73f3264 (diff)
135 files changed, 978 insertions, 5 deletions
diff --git a/gr-blocks/grc/blocks_abs_xx.block.yml b/gr-blocks/grc/blocks_abs_xx.block.yml
index 12d9a8fc3a..5a3b18a3aa 100644
--- a/gr-blocks/grc/blocks_abs_xx.block.yml
+++ b/gr-blocks/grc/blocks_abs_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_abs_xx
 label: Abs
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -29,4 +30,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.abs_${type.fcn}(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/abs_${type.fcn}.h>']
+    declarations: 'blocks::abs_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::abs_${type.fcn}::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_add_const_vxx.block.yml b/gr-blocks/grc/blocks_add_const_vxx.block.yml
index a3ce37b9b5..768af08c83 100644
--- a/gr-blocks/grc/blocks_add_const_vxx.block.yml
+++ b/gr-blocks/grc/blocks_add_const_vxx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_add_const_vxx
 label: Add Const
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -41,4 +42,11 @@ templates:
     callbacks:
     - set_k(${const})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/add_const_${"v" if context.get("vlen")() > 1 else ""}${type.fcn}.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:
+    - set_k(${const})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_add_xx.block.yml b/gr-blocks/grc/blocks_add_xx.block.yml
index 38df37a65b..fe69b56b77 100644
--- a/gr-blocks/grc/blocks_add_xx.block.yml
+++ b/gr-blocks/grc/blocks_add_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_add_xx
 label: Add
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,4 +40,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.add_v${type.fcn}(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/add_${type.fcn}.h>']
+    declarations: 'blocks::add_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::add_${type.fcn}::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_and_const_xx.block.yml b/gr-blocks/grc/blocks_and_const_xx.block.yml
index 459527260c..dce03d1612 100644
--- a/gr-blocks/grc/blocks_and_const_xx.block.yml
+++ b/gr-blocks/grc/blocks_and_const_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_and_const_xx
 label: And Const
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -28,4 +29,11 @@ templates:
     callbacks:
     - set_k(${const})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/and_const_${type.fcn}.h>']
+    declarations: 'blocks::and_const_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::and_const_${type.fcn}::make(${const});'
+    callbacks:
+    - set_k(${const})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_and_xx.block.yml b/gr-blocks/grc/blocks_and_xx.block.yml
index a8bba020a5..291d48316a 100644
--- a/gr-blocks/grc/blocks_and_xx.block.yml
+++ b/gr-blocks/grc/blocks_and_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_and_xx
 label: And
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -31,4 +32,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.and_${type.fcn}()
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/and_${type.fcn}.h>']
+    declarations: 'blocks::and_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::and_${type.fcn}::make();'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_argmax_xx.block.yml b/gr-blocks/grc/blocks_argmax_xx.block.yml
index 723f3fed6a..2cb94bd373 100644
--- a/gr-blocks/grc/blocks_argmax_xx.block.yml
+++ b/gr-blocks/grc/blocks_argmax_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_argmax_xx
 label: Argmax
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -42,4 +43,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.argmax_${type.fcn}(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/argmax_${type.fcn}.h>']
+    declarations: 'blocks::argmax_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::argmax_${type.fcn}::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_burst_tagger.block.yml b/gr-blocks/grc/blocks_burst_tagger.block.yml
index 02d4f74835..cf991b6195 100644
--- a/gr-blocks/grc/blocks_burst_tagger.block.yml
+++ b/gr-blocks/grc/blocks_burst_tagger.block.yml
@@ -1,5 +1,6 @@
 id: blocks_burst_tagger
 label: Burst Tagger
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -51,4 +52,17 @@ templates:
     - set_true_tag(${true_key},${true_value})
     - set_false_tag(${false_key},${false_value})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/burst_tagger.h>']
+    declarations: 'blocks::burst_tagger::sptr ${id};'
+    make: "this->${id} = blocks::burst_tagger::make(${type.size});\nthis->${id}.set_true_tag(${true_key},${true_value});\n\
+        this->${id}.set_false_tag(${false_key},${false_value});\n\t"
+    callbacks:
+    - set_true_tag(${true_key},${true_value})
+    - set_false_tag(${false_key},${false_value})
+    translations:
+        gr.sizeof_: 'sizeof('
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_char_to_float.block.yml b/gr-blocks/grc/blocks_char_to_float.block.yml
index c0858b5c1d..e4f9d551c5 100644
--- a/gr-blocks/grc/blocks_char_to_float.block.yml
+++ b/gr-blocks/grc/blocks_char_to_float.block.yml
@@ -1,5 +1,6 @@
 id: blocks_char_to_float
 label: Char To Float
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -28,4 +29,11 @@ templates:
     callbacks:
     - set_scale(${scale})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/char_to_float.h>']
+    declarations: 'blocks::char_to_float::sptr ${id};'
+    make: 'this->${id} = blocks::char_to_float::make(${vlen}, ${scale});'
+    callbacks:
+    - set_scale(${scale})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_char_to_short.block.yml b/gr-blocks/grc/blocks_char_to_short.block.yml
index f378e87e72..c7574b18c0 100644
--- a/gr-blocks/grc/blocks_char_to_short.block.yml
+++ b/gr-blocks/grc/blocks_char_to_short.block.yml
@@ -1,5 +1,6 @@
 id: blocks_char_to_short
 label: Char To Short
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -22,4 +23,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.char_to_short(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/char_to_short.h>']
+    declarations: 'blocks::char_to_short::sptr ${id};'
+    make: 'this->${id} = blocks::char_to_short::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_complex_to_arg.block.yml b/gr-blocks/grc/blocks_complex_to_arg.block.yml
index 4f44e4ae2c..1d1b873534 100644
--- a/gr-blocks/grc/blocks_complex_to_arg.block.yml
+++ b/gr-blocks/grc/blocks_complex_to_arg.block.yml
@@ -1,5 +1,6 @@
 id: blocks_complex_to_arg
 label: Complex to Arg
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -25,4 +26,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.complex_to_arg(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/complex_to_arg.h>']
+    declarations: 'blocks::complex_to_arg::sptr ${id};'
+    make: 'this->${id} = blocks::complex_to_arg::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_complex_to_float.block.yml b/gr-blocks/grc/blocks_complex_to_float.block.yml
index f7b35936c3..073e879071 100644
--- a/gr-blocks/grc/blocks_complex_to_float.block.yml
+++ b/gr-blocks/grc/blocks_complex_to_float.block.yml
@@ -1,5 +1,6 @@
 id: blocks_complex_to_float
 label: Complex To Float
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -31,4 +32,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.complex_to_float(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/complex_to_float.h>']
+    declarations: 'blocks::complex_to_float::sptr ${id};'
+    make: 'this->${id} = blocks::complex_to_float::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_complex_to_imag.block.yml b/gr-blocks/grc/blocks_complex_to_imag.block.yml
index 29e14046aa..6e024e8d0d 100644
--- a/gr-blocks/grc/blocks_complex_to_imag.block.yml
+++ b/gr-blocks/grc/blocks_complex_to_imag.block.yml
@@ -1,5 +1,6 @@
 id: blocks_complex_to_imag
 label: Complex to Imag
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -25,4 +26,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.complex_to_imag(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/complex_to_imag.h>']
+    declarations: 'blocks::complex_to_imag::sptr ${id};'
+    make: 'this->${id} = blocks::complex_to_imag::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_complex_to_interleaved_char.block.yml b/gr-blocks/grc/blocks_complex_to_interleaved_char.block.yml
index 06a75fc8d9..fe257af919 100644
--- a/gr-blocks/grc/blocks_complex_to_interleaved_char.block.yml
+++ b/gr-blocks/grc/blocks_complex_to_interleaved_char.block.yml
@@ -1,5 +1,6 @@
 id: blocks_complex_to_interleaved_char
 label: Complex To IChar
+flags: python, cpp
 
 parameters:
 -   id: vector_output
@@ -25,4 +26,12 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.complex_to_interleaved_char(${vector_output})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/complex_to_interleaved_char.h>']
+    declarations: 'blocks::complex_to_interleaved_char::sptr ${id};'
+    make: 'this->${id} = blocks::complex_to_interleaved_char::make(${vector_output});'
+    translations:
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_complex_to_interleaved_short.block.yml b/gr-blocks/grc/blocks_complex_to_interleaved_short.block.yml
index 0b8aa53621..5ad7d3a91c 100644
--- a/gr-blocks/grc/blocks_complex_to_interleaved_short.block.yml
+++ b/gr-blocks/grc/blocks_complex_to_interleaved_short.block.yml
@@ -1,5 +1,6 @@
 id: blocks_complex_to_interleaved_short
 label: Complex To IShort
+flags: python, cpp
 
 parameters:
 -   id: vector_output
@@ -25,4 +26,12 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.complex_to_interleaved_short(${vector_output})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/complex_to_interleaved_short.h>']
+    declarations: 'blocks::complex_to_interleaved_short::sptr ${id};'
+    make: 'this->${id} = blocks::complex_to_interleaved_short::make(${vector_output});'
+    translations:
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_complex_to_mag.block.yml b/gr-blocks/grc/blocks_complex_to_mag.block.yml
index d9582d1722..aaefeb39df 100644
--- a/gr-blocks/grc/blocks_complex_to_mag.block.yml
+++ b/gr-blocks/grc/blocks_complex_to_mag.block.yml
@@ -1,5 +1,6 @@
 id: blocks_complex_to_mag
 label: Complex to Mag
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -25,4 +26,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.complex_to_mag(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/complex_to_mag.h>']
+    declarations: 'blocks::complex_to_mag::sptr ${id};'
+    make: 'this->${id} = blocks::complex_to_mag::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_complex_to_mag_squared.block.yml b/gr-blocks/grc/blocks_complex_to_mag_squared.block.yml
index 815636d654..9dff52c2e4 100644
--- a/gr-blocks/grc/blocks_complex_to_mag_squared.block.yml
+++ b/gr-blocks/grc/blocks_complex_to_mag_squared.block.yml
@@ -1,5 +1,6 @@
 id: blocks_complex_to_mag_squared
 label: Complex to Mag^2
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -25,4 +26,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.complex_to_mag_squared(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/complex_to_mag_squared.h>']
+    declarations: 'blocks::complex_to_mag_squared::sptr ${id};'
+    make: 'this->${id} = blocks::complex_to_mag_squared::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_complex_to_magphase.block.yml b/gr-blocks/grc/blocks_complex_to_magphase.block.yml
index 80420ac2a0..a572038a5f 100644
--- a/gr-blocks/grc/blocks_complex_to_magphase.block.yml
+++ b/gr-blocks/grc/blocks_complex_to_magphase.block.yml
@@ -1,5 +1,6 @@
 id: blocks_complex_to_magphase
 label: Complex To Mag Phase
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -31,4 +32,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.complex_to_magphase(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/complex_to_magphase.h>']
+    declarations: 'blocks::complex_to_magphase::sptr ${id};'
+    make: 'this->${id} = blocks::complex_to_magphase::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_complex_to_real.block.yml b/gr-blocks/grc/blocks_complex_to_real.block.yml
index 41fbbb33cc..dfbd94a4b4 100644
--- a/gr-blocks/grc/blocks_complex_to_real.block.yml
+++ b/gr-blocks/grc/blocks_complex_to_real.block.yml
@@ -1,5 +1,6 @@
 id: blocks_complex_to_real
 label: Complex To Real
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -26,4 +27,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.complex_to_real(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/complex_to_real.h>']
+    declarations: 'blocks::complex_to_real::sptr ${id};'
+    make: 'this->${id} = blocks::complex_to_real::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_conjugate_cc.block.yml b/gr-blocks/grc/blocks_conjugate_cc.block.yml
index a0d8b1a64c..69aaee99de 100644
--- a/gr-blocks/grc/blocks_conjugate_cc.block.yml
+++ b/gr-blocks/grc/blocks_conjugate_cc.block.yml
@@ -1,5 +1,6 @@
 id: blocks_conjugate_cc
 label: Complex Conjugate
+flags: python, cpp
 
 inputs:
 -   domain: stream
@@ -13,4 +14,8 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.conjugate_cc()
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/conjugate_cc.h>']
+    declarations: 'blocks::conjugate_cc::sptr ${id};'
+    make: 'this->${id} = blocks::conjugate_cc::make();'
 file_format: 1
diff --git a/gr-blocks/grc/blocks_copy.block.yml b/gr-blocks/grc/blocks_copy.block.yml
index 9e2d6713a9..6e94d085aa 100644
--- a/gr-blocks/grc/blocks_copy.block.yml
+++ b/gr-blocks/grc/blocks_copy.block.yml
@@ -1,5 +1,6 @@
 id: blocks_copy
 label: Copy
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -54,4 +55,17 @@ templates:
     callbacks:
     - set_enabled(${enabled})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/copy.h>']
+    declarations: 'blocks::copy::sptr ${id};'
+    make: |-
+        this->${id} = blocks::copy::make(${type.size}*${vlen});
+        self->${id}.set_enabled(${enabled});
+    callbacks:
+    - set_enabled(${enabled})
+    translations:
+        gr.sizeof_: 'sizeof('
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_ctrlport_performance.block.yml b/gr-blocks/grc/blocks_ctrlport_performance.block.yml
index 80f541a41b..80e112e63b 100644
--- a/gr-blocks/grc/blocks_ctrlport_performance.block.yml
+++ b/gr-blocks/grc/blocks_ctrlport_performance.block.yml
@@ -1,5 +1,6 @@
 id: blocks_ctrlport_monitor_performance
 label: CtrlPort Performance Monitor
+flags: python
 
 parameters:
 -   id: en
diff --git a/gr-blocks/grc/blocks_ctrlport_probe2_c.block.yml b/gr-blocks/grc/blocks_ctrlport_probe2_c.block.yml
index 2b757718a6..4a74ae9e73 100644
--- a/gr-blocks/grc/blocks_ctrlport_probe2_c.block.yml
+++ b/gr-blocks/grc/blocks_ctrlport_probe2_c.block.yml
@@ -1,5 +1,6 @@
 id: blocks_ctrlport_probe2_c
 label: Ctrlport Probe
+flags: python, cpp
 
 parameters:
 -   id: name
@@ -32,6 +33,16 @@ templates:
     callbacks:
     - set_length(${len})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/ctrlport_probe2_c.h>']
+    declarations: 'blocks::ctrlport_probe2_c::sptr ${id};'
+    make: 'this->${id} = blocks::ctrlport_probe2_c::make(${name}, ${desc}, ${len}, ${disp_mask});'
+    callbacks:
+    - set_length(${len})
+    translations:
+        gr.: ''
+
+
 documentation: |-
     Place this in a graph to export vectors of samples to a GRCP port probe.
 
diff --git a/gr-blocks/grc/blocks_ctrlport_probe2_x.block.yml b/gr-blocks/grc/blocks_ctrlport_probe2_x.block.yml
index f2b8e0a781..ab5859da26 100644
--- a/gr-blocks/grc/blocks_ctrlport_probe2_x.block.yml
+++ b/gr-blocks/grc/blocks_ctrlport_probe2_x.block.yml
@@ -1,5 +1,6 @@
 id: blocks_ctrlport_probe2_x
 label: Ctrlport Probe
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,6 +40,16 @@ templates:
     callbacks:
     - set_length(${len})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/ctrlport_probe2_${type.fcn}.h>']
+    declarations: 'blocks::ctrlport_probe2_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::ctrlport_probe2_${type.fcn}::make(${name}, ${desc}, ${len}, ${disp_mask});'
+    callbacks:
+    - set_length(${len})
+    translations:
+        gr.: ''
+
+
 documentation: |-
     Place this in a graph to export vectors of samples to a GRCP port probe.
 
diff --git a/gr-blocks/grc/blocks_ctrlport_probe_c.block.yml b/gr-blocks/grc/blocks_ctrlport_probe_c.block.yml
index 6f59f3e695..24d54b019b 100644
--- a/gr-blocks/grc/blocks_ctrlport_probe_c.block.yml
+++ b/gr-blocks/grc/blocks_ctrlport_probe_c.block.yml
@@ -1,5 +1,6 @@
 id: blocks_ctrlport_probe_c
 label: Ctrlport Complex Probe
+flags: python, cpp
 
 parameters:
 -   id: name
@@ -19,6 +20,12 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.ctrlport_probe_c(${name}, ${desc})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/ctrlport_probe_c.h>']
+    declarations: 'blocks::ctrlport_probe_c::sptr ${id};'
+    make: 'this->${id} = blocks::ctrlport_probe_c::make(${name}, ${desc});'
+
+
 documentation: |-
     Place this in a graph to export complex values to a GRCP port probe.
 
diff --git a/gr-blocks/grc/blocks_ctrlport_viewer.block.yml b/gr-blocks/grc/blocks_ctrlport_viewer.block.yml
index dc718aa975..110cf1ca7b 100644
--- a/gr-blocks/grc/blocks_ctrlport_viewer.block.yml
+++ b/gr-blocks/grc/blocks_ctrlport_viewer.block.yml
@@ -1,5 +1,6 @@
 id: blocks_ctrlport_monitor
 label: CtrlPort Monitor
+flags: python
 
 parameters:
 -   id: en
diff --git a/gr-blocks/grc/blocks_deinterleave.block.yml b/gr-blocks/grc/blocks_deinterleave.block.yml
index 98761c4cc0..f18afefc62 100644
--- a/gr-blocks/grc/blocks_deinterleave.block.yml
+++ b/gr-blocks/grc/blocks_deinterleave.block.yml
@@ -1,5 +1,6 @@
 id: blocks_deinterleave
 label: Deinterleave
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -45,4 +46,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.deinterleave(${type.size}*${vlen}, ${blocksize})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/deinterleave.h>']
+    declarations: 'blocks::deinterleave::sptr ${id};'
+    make: 'this->${id} = blocks::deinterleave::make(${type.size}*${vlen}, ${blocksize});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_delay.block.yml b/gr-blocks/grc/blocks_delay.block.yml
index b9d63df586..d26f138016 100644
--- a/gr-blocks/grc/blocks_delay.block.yml
+++ b/gr-blocks/grc/blocks_delay.block.yml
@@ -1,5 +1,6 @@
 id: blocks_delay
 label: Delay
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -47,4 +48,13 @@ templates:
     callbacks:
     - set_dly(${delay})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/delay.h>']
+    declarations: 'blocks::delay::sptr ${id};'
+    make: 'this->${id} = blocks::delay::make(${type.size}*${vlen}, ${delay});'
+    callbacks:
+    - set_dly(${delay})
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_divide_XX.block.yml b/gr-blocks/grc/blocks_divide_XX.block.yml
index a98dfde5c7..5aeca9d741 100644
--- a/gr-blocks/grc/blocks_divide_XX.block.yml
+++ b/gr-blocks/grc/blocks_divide_XX.block.yml
@@ -1,5 +1,6 @@
 id: blocks_divide_xx
 label: Divide
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,4 +40,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.divide_${type.fcn}(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/divide_${type.fcn}.h>']
+    declarations: 'blocks::divide_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::divide_${type.fcn}::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_endian_swap.block.yml b/gr-blocks/grc/blocks_endian_swap.block.yml
index da2ef0c379..f47024e98e 100644
--- a/gr-blocks/grc/blocks_endian_swap.block.yml
+++ b/gr-blocks/grc/blocks_endian_swap.block.yml
@@ -1,5 +1,6 @@
 id: blocks_endian_swap
 label: Endian Swap
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -23,4 +24,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.endian_swap(${type.size})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/endian_swap.h>']
+    declarations: 'blocks::endian_swap::sptr ${id};'
+    make: 'this->${id} = blocks::endian_swap::make(${type.size});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_exponentiate_const_cci.block.yml b/gr-blocks/grc/blocks_exponentiate_const_cci.block.yml
index 10bef0d3cd..33ec28eed7 100644
--- a/gr-blocks/grc/blocks_exponentiate_const_cci.block.yml
+++ b/gr-blocks/grc/blocks_exponentiate_const_cci.block.yml
@@ -1,5 +1,6 @@
 id: blocks_exponentiate_const_cci
 label: Exponentiate Const Int
+flags: python, cpp
 
 parameters:
 -   id: num_ports
@@ -40,4 +41,12 @@ templates:
     callbacks:
     - set_exponent(${exponent})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/exponentiate_const_cci.h>']
+    declarations: 'blocks::exponentiate_const_cci::sptr ${id};'
+    make: 'this->${id} = blocks::exponentiate_const_cci::make(${exponent}, ${vlen});'
+    callbacks:
+    - set_exponent(${exponent})
+
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_file_descriptor_sink.block.yml b/gr-blocks/grc/blocks_file_descriptor_sink.block.yml
index 24d88f67f9..d35bf4028a 100644
--- a/gr-blocks/grc/blocks_file_descriptor_sink.block.yml
+++ b/gr-blocks/grc/blocks_file_descriptor_sink.block.yml
@@ -1,5 +1,6 @@
 id: blocks_file_descriptor_sink
 label: File Descriptor Sink
+flags: python, cpp
 
 parameters:
 -   id: fd
@@ -31,4 +32,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.file_descriptor_sink(${type.size}*${vlen}, ${fd})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/file_descriptor_sink.h>']
+    declarations: 'blocks::file_descriptor_sink::sptr ${id};'
+    make: 'this->${id} = blocks::file_descriptor_sink::make(${type.size}*${vlen}, ${fd});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_file_descriptor_source.block.yml b/gr-blocks/grc/blocks_file_descriptor_source.block.yml
index 84926661e4..e0117dd0e8 100644
--- a/gr-blocks/grc/blocks_file_descriptor_source.block.yml
+++ b/gr-blocks/grc/blocks_file_descriptor_source.block.yml
@@ -1,5 +1,6 @@
 id: blocks_file_descriptor_source
 label: File Descriptor Source
+flags: python, cpp
 
 parameters:
 -   id: fd
@@ -34,4 +35,13 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.file_descriptor_source(${type.size}*${vlen}, ${fd}, ${repeat})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/file_descriptor_source.h>']
+    declarations: 'blocks::file_descriptor_source::sptr ${id};'
+    make: 'this->${id} = blocks::file_descriptor_source::make(${type.size}*${vlen}, ${fd}, ${repeat});'
+    translations:
+        gr.sizeof_: 'sizeof('
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_file_meta_sink.block.yml b/gr-blocks/grc/blocks_file_meta_sink.block.yml
index 7512f23aae..d8d6737ca0 100644
--- a/gr-blocks/grc/blocks_file_meta_sink.block.yml
+++ b/gr-blocks/grc/blocks_file_meta_sink.block.yml
@@ -1,5 +1,6 @@
 id: blocks_file_meta_sink
 label: File Meta Sink
+flags: python
 
 parameters:
 -   id: file
diff --git a/gr-blocks/grc/blocks_file_meta_source.block.yml b/gr-blocks/grc/blocks_file_meta_source.block.yml
index 016c2f62a5..f752677d4f 100644
--- a/gr-blocks/grc/blocks_file_meta_source.block.yml
+++ b/gr-blocks/grc/blocks_file_meta_source.block.yml
@@ -1,5 +1,6 @@
 id: blocks_file_meta_source
 label: File Meta Source
+flags: python
 
 parameters:
 -   id: type
diff --git a/gr-blocks/grc/blocks_file_sink.block.yml b/gr-blocks/grc/blocks_file_sink.block.yml
index cf9782340f..77e8631286 100644
--- a/gr-blocks/grc/blocks_file_sink.block.yml
+++ b/gr-blocks/grc/blocks_file_sink.block.yml
@@ -1,5 +1,6 @@
 id: blocks_file_sink
 label: File Sink
+flags: python, cpp
 
 parameters:
 -   id: file
@@ -48,4 +49,15 @@ templates:
     - set_unbuffered(${unbuffered})
     - open(${file})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/file_sink.h>']
+    declarations: 'blocks::file_sink::sptr ${id};'
+    make: 'this->${id} = blocks::file_sink::make(${type.size})*${vlen}, ${file}, ${append});'
+    callbacks:
+    - open(${file})
+    translations:
+        'True': 'true'
+        'False': 'false'
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_file_source.block.yml b/gr-blocks/grc/blocks_file_source.block.yml
index 4aed206fbd..f10354145a 100644
--- a/gr-blocks/grc/blocks_file_source.block.yml
+++ b/gr-blocks/grc/blocks_file_source.block.yml
@@ -1,5 +1,6 @@
 id: blocks_file_source
 label: File Source
+flags: python, cpp
 
 parameters:
 -   id: file
@@ -56,4 +57,15 @@ templates:
     - open(${file}, ${repeat})
     - self.${id}.set_begin_tag(${begin_tag})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/file_source.h>']
+    declarations: 'blocks::file_source::sptr ${id};'
+    make: 'this->${id} =blocks::file_source::make(${type.size})*${vlen}, "${file[1:-1]}", ${repeat}, ${offset}, ${length});'
+    callbacks:
+    - open(${file}, ${repeat})
+    translations:
+        'True': 'true'
+        'False': 'false'
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_float_to_char.block.yml b/gr-blocks/grc/blocks_float_to_char.block.yml
index 4f6eeb7286..287c3800c7 100644
--- a/gr-blocks/grc/blocks_float_to_char.block.yml
+++ b/gr-blocks/grc/blocks_float_to_char.block.yml
@@ -1,5 +1,6 @@
 id: blocks_float_to_char
 label: Float To Char
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -28,4 +29,11 @@ templates:
     callbacks:
     - set_scale(${scale})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/float_to_char.h>']
+    declarations: 'blocks::float_to_char::sptr ${id};'
+    make: 'this->${id} = blocks::float_to_char::make(${vlen}, ${scale});'
+    callbacks:
+    - set_scale(${scale})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_float_to_complex.block.yml b/gr-blocks/grc/blocks_float_to_complex.block.yml
index d592c4e461..0f1d5d257e 100644
--- a/gr-blocks/grc/blocks_float_to_complex.block.yml
+++ b/gr-blocks/grc/blocks_float_to_complex.block.yml
@@ -1,5 +1,6 @@
 id: blocks_float_to_complex
 label: Float To Complex
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -31,4 +32,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.float_to_complex(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/float_to_complex.h>']
+    declarations: 'blocks::float_to_complex::sptr ${id};'
+    make: 'this->${id} = blocks::float_to_complex::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_float_to_int.block.yml b/gr-blocks/grc/blocks_float_to_int.block.yml
index 4ed0e08718..4411955a4f 100644
--- a/gr-blocks/grc/blocks_float_to_int.block.yml
+++ b/gr-blocks/grc/blocks_float_to_int.block.yml
@@ -1,5 +1,6 @@
 id: blocks_float_to_int
 label: Float To Int
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -28,4 +29,11 @@ templates:
     callbacks:
     - set_scale(${scale})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/float_to_int.h>']
+    declarations: 'blocks::float_to_int::sptr ${id};'
+    make: 'this->${id} = blocks::float_to_int::make(${vlen}, ${scale});'
+    callbacks:
+    - set_scale(${scale})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_float_to_short.block.yml b/gr-blocks/grc/blocks_float_to_short.block.yml
index 8b1c4e58b5..173d4e460c 100644
--- a/gr-blocks/grc/blocks_float_to_short.block.yml
+++ b/gr-blocks/grc/blocks_float_to_short.block.yml
@@ -1,5 +1,6 @@
 id: blocks_float_to_short
 label: Float To Short
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -28,4 +29,11 @@ templates:
     callbacks:
     - set_scale(${scale})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/float_to_short.h>']
+    declarations: 'blocks::float_to_short::sptr ${id};'
+    make: 'this->${id} = blocks::float_to_short::make(${vlen}, ${scale});'
+    callbacks:
+    - set_scale(${scale})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_float_uchar.block.yml b/gr-blocks/grc/blocks_float_uchar.block.yml
index 33687978c2..759d5e0147 100644
--- a/gr-blocks/grc/blocks_float_uchar.block.yml
+++ b/gr-blocks/grc/blocks_float_uchar.block.yml
@@ -1,5 +1,6 @@
 id: blocks_float_to_uchar
 label: Float To UChar
+flags: python, cpp
 
 inputs:
 -   domain: stream
@@ -13,4 +14,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.float_to_uchar()
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/float_to_uchar.h>']
+    declarations: 'blocks::float_to_uchar::sptr ${id};'
+    make: 'this->${id} = blocks::float_to_uchar::make();'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_head.block.yml b/gr-blocks/grc/blocks_head.block.yml
index c342e40067..50034836c8 100644
--- a/gr-blocks/grc/blocks_head.block.yml
+++ b/gr-blocks/grc/blocks_head.block.yml
@@ -1,5 +1,6 @@
 id: blocks_head
 label: Head
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,4 +40,13 @@ templates:
     callbacks:
     - set_length(${num_items})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/head.h>']
+    declarations: 'blocks::head::sptr ${id};'
+    make: 'this->${id} = blocks::head::make(${type.size}*${vlen}, ${num_items});'
+    callbacks:
+    - set_length(${num_items})
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_int_to_float.block.yml b/gr-blocks/grc/blocks_int_to_float.block.yml
index a6f3b3b92c..e0e83cef6b 100644
--- a/gr-blocks/grc/blocks_int_to_float.block.yml
+++ b/gr-blocks/grc/blocks_int_to_float.block.yml
@@ -1,5 +1,6 @@
 id: blocks_int_to_float
 label: Int To Float
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -28,4 +29,12 @@ templates:
     callbacks:
     - set_scale(${scale})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/int_to_float.h>']
+    declarations: 'blocks::int_to_float::sptr ${id};'
+    make: 'this->${id} = blocks::int_to_float::make(${vlen}, ${scale});'
+    callbacks:
+    - set_scale(${scale})
+
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_integrate_xx.block.yml b/gr-blocks/grc/blocks_integrate_xx.block.yml
index e8d3dd08cd..551c3bf4fe 100644
--- a/gr-blocks/grc/blocks_integrate_xx.block.yml
+++ b/gr-blocks/grc/blocks_integrate_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_integrate_xx
 label: Integrate
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -32,4 +33,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.integrate_${type.fcn}(${decim}, ${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/integrate_${type.fcn}.h>']
+    declarations: 'blocks::integrate_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::integrate_${type.fcn}::make(${decim}, ${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_interleave.block.yml b/gr-blocks/grc/blocks_interleave.block.yml
index e814e675b9..45f675c4fc 100644
--- a/gr-blocks/grc/blocks_interleave.block.yml
+++ b/gr-blocks/grc/blocks_interleave.block.yml
@@ -1,5 +1,6 @@
 id: blocks_interleave
 label: Interleave
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -45,4 +46,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.interleave(${type.size}*${vlen}, ${blocksize})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/interleave.h>']
+    declarations: 'blocks::interleave::sptr ${id};'
+    make: 'this->${id} = blocks::interleave::make(${type.size}*${vlen}, ${blocksize});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_interleaved_char_to_complex.block.yml b/gr-blocks/grc/blocks_interleaved_char_to_complex.block.yml
index 049f67b246..d5fe6a3bde 100644
--- a/gr-blocks/grc/blocks_interleaved_char_to_complex.block.yml
+++ b/gr-blocks/grc/blocks_interleaved_char_to_complex.block.yml
@@ -1,5 +1,6 @@
 id: blocks_interleaved_char_to_complex
 label: IChar To Complex
+flags: python, cpp
 
 parameters:
 -   id: vector_input
@@ -25,4 +26,12 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.interleaved_char_to_complex(${vector_input})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/interleaved_char_to_complex.h>']
+    declarations: 'blocks::interleaved_char_to_complex::sptr ${id};'
+    make: 'this->${id} = blocks::interleaved_char_to_complex::make(${vector_input});'
+    translations:
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_interleaved_short_to_complex.block.yml b/gr-blocks/grc/blocks_interleaved_short_to_complex.block.yml
index 5c3ab76d4d..bf833b4e67 100644
--- a/gr-blocks/grc/blocks_interleaved_short_to_complex.block.yml
+++ b/gr-blocks/grc/blocks_interleaved_short_to_complex.block.yml
@@ -1,5 +1,6 @@
 id: blocks_interleaved_short_to_complex
 label: IShort To Complex
+flags: python, cpp
 
 parameters:
 -   id: vector_input
@@ -34,4 +35,14 @@ templates:
     callbacks:
     - set_swap(${swap})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/interleaved_short_to_complex.h>']
+    declarations: 'blocks::interleaved_short_to_complex::sptr ${id};'
+    make: 'this->${id} = blocks::interleaved_short_to_complex::make(${vector_input}, ${swap});'
+    callbacks:
+    - set_swap(${swap})
+    translations:
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_keep_m_in_n.block.yml b/gr-blocks/grc/blocks_keep_m_in_n.block.yml
index 96cf25dde9..3c9d6326f8 100644
--- a/gr-blocks/grc/blocks_keep_m_in_n.block.yml
+++ b/gr-blocks/grc/blocks_keep_m_in_n.block.yml
@@ -1,5 +1,6 @@
 id: blocks_keep_m_in_n
 label: Keep M in N
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -48,4 +49,15 @@ templates:
     - set_m(${m})
     - set_n(${n})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/keep_m_in_n.h>']
+    declarations: 'blocks::keep_m_in_n::sptr ${id};'
+    make: 'this->${id} = blocks::keep_m_in_n::make(${type.size}, ${m}, ${n}, ${offset});'
+    callbacks:
+    - set_offset(${offset})
+    - set_m(${m})
+    - set_n(${n})
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_keep_one_in_n.block.yml b/gr-blocks/grc/blocks_keep_one_in_n.block.yml
index d790557834..2dcfbd12d0 100644
--- a/gr-blocks/grc/blocks_keep_one_in_n.block.yml
+++ b/gr-blocks/grc/blocks_keep_one_in_n.block.yml
@@ -1,5 +1,6 @@
 id: blocks_keep_one_in_n
 label: Keep 1 in N
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -41,4 +42,13 @@ templates:
     callbacks:
     - set_n(${n})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/keep_one_in_n.h>']
+    declarations: 'blocks::keep_one_in_n::sptr ${id};'
+    make: 'this->${id} = blocks::keep_one_in_n::make(${type.size}*${vlen}, ${n});'
+    callbacks:
+    - set_n(${n})
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_magphase_to_complex.block.yml b/gr-blocks/grc/blocks_magphase_to_complex.block.yml
index 56f939d816..d643ba5489 100644
--- a/gr-blocks/grc/blocks_magphase_to_complex.block.yml
+++ b/gr-blocks/grc/blocks_magphase_to_complex.block.yml
@@ -1,5 +1,6 @@
 id: blocks_magphase_to_complex
 label: Magnitude and Phase To Complex
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -31,4 +32,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.magphase_to_complex(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/magphase_to_complex.h>']
+    declarations: 'blocks::magphase_to_complex::sptr ${id};'
+    make: 'this->${id} = blocks::magphase_to_complex::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_max_xx.block.yml b/gr-blocks/grc/blocks_max_xx.block.yml
index 8b7516de8e..a5fb91a0d6 100644
--- a/gr-blocks/grc/blocks_max_xx.block.yml
+++ b/gr-blocks/grc/blocks_max_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_max_xx
 label: Max
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -42,6 +43,11 @@ asserts:
 
 templates:
     imports: from gnuradio import blocks
-    make: blocks.max_${type.fcn}(${vlen},${vlen_out})
+    make: blocks.max_${type.fcn}(${vlen}, ${vlen_out})
+
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/max_${type.fcn}.h>']
+    declarations: 'blocks::max_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::make_${type.fcn}::make(${vlen}, ${vlen_out});'
 
 file_format: 1
diff --git a/gr-blocks/grc/blocks_message_debug.block.yml b/gr-blocks/grc/blocks_message_debug.block.yml
index 301320e884..0ffb37f8c5 100644
--- a/gr-blocks/grc/blocks_message_debug.block.yml
+++ b/gr-blocks/grc/blocks_message_debug.block.yml
@@ -1,5 +1,6 @@
 id: blocks_message_debug
 label: Message Debug
+flags: python, cpp
 
 inputs:
 -   domain: message
@@ -16,4 +17,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.message_debug()
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/message_debug.h>']
+    declarations: 'blocks::message_debug::sptr ${id};'
+    make: 'this->${id} = blocks::message_debug::make();'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_message_strobe.block.yml b/gr-blocks/grc/blocks_message_strobe.block.yml
index 89264996b2..73baef498b 100644
--- a/gr-blocks/grc/blocks_message_strobe.block.yml
+++ b/gr-blocks/grc/blocks_message_strobe.block.yml
@@ -1,5 +1,6 @@
 id: blocks_message_strobe
 label: Message Strobe
+flags: python
 
 parameters:
 -   id: msg
diff --git a/gr-blocks/grc/blocks_message_strobe_random.block.yml b/gr-blocks/grc/blocks_message_strobe_random.block.yml
index c0d6075892..bc08ccdf2d 100644
--- a/gr-blocks/grc/blocks_message_strobe_random.block.yml
+++ b/gr-blocks/grc/blocks_message_strobe_random.block.yml
@@ -1,5 +1,6 @@
 id: blocks_message_strobe_random
 label: Message Strobe Random-Delay
+flags: python
 
 parameters:
 -   id: msg
diff --git a/gr-blocks/grc/blocks_min_xx.block.yml b/gr-blocks/grc/blocks_min_xx.block.yml
index 511d67c145..6fcd2664c0 100644
--- a/gr-blocks/grc/blocks_min_xx.block.yml
+++ b/gr-blocks/grc/blocks_min_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_min_xx
 label: Min
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -44,4 +45,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.min_${type.fcn}(${vlen},${vlen_out})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/min_${type.fcn}.h>']
+    declarations: 'blocks::min_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::min_${type.fcn}::make(${vlen},${vlen_out});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_moving_average_xx.block.yml b/gr-blocks/grc/blocks_moving_average_xx.block.yml
index 6b12355894..03c971ec1c 100644
--- a/gr-blocks/grc/blocks_moving_average_xx.block.yml
+++ b/gr-blocks/grc/blocks_moving_average_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_moving_average_xx
 label: Moving Average
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -46,4 +47,11 @@ templates:
     callbacks:
     - set_length_and_scale(${length}, ${scale})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/moving_average_${type.fcn}.h>']
+    declarations: 'blocks::moving_average_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::moving_average_${type.fcn}::make(${length}, ${scale}, ${max_iter}, ${vlen});'
+    callbacks:
+    - set_length_and_scale(${length}, ${scale})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_multiply_by_tag_value_cc.block.yml b/gr-blocks/grc/blocks_multiply_by_tag_value_cc.block.yml
index f6b72edf36..84d20e8732 100644
--- a/gr-blocks/grc/blocks_multiply_by_tag_value_cc.block.yml
+++ b/gr-blocks/grc/blocks_multiply_by_tag_value_cc.block.yml
@@ -1,5 +1,6 @@
 id: blocks_multiply_by_tag_value_cc
 label: Multiply by Tag Value
+flags: python, cpp
 
 parameters:
 -   id: tagname
@@ -22,4 +23,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.multiply_by_tag_value_cc(${tagname}, ${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/multiply_by_tag_value_cc.h>']
+    declarations: 'blocks::multiply_by_tag_value_cc::sptr ${id};'
+    make: 'this->${id} = blocks::multiply_by_tag_value_cc::make(${tagname}, ${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_multiply_conjugate_cc.block.yml b/gr-blocks/grc/blocks_multiply_conjugate_cc.block.yml
index aceabc643e..aff7c04991 100644
--- a/gr-blocks/grc/blocks_multiply_conjugate_cc.block.yml
+++ b/gr-blocks/grc/blocks_multiply_conjugate_cc.block.yml
@@ -1,5 +1,6 @@
 id: blocks_multiply_conjugate_cc
 label: Multiply Conjugate
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -30,4 +31,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.multiply_conjugate_cc(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/multiply_conjugate_cc.h>']
+    declarations: 'blocks::multiply_conjugate_cc::sptr ${id};'
+    make: 'this->${id} = blocks::multiply_conjugate_cc::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_multiply_const_vxx.block.yml b/gr-blocks/grc/blocks_multiply_const_vxx.block.yml
index 41dd9c9c68..6793ae134c 100644
--- a/gr-blocks/grc/blocks_multiply_const_vxx.block.yml
+++ b/gr-blocks/grc/blocks_multiply_const_vxx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_multiply_const_vxx
 label: Multiply Const
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -41,4 +42,11 @@ templates:
     callbacks:
     - set_k(${const})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/multiply_const_${"v" if context.get("vlen")() > 1 else "" }.h>']
+    declarations: 'blocks::multiply_const_${"v" if context.get("vlen")() > 1 else "" }::sptr ${id};'
+    make: 'this->${id} = blocks::multiply_const_${"v" if context.get("vlen")() > 1 else "" }${type.fcn}::make(${const});'
+    callbacks:
+    - set_k(${const})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_multiply_const_xx.block.yml b/gr-blocks/grc/blocks_multiply_const_xx.block.yml
index a239913802..561fccb17d 100644
--- a/gr-blocks/grc/blocks_multiply_const_xx.block.yml
+++ b/gr-blocks/grc/blocks_multiply_const_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_multiply_const_xx
 label: Fast Multiply Const
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,4 +40,11 @@ templates:
     callbacks:
     - set_k(${const})
 
+cpp_templates:
+    includes: ['#include <gnuradio/multiply_const_${type.fcn}.h>']
+    declarations: 'blocks::multiply_const_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::multiply_const_${type.fcn}::make(${const}, ${vlen});'
+    callbacks:
+    - set_k(${const})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_multiply_matrix_xx.block.yml b/gr-blocks/grc/blocks_multiply_matrix_xx.block.yml
index 21a66b4f8e..6a4a467633 100644
--- a/gr-blocks/grc/blocks_multiply_matrix_xx.block.yml
+++ b/gr-blocks/grc/blocks_multiply_matrix_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_multiply_matrix_xx
 label: Multiply by Matrix
+flags: python
 
 parameters:
 -   id: type
@@ -44,4 +45,11 @@ templates:
     callbacks:
     - set_A(${A})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/multiply_matrix_${type.fcn}.h>']
+    declarations: 'blocks::multiply_matrix_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::multiply_matrix_${type.fcn}::make(${A}, ${tag_propagation_policy});'
+    callbacks:
+    - set_A(${A})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_multiply_xx.block.yml b/gr-blocks/grc/blocks_multiply_xx.block.yml
index 41c28458a8..6287ecdafe 100644
--- a/gr-blocks/grc/blocks_multiply_xx.block.yml
+++ b/gr-blocks/grc/blocks_multiply_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_multiply_xx
 label: Multiply
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,4 +40,9 @@ templates:
     imports: from gnuradio import blocks
     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});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_mute_xx.block.yml b/gr-blocks/grc/blocks_mute_xx.block.yml
index 8e36c568d1..7d1f9931e4 100644
--- a/gr-blocks/grc/blocks_mute_xx.block.yml
+++ b/gr-blocks/grc/blocks_mute_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_mute_xx
 label: Mute
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -32,4 +33,14 @@ templates:
     callbacks:
     - set_mute(bool(${mute}))
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/mute_${type.fcn}.h>']
+    declarations: 'blocks::mute_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::mute_${type.fcn}::(bool(${mute}));'
+    callbacks:
+    - set_mute(bool(${mute}))
+    translations:
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_nlog10_ff.block.yml b/gr-blocks/grc/blocks_nlog10_ff.block.yml
index 004e72b4ec..f5396cd4ee 100644
--- a/gr-blocks/grc/blocks_nlog10_ff.block.yml
+++ b/gr-blocks/grc/blocks_nlog10_ff.block.yml
@@ -1,5 +1,6 @@
 id: blocks_nlog10_ff
 label: Log10
+flags: python, cpp
 
 parameters:
 -   id: n
@@ -34,4 +35,10 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.nlog10_ff(${n}, ${vlen}, ${k})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/nlog10_ff.h>']
+    declarations: 'blocks::nlog10_ff::sptr ${id};'
+    make: 'this->${id} = blocks::nlog10_ff::make(${n}, ${vlen}, ${k});'
+
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_nop.block.yml b/gr-blocks/grc/blocks_nop.block.yml
index 5e47e813ad..39578b0fc2 100644
--- a/gr-blocks/grc/blocks_nop.block.yml
+++ b/gr-blocks/grc/blocks_nop.block.yml
@@ -1,5 +1,6 @@
 id: blocks_nop
 label: Nop
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -41,4 +42,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.nop(${type.size}*${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/nop.h>']
+    declarations: 'blocks::nop::sptr ${id};'
+    make: 'this->${id} = blocks::nop::make(${type.size}*${vlen});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_not_xx.block.yml b/gr-blocks/grc/blocks_not_xx.block.yml
index 63ec98a42a..3de7ca5d75 100644
--- a/gr-blocks/grc/blocks_not_xx.block.yml
+++ b/gr-blocks/grc/blocks_not_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_not_xx
 label: Not
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -22,4 +23,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.not_${type.fcn}()
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/not_${type.fcn}.h>']
+    declarations: 'blocks::not_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::not_${type.fcn}::make();'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_null_sink.block.yml b/gr-blocks/grc/blocks_null_sink.block.yml
index c9530f99de..71d0b1867e 100644
--- a/gr-blocks/grc/blocks_null_sink.block.yml
+++ b/gr-blocks/grc/blocks_null_sink.block.yml
@@ -1,5 +1,6 @@
 id: blocks_null_sink
 label: Null Sink
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -40,4 +41,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.null_sink(${type.size}*${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/null_sink.h>']
+    declarations: 'blocks::null_sink::sptr ${id};'
+    make: 'this->${id} = blocks::null_sink::make(${type.size})*${vlen});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_null_source.block.yml b/gr-blocks/grc/blocks_null_source.block.yml
index 0678687a8d..da4335e8e3 100644
--- a/gr-blocks/grc/blocks_null_source.block.yml
+++ b/gr-blocks/grc/blocks_null_source.block.yml
@@ -1,5 +1,6 @@
 id: blocks_null_source
 label: Null Source
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -36,4 +37,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.null_source(${type.size}*${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/null_source.h>']
+    declarations: 'blocks::null_source::sptr ${id};'
+    make: 'blocks::null_source::make(${type.size})*${vlen});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_or_xx.block.yml b/gr-blocks/grc/blocks_or_xx.block.yml
index a28a951712..5604fb5e60 100644
--- a/gr-blocks/grc/blocks_or_xx.block.yml
+++ b/gr-blocks/grc/blocks_or_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_or_xx
 label: Or
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -31,4 +32,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.or_${type.fcn}()
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/or_${type.fcn}.h>']
+    declarations: 'blocks::or_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::or_${type.fcn}::make();'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_pack_k_bits_bb.block.yml b/gr-blocks/grc/blocks_pack_k_bits_bb.block.yml
index 904f382f0f..c8365afc41 100644
--- a/gr-blocks/grc/blocks_pack_k_bits_bb.block.yml
+++ b/gr-blocks/grc/blocks_pack_k_bits_bb.block.yml
@@ -1,5 +1,6 @@
 id: blocks_pack_k_bits_bb
 label: Pack K Bits
+flags: python, cpp
 
 parameters:
 -   id: k
@@ -18,6 +19,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.pack_k_bits_bb(${k})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/pack_k_bits_bb.h>']
+    declarations: 'blocks::pack_k_bits_bb::sptr ${id};'
+    make: 'this->${id} = blocks::pack_k_bits_bb::make(${k});'
+
 documentation: |-
     Pack K unpacked bits (one bit per byte) into a single packed byte containing k bits and 8 - k zeros.
 
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 5d49d1851c..696b668030 100644
--- a/gr-blocks/grc/blocks_packed_to_unpacked_xx.block.yml
+++ b/gr-blocks/grc/blocks_packed_to_unpacked_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_packed_to_unpacked_xx
 label: Packed to Unpacked
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -41,4 +42,12 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.packed_to_unpacked_${type.fcn}(${bits_per_chunk}, ${endianness})
 
+
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/packed_to_unpacked_${type.fcn}.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:
+        gr.: ''
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_patterned_interleaver.block.yml b/gr-blocks/grc/blocks_patterned_interleaver.block.yml
index 97f170f97e..a8fa4bb89e 100644
--- a/gr-blocks/grc/blocks_patterned_interleaver.block.yml
+++ b/gr-blocks/grc/blocks_patterned_interleaver.block.yml
@@ -1,5 +1,6 @@
 id: blocks_patterned_interleaver
 label: Patterned Interleaver
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,4 +40,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.patterned_interleaver(${type.size}*${vlen}, ${pattern})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/patterned_interleaver.h>']
+    declarations: 'blocks::patterned_interleaver::sptr ${id};'
+    make: 'this->${id} = blocks::patterned_interleaver::make(${type.size}*${vlen}, ${pattern});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_pdu_filter.block.yml b/gr-blocks/grc/blocks_pdu_filter.block.yml
index 43d72b7480..d65405bb01 100644
--- a/gr-blocks/grc/blocks_pdu_filter.block.yml
+++ b/gr-blocks/grc/blocks_pdu_filter.block.yml
@@ -1,5 +1,6 @@
 id: blocks_pdu_filter
 label: PDU Filter
+flags: python
 
 parameters:
 -   id: k
diff --git a/gr-blocks/grc/blocks_pdu_remove.block.yml b/gr-blocks/grc/blocks_pdu_remove.block.yml
index 4750ff22c4..a75f1ff3ac 100644
--- a/gr-blocks/grc/blocks_pdu_remove.block.yml
+++ b/gr-blocks/grc/blocks_pdu_remove.block.yml
@@ -1,5 +1,6 @@
 id: blocks_pdu_remove
 label: PDU Remove
+flags: python
 
 parameters:
 -   id: k
diff --git a/gr-blocks/grc/blocks_pdu_set.block.yml b/gr-blocks/grc/blocks_pdu_set.block.yml
index 44a06a2e09..aa53e08f59 100644
--- a/gr-blocks/grc/blocks_pdu_set.block.yml
+++ b/gr-blocks/grc/blocks_pdu_set.block.yml
@@ -1,5 +1,6 @@
 id: blocks_pdu_set
 label: PDU Set
+flags: python
 
 parameters:
 -   id: k
diff --git a/gr-blocks/grc/blocks_pdu_to_tagged_stream.block.yml b/gr-blocks/grc/blocks_pdu_to_tagged_stream.block.yml
index 3b44badd4b..295907a60a 100644
--- a/gr-blocks/grc/blocks_pdu_to_tagged_stream.block.yml
+++ b/gr-blocks/grc/blocks_pdu_to_tagged_stream.block.yml
@@ -1,5 +1,6 @@
 id: blocks_pdu_to_tagged_stream
 label: PDU to Tagged Stream
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -26,4 +27,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.pdu_to_tagged_stream(${type.tv}, ${tag})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/pdu_to_tagged_stream.h>']
+    declarations: 'blocks::pdu_to_tagged_stream::sptr ${id};'
+    make: 'this->${id} = blocks::pdu_to_tagged_stream::make(${type.tv}, ${tag});'
+    translations:
+        blocks.: 'blocks::'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_peak_detector2_fb.block.yml b/gr-blocks/grc/blocks_peak_detector2_fb.block.yml
index 0950640ae2..8b4eec97ca 100644
--- a/gr-blocks/grc/blocks_peak_detector2_fb.block.yml
+++ b/gr-blocks/grc/blocks_peak_detector2_fb.block.yml
@@ -1,5 +1,6 @@
 id: blocks_peak_detector2_fb
 label: Peak Detector2
+flags: python, cpp
 
 parameters:
 -   id: threshold_factor_rise
@@ -35,4 +36,13 @@ templates:
     - set_look_ahead(${look_ahead})
     - set_alpha(${alpha})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/peak_detector2_fb.h>']
+    declarations: 'blocks::peak_detector2_fb::sptr ${id};'
+    make: 'this->${id} = blocks::peak_detector2_fb::make(${threshold_factor_rise}, ${look_ahead}, ${alpha});'
+    callbacks:
+    - set_threshold_factor_rise(${threshold_factor_rise})
+    - set_look_ahead(${look_ahead})
+    - set_alpha(${alpha})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_peak_detector_xb.block.yml b/gr-blocks/grc/blocks_peak_detector_xb.block.yml
index be0f238391..6d1d91308e 100644
--- a/gr-blocks/grc/blocks_peak_detector_xb.block.yml
+++ b/gr-blocks/grc/blocks_peak_detector_xb.block.yml
@@ -1,5 +1,6 @@
 id: blocks_peak_detector_xb
 label: Peak Detector
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -44,4 +45,15 @@ templates:
     - set_look_ahead(${look_ahead})
     - set_alpha(${alpha})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/peak_detector_${type.fcn}b.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});'
+    callbacks:
+    - set_threshold_factor_rise(${threshold_factor_rise})
+    - set_threshold_factor_fall(${threshold_factor_fall})
+    - set_look_ahead(${look_ahead})
+    - set_alpha(${alpha})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_plateau_detector_fb.block.yml b/gr-blocks/grc/blocks_plateau_detector_fb.block.yml
index 09ae10b340..972e9995e6 100644
--- a/gr-blocks/grc/blocks_plateau_detector_fb.block.yml
+++ b/gr-blocks/grc/blocks_plateau_detector_fb.block.yml
@@ -1,5 +1,6 @@
 id: blocks_plateau_detector_fb
 label: Plateau Detector
+flags: python, cpp
 
 parameters:
 -   id: max_len
@@ -21,7 +22,10 @@ outputs:
 templates:
     imports: from gnuradio import blocks
     make: blocks.plateau_detector_fb(${max_len}, ${threshold})
-    callbacks:
-      - set_threshold(${threshold})
+
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/plateau_detector_fb.h>']
+    declarations: 'blocks::plateau_detector_fb::sptr ${id};'
+    make: 'this->${id} = blocks::plateau_detector_fb::make(${max_len}, ${threshold});'
 
 file_format: 1
diff --git a/gr-blocks/grc/blocks_probe_rate.block.yml b/gr-blocks/grc/blocks_probe_rate.block.yml
index 1f9ed65b2b..c7796213ec 100644
--- a/gr-blocks/grc/blocks_probe_rate.block.yml
+++ b/gr-blocks/grc/blocks_probe_rate.block.yml
@@ -1,5 +1,6 @@
 id: blocks_probe_rate
 label: Probe Rate
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -41,4 +42,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.probe_rate(${type.size}*${vlen}, ${mintime}, ${alpha})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/probe_rate.h>']
+    declarations: 'blocks::probe_rate::sptr ${id};'
+    make: 'this->${id} = blocks::probe_rate::make(${type.size}*${vlen}, ${mintime}, ${alpha});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_probe_signal_vx.block.yml b/gr-blocks/grc/blocks_probe_signal_vx.block.yml
index 2b486a55b2..b3be5c7cd3 100644
--- a/gr-blocks/grc/blocks_probe_signal_vx.block.yml
+++ b/gr-blocks/grc/blocks_probe_signal_vx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_probe_signal_vx
 label: Probe Signal Vector
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -27,6 +28,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.probe_signal_v${type.fcn}(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/probe_signal_v${type.fcn}.h>']
+    declarations: 'blocks::probe_signal_v${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::probe_signal_v${type.fcn}::make(${vlen});'
+
 documentation: |-
     Available functions to probe: level()
 
diff --git a/gr-blocks/grc/blocks_probe_signal_x.block.yml b/gr-blocks/grc/blocks_probe_signal_x.block.yml
index 0991bde99f..84a249a883 100644
--- a/gr-blocks/grc/blocks_probe_signal_x.block.yml
+++ b/gr-blocks/grc/blocks_probe_signal_x.block.yml
@@ -1,5 +1,6 @@
 id: blocks_probe_signal_x
 label: Probe Signal
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -18,6 +19,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.probe_signal_${type.fcn}()
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/probe_signal_${type.fcn}.h>']
+    declarations: 'blocks::probe_signal_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::probe_signal_${type.fcn}::make();'
+
 documentation: |-
     Available functions to probe: level()
 
diff --git a/gr-blocks/grc/blocks_random_pdu.block.yml b/gr-blocks/grc/blocks_random_pdu.block.yml
index 831b7eb4c2..b12d4c5441 100644
--- a/gr-blocks/grc/blocks_random_pdu.block.yml
+++ b/gr-blocks/grc/blocks_random_pdu.block.yml
@@ -1,5 +1,6 @@
 id: blocks_random_pdu
 label: Random PDU Generator
+flags: python
 
 parameters:
 -   id: minsize
diff --git a/gr-blocks/grc/blocks_regenerate_bb.block.yml b/gr-blocks/grc/blocks_regenerate_bb.block.yml
index 843e680a41..5b3a8b4879 100644
--- a/gr-blocks/grc/blocks_regenerate_bb.block.yml
+++ b/gr-blocks/grc/blocks_regenerate_bb.block.yml
@@ -1,5 +1,6 @@
 id: blocks_regenerate_bb
 label: Regenerate
+flags: python, cpp
 
 parameters:
 -   id: period
@@ -22,4 +23,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.regenerate_bb(${period}, ${max_regen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/regenerate_bb.h>']
+    declarations: 'blocks::regenerate_bb::sptr ${id};'
+    make: 'this->${id} = blocks::regenerate_bb::make(${period}, ${max_regen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_repack_bits_bb.block.yml b/gr-blocks/grc/blocks_repack_bits_bb.block.yml
index 9d5a3ba9ca..8c1ca35a6c 100644
--- a/gr-blocks/grc/blocks_repack_bits_bb.block.yml
+++ b/gr-blocks/grc/blocks_repack_bits_bb.block.yml
@@ -1,5 +1,6 @@
 id: blocks_repack_bits_bb
 label: Repack Bits
+flags: python, cpp
 
 parameters:
 -   id: k
@@ -44,4 +45,14 @@ templates:
     callbacks:
     - set_k_and_l(${k},${l})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/repack_bits_bb.h>']
+    declarations: 'blocks::repack_bits_bb::sptr ${id};'
+    make: 'this->${id} = blocks::repack_bits_bb::make(${k}, ${l}, ${len_tag_key}, ${align_output}, ${endianness});'
+    callbacks:
+    - set_k_and_l(${k},${l})
+    translations:
+        gr.: ''
+        'True': 'true'
+        'False': 'false'
 file_format: 1
diff --git a/gr-blocks/grc/blocks_repeat.block.yml b/gr-blocks/grc/blocks_repeat.block.yml
index 809231d293..d7f0e54a27 100644
--- a/gr-blocks/grc/blocks_repeat.block.yml
+++ b/gr-blocks/grc/blocks_repeat.block.yml
@@ -1,5 +1,6 @@
 id: blocks_repeat
 label: Repeat
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -38,4 +39,13 @@ templates:
     callbacks:
     - set_interpolation(${interp})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/repeat.h>']
+    declarations: 'blocks::repeat::sptr ${id};'
+    make: 'this->${id} = blocks::repeat::make(${type.size}*${vlen}, ${interp});'
+    callbacks:
+    - set_interpolation(${interp})
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_rms_xx.block.yml b/gr-blocks/grc/blocks_rms_xx.block.yml
index ca5e8df124..3750d937eb 100644
--- a/gr-blocks/grc/blocks_rms_xx.block.yml
+++ b/gr-blocks/grc/blocks_rms_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_rms_xx
 label: RMS
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -28,4 +29,11 @@ templates:
     callbacks:
     - set_alpha(${alpha})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/rms_${type.fcn}f.h>']
+    declarations: 'blocks::rms_${type.fcn}f::sptr ${id};'
+    make: 'this->${id} = blocks::rms_${type.fcn}f::make(${alpha});'
+    callbacks:
+    - set_alpha(${alpha})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_rotator_cc.block.yml b/gr-blocks/grc/blocks_rotator_cc.block.yml
index d65fbd5997..2e6e75a3a5 100644
--- a/gr-blocks/grc/blocks_rotator_cc.block.yml
+++ b/gr-blocks/grc/blocks_rotator_cc.block.yml
@@ -1,5 +1,6 @@
 id: blocks_rotator_cc
 label: Rotator
+flags: python, cpp
 
 parameters:
 -   id: phase_inc
@@ -21,4 +22,11 @@ templates:
     callbacks:
     - set_phase_inc(${phase_inc})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/rotator_cc.h>']
+    declarations: 'blocks::rotator_cc::sptr ${id};'
+    make: 'this->${id} = blocks::rotator_cc::make(${phase_inc});'
+    callbacks:
+    - set_phase_inc(${phase_inc})
+
 file_format: 1
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 893e7862b2..d2001ce6c5 100644
--- a/gr-blocks/grc/blocks_sample_and_hold_xx.block.yml
+++ b/gr-blocks/grc/blocks_sample_and_hold_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_sample_and_hold_xx
 label: Sample and Hold
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -25,4 +26,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.sample_and_hold_${type.fcn}()
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/sample_and_hold_${type.fcn}.h>']
+    declarations: 'blocks::sample_and_hold_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::sample_and_hold_${type.fcn}::make();'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_short_to_char.block.yml b/gr-blocks/grc/blocks_short_to_char.block.yml
index d24df725da..adb2293494 100644
--- a/gr-blocks/grc/blocks_short_to_char.block.yml
+++ b/gr-blocks/grc/blocks_short_to_char.block.yml
@@ -1,5 +1,6 @@
 id: blocks_short_to_char
 label: Short To Char
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -22,4 +23,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.short_to_char(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/short_to_char.h>']
+    declarations: 'blocks::short_to_char::sptr ${id};'
+    make: 'this->${id} = blocks::short_to_char::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_short_to_float.block.yml b/gr-blocks/grc/blocks_short_to_float.block.yml
index 8ad5f7ed13..e8b28bbb1c 100644
--- a/gr-blocks/grc/blocks_short_to_float.block.yml
+++ b/gr-blocks/grc/blocks_short_to_float.block.yml
@@ -1,5 +1,6 @@
 id: blocks_short_to_float
 label: Short To Float
+flags: python, cpp
 
 parameters:
 -   id: vlen
@@ -28,4 +29,11 @@ templates:
     callbacks:
     - set_scale(${scale})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/short_to_float.h>']
+    declarations: 'blocks::short_to_float::sptr ${id};'
+    make: 'this->${id} = blocks::short_to_float::make(${vlen}, ${scale});'
+    callbacks:
+    - set_scale(${scale})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_skiphead.block.yml b/gr-blocks/grc/blocks_skiphead.block.yml
index c0f10eb2d1..97aab03754 100644
--- a/gr-blocks/grc/blocks_skiphead.block.yml
+++ b/gr-blocks/grc/blocks_skiphead.block.yml
@@ -1,5 +1,6 @@
 id: blocks_skiphead
 label: Skip Head
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -37,4 +38,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.skiphead(${type.size}*${vlen}, ${num_items})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/skiphead.h>']
+    declarations: 'blocks::skiphead::sptr ${id};'
+    make: 'this->${id} = blocks::skiphead::make(${type.size}*${vlen}, ${num_items});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_socket_pdu.block.yml b/gr-blocks/grc/blocks_socket_pdu.block.yml
index 537abac52e..377d20c048 100644
--- a/gr-blocks/grc/blocks_socket_pdu.block.yml
+++ b/gr-blocks/grc/blocks_socket_pdu.block.yml
@@ -1,5 +1,6 @@
 id: blocks_socket_pdu
 label: Socket PDU
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -41,6 +42,14 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.socket_pdu(${repr(type)}, ${host}, ${port}, ${mtu}, ${tcp_no_delay})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/socket_pdu.h>']
+    declarations: 'blocks::socket_pdu::sptr ${id};'
+    make: 'this->${id} = blocks::socket_pdu::make(${type}, ${host}, ${port}, ${mtu}, ${tcp_no_delay});'
+    translations:
+        'True': 'true'
+        'False': 'false'
+
 documentation: |-
     For server modes, leave Host blank to bind to all interfaces (equivalent to 0.0.0.0).
 
diff --git a/gr-blocks/grc/blocks_stream_mux.block.yml b/gr-blocks/grc/blocks_stream_mux.block.yml
index 27d3baf89f..177ec18dca 100644
--- a/gr-blocks/grc/blocks_stream_mux.block.yml
+++ b/gr-blocks/grc/blocks_stream_mux.block.yml
@@ -1,5 +1,6 @@
 id: blocks_stream_mux
 label: Stream Mux
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -45,4 +46,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.stream_mux(${type.size}*${vlen}, ${lengths})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/stream_mux.h>']
+    declarations: 'blocks::stream_mux::sptr ${id};'
+    make: 'this->${id} = blocks::stream_mux::make(${type.size}*${vlen}, ${lengths});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_stream_to_streams.block.yml b/gr-blocks/grc/blocks_stream_to_streams.block.yml
index 16adb159a3..43c35901ae 100644
--- a/gr-blocks/grc/blocks_stream_to_streams.block.yml
+++ b/gr-blocks/grc/blocks_stream_to_streams.block.yml
@@ -1,5 +1,6 @@
 id: blocks_stream_to_streams
 label: Stream to Streams
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -40,4 +41,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.stream_to_streams(${type.size}*${vlen}, ${num_streams})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/stream_to_streams.h>']
+    declarations: 'blocks::stream_to_streams::sptr ${id};'
+    make: 'this->${id} = blocks::stream_to_streams::make(${type.size}*${vlen}, ${num_streams});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_stream_to_tagged_stream.block.yml b/gr-blocks/grc/blocks_stream_to_tagged_stream.block.yml
index db75c20dd7..b9f277c39c 100644
--- a/gr-blocks/grc/blocks_stream_to_tagged_stream.block.yml
+++ b/gr-blocks/grc/blocks_stream_to_tagged_stream.block.yml
@@ -1,5 +1,6 @@
 id: blocks_stream_to_tagged_stream
 label: Stream to Tagged Stream
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -40,4 +41,14 @@ templates:
     - set_packet_len(${packet_len})
     - set_packet_len_pmt(${packet_len})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/stream_to_tagged_stream.h>']
+    declarations: 'blocks::stream_to_tagged_stream::sptr ${id};'
+    make: 'this->${id} = blocks::stream_to_tagged_stream::make(${type.size}, ${vlen}, ${packet_len}, ${len_tag_key});'
+    callbacks:
+    - set_packet_len(${packet_len})
+    - set_packet_len_pmt(${packet_len})
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_stream_to_vector.block.yml b/gr-blocks/grc/blocks_stream_to_vector.block.yml
index 73e177d0c7..94c53b42c7 100644
--- a/gr-blocks/grc/blocks_stream_to_vector.block.yml
+++ b/gr-blocks/grc/blocks_stream_to_vector.block.yml
@@ -1,5 +1,6 @@
 id: blocks_stream_to_vector
 label: Stream to Vector
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,4 +40,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.stream_to_vector(${type.size}*${vlen}, ${num_items})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/stream_to_vector.h>']
+    declarations: 'blocks::stream_to_vector::sptr ${id};'
+    make: 'this->${id} = blocks::stream_to_vector::make(${type.size}*${vlen}, ${num_items});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_stream_to_vector_decimator.block.yml b/gr-blocks/grc/blocks_stream_to_vector_decimator.block.yml
index c5b4e2059d..7bc639540b 100644
--- a/gr-blocks/grc/blocks_stream_to_vector_decimator.block.yml
+++ b/gr-blocks/grc/blocks_stream_to_vector_decimator.block.yml
@@ -1,5 +1,6 @@
 id: blocks_stream_to_vector_decimator
 label: Stream to Vec Decim
+flags: python
 
 parameters:
 -   id: type
diff --git a/gr-blocks/grc/blocks_streams_to_stream.block.yml b/gr-blocks/grc/blocks_streams_to_stream.block.yml
index 404fcb0125..aa457ef7a3 100644
--- a/gr-blocks/grc/blocks_streams_to_stream.block.yml
+++ b/gr-blocks/grc/blocks_streams_to_stream.block.yml
@@ -1,5 +1,6 @@
 id: blocks_streams_to_stream
 label: Streams to Stream
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -40,4 +41,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.streams_to_stream(${type.size}*${vlen}, ${num_streams})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/streams_to_stream.h>']
+    declarations: 'blocks::streams_to_stream::sptr ${id};'
+    make: 'this->${id} = blocks::streams_to_stream::make(${type.size}*${vlen}, ${num_streams});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_streams_to_vector.block.yml b/gr-blocks/grc/blocks_streams_to_vector.block.yml
index d16d1e9384..3ebfc0a827 100644
--- a/gr-blocks/grc/blocks_streams_to_vector.block.yml
+++ b/gr-blocks/grc/blocks_streams_to_vector.block.yml
@@ -1,5 +1,6 @@
 id: blocks_streams_to_vector
 label: Streams to Vector
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -40,4 +41,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.streams_to_vector(${type.size}*${vlen}, ${num_streams})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/streams_to_vector.h>']
+    declarations: 'blocks::streams_to_vector::sptr ${id};'
+    make: 'this->${id} = blocks::streams_to_vector::make(${type.size}*${vlen}, ${num_streams});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_stretch_ff.block.yml b/gr-blocks/grc/blocks_stretch_ff.block.yml
index 95921538c0..d2a24c9eed 100644
--- a/gr-blocks/grc/blocks_stretch_ff.block.yml
+++ b/gr-blocks/grc/blocks_stretch_ff.block.yml
@@ -1,5 +1,6 @@
 id: blocks_stretch_ff
 label: Stretch
+flags: python, cpp
 
 parameters:
 -   id: lo
@@ -25,4 +26,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.stretch_ff(${lo}, ${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/stretch_ff.h>']
+    declarations: 'blocks::stretch_ff::sptr ${id};'
+    make: 'this->${id} = blocks::stretch_ff::make(${lo}, ${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_sub_xx.block.yml b/gr-blocks/grc/blocks_sub_xx.block.yml
index 0cfab09407..d0522df819 100644
--- a/gr-blocks/grc/blocks_sub_xx.block.yml
+++ b/gr-blocks/grc/blocks_sub_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_sub_xx
 label: Subtract
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,4 +40,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.sub_${type.fcn}(${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/sub_${type.fcn}.h>']
+    declarations: 'blocks::sub_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::sub_${type.fcn}::make(${vlen});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_tag_debug.block.yml b/gr-blocks/grc/blocks_tag_debug.block.yml
index 4bab9b94dd..0a84a4c742 100644
--- a/gr-blocks/grc/blocks_tag_debug.block.yml
+++ b/gr-blocks/grc/blocks_tag_debug.block.yml
@@ -1,5 +1,6 @@
 id: blocks_tag_debug
 label: Tag Debug
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -52,4 +53,17 @@ templates:
     callbacks:
     - set_display(${display})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/tag_debug.h>']
+    declarations: 'blocks::tag_debug::sptr ${id};'
+    make: |-
+        this->${id} = blocks::tag_debug::make(${type.size}*${vlen}, ${name}, ${filter});
+        this->${id}.set_display(${display});
+    callbacks:
+    - set_display(${display})
+    translations:
+        gr.sizeof_: 'sizeof('
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_tag_gate.block.yml b/gr-blocks/grc/blocks_tag_gate.block.yml
index a05ee3c276..cb8e199f49 100644
--- a/gr-blocks/grc/blocks_tag_gate.block.yml
+++ b/gr-blocks/grc/blocks_tag_gate.block.yml
@@ -1,5 +1,6 @@
 id: blocks_tag_gate
 label: Tag Gate
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -47,4 +48,16 @@ templates:
     callbacks:
     - self.${id}.set_single_key(${single_key})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/tag_gate.h>']
+    make: |-
+        this->${id} = blocks::tag_gate::make(${type.size} * ${vlen}, ${propagate_tags});
+        this->${id}.set_single_key(${single_key});
+    callbacks:
+    - self.${id}.set_single_key(${single_key})
+    translations:
+        gr.sizeof_: 'sizeof('
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_tag_object.block.yml b/gr-blocks/grc/blocks_tag_object.block.yml
index cf0f996470..4584290d43 100644
--- a/gr-blocks/grc/blocks_tag_object.block.yml
+++ b/gr-blocks/grc/blocks_tag_object.block.yml
@@ -1,5 +1,6 @@
 id: variable_tag_object
 label: Tag Object
+flags: python
 
 parameters:
 -   id: offset
diff --git a/gr-blocks/grc/blocks_tag_share.block.yml b/gr-blocks/grc/blocks_tag_share.block.yml
index 96096ef58c..b2f483164a 100644
--- a/gr-blocks/grc/blocks_tag_share.block.yml
+++ b/gr-blocks/grc/blocks_tag_share.block.yml
@@ -1,5 +1,6 @@
 id: blocks_tag_share
 label: Tag Share
+flags: python, cpp
 
 parameters:
 -   id: io_type
@@ -45,4 +46,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.tag_share(${io_type.size}, ${share_type.size}, ${vlen})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/tag_share.h>']
+    declarations: 'blocks::tag_share::sptr ${id};'
+    make: 'this->${id} = blocks::tag_share::make(${io_type.size}, ${share_type.size}, ${vlen});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_tagged_file_sink.block.yml b/gr-blocks/grc/blocks_tagged_file_sink.block.yml
index f70c78154b..b1cff2f24c 100644
--- a/gr-blocks/grc/blocks_tagged_file_sink.block.yml
+++ b/gr-blocks/grc/blocks_tagged_file_sink.block.yml
@@ -1,5 +1,6 @@
 id: blocks_tagged_file_sink
 label: Tagged File Sink
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -32,4 +33,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.tagged_file_sink(${type.size}*${vlen}, ${samp_rate})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/tagged_file_sink.h>']
+    declarations: 'blocks::tagged_file_sink::sptr ${id};'
+    make: 'this->${id} = blocks::tagged_file_sink::make(${type.size}*${vlen}, ${samp_rate});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_tagged_stream_align.block.yml b/gr-blocks/grc/blocks_tagged_stream_align.block.yml
index cfc5a7717a..bb6f5b3e20 100644
--- a/gr-blocks/grc/blocks_tagged_stream_align.block.yml
+++ b/gr-blocks/grc/blocks_tagged_stream_align.block.yml
@@ -1,5 +1,6 @@
 id: blocks_tagged_stream_align
 label: Tagged Stream Align
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -34,4 +35,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.tagged_stream_align(${type.size}*${vlen}, ${lengthtagname})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/tagged_stream_align.h>']
+    declarations: 'blocks::tagged_stream_align::sptr ${id};'
+    make: 'this->${id} = blocks::tagged_stream_align::make(${type.size}*${vlen}, ${lengthtagname});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_tagged_stream_multiply_length.block.yml b/gr-blocks/grc/blocks_tagged_stream_multiply_length.block.yml
index 90fbcf0c21..576ba89508 100644
--- a/gr-blocks/grc/blocks_tagged_stream_multiply_length.block.yml
+++ b/gr-blocks/grc/blocks_tagged_stream_multiply_length.block.yml
@@ -1,5 +1,6 @@
 id: blocks_tagged_stream_multiply_length
 label: Tagged Stream Multiply Length Tag
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -43,4 +44,14 @@ templates:
     callbacks:
     - set_scalar(${c})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/tagged_stream_multiply_length.h>']
+    declarations: 'blocks::tagged_stream_multiply_length::sptr ${id};'
+    make: 'this->${id} = blocks.tagged_stream_multiply_length(${type.size}*${vlen}, ${lengthtagname},
+        ${c});'
+    callbacks:
+    - set_scalar(${c})
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_tagged_stream_mux.block.yml b/gr-blocks/grc/blocks_tagged_stream_mux.block.yml
index 4807e95d2b..065103f93f 100644
--- a/gr-blocks/grc/blocks_tagged_stream_mux.block.yml
+++ b/gr-blocks/grc/blocks_tagged_stream_mux.block.yml
@@ -1,5 +1,6 @@
 id: blocks_tagged_stream_mux
 label: Tagged Stream Mux
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -43,4 +44,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.tagged_stream_mux(${type.size}*${vlen}, ${lengthtagname}, ${tag_preserve_head_pos})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/tagged_stream_mux.h>']
+    declarations: 'blocks::tagged_stream_mux::sptr ${id};'
+    make: 'this->${id} = blocks::tagged_stream_mux::make(${type.size}*${vlen}, ${lengthtagname}, ${tag_preserve_head_pos});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_tagged_stream_to_pdu.block.yml b/gr-blocks/grc/blocks_tagged_stream_to_pdu.block.yml
index e2292adb25..e62b5516df 100644
--- a/gr-blocks/grc/blocks_tagged_stream_to_pdu.block.yml
+++ b/gr-blocks/grc/blocks_tagged_stream_to_pdu.block.yml
@@ -1,5 +1,6 @@
 id: blocks_tagged_stream_to_pdu
 label: Tagged Stream to PDU
+flags: python
 
 parameters:
 -   id: type
@@ -27,4 +28,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.tagged_stream_to_pdu(${type.tv}, ${tag})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/tagged_stream_to_pdu.h>']
+    declarations: 'blocks::tagged_stream_to_pdu::sptr ${id};'
+    make: 'this->${id} = blocks::tagged_stream_to_pdu::make(${type.tv}, ${tag});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_tags_strobe.block.yml b/gr-blocks/grc/blocks_tags_strobe.block.yml
index 344fb9bde8..fffb8b7e46 100644
--- a/gr-blocks/grc/blocks_tags_strobe.block.yml
+++ b/gr-blocks/grc/blocks_tags_strobe.block.yml
@@ -1,5 +1,6 @@
 id: blocks_tags_strobe
 label: Tags Strobe
+flags: python
 
 parameters:
 -   id: type
diff --git a/gr-blocks/grc/blocks_tcp_server_sink.block.yml b/gr-blocks/grc/blocks_tcp_server_sink.block.yml
index fc8eae056b..e5d4fcc071 100644
--- a/gr-blocks/grc/blocks_tcp_server_sink.block.yml
+++ b/gr-blocks/grc/blocks_tcp_server_sink.block.yml
@@ -1,5 +1,6 @@
 id: blocks_tcp_server_sink
 label: TCP Server Sink
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,4 +40,13 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.tcp_server_sink(${type.size}*${vlen}, ${ipaddr}, ${port}, ${noblock})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/tcp_server_sink.h>']
+    declarations: 'blocks::tcp_server_sink::sptr ${id};'
+    make: 'this->${id} = blocks::tcp_server_sink::make(${type.size}*${vlen}, ${ipaddr}, ${port}, ${noblock});'
+    translations:
+        gr.sizeof_: 'sizeof('
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_test_tag_variable_rate_ff.block.yml b/gr-blocks/grc/blocks_test_tag_variable_rate_ff.block.yml
index 1a873cc19c..a13bd777ad 100644
--- a/gr-blocks/grc/blocks_test_tag_variable_rate_ff.block.yml
+++ b/gr-blocks/grc/blocks_test_tag_variable_rate_ff.block.yml
@@ -1,5 +1,6 @@
 id: blocks_test_tag_variable_rate_ff
 label: Test Tag Variable Rate
+flags: python, cpp
 
 parameters:
 -   id: once
@@ -26,4 +27,12 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.test_tag_variable_rate_ff(${once}, ${step})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/test_tag_variable_rate_ff.h>']
+    declarations: 'blocks::test_tag_variable_rate_ff::sptr ${id};'
+    make: 'this->${id} = blocks::test_tag_variable_rate_ff::make(${once}, ${step});'
+    translations:
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_threshold_ff.block.yml b/gr-blocks/grc/blocks_threshold_ff.block.yml
index 52a6f10059..23eb9c2d14 100644
--- a/gr-blocks/grc/blocks_threshold_ff.block.yml
+++ b/gr-blocks/grc/blocks_threshold_ff.block.yml
@@ -1,5 +1,6 @@
 id: blocks_threshold_ff
 label: Threshold
+flags: python, cpp
 
 parameters:
 -   id: low
@@ -30,4 +31,12 @@ templates:
     - set_hi(${high})
     - set_lo(${low})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/threshold_ff.h>']
+    declarations: 'blocks::threshold_ff::sptr ${id};'
+    make: 'this->${id} = blocks::threshold_ff::make(${low}, ${high}, ${init});'
+    callbacks:
+    - set_hi(${high})
+    - set_lo(${low})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_throttle.block.yml b/gr-blocks/grc/blocks_throttle.block.yml
index 8b497b60c4..0bfdeab0dc 100644
--- a/gr-blocks/grc/blocks_throttle.block.yml
+++ b/gr-blocks/grc/blocks_throttle.block.yml
@@ -1,6 +1,6 @@
 id: blocks_throttle
 label: Throttle
-flags: throttle
+flags: throttle, python, cpp
 
 parameters:
 -   id: type
@@ -45,4 +45,16 @@ templates:
     callbacks:
     - set_sample_rate(${samples_per_second})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/throttle.h>']
+    declarations: 'blocks::throttle::sptr ${id};'
+    make: 'this->${id} = blocks::throttle::make(${type.size})*${vlen}, ${samples_per_second}, ${ignoretag});'
+    callbacks:
+    - set_sample_rate(${samples_per_second})
+    translations:
+        gr.sizeof_: 'sizeof('
+        'True': 'true'
+        'False': 'false'
+
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_transcendental.block.yml b/gr-blocks/grc/blocks_transcendental.block.yml
index ca9e5cd0d3..3e1b25c617 100644
--- a/gr-blocks/grc/blocks_transcendental.block.yml
+++ b/gr-blocks/grc/blocks_transcendental.block.yml
@@ -1,5 +1,6 @@
 id: blocks_transcendental
 label: Transcendental
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -27,4 +28,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.transcendental(${name}, "${type}")
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/transcendental.h>']
+    declarations: 'blocks::transcendental::sptr ${id};'
+    make: 'this->${id} = blocks::transcendental::make(${name}, "$type");'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_tuntap_pdu.block.yml b/gr-blocks/grc/blocks_tuntap_pdu.block.yml
index 0fd183cbfe..d159e3e8f3 100644
--- a/gr-blocks/grc/blocks_tuntap_pdu.block.yml
+++ b/gr-blocks/grc/blocks_tuntap_pdu.block.yml
@@ -1,5 +1,6 @@
 id: blocks_tuntap_pdu
 label: TUNTAP PDU
+flags: python, cpp
 
 parameters:
 -   id: ifn
@@ -31,4 +32,12 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.tuntap_pdu(${ifn}, ${mtu}, ${istunflag})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/tuntap_pdu.h>']
+    declarations: 'blocks::tuntap_pdu::sptr ${id};'
+    make: 'this->${id} = blocks::tuntap_pdu::make(${ifn}, ${mtu}, ${istunflag});'
+    translations:
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_uchar_to_float.block.yml b/gr-blocks/grc/blocks_uchar_to_float.block.yml
index 984cbd3928..65a2284f6a 100644
--- a/gr-blocks/grc/blocks_uchar_to_float.block.yml
+++ b/gr-blocks/grc/blocks_uchar_to_float.block.yml
@@ -1,5 +1,6 @@
 id: blocks_uchar_to_float
 label: UChar To Float
+flags: python, cpp
 
 inputs:
 -   domain: stream
@@ -13,4 +14,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.uchar_to_float()
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/uchar_to_float.h>']
+    declarations: 'blocks::uchar_to_float::sptr ${id};'
+    make: 'this->${id} = blocks::uchar_to_float::make();'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_udp_sink.block.yml b/gr-blocks/grc/blocks_udp_sink.block.yml
index 1ffa83c033..a761b86127 100644
--- a/gr-blocks/grc/blocks_udp_sink.block.yml
+++ b/gr-blocks/grc/blocks_udp_sink.block.yml
@@ -1,5 +1,6 @@
 id: blocks_udp_sink
 label: UDP Sink
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -42,4 +43,13 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.udp_sink(${type.size}*${vlen}, ${ipaddr}, ${port}, ${psize}, ${eof})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/udp_sink.h>']
+    declarations: 'blocks::udp_sink::sptr ${id};'
+    make: 'this->${id} = blocks::udp_sink::make(${type.size}*${vlen}, ${ipaddr}, ${port}, ${psize}, ${eof});'
+    translations:
+        gr.sizeof_: 'sizeof('
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_udp_source.block.yml b/gr-blocks/grc/blocks_udp_source.block.yml
index 1e15678158..d6745d5ba3 100644
--- a/gr-blocks/grc/blocks_udp_source.block.yml
+++ b/gr-blocks/grc/blocks_udp_source.block.yml
@@ -1,6 +1,6 @@
 id: blocks_udp_source
 label: UDP Source
-flags: throttle
+flags: throttle, python, cpp
 
 parameters:
 -   id: type
@@ -45,4 +45,13 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.udp_source(${type.size}*${vlen}, ${ipaddr}, ${port}, ${psize}, ${eof})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/udp_source.h>']
+    declarations: 'blocks::udp_source::sptr ${id};'
+    make: 'this->${id} = blocks::udp_source::make(${type.size}*${vlen}, ${ipaddr}, ${port}, ${psize}, ${eof});'
+    translations:
+        gr.sizeof_: 'sizeof('
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_unpack_k_bits_bb.block.yml b/gr-blocks/grc/blocks_unpack_k_bits_bb.block.yml
index 065fc45ebf..d963702ca0 100644
--- a/gr-blocks/grc/blocks_unpack_k_bits_bb.block.yml
+++ b/gr-blocks/grc/blocks_unpack_k_bits_bb.block.yml
@@ -1,5 +1,6 @@
 id: blocks_unpack_k_bits_bb
 label: Unpack K Bits
+flags: python, cpp
 
 parameters:
 -   id: k
@@ -18,4 +19,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.unpack_k_bits_bb(${k})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/unpack_k_bits_bb.h>']
+    declarations: 'blocks::unpack_k_bits_bb::sptr ${id};'
+    make: 'this->${id} = blocks::unpack_k_bits_bb::make(${k});'
+
 file_format: 1
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 97c7af9e28..095516b178 100644
--- a/gr-blocks/grc/blocks_unpacked_to_packed_xx.block.yml
+++ b/gr-blocks/grc/blocks_unpacked_to_packed_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_unpacked_to_packed_xx
 label: Unpacked to Packed
+flags: python
 
 parameters:
 -   id: type
@@ -41,4 +42,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.unpacked_to_packed_${type.fcn}(${bits_per_chunk}, ${endianness})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/unpacked_to_packed_${type.fcn}.h>']
+    declarations: 'blocks::unpacked_to_packed_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::unpacked_to_packed_${type.fcn}::make(${bits_per_chunk}, ${endianness});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_vco_c.block.yml b/gr-blocks/grc/blocks_vco_c.block.yml
index b14b96bc54..dfcae9c7ae 100644
--- a/gr-blocks/grc/blocks_vco_c.block.yml
+++ b/gr-blocks/grc/blocks_vco_c.block.yml
@@ -1,5 +1,6 @@
 id: blocks_vco_c
 label: VCO (complex)
+flags: python, cpp
 
 parameters:
 -   id: samp_rate
@@ -24,4 +25,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.vco_c(${samp_rate}, ${sensitivity}, ${amplitude})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/vco_c.h>']
+    declarations: 'blocks::vco_c::sptr ${id};'
+    make: 'this->${id} = blocks::vco_c::make(${samp_rate}, ${sensitivity}, ${amplitude});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_vco_f.block.yml b/gr-blocks/grc/blocks_vco_f.block.yml
index 79ade4d0af..4b81117e12 100644
--- a/gr-blocks/grc/blocks_vco_f.block.yml
+++ b/gr-blocks/grc/blocks_vco_f.block.yml
@@ -1,5 +1,6 @@
 id: blocks_vco_f
 label: VCO
+flags: python, cpp
 
 parameters:
 -   id: samp_rate
@@ -24,4 +25,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.vco_f(${samp_rate}, ${sensitivity}, ${amplitude})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/vco_f.h>']
+    declarations: 'blocks::vco_f::sptr ${id};'
+    make: 'this->${id} = blocks::vco_f::make(${samp_rate}, ${sensitivity}, ${amplitude});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_vector_insert_x.block.yml b/gr-blocks/grc/blocks_vector_insert_x.block.yml
index d3b833865d..d27bc827d7 100644
--- a/gr-blocks/grc/blocks_vector_insert_x.block.yml
+++ b/gr-blocks/grc/blocks_vector_insert_x.block.yml
@@ -1,5 +1,6 @@
 id: blocks_vector_insert_x
 label: Vector Insert
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -35,6 +36,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.vector_insert_${type.fcn}(${vector}, ${period}, ${offset})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/vector_insert_${type.fcn}.h>']
+    declarations: 'blocks::vector_insert_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::vector_insert_${type.fcn}::make(${vector}, ${period}, ${offset});'
+
 documentation: |-
     Periodicity, the length of the periodicity at which the vector should be inserted at the output.
             (i.e. one vector for every N output items)
diff --git a/gr-blocks/grc/blocks_vector_sink_x.block.yml b/gr-blocks/grc/blocks_vector_sink_x.block.yml
index 4ffa4ddfde..f4640247c9 100644
--- a/gr-blocks/grc/blocks_vector_sink_x.block.yml
+++ b/gr-blocks/grc/blocks_vector_sink_x.block.yml
@@ -1,5 +1,6 @@
 id: blocks_vector_sink_x
 label: Vector Sink
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -32,4 +33,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.vector_sink_${type.fcn}(${vlen}, ${reserve_items})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/vector_sink_${type.fcn}.h>']
+    declarations: 'blocks::vector_sink_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::vector_sink_${type.fcn}::make(${vlen}, ${reserve_items});'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_vector_source_x.block.yml b/gr-blocks/grc/blocks_vector_source_x.block.yml
index 5cdb6d6d51..39df095a02 100644
--- a/gr-blocks/grc/blocks_vector_source_x.block.yml
+++ b/gr-blocks/grc/blocks_vector_source_x.block.yml
@@ -1,5 +1,6 @@
 id: blocks_vector_source_x
 label: Vector Source
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -44,4 +45,14 @@ templates:
     callbacks:
     - set_data(${vector}, ${tags})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/vector_source_${type.fcn}.h>']
+    declarations: 'blocks::vector_source_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::vector_source_${type.fcn}::make(${vector}, ${repeat}, ${vlen}, ${tags});'
+    callbacks:
+    - set_data(${vector}, ${tags})
+    translations:
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_vector_to_stream.block.yml b/gr-blocks/grc/blocks_vector_to_stream.block.yml
index 77b42ab68d..fab1f1d2b2 100644
--- a/gr-blocks/grc/blocks_vector_to_stream.block.yml
+++ b/gr-blocks/grc/blocks_vector_to_stream.block.yml
@@ -1,5 +1,6 @@
 id: blocks_vector_to_stream
 label: Vector to Stream
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,4 +40,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.vector_to_stream(${type.size}*${vlen}, ${num_items})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/vector_to_stream.h>']
+    declarations: 'blocks::vector_to_stream::sptr ${id};'
+    make: 'this->${id} = blocks::vector_to_stream::make(${type.size}*${vlen}, ${num_items});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_vector_to_streams.block.yml b/gr-blocks/grc/blocks_vector_to_streams.block.yml
index e64df38534..7affd864fe 100644
--- a/gr-blocks/grc/blocks_vector_to_streams.block.yml
+++ b/gr-blocks/grc/blocks_vector_to_streams.block.yml
@@ -1,5 +1,6 @@
 id: blocks_vector_to_streams
 label: Vector to Streams
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -40,4 +41,11 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.vector_to_streams(${type.size}*${vlen}, ${num_streams})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/vector_to_streams.h>']
+    declarations: 'blocks::vector_to_streams::sptr ${id};'
+    make: 'this->${id} = blocks::vector_to_streams::make(${type.size}*${vlen}, ${num_streams});'
+    translations:
+        gr.sizeof_: 'sizeof('
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_wavfile_sink.block.yml b/gr-blocks/grc/blocks_wavfile_sink.block.yml
index 6bce90d0ec..11d67aaffe 100644
--- a/gr-blocks/grc/blocks_wavfile_sink.block.yml
+++ b/gr-blocks/grc/blocks_wavfile_sink.block.yml
@@ -1,5 +1,6 @@
 id: blocks_wavfile_sink
 label: Wav File Sink
+flags: python, cpp
 
 parameters:
 -   id: file
@@ -33,4 +34,11 @@ templates:
     callbacks:
     - open(${file})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/wavfile_sink.h>']
+    declarations: 'blocks::wavfile_sink::sptr ${id};'
+    make: 'this->${id} = blocks::wavfile_sink::make(${file}, ${nchan}, ${samp_rate}, ${bits_per_sample});'
+    callbacks:
+    - open(${file})
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_wavfile_source.block.yml b/gr-blocks/grc/blocks_wavfile_source.block.yml
index 6a84ebbb83..d038b7a0d8 100644
--- a/gr-blocks/grc/blocks_wavfile_source.block.yml
+++ b/gr-blocks/grc/blocks_wavfile_source.block.yml
@@ -1,5 +1,6 @@
 id: blocks_wavfile_source
 label: Wav File Source
+flags: python, cpp
 
 parameters:
 -   id: file
@@ -29,4 +30,12 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.wavfile_source(${file}, ${repeat})
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/wavfile_source.h>']
+    declarations: 'blocks::wavfile_source::sptr ${id};'
+    make: 'this->${id} = blocks::wavfile_source::make(${file}, ${repeat});'
+    translations:
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-blocks/grc/blocks_xor_xx.block.yml b/gr-blocks/grc/blocks_xor_xx.block.yml
index 493afef0c2..7f9f78dd90 100644
--- a/gr-blocks/grc/blocks_xor_xx.block.yml
+++ b/gr-blocks/grc/blocks_xor_xx.block.yml
@@ -1,5 +1,6 @@
 id: blocks_xor_xx
 label: Xor
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -31,4 +32,9 @@ templates:
     imports: from gnuradio import blocks
     make: blocks.xor_${type.fcn}()
 
+cpp_templates:
+    includes: ['#include <gnuradio/blocks/xor_${type.fcn}.h>']
+    declarations: 'blocks::xor_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = blocks::xor_${type.fcn}::make();'
+
 file_format: 1
diff --git a/gr-blocks/grc/xmlrpc_client.block.yml b/gr-blocks/grc/xmlrpc_client.block.yml
index 3e395ecca4..54a1e20b84 100644
--- a/gr-blocks/grc/xmlrpc_client.block.yml
+++ b/gr-blocks/grc/xmlrpc_client.block.yml
@@ -1,5 +1,6 @@
 id: xmlrpc_client
 label: XMLRPC Client
+flags: python
 
 parameters:
 -   id: addr
diff --git a/gr-blocks/grc/xmlrpc_server.block.yml b/gr-blocks/grc/xmlrpc_server.block.yml
index fb33fa79a8..85d5c14447 100644
--- a/gr-blocks/grc/xmlrpc_server.block.yml
+++ b/gr-blocks/grc/xmlrpc_server.block.yml
@@ -1,5 +1,6 @@
 id: xmlrpc_server
 label: XMLRPC Server
+flags: python
 
 parameters:
 -   id: addr
author	Håkon Vågsether <haakonsv@gmail.com>	2017-12-21 00:07:28 +0100
committer	Håkon Vågsether <haakonsv@gmail.com>	2018-12-18 23:17:34 +0100
commit	612c65091a748eb85a8dea2d9414f0486777fb17 (patch)
tree	bb83a329c3f15ddfa3b2f19abc24f38c5638e356 /gr-blocks/grc
parent	bac53b29f7008b33667a7c2c481ace02d73f3264 (diff)