From 799133a2e63253480fd5ec7d2a8092595687a90f Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 8 Jun 2016 22:30:52 +0200 Subject: Changed clock_offset_corrector in order to address the problem #152 - this is not ideal solution yet, as it involves removing of sampling frequency offset correction. --- .../misc_utils/gsm_clock_offset_corrector.grc | 677 +++++++++++---------- 1 file changed, 345 insertions(+), 332 deletions(-) (limited to 'hier_blocks') diff --git a/hier_blocks/misc_utils/gsm_clock_offset_corrector.grc b/hier_blocks/misc_utils/gsm_clock_offset_corrector.grc index 99d8e15..2222d7e 100644 --- a/hier_blocks/misc_utils/gsm_clock_offset_corrector.grc +++ b/hier_blocks/misc_utils/gsm_clock_offset_corrector.grc @@ -1,737 +1,756 @@ - - + + Thu Nov 6 10:22:20 2014 - import + options - id - math_imp + author + Piotr Krysik - _enabled - True + window_size + 2280, 1024 - import - import math + category + GSM - alias + comment + + + + description + + _enabled + True + _coordinate - (11, 125) + (10, 10) _rotation 0 - - - variable - id - samp_rate_out + generate_options + hb - _enabled - True + hier_block_src_path + .: - value - samp_rate_in + id + clock_offset_corrector - alias - + max_nouts + 0 - _coordinate - (736, 19) + qt_qss_theme + - _rotation - 0 + realtime_scheduling + - - - parameter - id - fc + run_command + {python} -u {filename} - _enabled - True + run_options + prompt - label - fc + run + True - value - 936.6e6 + thread_safe_setters + - type - eng_float + title + Clock offset corrector + + + variable - short_id + comment - alias - + _enabled + True _coordinate - (274, 19) + (736, 19) _rotation 0 - - - pad_source id - pad_source_0 + samp_rate_out - _enabled - True + value + samp_rate_in + + + blocks_add_const_vxx - label - in + alias + - type - complex + comment + - vlen - 1 + const + samp_rate_in/samp_rate_out - num_streams - 1 + affinity + - optional - False + _enabled + 0 _coordinate - (14, 299) + (552, 331) _rotation 0 - - - parameter id - ppm - - - _enabled - True + blocks_add_const_vxx_0 - label - ppm + type + float - value + maxoutbuf 0 - type - eng_float + minoutbuf + 0 - short_id - + vlen + 1 + + + blocks_multiply_const_vxx alias - _coordinate - (496, 19) + comment + - _rotation - 0 + const + fc/samp_rate_out*(2*math.pi)/1e6 - - - parameter - id - samp_rate_in + affinity + _enabled True - label - samp_rate_in + _coordinate + (432, 220) - value - 1625000.0/6.0*4.0 + _rotation + 0 - type - eng_float + id + blocks_multiply_const_vxx_0 - short_id - + type + float - alias - + maxoutbuf + 0 - _coordinate - (368, 19) + minoutbuf + 0 - _rotation - 0 + vlen + 1 - parameter - - id - samp_rate_out - - - _enabled - False - + blocks_multiply_const_vxx - label - samp_rate_out + alias + - value - 1625000.0/6.0*4.0 + comment + - type - eng_float + const + 1.0e-6*samp_rate_in/samp_rate_out - short_id + affinity - alias - + _enabled + 0 _coordinate - (592, 20) + (392, 331) _rotation 0 - - - pad_source id - ppm_in + blocks_multiply_const_vxx_0_0 - _enabled - True + type + float - label - ppm_in + maxoutbuf + 0 - type - message + minoutbuf + 0 vlen 1 + + + parameter - num_streams - 1 + alias + - optional + comment + + + + _enabled True _coordinate - (16, 219) + (274, 19) _rotation 0 - - - fractional_resampler_xx id - fractional_resampler_xx_0_0 + fc - _enabled - False + label + fc - type - float + short_id + - phase_shift - 0 + type + eng_float - resamp_ratio - samp_rate_in/samp_rate_out + value + 936.6e6 + + + fractional_resampler_xx alias - affinity + comment - minoutbuf - 0 + affinity + - maxoutbuf + _enabled 0 _coordinate - (712, 144) + (592, 537) _rotation 0 - - - blocks_multiply_const_vxx id - blocks_multiply_const_vxx_0 + fractional_resampler_xx_0 - _enabled - True + maxoutbuf + 0 - type - float + minoutbuf + 0 - const - fc/samp_rate_out*(2*math.pi)/1e6 + phase_shift + 0 - vlen - 1 + resamp_ratio + samp_rate_in/samp_rate_out + + type + complex + + + + gsm_controlled_const_source_f alias - affinity + comment - minoutbuf - 0 + affinity + - maxoutbuf - 0 + _enabled + True _coordinate - (416, 219) + (184, 220) _rotation 0 - - - fractional_resampler_xx id - fractional_resampler_xx_0 - - - _enabled - True + gsm_controlled_const_source_f_0 - type - complex + maxoutbuf + 0 - phase_shift + minoutbuf 0 - resamp_ratio - samp_rate_in/samp_rate_out + constant + ppm + + + gsm_controlled_rotator_cc alias + + comment + + affinity - minoutbuf + _enabled + True + + + _coordinate + (952, 193) + + + _rotation 0 + + id + gsm_controlled_rotator_cc_0 + maxoutbuf 0 - _coordinate - (704, 304) + minoutbuf + 0 - _rotation + phase_inc 0 + + samp_rate + samp_rate_out + - blocks_multiply_const_vxx + import - id - blocks_multiply_const_vxx_0_0 + alias + - _enabled - True + comment + - type - float + _enabled + True - const - 1.0e-6*samp_rate_in/samp_rate_out + _coordinate + (11, 125) - vlen - 1 + _rotation + 0 - alias - + id + math_imp - affinity - + import + import math + + + pad_sink - minoutbuf - 0 + comment + - maxoutbuf - 0 + _enabled + True _coordinate - (392, 331) + (1168, 204) _rotation 0 - - - pad_sink id pad_sink_1 - _enabled - True + type + complex label out - type - complex + num_streams + 1 + + + optional + False vlen 1 + + + pad_source - num_streams - 1 + comment + - optional - False + _enabled + True _coordinate - (1112, 331) + (32, 188) _rotation 0 - - - gsm_controlled_rotator_cc id - gsm_controlled_rotator_cc_0 + pad_source_0 - _enabled - True + label + in - phase_inc - 0 + num_streams + 1 - samp_rate - samp_rate_out + optional + False - alias - + type + complex - affinity + vlen + 1 + + + + parameter + + alias - minoutbuf - 0 + comment + - maxoutbuf - 0 + _enabled + True _coordinate - (928, 320) + (496, 19) _rotation 0 - - - gsm_controlled_const_source_f id - gsm_controlled_const_source_f_0 - - - _enabled - True + ppm - constant + label ppm - alias + short_id - affinity - + type + eng_float - minoutbuf + value 0 + + + pad_source - maxoutbuf - 0 + comment + + + + _enabled + True _coordinate - (168, 219) + (32, 244) _rotation 0 - - - blocks_add_const_vxx id - blocks_add_const_vxx_0 + ppm_in - _enabled - True + label + ppm_in - type - float + num_streams + 1 - const - samp_rate_in/samp_rate_out + optional + True + + + type + message vlen 1 + + + parameter alias - affinity + comment - minoutbuf - 0 - - - maxoutbuf - 0 + _enabled + True _coordinate - (552, 331) + (368, 19) _rotation 0 - - - options id - clock_offset_corrector + samp_rate_in - _enabled - True + label + samp_rate_in - title - Clock offset corrector + short_id + - author - Piotr Krysik + type + eng_float - description - + value + 1625000.0/6.0*4.0 + + + parameter - window_size - 2280, 1024 + alias + - generate_options - hb + comment + - category - GSM + _enabled + False - run_options - prompt + _coordinate + (592, 20) - run - True + _rotation + 0 - max_nouts - 0 + id + samp_rate_out - realtime_scheduling - + label + samp_rate_out - alias + short_id - _coordinate - (10, 10) + type + eng_float - _rotation - 0 + value + 1625000.0/6.0*4.0 - ppm_in - gsm_controlled_const_source_f_0 - 0 - constant_msg - - - pad_source_0 + blocks_add_const_vxx_0 fractional_resampler_xx_0 0 - 0 + 1 blocks_multiply_const_vxx_0 - fractional_resampler_xx_0_0 + gsm_controlled_rotator_cc_0 0 - 0 + 1 - blocks_add_const_vxx_0 - fractional_resampler_xx_0_0 + blocks_multiply_const_vxx_0_0 + blocks_add_const_vxx_0 0 - 1 + 0 fractional_resampler_xx_0 @@ -740,28 +759,16 @@ 0 - blocks_add_const_vxx_0 - fractional_resampler_xx_0 - 0 - 1 - - - blocks_multiply_const_vxx_0_0 - blocks_add_const_vxx_0 + gsm_controlled_const_source_f_0 + blocks_multiply_const_vxx_0 0 0 - fractional_resampler_xx_0_0 - gsm_controlled_rotator_cc_0 - 0 - 1 - - - blocks_multiply_const_vxx_0 - gsm_controlled_rotator_cc_0 + gsm_controlled_const_source_f_0 + blocks_multiply_const_vxx_0_0 0 - 1 + 0 gsm_controlled_rotator_cc_0 @@ -770,15 +777,21 @@ 0 - gsm_controlled_const_source_f_0 - blocks_multiply_const_vxx_0_0 + pad_source_0 + fractional_resampler_xx_0 0 0 - gsm_controlled_const_source_f_0 - blocks_multiply_const_vxx_0 + pad_source_0 + gsm_controlled_rotator_cc_0 0 0 + + ppm_in + gsm_controlled_const_source_f_0 + out + constant_msg + -- cgit v1.2.3