Merge branch 'master' into wip/gr-blocks-master

1 files changed, 209 insertions, 161 deletions

diff --git a/gr-digital/examples/demod/pam_timing.grc b/gr-digital/examples/demod/pam_timing.grc
index 02130f481..14a7d403e 100644
--- a/gr-digital/examples/demod/pam_timing.grc
+++ b/gr-digital/examples/demod/pam_timing.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Mon Feb  1 18:54:46 2010</timestamp>
+  <timestamp>Thu Jul  5 17:55:51 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -44,6 +44,10 @@
       <value>True</value>
     </param>
     <param>
+      <key>max_nouts</key>
+      <value>0</value>
+    </param>
+    <param>
       <key>realtime_scheduling</key>
       <value></value>
     </param>
@@ -749,6 +753,14 @@
       <value></value>
     </param>
     <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
+    </param>
+    <param>
       <key>_coordinate</key>
       <value>(1116, 500)</value>
     </param>
@@ -792,7 +804,7 @@
     <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0</value>
+      <value>wxgui_scopesink2_0_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -804,7 +816,7 @@
     </param>
     <param>
       <key>title</key>
-      <value>Error</value>
+      <value>Scope Plot</value>
     </param>
     <param>
       <key>samp_rate</key>
@@ -812,7 +824,7 @@
     </param>
     <param>
       <key>v_scale</key>
-      <value>3</value>
+      <value>9</value>
     </param>
     <param>
       <key>v_offset</key>
@@ -844,11 +856,42 @@
     </param>
     <param>
       <key>notebook</key>
-      <value>notebook_0,0</value>
+      <value>notebook_0,1</value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1110, 651)</value>
+      <value>(1112, 881)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>rrctaps</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>firdes.root_raised_cosine(nfilts,1.0,1.0/(spb*nfilts), .35, int(11*spb*nfilts))</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(513, 679)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -859,7 +902,7 @@
     <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0_0</value>
+      <value>wxgui_scopesink2_0_0_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -867,11 +910,11 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>complex</value>
     </param>
     <param>
       <key>title</key>
-      <value>Scope Plot</value>
+      <value>Error</value>
     </param>
     <param>
       <key>samp_rate</key>
@@ -879,7 +922,7 @@
     </param>
     <param>
       <key>v_scale</key>
-      <value>9</value>
+      <value>.5</value>
     </param>
     <param>
       <key>v_offset</key>
@@ -911,11 +954,19 @@
     </param>
     <param>
       <key>notebook</key>
-      <value>notebook_0,1</value>
+      <value>notebook_0,3</value>
+    </param>
+    <param>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
+    </param>
+    <param>
+      <key>y_axis_label</key>
+      <value>Counts</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1112, 881)</value>
+      <value>(1115, 358)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -923,22 +974,22 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>gr_float_to_complex</key>
     <param>
       <key>id</key>
-      <value>rrctaps</value>
+      <value>gr_float_to_complex_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>firdes.root_raised_cosine(nfilts,1.0,1.0/(spb*nfilts), .35, int(11*spb*nfilts))</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(513, 679)</value>
+      <value>(590, 184)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -946,50 +997,69 @@
     </param>
   </block>
   <block>
-    <key>gr_pfb_clock_sync_xxx</key>
+    <key>blks2_pfb_arb_resampler_ccf</key>
     <param>
       <key>id</key>
-      <value>gr_pfb_clock_sync_xxx_0</value>
+      <value>blks2_pfb_arb_resampler_ccf_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>ccf</value>
+      <key>rate</key>
+      <value>spb</value>
     </param>
     <param>
-      <key>sps</key>
-      <value>spb</value>
+      <key>taps</key>
+      <value>firdes.root_raised_cosine(32, 32, 1.0, 0.35, 44*32)</value>
     </param>
     <param>
-      <key>alpha</key>
-      <value>alpha</value>
+      <key>size</key>
+      <value>32</value>
     </param>
     <param>
-      <key>beta</key>
-      <value>beta</value>
+      <key>_coordinate</key>
+      <value>(816, 181)</value>
     </param>
     <param>
-      <key>taps</key>
-      <value>rrctaps</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>gr_channel_model</key>
     <param>
-      <key>filter_size</key>
-      <value>nfilts</value>
+      <key>id</key>
+      <value>gr_channel_model_0</value>
     </param>
     <param>
-      <key>init_phase</key>
-      <value>16</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>max_dev</key>
-      <value>1.5</value>
+      <key>noise_voltage</key>
+      <value>noise_amp</value>
+    </param>
+    <param>
+      <key>freq_offset</key>
+      <value>freq_offset</value>
+    </param>
+    <param>
+      <key>epsilon</key>
+      <value>interpratio</value>
+    </param>
+    <param>
+      <key>taps</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>42</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(512, 527)</value>
+      <value>(59, 543)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -997,10 +1067,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>gr_multiply_const_vxx</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0_0_0</value>
+      <value>gr_multiply_const_vxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1008,55 +1078,97 @@
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>complex</value>
     </param>
     <param>
-      <key>title</key>
-      <value>Scope Plot</value>
+      <key>const</key>
+      <value>sig_amp</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>v_scale</key>
-      <value>1.25</value>
+      <key>_coordinate</key>
+      <value>(714, 382)</value>
     </param>
     <param>
-      <key>v_offset</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>t_scale</key>
+      <key>id</key>
+      <value>spb</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>4.2563</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(42, 840)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>gr_pfb_clock_sync_xxx</key>
     <param>
-      <key>ac_couple</key>
-      <value>False</value>
+      <key>id</key>
+      <value>gr_pfb_clock_sync_xxx_0</value>
     </param>
     <param>
-      <key>xy_mode</key>
-      <value>False</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>type</key>
+      <value>ccf</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>sps</key>
+      <value>spb</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>alpha</key>
+      <value>alpha</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value>notebook_0,2</value>
+      <key>beta</key>
+      <value>beta</value>
+    </param>
+    <param>
+      <key>taps</key>
+      <value>rrctaps</value>
+    </param>
+    <param>
+      <key>filter_size</key>
+      <value>nfilts</value>
+    </param>
+    <param>
+      <key>init_phase</key>
+      <value>16</value>
+    </param>
+    <param>
+      <key>max_dev</key>
+      <value>1.5</value>
+    </param>
+    <param>
+      <key>osps</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1111, 767)</value>
+      <value>(512, 527)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1067,7 +1179,7 @@
     <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0_1</value>
+      <value>wxgui_scopesink2_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1075,7 +1187,7 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>float</value>
     </param>
     <param>
       <key>title</key>
@@ -1087,7 +1199,7 @@
     </param>
     <param>
       <key>v_scale</key>
-      <value>.5</value>
+      <value>3</value>
     </param>
     <param>
       <key>v_offset</key>
@@ -1119,34 +1231,19 @@
     </param>
     <param>
       <key>notebook</key>
-      <value>notebook_0,3</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(1115, 358)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_float_to_complex</key>
-    <param>
-      <key>id</key>
-      <value>gr_float_to_complex_0</value>
+      <value>notebook_0,0</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>y_axis_label</key>
+      <value>Counts</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(590, 184)</value>
+      <value>(1114, 615)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1154,123 +1251,74 @@
     </param>
   </block>
   <block>
-    <key>blks2_pfb_arb_resampler_ccf</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>blks2_pfb_arb_resampler_ccf_0</value>
+      <value>wxgui_scopesink2_0_0_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>rate</key>
-      <value>spb</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>taps</key>
-      <value>firdes.root_raised_cosine(32, 32, 1.0, 0.35, 44*32)</value>
+      <key>title</key>
+      <value>Scope Plot</value>
     </param>
     <param>
-      <key>size</key>
-      <value>32</value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(816, 181)</value>
+      <key>v_scale</key>
+      <value>1.25</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>v_offset</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>gr_channel_model</key>
-    <param>
-      <key>id</key>
-      <value>gr_channel_model_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>noise_voltage</key>
-      <value>noise_amp</value>
-    </param>
     <param>
-      <key>freq_offset</key>
-      <value>freq_offset</value>
-    </param>
-    <param>
-      <key>epsilon</key>
-      <value>interpratio</value>
-    </param>
-    <param>
-      <key>taps</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>seed</key>
-      <value>42</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(59, 543)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
+      <key>t_scale</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>gr_multiply_const_vxx</key>
     <param>
-      <key>id</key>
-      <value>gr_multiply_const_vxx_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>ac_couple</key>
+      <value>False</value>
     </param>
     <param>
-      <key>const</key>
-      <value>sig_amp</value>
+      <key>xy_mode</key>
+      <value>False</value>
     </param>
     <param>
-      <key>vlen</key>
+      <key>num_inputs</key>
       <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(714, 382)</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>grid_pos</key>
+      <value></value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
-      <key>id</key>
-      <value>spb</value>
+      <key>notebook</key>
+      <value>notebook_0,2</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>trig_mode</key>
+      <value>gr.gr_TRIG_MODE_AUTO</value>
     </param>
     <param>
-      <key>value</key>
-      <value>4.2563</value>
+      <key>y_axis_label</key>
+      <value>Counts</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(42, 840)</value>
+      <value>(1080, 751)</value>
     </param>
     <param>
       <key>_rotation</key>