Changes in clock offset corrector and gsm_input - the previous version wasn't working well when samp_rate_in was different from samp_rate_out.

Now resampling is done outside of clock offset corrector.

1 files changed, 141 insertions, 64 deletions

diff --git a/hier_blocks/receiver/gsm_input.grc b/hier_blocks/receiver/gsm_input.grc
index 8d99640..685f0b2 100644
--- a/hier_blocks/receiver/gsm_input.grc
+++ b/hier_blocks/receiver/gsm_input.grc
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='ASCII'?>
+<?grc format='1' created='3.7.6'?>
 <flow_graph>
   <timestamp>Thu Nov  6 14:41:06 2014</timestamp>
   <block>
@@ -65,38 +66,26 @@
     </param>
   </block>
   <block>
-    <key>pad_sink</key>
+    <key>variable</key>
     <param>
       <key>id</key>
-      <value>pad_sink_0</value>
+      <value>samp_rate_out</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>out</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>num_streams</key>
-      <value>1</value>
+      <key>value</key>
+      <value>1625000.0/6.0*osr</value>
     </param>
     <param>
-      <key>optional</key>
-      <value>False</value>
+      <key>alias</key>
+      <value></value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(706, 213)</value>
+      <value>(632, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -182,6 +171,84 @@
     </param>
   </block>
   <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>fc</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>fc</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>940e6</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>(231, 22)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>parameter</key>
+    <param>
+      <key>id</key>
+      <value>samp_rate_in</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value>samp_rate_in</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1e6</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>(328, 22)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
     <key>low_pass_filter</key>
     <param>
       <key>id</key>
@@ -209,7 +276,7 @@
     </param>
     <param>
       <key>samp_rate</key>
-      <value>1625000.0/6.0*osr</value>
+      <value>samp_rate_out</value>
     </param>
     <param>
       <key>cutoff_freq</key>
@@ -245,7 +312,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(502, 165)</value>
+      <value>(704, 179)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -253,10 +320,10 @@
     </param>
   </block>
   <block>
-    <key>pad_source</key>
+    <key>pad_sink</key>
     <param>
       <key>id</key>
-      <value>ppm_in</value>
+      <value>pad_sink_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -264,11 +331,11 @@
     </param>
     <param>
       <key>label</key>
-      <value>ppm_in</value>
+      <value>out</value>
     </param>
     <param>
       <key>type</key>
-      <value>message</value>
+      <value>complex</value>
     </param>
     <param>
       <key>vlen</key>
@@ -280,11 +347,11 @@
     </param>
     <param>
       <key>optional</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(91, 242)</value>
+      <value>(904, 227)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -292,30 +359,26 @@
     </param>
   </block>
   <block>
-    <key>gsm_clock_offset_corrector</key>
+    <key>fractional_resampler_xx</key>
     <param>
       <key>id</key>
-      <value>gsm_clock_offset_corrector_0</value>
+      <value>fractional_resampler_xx_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>fc</key>
-      <value>fc</value>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
-      <key>ppm</key>
+      <key>phase_shift</key>
       <value>0</value>
     </param>
     <param>
-      <key>samp_rate_in</key>
-      <value>samp_rate_in</value>
-    </param>
-    <param>
-      <key>samp_rate_out</key>
-      <value>1625000.0/6.0*4.0</value>
+      <key>resamp_ratio</key>
+      <value>samp_rate_in/samp_rate_out</value>
     </param>
     <param>
       <key>alias</key>
@@ -335,7 +398,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(279, 190)</value>
+      <value>(488, 216)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -374,7 +437,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(88, 197)</value>
+      <value>(56, 179)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -382,10 +445,10 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>pad_source</key>
     <param>
       <key>id</key>
-      <value>fc</value>
+      <value>ppm_in</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -393,27 +456,27 @@
     </param>
     <param>
       <key>label</key>
-      <value>fc</value>
+      <value>ppm_in</value>
     </param>
     <param>
-      <key>value</key>
-      <value>940e6</value>
+      <key>type</key>
+      <value>message</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>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(231, 22)</value>
+      <value>(56, 243)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -421,38 +484,46 @@
     </param>
   </block>
   <block>
-    <key>parameter</key>
+    <key>gsm_clock_offset_corrector</key>
     <param>
       <key>id</key>
-      <value>samp_rate_in</value>
+      <value>gsm_clock_offset_corrector_0</value>
     </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
-      <key>label</key>
-      <value>samp_rate_in</value>
+      <key>fc</key>
+      <value>fc</value>
     </param>
     <param>
-      <key>value</key>
-      <value>1e6</value>
+      <key>ppm</key>
+      <value>ppm</value>
     </param>
     <param>
-      <key>type</key>
-      <value>eng_float</value>
+      <key>samp_rate_in</key>
+      <value>samp_rate_in</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>(328, 22)</value>
+      <value>(280, 195)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -466,12 +537,18 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>gsm_clock_offset_corrector_0</source_block_id>
+    <source_block_id>fractional_resampler_xx_0</source_block_id>
     <sink_block_id>low_pass_filter_0_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
+    <source_block_id>gsm_clock_offset_corrector_0</source_block_id>
+    <sink_block_id>fractional_resampler_xx_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>gsm_clock_offset_corrector_0</sink_block_id>
     <source_key>0</source_key>