Changes in the simple usrp receiver example

1 files changed, 233 insertions, 147 deletions

diff --git a/examples/receiver_usrp.grc b/examples/receiver_usrp.grc
index 00d6852..c4bb2c1 100644
--- a/examples/receiver_usrp.grc
+++ b/examples/receiver_usrp.grc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Fri Jul 18 11:26:16 2014</timestamp>
+  <timestamp>Mon Aug  4 09:35:59 2014</timestamp>
   <block>
     <key>options</key>
     <param>
@@ -76,7 +76,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>100e6/80</value>
+      <value>100e6/100</value>
     </param>
     <param>
       <key>alias</key>
@@ -131,120 +131,86 @@
     </param>
   </block>
   <block>
-    <key>variable_slider</key>
+    <key>wxgui_fftsink2</key>
     <param>
       <key>id</key>
-      <value>gain</value>
+      <value>wxgui_fftsink2_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value></value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>25</value>
-    </param>
-    <param>
-      <key>min</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>max</key>
-      <value>50</value>
-    </param>
-    <param>
-      <key>num_steps</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>style</key>
-      <value>wx.SL_HORIZONTAL</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>converver</key>
-      <value>float_converter</value>
+      <key>title</key>
+      <value>FFT Plot</value>
     </param>
     <param>
-      <key>grid_pos</key>
-      <value></value>
+      <key>samp_rate</key>
+      <value>samp_rate</value>
     </param>
     <param>
-      <key>notebook</key>
-      <value></value>
+      <key>baseband_freq</key>
+      <value>fc</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>y_per_div</key>
+      <value>10</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(368, -1)</value>
+      <key>y_divs</key>
+      <value>10</value>
     </param>
     <param>
-      <key>_rotation</key>
+      <key>ref_level</key>
       <value>0</value>
     </param>
-  </block>
-  <block>
-    <key>gsm_receiver_hier</key>
     <param>
-      <key>id</key>
-      <value>gsm_receiver_hier_0</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>input_rate</key>
-      <value>samp_rate</value>
+      <key>ref_scale</key>
+      <value>2.0</value>
     </param>
     <param>
-      <key>osr</key>
-      <value>4</value>
+      <key>fft_size</key>
+      <value>1024</value>
     </param>
     <param>
-      <key>arfcn</key>
-      <value>0</value>
+      <key>fft_rate</key>
+      <value>15</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>peak_hold</key>
+      <value>False</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>average</key>
+      <value>False</value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>avg_alpha</key>
       <value>0</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
+      <key>win</key>
+      <value>None</value>
     </param>
     <param>
-      <key>_coordinate</key>
-      <value>(348, 237)</value>
+      <key>win_size</key>
+      <value></value>
     </param>
     <param>
-      <key>_rotation</key>
-      <value>0</value>
+      <key>grid_pos</key>
+      <value>1,1,1,1</value>
     </param>
-  </block>
-  <block>
-    <key>gsm_bursts_printer</key>
     <param>
-      <key>id</key>
-      <value>gsm_bursts_printer_0</value>
+      <key>notebook</key>
+      <value></value>
     </param>
     <param>
-      <key>_enabled</key>
-      <value>True</value>
+      <key>freqvar</key>
+      <value>None</value>
     </param>
     <param>
       <key>alias</key>
@@ -256,7 +222,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(587, 257)</value>
+      <value>(444, 366)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -267,7 +233,7 @@
     <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>fc</value>
+      <value>g</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -279,19 +245,19 @@
     </param>
     <param>
       <key>value</key>
-      <value>930</value>
+      <value>28</value>
     </param>
     <param>
       <key>min</key>
-      <value>900</value>
+      <value>0</value>
     </param>
     <param>
       <key>max</key>
-      <value>1000</value>
+      <value>50</value>
     </param>
     <param>
       <key>num_steps</key>
-      <value>500</value>
+      <value>100</value>
     </param>
     <param>
       <key>style</key>
@@ -315,7 +281,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(236, 0)</value>
+      <value>(368, -1)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -323,74 +289,42 @@
     </param>
   </block>
   <block>
-    <key>wxgui_fftsink2</key>
+    <key>variable_slider</key>
     <param>
       <key>id</key>
-      <value>wxgui_fftsink2_0</value>
+      <value>fc</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>FFT Plot</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate</value>
-    </param>
-    <param>
-      <key>baseband_freq</key>
-      <value>fc</value>
-    </param>
-    <param>
-      <key>y_per_div</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>y_divs</key>
-      <value>10</value>
-    </param>
-    <param>
-      <key>ref_level</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>ref_scale</key>
-      <value>2.0</value>
-    </param>
-    <param>
-      <key>fft_size</key>
-      <value>1024</value>
+      <key>label</key>
+      <value></value>
     </param>
     <param>
-      <key>fft_rate</key>
-      <value>15</value>
+      <key>value</key>
+      <value>930e6</value>
     </param>
     <param>
-      <key>peak_hold</key>
-      <value>False</value>
+      <key>min</key>
+      <value>900e6</value>
     </param>
     <param>
-      <key>average</key>
-      <value>False</value>
+      <key>max</key>
+      <value>1000e6</value>
     </param>
     <param>
-      <key>avg_alpha</key>
-      <value>0</value>
+      <key>num_steps</key>
+      <value>500</value>
     </param>
     <param>
-      <key>win</key>
-      <value>None</value>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
     </param>
     <param>
-      <key>win_size</key>
-      <value></value>
+      <key>converver</key>
+      <value>float_converter</value>
     </param>
     <param>
       <key>grid_pos</key>
@@ -401,20 +335,12 @@
       <value></value>
     </param>
     <param>
-      <key>freqvar</key>
-      <value>None</value>
-    </param>
-    <param>
       <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
       <key>_coordinate</key>
-      <value>(654, 52)</value>
+      <value>(236, 0)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -437,7 +363,7 @@
     </param>
     <param>
       <key>otw</key>
-      <value>sc16</value>
+      <value></value>
     </param>
     <param>
       <key>stream_args</key>
@@ -449,7 +375,7 @@
     </param>
     <param>
       <key>dev_addr</key>
-      <value></value>
+      <value>addr=192.168.9.2</value>
     </param>
     <param>
       <key>dev_args</key>
@@ -469,7 +395,7 @@
     </param>
     <param>
       <key>clock_source0</key>
-      <value>internal</value>
+      <value>external</value>
     </param>
     <param>
       <key>time_source0</key>
@@ -573,11 +499,11 @@
     </param>
     <param>
       <key>center_freq0</key>
-      <value>fc*1e6</value>
+      <value>fc</value>
     </param>
     <param>
       <key>gain0</key>
-      <value>gain</value>
+      <value>g</value>
     </param>
     <param>
       <key>ant0</key>
@@ -1101,7 +1027,155 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(101, 229)</value>
+      <value>(109, 236)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gsm_bursts_printer</key>
+    <param>
+      <key>id</key>
+      <value>gsm_bursts_printer_1</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(688, 272)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gsm_receiver_hier</key>
+    <param>
+      <key>id</key>
+      <value>gsm_receiver_hier_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>input_rate</key>
+      <value>samp_rate</value>
+    </param>
+    <param>
+      <key>osr</key>
+      <value>4</value>
+    </param>
+    <param>
+      <key>arfcn</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(455, 252)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gsm_get_bcch_or_ccch_bursts</key>
+    <param>
+      <key>id</key>
+      <value>gsm_get_bcch_or_ccch_bursts_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>d_fn51_start</key>
+      <value>2</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(664, 346)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>gsm_control_channels_decoder</key>
+    <param>
+      <key>id</key>
+      <value>gsm_control_channels_decoder_0</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(955, 350)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1115,15 +1189,27 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
+    <source_block_id>uhd_usrp_source_0</source_block_id>
+    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
     <source_block_id>gsm_receiver_hier_0</source_block_id>
-    <sink_block_id>gsm_bursts_printer_0</sink_block_id>
+    <sink_block_id>gsm_bursts_printer_1</sink_block_id>
     <source_key>bursts</source_key>
     <sink_key>bursts</sink_key>
   </connection>
   <connection>
-    <source_block_id>uhd_usrp_source_0</source_block_id>
-    <sink_block_id>wxgui_fftsink2_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
+    <source_block_id>gsm_receiver_hier_0</source_block_id>
+    <sink_block_id>gsm_get_bcch_or_ccch_bursts_0</sink_block_id>
+    <source_key>bursts</source_key>
+    <sink_key>bursts</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gsm_get_bcch_or_ccch_bursts_0</source_block_id>
+    <sink_block_id>gsm_control_channels_decoder_0</sink_block_id>
+    <source_key>bursts</source_key>
+    <sink_key>bursts</sink_key>
   </connection>
 </flow_graph>