Skip to content
This repository has been archived by the owner on Mar 14, 2020. It is now read-only.

Commit

Permalink
Remove redundant block parameters with Cheetah templates.
Browse files Browse the repository at this point in the history
  • Loading branch information
@drmpeg
drmpeg committed Feb 11, 2015
1 parent 1e1685c commit 88b8df4
Show file tree
Hide file tree
Showing 17 changed files with 243 additions and 97 deletions.
63 changes: 58 additions & 5 deletions grc/dvbt2_framemapper_cc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,29 @@
<key>dvbt2_framemapper_cc</key>
<category>dvbt2</category>
<import>import dvbt2</import>
<make>dvbt2.framemapper_cc($framesize.val, $rate.val, $constellation.val, $rotation.val, $fecblocks, $tiblocks, $carriermode.val, $fftsize1.val, $fftsize2.val, $guardinterval.val, $l1constellation.val, $pilotpattern.val, $t2frames, $numdatasyms, $paprmode.val, $version.val, $preamble1.val, $preamble2.val, $inputmode.val, $reservedbiasbits.val, $l1scrambled.val, $inband.val)</make>
<make>dvbt2.framemapper_cc($framesize.val, $rate.val, $constellation.val, $rotation.val, $fecblocks, $tiblocks, $carriermode.val, #slurp
#if str($version) == 'VERSION_111'
$fftsize1.val, #slurp
#else
#if str($preamble2) == 'PREAMBLE_T2_SISO' or str($preamble2) == 'PREAMBLE_T2_MISO'
$fftsize1.val, #slurp
#else
$fftsize2.val, #slurp
#end if
#end if
$guardinterval.val, $l1constellation.val, $pilotpattern.val, $t2frames, $numdatasyms, #slurp
#if str($version) == 'VERSION_111'
$paprmode1.val, #slurp
#else
$paprmode2.val, #slurp
#end if
$version.val, #slurp
#if str($version) == 'VERSION_111'
$preamble1.val, #slurp
#else
$preamble2.val, #slurp
#end if
$inputmode.val, $reservedbiasbits.val, $l1scrambled.val, $inband.val)</make>
<param>
<name>FECFRAME size</name>
<key>framesize</key>
Expand Down Expand Up @@ -135,7 +157,7 @@
<name>FFT Size</name>
<key>fftsize1</key>
<type>enum</type>
<hide>$preamble2.hide_base</hide>
<hide>#if str($version) == 'VERSION_111' then $preamble1.hide_base else $preamble2.hide_base</hide>
<option>
<name>1K</name>
<key>FFTSIZE_1K</key>
Expand Down Expand Up @@ -181,7 +203,7 @@
<name>FFT Size</name>
<key>fftsize2</key>
<type>enum</type>
<hide>$preamble2.hide_lite</hide>
<hide>#if str($version) == 'VERSION_111' then $preamble1.hide_lite else $preamble2.hide_lite</hide>
<option>
<name>2K</name>
<key>FFTSIZE_2K</key>
Expand Down Expand Up @@ -337,10 +359,37 @@
</param>
<param>
<name>PAPR Mode</name>
<key>paprmode</key>
<key>paprmode1</key>
<type>enum</type>
<hide>$version.hide_111</hide>
<option>
<name>Off</name>
<key>PAPR_OFF</key>
<opt>val:dvbt2.PAPR_OFF</opt>
</option>
<option>
<name>Active Constellation Extension</name>
<key>PAPR_ACE</key>
<opt>val:dvbt2.PAPR_ACE</opt>
</option>
<option>
<name>Tone Reservation</name>
<key>PAPR_TR</key>
<opt>val:dvbt2.PAPR_TR</opt>
</option>
<option>
<name>Off (1.1.1) / P2 Only (1.3.1)</name>
<name>Both ACE and TR</name>
<key>PAPR_BOTH</key>
<opt>val:dvbt2.PAPR_BOTH</opt>
</option>
</param>
<param>
<name>PAPR Mode</name>
<key>paprmode2</key>
<type>enum</type>
<hide>$version.hide_131</hide>
<option>
<name>P2 Only</name>
<key>PAPR_OFF</key>
<opt>val:dvbt2.PAPR_OFF</opt>
</option>
Expand Down Expand Up @@ -388,11 +437,15 @@
<name>T2 SISO</name>
<key>PREAMBLE_T2_SISO</key>
<opt>val:dvbt2.PREAMBLE_T2_SISO</opt>
<opt>hide_lite:all</opt>
<opt>hide_base:</opt>
</option>
<option>
<name>T2 MISO</name>
<key>PREAMBLE_T2_MISO</key>
<opt>val:dvbt2.PREAMBLE_T2_MISO</opt>
<opt>hide_lite:all</opt>
<opt>hide_base:</opt>
</option>
</param>
<param>
Expand Down
45 changes: 42 additions & 3 deletions grc/dvbt2_freqinterleaver_cc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,19 @@
<key>dvbt2_freqinterleaver_cc</key>
<category>dvbt2</category>
<import>import dvbt2</import>
<make>dvbt2.freqinterleaver_cc($carriermode.val, $fftsize.val, $pilotpattern.val, $guardinterval.val, $numdatasyms, $paprmode.val, $version.val, $preamble1.val, $preamble2.val)</make>
<make>dvbt2.freqinterleaver_cc($carriermode.val, $fftsize.val, $pilotpattern.val, $guardinterval.val, $numdatasyms, #slurp
#if str($version) == 'VERSION_111'
$paprmode1.val, #slurp
#else
$paprmode2.val, #slurp
#end if
$version.val, #slurp
#if str($version) == 'VERSION_111'
$preamble1.val, #slurp
#else
$preamble2.val, #slurp
#end if
)</make>
<param>
<name>Extended Carrier Mode</name>
<key>carriermode</key>
Expand Down Expand Up @@ -162,10 +174,37 @@
</param>
<param>
<name>PAPR Mode</name>
<key>paprmode</key>
<key>paprmode1</key>
<type>enum</type>
<hide>$version.hide_111</hide>
<option>
<name>Off</name>
<key>PAPR_OFF</key>
<opt>val:dvbt2.PAPR_OFF</opt>
</option>
<option>
<name>Active Constellation Extension</name>
<key>PAPR_ACE</key>
<opt>val:dvbt2.PAPR_ACE</opt>
</option>
<option>
<name>Tone Reservation</name>
<key>PAPR_TR</key>
<opt>val:dvbt2.PAPR_TR</opt>
</option>
<option>
<name>Both ACE and TR</name>
<key>PAPR_BOTH</key>
<opt>val:dvbt2.PAPR_BOTH</opt>
</option>
</param>
<param>
<name>PAPR Mode</name>
<key>paprmode2</key>
<type>enum</type>
<hide>$version.hide_131</hide>
<option>
<name>Off (1.1.1) / P2 Only (1.3.1)</name>
<name>P2 Only</name>
<key>PAPR_OFF</key>
<opt>val:dvbt2.PAPR_OFF</opt>
</option>
Expand Down
26 changes: 23 additions & 3 deletions grc/dvbt2_p1insertion_cc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,23 @@
<import>import dvbt2</import>
<import>from gnuradio import fft</import>
<import>from gnuradio.fft import window</import>
<make>dvbt2.p1insertion_cc($carriermode.val, $fftsize1.val, $fftsize2.val, $guardinterval.val, $numdatasyms, $version.val, $preamble1.val, $preamble2.val, $showlevels.val, $vclip)</make>
<make>dvbt2.p1insertion_cc($carriermode.val, #slurp
#if str($version) == 'VERSION_111'
$fftsize1.val, #slurp
#else
#if str($preamble2) == 'PREAMBLE_T2_SISO' or str($preamble2) == 'PREAMBLE_T2_MISO'
$fftsize1.val, #slurp
#else
$fftsize2.val, #slurp
#end if
#end if
$guardinterval.val, $numdatasyms, #slurp
#if str($version) == 'VERSION_111'
$preamble1.val, #slurp
#else
$preamble2.val, #slurp
#end if
$showlevels.val, $vclip)</make>
<param>
<name>Extended Carrier Mode</name>
<key>carriermode</key>
Expand All @@ -25,7 +41,7 @@
<name>FFT Size</name>
<key>fftsize1</key>
<type>enum</type>
<hide>$preamble2.hide_base</hide>
<hide>#if str($version) == 'VERSION_111' then $preamble1.hide_base else $preamble2.hide_base</hide>
<option>
<name>1K</name>
<key>FFTSIZE_1K</key>
Expand Down Expand Up @@ -71,7 +87,7 @@
<name>FFT Size</name>
<key>fftsize2</key>
<type>enum</type>
<hide>$preamble2.hide_lite</hide>
<hide>#if str($version) == 'VERSION_111' then $preamble1.hide_lite else $preamble2.hide_lite</hide>
<option>
<name>2K</name>
<key>FFTSIZE_2K</key>
Expand Down Expand Up @@ -177,11 +193,15 @@
<name>T2 SISO</name>
<key>PREAMBLE_T2_SISO</key>
<opt>val:dvbt2.PREAMBLE_T2_SISO</opt>
<opt>hide_lite:all</opt>
<opt>hide_base:</opt>
</option>
<option>
<name>T2 MISO</name>
<key>PREAMBLE_T2_MISO</key>
<opt>val:dvbt2.PREAMBLE_T2_MISO</opt>
<opt>hide_lite:all</opt>
<opt>hide_base:</opt>
</option>
</param>
<param>
Expand Down
51 changes: 46 additions & 5 deletions grc/dvbt2_paprtr_cc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
<key>dvbt2_paprtr_cc</key>
<category>dvbt2</category>
<import>import dvbt2</import>
<make>dvbt2.paprtr_cc($carriermode.val, $fftsize.val, $pilotpattern.val, $guardinterval.val, $numdatasyms, $paprmode.val, $version.val, $vclip, $iterations, $fftsize.vlength)</make>
<make>dvbt2.paprtr_cc($carriermode.val, $fftsize.val, $pilotpattern.val, $guardinterval.val, $numdatasyms, #slurp
#if str($version) == 'VERSION_111'
$paprmode1.val, #slurp
#else
$paprmode2.val, #slurp
#end if
$version.val, $vclip, $iterations, $fftsize.vlength)</make>
<param>
<name>Extended Carrier Mode</name>
<key>carriermode</key>
Expand Down Expand Up @@ -171,10 +177,41 @@
</param>
<param>
<name>PAPR Mode</name>
<key>paprmode</key>
<key>paprmode1</key>
<type>enum</type>
<hide>$version.hide_111</hide>
<option>
<name>Off (1.1.1) / P2 Only (1.3.1)</name>
<name>Off</name>
<key>PAPR_OFF</key>
<opt>val:dvbt2.PAPR_OFF</opt>
<opt>hide_vclip:all</opt>
</option>
<option>
<name>Active Constellation Extension</name>
<key>PAPR_ACE</key>
<opt>val:dvbt2.PAPR_ACE</opt>
<opt>hide_vclip:all</opt>
</option>
<option>
<name>Tone Reservation</name>
<key>PAPR_TR</key>
<opt>val:dvbt2.PAPR_TR</opt>
<opt>hide_vclip:</opt>
</option>
<option>
<name>Both ACE and TR</name>
<key>PAPR_BOTH</key>
<opt>val:dvbt2.PAPR_BOTH</opt>
<opt>hide_vclip:</opt>
</option>
</param>
<param>
<name>PAPR Mode</name>
<key>paprmode2</key>
<type>enum</type>
<hide>$version.hide_131</hide>
<option>
<name>P2 Only</name>
<key>PAPR_OFF</key>
<opt>val:dvbt2.PAPR_OFF</opt>
<opt>hide_vclip:all</opt>
Expand Down Expand Up @@ -206,26 +243,30 @@
<name>1.1.1</name>
<key>VERSION_111</key>
<opt>val:dvbt2.VERSION_111</opt>
<opt>hide_111:</opt>
<opt>hide_131:all</opt>
</option>
<option>
<name>1.3.1</name>
<key>VERSION_131</key>
<opt>val:dvbt2.VERSION_131</opt>
<opt>hide_111:all</opt>
<opt>hide_131:</opt>
</option>
</param>
<param>
<name>Vclip</name>
<key>vclip</key>
<value>3.3</value>
<type>float</type>
<hide>$paprmode.hide_vclip</hide>
<hide>#if str($version) == 'VERSION_111' then $paprmode1.hide_vclip else $paprmode2.hide_vclip</hide>
</param>
<param>
<name>Iterations</name>
<key>iterations</key>
<value>10</value>
<type>int</type>
<hide>$paprmode.hide_vclip</hide>
<hide>#if str($version) == 'VERSION_111' then $paprmode1.hide_vclip else $paprmode2.hide_vclip</hide>
</param>
<sink>
<name>in</name>
Expand Down
Loading

0 comments on commit 88b8df4

Please sign in to comment.