diff options
author | Håkon Vågsether <haakonsv@gmail.com> | 2018-07-26 23:58:01 +0200 |
---|---|---|
committer | Marcus Müller <marcus@hostalia.de> | 2018-08-25 14:18:01 +0200 |
commit | d7ed6a6f76ca9fbc77f15354af58b1110c446cf9 (patch) | |
tree | 9ee40bb7098703da6d00d15cc6705df2199e4010 /gr-dtv | |
parent | 35f76a9c487e1dabe74b03e874c90349b816aeff (diff) |
Cleaned up lots of blocks
Diffstat (limited to 'gr-dtv')
-rw-r--r-- | gr-dtv/grc/dtv_dvb_bbheader_bb.block.yml | 35 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvb_bbscrambler_bb.block.yml | 30 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvb_bch_bb.block.yml | 30 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvb_ldpc_bb.block.yml | 30 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbs2_interleaver_bb.block.yml | 14 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbs2_modulator_bc.block.yml | 15 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbs2_physical_cc.block.yml | 17 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_framemapper_cc.block.yml | 47 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.block.yml | 24 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_miso_cc.block.yml | 16 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_p1insertion_cc.block.yml | 28 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml | 21 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt2_pilotgenerator_cc.block.yml | 28 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_demod_reference_signals.block.yml | 17 | ||||
-rw-r--r-- | gr-dtv/grc/dtv_dvbt_reference_signals.block.yml | 17 |
15 files changed, 294 insertions, 75 deletions
diff --git a/gr-dtv/grc/dtv_dvb_bbheader_bb.block.yml b/gr-dtv/grc/dtv_dvb_bbheader_bb.block.yml index 7f51427af5..520e5dd4c8 100644 --- a/gr-dtv/grc/dtv_dvb_bbheader_bb.block.yml +++ b/gr-dtv/grc/dtv_dvb_bbheader_bb.block.yml @@ -143,12 +143,33 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvb_bbheader_bb(${standard.val}, \n% if str(standard) == 'STANDARD_DVBT2':\n\ - ${framesize1.val}, \n% else:\n${framesize2.val}, \n% endif\n% if str(standard)\ - \ == 'STANDARD_DVBT2':\n% if str(framesize1) == 'FECFRAME_NORMAL':\n${rate1.val},\ - \ \n% else:\n${rate2.val}, \n% endif\n% else:\n% if str(framesize2) == 'FECFRAME_NORMAL':\n\ - ${rate3.val}, \n% elif str(framesize2) == 'FECFRAME_MEDIUM':\n${rate4.val},\ - \ \n% else:\n${rate5.val}, \n% endif\n% endif\n${rolloff.val}, ${mode.val},\ - \ ${inband.val}, ${fecblocks}, ${tsrate})" + make: |- + dtv.dvb_bbheader_bb( + ${standard.val}, + % if str(standard) == 'STANDARD_DVBT2': + ${framesize1.val}, + % else: + ${framesize2.val}, + % endif + % if str(standard) == 'STANDARD_DVBT2': + % if str(framesize1) == 'FECFRAME_NORMAL': + ${rate1.val}, + % else: + ${rate2.val}, + % endif + % else: + % if str(framesize2) == 'FECFRAME_NORMAL': + ${rate3.val}, + % elif str(framesize2) == 'FECFRAME_MEDIUM': + ${rate4.val}, + % else: + ${rate5.val}, + % endif + % endif + ${rolloff.val}, + ${mode.val}, + ${inband.val}, + ${fecblocks}, + ${tsrate}) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvb_bbscrambler_bb.block.yml b/gr-dtv/grc/dtv_dvb_bbscrambler_bb.block.yml index c1e2a7685b..86872688ed 100644 --- a/gr-dtv/grc/dtv_dvb_bbscrambler_bb.block.yml +++ b/gr-dtv/grc/dtv_dvb_bbscrambler_bb.block.yml @@ -108,11 +108,29 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvb_bbscrambler_bb(${standard.val}, \n% if str(standard) == 'STANDARD_DVBT2':\n\ - ${framesize1.val}, \n% else:\n${framesize2.val}, \n% endif\n% if str(standard)\ - \ == 'STANDARD_DVBT2':\n% if str(framesize1) == 'FECFRAME_NORMAL':\n${rate1.val}\n\ - % else:\n${rate2.val}\n% endif\n% else:\n% if str(framesize2) == 'FECFRAME_NORMAL':\n\ - ${rate3.val}\n% elif str(framesize2) == 'FECFRAME_MEDIUM':\n${rate4.val}\n\ - % else:\n${rate5.val}\n% endif\n% endif\n)" + make: |- + dtv.dvb_bbscrambler_bb( + ${standard.val}, + % if str(standard) == 'STANDARD_DVBT2': + ${framesize1.val}, + % else: + ${framesize2.val}, + % endif + % if str(standard) == 'STANDARD_DVBT2': + % if str(framesize1) == 'FECFRAME_NORMAL': + ${rate1.val} + % else: + ${rate2.val} + % endif + % else: + % if str(framesize2) == 'FECFRAME_NORMAL': + ${rate3.val} + % elif str(framesize2) == 'FECFRAME_MEDIUM': + ${rate4.val} + % else: + ${rate5.val} + % endif + % endif + ) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvb_bch_bb.block.yml b/gr-dtv/grc/dtv_dvb_bch_bb.block.yml index bfde8654fa..a9b47a52b2 100644 --- a/gr-dtv/grc/dtv_dvb_bch_bb.block.yml +++ b/gr-dtv/grc/dtv_dvb_bch_bb.block.yml @@ -108,11 +108,29 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvb_bch_bb(${standard.val}, \n% if str(standard) == 'STANDARD_DVBT2':\n\ - ${framesize1.val}, \n% else:\n${framesize2.val}, \n% endif\n% if str(standard)\ - \ == 'STANDARD_DVBT2':\n% if str(framesize1) == 'FECFRAME_NORMAL':\n${rate1.val}\n\ - % else:\n${rate2.val}\n% endif\n% else:\n% if str(framesize2) == 'FECFRAME_NORMAL':\n\ - ${rate3.val}\n% elif str(framesize2) == 'FECFRAME_MEDIUM':\n${rate4.val}\n\ - % else:\n${rate5.val}\n% endif\n% endif\n)" + make: |- + dtv.dvb_bch_bb( + ${standard.val}, + % if str(standard) == 'STANDARD_DVBT2': + ${framesize1.val}, + % else: + ${framesize2.val}, + % endif + % if str(standard) == 'STANDARD_DVBT2': + % if str(framesize1) == 'FECFRAME_NORMAL': + ${rate1.val} + % else: + ${rate2.val} + % endif + % else: + % if str(framesize2) == 'FECFRAME_NORMAL': + ${rate3.val} + % elif str(framesize2) == 'FECFRAME_MEDIUM': + ${rate4.val} + % else: + ${rate5.val} + % endif + % endif + ) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvb_ldpc_bb.block.yml b/gr-dtv/grc/dtv_dvb_ldpc_bb.block.yml index 435e039d51..c8b5df4274 100644 --- a/gr-dtv/grc/dtv_dvb_ldpc_bb.block.yml +++ b/gr-dtv/grc/dtv_dvb_ldpc_bb.block.yml @@ -116,11 +116,29 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvb_ldpc_bb(${standard.val}, \n% if str(standard) == 'STANDARD_DVBT2':\n\ - ${framesize1.val}, \n% else:\n${framesize2.val}, \n% endif\n% if str(standard)\ - \ == 'STANDARD_DVBT2':\n% if str(framesize1) == 'FECFRAME_NORMAL':\n${rate1.val},\ - \ \n% else:\n${rate2.val}, \n% endif\n% else:\n% if str(framesize2) == 'FECFRAME_NORMAL':\n\ - ${rate3.val}, \n% elif str(framesize2) == 'FECFRAME_MEDIUM':\n${rate4.val},\ - \ \n% else:\n${rate5.val}, \n% endif\n% endif\n${constellation.val})" + make: |- + dtv.dvb_ldpc_bb( + ${standard.val}, + if str(standard) == 'STANDARD_DVBT2': + ${framesize1.val}, + % else: + ${framesize2.val}, + % endif + % if str(standard) == 'STANDARD_DVBT2': + % if str(framesize1) == 'FECFRAME_NORMAL': + ${rate1.val}, + % else: + ${rate2.val}, + % endif + % else: + % if str(framesize2) == 'FECFRAME_NORMAL': + ${rate3.val}, + % elif str(framesize2) == 'FECFRAME_MEDIUM': + ${rate4.val}, + % else: + ${rate5.val}, + % endif + % endif + ${constellation.val}) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvbs2_interleaver_bb.block.yml b/gr-dtv/grc/dtv_dvbs2_interleaver_bb.block.yml index ad9c79c1b8..d3a8a77abd 100644 --- a/gr-dtv/grc/dtv_dvbs2_interleaver_bb.block.yml +++ b/gr-dtv/grc/dtv_dvbs2_interleaver_bb.block.yml @@ -79,8 +79,16 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvbs2_interleaver_bb(${framesize.val}, \n% if str(framesize) == 'FECFRAME_NORMAL':\n\ - ${rate1.val}, \n% elif str(framesize) == 'FECFRAME_MEDIUM':\n${rate2.val},\ - \ \n% else:\n${rate3.val}, \n% endif\n${constellation.val})" + make: |- + dtv.dvbs2_interleaver_bb( + ${framesize.val}, + % if str(framesize) == 'FECFRAME_NORMAL': + ${rate1.val}, + % elif str(framesize) == 'FECFRAME_MEDIUM': + ${rate2.val}, + % else: + ${rate3.val}, + % endif + ${constellation.val}) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvbs2_modulator_bc.block.yml b/gr-dtv/grc/dtv_dvbs2_modulator_bc.block.yml index 07d6cd58ff..dee9dba9b0 100644 --- a/gr-dtv/grc/dtv_dvbs2_modulator_bc.block.yml +++ b/gr-dtv/grc/dtv_dvbs2_modulator_bc.block.yml @@ -95,8 +95,17 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvbs2_modulator_bc(${framesize.val},\n% if str(framesize) == 'FECFRAME_NORMAL':\n\ - ${rate1.val}, \n% elif str(framesize) == 'FECFRAME_MEDIUM':\n${rate2.val},\ - \ \n% else:\n${rate3.val}, \n% endif\n${constellation.val}, ${interpolation.val})" + make: |- + dtv.dvbs2_modulator_bc( + ${framesize.val}, + % if str(framesize) == 'FECFRAME_NORMAL': + ${rate1.val}, + % elif str(framesize) == 'FECFRAME_MEDIUM': + ${rate2.val}, + % else: + ${rate3.val}, + % endif + ${constellation.val}, + ${interpolation.val}) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvbs2_physical_cc.block.yml b/gr-dtv/grc/dtv_dvbs2_physical_cc.block.yml index 261b2f6b06..9872446d08 100644 --- a/gr-dtv/grc/dtv_dvbs2_physical_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbs2_physical_cc.block.yml @@ -90,9 +90,18 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvbs2_physical_cc(${framesize.val}, \n% if str(framesize) == 'FECFRAME_NORMAL':\n\ - ${rate1.val}, \n% elif str(framesize) == 'FECFRAME_MEDIUM':\n${rate2.val},\ - \ \n% else:\n${rate3.val}, \n% endif\n${constellation.val}, ${pilots.val},\ - \ ${goldcode})" + make: |- + dtv.dvbs2_physical_cc( + ${framesize.val}, + % if str(framesize) == 'FECFRAME_NORMAL': + ${rate1.val}, + % elif str(framesize) == 'FECFRAME_MEDIUM': + ${rate2.val}, + % else: + ${rate3.val}, + % endif + ${constellation.val}, + ${pilots.val}, + ${goldcode}) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvbt2_framemapper_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_framemapper_cc.block.yml index 3459c13afb..bb753e4625 100644 --- a/gr-dtv/grc/dtv_dvbt2_framemapper_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_framemapper_cc.block.yml @@ -190,14 +190,43 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvbt2_framemapper_cc(${framesize.val}, ${rate.val}, ${constellation.val},\ - \ ${rotation.val}, ${fecblocks}, ${tiblocks}, ${carriermode.val}, \n% if str(version)\ - \ == 'VERSION_111':\n${fftsize1.val}, \n% else:\n% if str(preamble2) == 'PREAMBLE_T2_SISO'\ - \ or str(preamble2) == 'PREAMBLE_T2_MISO':\n${fftsize1.val}, \n% else:\n${fftsize2.val},\ - \ \n% endif\n% endif\n${guardinterval.val}, ${l1constellation.val}, ${pilotpattern.val},\ - \ ${t2frames}, ${numdatasyms}, \n% if str(version) == 'VERSION_111':\n${paprmode1.val},\ - \ \n% else:\n${paprmode2.val}, \n% endif\n${version.val}, \n% if str(version)\ - \ == 'VERSION_111':\n${preamble1.val}, \n% else:\n${preamble2.val}, \n% endif\n\ - ${inputmode.val}, ${reservedbiasbits.val}, ${l1scrambled.val}, ${inband.val})" + make: |- + dtv.dvbt2_framemapper_cc( + ${framesize.val}, + ${rate.val}, + ${constellation.val}, + ${rotation.val}, + ${fecblocks}, + ${tiblocks}, + ${carriermode.val}, + % if str(version) == 'VERSION_111': + ${fftsize1.val}, + % else: + % if str(preamble2) == 'PREAMBLE_T2_SISO' or str(preamble2) == 'PREAMBLE_T2_MISO': + ${fftsize1.val}, + % else: + ${fftsize2.val}, + % endif + % endif + ${guardinterval.val}, + ${l1constellation.val}, + ${pilotpattern.val}, + ${t2frames}, + ${numdatasyms}, + % if str(version) == 'VERSION_111': + ${paprmode1.val}, + % else: + ${paprmode2.val}, + % endif + ${version.val}, + % if str(version) == 'VERSION_111': + ${preamble1.val}, + % else: + ${preamble2.val}, + % endif + ${inputmode.val}, + ${reservedbiasbits.val}, + ${l1scrambled.val}, + ${inband.val}) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.block.yml index 990d4b8002..e6977374f0 100644 --- a/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_freqinterleaver_cc.block.yml @@ -95,10 +95,24 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvbt2_freqinterleaver_cc(${carriermode.val}, ${fftsize.val}, ${pilotpattern.val},\ - \ ${guardinterval.val}, ${numdatasyms}, \n% if str(version) == 'VERSION_111':\n\ - ${paprmode1.val}, \n% else:\n${paprmode2.val}, \n% endif\n${version.val},\ - \ \n% if str(version) == 'VERSION_111':\n${preamble1.val}\n% else:\n${preamble2.val}\n\ - % endif\n)" + make: |- + dtv.dvbt2_freqinterleaver_cc( + ${carriermode.val}, + ${fftsize.val}, + ${pilotpattern.val}, + ${guardinterval.val}, + ${numdatasyms}, + % if str(version) == 'VERSION_111': + ${paprmode1.val}, + % else: + ${paprmode2.val}, + % endif + ${version.val}, + % if str(version) == 'VERSION_111': + ${preamble1.val} + % else: + ${preamble2.val} + % endif + ) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvbt2_miso_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_miso_cc.block.yml index 81550c9c1f..e00a0b047e 100644 --- a/gr-dtv/grc/dtv_dvbt2_miso_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_miso_cc.block.yml @@ -79,8 +79,18 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvbt2_miso_cc(${carriermode.val}, ${fftsize.val}, ${pilotpattern.val},\ - \ ${guardinterval.val}, ${numdatasyms}, \n% if str(version) == 'VERSION_111':\n\ - ${paprmode1.val}, \n% else:\n${paprmode2.val}, \n% endif\n)" + make: |- + dtv.dvbt2_miso_cc( + ${carriermode.val}, + ${fftsize.val}, + ${pilotpattern.val}, + ${guardinterval.val}, + ${numdatasyms}, + % if str(version) == 'VERSION_111': + ${paprmode1.val} + % else: + ${paprmode2.val} + % endif + ) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvbt2_p1insertion_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_p1insertion_cc.block.yml index ad9ab8519d..2749f035d0 100644 --- a/gr-dtv/grc/dtv_dvbt2_p1insertion_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_p1insertion_cc.block.yml @@ -96,11 +96,27 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvbt2_p1insertion_cc(${carriermode.val}, \n% if str(version) == 'VERSION_111':\n\ - ${fftsize1.val}, \n% else:\n% if str(preamble2) == 'PREAMBLE_T2_SISO' or str(preamble2)\ - \ == 'PREAMBLE_T2_MISO':\n${fftsize1.val}, \n% else:\n${fftsize2.val}, \n\ - % endif\n% endif\n${guardinterval.val}, ${numdatasyms}, \n% if str(version)\ - \ == 'VERSION_111':\n${preamble1.val}, \n% else:\n${preamble2.val}, \n% endif\n\ - ${showlevels.val}, ${vclip})" + make: |- + dtv.dvbt2_p1insertion_cc( + ${carriermode.val}, + % if str(version) == 'VERSION_111': + ${fftsize1.val}, + % else: + % if str(preamble2) == 'PREAMBLE_T2_SISO' or str(preamble2) == 'PREAMBLE_T2_MISO': + ${fftsize1.val}, + % else: + ${fftsize2.val}, + % endif + % endif + ${guardinterval.val}, + ${numdatasyms}, + % if str(version) == 'VERSION_111': + ${preamble1.val}, + % else: + ${preamble2.val}, + % endif + ${showlevels.val}, + ${vclip} + ) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml index 0e1d6c285d..646291b1af 100644 --- a/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_paprtr_cc.block.yml @@ -97,9 +97,22 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvbt2_paprtr_cc(${carriermode.val}, ${fftsize.val}, ${pilotpattern.val},\ - \ ${guardinterval.val}, ${numdatasyms}, \n% if str(version) == 'VERSION_111':\n\ - ${paprmode1.val}, \n% else:\n${paprmode2.val}, \n% endif\n${version.val},\ - \ ${vclip}, ${iterations}, ${fftsize.vlength})" + make: |- + dtv.dvbt2_paprtr_cc( + ${carriermode.val}, + ${fftsize.val}, + ${pilotpattern.val}, + ${guardinterval.val}, + ${numdatasyms}, + % if str(version) == 'VERSION_111': + ${paprmode1.val}, + % else: + ${paprmode2.val}, + % endif + ${version.val}, + ${vclip}, + ${iterations}, + ${fftsize.vlength} + ) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvbt2_pilotgenerator_cc.block.yml b/gr-dtv/grc/dtv_dvbt2_pilotgenerator_cc.block.yml index 083b86056c..1e9d7a9b74 100644 --- a/gr-dtv/grc/dtv_dvbt2_pilotgenerator_cc.block.yml +++ b/gr-dtv/grc/dtv_dvbt2_pilotgenerator_cc.block.yml @@ -128,10 +128,28 @@ outputs: templates: imports: from gnuradio import dtv - make: "dtv.dvbt2_pilotgenerator_cc(${carriermode.val}, ${fftsize.val}, ${pilotpattern.val},\ - \ ${guardinterval.val}, ${numdatasyms}, \n% if str(version) == 'VERSION_111':\n\ - ${paprmode1.val}, \n% else:\n${paprmode2.val}, \n% endif\n${version.val},\ - \ \n% if str(version) == 'VERSION_111':\n${preamble1.val}, \n% else:\n${preamble2.val},\ - \ \n% endif\n${misogroup.val}, ${equalization.val}, ${bandwidth.val}, ${fftsize.vlength})" + make: |- + dtv.dvbt2_pilotgenerator_cc( + ${carriermode.val}, + ${fftsize.val}, + ${pilotpattern.val}, + ${guardinterval.val}, + ${numdatasyms}, + % if str(version) == 'VERSION_111': + ${paprmode1.val}, + % else: + ${paprmode2.val}, + % endif + ${version.val}, + % if str(version) == 'VERSION_111': + ${preamble1.val}, + % else: + ${preamble2.val}, + % endif + ${misogroup.val}, + ${equalization.val}, + ${bandwidth.val}, + ${fftsize.vlength} + ) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvbt_demod_reference_signals.block.yml b/gr-dtv/grc/dtv_dvbt_demod_reference_signals.block.yml index a700f54eb6..dbd26e9502 100644 --- a/gr-dtv/grc/dtv_dvbt_demod_reference_signals.block.yml +++ b/gr-dtv/grc/dtv_dvbt_demod_reference_signals.block.yml @@ -78,9 +78,18 @@ outputs: templates: imports: from gnuradio import dtv - make: dtv.dvbt_demod_reference_signals(${type.size}, ${transmission_mode.fft_length}, - ${transmission_mode.payload_length}, ${constellation.val}, ${hierarchy.val}, - ${code_rate_hp.val}, ${code_rate_lp.val}, ${guard_interval.val}, ${transmission_mode.val}, - ${include_cell_id.val}, ${cell_id}) + make: |- + dtv.dvbt_demod_reference_signals( + ${type.size}, + ${transmission_mode.fft_length}, + ${transmission_mode.payload_length}, + ${constellation.val}, + ${hierarchy.val}, + ${code_rate_hp.val}, + ${code_rate_lp.val}, + ${guard_interval.val}, + ${transmission_mode.val}, + ${include_cell_id.val}, + ${cell_id}) file_format: 1 diff --git a/gr-dtv/grc/dtv_dvbt_reference_signals.block.yml b/gr-dtv/grc/dtv_dvbt_reference_signals.block.yml index d693b5ae10..3a3e879391 100644 --- a/gr-dtv/grc/dtv_dvbt_reference_signals.block.yml +++ b/gr-dtv/grc/dtv_dvbt_reference_signals.block.yml @@ -78,9 +78,18 @@ outputs: templates: imports: from gnuradio import dtv - make: dtv.dvbt_reference_signals(${type.size}, ${transmission_mode.payload_length}, - ${transmission_mode.fft_length}, ${constellation.val}, ${hierarchy.val}, ${code_rate_hp.val}, - ${code_rate_lp.val}, ${guard_interval.val}, ${transmission_mode.val}, ${include_cell_id.val}, - ${cell_id}) + make: |- + dtv.dvbt_reference_signals( + ${type.size}, + ${transmission_mode.payload_length}, + ${transmission_mode.fft_length}, + ${constellation.val}, + ${hierarchy.val}, + ${code_rate_hp.val}, + ${code_rate_lp.val}, + ${guard_interval.val}, + ${transmission_mode.val}, + ${include_cell_id.val}, + ${cell_id}) file_format: 1 |