4 files changed, 43 insertions, 0 deletions
diff --git a/gr-fft/grc/fft_ctrlport_probe_psd.block.yml b/gr-fft/grc/fft_ctrlport_probe_psd.block.yml
index 3349f42639..5f6de8a9be 100644
--- a/gr-fft/grc/fft_ctrlport_probe_psd.block.yml
+++ b/gr-fft/grc/fft_ctrlport_probe_psd.block.yml
@@ -1,5 +1,6 @@
 id: fft_ctrlport_probe_psd
 label: Ctrlport Probe PSD
+flags: [ python, cpp ]
 
 parameters:
 -   id: name
@@ -25,6 +26,14 @@ templates:
     callbacks:
     - set_length(${len})
 
+cpp_templates:
+    includes: [ '#include <gnuradio/fft/ctrlport_probe_psd.h>' ]
+    declarations: 'fft::ctrlport_probe_psd::sptr ${id};'
+    make: 'this->${id} = fft::ctrlport_probe_psd::make(${name}, ${desc}, ${len});'
+    link: ['gnuradio-fft']
+    callbacks:
+    - set_length(${len})
+
 documentation: |-
     Place this in a graph to export PSD values to a GRCP port probe.
 
diff --git a/gr-fft/grc/fft_fft_vxx.block.yml b/gr-fft/grc/fft_fft_vxx.block.yml
index d28bf5ccbe..ce30078b9b 100644
--- a/gr-fft/grc/fft_fft_vxx.block.yml
+++ b/gr-fft/grc/fft_fft_vxx.block.yml
@@ -1,11 +1,14 @@
 id: fft_vxx
 label: FFT
+flags: [ python, cpp ]
 
 parameters:
 -   id: type
     label: Input Type
     dtype: enum
     options: [complex, float]
+    option_attributes:
+        fcn: [vcc, vfc]
     hide: part
 -   id: fft_size
     label: FFT Size
@@ -54,4 +57,21 @@ templates:
     callbacks:
     - set_nthreads(${nthreads})
 
+cpp_templates:
+    includes: [ '#include <gnuradio/fft/fft.h>', '#include <gnuradio/fft/fft_${type.fcn}.h>', '#include <gnuradio/fft/window.h>' ]
+    declarations: 'fft::fft_${type.fcn}::sptr ${id};'
+    make: |-
+        % if type == "complex":
+        this->${id} = fft::fft_vcc::make(${fft_size}, ${forward}, ${window}, ${shift}, ${nthreads});
+        % else:
+        this->${id} = fft::fft_vfc::make(${fft_size}, ${forward}, ${window}, ${nthreads});
+        % endif
+    link: ['gnuradio-fft']
+    callbacks:
+    - set_nthreads(${nthreads})
+    translations:
+        'True': 'true'
+        'False': 'false'
+        'window.': 'fft::window::'
+
 file_format: 1
diff --git a/gr-fft/grc/fft_goertzel_fc.block.yml b/gr-fft/grc/fft_goertzel_fc.block.yml
index 6ea74e7f53..5e9851f153 100644
--- a/gr-fft/grc/fft_goertzel_fc.block.yml
+++ b/gr-fft/grc/fft_goertzel_fc.block.yml
@@ -1,16 +1,20 @@
 id: goertzel_fc
 label: Goertzel
+flags: [ python, cpp ]
 
 parameters:
 -   id: rate
     label: Rate
     dtype: int
+    default: '0'
 -   id: len
     label: Length
     dtype: int
+    default: '0'
 -   id: freq
     label: Frequency
     dtype: real
+    default: '0'
 
 inputs:
 -   domain: stream
@@ -27,4 +31,13 @@ templates:
     - set_freq(${freq})
     - set_rate(${rate})
 
+cpp_templates:
+    includes: [ '#include <gnuradio/fft/goertzel_fc.h>' ]
+    declarations: 'fft::goertzel_fc::sptr ${id};'
+    make: 'this->${id} = fft::goertzel_fc::make(${rate}, ${len}, ${freq});'
+    link: ['gnuradio-fft']
+    callbacks:
+    - set_freq(${freq})
+    - set_rate(${rate})
+
 file_format: 1
diff --git a/gr-fft/grc/fft_logpwrfft_x.block.yml b/gr-fft/grc/fft_logpwrfft_x.block.yml
index 9b83612631..47ca169496 100644
--- a/gr-fft/grc/fft_logpwrfft_x.block.yml
+++ b/gr-fft/grc/fft_logpwrfft_x.block.yml
@@ -1,5 +1,6 @@
 id: logpwrfft_x
 label: Log Power FFT
+flags: [ python ]
 
 parameters:
 -   id: type