Changed clock offset controller and company in order to remove from the gsm_input one of the resamplers.

2 files changed, 120 insertions, 60 deletions

diff --git a/hier_blocks/misc_utils/gsm_clock_offset_corrector_tagged.grc b/hier_blocks/misc_utils/gsm_clock_offset_corrector_tagged.grc
index 79c21c0..83806f4 100644
--- a/hier_blocks/misc_utils/gsm_clock_offset_corrector_tagged.grc
+++ b/hier_blocks/misc_utils/gsm_clock_offset_corrector_tagged.grc
@@ -78,7 +78,7 @@
     </param>
     <param>
       <key>title</key>
-      <value>Clock offset corrector tagged</value>
+      <value>Clock Offset Corrector Tagged</value>
     </param>
   </block>
   <block>
@@ -93,7 +93,34 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(736, 19)</value>
+      <value>(688, 21)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>gsm_symb_rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1625000.0/6.0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(808, 21)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -105,7 +132,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>samp_rate_in</value>
+      <value>osr*gsm_symb_rate</value>
     </param>
   </block>
   <block>
@@ -214,7 +241,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(328, 197)</value>
+      <value>(344, 197)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -238,7 +265,7 @@
     </param>
     <param>
       <key>resamp_ratio</key>
-      <value>1.0</value>
+      <value>samp_rate_in/samp_rate_out</value>
     </param>
   </block>
   <block>
@@ -261,7 +288,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(608, 209)</value>
+      <value>(600, 204)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -281,11 +308,7 @@
     </param>
     <param>
       <key>phase_inc</key>
-      <value>ppm/1.0e6*2*math.pi*fc/samp_rate_in</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>samp_rate_out</value>
+      <value>ppm/1.0e6*2*math.pi*fc/samp_rate_out</value>
     </param>
   </block>
   <block>
@@ -359,7 +382,11 @@
     </param>
   </block>
   <block>
-    <key>pad_sink</key>
+    <key>parameter</key>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
     <param>
       <key>comment</key>
       <value></value>
@@ -370,7 +397,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(784, 220)</value>
+      <value>(584, 23)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -378,31 +405,27 @@
     </param>
     <param>
       <key>id</key>
-      <value>pad_sink_1</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
+      <value>osr</value>
     </param>
     <param>
       <key>label</key>
-      <value>out</value>
+      <value>OSR</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>type</key>
+      <value>intx</value>
     </param>
     <param>
-      <key>vlen</key>
-      <value>1</value>
+      <key>value</key>
+      <value>4</value>
     </param>
   </block>
   <block>
-    <key>pad_source</key>
+    <key>pad_sink</key>
     <param>
       <key>comment</key>
       <value></value>
@@ -413,7 +436,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(32, 188)</value>
+      <value>(776, 204)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -421,11 +444,15 @@
     </param>
     <param>
       <key>id</key>
-      <value>pad_source_0</value>
+      <value>pad_sink_1</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
     </param>
     <param>
       <key>label</key>
-      <value>in</value>
+      <value>out</value>
     </param>
     <param>
       <key>num_streams</key>
@@ -436,20 +463,12 @@
       <value>False</value>
     </param>
     <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
       <key>vlen</key>
       <value>1</value>
     </param>
   </block>
   <block>
-    <key>parameter</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
+    <key>pad_source</key>
     <param>
       <key>comment</key>
       <value></value>
@@ -460,7 +479,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(496, 19)</value>
+      <value>(32, 188)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -468,23 +487,27 @@
     </param>
     <param>
       <key>id</key>
-      <value>ppm</value>
+      <value>pad_source_0</value>
     </param>
     <param>
       <key>label</key>
-      <value>ppm</value>
+      <value>in</value>
     </param>
     <param>
-      <key>short_id</key>
-      <value></value>
+      <key>num_streams</key>
+      <value>1</value>
+    </param>
+    <param>
+      <key>optional</key>
+      <value>False</value>
     </param>
     <param>
       <key>type</key>
-      <value>eng_float</value>
+      <value>complex</value>
     </param>
     <param>
-      <key>value</key>
-      <value>0</value>
+      <key>vlen</key>
+      <value>1</value>
     </param>
   </block>
   <block>
@@ -503,7 +526,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(368, 19)</value>
+      <value>(496, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -511,11 +534,11 @@
     </param>
     <param>
       <key>id</key>
-      <value>samp_rate_in</value>
+      <value>ppm</value>
     </param>
     <param>
       <key>label</key>
-      <value>samp_rate_in</value>
+      <value>ppm</value>
     </param>
     <param>
       <key>short_id</key>
@@ -527,7 +550,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>1625000.0/6.0*4.0</value>
+      <value>0</value>
     </param>
   </block>
   <block>
@@ -542,11 +565,11 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>False</value>
+      <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(592, 20)</value>
+      <value>(368, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -554,11 +577,11 @@
     </param>
     <param>
       <key>id</key>
-      <value>samp_rate_out</value>
+      <value>samp_rate_in</value>
     </param>
     <param>
       <key>label</key>
-      <value>samp_rate_out</value>
+      <value>samp_rate_in</value>
     </param>
     <param>
       <key>short_id</key>
diff --git a/hier_blocks/receiver/gsm_input.grc b/hier_blocks/receiver/gsm_input.grc
index 300dff5..3aa032b 100644
--- a/hier_blocks/receiver/gsm_input.grc
+++ b/hier_blocks/receiver/gsm_input.grc
@@ -93,6 +93,33 @@
     </param>
     <param>
       <key>_coordinate</key>
+      <value>(752, 21)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>gsm_symb_rate</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1625000.0/6.0</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
       <value>(632, 19)</value>
     </param>
     <param>
@@ -105,7 +132,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>1625000.0/6.0*osr</value>
+      <value>gsm_symb_rate*osr</value>
     </param>
   </block>
   <block>
@@ -210,11 +237,11 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(488, 217)</value>
+      <value>(488, 281)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -265,7 +292,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(224, 198)</value>
+      <value>(232, 199)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -284,6 +311,10 @@
       <value>0</value>
     </param>
     <param>
+      <key>osr</key>
+      <value>osr</value>
+    </param>
+    <param>
       <key>fc</key>
       <value>fc</value>
     </param>
@@ -332,7 +363,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(712, 186)</value>
+      <value>(712, 178)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -426,7 +457,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(904, 228)</value>
+      <value>(904, 220)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -605,6 +636,12 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
+    <source_block_id>gsm_clock_offset_corrector_tagged_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>low_pass_filter_0_0</source_block_id>
     <sink_block_id>pad_sink_0</sink_block_id>
     <source_key>0</source_key>