diff options
author | Piotr K <pkrysik@elka.pw.edu.pl> | 2014-08-13 19:04:57 +0200 |
---|---|---|
committer | Piotr K <pkrysik@elka.pw.edu.pl> | 2014-08-13 19:04:57 +0200 |
commit | 66bb3cdc3137e46436ed18a1c453d59176051158 (patch) | |
tree | 8072de4539dccfbabfd8f6b2f5de7ee50e0e20f9 /hier_blocks | |
parent | c917af4e3a7c4c66f5b4e2494e1456f41dd12a47 (diff) |
Changed directory structure.
Corrected clock_offset_corrector (for some streange and yet unknown reason fractional resampler eats strem tags for some values of sps).
(this commit may contain some changes that are not described)
Diffstat (limited to 'hier_blocks')
-rw-r--r-- | hier_blocks/misc_utils/gsm_clock_offset_corrector.grc (renamed from hier_blocks/clock_offset_corrector.grc) | 371 | ||||
-rw-r--r-- | hier_blocks/receiver/gsm_fcch_detector.grc (renamed from hier_blocks/gsm_fcch_detector.grc) | 0 |
2 files changed, 205 insertions, 166 deletions
diff --git a/hier_blocks/clock_offset_corrector.grc b/hier_blocks/misc_utils/gsm_clock_offset_corrector.grc index 97dde85..10ed7ef 100644 --- a/hier_blocks/clock_offset_corrector.grc +++ b/hier_blocks/misc_utils/gsm_clock_offset_corrector.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Wed Aug 6 19:56:28 2014</timestamp> + <timestamp>Wed Aug 13 16:44:37 2014</timestamp> <block> <key>options</key> <param> @@ -65,30 +65,18 @@ </param> </block> <block> - <key>parameter</key> + <key>import</key> <param> <key>id</key> - <value>ppm</value> + <value>math_imp</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> + <key>import</key> + <value>import math</value> </param> <param> <key>alias</key> @@ -96,7 +84,7 @@ </param> <param> <key>_coordinate</key> - <value>(487, 22)</value> + <value>(11, 125)</value> </param> <param> <key>_rotation</key> @@ -104,38 +92,46 @@ </param> </block> <block> - <key>parameter</key> + <key>fractional_resampler_xx</key> <param> <key>id</key> - <value>samp_rate</value> + <value>fractional_resampler_xx_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>samp_rate</value> + <key>type</key> + <value>complex</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>1</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>(368, 19)</value> + <value>(720, 303)</value> </param> <param> <key>_rotation</key> @@ -143,10 +139,10 @@ </param> </block> <block> - <key>parameter</key> + <key>pad_source</key> <param> <key>id</key> - <value>fc</value> + <value>pad_source_0</value> </param> <param> <key>_enabled</key> @@ -154,27 +150,27 @@ </param> <param> <key>label</key> - <value>fc</value> + <value>in</value> </param> <param> - <key>value</key> - <value>936.6e6</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>(274, 19)</value> + <value>(14, 299)</value> </param> <param> <key>_rotation</key> @@ -182,26 +178,38 @@ </param> </block> <block> - <key>import</key> + <key>pad_sink</key> <param> <key>id</key> - <value>math_imp</value> + <value>pad_sink_1</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>import</key> - <value>import math</value> + <key>label</key> + <value>out</value> </param> <param> - <key>alias</key> - <value></value> + <key>type</key> + <value>complex</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>num_streams</key> + <value>1</value> + </param> + <param> + <key>optional</key> + <value>False</value> </param> <param> <key>_coordinate</key> - <value>(11, 125)</value> + <value>(1170, 333)</value> </param> <param> <key>_rotation</key> @@ -209,46 +217,38 @@ </param> </block> <block> - <key>blocks_multiply_const_vxx</key> + <key>parameter</key> <param> <key>id</key> - <value>blocks_multiply_const_vxx_0</value> + <value>fc</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label</key> + <value>fc</value> </param> <param> - <key>const</key> - <value>fc/samp_rate*(2*math.pi)</value> + <key>value</key> + <value>936.6e6</value> </param> <param> - <key>vlen</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>(571, 335)</value> + <value>(274, 19)</value> </param> <param> <key>_rotation</key> @@ -256,46 +256,38 @@ </param> </block> <block> - <key>blocks_add_const_vxx</key> + <key>parameter</key> <param> <key>id</key> - <value>blocks_add_const_vxx_0</value> + <value>ppm</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label</key> + <value>ppm</value> </param> <param> - <key>const</key> - <value>1</value> + <key>value</key> + <value>0</value> </param> <param> - <key>vlen</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>(779, 217)</value> + <value>(496, 19)</value> </param> <param> <key>_rotation</key> @@ -303,46 +295,38 @@ </param> </block> <block> - <key>blocks_multiply_const_vxx</key> + <key>parameter</key> <param> <key>id</key> - <value>blocks_multiply_const_vxx_0_0</value> + <value>samp_rate_in</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> + <key>label</key> + <value>samp_rate_in</value> </param> <param> - <key>const</key> - <value>1.0/1.0e6</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>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>(405, 217)</value> + <value>(368, 19)</value> </param> <param> <key>_rotation</key> @@ -353,7 +337,7 @@ <key>pad_source</key> <param> <key>id</key> - <value>pad_source_0</value> + <value>ppm_in</value> </param> <param> <key>_enabled</key> @@ -361,11 +345,11 @@ </param> <param> <key>label</key> - <value>in</value> + <value>ppm_in</value> </param> <param> <key>type</key> - <value>complex</value> + <value>message</value> </param> <param> <key>vlen</key> @@ -377,11 +361,11 @@ </param> <param> <key>optional</key> - <value>False</value> + <value>True</value> </param> <param> <key>_coordinate</key> - <value>(13, 301)</value> + <value>(15, 217)</value> </param> <param> <key>_rotation</key> @@ -389,10 +373,10 @@ </param> </block> <block> - <key>pad_sink</key> + <key>parameter</key> <param> <key>id</key> - <value>pad_sink_1</value> + <value>samp_rate_out</value> </param> <param> <key>_enabled</key> @@ -400,27 +384,27 @@ </param> <param> <key>label</key> - <value>out</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>(1174, 335)</value> + <value>(592, 20)</value> </param> <param> <key>_rotation</key> @@ -428,10 +412,10 @@ </param> </block> <block> - <key>fractional_resampler_xx</key> + <key>blocks_multiply_const_vxx</key> <param> <key>id</key> - <value>fractional_resampler_xx_0</value> + <value>blocks_multiply_const_vxx_0</value> </param> <param> <key>_enabled</key> @@ -439,14 +423,14 @@ </param> <param> <key>type</key> - <value>complex</value> + <value>float</value> </param> <param> - <key>phase_shift</key> - <value>0</value> + <key>const</key> + <value>fc/samp_rate_out*(2*math.pi)/1e6</value> </param> <param> - <key>resamp_ratio</key> + <key>vlen</key> <value>1</value> </param> <param> @@ -467,7 +451,7 @@ </param> <param> <key>_coordinate</key> - <value>(986, 322)</value> + <value>(724, 217)</value> </param> <param> <key>_rotation</key> @@ -514,22 +498,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</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> @@ -549,7 +537,7 @@ </param> <param> <key>_coordinate</key> - <value>(759, 305)</value> + <value>(571, 333)</value> </param> <param> <key>_rotation</key> @@ -557,38 +545,89 @@ </param> </block> <block> - <key>pad_source</key> + <key>blocks_multiply_const_vxx</key> <param> <key>id</key> - <value>ppm</value> + <value>blocks_multiply_const_vxx_0_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>ppm</value> + <key>type</key> + <value>float</value> </param> <param> - <key>type</key> - <value>message</value> + <key>const</key> + <value>1.0e-6*samp_rate_in/samp_rate_out</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> + <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>(411, 333)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>gsm_controlled_rotator_cc</key> + <param> + <key>id</key> + <value>gsm_controlled_rotator_cc_0</value> + </param> + <param> + <key>_enabled</key> <value>True</value> </param> <param> + <key>phase_inc</key> + <value>0</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate_out</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>(15, 217)</value> + <value>(973, 320)</value> </param> <param> <key>_rotation</key> @@ -596,40 +635,34 @@ </param> </block> <connection> - <source_block_id>gsm_controlled_const_source_f_0</source_block_id> - <sink_block_id>blocks_multiply_const_vxx_0_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>pad_source_0</source_block_id> + <source_block_id>blocks_multiply_const_vxx_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> <connection> - <source_block_id>blocks_multiply_const_vxx_0_0</source_block_id> - <sink_block_id>blocks_multiply_const_vxx_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_add_const_vxx_0</source_block_id> - <sink_block_id>fractional_resampler_xx_0</sink_block_id> - <source_key>0</source_key> - <sink_key>1</sink_key> - </connection> - <connection> <source_block_id>gsm_controlled_rotator_cc_0</source_block_id> - <sink_block_id>fractional_resampler_xx_0</sink_block_id> + <sink_block_id>pad_sink_1</sink_block_id> <source_key>0</source_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> + <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_0</source_block_id> @@ -638,15 +671,21 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>fractional_resampler_xx_0</source_block_id> - <sink_block_id>pad_sink_1</sink_block_id> + <source_block_id>gsm_controlled_const_source_f_0</source_block_id> + <sink_block_id>blocks_multiply_const_vxx_0_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>ppm</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> </flow_graph> diff --git a/hier_blocks/gsm_fcch_detector.grc b/hier_blocks/receiver/gsm_fcch_detector.grc index 1d69b53..1d69b53 100644 --- a/hier_blocks/gsm_fcch_detector.grc +++ b/hier_blocks/receiver/gsm_fcch_detector.grc |