diff options
10 files changed, 38 insertions, 19 deletions
diff --git a/gr-filter/grc/filter_band_pass_filter.block.yml b/gr-filter/grc/filter_band_pass_filter.block.yml index 9644ead477..dee8767806 100644 --- a/gr-filter/grc/filter_band_pass_filter.block.yml +++ b/gr-filter/grc/filter_band_pass_filter.block.yml @@ -68,9 +68,17 @@ templates: imports: |- from gnuradio import filter from gnuradio.filter import firdes - make: "filter.${type}(${ 'interp' if str(type).startswith('interp') else 'decim' },\ - \ firdes.type.fcn(:\n\t${gain}, ${samp_rate}, ${low_cutoff_freq}, ${high_cutoff_freq},\ - \ ${width}, ${win}, ${beta}))" + make: |- + filter.${type}( + ${ interp if str(type).startswith('interp') else decim }, + firdes.type.fcn( + ${gain}, + ${samp_rate}, + ${low_cutoff_freq}, + ${high_cutoff_freq}, + ${width}, + ${win}, + ${beta})) callbacks: - set_taps(firdes.${type.fcn}(${gain}, ${samp_rate}, ${low_cutoff_freq}, ${high_cutoff_freq}, ${width}, ${win}, ${beta})) diff --git a/gr-filter/grc/filter_band_reject_filter.block.yml b/gr-filter/grc/filter_band_reject_filter.block.yml index cb1b4d01ae..4d1c889a1e 100644 --- a/gr-filter/grc/filter_band_reject_filter.block.yml +++ b/gr-filter/grc/filter_band_reject_filter.block.yml @@ -65,7 +65,7 @@ templates: from gnuradio.filter import firdes make: |- filter.${type}( - ${ 'interp' if str(type).startswith('interp') else 'decim' }, + ${ interp if str(type).startswith('interp') else decim }, firdes.band_reject( ${gain}, ${samp_rate}, diff --git a/gr-filter/grc/filter_high_pass_filter.block.yml b/gr-filter/grc/filter_high_pass_filter.block.yml index 1199d637b4..a0d836415e 100644 --- a/gr-filter/grc/filter_high_pass_filter.block.yml +++ b/gr-filter/grc/filter_high_pass_filter.block.yml @@ -62,7 +62,7 @@ templates: from gnuradio.filter import firdes make: |- filter.${type}( - ${ 'interp' if str(type).startswith('interp') else 'decim' }, + ${ interp if str(type).startswith('interp') else decim }, firdes.high_pass( ${gain}, ${samp_rate}, diff --git a/gr-filter/grc/filter_low_pass_filter.block.yml b/gr-filter/grc/filter_low_pass_filter.block.yml index 1e3ddd5d9b..489b59a513 100644 --- a/gr-filter/grc/filter_low_pass_filter.block.yml +++ b/gr-filter/grc/filter_low_pass_filter.block.yml @@ -62,7 +62,7 @@ templates: from gnuradio.filter import firdes make: |- filter.${type}( - ${ 'interp' if str(type).startswith('interp') else 'decim' }, + ${ interp if str(type).startswith('interp') else decim }, firdes.low_pass( ${gain}, ${samp_rate}, diff --git a/gr-filter/grc/filter_root_raised_cosine_filter.block.yml b/gr-filter/grc/filter_root_raised_cosine_filter.block.yml index fb0f99258f..37dca275bb 100644 --- a/gr-filter/grc/filter_root_raised_cosine_filter.block.yml +++ b/gr-filter/grc/filter_root_raised_cosine_filter.block.yml @@ -55,9 +55,15 @@ templates: imports: |- from gnuradio import filter from gnuradio.filter import firdes - make: "filter.${type}(${ 'interp' if str(type).startswith('interp') else 'decim' },\ - \ firdes.root_raised_cosine(:\n\t${gain}, ${samp_rate}, ${sym_rate}, ${alpha},\ - \ ${ntaps}))" + make: |- + filter.${type}( + ${ interp if str(type).startswith('interp') else decim }, + firdes.root_raised_cosine( + ${gain}, + ${samp_rate}, + ${sym_rate}, + ${alpha}, + ${ntaps})) callbacks: - set_taps(firdes.root_raised_cosine(${gain}, ${samp_rate}, ${sym_rate}, ${alpha}, ${ntaps})) diff --git a/gr-filter/grc/variable_band_pass_filter_taps.block.yml b/gr-filter/grc/variable_band_pass_filter_taps.block.yml index 4d82445a8a..2772cc077d 100644 --- a/gr-filter/grc/variable_band_pass_filter_taps.block.yml +++ b/gr-filter/grc/variable_band_pass_filter_taps.block.yml @@ -42,8 +42,9 @@ value: ${ firdes.type.fcn(gain, samp_rate, low_cutoff_freq, high_cutoff_freq, wi templates: imports: from gnuradio.filter import firdes - var_make: "\nself.${id} = ${id} = firdes.${type.fcn}(${gain}, ${samp_rate}, ${low_cutoff_freq},\ - \ ${high_cutoff_freq}, ${width}, ${win}, ${beta})\n " + var_make: |- + self.${id} = ${id} = firdes.${type.fcn}(${gain}, ${samp_rate}, ${low_cutoff_freq},\ + ${high_cutoff_freq}, ${width}, ${win}, ${beta}) documentation: |- This is a convenience wrapper for calling firdes.band_pass() or firdes.complex_band_pass() diff --git a/gr-filter/grc/variable_band_reject_filter_taps.block.yml b/gr-filter/grc/variable_band_reject_filter_taps.block.yml index fbb3825067..81095982f3 100644 --- a/gr-filter/grc/variable_band_reject_filter_taps.block.yml +++ b/gr-filter/grc/variable_band_reject_filter_taps.block.yml @@ -35,8 +35,9 @@ value: ${ firdes.band_reject(gain, samp_rate, low_cutoff_freq, high_cutoff_freq, templates: imports: from gnuradio.filter import firdes - var_make: "\nself.${id} = ${id} = firdes.band_reject(${gain}, ${samp_rate}, ${low_cutoff_freq},\ - \ ${high_cutoff_freq}, ${width}, ${win}, ${beta})\n " + var_make: |- + self.${id} = ${id} = firdes.band_reject(${gain}, ${samp_rate}, ${low_cutoff_freq},\ + ${high_cutoff_freq}, ${width}, ${win}, ${beta}) documentation: |- This is a convenience wrapper for calling firdes.band_reject(). diff --git a/gr-filter/grc/variable_high_pass_filter_taps.block.yml b/gr-filter/grc/variable_high_pass_filter_taps.block.yml index e7aa9ee0d5..68a4fdbec8 100644 --- a/gr-filter/grc/variable_high_pass_filter_taps.block.yml +++ b/gr-filter/grc/variable_high_pass_filter_taps.block.yml @@ -31,8 +31,9 @@ value: ${ firdes.high_pass(gain, samp_rate, cutoff_freq, width, win, beta) } templates: imports: from gnuradio.filter import firdes - var_make: "\nself.${id} = ${id} = firdes.high_pass(${gain}, ${samp_rate}, ${cutoff_freq},\ - \ ${width}, ${win}, ${beta})\n " + var_make: |- + self.${id} = ${id} = firdes.high_pass(${gain}, ${samp_rate}, ${cutoff_freq},\ + ${width}, ${win}, ${beta}) documentation: |- This variable is a convenience wrapper around a call to firdes.high_pass(...). diff --git a/gr-filter/grc/variable_low_pass_filter_taps.block.yml b/gr-filter/grc/variable_low_pass_filter_taps.block.yml index 2a28e2be1a..d4e1dc07b4 100644 --- a/gr-filter/grc/variable_low_pass_filter_taps.block.yml +++ b/gr-filter/grc/variable_low_pass_filter_taps.block.yml @@ -31,8 +31,9 @@ value: ${ firdes.low_pass(gain, samp_rate, cutoff_freq, width, win, beta) } templates: imports: from gnuradio.filter import firdes - var_make: "\nself.${id} = ${id} = firdes.low_pass(${gain}, ${samp_rate}, ${cutoff_freq},\ - \ ${width}, ${win}, ${beta})\n " + var_make: |- + self.${id} = ${id} = firdes.low_pass(${gain}, ${samp_rate}, ${cutoff_freq},\ + ${width}, ${win}, ${beta}) documentation: |- This variable is a convenience wrapper around a call to firdes.low_pass(...). diff --git a/gr-filter/grc/variable_rrc_filter_taps.block.yml b/gr-filter/grc/variable_rrc_filter_taps.block.yml index 6fcf0c56cb..738c084b0d 100644 --- a/gr-filter/grc/variable_rrc_filter_taps.block.yml +++ b/gr-filter/grc/variable_rrc_filter_taps.block.yml @@ -25,8 +25,9 @@ value: ${ firdes.root_raised_cosine(gain, samp_rate, sym_rate, alpha, ntaps) } templates: imports: from gnuradio.filter import firdes - var_make: "\nself.${id} = ${id} = firdes.root_raised_cosine(${gain}, ${samp_rate},\ - \ ${sym_rate}, ${alpha}, ${ntaps})\n " + var_make: |- + self.${id} = ${id} = firdes.root_raised_cosine(${gain}, ${samp_rate},\ + ${sym_rate}, ${alpha}, ${ntaps}) documentation: |- This is a convenience wrapper for calling firdes.root_raised_cosine(...). |