1 files changed, 316 insertions, 211 deletions
diff --git a/grc/examples/usrp/usrp_two_tone_loopback.grc b/grc/examples/usrp/usrp_two_tone_loopback.grc
index e3c635d46..3df977044 100644
--- a/grc/examples/usrp/usrp_two_tone_loopback.grc
+++ b/grc/examples/usrp/usrp_two_tone_loopback.grc
@@ -1,43 +1,46 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Mon Sep  8 21:47:19 2008</timestamp>
+  <timestamp>Fri Apr 17 18:23:35 2009</timestamp>
   <block>
-    <key>options</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>top_block</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>title</key>
-      <value>USRP Loopback - 2 Tone</value>
+      <key>value</key>
+      <value>64e6/200</value>
     </param>
     <param>
-      <key>author</key>
-      <value>Example</value>
+      <key>_coordinate</key>
+      <value>(9, 166)</value>
     </param>
     <param>
-      <key>description</key>
-      <value>Loopback test with basic rx and basic tx</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
+      <key>id</key>
+      <value>tun_freq</value>
     </param>
     <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>category</key>
-      <value>Custom</value>
+      <key>value</key>
+      <value>int(100e6)</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(10, 10)</value>
+      <value>(116, 166)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -45,10 +48,10 @@
     </param>
   </block>
   <block>
-    <key>usrp_simple_source_x</key>
+    <key>gr_sig_source_x</key>
     <param>
       <key>id</key>
-      <value>usrp_simple_source_x</value>
+      <value>gr_sig_source_x</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -59,40 +62,28 @@
       <value>complex</value>
     </param>
     <param>
-      <key>number</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>subdev_spec</key>
-      <value>None</value>
-    </param>
-    <param>
-      <key>frequency</key>
-      <value>tun_freq</value>
-    </param>
-    <param>
-      <key>decimation</key>
-      <value>200</value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>gain</key>
-      <value>20</value>
+      <key>waveform</key>
+      <value>gr.GR_COS_WAVE</value>
     </param>
     <param>
-      <key>mux</key>
-      <value>0x0</value>
+      <key>freq</key>
+      <value>tone1</value>
     </param>
     <param>
-      <key>auto_tr</key>
-      <value>None</value>
+      <key>amp</key>
+      <value>tone_ampl</value>
     </param>
     <param>
-      <key>rx_ant</key>
-      <value>None</value>
+      <key>offset</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(578, 319)</value>
+      <value>(258, 20)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -100,10 +91,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>gr_sig_source_x</key>
     <param>
       <key>id</key>
-      <value>wxgui_fftsink2</value>
+      <value>gr_sig_source_x0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -114,56 +105,59 @@
       <value>complex</value>
     </param>
     <param>
-      <key>title</key>
-      <value>FFT Plot</value>
-    </param>
-    <param>
       <key>samp_rate</key>
       <value>samp_rate</value>
     </param>
     <param>
-      <key>baseband_freq</key>
-      <value>0</value>
+      <key>waveform</key>
+      <value>gr.GR_COS_WAVE</value>
     </param>
     <param>
-      <key>y_per_div</key>
-      <value>10</value>
+      <key>freq</key>
+      <value>tone2</value>
     </param>
     <param>
-      <key>y_divs</key>
-      <value>8</value>
+      <key>amp</key>
+      <value>tone_ampl</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>100</value>
+      <key>offset</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>512*2</value>
+      <key>_coordinate</key>
+      <value>(255, 179)</value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>15</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>gr_add_xx</key>
     <param>
-      <key>avg_alpha</key>
-      <value>0</value>
+      <key>id</key>
+      <value>gr_add_xx</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>1, 2, 2, 4</value>
+      <key>num_inputs</key>
+      <value>3</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(845, 228)</value>
+      <value>(528, 78)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -171,10 +165,10 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>parameter</key>
     <param>
       <key>id</key>
-      <value>tone2</value>
+      <value>tx_side</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -182,35 +176,19 @@
     </param>
     <param>
       <key>label</key>
-      <value>Tone 2</value>
+      <value></value>
     </param>
     <param>
       <key>value</key>
-      <value>75e3</value>
+      <value>A</value>
     </param>
     <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>150000</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>slider_type</key>
-      <value>horizontal</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value>0, 4, 1, 2</value>
+      <key>type</key>
+      <value>string</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(397, 478)</value>
+      <value>(688, 384)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -218,46 +196,50 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>usrp_simple_sink_x</key>
     <param>
       <key>id</key>
-      <value>tone1</value>
+      <value>usrp_simple_sink_x</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Tone 1</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>value</key>
-      <value>50e3</value>
+      <key>format</key>
+      <value></value>
     </param>
     <param>
-      <key>min</key>
+      <key>which</key>
       <value>0</value>
     </param>
     <param>
-      <key>max</key>
-      <value>150000</value>
+      <key>interpolation</key>
+      <value>400</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>100</value>
+      <key>frequency</key>
+      <value>tun_freq</value>
     </param>
     <param>
-      <key>slider_type</key>
-      <value>horizontal</value>
+      <key>gain</key>
+      <value>0</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>0, 2, 1, 2</value>
+      <key>side</key>
+      <value>tx_side</value>
+    </param>
+    <param>
+      <key>transmit</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(220, 475)</value>
+      <value>(835, 5)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -265,46 +247,54 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>usrp_simple_source_x</key>
     <param>
       <key>id</key>
-      <value>noise_ampl</value>
+      <value>usrp_simple_source_x</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Noise Ampl</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>value</key>
-      <value>2000</value>
+      <key>format</key>
+      <value></value>
     </param>
     <param>
-      <key>min</key>
+      <key>which</key>
       <value>0</value>
     </param>
     <param>
-      <key>max</key>
-      <value>5000</value>
+      <key>decimation</key>
+      <value>200</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>100</value>
+      <key>frequency</key>
+      <value>tun_freq</value>
     </param>
     <param>
-      <key>slider_type</key>
-      <value>vertical</value>
+      <key>gain</key>
+      <value>20</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>1, 1, 2, 1</value>
+      <key>side</key>
+      <value>rx_side</value>
+    </param>
+    <param>
+      <key>rx_ant</key>
+      <value>rx_ant</value>
+    </param>
+    <param>
+      <key>hb_filters</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(20, 243)</value>
+      <value>(479, 224)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -312,22 +302,30 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>parameter</key>
     <param>
       <key>id</key>
-      <value>samp_rate</value>
+      <value>rx_ant</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
+      <key>label</key>
+      <value></value>
+    </param>
+    <param>
       <key>value</key>
-      <value>64e6/200</value>
+      <value>RXA</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>string</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(9, 166)</value>
+      <value>(802, 384)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -335,65 +333,66 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>tun_freq</value>
+      <value>wxgui_fftsink2</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>int(100e6)</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(116, 166)</value>
+      <key>title</key>
+      <value>FFT Plot</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
-  </block>
-  <block>
-    <key>gr_sig_source_x</key>
     <param>
-      <key>id</key>
-      <value>gr_sig_source_x</value>
+      <key>baseband_freq</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>y_per_div</key>
+      <value>10</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>ref_level</key>
+      <value>100</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>fft_size</key>
+      <value>512*2</value>
     </param>
     <param>
-      <key>waveform</key>
-      <value>gr.GR_COS_WAVE</value>
+      <key>fft_rate</key>
+      <value>15</value>
     </param>
     <param>
-      <key>freq</key>
-      <value>tone1</value>
+      <key>peak_hold</key>
+      <value>False</value>
     </param>
     <param>
-      <key>amp</key>
-      <value>tone_ampl</value>
+      <key>average</key>
+      <value>False</value>
     </param>
     <param>
-      <key>offset</key>
+      <key>avg_alpha</key>
       <value>0</value>
     </param>
     <param>
+      <key>grid_pos</key>
+      <value>1, 2, 2, 4</value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(258, 20)</value>
+      <value>(746, 133)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -401,42 +400,30 @@
     </param>
   </block>
   <block>
-    <key>gr_sig_source_x</key>
+    <key>parameter</key>
     <param>
       <key>id</key>
-      <value>gr_sig_source_x0</value>
+      <value>rx_side</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>waveform</key>
-      <value>gr.GR_COS_WAVE</value>
-    </param>
-    <param>
-      <key>freq</key>
-      <value>tone2</value>
+      <key>label</key>
+      <value></value>
     </param>
     <param>
-      <key>amp</key>
-      <value>tone_ampl</value>
+      <key>value</key>
+      <value>A</value>
     </param>
     <param>
-      <key>offset</key>
-      <value>0</value>
+      <key>type</key>
+      <value>string</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(255, 179)</value>
+      <value>(568, 382)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -471,7 +458,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(257, 337)</value>
+      <value>(276, 312)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -479,30 +466,50 @@
     </param>
   </block>
   <block>
-    <key>gr_add_xx</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>gr_add_xx</value>
+      <value>noise_ampl</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>label</key>
+      <value>Noise Ampl</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>3</value>
+      <key>value</key>
+      <value>2000</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>min</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>5000</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_VERTICAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1, 1, 2, 1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(528, 78)</value>
+      <value>(20, 243)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -510,54 +517,101 @@
     </param>
   </block>
   <block>
-    <key>usrp_simple_sink_x</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>usrp_simple_sink_x</value>
+      <value>tone_ampl</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>label</key>
+      <value>Tone Ampl</value>
     </param>
     <param>
-      <key>number</key>
+      <key>value</key>
+      <value>5000</value>
+    </param>
+    <param>
+      <key>min</key>
       <value>0</value>
     </param>
     <param>
-      <key>subdev_spec</key>
-      <value>None</value>
+      <key>max</key>
+      <value>10e3</value>
     </param>
     <param>
-      <key>frequency</key>
-      <value>tun_freq</value>
+      <key>num_steps</key>
+      <value>100</value>
     </param>
     <param>
-      <key>interpolation</key>
-      <value>400</value>
+      <key>style</key>
+      <value>wx.SL_VERTICAL</value>
     </param>
     <param>
-      <key>gain</key>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1, 0, 2, 1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(28, 437)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
     <param>
-      <key>mux</key>
-      <value>0x0</value>
+      <key>id</key>
+      <value>tone1</value>
     </param>
     <param>
-      <key>auto_tr</key>
-      <value>None</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>tx_enb</key>
-      <value>None</value>
+      <key>label</key>
+      <value>Tone 1</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>50e3</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-samp_rate/2</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>samp_rate/2</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>0, 0, 1, 4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(835, 5)</value>
+      <value>(190, 436)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -568,7 +622,7 @@
     <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>tone_ampl</value>
+      <value>tone2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -576,11 +630,11 @@
     </param>
     <param>
       <key>label</key>
-      <value>Tone Ampl</value>
+      <value>Tone 2</value>
     </param>
     <param>
       <key>value</key>
-      <value>5000</value>
+      <value>75e3</value>
     </param>
     <param>
       <key>min</key>
@@ -595,16 +649,67 @@
       <value>100</value>
     </param>
     <param>
-      <key>slider_type</key>
-      <value>vertical</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
       <key>grid_pos</key>
-      <value>1, 0, 2, 1</value>
+      <value>0, 4, 1, 4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(21, 422)</value>
+      <value>(367, 439)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>options</key>
+    <param>
+      <key>id</key>
+      <value>usrp_two_tone_loopback</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>USRP Loopback - 2 Tone</value>
+    </param>
+    <param>
+      <key>author</key>
+      <value>Example</value>
+    </param>
+    <param>
+      <key>description</key>
+      <value>Loopback test with basic rx and basic tx</value>
+    </param>
+    <param>
+      <key>window_size</key>
+      <value>1280, 1024</value>
+    </param>
+    <param>
+      <key>generate_options</key>
+      <value>wx_gui</value>
+    </param>
+    <param>
+      <key>category</key>
+      <value>Custom</value>
+    </param>
+    <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(10, 10)</value>
     </param>
     <param>
       <key>_rotation</key>