update GRC examples

2 files changed, 222 insertions, 205 deletions

diff --git a/apps/osmosdr_source.grc b/apps/osmosdr_source_1rtl.grc
index 03e439a..2333b24 100644
--- a/apps/osmosdr_source.grc
+++ b/apps/osmosdr_source_1rtl.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Sat May  5 21:04:19 2012</timestamp>
+  <timestamp>Tue May 15 18:29:06 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -61,97 +61,97 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>samp_rate</value>
+      <value>corr_ppm</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>samplerate</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(54, 141)</value>
+      <key>label</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>value</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>wxgui_fftsink2</key>
     <param>
-      <key>id</key>
-      <value>wxgui_fftsink2_0</value>
+      <key>min</key>
+      <value>-100</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>max</key>
+      <value>100</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>num_steps</key>
+      <value>201</value>
     </param>
     <param>
-      <key>title</key>
-      <value>FFT Plot</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
-      <key>baseband_freq</key>
-      <value>freq</value>
+      <key>grid_pos</key>
+      <value></value>
     </param>
     <param>
-      <key>y_per_div</key>
-      <value>10</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
-      <key>y_divs</key>
-      <value>10</value>
+      <key>_coordinate</key>
+      <value>(418, 68)</value>
     </param>
     <param>
-      <key>ref_level</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
     <param>
-      <key>ref_scale</key>
-      <value>2.0</value>
+      <key>id</key>
+      <value>gain_slider</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>1024</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>15</value>
+      <key>label</key>
+      <value></value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>value</key>
+      <value>10</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>min</key>
+      <value>-1</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0</value>
+      <key>max</key>
+      <value>50</value>
     </param>
     <param>
-      <key>win</key>
-      <value>None</value>
+      <key>num_steps</key>
+      <value>52</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
       <key>grid_pos</key>
@@ -163,7 +163,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(724, 129)</value>
+      <value>(570, 68)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -174,7 +174,7 @@
     <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>freq</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -186,19 +186,19 @@
     </param>
     <param>
       <key>value</key>
-      <value>394.4e6</value>
+      <value>2048e3</value>
     </param>
     <param>
       <key>min</key>
-      <value>50e6</value>
+      <value>1e6</value>
     </param>
     <param>
       <key>max</key>
-      <value>2.2e9</value>
+      <value>3.2e6</value>
     </param>
     <param>
       <key>num_steps</key>
-      <value>1000</value>
+      <value>100</value>
     </param>
     <param>
       <key>style</key>
@@ -218,7 +218,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(268, 65)</value>
+      <value>(30, 111)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -297,7 +297,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(724, 320)</value>
+      <value>(517, 399)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -305,93 +305,74 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>samplerate</value>
+      <value>wxgui_fftsink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value></value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>2048e3</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>1e6</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>3.2e6</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>title</key>
+      <value>FFT Plot</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>baseband_freq</key>
+      <value>0</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>y_per_div</key>
+      <value>10</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(38, 280)</value>
+      <key>y_divs</key>
+      <value>10</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>ref_level</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable_chooser</key>
     <param>
-      <key>id</key>
-      <value>gain_chooser</value>
+      <key>ref_scale</key>
+      <value>2.0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>fft_size</key>
+      <value>1024</value>
     </param>
     <param>
-      <key>label</key>
-      <value></value>
+      <key>fft_rate</key>
+      <value>15</value>
     </param>
     <param>
-      <key>value</key>
-      <value>9.0</value>
+      <key>peak_hold</key>
+      <value>False</value>
     </param>
     <param>
-      <key>choices</key>
-      <value>[-1.0, 1.5, 4.0, 6.5, 9.0, 11.5, 14.0, 16.5, 19.0, 21.5, 24.0, 29.0, 34.0, 42.0, 43.0, 45.0, 47.0, 49.0]</value>
+      <key>average</key>
+      <value>False</value>
     </param>
     <param>
-      <key>labels</key>
-      <value>[]</value>
+      <key>avg_alpha</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>drop_down</value>
+      <key>win</key>
+      <value>None</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.RA_HORIZONTAL</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
       <key>grid_pos</key>
@@ -403,7 +384,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(461, 63)</value>
+      <value>(517, 208)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -442,11 +423,11 @@
     </param>
     <param>
       <key>corr0</key>
-      <value>0</value>
+      <value>corr_ppm</value>
     </param>
     <param>
       <key>gain0</key>
-      <value>gain_chooser</value>
+      <value>gain_slider</value>
     </param>
     <param>
       <key>gain_mode0</key>
@@ -466,7 +447,7 @@
     </param>
     <param>
       <key>gain1</key>
-      <value>gain_chooser</value>
+      <value>gain_slider</value>
     </param>
     <param>
       <key>gain_mode1</key>
@@ -538,7 +519,62 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(277, 277)</value>
+      <value>(76, 324)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>freq</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value></value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>394e6</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>50e6</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>2.2e9</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>1000</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></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(229, 67)</value>
     </param>
     <param>
       <key>_rotation</key>
diff --git a/apps/osmosdr_source_multi.grc b/apps/osmosdr_source_2rtl.grc
index 7270485..f6cc423 100644
--- a/apps/osmosdr_source_multi.grc
+++ b/apps/osmosdr_source_2rtl.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Sat May  5 21:02:25 2012</timestamp>
+  <timestamp>Tue May 15 18:30:25 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -61,29 +61,6 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
-    <param>
-      <key>id</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>samplerate</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(54, 141)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>variable_slider</key>
     <param>
       <key>id</key>
@@ -139,65 +116,10 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>samplerate</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value></value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>2048e3</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>1e6</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>3.2e6</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></value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(38, 280)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_fftsink2_0</value>
+      <value>wxgui_fftsink2_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -273,7 +195,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(717, 114)</value>
+      <value>(718, 318)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -284,7 +206,7 @@
     <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_fftsink2_0_0</value>
+      <value>wxgui_fftsink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -360,7 +282,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(718, 318)</value>
+      <value>(717, 114)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -368,10 +290,10 @@
     </param>
   </block>
   <block>
-    <key>variable_chooser</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>gain_chooser</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -383,23 +305,82 @@
     </param>
     <param>
       <key>value</key>
-      <value>9.0</value>
+      <value>2048e3</value>
     </param>
     <param>
-      <key>choices</key>
-      <value>[-1.0, 1.5, 4.0, 6.5, 9.0, 11.5, 14.0, 16.5, 19.0, 21.5, 24.0, 29.0, 34.0, 42.0, 43.0, 45.0, 47.0, 49.0]</value>
+      <key>min</key>
+      <value>1e6</value>
     </param>
     <param>
-      <key>labels</key>
-      <value>[]</value>
+      <key>max</key>
+      <value>3.2e6</value>
     </param>
     <param>
-      <key>type</key>
-      <value>drop_down</value>
+      <key>num_steps</key>
+      <value>100</value>
     </param>
     <param>
       <key>style</key>
-      <value>wx.RA_HORIZONTAL</value>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>float_converter</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(55, 110)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>gain_slider</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value></value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>10</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-1</value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>50</value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>52</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>
@@ -411,7 +392,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(460, 64)</value>
+      <value>(457, 62)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -454,7 +435,7 @@
     </param>
     <param>
       <key>gain0</key>
-      <value>gain_chooser</value>
+      <value>gain_slider</value>
     </param>
     <param>
       <key>gain_mode0</key>
@@ -474,7 +455,7 @@
     </param>
     <param>
       <key>gain1</key>
-      <value>gain_chooser</value>
+      <value>gain_slider</value>
     </param>
     <param>
       <key>gain_mode1</key>