From d0b7863386b0c1eaaea53229bef316a44ad57172 Mon Sep 17 00:00:00 2001
From: Ruben Undheim <ruben.undheim@gmail.com>
Date: Mon, 2 Jul 2018 23:56:45 +0200
Subject: [PATCH] Fixed a few GRC symbols for blocks

---
 grc/CMakeLists.txt                    |  2 +-
 grc/dab_frequency_interleaver_vcc.xml |  9 +++-
 grc/dab_magnitude_equalizer_vcc.xml   | 11 ++--
 grc/dab_repartition_vectors.xml       | 72 ++++++++++++++++++++++++---
 grc/dab_select_vectors.xml            | 65 +++++++++++++++++++++---
 5 files changed, 137 insertions(+), 22 deletions(-)

diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index cd79e04b..83360dd6 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -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
diff --git a/grc/dab_frequency_interleaver_vcc.xml b/grc/dab_frequency_interleaver_vcc.xml
index b8f30a65..c8a2d71e 100644
--- a/grc/dab_frequency_interleaver_vcc.xml
+++ b/grc/dab_frequency_interleaver_vcc.xml
@@ -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>
diff --git a/grc/dab_magnitude_equalizer_vcc.xml b/grc/dab_magnitude_equalizer_vcc.xml
index 6761aee9..88644367 100644
--- a/grc/dab_magnitude_equalizer_vcc.xml
+++ b/grc/dab_magnitude_equalizer_vcc.xml
@@ -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>
@@ -31,6 +27,7 @@
   <source>
     <name>out</name>
     <type>complex</type>
+    <vlen>$vlen</vlen>
   </source>
   <source>
     <name>trigger out</name>
diff --git a/grc/dab_repartition_vectors.xml b/grc/dab_repartition_vectors.xml
index 9a39f9de..32ffb440 100644
--- a/grc/dab_repartition_vectors.xml
+++ b/grc/dab_repartition_vectors.xml
@@ -4,18 +4,68 @@
   <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
@@ -23,7 +73,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>$vlen_in</vlen>
+  </sink>
+  <sink>
+    <name>trigger_in</name>
+    <type>byte</type>
   </sink>
 
   <!-- Make one 'source' node per output. Sub-nodes:
@@ -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>
diff --git a/grc/dab_select_vectors.xml b/grc/dab_select_vectors.xml
index aaf06f0e..4914480e 100644
--- a/grc/dab_select_vectors.xml
+++ b/grc/dab_select_vectors.xml
@@ -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:
@@ -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:
@@ -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>