diff options
| author | Terry May <terrydmay@gmail.com> | 2019-11-28 13:43:38 -0500 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2020-01-02 14:32:35 -0800 |
| commit | 479fb2596032a0f1482ed184bd4fe93186332b9e (patch) | |
| tree | 278893b36e0920da659bc5a7c0a467ce1387c2fa | |
| parent | a1d8932e3ce36227cb1dc3d41fda189c2d315961 (diff) | |
analog: Fix C++ generation
Fixes C++ code gen for the following modules:
- agc, agc2, agc3
- const_source
- frequency_modulator_fc
- wfm_tx
| -rw-r--r-- | gr-analog/grc/analog_agc2_xx.block.yml | 2 | ||||
| -rw-r--r-- | gr-analog/grc/analog_agc3_xx.block.yml | 2 | ||||
| -rw-r--r-- | gr-analog/grc/analog_agc_xx.block.yml | 2 | ||||
| -rw-r--r-- | gr-analog/grc/analog_const_source_x.block.yml | 3 | ||||
| -rw-r--r-- | gr-analog/grc/analog_frequency_modulator_fc.block.yml | 1 | ||||
| -rw-r--r-- | gr-analog/grc/analog_wfm_tx.block.yml | 8 |
6 files changed, 13 insertions, 5 deletions
diff --git a/gr-analog/grc/analog_agc2_xx.block.yml b/gr-analog/grc/analog_agc2_xx.block.yml index 5594d448de..a703030582 100644 --- a/gr-analog/grc/analog_agc2_xx.block.yml +++ b/gr-analog/grc/analog_agc2_xx.block.yml @@ -56,7 +56,7 @@ cpp_templates: 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}); + this->${id}->set_max_gain(${max_gain}); callbacks: - set_attack_rate(${attack_rate}) - set_decay_rate(${decay_rate}) diff --git a/gr-analog/grc/analog_agc3_xx.block.yml b/gr-analog/grc/analog_agc3_xx.block.yml index 272515f45d..de1c117b37 100644 --- a/gr-analog/grc/analog_agc3_xx.block.yml +++ b/gr-analog/grc/analog_agc3_xx.block.yml @@ -60,7 +60,7 @@ cpp_templates: 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}); + this->${id}->set_max_gain(${max_gain}); callbacks: - set_attack_rate(${attack_rate}) - set_decay_rate(${decay_rate}) diff --git a/gr-analog/grc/analog_agc_xx.block.yml b/gr-analog/grc/analog_agc_xx.block.yml index d1e21faa98..d8c3866132 100644 --- a/gr-analog/grc/analog_agc_xx.block.yml +++ b/gr-analog/grc/analog_agc_xx.block.yml @@ -51,7 +51,7 @@ cpp_templates: 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}); + this->${id}->set_max_gain(${max_gain}); callbacks: - set_rate(${rate}) - set_reference(${reference}) diff --git a/gr-analog/grc/analog_const_source_x.block.yml b/gr-analog/grc/analog_const_source_x.block.yml index 348bd8377c..929ed6496a 100644 --- a/gr-analog/grc/analog_const_source_x.block.yml +++ b/gr-analog/grc/analog_const_source_x.block.yml @@ -27,7 +27,8 @@ templates: - set_offset(${const}) cpp_templates: - includes: ['#include <gnuradio/analog/sig_source_${type.fcn}.h>'] + includes: ['#include <gnuradio/analog/sig_source.h>'] + declarations: 'analog::sig_source_${type.fcn}::sptr ${id};' make: 'this->${id} = analog::sig_source_${type.fcn}::make(0, analog::GR_CONST_WAVE, 0, 0, ${const});' callbacks: - set_offset(${const}) diff --git a/gr-analog/grc/analog_frequency_modulator_fc.block.yml b/gr-analog/grc/analog_frequency_modulator_fc.block.yml index 40c8172c21..918b8713a8 100644 --- a/gr-analog/grc/analog_frequency_modulator_fc.block.yml +++ b/gr-analog/grc/analog_frequency_modulator_fc.block.yml @@ -23,6 +23,7 @@ templates: cpp_templates: includes: ['#include <gnuradio/analog/frequency_modulator_fc.h>'] + declarations: 'gr::analog::frequency_modulator_fc::sptr ${id};' make: 'this->${id} = analog::frequency_modulator_fc::make(${sensitivity});' callbacks: - set_sensitivity(${sensitivity}) diff --git a/gr-analog/grc/analog_wfm_tx.block.yml b/gr-analog/grc/analog_wfm_tx.block.yml index d2c9f42363..83afa44c10 100644 --- a/gr-analog/grc/analog_wfm_tx.block.yml +++ b/gr-analog/grc/analog_wfm_tx.block.yml @@ -1,6 +1,6 @@ id: analog_wfm_tx label: WBFM Transmit -flags: [ python ] +flags: [ python, cpp ] parameters: - id: audio_rate @@ -38,4 +38,10 @@ templates: make: "analog.wfm_tx(\n\taudio_rate=${audio_rate},\n\tquad_rate=${quad_rate},\n\ \ttau=${tau},\n\tmax_dev=${max_dev},\n\tfh=${fh},\n)" +cpp_templates: + includes: [ '#include <gnuradio/analog/frequency_modulator_fc.h>', '#include <boost/math/constants/constants.hpp>' ] + declarations: gr::analog::frequency_modulator_fc::sptr ${id}; + make: this->${id} = gr::analog::frequency_modulator_fc::make(2 * boost::math::constants::pi<double>() * ${max_dev} / ${quad_rate}); + link: ['gnuradio-analog'] + file_format: 1 |