grc: updating GRC exmaples for new component changes.

author: Tom Rondeau <trondeau@vt.edu> 2012-12-27 13:50:09 -0500
committer: Tom Rondeau <trondeau@vt.edu> 2012-12-27 13:50:09 -0500
commit: c805168975a30af962fbd0a25c091d7b2113394e (patch)
tree: a47f006ba0d91b481ca8dfcd71348ff9d9f2613e /gr-digital
parent: cb18c1c206145707b9d5c62cada32ff43f99ca3f (diff)
4 files changed, 207 insertions, 435 deletions
diff --git a/gr-digital/examples/demod/ber_simulation.grc b/gr-digital/examples/demod/ber_simulation.grc
index 2a3e27a496..9f67504b5a 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>Sat Nov 10 15:31:44 2012</timestamp>
+  <timestamp>Thu Dec 27 13:06:26 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -510,10 +510,10 @@
     </param>
   </block>
   <block>
-    <key>gr_add_xx</key>
+    <key>blocks_add_xx</key>
     <param>
       <key>id</key>
-      <value>gr_add_xx</value>
+      <value>blocks_add_xx</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -594,7 +594,7 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_xx</source_block_id>
+    <source_block_id>blocks_add_xx</source_block_id>
     <sink_block_id>wxgui_scopesink2_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -606,7 +606,7 @@
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_xx</source_block_id>
+    <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>
@@ -619,13 +619,13 @@
   </connection>
   <connection>
     <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
-    <sink_block_id>gr_add_xx</sink_block_id>
+    <sink_block_id>blocks_add_xx</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>analog_noise_source_x_0</source_block_id>
-    <sink_block_id>gr_add_xx</sink_block_id>
+    <sink_block_id>blocks_add_xx</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
diff --git a/gr-digital/examples/demod/pam_sync.grc b/gr-digital/examples/demod/pam_sync.grc
index 11c625467b..d9afb3100c 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 Jul 16 21:25:28 2012</timestamp>
+  <timestamp>Thu Dec 27 13:26:17 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -311,61 +311,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>nfilts/2</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>(601, 254)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>wxgui_scopesink2</key>
     <param>
       <key>id</key>
@@ -452,7 +397,7 @@
     </param>
     <param>
       <key>label</key>
-      <value>Channel Noise</value>
+      <value>Channels_Channel Noise</value>
     </param>
     <param>
       <key>value</key>
@@ -703,10 +648,10 @@
     </param>
   </block>
   <block>
-    <key>channel_model</key>
+    <key>channels_channel_model</key>
     <param>
       <key>id</key>
-      <value>channel_model_0</value>
+      <value>channels_channel_model_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -966,116 +911,6 @@
     <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>time_alpha</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Timing Alpha</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>1</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>(5,2,1,1)</value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(557, 431)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>time_beta</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Timing Beta</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0.0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>0.1</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>(6,2,1,1)</value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(694, 430)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-  </block>
-  <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
       <value>freq_bw</value>
     </param>
     <param>
@@ -1219,10 +1054,10 @@
     </param>
   </block>
   <block>
-    <key>gr_multiply_const_vxx</key>
+    <key>blocks_multiply_const_vxx</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_const_vxx_0</value>
+      <value>blocks_multiply_const_vxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1307,6 +1142,10 @@
       <value>32</value>
     </param>
     <param>
+      <key>atten</key>
+      <value>100</value>
+    </param>
+    <param>
       <key>_coordinate</key>
       <value>(468, 72)</value>
     </param>
@@ -1355,58 +1194,105 @@
     </param>
   </block>
   <block>
-    <key>options</key>
+    <key>digital_pfb_clock_sync_xxx</key>
     <param>
       <key>id</key>
-      <value>pam_sync</value>
+      <value>digital_pfb_clock_sync_xxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>title</key>
-      <value></value>
+      <key>type</key>
+      <value>ccf</value>
     </param>
     <param>
-      <key>author</key>
-      <value></value>
+      <key>sps</key>
+      <value>spb</value>
     </param>
     <param>
-      <key>description</key>
-      <value></value>
+      <key>loop_bw</key>
+      <value>timing_loop_bw</value>
     </param>
     <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
+      <key>taps</key>
+      <value>rrctaps</value>
     </param>
     <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
+      <key>filter_size</key>
+      <value>nfilts</value>
     </param>
     <param>
-      <key>category</key>
-      <value>Custom</value>
+      <key>init_phase</key>
+      <value>nfilts/2</value>
     </param>
     <param>
-      <key>run_options</key>
-      <value>prompt</value>
+      <key>max_dev</key>
+      <value>1.5</value>
     </param>
     <param>
-      <key>run</key>
+      <key>osps</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(601, 254)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>id</key>
+      <value>timing_loop_bw</value>
+    </param>
+    <param>
+      <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>max_nouts</key>
+      <key>label</key>
+      <value>Timing Loop Bandwidth</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>6.28/100.0</value>
+    </param>
+    <param>
+      <key>min</key>
       <value>0</value>
     </param>
     <param>
-      <key>realtime_scheduling</key>
+      <key>max</key>
+      <value>0.2</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>(5,2,1,1)</value>
+    </param>
+    <param>
+      <key>notebook</key>
       <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(-1, 0)</value>
+      <value>(557, 431)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1438,7 +1324,7 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_multiply_const_vxx_0</source_block_id>
+    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
     <sink_block_id>gr_throttle_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -1462,20 +1348,20 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>channel_model_0</source_block_id>
+    <source_block_id>channels_channel_model_0</source_block_id>
     <sink_block_id>virtual_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>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>
   </connection>
   <connection>
     <source_block_id>gr_throttle_0</source_block_id>
-    <sink_block_id>channel_model_0</sink_block_id>
+    <sink_block_id>channels_channel_model_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -1487,7 +1373,7 @@
   </connection>
   <connection>
     <source_block_id>pfb_arb_resampler_xxx_0</source_block_id>
-    <sink_block_id>gr_multiply_const_vxx_0</sink_block_id>
+    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gr-digital/examples/demod/pam_timing.grc b/gr-digital/examples/demod/pam_timing.grc
index 6465d25fd0..b5e8d8822e 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>Thu Jul  5 17:55:51 2012</timestamp>
+  <timestamp>Thu Dec 27 13:05:12 2012</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -61,10 +61,10 @@
     </param>
   </block>
   <block>
-    <key>gr_uchar_to_float</key>
+    <key>blocks_uchar_to_float</key>
     <param>
       <key>id</key>
-      <value>gr_uchar_to_float_0</value>
+      <value>blocks_uchar_to_float_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -80,10 +80,10 @@
     </param>
   </block>
   <block>
-    <key>gr_uchar_to_float</key>
+    <key>blocks_uchar_to_float</key>
     <param>
       <key>id</key>
-      <value>gr_uchar_to_float_0_0</value>
+      <value>blocks_uchar_to_float_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -232,10 +232,10 @@
     </param>
   </block>
   <block>
-    <key>const_source_x</key>
+    <key>analog_const_source_x</key>
     <param>
       <key>id</key>
-      <value>const_source_x_0</value>
+      <value>analog_const_source_x_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -259,10 +259,10 @@
     </param>
   </block>
   <block>
-    <key>const_source_x</key>
+    <key>analog_const_source_x</key>
     <param>
       <key>id</key>
-      <value>const_source_x_0_0</value>
+      <value>analog_const_source_x_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -321,10 +321,10 @@
     </param>
   </block>
   <block>
-    <key>gr_add_xx</key>
+    <key>blocks_add_xx</key>
     <param>
       <key>id</key>
-      <value>gr_add_xx_0</value>
+      <value>blocks_add_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -352,10 +352,10 @@
     </param>
   </block>
   <block>
-    <key>gr_add_xx</key>
+    <key>blocks_add_xx</key>
     <param>
       <key>id</key>
-      <value>gr_add_xx_0_1</value>
+      <value>blocks_add_xx_0_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -516,61 +516,6 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
-    <param>
-      <key>id</key>
-      <value>alpha</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value>Timing Alpha</value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>1</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>(552, 4)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>variable</key>
     <param>
       <key>id</key>
@@ -692,61 +637,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>alpha</value>
-    </param>
-    <param>
-      <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>nfilts/2</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>(492, 519)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
     <key>gr_throttle</key>
     <param>
       <key>id</key>
@@ -778,10 +668,10 @@
     </param>
   </block>
   <block>
-    <key>channel_model</key>
+    <key>channels_channel_model</key>
     <param>
       <key>id</key>
-      <value>channel_model_0</value>
+      <value>channels_channel_model_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -817,10 +707,10 @@
     </param>
   </block>
   <block>
-    <key>gr_float_to_complex</key>
+    <key>blocks_float_to_complex</key>
     <param>
       <key>id</key>
-      <value>gr_float_to_complex_0</value>
+      <value>blocks_float_to_complex_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -866,6 +756,10 @@
       <value>32</value>
     </param>
     <param>
+      <key>atten</key>
+      <value>100</value>
+    </param>
+    <param>
       <key>_coordinate</key>
       <value>(788, 173)</value>
     </param>
@@ -875,10 +769,10 @@
     </param>
   </block>
   <block>
-    <key>gr_multiply_const_vxx</key>
+    <key>blocks_multiply_const_vxx</key>
     <param>
       <key>id</key>
-      <value>gr_multiply_const_vxx_0</value>
+      <value>blocks_multiply_const_vxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1206,113 +1100,119 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>beta</value>
+      <value>pam_amp</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>Timing Beta</value>
+      <key>value</key>
+      <value>2</value>
     </param>
     <param>
-      <key>value</key>
+      <key>_coordinate</key>
+      <value>(277, 12)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>variable</key>
     <param>
-      <key>min</key>
-      <value>0.0</value>
+      <key>id</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>max</key>
-      <value>0.1</value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>num_steps</key>
-      <value>1000</value>
+      <key>value</key>
+      <value>32000</value>
     </param>
     <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>_coordinate</key>
+      <value>(182, 12)</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>id</key>
+      <value>sig_amp</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>_enabled</key>
+      <value>True</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>value</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(673, 5)</value>
+      <value>(369, 12)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
   </block>
   <block>
-    <key>options</key>
+    <key>digital_pfb_clock_sync_xxx</key>
     <param>
       <key>id</key>
-      <value>pam_timing</value>
+      <value>digital_pfb_clock_sync_xxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>title</key>
-      <value></value>
-    </param>
-    <param>
-      <key>author</key>
-      <value></value>
-    </param>
-    <param>
-      <key>description</key>
-      <value></value>
+      <key>type</key>
+      <value>ccf</value>
     </param>
     <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
+      <key>sps</key>
+      <value>spb</value>
     </param>
     <param>
-      <key>generate_options</key>
-      <value>wx_gui</value>
+      <key>loop_bw</key>
+      <value>loop_bw</value>
     </param>
     <param>
-      <key>category</key>
-      <value>Custom</value>
+      <key>taps</key>
+      <value>rrctaps</value>
     </param>
     <param>
-      <key>run_options</key>
-      <value>prompt</value>
+      <key>filter_size</key>
+      <value>nfilts</value>
     </param>
     <param>
-      <key>run</key>
-      <value>True</value>
+      <key>init_phase</key>
+      <value>nfilts/2</value>
     </param>
     <param>
-      <key>max_nouts</key>
-      <value>0</value>
+      <key>max_dev</key>
+      <value>1.5</value>
     </param>
     <param>
-      <key>realtime_scheduling</key>
-      <value></value>
+      <key>osps</key>
+      <value>1</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(10, 10)</value>
+      <value>(492, 519)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1320,68 +1220,54 @@
     </param>
   </block>
   <block>
-    <key>variable</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>pam_amp</value>
+      <value>loop_bw</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>value</key>
-      <value>2</value>
+      <key>label</key>
+      <value>Loop Bandwidth</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(277, 12)</value>
+      <key>value</key>
+      <value>6.28/100.0</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>min</key>
       <value>0</value>
     </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>32000</value>
+      <key>max</key>
+      <value>0.2</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(182, 12)</value>
+      <key>num_steps</key>
+      <value>1000</value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
-  </block>
-  <block>
-    <key>variable</key>
     <param>
-      <key>id</key>
-      <value>sig_amp</value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>grid_pos</key>
+      <value></value>
     </param>
     <param>
-      <key>value</key>
-      <value>1</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(369, 12)</value>
+      <value>(552, 4)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1390,54 +1276,54 @@
   </block>
   <connection>
     <source_block_id>random_source_x_0</source_block_id>
-    <sink_block_id>gr_uchar_to_float_0</sink_block_id>
+    <sink_block_id>blocks_uchar_to_float_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_uchar_to_float_0</source_block_id>
-    <sink_block_id>gr_add_xx_0</sink_block_id>
+    <source_block_id>blocks_uchar_to_float_0</source_block_id>
+    <sink_block_id>blocks_add_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>const_source_x_0</source_block_id>
-    <sink_block_id>gr_add_xx_0</sink_block_id>
+    <source_block_id>analog_const_source_x_0</source_block_id>
+    <sink_block_id>blocks_add_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_uchar_to_float_0_0</source_block_id>
-    <sink_block_id>gr_add_xx_0_1</sink_block_id>
+    <source_block_id>blocks_uchar_to_float_0_0</source_block_id>
+    <sink_block_id>blocks_add_xx_0_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>const_source_x_0_0</source_block_id>
-    <sink_block_id>gr_add_xx_0_1</sink_block_id>
+    <source_block_id>analog_const_source_x_0_0</source_block_id>
+    <sink_block_id>blocks_add_xx_0_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
   <connection>
     <source_block_id>random_source_x_0_0</source_block_id>
-    <sink_block_id>gr_uchar_to_float_0_0</sink_block_id>
+    <sink_block_id>blocks_uchar_to_float_0_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_xx_0</source_block_id>
-    <sink_block_id>gr_float_to_complex_0</sink_block_id>
+    <source_block_id>blocks_add_xx_0</source_block_id>
+    <sink_block_id>blocks_float_to_complex_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_add_xx_0_1</source_block_id>
-    <sink_block_id>gr_float_to_complex_0</sink_block_id>
+    <source_block_id>blocks_add_xx_0_1</source_block_id>
+    <sink_block_id>blocks_float_to_complex_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_multiply_const_vxx_0</source_block_id>
+    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
     <sink_block_id>wxgui_scopesink2_0_0_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -1473,26 +1359,26 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>channel_model_0</source_block_id>
+    <source_block_id>channels_channel_model_0</source_block_id>
     <sink_block_id>gr_throttle_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>channel_model_0</sink_block_id>
+    <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
+    <sink_block_id>channels_channel_model_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gr_float_to_complex_0</source_block_id>
+    <source_block_id>blocks_float_to_complex_0</source_block_id>
     <sink_block_id>pfb_arb_resampler_xxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>pfb_arb_resampler_xxx_0</source_block_id>
-    <sink_block_id>gr_multiply_const_vxx_0</sink_block_id>
+    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gr-digital/python/gfsk.py b/gr-digital/python/gfsk.py
index d6a81c37fc..42d65d36ce 100644
--- a/gr-digital/python/gfsk.py
+++ b/gr-digital/python/gfsk.py
@@ -26,7 +26,7 @@
 
 from gnuradio import gr
 from gnuradio import analog
-from gnuradio import blocksx
+from gnuradio import blocks
 import modulation_utils
 import digital_swig as digital
 from math import pi
author	Tom Rondeau <trondeau@vt.edu>	2012-12-27 13:50:09 -0500
committer	Tom Rondeau <trondeau@vt.edu>	2012-12-27 13:50:09 -0500
commit	c805168975a30af962fbd0a25c091d7b2113394e (patch)
tree	a47f006ba0d91b481ca8dfcd71348ff9d9f2613e /gr-digital
parent	cb18c1c206145707b9d5c62cada32ff43f99ca3f (diff)