From 66bb3cdc3137e46436ed18a1c453d59176051158 Mon Sep 17 00:00:00 2001 From: Piotr K Date: Wed, 13 Aug 2014 19:04:57 +0200 Subject: 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) --- examples/gsm_fcch_detector.grc | 567 ----------------------------------------- examples/receiver_file.grc | 180 ++++++------- examples/receiver_rtlsdr.grc | 468 ++++++++++++++++++++-------------- examples/receiver_usrp.grc | 508 ++++++++++++++++++------------------ 4 files changed, 625 insertions(+), 1098 deletions(-) delete mode 100644 examples/gsm_fcch_detector.grc (limited to 'examples') diff --git a/examples/gsm_fcch_detector.grc b/examples/gsm_fcch_detector.grc deleted file mode 100644 index 1d69b53..0000000 --- a/examples/gsm_fcch_detector.grc +++ /dev/null @@ -1,567 +0,0 @@ - - - Tue Jul 8 19:32:53 2014 - - variable - - id - samp_rate - - - _enabled - True - - - value - f_symb*OSR - - - _coordinate - (10, 170) - - - _rotation - 0 - - - - variable - - id - f_symb - - - _enabled - True - - - value - 1625000.0/6.0 - - - _coordinate - (11, 239) - - - _rotation - 0 - - - - parameter - - id - OSR - - - _enabled - True - - - label - OverSamplingRatio - - - value - 4 - - - type - intx - - - short_id - - - - _coordinate - (264, 4) - - - _rotation - 0 - - - - blocks_complex_to_arg - - id - blocks_complex_to_arg_0 - - - _enabled - True - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (641, 158) - - - _rotation - 0 - - - - blocks_multiply_conjugate_cc - - id - blocks_multiply_conjugate_cc_0 - - - _enabled - True - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (444, 141) - - - _rotation - 0 - - - - blocks_delay - - id - blocks_delay_0 - - - _enabled - True - - - type - complex - - - delay - int(OSR) - - - num_ports - 1 - - - vlen - 1 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (319, 171) - - - _rotation - 0 - - - - blocks_moving_average_xx - - id - blocks_moving_average_xx_0 - - - _enabled - True - - - type - float - - - length - int((142)*samp_rate/f_symb) - - - scale - 1 - - - max_iter - int(1e6) - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (971, 138) - - - _rotation - 0 - - - - blocks_threshold_ff - - id - blocks_threshold_ff_0_0 - - - _enabled - True - - - low - 0 - - - high - 0 - - - init - 0 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (815, 138) - - - _rotation - 0 - - - - pad_source - - id - pad_source_0 - - - _enabled - True - - - label - in - - - type - complex - - - vlen - 1 - - - num_streams - 1 - - - optional - False - - - _coordinate - (155, 137) - - - _rotation - 0 - - - - blocks_threshold_ff - - id - blocks_threshold_ff_0 - - - _enabled - True - - - low - int((138)*samp_rate/f_symb) - - - high - int((138)*samp_rate/f_symb) - - - init - 0 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (1150, 138) - - - _rotation - 0 - - - - gsm_fcch_burst_tagger - - id - gsm_fcch_burst_tagger_0 - - - _enabled - True - - - OSR - OSR - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (348, 303) - - - _rotation - 0 - - - - pad_sink - - id - pad_sink_0 - - - _enabled - True - - - label - out - - - type - complex - - - vlen - 1 - - - num_streams - 1 - - - optional - False - - - _coordinate - (584, 316) - - - _rotation - 0 - - - - options - - id - fcch_detector - - - _enabled - True - - - title - FCCH Bursts Detector - - - author - Piotr Krysik - - - description - Detects positions of FCCH bursts. At the end of each detected FCCH burst adds to the stream a tag with key "fcch" and value which is a frequency offset estimate. The input sampling frequency should be integer multiply of GSM GMKS symbol rate - 1625000/6 Hz. - - - window_size - 1280, 1024 - - - generate_options - hb - - - category - GSM - - - run_options - prompt - - - run - True - - - max_nouts - 0 - - - realtime_scheduling - - - - _coordinate - (8, 0) - - - _rotation - 0 - - - - pad_source_0 - blocks_multiply_conjugate_cc_0 - 0 - 0 - - - blocks_delay_0 - blocks_multiply_conjugate_cc_0 - 0 - 1 - - - blocks_complex_to_arg_0 - blocks_threshold_ff_0_0 - 0 - 0 - - - pad_source_0 - blocks_delay_0 - 0 - 0 - - - blocks_multiply_conjugate_cc_0 - blocks_complex_to_arg_0 - 0 - 0 - - - blocks_moving_average_xx_0 - blocks_threshold_ff_0 - 0 - 0 - - - blocks_threshold_ff_0_0 - blocks_moving_average_xx_0 - 0 - 0 - - - gsm_fcch_burst_tagger_0 - pad_sink_0 - 0 - 0 - - - pad_source_0 - gsm_fcch_burst_tagger_0 - 0 - 0 - - - blocks_threshold_ff_0 - gsm_fcch_burst_tagger_0 - 0 - 1 - - diff --git a/examples/receiver_file.grc b/examples/receiver_file.grc index 507d3e5..8292b96 100644 --- a/examples/receiver_file.grc +++ b/examples/receiver_file.grc @@ -1,6 +1,6 @@ - Thu Aug 7 10:53:22 2014 + Wed Aug 13 19:03:06 2014 options @@ -143,42 +143,46 @@ - parameter + gsm_clock_offset_control id - input_file_name + gsm_clock_offset_control_0 _enabled True - label - input_file_name + fc + fc - value - input.cfile + samp_rate + samp_rate - type - string + alias + - short_id - i + affinity + - alias - + minoutbuf + 0 + + + maxoutbuf + 0 _coordinate - (194, 11) + (330, 261) _rotation - 0 + 180 @@ -191,17 +195,21 @@ _enabled True + + fc + fc + ppm 0 - samp_rate - samp_rate + samp_rate_in + 1625000.0/6.0*4.0 - fc - fc + samp_rate_out + 1625000.0/6.0*4.0 alias @@ -229,31 +237,15 @@ - blocks_file_source + gsm_message_printer id - blocks_file_source_0 + gsm_message_printer_0 _enabled True - - file - input_file_name - - - type - complex - - - repeat - False - - - vlen - 1 - alias @@ -262,17 +254,9 @@ affinity - - minoutbuf - 0 - - - maxoutbuf - 0 - _coordinate - (39, 346) + (1135, 366) _rotation @@ -280,15 +264,19 @@ - gsm_control_channels_decoder + gsm_get_bcch_or_ccch_bursts id - gsm_control_channels_decoder_0 + gsm_get_bcch_or_ccch_bursts_0 _enabled True + + d_fn51_start + 2 + alias @@ -307,7 +295,7 @@ _coordinate - (897, 358) + (668, 362) _rotation @@ -315,19 +303,15 @@ - gsm_get_bcch_or_ccch_bursts + gsm_control_channels_decoder id - gsm_get_bcch_or_ccch_bursts_0 + gsm_control_channels_decoder_0 _enabled True - - d_fn51_start - 2 - alias @@ -346,7 +330,7 @@ _coordinate - (652, 354) + (913, 366) _rotation @@ -393,7 +377,7 @@ _coordinate - (449, 355) + (465, 363) _rotation @@ -401,26 +385,38 @@ - gsm_message_printer + parameter id - gsm_message_printer_0 + input_file_name _enabled True - alias - + label + input_file_name - affinity + value + input.cfile + + + type + string + + + short_id + i + + + alias _coordinate - (1119, 358) + (193, 11) _rotation @@ -428,22 +424,30 @@ - gsm_clock_offset_control + blocks_file_source id - gsm_clock_offset_control_0 + blocks_file_source_0 _enabled True - fc - fc + file + input_file_name - samp_rate - samp_rate + type + complex + + + repeat + False + + + vlen + 1 alias @@ -463,11 +467,11 @@ _coordinate - (333, 261) + (23, 354) _rotation - 180 + 0 @@ -476,12 +480,6 @@ 0 0 - - gsm_clock_offset_control_0 - clock_offset_corrector_0 - ppm - ppm - blocks_file_source_0 clock_offset_corrector_0 @@ -489,16 +487,16 @@ 0 - gsm_receiver_hier_0 - gsm_get_bcch_or_ccch_bursts_0 - bursts - bursts + gsm_clock_offset_control_0 + clock_offset_corrector_0 + ppm + ppm_in - gsm_get_bcch_or_ccch_bursts_0 - gsm_control_channels_decoder_0 - bursts - bursts + gsm_receiver_hier_0 + gsm_clock_offset_control_0 + measurements + measurements gsm_control_channels_decoder_0 @@ -506,10 +504,16 @@ msgs msgs + + gsm_get_bcch_or_ccch_bursts_0 + gsm_control_channels_decoder_0 + bursts + bursts + gsm_receiver_hier_0 - gsm_clock_offset_control_0 - measurements - measurements + gsm_get_bcch_or_ccch_bursts_0 + bursts + bursts diff --git a/examples/receiver_rtlsdr.grc b/examples/receiver_rtlsdr.grc index 513a28d..d7d4ccb 100644 --- a/examples/receiver_rtlsdr.grc +++ b/examples/receiver_rtlsdr.grc @@ -1,6 +1,6 @@ - Thu Aug 7 16:47:30 2014 + Wed Aug 13 19:03:28 2014 options @@ -29,7 +29,7 @@ generate_options - wx_gui + qt_gui category @@ -84,7 +84,7 @@ _coordinate - (13, 167) + (13, 86) _rotation @@ -92,10 +92,10 @@ - variable_slider + variable_qtgui_range id - ppm + g _enabled @@ -103,38 +103,38 @@ label - + gain value - 0 + 43 - min - -50 + start + 0 - max + stop 50 - num_steps - 100 + step + 0.5 - style - wx.SL_HORIZONTAL + widget + counter - converver - float_converter + orient + Qt.Horizontal - grid_pos - + min_len + 100 - notebook + gui_hint @@ -143,7 +143,7 @@ _coordinate - (462, 28) + (218, 10) _rotation @@ -151,7 +151,7 @@ - variable_slider + variable_qtgui_range id fc @@ -162,38 +162,38 @@ label - + center_frequency value - 940e6 + 939.4e6 - min - 800e6 + start + 925e6 - max - 1000e6 + stop + 960e6 - num_steps - 1000 + step + 2e5 - style - wx.SL_HORIZONTAL + widget + counter_slider - converver - float_converter + orient + Qt.Horizontal - grid_pos - + min_len + 100 - notebook + gui_hint @@ -202,7 +202,7 @@ _coordinate - (333, 29) + (330, 9) _rotation @@ -210,10 +210,10 @@ - variable_slider + variable_qtgui_range id - g + ppm _enabled @@ -221,86 +221,47 @@ label - + clock_correction value - 43 - - - min 0 - max - 100 + start + -50 - num_steps - 100 + stop + 50 - style - wx.SL_HORIZONTAL + step + 1 - converver - float_converter + widget + counter - grid_pos - + orient + Qt.Horizontal - notebook - + min_len + 100 - alias + gui_hint - - _coordinate - (217, 29) - - - _rotation - 0 - - - - gsm_get_bcch_or_ccch_bursts - - id - gsm_get_bcch_or_ccch_bursts_0 - - - _enabled - True - - - d_fn51_start - 2 - alias - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - _coordinate - (659, 316) + (473, 10) _rotation @@ -391,7 +352,7 @@ gain_mode1 - 0 + True gain1 @@ -431,7 +392,7 @@ gain_mode2 - 0 + True gain2 @@ -471,7 +432,7 @@ gain_mode3 - 0 + True gain3 @@ -511,7 +472,7 @@ gain_mode4 - 0 + True gain4 @@ -551,7 +512,7 @@ _coordinate - (5, 244) + (4, 171) _rotation @@ -559,10 +520,10 @@ - wxgui_fftsink2 + qtgui_sink_x id - wxgui_fftsink2_0 + qtgui_sink_x_0 _enabled @@ -573,72 +534,99 @@ complex - title - FFT Plot + name + "" - samp_rate - samp_rate + fftsize + 1024 - baseband_freq - 0 + wintype + firdes.WIN_BLACKMAN_hARRIS - y_per_div - 10 + fc + fc - y_divs - 10 + bw + samp_rate - ref_level - 0 + rate + 10 - ref_scale - 2.0 + showrf + True - fft_size - 1024 + plotfreq + True - fft_rate - 15 + plotwaterfall + True - peak_hold - False + plottime + True - average - False + plotconst + True - avg_alpha - 0 + gui_hint + - win + freqchangevar None - win_size - + showports + True - grid_pos + alias - notebook + affinity - freqvar - None + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (455, 374) + + + _rotation + 0 + + + + gsm_get_bcch_or_ccch_bursts + + id + gsm_get_bcch_or_ccch_bursts_0 + + + _enabled + True + + + d_fn51_start + 2 alias @@ -648,9 +636,17 @@ affinity + + minoutbuf + 0 + + + maxoutbuf + 0 + _coordinate - (455, 398) + (660, 243) _rotation @@ -658,15 +654,23 @@ - gsm_control_channels_decoder + gsm_clock_offset_control id - gsm_control_channels_decoder_0 + gsm_clock_offset_control_0 _enabled True + + fc + fc + + + samp_rate + samp_rate + alias @@ -685,11 +689,11 @@ _coordinate - (919, 320) + (329, 155) _rotation - 0 + 180 @@ -702,17 +706,21 @@ _enabled True + + fc + fc + ppm 0 - samp_rate + samp_rate_in samp_rate - fc - fc + samp_rate_out + samp_rate alias @@ -732,7 +740,7 @@ _coordinate - (252, 317) + (251, 236) _rotation @@ -740,23 +748,78 @@ - gsm_clock_offset_control + blocks_tag_debug id - gsm_clock_offset_control_0 + blocks_tag_debug_0 _enabled + False + + + type + complex + + + name + + + + filter + "" + + + num_inputs + 1 + + + vlen + 1 + + + display True - fc - fc + alias + - samp_rate + affinity + + + + _coordinate + (456, 477) + + + _rotation + 0 + + + + gsm_receiver_hier + + id + gsm_receiver_hier_0 + + + _enabled + True + + + input_rate samp_rate + + osr + 4 + + + arfcn + 0 + alias @@ -775,18 +838,18 @@ _coordinate - (330, 235) + (455, 244) _rotation - 180 + 0 - gsm_message_printer + blocks_message_debug id - gsm_message_printer_0 + blocks_message_debug_0 _enabled @@ -802,7 +865,7 @@ _coordinate - (1140, 320) + (240, 406) _rotation @@ -810,10 +873,10 @@ - blocks_message_debug + gsm_control_channels_decoder id - blocks_message_debug_0 + gsm_control_channels_decoder_0 _enabled @@ -827,9 +890,17 @@ affinity + + minoutbuf + 0 + + + maxoutbuf + 0 + _coordinate - (265, 450) + (920, 247) _rotation @@ -837,46 +908,53 @@ - gsm_receiver_hier + gsm_message_printer id - gsm_receiver_hier_0 + gsm_message_printer_0 _enabled - True + False - input_rate - samp_rate + alias + - osr - 4 + affinity + - arfcn + _coordinate + (1128, 169) + + + _rotation 0 + + + gsm_message_printer - alias - + id + gsm_message_printer_1 - affinity - + _enabled + True - minoutbuf - 0 + alias + - maxoutbuf - 0 + affinity + _coordinate - (458, 317) + (1141, 247) _rotation @@ -884,16 +962,10 @@ - gsm_control_channels_decoder_0 - gsm_message_printer_0 - msgs - msgs - - - gsm_clock_offset_control_0 - clock_offset_corrector_0 - ppm - ppm + clock_offset_corrector_0 + gsm_receiver_hier_0 + 0 + 0 rtlsdr_source_0 @@ -903,15 +975,15 @@ clock_offset_corrector_0 - wxgui_fftsink2_0 + qtgui_sink_x_0 0 0 - clock_offset_corrector_0 - gsm_receiver_hier_0 - 0 - 0 + gsm_get_bcch_or_ccch_bursts_0 + gsm_control_channels_decoder_0 + bursts + bursts gsm_receiver_hier_0 @@ -926,10 +998,22 @@ measurements - gsm_get_bcch_or_ccch_bursts_0 - gsm_control_channels_decoder_0 - bursts - bursts + gsm_control_channels_decoder_0 + gsm_message_printer_0 + msgs + msgs + + + gsm_clock_offset_control_0 + clock_offset_corrector_0 + ppm + ppm_in + + + clock_offset_corrector_0 + blocks_tag_debug_0 + 0 + 0 gsm_receiver_hier_0 @@ -937,4 +1021,10 @@ measurements print + + gsm_control_channels_decoder_0 + gsm_message_printer_1 + msgs + msgs + diff --git a/examples/receiver_usrp.grc b/examples/receiver_usrp.grc index a7a8dcf..c6fd77a 100644 --- a/examples/receiver_usrp.grc +++ b/examples/receiver_usrp.grc @@ -1,6 +1,6 @@ - Wed Aug 6 19:56:07 2014 + Wed Aug 13 19:03:38 2014 options @@ -248,6 +248,253 @@ 0 + + wxgui_fftsink2 + + id + wxgui_fftsink2_0 + + + _enabled + True + + + type + complex + + + title + FFT Plot + + + samp_rate + samp_rate + + + baseband_freq + fc + + + y_per_div + 10 + + + y_divs + 10 + + + ref_level + 0 + + + ref_scale + 2.0 + + + fft_size + 1024 + + + fft_rate + 15 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + win + None + + + win_size + + + + grid_pos + 1,1,1,1 + + + notebook + + + + freqvar + None + + + alias + + + + affinity + + + + _coordinate + (284, 367) + + + _rotation + 0 + + + + gsm_receiver_hier + + id + gsm_receiver_hier_0 + + + _enabled + True + + + input_rate + samp_rate + + + osr + 4 + + + arfcn + 0 + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (266, 269) + + + _rotation + 0 + + + + gsm_message_printer + + id + gsm_message_printer_0 + + + _enabled + True + + + alias + + + + affinity + + + + _coordinate + (905, 272) + + + _rotation + 0 + + + + gsm_control_channels_decoder + + id + gsm_control_channels_decoder_0 + + + _enabled + True + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (694, 272) + + + _rotation + 0 + + + + gsm_get_bcch_or_ccch_bursts + + id + gsm_get_bcch_or_ccch_bursts_0 + + + _enabled + True + + + d_fn51_start + 2 + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (452, 268) + + + _rotation + 0 + + uhd_usrp_source @@ -296,7 +543,7 @@ clock_source0 - external + time_source0 @@ -928,254 +1175,7 @@ _coordinate - (22, 253) - - - _rotation - 0 - - - - wxgui_fftsink2 - - id - wxgui_fftsink2_0 - - - _enabled - True - - - type - complex - - - title - FFT Plot - - - samp_rate - samp_rate - - - baseband_freq - fc - - - y_per_div - 10 - - - y_divs - 10 - - - ref_level - 0 - - - ref_scale - 2.0 - - - fft_size - 1024 - - - fft_rate - 15 - - - peak_hold - False - - - average - False - - - avg_alpha - 0 - - - win - None - - - win_size - - - - grid_pos - 1,1,1,1 - - - notebook - - - - freqvar - None - - - alias - - - - affinity - - - - _coordinate - (284, 367) - - - _rotation - 0 - - - - gsm_get_bcch_or_ccch_bursts - - id - gsm_get_bcch_or_ccch_bursts_0 - - - _enabled - True - - - d_fn51_start - 2 - - - alias - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (452, 268) - - - _rotation - 0 - - - - gsm_control_channels_decoder - - id - gsm_control_channels_decoder_0 - - - _enabled - True - - - alias - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (694, 272) - - - _rotation - 0 - - - - gsm_message_printer - - id - gsm_message_printer_0 - - - _enabled - True - - - alias - - - - affinity - - - - _coordinate - (905, 272) - - - _rotation - 0 - - - - gsm_receiver_hier - - id - gsm_receiver_hier_0 - - - _enabled - True - - - input_rate - samp_rate - - - osr - 4 - - - arfcn - 0 - - - alias - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (266, 269) + (25, 261) _rotation @@ -1195,8 +1195,8 @@ 0 - gsm_get_bcch_or_ccch_bursts_0 - gsm_control_channels_decoder_0 + gsm_receiver_hier_0 + gsm_get_bcch_or_ccch_bursts_0 bursts bursts @@ -1207,8 +1207,8 @@ msgs - gsm_receiver_hier_0 - gsm_get_bcch_or_ccch_bursts_0 + gsm_get_bcch_or_ccch_bursts_0 + gsm_control_channels_decoder_0 bursts bursts -- cgit v1.2.3