1 files changed, 513 insertions, 279 deletions
diff --git a/gr-dtv/examples/dvbs_tx.grc b/gr-dtv/examples/dvbs_tx.grc
index c9dd98a0b9..b5e94b55ed 100644
--- a/gr-dtv/examples/dvbs_tx.grc
+++ b/gr-dtv/examples/dvbs_tx.grc
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<?grc format='1' created='3.7.10'?>
+<?grc format='1' created='3.7.11'?>
 <flow_graph>
   <timestamp>Wed Jun 18 01:23:58 2014</timestamp>
   <block>
@@ -30,7 +30,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(8, 11)</value>
+      <value>(8, 12)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -38,7 +38,7 @@
     </param>
     <param>
       <key>generate_options</key>
-      <value>wx_gui</value>
+      <value>qt_gui</value>
     </param>
     <param>
       <key>hier_block_src_path</key>
@@ -93,7 +93,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(8, 203)</value>
+      <value>(8, 204)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -101,7 +101,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>frequency</value>
+      <value>center_freq</value>
     </param>
     <param>
       <key>value</key>
@@ -120,7 +120,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(8, 267)</value>
+      <value>(8, 268)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -147,7 +147,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(8, 75)</value>
+      <value>(8, 76)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -174,7 +174,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(8, 139)</value>
+      <value>(8, 140)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -190,34 +190,89 @@
     </param>
   </block>
   <block>
-    <key>blocks_file_sink</key>
+    <key>variable_qtgui_range</key>
     <param>
-      <key>append</key>
-      <value>False</value>
+      <key>comment</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>value</key>
+      <value>50</value>
     </param>
     <param>
-      <key>comment</key>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(240, 480)</value>
+    </param>
+    <param>
+      <key>gui_hint</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>tx_gain</value>
+    </param>
+    <param>
+      <key>label</key>
       <value></value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>min_len</key>
+      <value>200</value>
+    </param>
+    <param>
+      <key>orient</key>
+      <value>Qt.Horizontal</value>
+    </param>
+    <param>
+      <key>start</key>
       <value>0</value>
     </param>
     <param>
-      <key>file</key>
-      <value>adv.bin</value>
+      <key>step</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>stop</key>
+      <value>89</value>
+    </param>
+    <param>
+      <key>rangeType</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>widget</key>
+      <value>counter_slider</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_qtgui_range</key>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>-8</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(848, 507)</value>
+      <value>(8, 480)</value>
+    </param>
+    <param>
+      <key>gui_hint</key>
+      <value></value>
     </param>
     <param>
       <key>_rotation</key>
@@ -225,46 +280,62 @@
     </param>
     <param>
       <key>id</key>
-      <value>blocks_file_sink_0</value>
+      <value>vga1_gain</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>label</key>
+      <value></value>
     </param>
     <param>
-      <key>unbuffered</key>
-      <value>False</value>
+      <key>min_len</key>
+      <value>200</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>orient</key>
+      <value>Qt.Horizontal</value>
+    </param>
+    <param>
+      <key>start</key>
+      <value>-35</value>
+    </param>
+    <param>
+      <key>step</key>
       <value>1</value>
     </param>
-  </block>
-  <block>
-    <key>blocks_file_source</key>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>stop</key>
+      <value>-4</value>
+    </param>
+    <param>
+      <key>rangeType</key>
+      <value>int</value>
     </param>
     <param>
+      <key>widget</key>
+      <value>counter_slider</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_qtgui_range</key>
+    <param>
       <key>comment</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>value</key>
+      <value>10</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>file</key>
-      <value>/run/shm/advdvbs78.ts</value>
+      <key>_coordinate</key>
+      <value>(120, 480)</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(184, 59)</value>
+      <key>gui_hint</key>
+      <value></value>
     </param>
     <param>
       <key>_rotation</key>
@@ -272,31 +343,47 @@
     </param>
     <param>
       <key>id</key>
-      <value>blocks_file_source_0</value>
+      <value>vga2_gain</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>label</key>
+      <value></value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>min_len</key>
+      <value>200</value>
     </param>
     <param>
-      <key>type</key>
-      <value>byte</value>
+      <key>orient</key>
+      <value>Qt.Horizontal</value>
     </param>
     <param>
-      <key>repeat</key>
-      <value>True</value>
+      <key>start</key>
+      <value>0</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>step</key>
       <value>1</value>
     </param>
+    <param>
+      <key>stop</key>
+      <value>25</value>
+    </param>
+    <param>
+      <key>rangeType</key>
+      <value>int</value>
+    </param>
+    <param>
+      <key>widget</key>
+      <value>counter_slider</value>
+    </param>
   </block>
   <block>
-    <key>blocks_pack_k_bits_bb</key>
+    <key>blocks_file_sink</key>
+    <param>
+      <key>append</key>
+      <value>False</value>
+    </param>
     <param>
       <key>alias</key>
       <value></value>
@@ -311,11 +398,15 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>1</value>
+      <value>0</value>
+    </param>
+    <param>
+      <key>file</key>
+      <value>adv.cfile</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(176, 451)</value>
+      <value>(864, 484)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -323,27 +414,23 @@
     </param>
     <param>
       <key>id</key>
-      <value>blocks_pack_k_bits_bb_0</value>
+      <value>blocks_file_sink_0</value>
     </param>
     <param>
-      <key>k</key>
-      <value>2</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>unbuffered</key>
+      <value>False</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
   </block>
   <block>
-    <key>blocks_packed_to_unpacked_xx</key>
-    <param>
-      <key>bits_per_chunk</key>
-      <value>1</value>
-    </param>
+    <key>blocks_file_source</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -358,15 +445,15 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>1</value>
+      <value>True</value>
     </param>
     <param>
-      <key>endianness</key>
-      <value>gr.GR_MSB_FIRST</value>
+      <key>file</key>
+      <value>/run/shm/advdvbs78.ts</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1080, 59)</value>
+      <value>(208, 52)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -374,7 +461,7 @@
     </param>
     <param>
       <key>id</key>
-      <value>blocks_packed_to_unpacked_xx_0</value>
+      <value>blocks_file_source_0</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -385,16 +472,20 @@
       <value>0</value>
     </param>
     <param>
-      <key>num_ports</key>
-      <value>1</value>
-    </param>
-    <param>
       <key>type</key>
       <value>byte</value>
     </param>
+    <param>
+      <key>repeat</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
   </block>
   <block>
-    <key>blocks_unpack_k_bits_bb</key>
+    <key>blocks_vector_to_stream</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -409,11 +500,11 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>1</value>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(408, 235)</value>
+      <value>(568, 228)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -421,11 +512,11 @@
     </param>
     <param>
       <key>id</key>
-      <value>blocks_unpack_k_bits_bb_0</value>
+      <value>blocks_vector_to_stream_0</value>
     </param>
     <param>
-      <key>k</key>
-      <value>2</value>
+      <key>type</key>
+      <value>byte</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -435,6 +526,14 @@
       <key>minoutbuf</key>
       <value>0</value>
     </param>
+    <param>
+      <key>num_items</key>
+      <value>1512</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
   </block>
   <block>
     <key>dtv_dvbs2_modulator_bc</key>
@@ -447,8 +546,16 @@
       <value></value>
     </param>
     <param>
-      <key>rate</key>
-      <value>C_OTHER</value>
+      <key>rate1</key>
+      <value>C1_4</value>
+    </param>
+    <param>
+      <key>rate2</key>
+      <value>C1_5_MEDIUM</value>
+    </param>
+    <param>
+      <key>rate3</key>
+      <value>C1_4</value>
     </param>
     <param>
       <key>comment</key>
@@ -472,7 +579,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(352, 427)</value>
+      <value>(248, 376)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -519,7 +626,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(832, 51)</value>
+      <value>(952, 44)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -566,7 +673,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(408, 73)</value>
+      <value>(456, 64)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -586,46 +693,50 @@
     </param>
   </block>
   <block>
-    <key>dtv_dvbt_reed_solomon_enc</key>
+    <key>dtv_dvbt_inner_coder</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>blocks</key>
-      <value>8</value>
+      <key>code_rate</key>
+      <value>C7_8</value>
     </param>
     <param>
       <key>comment</key>
       <value></value>
     </param>
     <param>
+      <key>constellation</key>
+      <value>qpsk</value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>gfpoly</key>
-      <value>0x11d</value>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(600, 19)</value>
+      <value>(248, 208)</value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
+      <key>hierarchy</key>
+      <value>nh</value>
+    </param>
+    <param>
       <key>id</key>
-      <value>dtv_dvbt_reed_solomon_enc_0</value>
+      <value>dtv_dvbt_inner_coder_0</value>
     </param>
     <param>
-      <key>k</key>
-      <value>239</value>
+      <key>ninput</key>
+      <value>1</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -636,33 +747,21 @@
       <value>0</value>
     </param>
     <param>
-      <key>n</key>
-      <value>255</value>
-    </param>
-    <param>
-      <key>s</key>
-      <value>51</value>
-    </param>
-    <param>
-      <key>m</key>
-      <value>8</value>
-    </param>
-    <param>
-      <key>p</key>
-      <value>2</value>
-    </param>
-    <param>
-      <key>t</key>
-      <value>8</value>
+      <key>noutput</key>
+      <value>1512</value>
     </param>
   </block>
   <block>
-    <key>fec_puncture_xx</key>
+    <key>dtv_dvbt_reed_solomon_enc</key>
     <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
+      <key>blocks</key>
+      <value>8</value>
+    </param>
+    <param>
       <key>comment</key>
       <value></value>
     </param>
@@ -671,16 +770,16 @@
       <value></value>
     </param>
     <param>
-      <key>delay</key>
-      <value>0</value>
-    </param>
-    <param>
       <key>_enabled</key>
       <value>1</value>
     </param>
     <param>
+      <key>gfpoly</key>
+      <value>0x11d</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(600, 219)</value>
+      <value>(680, 16)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -688,7 +787,11 @@
     </param>
     <param>
       <key>id</key>
-      <value>fec_puncture_xx_0</value>
+      <value>dtv_dvbt_reed_solomon_enc_0</value>
+    </param>
+    <param>
+      <key>k</key>
+      <value>239</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -699,16 +802,24 @@
       <value>0</value>
     </param>
     <param>
-      <key>puncpat</key>
-      <value>0b11010101100110</value>
+      <key>n</key>
+      <value>255</value>
     </param>
     <param>
-      <key>puncsize</key>
-      <value>14</value>
+      <key>s</key>
+      <value>51</value>
     </param>
     <param>
-      <key>type</key>
-      <value>byte</value>
+      <key>m</key>
+      <value>8</value>
+    </param>
+    <param>
+      <key>p</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>t</key>
+      <value>8</value>
     </param>
   </block>
   <block>
@@ -731,11 +842,11 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(584, 435)</value>
+      <value>(496, 380)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -782,7 +893,7 @@
     </param>
     <param>
       <key>bb_gain0</key>
-      <value>-10</value>
+      <value>vga1_gain</value>
     </param>
     <param>
       <key>bw0</key>
@@ -794,7 +905,7 @@
     </param>
     <param>
       <key>freq0</key>
-      <value>frequency</value>
+      <value>center_freq</value>
     </param>
     <param>
       <key>if_gain0</key>
@@ -802,7 +913,7 @@
     </param>
     <param>
       <key>gain0</key>
-      <value>15</value>
+      <value>vga2_gain</value>
     </param>
     <param>
       <key>ant10</key>
@@ -1686,11 +1797,11 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>0</value>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1064, 211)</value>
+      <value>(1056, 228)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1786,50 +1897,234 @@
     </param>
   </block>
   <block>
-    <key>trellis_encoder_xx</key>
+    <key>qtgui_freq_sink_x</key>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>autoscale</key>
+      <value>False</value>
     </param>
     <param>
-      <key>blocklength</key>
-      <value>0</value>
+      <key>average</key>
+      <value>0.2</value>
     </param>
     <param>
-      <key>blockwise</key>
-      <value>False</value>
+      <key>axislabels</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>bw</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>fc</key>
+      <value>center_freq</value>
     </param>
     <param>
       <key>comment</key>
       <value></value>
     </param>
     <param>
+      <key>ctrlpanel</key>
+      <value>False</value>
+    </param>
+    <param>
       <key>affinity</key>
       <value></value>
     </param>
     <param>
       <key>_enabled</key>
-      <value>1</value>
+      <value>True</value>
     </param>
     <param>
-      <key>fsm_args</key>
-      <value>1, 2, (0171, 0133)</value>
+      <key>fftsize</key>
+      <value>1024</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(176, 227)</value>
+      <value>(864, 188)</value>
+    </param>
+    <param>
+      <key>gui_hint</key>
+      <value></value>
     </param>
     <param>
       <key>_rotation</key>
       <value>0</value>
     </param>
     <param>
+      <key>grid</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>id</key>
-      <value>trellis_encoder_xx_0</value>
+      <value>qtgui_freq_sink_x_0</value>
     </param>
     <param>
-      <key>init_state</key>
-      <value>0</value>
+      <key>legend</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>alpha1</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>color1</key>
+      <value>"blue"</value>
+    </param>
+    <param>
+      <key>label1</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width1</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>alpha10</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>color10</key>
+      <value>"dark blue"</value>
+    </param>
+    <param>
+      <key>label10</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width10</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>alpha2</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>color2</key>
+      <value>"red"</value>
+    </param>
+    <param>
+      <key>label2</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width2</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>alpha3</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>color3</key>
+      <value>"green"</value>
+    </param>
+    <param>
+      <key>label3</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width3</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>alpha4</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>color4</key>
+      <value>"black"</value>
+    </param>
+    <param>
+      <key>label4</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width4</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>alpha5</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>color5</key>
+      <value>"cyan"</value>
+    </param>
+    <param>
+      <key>label5</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width5</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>alpha6</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>color6</key>
+      <value>"magenta"</value>
+    </param>
+    <param>
+      <key>label6</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width6</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>alpha7</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>color7</key>
+      <value>"yellow"</value>
+    </param>
+    <param>
+      <key>label7</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width7</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>alpha8</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>color8</key>
+      <value>"dark red"</value>
+    </param>
+    <param>
+      <key>label8</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width8</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>alpha9</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>color9</key>
+      <value>"dark green"</value>
+    </param>
+    <param>
+      <key>label9</key>
+      <value></value>
+    </param>
+    <param>
+      <key>width9</key>
+      <value>1</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -1840,8 +2135,64 @@
       <value>0</value>
     </param>
     <param>
+      <key>name</key>
+      <value>""</value>
+    </param>
+    <param>
+      <key>nconnections</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>showports</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>freqhalf</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>tr_chan</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>tr_level</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>tr_mode</key>
+      <value>qtgui.TRIG_MODE_FREE</value>
+    </param>
+    <param>
+      <key>tr_tag</key>
+      <value>""</value>
+    </param>
+    <param>
       <key>type</key>
-      <value>bb</value>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>update_time</key>
+      <value>0.10</value>
+    </param>
+    <param>
+      <key>wintype</key>
+      <value>firdes.WIN_BLACKMAN_hARRIS</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>Relative Gain</value>
+    </param>
+    <param>
+      <key>ymax</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>ymin</key>
+      <value>-140</value>
+    </param>
+    <param>
+      <key>units</key>
+      <value>dB</value>
     </param>
   </block>
   <block>
@@ -1860,7 +2211,7 @@
     </param>
     <param>
       <key>center_freq0</key>
-      <value>uhd.tune_request(frequency, ((symbol_rate * 1.35) / 2 ) + 1e5)</value>
+      <value>uhd.tune_request(center_freq, ((symbol_rate * 1.35) / 2 ) + 1e5)</value>
     </param>
     <param>
       <key>norm_gain0</key>
@@ -1868,7 +2219,7 @@
     </param>
     <param>
       <key>gain0</key>
-      <value>60</value>
+      <value>tx_gain</value>
     </param>
     <param>
       <key>ant10</key>
@@ -2512,11 +2863,11 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>1</value>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1064, 403)</value>
+      <value>(1064, 392)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2643,6 +2994,10 @@
       <value>False</value>
     </param>
     <param>
+      <key>hide_lo_controls</key>
+      <value>True</value>
+    </param>
+    <param>
       <key>stream_args</key>
       <value></value>
     </param>
@@ -2663,109 +3018,6 @@
       <value></value>
     </param>
   </block>
-  <block>
-    <key>wxgui_fftsink2</key>
-    <param>
-      <key>avg_alpha</key>
-      <value>0.13333</value>
-    </param>
-    <param>
-      <key>average</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>baseband_freq</key>
-      <value>frequency</value>
-    </param>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>fft_size</key>
-      <value>1024</value>
-    </param>
-    <param>
-      <key>freqvar</key>
-      <value>None</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(848, 195)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>wxgui_fftsink2_0</value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>peak_hold</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>ref_level</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ref_scale</key>
-      <value>2.0</value>
-    </param>
-    <param>
-      <key>fft_rate</key>
-      <value>15</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>FFT Plot</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>win_size</key>
-      <value></value>
-    </param>
-    <param>
-      <key>win</key>
-      <value>None</value>
-    </param>
-    <param>
-      <key>y_divs</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>y_per_div</key>
-      <value>10</value>
-    </param>
-  </block>
   <connection>
     <source_block_id>blocks_file_source_0</source_block_id>
     <sink_block_id>dtv_dvbt_energy_dispersal_0</sink_block_id>
@@ -2773,24 +3025,12 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_pack_k_bits_bb_0</source_block_id>
+    <source_block_id>blocks_vector_to_stream_0</source_block_id>
     <sink_block_id>dtv_dvbs2_modulator_bc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_packed_to_unpacked_xx_0</source_block_id>
-    <sink_block_id>trellis_encoder_xx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>blocks_unpack_k_bits_bb_0</source_block_id>
-    <sink_block_id>fec_puncture_xx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
     <source_block_id>dtv_dvbs2_modulator_bc_0</source_block_id>
     <sink_block_id>fft_filter_xxx_0</sink_block_id>
     <source_key>0</source_key>
@@ -2798,7 +3038,7 @@
   </connection>
   <connection>
     <source_block_id>dtv_dvbt_convolutional_interleaver_0</source_block_id>
-    <sink_block_id>blocks_packed_to_unpacked_xx_0</sink_block_id>
+    <sink_block_id>dtv_dvbt_inner_coder_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2809,14 +3049,14 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>dtv_dvbt_reed_solomon_enc_0</source_block_id>
-    <sink_block_id>dtv_dvbt_convolutional_interleaver_0</sink_block_id>
+    <source_block_id>dtv_dvbt_inner_coder_0</source_block_id>
+    <sink_block_id>blocks_vector_to_stream_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>fec_puncture_xx_0</source_block_id>
-    <sink_block_id>blocks_pack_k_bits_bb_0</sink_block_id>
+    <source_block_id>dtv_dvbt_reed_solomon_enc_0</source_block_id>
+    <sink_block_id>dtv_dvbt_convolutional_interleaver_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2834,19 +3074,13 @@
   </connection>
   <connection>
     <source_block_id>fft_filter_xxx_0</source_block_id>
-    <sink_block_id>uhd_usrp_sink_0_0</sink_block_id>
+    <sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>fft_filter_xxx_0</source_block_id>
-    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>trellis_encoder_xx_0</source_block_id>
-    <sink_block_id>blocks_unpack_k_bits_bb_0</sink_block_id>
+    <sink_block_id>uhd_usrp_sink_0_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>