digital: fixed up examples for the updated location of blocks.

author: Tom Rondeau <trondeau@vt.edu> 2013-01-15 15:00:51 -0500
committer: Tom Rondeau <trondeau@vt.edu> 2013-01-15 15:00:51 -0500
commit: 8c3fc71409c002266150e99a5b06208cc1bb12ef (patch)
tree: bbe298679d154366b8ee92955fcc45dfda4b42de
parent: 5be31c3d79015beeabdd98ebf1c0152ae6caac8c (diff)
4 files changed, 848 insertions, 899 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_block_detail.cc b/gnuradio-core/src/lib/runtime/gr_block_detail.cc
index 784cdbe117..cfd7382f77 100644
--- a/gnuradio-core/src/lib/runtime/gr_block_detail.cc
+++ b/gnuradio-core/src/lib/runtime/gr_block_detail.cc
@@ -156,8 +156,8 @@ gr_block_detail::add_item_tag(unsigned int which_output, const gr_tag_t &tag)
 void
 gr_block_detail::remove_item_tag(unsigned int which_input, const gr_tag_t &tag)
 {
-  if(!pmt_is_symbol(tag.key)) {
-    throw pmt_wrong_type("gr_block_detail::add_item_tag key", tag.key);
+  if(!pmt::is_symbol(tag.key)) {
+    throw pmt::wrong_type("gr_block_detail::add_item_tag key", tag.key);
   }
   else {
     // Add tag to gr_buffer's deque tags
diff --git a/gr-digital/examples/demod/ber_simulation.grc b/gr-digital/examples/demod/ber_simulation.grc
index 98c1f3d22d..515f7f91f6 100644
--- a/gr-digital/examples/demod/ber_simulation.grc
+++ b/gr-digital/examples/demod/ber_simulation.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Tue Jan 15 14:59:58 2013</timestamp>
+  <timestamp>Mon Jan 14 11:20:53 2013</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -92,6 +92,124 @@
     </param>
   </block>
   <block>
+    <key>blocks_add_xx</key>
+    <param>
+      <key>id</key>
+      <value>blocks_add_xx</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>num_inputs</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(486, 151)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>wxgui_numbersink2</key>
+    <param>
+      <key>id</key>
+      <value>wxgui_numbersink2</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>title</key>
+      <value>BER</value>
+    </param>
+    <param>
+      <key>units</key>
+      <value>%</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>min_value</key>
+      <value>0.0</value>
+    </param>
+    <param>
+      <key>max_value</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>factor</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>decimal_places</key>
+      <value>4</value>
+    </param>
+    <param>
+      <key>ref_level</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>number_rate</key>
+      <value>15</value>
+    </param>
+    <param>
+      <key>peak_hold</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>average</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>avg_alpha</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>show_gauge</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value>1, 0, 1, 1</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(791, 228)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>180</value>
+    </param>
+  </block>
+  <block>
     <key>import</key>
     <param>
       <key>id</key>
@@ -267,119 +385,38 @@
     </param>
   </block>
   <block>
-    <key>blks2_error_rate</key>
-    <param>
-      <key>id</key>
-      <value>blks2_error_rate</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>'BER'</value>
-    </param>
-    <param>
-      <key>win_size</key>
-      <value>int(1e7)</value>
-    </param>
-    <param>
-      <key>bits_per_symbol</key>
-      <value>const[const_type].bits_per_symbol()</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(720, 25)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable</key>
+    <key>digital_chunks_to_symbols_xx</key>
     <param>
       <key>id</key>
-      <value>samp_rate</value>
+      <value>digital_chunks_to_symbols_xx</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>100e3</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(16, 308)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>in_type</key>
+      <value>byte</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
-      <key>id</key>
-      <value>const_type</value>
+      <key>out_type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>symbol_table</key>
+      <value>const[const_type].points()</value>
     </param>
     <param>
-      <key>value</key>
+      <key>dimension</key>
       <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(18, 428)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_static_text</key>
-    <param>
-      <key>id</key>
-      <value>variable_static_text_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Constellation Type</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>{0: 'BPSK', 1: 'QPSK', 2: '8-PSK'}[const_type] + " - Change const_type for different constellation types!"</value>
-    </param>
-    <param>
-      <key>converver</key>
-      <value>str_converter</value>
-    </param>
-    <param>
-      <key>formatter</key>
-      <value>None</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
+      <key>num_ports</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(422, 311)</value>
+      <value>(240, 140)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -387,38 +424,30 @@
     </param>
   </block>
   <block>
-    <key>digital_chunks_to_symbols_xx</key>
+    <key>blks2_error_rate</key>
     <param>
       <key>id</key>
-      <value>digital_chunks_to_symbols_xx</value>
+      <value>blks2_error_rate</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>in_type</key>
-      <value>byte</value>
-    </param>
-    <param>
-      <key>out_type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>symbol_table</key>
-      <value>const[const_type].points()</value>
+      <key>type</key>
+      <value>'BER'</value>
     </param>
     <param>
-      <key>dimension</key>
-      <value>1</value>
+      <key>win_size</key>
+      <value>int(1e7)</value>
     </param>
     <param>
-      <key>num_ports</key>
-      <value>1</value>
+      <key>bits_per_symbol</key>
+      <value>const[const_type].bits_per_symbol()</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(251, 141)</value>
+      <value>(720, 25)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -426,30 +455,22 @@
     </param>
   </block>
   <block>
-    <key>blocks_add_xx</key>
+    <key>digital_constellation_decoder_cb</key>
     <param>
       <key>id</key>
-      <value>blocks_add_xx</value>
+      <value>digital_constellation_decoder_cb_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>num_inputs</key>
-      <value>2</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>constellation</key>
+      <value>const[const_type].base()</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(510, 166)</value>
+      <value>(618, 164)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -524,7 +545,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(702, 229)</value>
+      <value>(623, 228)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -532,78 +553,80 @@
     </param>
   </block>
   <block>
-    <key>wxgui_numbersink2</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>wxgui_numbersink2</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>BER</value>
+      <key>value</key>
+      <value>100e3</value>
     </param>
     <param>
-      <key>units</key>
-      <value>%</value>
+      <key>_coordinate</key>
+      <value>(16, 308)</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>min_value</key>
-      <value>0.0</value>
+      <key>id</key>
+      <value>const_type</value>
     </param>
     <param>
-      <key>max_value</key>
-      <value>1.0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>factor</key>
-      <value>100</value>
+      <key>value</key>
+      <value>1</value>
     </param>
     <param>
-      <key>decimal_places</key>
-      <value>4</value>
+      <key>_coordinate</key>
+      <value>(18, 428)</value>
     </param>
     <param>
-      <key>ref_level</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable_static_text</key>
     <param>
-      <key>number_rate</key>
-      <value>15</value>
+      <key>id</key>
+      <value>variable_static_text_0</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>label</key>
+      <value>Constellation Type</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0</value>
+      <key>value</key>
+      <value>{0: 'BPSK', 1: 'QPSK', 2: '8-PSK'}[const_type] + " - Change const_type for different constellation types!"</value>
     </param>
     <param>
-      <key>show_gauge</key>
-      <value>False</value>
+      <key>converver</key>
+      <value>str_converter</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>formatter</key>
+      <value>None</value>
     </param>
     <param>
       <key>grid_pos</key>
-      <value>1, 0, 1, 1</value>
+      <value></value>
     </param>
     <param>
       <key>notebook</key>
@@ -611,30 +634,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(852, 229)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-  </block>
-  <block>
-    <key>digital_constellation_decoder_cb</key>
-    <param>
-      <key>id</key>
-      <value>digital_constellation_decoder_cb_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>constellation</key>
-      <value>const[const_type].base()</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(701, 165)</value>
+      <value>(422, 311)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -684,15 +684,15 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_add_xx</source_block_id>
-    <sink_block_id>digital_constellation_decoder_cb_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
     <source_block_id>digital_constellation_decoder_cb_0</source_block_id>
     <sink_block_id>blks2_error_rate</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
+  <connection>
+    <source_block_id>blocks_add_xx</source_block_id>
+    <sink_block_id>digital_constellation_decoder_cb_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
 </flow_graph>
diff --git a/gr-digital/examples/demod/digital_freq_lock.grc b/gr-digital/examples/demod/digital_freq_lock.grc
index 1844c8c779..7597e1a0fa 100644
--- a/gr-digital/examples/demod/digital_freq_lock.grc
+++ b/gr-digital/examples/demod/digital_freq_lock.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Mon Jan 14 10:49:20 2013</timestamp>
+  <timestamp>Tue Jan 15 14:17:18 2013</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -61,38 +61,22 @@
     </param>
   </block>
   <block>
-    <key>random_source_x</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>random_source_x</value>
+      <value>sps</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>byte</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>256</value>
-    </param>
-    <param>
-      <key>num_samps</key>
-      <value>10000000</value>
-    </param>
-    <param>
-      <key>repeat</key>
-      <value>True</value>
+      <key>value</key>
+      <value>4</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(-2, 111)</value>
+      <value>(166, -2)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -100,30 +84,22 @@
     </param>
   </block>
   <block>
-    <key>gr_throttle</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>gr_throttle_0</value>
+      <value>rolloff</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>samples_per_second</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>value</key>
+      <value>0.35</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(456, 134)</value>
+      <value>(231, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -134,7 +110,7 @@
     <key>variable</key>
     <param>
       <key>id</key>
-      <value>sps</value>
+      <value>samp_rate</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -142,11 +118,11 @@
     </param>
     <param>
       <key>value</key>
-      <value>4</value>
+      <value>32000</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(166, -2)</value>
+      <value>(439, -1)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -154,61 +130,54 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>rolloff</value>
+      <value>freq_offset</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>0.35</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(231, 0)</value>
+      <key>label</key>
+      <value>Frequency Offset</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>value</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>digital_fll_band_edge_cc</key>
     <param>
-      <key>id</key>
-      <value>digital_fll_band_edge_cc_0</value>
+      <key>min</key>
+      <value>-0.5</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>max</key>
+      <value>0.5</value>
     </param>
     <param>
-      <key>type</key>
-      <value>cc</value>
+      <key>num_steps</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>samps_per_sym</key>
-      <value>sps</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>rolloff</key>
-      <value>rolloff</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
-      <key>filter_size</key>
-      <value>44</value>
+      <key>grid_pos</key>
+      <value></value>
     </param>
     <param>
-      <key>w</key>
-      <value>freq_bw</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(81, 248)</value>
+      <value>(673, -1)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -216,42 +185,54 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>freq_bw</value>
+      <value>wxgui_scopesink2_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>FLL Loop Bandwidth</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>value</key>
+      <key>title</key>
+      <value>Frequency Corrected Signal</value>
+    </param>
+    <param>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>v_scale</key>
       <value>0</value>
     </param>
     <param>
-      <key>min</key>
+      <key>v_offset</key>
       <value>0</value>
     </param>
     <param>
-      <key>max</key>
-      <value>0.1</value>
+      <key>t_scale</key>
+      <value>0</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>1000</value>
+      <key>ac_couple</key>
+      <value>False</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>xy_mode</key>
+      <value>False</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>num_inputs</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
       <key>grid_pos</key>
@@ -259,11 +240,19 @@
     </param>
     <param>
       <key>notebook</key>
-      <value></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>(80, 382)</value>
+      <value>(439, 289)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -271,65 +260,74 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>samp_rate</value>
+      <value>wxgui_fftsink2_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>32000</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(439, -1)</value>
+      <key>title</key>
+      <value>Frequency Corrected Signal</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>baseband_freq</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
     <param>
-      <key>id</key>
-      <value>noise_amp</value>
+      <key>y_per_div</key>
+      <value>10</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>y_divs</key>
+      <value>10</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Channel Noise</value>
+      <key>ref_level</key>
+      <value>10</value>
     </param>
     <param>
-      <key>value</key>
-      <value>0</value>
+      <key>ref_scale</key>
+      <value>2.0</value>
     </param>
     <param>
-      <key>min</key>
-      <value>0</value>
+      <key>fft_size</key>
+      <value>1024</value>
     </param>
     <param>
-      <key>max</key>
-      <value>1.0</value>
+      <key>fft_rate</key>
+      <value>30</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>1000</value>
+      <key>peak_hold</key>
+      <value>False</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>average</key>
+      <value>False</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>avg_alpha</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>win</key>
+      <value>None</value>
+    </param>
+    <param>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
       <key>grid_pos</key>
@@ -337,11 +335,15 @@
     </param>
     <param>
       <key>notebook</key>
-      <value></value>
+      <value>notebook_0,0</value>
+    </param>
+    <param>
+      <key>freqvar</key>
+      <value>None</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(553, 0)</value>
+      <value>(439, 423)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -352,7 +354,7 @@
     <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>freq_offset</value>
+      <value>freq_bw</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -360,7 +362,7 @@
     </param>
     <param>
       <key>label</key>
-      <value>Frequency Offset</value>
+      <value>FLL Loop Bandwidth</value>
     </param>
     <param>
       <key>value</key>
@@ -368,11 +370,11 @@
     </param>
     <param>
       <key>min</key>
-      <value>-0.5</value>
+      <value>0</value>
     </param>
     <param>
       <key>max</key>
-      <value>0.5</value>
+      <value>0.1</value>
     </param>
     <param>
       <key>num_steps</key>
@@ -396,7 +398,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(673, -1)</value>
+      <value>(74, 436)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -404,38 +406,34 @@
     </param>
   </block>
   <block>
-    <key>channels_channel_model</key>
+    <key>notebook</key>
     <param>
       <key>id</key>
-      <value>channels_channel_model_0</value>
+      <value>notebook_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>
+      <key>style</key>
+      <value>wx.NB_TOP</value>
     </param>
     <param>
-      <key>epsilon</key>
-      <value>1.0</value>
+      <key>labels</key>
+      <value>['Freq', 'Time']</value>
     </param>
     <param>
-      <key>taps</key>
-      <value>1.0</value>
+      <key>grid_pos</key>
+      <value></value>
     </param>
     <param>
-      <key>seed</key>
-      <value>42</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(649, 104)</value>
+      <value>(108, 568)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -443,10 +441,10 @@
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>digital_fll_band_edge_cc</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0</value>
+      <value>digital_fll_band_edge_cc_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -454,63 +452,27 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>Signal into Receiver</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>v_scale</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>v_offset</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>t_scale</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ac_couple</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>xy_mode</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>num_inputs</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>win_size</key>
-      <value></value>
+      <value>cc</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>samps_per_sym</key>
+      <value>sps</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value>notebook_0,1</value>
+      <key>rolloff</key>
+      <value>rolloff</value>
     </param>
     <param>
-      <key>trig_mode</key>
-      <value>gr.gr_TRIG_MODE_AUTO</value>
+      <key>filter_size</key>
+      <value>44</value>
     </param>
     <param>
-      <key>y_axis_label</key>
-      <value>Counts</value>
+      <key>w</key>
+      <value>freq_bw</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(875, 0)</value>
+      <value>(75, 295)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -601,7 +563,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(875, 108)</value>
+      <value>(918, 107)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -612,7 +574,7 @@
     <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0_0</value>
+      <value>wxgui_scopesink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -624,7 +586,7 @@
     </param>
     <param>
       <key>title</key>
-      <value>Frequency Corrected Signal</value>
+      <value>Signal into Receiver</value>
     </param>
     <param>
       <key>samp_rate</key>
@@ -676,7 +638,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(439, 289)</value>
+      <value>(918, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -684,90 +646,124 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>digital_psk_mod</key>
     <param>
       <key>id</key>
-      <value>wxgui_fftsink2_0_0</value>
+      <value>digital_psk_mod_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>constellation_points</key>
+      <value>2</value>
     </param>
     <param>
-      <key>title</key>
-      <value>Frequency Corrected Signal</value>
+      <key>mod_code</key>
+      <value>"gray"</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>differential</key>
+      <value>False</value>
     </param>
     <param>
-      <key>baseband_freq</key>
+      <key>samples_per_symbol</key>
+      <value>sps</value>
+    </param>
+    <param>
+      <key>excess_bw</key>
+      <value>rolloff</value>
+    </param>
+    <param>
+      <key>verbose</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(202, 142)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>random_source_x</key>
     <param>
-      <key>y_per_div</key>
-      <value>10</value>
+      <key>id</key>
+      <value>random_source_x</value>
     </param>
     <param>
-      <key>y_divs</key>
-      <value>10</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>10</value>
+      <key>type</key>
+      <value>byte</value>
     </param>
     <param>
-      <key>ref_scale</key>
-      <value>2.0</value>
+      <key>min</key>
+      <value>0</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>1024</value>
+      <key>max</key>
+      <value>256</value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>30</value>
+      <key>num_samps</key>
+      <value>10000000</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>repeat</key>
+      <value>True</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>_coordinate</key>
+      <value>(8, 150)</value>
     </param>
     <param>
-      <key>avg_alpha</key>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>channels_channel_model</key>
+    <param>
+      <key>id</key>
+      <value>channels_channel_model_0</value>
+    </param>
     <param>
-      <key>win</key>
-      <value>None</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>noise_voltage</key>
+      <value>noise_amp</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>freq_offset</key>
+      <value>freq_offset</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value>notebook_0,0</value>
+      <key>epsilon</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>freqvar</key>
-      <value>None</value>
+      <key>taps</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>42</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(439, 423)</value>
+      <value>(681, 142)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -775,34 +771,30 @@
     </param>
   </block>
   <block>
-    <key>notebook</key>
+    <key>gr_throttle</key>
     <param>
       <key>id</key>
-      <value>notebook_0</value>
+      <value>gr_throttle_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.NB_TOP</value>
-    </param>
-    <param>
-      <key>labels</key>
-      <value>['Freq', 'Time']</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>samples_per_second</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(114, 521)</value>
+      <value>(487, 174)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -810,46 +802,54 @@
     </param>
   </block>
   <block>
-    <key>digital_psk_mod</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>digital_psk_mod_0</value>
+      <value>noise_amp</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>constellation_points</key>
-      <value>2</value>
+      <key>label</key>
+      <value>Channel Noise</value>
     </param>
     <param>
-      <key>mod_code</key>
-      <value>"gray"</value>
+      <key>value</key>
+      <value>0</value>
     </param>
     <param>
-      <key>differential</key>
-      <value>False</value>
+      <key>min</key>
+      <value>0</value>
     </param>
     <param>
-      <key>samples_per_symbol</key>
-      <value>sps</value>
+      <key>max</key>
+      <value>1.0</value>
     </param>
     <param>
-      <key>excess_bw</key>
-      <value>rolloff</value>
+      <key>num_steps</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>verbose</key>
-      <value>False</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>log</key>
-      <value>False</value>
+      <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>(194, 104)</value>
+      <value>(549, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
diff --git a/gr-digital/examples/demod/pam_sync.grc b/gr-digital/examples/demod/pam_sync.grc
index d9d4239c98..c1cb6e9b94 100644
--- a/gr-digital/examples/demod/pam_sync.grc
+++ b/gr-digital/examples/demod/pam_sync.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Mon Jan 14 10:47:40 2013</timestamp>
+  <timestamp>Tue Jan 15 14:11:25 2013</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -107,100 +107,6 @@
     </param>
   </block>
   <block>
-    <key>digital_pfb_clock_sync_xxx</key>
-    <param>
-      <key>id</key>
-      <value>digital_pfb_clock_sync_xxx_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>ccf</value>
-    </param>
-    <param>
-      <key>sps</key>
-      <value>spb</value>
-    </param>
-    <param>
-      <key>alpha</key>
-      <value>time_alpha</value>
-    </param>
-    <param>
-      <key>beta</key>
-      <value>time_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>(598, 241)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>digital_fll_band_edge_cc</key>
-    <param>
-      <key>id</key>
-      <value>digital_fll_band_edge_cc_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>cc</value>
-    </param>
-    <param>
-      <key>samps_per_sym</key>
-      <value>spb</value>
-    </param>
-    <param>
-      <key>rolloff</key>
-      <value>rolloff</value>
-    </param>
-    <param>
-      <key>filter_size</key>
-      <value>44</value>
-    </param>
-    <param>
-      <key>w</key>
-      <value>freq_bw</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(331, 239)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>variable</key>
     <param>
       <key>id</key>
@@ -263,99 +169,6 @@
     </param>
   </block>
   <block>
-    <key>channels_channel_model</key>
-    <param>
-      <key>id</key>
-      <value>channels_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>(46, 183)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>gr_throttle</key>
-    <param>
-      <key>id</key>
-      <value>gr_throttle_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>samples_per_second</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(857, 95)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>virtual_source</key>
-    <param>
-      <key>id</key>
-      <value>virtual_source_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>stream_id</key>
-      <value>input_signal_probe</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(835, 562)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
@@ -522,165 +335,197 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>wxgui_fftsink2_0_0</value>
+      <value>phase_bw</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>label</key>
+      <value>Costas Loop (Phase) Bandwidth</value>
     </param>
     <param>
-      <key>title</key>
-      <value>Post-sync spectrum</value>
+      <key>value</key>
+      <value>0</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>min</key>
+      <value>0</value>
     </param>
     <param>
-      <key>baseband_freq</key>
-      <value>0</value>
+      <key>max</key>
+      <value>0.1</value>
     </param>
     <param>
-      <key>y_per_div</key>
-      <value>10</value>
+      <key>num_steps</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>y_divs</key>
-      <value>10</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>ref_level</key>
-      <value>10</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
-      <key>ref_scale</key>
-      <value>2.0</value>
+      <key>grid_pos</key>
+      <value>(7,2,1,1)</value>
     </param>
     <param>
-      <key>fft_size</key>
-      <value>1024</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>30</value>
+      <key>_coordinate</key>
+      <value>(866, 313)</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>notebook</key>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>id</key>
+      <value>notebook_0</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>win</key>
-      <value>None</value>
+      <key>style</key>
+      <value>wx.NB_TOP</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>labels</key>
+      <value>['Synched Signal', 'Received Signal']</value>
     </param>
     <param>
       <key>grid_pos</key>
-      <value></value>
+      <value>(1,1,8,1)</value>
     </param>
     <param>
       <key>notebook</key>
-      <value>notebook_0,0</value>
-    </param>
-    <param>
-      <key>freqvar</key>
-      <value>None</value>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(347, 516)</value>
+      <value>(9, 601)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
   </block>
   <block>
-    <key>wxgui_scopesink2</key>
+    <key>digital_chunks_to_symbols_xx</key>
     <param>
       <key>id</key>
-      <value>wxgui_scopesink2_0</value>
+      <value>digital_chunks_to_symbols_xx</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
+      <key>in_type</key>
+      <value>byte</value>
+    </param>
+    <param>
+      <key>out_type</key>
       <value>complex</value>
     </param>
     <param>
-      <key>title</key>
-      <value>Post-sync Signal</value>
+      <key>symbol_table</key>
+      <value>const.points()</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
+      <key>dimension</key>
+      <value>1</value>
     </param>
     <param>
-      <key>v_scale</key>
-      <value>0</value>
+      <key>num_ports</key>
+      <value>1</value>
     </param>
     <param>
-      <key>v_offset</key>
+      <key>_coordinate</key>
+      <value>(178, 87)</value>
+    </param>
+    <param>
+      <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.0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(513, -1)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>ac_couple</key>
-      <value>False</value>
+      <key>id</key>
+      <value>rolloff</value>
     </param>
     <param>
-      <key>xy_mode</key>
+      <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>num_inputs</key>
-      <value>1</value>
+      <key>value</key>
+      <value>0.35</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>_coordinate</key>
+      <value>(578, -1)</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>notebook</key>
-      <value>notebook_0,0</value>
+      <key>id</key>
+      <value>rrctaps</value>
     </param>
     <param>
-      <key>trig_mode</key>
-      <value>gr.gr_TRIG_MODE_AUTO</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>y_axis_label</key>
-      <value>Counts</value>
+      <key>value</key>
+      <value>firdes.root_raised_cosine(nfilts,1.0,1.0/(nfilts*spb), rolloff, int(11*spb*nfilts))</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1085, 213)</value>
+      <value>(660, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -688,65 +533,146 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>freq_bw</value>
+      <value>sig_amp</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>FLL Bandwidth</value>
+      <key>value</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(887, -1)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>nfilts</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
       <key>value</key>
+      <value>32</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(816, 0)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>digital_pfb_clock_sync_xxx</key>
     <param>
-      <key>min</key>
-      <value>0.0</value>
+      <key>id</key>
+      <value>digital_pfb_clock_sync_xxx_0</value>
     </param>
     <param>
-      <key>max</key>
-      <value>0.05</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>1000</value>
+      <key>type</key>
+      <value>ccf</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>sps</key>
+      <value>spb</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>loop_bw</key>
+      <value>time_bw</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>(4,2,1,1)</value>
+      <key>taps</key>
+      <value>rrctaps</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <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>(341, 373)</value>
+      <value>(598, 241)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>pfb_arb_resampler_xxx</key>
+    <param>
+      <key>id</key>
+      <value>pfb_arb_resampler_xxx_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>ccf</value>
+    </param>
+    <param>
+      <key>rrate</key>
+      <value>spb</value>
+    </param>
+    <param>
+      <key>taps</key>
+      <value>firdes.root_raised_cosine(nfilts, 1.0, 1.0/nfilts, rolloff, int(11*spb*nfilts))</value>
+    </param>
+    <param>
+      <key>nfilts</key>
+      <value>32</value>
+    </param>
+    <param>
+      <key>atten</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(503, 63)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
   </block>
   <block>
     <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>time_alpha</value>
+      <value>interpratio</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -754,19 +680,19 @@
     </param>
     <param>
       <key>label</key>
-      <value>Timing Alpha</value>
+      <value>Timing Offset</value>
     </param>
     <param>
       <key>value</key>
-      <value>0</value>
+      <value>1.00</value>
     </param>
     <param>
       <key>min</key>
-      <value>0</value>
+      <value>0.99</value>
     </param>
     <param>
       <key>max</key>
-      <value>1</value>
+      <value>1.01</value>
     </param>
     <param>
       <key>num_steps</key>
@@ -782,7 +708,7 @@
     </param>
     <param>
       <key>grid_pos</key>
-      <value>(5,2,1,1)</value>
+      <value>(3,2,1,1)</value>
     </param>
     <param>
       <key>notebook</key>
@@ -790,18 +716,18 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(598, 388)</value>
+      <value>(42, 459)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>0</value>
+      <value>180</value>
     </param>
   </block>
   <block>
     <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>time_beta</value>
+      <value>freq_offset</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -809,7 +735,7 @@
     </param>
     <param>
       <key>label</key>
-      <value>Timing Beta</value>
+      <value>Frequency Offset</value>
     </param>
     <param>
       <key>value</key>
@@ -817,11 +743,11 @@
     </param>
     <param>
       <key>min</key>
-      <value>0.0</value>
+      <value>-0.5</value>
     </param>
     <param>
       <key>max</key>
-      <value>0.1</value>
+      <value>0.5</value>
     </param>
     <param>
       <key>num_steps</key>
@@ -837,7 +763,7 @@
     </param>
     <param>
       <key>grid_pos</key>
-      <value>(6,2,1,1)</value>
+      <value>(2,2,1,1)</value>
     </param>
     <param>
       <key>notebook</key>
@@ -845,18 +771,18 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(708, 388)</value>
+      <value>(8, 314)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
   </block>
   <block>
     <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>phase_bw</value>
+      <value>noise_amp</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -864,7 +790,7 @@
     </param>
     <param>
       <key>label</key>
-      <value>Costas Loop (Phase) Bandwidth</value>
+      <value>Channel Noise</value>
     </param>
     <param>
       <key>value</key>
@@ -876,7 +802,7 @@
     </param>
     <param>
       <key>max</key>
-      <value>0.1</value>
+      <value>1.0</value>
     </param>
     <param>
       <key>num_steps</key>
@@ -892,7 +818,7 @@
     </param>
     <param>
       <key>grid_pos</key>
-      <value>(7,2,1,1)</value>
+      <value>(1,2,1,1)</value>
     </param>
     <param>
       <key>notebook</key>
@@ -900,7 +826,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(866, 313)</value>
+      <value>(136, 314)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -908,34 +834,77 @@
     </param>
   </block>
   <block>
-    <key>notebook</key>
+    <key>channels_channel_model</key>
     <param>
       <key>id</key>
-      <value>notebook_0</value>
+      <value>channels_channel_model_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.NB_TOP</value>
+      <key>noise_voltage</key>
+      <value>noise_amp</value>
     </param>
     <param>
-      <key>labels</key>
-      <value>['Synched Signal', 'Received Signal']</value>
+      <key>freq_offset</key>
+      <value>freq_offset</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>(1,1,8,1)</value>
+      <key>epsilon</key>
+      <value>interpratio</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>taps</key>
+      <value>1.0</value>
+    </param>
+    <param>
+      <key>seed</key>
+      <value>42</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(9, 601)</value>
+      <value>(59, 184)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>digital_fll_band_edge_cc</key>
+    <param>
+      <key>id</key>
+      <value>digital_fll_band_edge_cc_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>cc</value>
+    </param>
+    <param>
+      <key>samps_per_sym</key>
+      <value>spb</value>
+    </param>
+    <param>
+      <key>rolloff</key>
+      <value>rolloff</value>
+    </param>
+    <param>
+      <key>filter_size</key>
+      <value>44</value>
+    </param>
+    <param>
+      <key>w</key>
+      <value>freq_bw</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(331, 238)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -946,7 +915,7 @@
     <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>interpratio</value>
+      <value>freq_bw</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -954,19 +923,19 @@
     </param>
     <param>
       <key>label</key>
-      <value>Timing Offset</value>
+      <value>FLL Bandwidth</value>
     </param>
     <param>
       <key>value</key>
-      <value>1.00</value>
+      <value>0</value>
     </param>
     <param>
       <key>min</key>
-      <value>0.99</value>
+      <value>0.0</value>
     </param>
     <param>
       <key>max</key>
-      <value>1.01</value>
+      <value>0.05</value>
     </param>
     <param>
       <key>num_steps</key>
@@ -982,7 +951,7 @@
     </param>
     <param>
       <key>grid_pos</key>
-      <value>(3,2,1,1)</value>
+      <value>(4,2,1,1)</value>
     </param>
     <param>
       <key>notebook</key>
@@ -990,7 +959,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(60, 407)</value>
+      <value>(335, 379)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -998,10 +967,10 @@
     </param>
   </block>
   <block>
-    <key>blocks_multiply_const_vxx</key>
+    <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>blocks_multiply_const_vxx_0</value>
+      <value>wxgui_fftsink2_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1012,101 +981,103 @@
       <value>complex</value>
     </param>
     <param>
-      <key>const</key>
-      <value>sig_amp</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>title</key>
+      <value>Post-sync spectrum</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(659, 95)</value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>baseband_freq</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>digital_chunks_to_symbols_xx</key>
     <param>
-      <key>id</key>
-      <value>digital_chunks_to_symbols_xx</value>
+      <key>y_per_div</key>
+      <value>10</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>y_divs</key>
+      <value>10</value>
     </param>
     <param>
-      <key>in_type</key>
-      <value>byte</value>
+      <key>ref_level</key>
+      <value>10</value>
     </param>
     <param>
-      <key>out_type</key>
-      <value>complex</value>
+      <key>ref_scale</key>
+      <value>2.0</value>
     </param>
     <param>
-      <key>symbol_table</key>
-      <value>const.points()</value>
+      <key>fft_size</key>
+      <value>1024</value>
     </param>
     <param>
-      <key>dimension</key>
-      <value>1</value>
+      <key>fft_rate</key>
+      <value>30</value>
     </param>
     <param>
-      <key>num_ports</key>
-      <value>1</value>
+      <key>peak_hold</key>
+      <value>False</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(178, 87)</value>
+      <key>average</key>
+      <value>False</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>avg_alpha</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
-      <key>id</key>
-      <value>spb</value>
+      <key>win</key>
+      <value>None</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
-      <key>value</key>
-      <value>4.0</value>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value>notebook_0,0</value>
+    </param>
+    <param>
+      <key>freqvar</key>
+      <value>None</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(513, -1)</value>
+      <value>(337, 523)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>0</value>
+      <value>180</value>
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>digital_costas_loop_cc</key>
     <param>
       <key>id</key>
-      <value>rolloff</value>
+      <value>digital_costas_loop_cc_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>0.35</value>
+      <key>w</key>
+      <value>phase_bw</value>
+    </param>
+    <param>
+      <key>order</key>
+      <value>const.arity()</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(578, -1)</value>
+      <value>(871, 225)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1114,68 +1085,74 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
-      <value>rrctaps</value>
+      <value>wxgui_scopesink2_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/(nfilts*spb), rolloff, int(11*spb*nfilts))</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(660, 0)</value>
+      <key>title</key>
+      <value>Post-sync Signal</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>v_scale</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
-      <key>id</key>
-      <value>sig_amp</value>
+      <key>v_offset</key>
+      <value>0</value>
     </param>
     <param>
-      <key>_enabled</key>
+      <key>t_scale</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>ac_couple</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>xy_mode</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>1.0</value>
+      <key>num_inputs</key>
+      <value>1</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(887, -1)</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>nfilts</value>
+      <key>notebook</key>
+      <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>value</key>
-      <value>32</value>
+      <key>y_axis_label</key>
+      <value>Counts</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(816, 0)</value>
+      <value>(1103, 196)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1183,30 +1160,22 @@
     </param>
   </block>
   <block>
-    <key>blks2_pfb_arb_resampler_ccf</key>
+    <key>virtual_source</key>
     <param>
       <key>id</key>
-      <value>blks2_pfb_arb_resampler_ccf_0</value>
+      <value>virtual_source_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>rate</key>
-      <value>spb</value>
-    </param>
-    <param>
-      <key>taps</key>
-      <value>firdes.root_raised_cosine(nfilts, 1.0, 1.0/nfilts, rolloff, int(11*spb*nfilts))</value>
-    </param>
-    <param>
-      <key>size</key>
-      <value>nfilts</value>
+      <key>stream_id</key>
+      <value>input_signal_probe</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(411, 80)</value>
+      <value>(828, 562)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1214,54 +1183,61 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>blocks_multiply_const_vxx</key>
     <param>
       <key>id</key>
-      <value>freq_offset</value>
+      <value>blocks_multiply_const_vxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Frequency Offset</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>value</key>
-      <value>0</value>
+      <key>const</key>
+      <value>sig_amp</value>
     </param>
     <param>
-      <key>min</key>
-      <value>-0.5</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>max</key>
-      <value>0.5</value>
+      <key>_coordinate</key>
+      <value>(807, 95)</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>1000</value>
+      <key>_rotation</key>
+      <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>gr_throttle</key>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>id</key>
+      <value>gr_throttle_0</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value>(2,2,1,1)</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>samples_per_second</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(-1, 285)</value>
+      <value>(987, 95)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1272,7 +1248,7 @@
     <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>noise_amp</value>
+      <value>time_bw</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1280,7 +1256,7 @@
     </param>
     <param>
       <key>label</key>
-      <value>Channel Noise</value>
+      <value>Timing Loop BW</value>
     </param>
     <param>
       <key>value</key>
@@ -1292,7 +1268,7 @@
     </param>
     <param>
       <key>max</key>
-      <value>1.0</value>
+      <value>0.1</value>
     </param>
     <param>
       <key>num_steps</key>
@@ -1308,7 +1284,7 @@
     </param>
     <param>
       <key>grid_pos</key>
-      <value>(1,2,1,1)</value>
+      <value>(5,2,1,1)</value>
     </param>
     <param>
       <key>notebook</key>
@@ -1316,34 +1292,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(129, 285)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>digital_costas_loop_cc</key>
-    <param>
-      <key>id</key>
-      <value>digital_costas_loop_cc_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>w</key>
-      <value>phase_bw</value>
-    </param>
-    <param>
-      <key>order</key>
-      <value>const.arity()</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(866, 246)</value>
+      <value>(598, 388)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1375,13 +1324,13 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blks2_pfb_arb_resampler_ccf_0</source_block_id>
+    <source_block_id>pfb_arb_resampler_xxx_0</source_block_id>
     <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_channel_model_0</source_block_id>
+    <source_block_id>channels_channel_model_0</source_block_id>
     <sink_block_id>digital_fll_band_edge_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -1424,7 +1373,7 @@
   </connection>
   <connection>
     <source_block_id>digital_chunks_to_symbols_xx</source_block_id>
-    <sink_block_id>blks2_pfb_arb_resampler_ccf_0</sink_block_id>
+    <sink_block_id>pfb_arb_resampler_xxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
author	Tom Rondeau <trondeau@vt.edu>	2013-01-15 15:00:51 -0500
committer	Tom Rondeau <trondeau@vt.edu>	2013-01-15 15:00:51 -0500
commit	8c3fc71409c002266150e99a5b06208cc1bb12ef (patch)
tree	bbe298679d154366b8ee92955fcc45dfda4b42de
parent	5be31c3d79015beeabdd98ebf1c0152ae6caac8c (diff)