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-analog/grc
parent: bac53b29f7008b33667a7c2c481ace02d73f3264 (diff)
34 files changed, 223 insertions, 2 deletions
diff --git a/gr-analog/grc/analog_agc2_xx.block.yml b/gr-analog/grc/analog_agc2_xx.block.yml
index 93990b5c3b..711d52ae9f 100644
--- a/gr-analog/grc/analog_agc2_xx.block.yml
+++ b/gr-analog/grc/analog_agc2_xx.block.yml
@@ -1,5 +1,6 @@
 id: analog_agc2_xx
 label: AGC2
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -50,4 +51,18 @@ templates:
     - set_gain(${gain})
     - set_max_gain(${max_gain})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/agc2_${type.fcn}.h>']
+    declarations: 'analog::agc2_${type.fcn}::sptr ${id};'
+    make: |-
+        this->${id} = analog::agc2_${type.fcn}::make(${attack_rate}, ${decay_rate}, ${reference}, ${gain});
+        this->${id}.set_max_gain(${max_gain});
+    callbacks:
+    - set_attack_rate(${attack_rate})
+    - set_decay_rate(${decay_rate})
+    - set_reference(${reference})
+    - set_gain(${gain})
+    - set_max_gain(${max_gain})
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_agc3_xx.block.yml b/gr-analog/grc/analog_agc3_xx.block.yml
index 17a03f6771..3c9c8b6593 100644
--- a/gr-analog/grc/analog_agc3_xx.block.yml
+++ b/gr-analog/grc/analog_agc3_xx.block.yml
@@ -1,5 +1,6 @@
 id: analog_agc3_xx
 label: AGC3
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -54,4 +55,18 @@ templates:
     - set_gain(${gain})
     - set_max_gain(${max_gain})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/agc3_${type.fcn}.h>']
+    declarations: 'analog::agc3_${type.fcn}::sptr ${id};'
+    make: |-
+        this->${id} = analog::agc3_${type.fcn}::make(${attack_rate}, ${decay_rate}, ${reference}, ${gain}, ${iir_update_decim});
+        this->${id}.set_max_gain(${max_gain});
+    callbacks:
+    - set_attack_rate(${attack_rate})
+    - set_decay_rate(${decay_rate})
+    - set_reference(${reference})
+    - set_gain(${gain})
+    - set_max_gain(${max_gain})
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_agc_xx.block.yml b/gr-analog/grc/analog_agc_xx.block.yml
index 52ef26f79f..8c03d28a42 100644
--- a/gr-analog/grc/analog_agc_xx.block.yml
+++ b/gr-analog/grc/analog_agc_xx.block.yml
@@ -1,5 +1,6 @@
 id: analog_agc_xx
 label: AGC
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -45,4 +46,17 @@ templates:
     - set_gain(${gain})
     - set_max_gain(${max_gain})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/agc_${type.fcn}.h>']
+    declarations: 'analog::agc_${type.fcn}::sptr ${id};'
+    make: |-
+        this->${id} = analog::agc_${type.fcn}::make(${rate}, ${reference}, ${gain});
+        this->${id}.set_max_gain(${max_gain});
+    callbacks:
+    - set_rate(${rate})
+    - set_reference(${reference})
+    - set_gain(${gain})
+    - set_max_gain(${max_gain})
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_am_demod_cf.block.yml b/gr-analog/grc/analog_am_demod_cf.block.yml
index 8bc6cc1c31..a0d6a83578 100644
--- a/gr-analog/grc/analog_am_demod_cf.block.yml
+++ b/gr-analog/grc/analog_am_demod_cf.block.yml
@@ -1,5 +1,6 @@
 id: analog_am_demod_cf
 label: AM Demod
+flags: python
 
 parameters:
 -   id: chan_rate
diff --git a/gr-analog/grc/analog_const_source_x.block.yml b/gr-analog/grc/analog_const_source_x.block.yml
index ac676b7ac4..c170330bbc 100644
--- a/gr-analog/grc/analog_const_source_x.block.yml
+++ b/gr-analog/grc/analog_const_source_x.block.yml
@@ -1,5 +1,6 @@
 id: analog_const_source_x
 label: Constant Source
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -25,4 +26,11 @@ templates:
     callbacks:
     - set_offset(${const})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/sig_source_${type.fcn}.h>']
+    make: 'this->${id} = analog::sig_source_${type.fcn}::make(0, analog::GR_CONST_WAVE, 0, 0, ${const});'
+    callbacks:
+    - set_offset(${const})
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_cpfsk_bc.block.yml b/gr-analog/grc/analog_cpfsk_bc.block.yml
index c9ccbaac27..17d15e6465 100644
--- a/gr-analog/grc/analog_cpfsk_bc.block.yml
+++ b/gr-analog/grc/analog_cpfsk_bc.block.yml
@@ -1,6 +1,7 @@
 id: analog_cpfsk_bc
 label: CPFSK
 category: '[Core]/Deprecated'
+flags: python, cpp
 
 parameters:
 -   id: k
@@ -28,4 +29,12 @@ templates:
     callbacks:
     - set_amplitude(${amplitude})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/cpfsk_bc.h>']
+    make: 'this->${id} = analog::cpfsk_bc::make(${k}, ${amplitude}, ${samples_per_symbol});'
+    callbacks:
+    - set_amplitude(${amplitude})
+    link: ['gnuradio-analog']
+
+
 file_format: 1
diff --git a/gr-analog/grc/analog_ctcss_squelch_ff.block.yml b/gr-analog/grc/analog_ctcss_squelch_ff.block.yml
index a3dd89f1f6..8fca766cf5 100644
--- a/gr-analog/grc/analog_ctcss_squelch_ff.block.yml
+++ b/gr-analog/grc/analog_ctcss_squelch_ff.block.yml
@@ -1,5 +1,6 @@
 id: analog_ctcss_squelch_ff
 label: CTCSS Squelch
+flags: python, cpp
 
 parameters:
 -   id: rate
@@ -42,4 +43,15 @@ templates:
     - set_level(${level})
     - set_frequency(${freq})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/ctcss_squelch_ff.h>']
+    make: 'this->${id} = analog::ctcss_squelch_ff::make(${rate}, ${freq}, ${level}, ${len}, ${ramp}, ${gate});'
+    callbacks:
+    - set_level(${level})
+    - set_frequency(${freq})
+    link: ['gnuradio-analog']
+    translations:
+        'True': 'true'
+        'False': 'false'
+
 file_format: 1
diff --git a/gr-analog/grc/analog_dpll_bb.block.yml b/gr-analog/grc/analog_dpll_bb.block.yml
index 289f3a283d..1d65c5c1b5 100644
--- a/gr-analog/grc/analog_dpll_bb.block.yml
+++ b/gr-analog/grc/analog_dpll_bb.block.yml
@@ -1,5 +1,6 @@
 id: analog_dpll_bb
 label: Detect Peak
+flags: python, cpp
 
 parameters:
 -   id: period
@@ -23,4 +24,11 @@ templates:
     callbacks:
     - set_gain(${gain})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/dpll_bb.h>']
+    make: 'this->${id} = analog::dpll_bb::make(${period}, ${gain});'
+    callbacks:
+    - set_gain(${gain})
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_fastnoise_source_x.block.yml b/gr-analog/grc/analog_fastnoise_source_x.block.yml
index 21c4366074..9d22665be5 100644
--- a/gr-analog/grc/analog_fastnoise_source_x.block.yml
+++ b/gr-analog/grc/analog_fastnoise_source_x.block.yml
@@ -1,5 +1,6 @@
 id: analog_fastnoise_source_x
 label: Fast Noise Source
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -39,6 +40,16 @@ templates:
     - set_type(${noise_type})
     - set_amplitude(${amp})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/fastnoise_source_${type.fcn}.h>']
+    make: 'this->${id} = analog::fastnoise_source_${type.fcn}::make(${noise_type}, ${amp}, ${seed}, ${samples});'
+    callbacks:
+    - set_type(${noise_type})
+    - set_amplitude(${amp})
+    link: ['gnuradio-analog']
+    translations:
+        analog.: 'analog::'
+
 documentation: |-
     The fast noise source works by pre-generating a pool of random variates taken from the specified distribution.  At runtime, samples are then uniform randomly chosen from this pool which is a very fast operation.
 
diff --git a/gr-analog/grc/analog_feedforward_agc_cc.block.yml b/gr-analog/grc/analog_feedforward_agc_cc.block.yml
index fd49a654a8..33a9b301aa 100644
--- a/gr-analog/grc/analog_feedforward_agc_cc.block.yml
+++ b/gr-analog/grc/analog_feedforward_agc_cc.block.yml
@@ -1,5 +1,6 @@
 id: analog_feedforward_agc_cc
 label: Feed Forward AGC
+flags: python, cpp
 
 parameters:
 -   id: num_samples
@@ -23,4 +24,9 @@ templates:
     imports: from gnuradio import analog
     make: analog.feedforward_agc_cc(${num_samples}, ${reference})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/feedforward_agc_cc.h>']
+    make: 'this->${id} = analog::feedforward_agc_cc::make(${num_samples}, ${reference});'
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_fm_deemph.block.yml b/gr-analog/grc/analog_fm_deemph.block.yml
index b9c11a6842..f038ad8263 100644
--- a/gr-analog/grc/analog_fm_deemph.block.yml
+++ b/gr-analog/grc/analog_fm_deemph.block.yml
@@ -1,5 +1,6 @@
 id: analog_fm_deemph
 label: FM Deemphasis
+flags: python
 
 parameters:
 -   id: samp_rate
diff --git a/gr-analog/grc/analog_fm_demod_cf.block.yml b/gr-analog/grc/analog_fm_demod_cf.block.yml
index a558253a2c..7f8111851d 100644
--- a/gr-analog/grc/analog_fm_demod_cf.block.yml
+++ b/gr-analog/grc/analog_fm_demod_cf.block.yml
@@ -1,5 +1,6 @@
 id: analog_fm_demod_cf
 label: FM Demod
+flags: python
 
 parameters:
 -   id: chan_rate
diff --git a/gr-analog/grc/analog_fm_preemph.block.yml b/gr-analog/grc/analog_fm_preemph.block.yml
index d3f05d3164..87b06d52c8 100644
--- a/gr-analog/grc/analog_fm_preemph.block.yml
+++ b/gr-analog/grc/analog_fm_preemph.block.yml
@@ -1,5 +1,6 @@
 id: analog_fm_preemph
 label: FM Preemphasis
+flags: python
 
 parameters:
 -   id: samp_rate
diff --git a/gr-analog/grc/analog_fmdet_cf.block.yml b/gr-analog/grc/analog_fmdet_cf.block.yml
index ee8661b80f..a901fe1f6f 100644
--- a/gr-analog/grc/analog_fmdet_cf.block.yml
+++ b/gr-analog/grc/analog_fmdet_cf.block.yml
@@ -1,5 +1,6 @@
 id: analog_fmdet_cf
 label: FM Detector
+flags: python
 
 parameters:
 -   id: samplerate
diff --git a/gr-analog/grc/analog_frequency_modulator_fc.block.yml b/gr-analog/grc/analog_frequency_modulator_fc.block.yml
index 09f3e807f3..13ee812df2 100644
--- a/gr-analog/grc/analog_frequency_modulator_fc.block.yml
+++ b/gr-analog/grc/analog_frequency_modulator_fc.block.yml
@@ -1,5 +1,6 @@
 id: analog_frequency_modulator_fc
 label: Frequency Mod
+flags: python, cpp
 
 parameters:
 -   id: sensitivity
@@ -20,4 +21,11 @@ templates:
     callbacks:
     - set_sensitivity(${sensitivity})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/frequency_modulator_fc.h>']
+    make: 'this->${id} = analog::frequency_modulator_fc::make(${sensitivity});'
+    callbacks:
+    - set_sensitivity(${sensitivity})
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_nbfm_rx.block.yml b/gr-analog/grc/analog_nbfm_rx.block.yml
index 8bb3da7684..04e09900d7 100644
--- a/gr-analog/grc/analog_nbfm_rx.block.yml
+++ b/gr-analog/grc/analog_nbfm_rx.block.yml
@@ -1,5 +1,6 @@
 id: analog_nbfm_rx
 label: NBFM Receive
+flags: python
 
 parameters:
 -   id: audio_rate
diff --git a/gr-analog/grc/analog_nbfm_tx.block.yml b/gr-analog/grc/analog_nbfm_tx.block.yml
index 00f63f8d64..da0d9eefc8 100644
--- a/gr-analog/grc/analog_nbfm_tx.block.yml
+++ b/gr-analog/grc/analog_nbfm_tx.block.yml
@@ -1,5 +1,6 @@
 id: analog_nbfm_tx
 label: NBFM Transmit
+flags: python
 
 parameters:
 -   id: audio_rate
diff --git a/gr-analog/grc/analog_noise_source_x.block.yml b/gr-analog/grc/analog_noise_source_x.block.yml
index bb3f67209e..feb092c08d 100644
--- a/gr-analog/grc/analog_noise_source_x.block.yml
+++ b/gr-analog/grc/analog_noise_source_x.block.yml
@@ -1,5 +1,6 @@
 id: analog_noise_source_x
 label: Noise Source
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -35,4 +36,14 @@ templates:
     - set_type(${noise_type})
     - set_amplitude(${amp})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/noise_source_${type.fcn}.h>']
+    make: 'this->${id} = analog::noise_source_${type.fcn}::make(${noise_type}, ${amp}, ${seed});'
+    callbacks:
+    - set_type(${noise_type})
+    - set_amplitude(${amp})
+    link: ['gnuradio-analog']
+    translations:
+        analog.: 'analog::'
+
 file_format: 1
diff --git a/gr-analog/grc/analog_phase_modulator_fc.block.yml b/gr-analog/grc/analog_phase_modulator_fc.block.yml
index 6d38ddd010..ea46af34fe 100644
--- a/gr-analog/grc/analog_phase_modulator_fc.block.yml
+++ b/gr-analog/grc/analog_phase_modulator_fc.block.yml
@@ -1,5 +1,6 @@
 id: analog_phase_modulator_fc
 label: Phase Mod
+flags: python, cpp
 
 parameters:
 -   id: sensitivity
@@ -20,4 +21,11 @@ templates:
     callbacks:
     - set_sensitivity(${sensitivity})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/phase_modulator_fc.h>']
+    make: 'this->${id} = analog::phase_modulator_fc::make(${sensitivity});'
+    link: ['gnuradio-analog']
+    callbacks:
+    - set_sensitivity(${sensitivity})
+
 file_format: 1
diff --git a/gr-analog/grc/analog_pll_carriertracking_cc.block.yml b/gr-analog/grc/analog_pll_carriertracking_cc.block.yml
index 1a66aca0a7..346a302a83 100644
--- a/gr-analog/grc/analog_pll_carriertracking_cc.block.yml
+++ b/gr-analog/grc/analog_pll_carriertracking_cc.block.yml
@@ -1,5 +1,6 @@
 id: analog_pll_carriertracking_cc
 label: PLL Carrier Tracking
+flags: python, cpp
 
 parameters:
 -   id: w
@@ -28,4 +29,13 @@ templates:
     - set_max_freq(${max_freq})
     - set_min_freq(${min_freq})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/pll_carriertracking_${type.fcn}.h>']
+    make: 'this->${id} = analog::pll_carriertracking_cc::make(${w}, ${max_freq}, ${min_freq});'
+    callbacks:
+    - set_loop_bandwidth(${w})
+    - set_max_freq(${max_freq})
+    - set_min_freq(${min_freq})
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_pll_freqdet_cf.block.yml b/gr-analog/grc/analog_pll_freqdet_cf.block.yml
index b9fe199dd2..43b3ab353d 100644
--- a/gr-analog/grc/analog_pll_freqdet_cf.block.yml
+++ b/gr-analog/grc/analog_pll_freqdet_cf.block.yml
@@ -1,5 +1,6 @@
 id: analog_pll_freqdet_cf
 label: PLL Freq Det
+flags: python, cpp
 
 parameters:
 -   id: w
@@ -28,4 +29,14 @@ templates:
     - set_max_freq(${max_freq})
     - set_min_freq(${min_freq})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/pll_freqdet_cf.h>']
+    make: 'this->${id} = analog::pll_freqdet_cf::make(${w}, ${max_freq}, ${min_freq});'
+    callbacks:
+    - set_loop_bandwidth(${w})
+    - set_max_freq(${max_freq})
+    - set_min_freq(${min_freq})
+    link: ['gnuradio-analog']
+
+
 file_format: 1
diff --git a/gr-analog/grc/analog_pll_refout_cc.block.yml b/gr-analog/grc/analog_pll_refout_cc.block.yml
index 5acd85c3b6..79c8723a1b 100644
--- a/gr-analog/grc/analog_pll_refout_cc.block.yml
+++ b/gr-analog/grc/analog_pll_refout_cc.block.yml
@@ -1,5 +1,6 @@
 id: analog_pll_refout_cc
 label: PLL Ref Out
+flags: python, cpp
 
 parameters:
 -   id: w
@@ -28,4 +29,13 @@ templates:
     - set_max_freq(${max_freq})
     - set_min_freq(${min_freq})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/pll_refout_cc.h>']
+    make: 'this->${id} = analog::pll_refout_cc::make(${w}, ${max_freq}, ${min_freq});'
+    callbacks:
+    - set_loop_bandwidth(${w})
+    - set_max_freq(${max_freq})
+    - set_min_freq(${min_freq})
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_probe_avg_mag_sqrd_x.block.yml b/gr-analog/grc/analog_probe_avg_mag_sqrd_x.block.yml
index ad128c1521..091cbac98f 100644
--- a/gr-analog/grc/analog_probe_avg_mag_sqrd_x.block.yml
+++ b/gr-analog/grc/analog_probe_avg_mag_sqrd_x.block.yml
@@ -1,5 +1,6 @@
 id: analog_probe_avg_mag_sqrd_x
 label: Probe Avg Mag^2
+flags: python
 
 parameters:
 -   id: type
diff --git a/gr-analog/grc/analog_pwr_squelch_xx.block.yml b/gr-analog/grc/analog_pwr_squelch_xx.block.yml
index 20bcfa923e..eb780e4897 100644
--- a/gr-analog/grc/analog_pwr_squelch_xx.block.yml
+++ b/gr-analog/grc/analog_pwr_squelch_xx.block.yml
@@ -1,5 +1,6 @@
 id: analog_pwr_squelch_xx
 label: Power Squelch
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -41,4 +42,15 @@ templates:
     - set_threshold(${threshold})
     - set_alpha(${alpha})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/pwr_squelch_${type.fcn}.h>']
+    make: 'this->${id} = analog::pwr_squelch_${type.fcn}::make(${threshold}, ${alpha}, ${ramp}, ${gate});'
+    callbacks:
+    - set_threshold(${threshold})
+    - set_alpha(${alpha})
+    link: ['gnuradio-analog']
+    translations:
+        True: true
+        False: false
+
 file_format: 1
diff --git a/gr-analog/grc/analog_quadrature_demod_cf.block.yml b/gr-analog/grc/analog_quadrature_demod_cf.block.yml
index 874b286c87..636e264b06 100644
--- a/gr-analog/grc/analog_quadrature_demod_cf.block.yml
+++ b/gr-analog/grc/analog_quadrature_demod_cf.block.yml
@@ -1,5 +1,6 @@
 id: analog_quadrature_demod_cf
 label: Quadrature Demod
+flags: python
 
 parameters:
 -   id: gain
diff --git a/gr-analog/grc/analog_rail_ff.block.yml b/gr-analog/grc/analog_rail_ff.block.yml
index 8a2d2e8a54..df2be8f4c1 100644
--- a/gr-analog/grc/analog_rail_ff.block.yml
+++ b/gr-analog/grc/analog_rail_ff.block.yml
@@ -1,5 +1,6 @@
 id: analog_rail_ff
 label: Rail
+flags: python, cpp
 
 parameters:
 -   id: lo
@@ -24,4 +25,12 @@ templates:
     - set_lo(${lo})
     - set_hi(${hi})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/rail_ff.h>']
+    make: 'this->${id} = analog::rail_ff::make(${lo}, ${hi});'
+    callbacks:
+    - set_lo(${lo})
+    - set_hi(${hi})
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_random_source_x.block.yml b/gr-analog/grc/analog_random_source_x.block.yml
index 20fb31932f..0c0d36d726 100644
--- a/gr-analog/grc/analog_random_source_x.block.yml
+++ b/gr-analog/grc/analog_random_source_x.block.yml
@@ -1,5 +1,6 @@
 id: analog_random_source_x
 label: Random Source
+flags: python
 
 parameters:
 -   id: type
@@ -43,9 +44,9 @@ documentation: |-
     Generate num samples of random numbers of [min, max). Repeat samples if specified.
 
     Ex: With min=0 and max=2, the sequence 01110101... will be generated.
-    
+
     This block wraps Vector Source, i.e. it creates a vector source using a vector filled with values returned from calling np.random.randint(min, max, num_samps) once
 
     If you would like a traditional random number generator, use Random Uniform Source instead
-    
+
 file_format: 1
diff --git a/gr-analog/grc/analog_random_uniform_source_x.block.yml b/gr-analog/grc/analog_random_uniform_source_x.block.yml
index d76bc903a5..7a538aacb2 100644
--- a/gr-analog/grc/analog_random_uniform_source_x.block.yml
+++ b/gr-analog/grc/analog_random_uniform_source_x.block.yml
@@ -1,5 +1,6 @@
 id: analog_random_uniform_source_x
 label: Random Uniform Source
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -29,4 +30,9 @@ templates:
     imports: from gnuradio import analog
     make: analog.random_uniform_source_${type.fcn}(${minimum}, ${maximum}, ${seed})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/random_uniform_source_${type.fcn}.h>']
+    make: 'this->${id} = analog.random_uniform_source_${type.fcn}(${minimum}, ${maximum}, ${seed});'
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_sig_source_x.block.yml b/gr-analog/grc/analog_sig_source_x.block.yml
index 2fbc853a9b..ec4fa726dc 100644
--- a/gr-analog/grc/analog_sig_source_x.block.yml
+++ b/gr-analog/grc/analog_sig_source_x.block.yml
@@ -1,5 +1,6 @@
 id: analog_sig_source_x
 label: Signal Source
+flags: python, cpp
 
 parameters:
 -   id: type
@@ -54,4 +55,18 @@ templates:
     - set_amplitude(${amp})
     - set_offset(${offset})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/sig_source_${type.fcn}.h>']
+    declarations: 'analog::sig_source_${type.fcn}::sptr ${id};'
+    make: 'this->${id} = analog::sig_source_${type.fcn}::make(${samp_rate}, ${waveform}, ${freq}, ${amp}, ${offset});'
+    callbacks:
+    - set_sampling_freq(${samp_rate})
+    - set_waveform(${waveform})
+    - set_frequency(${freq})
+    - set_amplitude(${amp})
+    - set_offset(${offset})
+    link: ['gnuradio-analog']
+    translations:
+        analog.: 'analog::'
+
 file_format: 1
diff --git a/gr-analog/grc/analog_simple_squelch_cc.block.yml b/gr-analog/grc/analog_simple_squelch_cc.block.yml
index 17a98eb4ba..fd96ba5ca0 100644
--- a/gr-analog/grc/analog_simple_squelch_cc.block.yml
+++ b/gr-analog/grc/analog_simple_squelch_cc.block.yml
@@ -1,5 +1,6 @@
 id: analog_simple_squelch_cc
 label: Simple Squelch
+flags: python, cpp
 
 parameters:
 -   id: threshold
@@ -24,4 +25,12 @@ templates:
     - set_threshold(${threshold})
     - set_alpha(${alpha})
 
+cpp_templates:
+    includes: ['#include <gnuradio/analog/simple_squelch_cc.h>']
+    make: 'this->${id} = analog::simple_squelch_cc::make(${threshold}, ${alpha});'
+    callbacks:
+    - set_threshold(${threshold})
+    - set_alpha(${alpha})
+    link: ['gnuradio-analog']
+
 file_format: 1
diff --git a/gr-analog/grc/analog_standard_squelch.block.yml b/gr-analog/grc/analog_standard_squelch.block.yml
index d753dfaf01..54ab6c24e8 100644
--- a/gr-analog/grc/analog_standard_squelch.block.yml
+++ b/gr-analog/grc/analog_standard_squelch.block.yml
@@ -1,5 +1,6 @@
 id: analog_standard_squelch
 label: Standard Squelch
+flags: python
 
 parameters:
 -   id: audio_rate
diff --git a/gr-analog/grc/analog_wfm_rcv.block.yml b/gr-analog/grc/analog_wfm_rcv.block.yml
index eb3a84893e..bca69001a9 100644
--- a/gr-analog/grc/analog_wfm_rcv.block.yml
+++ b/gr-analog/grc/analog_wfm_rcv.block.yml
@@ -1,5 +1,6 @@
 id: analog_wfm_rcv
 label: WBFM Receive
+flags: python
 
 parameters:
 -   id: quad_rate
diff --git a/gr-analog/grc/analog_wfm_rcv_pll.block.yml b/gr-analog/grc/analog_wfm_rcv_pll.block.yml
index e5e3d76ccc..363f86cf86 100644
--- a/gr-analog/grc/analog_wfm_rcv_pll.block.yml
+++ b/gr-analog/grc/analog_wfm_rcv_pll.block.yml
@@ -1,5 +1,6 @@
 id: analog_wfm_rcv_pll
 label: WBFM Receive PLL
+flags: python
 
 parameters:
 -   id: quad_rate
diff --git a/gr-analog/grc/analog_wfm_tx.block.yml b/gr-analog/grc/analog_wfm_tx.block.yml
index 1e4346c41d..bf114e2fc5 100644
--- a/gr-analog/grc/analog_wfm_tx.block.yml
+++ b/gr-analog/grc/analog_wfm_tx.block.yml
@@ -1,5 +1,6 @@
 id: analog_wfm_tx
 label: WBFM Transmit
+flags: python
 
 parameters:
 -   id: audio_rate
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-analog/grc
parent	bac53b29f7008b33667a7c2c481ace02d73f3264 (diff)