Added capability to receive multiple channels of a single BTS to the receiver. It is now possible to receive bursts on channels for which frequency hopping was used. Changed examples to work without hierarhical GSM Receiver block.

1 files changed, 251 insertions, 192 deletions

diff --git a/hier_blocks/misc_utils/gsm_clock_offset_corrector.grc b/hier_blocks/misc_utils/gsm_clock_offset_corrector.grc
index 8621029..efc1275 100644
--- a/hier_blocks/misc_utils/gsm_clock_offset_corrector.grc
+++ b/hier_blocks/misc_utils/gsm_clock_offset_corrector.grc
@@ -1,55 +1,19 @@
 <?xml version='1.0' encoding='ASCII'?>
 <flow_graph>
-  <timestamp>Wed Aug 13 19:09:32 2014</timestamp>
+  <timestamp>Thu Nov  6 10:22:20 2014</timestamp>
   <block>
-    <key>options</key>
+    <key>import</key>
     <param>
       <key>id</key>
-      <value>clock_offset_corrector</value>
+      <value>math_imp</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>title</key>
-      <value>Clock offset corrector</value>
-    </param>
-    <param>
-      <key>author</key>
-      <value>Piotr Krysik</value>
-    </param>
-    <param>
-      <key>description</key>
-      <value></value>
-    </param>
-    <param>
-      <key>window_size</key>
-      <value>1280, 1024</value>
-    </param>
-    <param>
-      <key>generate_options</key>
-      <value>hb</value>
-    </param>
-    <param>
-      <key>category</key>
-      <value>GSM</value>
-    </param>
-    <param>
-      <key>run_options</key>
-      <value>prompt</value>
-    </param>
-    <param>
-      <key>run</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>max_nouts</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>realtime_scheduling</key>
-      <value></value>
+      <key>import</key>
+      <value>import math</value>
     </param>
     <param>
       <key>alias</key>
@@ -57,7 +21,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(10, 10)</value>
+      <value>(11, 125)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -65,18 +29,30 @@
     </param>
   </block>
   <block>
-    <key>import</key>
+    <key>parameter</key>
     <param>
       <key>id</key>
-      <value>math_imp</value>
+      <value>fc</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>import</key>
-      <value>import math</value>
+      <key>label</key>
+      <value>fc</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>936.6e6</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
     </param>
     <param>
       <key>alias</key>
@@ -84,7 +60,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(11, 125)</value>
+      <value>(274, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -92,46 +68,38 @@
     </param>
   </block>
   <block>
-    <key>fractional_resampler_xx</key>
+    <key>parameter</key>
     <param>
       <key>id</key>
-      <value>fractional_resampler_xx_0</value>
+      <value>samp_rate_in</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>label</key>
+      <value>samp_rate_in</value>
     </param>
     <param>
-      <key>phase_shift</key>
-      <value>0</value>
+      <key>value</key>
+      <value>1625000.0/6.0*4.0</value>
     </param>
     <param>
-      <key>resamp_ratio</key>
-      <value>1</value>
+      <key>type</key>
+      <value>eng_float</value>
     </param>
     <param>
-      <key>alias</key>
+      <key>short_id</key>
       <value></value>
     </param>
     <param>
-      <key>affinity</key>
+      <key>alias</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>(720, 303)</value>
+      <value>(368, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -139,10 +107,10 @@
     </param>
   </block>
   <block>
-    <key>pad_source</key>
+    <key>parameter</key>
     <param>
       <key>id</key>
-      <value>pad_source_0</value>
+      <value>samp_rate_out</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -150,27 +118,27 @@
     </param>
     <param>
       <key>label</key>
-      <value>in</value>
+      <value>samp_rate_out</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
+      <key>value</key>
+      <value>1625000.0/6.0*4.0</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>type</key>
+      <value>eng_float</value>
     </param>
     <param>
-      <key>num_streams</key>
-      <value>1</value>
+      <key>short_id</key>
+      <value></value>
     </param>
     <param>
-      <key>optional</key>
-      <value>False</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(14, 299)</value>
+      <value>(592, 20)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -209,7 +177,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1170, 333)</value>
+      <value>(1184, 333)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -217,38 +185,46 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>fractional_resampler_xx</key>
     <param>
       <key>id</key>
-      <value>fc</value>
+      <value>fractional_resampler_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>fc</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>value</key>
-      <value>936.6e6</value>
+      <key>phase_shift</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>eng_float</value>
+      <key>resamp_ratio</key>
+      <value>samp_rate_in/samp_rate_out</value>
     </param>
     <param>
-      <key>short_id</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <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>(274, 19)</value>
+      <value>(721, 303)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -256,10 +232,10 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>pad_source</key>
     <param>
       <key>id</key>
-      <value>ppm</value>
+      <value>pad_source_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -267,27 +243,27 @@
     </param>
     <param>
       <key>label</key>
-      <value>ppm</value>
+      <value>in</value>
     </param>
     <param>
-      <key>value</key>
-      <value>0</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>type</key>
-      <value>eng_float</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
-      <key>short_id</key>
-      <value></value>
+      <key>num_streams</key>
+      <value>1</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>optional</key>
+      <value>False</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(496, 19)</value>
+      <value>(14, 299)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -295,38 +271,42 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>gsm_controlled_rotator_cc</key>
     <param>
       <key>id</key>
-      <value>samp_rate_in</value>
+      <value>gsm_controlled_rotator_cc_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>samp_rate_in</value>
+      <key>phase_inc</key>
+      <value>0</value>
     </param>
     <param>
-      <key>value</key>
-      <value>1625000.0/6.0*4.0</value>
+      <key>samp_rate</key>
+      <value>samp_rate_out</value>
     </param>
     <param>
-      <key>type</key>
-      <value>eng_float</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>short_id</key>
+      <key>affinity</key>
       <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(368, 19)</value>
+      <value>(968, 320)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -334,38 +314,46 @@
     </param>
   </block>
   <block>
-    <key>pad_source</key>
+    <key>blocks_multiply_const_vxx</key>
     <param>
       <key>id</key>
-      <value>ppm_in</value>
+      <value>blocks_multiply_const_vxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>ppm_in</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>type</key>
-      <value>message</value>
+      <key>const</key>
+      <value>fc/samp_rate_out*(2*math.pi)/1e6</value>
     </param>
     <param>
       <key>vlen</key>
       <value>1</value>
     </param>
     <param>
-      <key>num_streams</key>
-      <value>1</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
-      <key>optional</key>
-      <value>True</value>
+      <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>(15, 217)</value>
+      <value>(435, 216)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -373,38 +361,46 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>fractional_resampler_xx</key>
     <param>
       <key>id</key>
-      <value>samp_rate_out</value>
+      <value>fractional_resampler_xx_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>samp_rate_out</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>value</key>
-      <value>1625000.0/6.0*4.0</value>
+      <key>phase_shift</key>
+      <value>0</value>
     </param>
     <param>
-      <key>type</key>
-      <value>eng_float</value>
+      <key>resamp_ratio</key>
+      <value>samp_rate_in/samp_rate_out</value>
     </param>
     <param>
-      <key>short_id</key>
+      <key>alias</key>
       <value></value>
     </param>
     <param>
-      <key>alias</key>
+      <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>(592, 20)</value>
+      <value>(721, 220)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -443,7 +439,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(183, 217)</value>
+      <value>(182, 216)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -451,46 +447,77 @@
     </param>
   </block>
   <block>
-    <key>blocks_add_const_vxx</key>
+    <key>pad_source</key>
     <param>
       <key>id</key>
-      <value>blocks_add_const_vxx_0</value>
+      <value>ppm_in</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>float</value>
+      <key>label</key>
+      <value>ppm_in</value>
     </param>
     <param>
-      <key>const</key>
-      <value>samp_rate_in/samp_rate_out</value>
+      <key>type</key>
+      <value>message</value>
     </param>
     <param>
       <key>vlen</key>
       <value>1</value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>num_streams</key>
+      <value>1</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>optional</key>
+      <value>True</value>
     </param>
     <param>
-      <key>minoutbuf</key>
+      <key>_coordinate</key>
+      <value>(13, 216)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
       <value>0</value>
     </param>
+  </block>
+  <block>
+    <key>parameter</key>
     <param>
-      <key>maxoutbuf</key>
+      <key>id</key>
+      <value>ppm</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>ppm</value>
+    </param>
+    <param>
+      <key>value</key>
       <value>0</value>
     </param>
     <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(571, 333)</value>
+      <value>(496, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -537,7 +564,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(411, 333)</value>
+      <value>(410, 333)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -545,22 +572,26 @@
     </param>
   </block>
   <block>
-    <key>gsm_controlled_rotator_cc</key>
+    <key>blocks_add_const_vxx</key>
     <param>
       <key>id</key>
-      <value>gsm_controlled_rotator_cc_0</value>
+      <value>blocks_add_const_vxx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>phase_inc</key>
-      <value>0</value>
+      <key>type</key>
+      <value>float</value>
     </param>
     <param>
-      <key>samp_rate</key>
-      <value>samp_rate_out</value>
+      <key>const</key>
+      <value>samp_rate_in/samp_rate_out</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
     </param>
     <param>
       <key>alias</key>
@@ -580,7 +611,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(973, 320)</value>
+      <value>(571, 333)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -588,46 +619,62 @@
     </param>
   </block>
   <block>
-    <key>blocks_multiply_const_vxx</key>
+    <key>options</key>
     <param>
       <key>id</key>
-      <value>blocks_multiply_const_vxx_0</value>
+      <value>clock_offset_corrector</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>type</key>
-      <value>float</value>
+      <key>title</key>
+      <value>Clock offset corrector</value>
     </param>
     <param>
-      <key>const</key>
-      <value>fc/samp_rate_out*(2*math.pi)/1e6</value>
+      <key>author</key>
+      <value>Piotr Krysik</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>description</key>
+      <value></value>
     </param>
     <param>
-      <key>alias</key>
-      <value></value>
+      <key>window_size</key>
+      <value>2280, 1024</value>
     </param>
     <param>
-      <key>affinity</key>
-      <value></value>
+      <key>generate_options</key>
+      <value>hb</value>
     </param>
     <param>
-      <key>minoutbuf</key>
-      <value>0</value>
+      <key>category</key>
+      <value>GSM</value>
     </param>
     <param>
-      <key>maxoutbuf</key>
+      <key>run_options</key>
+      <value>prompt</value>
+    </param>
+    <param>
+      <key>run</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>max_nouts</key>
       <value>0</value>
     </param>
     <param>
+      <key>realtime_scheduling</key>
+      <value></value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
       <key>_coordinate</key>
-      <value>(724, 216)</value>
+      <value>(10, 10)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -635,22 +682,34 @@
     </param>
   </block>
   <connection>
-    <source_block_id>blocks_add_const_vxx_0</source_block_id>
+    <source_block_id>ppm_in</source_block_id>
+    <sink_block_id>gsm_controlled_const_source_f_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>constant_msg</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>gsm_controlled_const_source_f_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>pad_source_0</source_block_id>
     <sink_block_id>fractional_resampler_xx_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>1</sink_key>
+    <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>blocks_multiply_const_vxx_0</source_block_id>
-    <sink_block_id>gsm_controlled_rotator_cc_0</sink_block_id>
+    <sink_block_id>fractional_resampler_xx_0_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>1</sink_key>
+    <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>fractional_resampler_xx_0</source_block_id>
-    <sink_block_id>gsm_controlled_rotator_cc_0</sink_block_id>
+    <source_block_id>blocks_add_const_vxx_0</source_block_id>
+    <sink_block_id>fractional_resampler_xx_0_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>0</sink_key>
+    <sink_key>1</sink_key>
   </connection>
   <connection>
     <source_block_id>gsm_controlled_rotator_cc_0</source_block_id>
@@ -659,16 +718,16 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>pad_source_0</source_block_id>
-    <sink_block_id>fractional_resampler_xx_0</sink_block_id>
+    <source_block_id>fractional_resampler_xx_0</source_block_id>
+    <sink_block_id>gsm_controlled_rotator_cc_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_multiply_const_vxx_0_0</source_block_id>
-    <sink_block_id>blocks_add_const_vxx_0</sink_block_id>
+    <source_block_id>blocks_add_const_vxx_0</source_block_id>
+    <sink_block_id>fractional_resampler_xx_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>0</sink_key>
+    <sink_key>1</sink_key>
   </connection>
   <connection>
     <source_block_id>gsm_controlled_const_source_f_0</source_block_id>
@@ -677,15 +736,15 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>ppm_in</source_block_id>
-    <sink_block_id>gsm_controlled_const_source_f_0</sink_block_id>
+    <source_block_id>blocks_multiply_const_vxx_0_0</source_block_id>
+    <sink_block_id>blocks_add_const_vxx_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>constant_msg</sink_key>
+    <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gsm_controlled_const_source_f_0</source_block_id>
-    <sink_block_id>blocks_multiply_const_vxx_0</sink_block_id>
+    <source_block_id>fractional_resampler_xx_0_0</source_block_id>
+    <sink_block_id>gsm_controlled_rotator_cc_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>0</sink_key>
+    <sink_key>1</sink_key>
   </connection>
 </flow_graph>