Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed a few GRC symbols for blocks #40

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed a few GRC symbols for blocks #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ install(FILES
dab_ofdm_coarse_frequency_correct.xml
dab_diff_phasor_vcc.xml
dab_ofdm_remove_first_symbol_vcc.xml
# dab_frequency_interleaver_vcc.xml
dab_frequency_interleaver_vcc.xml
dab_qpsk_demapper_vcb.xml
dab_complex_to_interleaved_float_vcf.xml
dab_modulo_ff.xml
Expand Down
9 changes: 7 additions & 2 deletions grc/dab_frequency_interleaver_vcc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,19 @@
<key>interleaving_sequence</key>
<type>raw</type>
</param>
<param>
<name>Size</name>
<key>size</key>
<type>int</type>
</param>
<sink>
<name>in</name>
<type>complex</type>
<vlen>$interleaving_sequence.size()</vlen>
<vlen>$size</vlen>
</sink>
<source>
<name>out</name>
<type>complex</type>
<vlen>$interleaving_sequence.size()</vlen>
<vlen>$size</vlen>
</source>
</block>
11 changes: 4 additions & 7 deletions grc/dab_magnitude_equalizer_vcc.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,20 @@
<category>[DAB]</category>
<import>import dab</import>
<make>dab.magnitude_equalizer_vcc($vlen, $num_symbols)</make>
<param>
<name>Length</name>
<key>vlen</key>
<type>int</type>
</param>
<param>
<name>Number of carriers</name>
<key>num_carriers</key>
<key>vlen</key>
<type>int</type>
</param>
<param>
<name>Symbols</name>
<key>symbols_for_magnitude_equalization</key>
<key>num_symbols</key>
<type>int</type>
</param>
<sink>
<name>in</name>
<type>complex</type>
<vlen>$vlen</vlen>
</sink>
<sink>
<name>trigger_in</name>
Expand All @@ -31,6 +27,7 @@
<source>
<name>out</name>
<type>complex</type>
<vlen>$vlen</vlen>
</source>
<source>
<name>trigger out</name>
Expand Down
72 changes: 66 additions & 6 deletions grc/dab_repartition_vectors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,81 @@
<key>dab_repartition_vectors</key>
<category>dab</category>
<import>import dab</import>
<make>dab.repartition_vectors($itemsize, $vlen_in, $vlen_out, $multiply, $divide)</make>
<make>dab.repartition_vectors($type.size, $vlen_in, $vlen_out, $multiply, $divide)</make>
<!-- Make one 'param' node for every Parameter you want settable from the GUI.
Sub-nodes:
* name
* key (makes the value accessible as $keyname, e.g. in the make node)
* type -->
<param>
<name>...</name>
<key>...</key>
<type>...</type>
<name>IO Type</name>
<key>type</key>
<type>enum</type>
<option>
<name>Complex</name>
<key>complex</key>
<opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
<opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
<opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
<opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
<opt>size:gr.sizeof_char</opt>
</option>
</param>

<param>
<name>Length in</name>
<key>vlen_in</key>
<type>int</type>
</param>

<param>
<name>Length out</name>
<key>vlen_out</key>
<type>int</type>
</param>

<param>
<name>Multiply</name>
<key>multiply</key>
<type>int</type>
</param>

<param>
<name>Divide</name>
<key>divide</key>
<type>int</type>
</param>


<!-- Make one 'sink' node per input. Sub-nodes:
* name (an identifier for the GUI)
* type
* vlen
* optional (set to 1 for optional inputs) -->
<sink>
<name>in</name>
<type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type>
<type>$type</type>
<vlen>$vlen_in</vlen>
</sink>
<sink>
<name>trigger_in</name>
<type>byte</type>
</sink>

<!-- Make one 'source' node per output. Sub-nodes:
Expand All @@ -33,6 +88,11 @@
* optional (set to 1 for optional inputs) -->
<source>
<name>out</name>
<type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type>
<type>$type</type>
<vlen>$vlen_out</vlen>
</source>
<source>
<name>trigger_out</name>
<type>byte</type>
</source>
</block>
65 changes: 59 additions & 6 deletions grc/dab_select_vectors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,59 @@
<key>dab_select_vectors</key>
<category>dab</category>
<import>import dab</import>
<make>dab.select_vectors($itemsize, $length, $num_select, $num_skip)</make>
<make>dab.select_vectors($type.size, $total_length, $num_msc_syms, $num_fic_syms)</make>
<!-- Make one 'param' node for every Parameter you want settable from the GUI.
Sub-nodes:
* name
* key (makes the value accessible as $keyname, e.g. in the make node)
* type -->
<param>
<name>...</name>
<key>...</key>
<type>...</type>
<name>IO Type</name>
<key>type</key>
<type>enum</type>
<option>
<name>Complex</name>
<key>complex</key>
<opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
<opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
<opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
<opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
<opt>size:gr.sizeof_char</opt>
</option>
</param>

<param>
<name>Length</name>
<key>total_length</key>
<type>int</type>
</param>

<param>
<name>Num msc syms</name>
<key>num_msc_syms</key>
<type>int</type>
</param>

<param>
<name>Num fic syms</name>
<key>num_fic_syms</key>
<type>int</type>
</param>

<!-- Make one 'sink' node per input. Sub-nodes:
Expand All @@ -23,7 +66,12 @@
* optional (set to 1 for optional inputs) -->
<sink>
<name>in</name>
<type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type>
<type>$type</type>
<vlen>$total_length</vlen>
</sink>
<sink>
<name>trigger_in</name>
<type>byte</type>
</sink>

<!-- Make one 'source' node per output. Sub-nodes:
Expand All @@ -33,6 +81,11 @@
* optional (set to 1 for optional inputs) -->
<source>
<name>out</name>
<type><!-- e.g. int, float, complex, byte, short, xxx_vector, ...--></type>
<type>$type</type>
<vlen>$total_length</vlen>
</source>
<source>
<name>trigger_out</name>
<type>byte</type>
</source>
</block>