From 2c2f77f6d1838a8be4943cfc6829ceba7e4f2a74 Mon Sep 17 00:00:00 2001 From: piotr Date: Wed, 6 Aug 2014 20:13:50 +0200 Subject: Changes in examples resulting from change of the clock offset corrector input --- examples/receiver_file.grc | 278 +++++++++++----------- examples/receiver_rtlsdr.grc | 552 +++++++++++++++++++++---------------------- examples/receiver_usrp.grc | 306 ++++++++++++------------ 3 files changed, 568 insertions(+), 568 deletions(-) (limited to 'examples') diff --git a/examples/receiver_file.grc b/examples/receiver_file.grc index 800e662..4561b49 100644 --- a/examples/receiver_file.grc +++ b/examples/receiver_file.grc @@ -1,11 +1,11 @@ - Wed Aug 6 15:17:45 2014 + Wed Aug 6 20:09:35 2014 options id - gsm_receiver_test + gsm_receiver_file _enabled @@ -65,26 +65,18 @@ - gsm_receiver_hier + gsm_get_bcch_or_ccch_bursts id - gsm_receiver_hier_0 + gsm_get_bcch_or_ccch_bursts_0 _enabled True - input_rate - samp_rate - - - osr - 4 - - - arfcn - 0 + d_fn51_start + 2 alias @@ -104,7 +96,7 @@ _coordinate - (606, 180) + (809, 179) _rotation @@ -112,19 +104,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 @@ -143,7 +131,7 @@ _coordinate - (809, 179) + (1054, 183) _rotation @@ -151,10 +139,10 @@ - gsm_control_channels_decoder + gsm_message_printer id - gsm_control_channels_decoder_0 + gsm_message_printer_0 _enabled @@ -168,17 +156,9 @@ affinity - - minoutbuf - 0 - - - maxoutbuf - 0 - _coordinate - (1054, 183) + (945, 254) _rotation @@ -186,26 +166,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 - (945, 254) + (189, 13) _rotation @@ -213,46 +205,77 @@ - clk_offset_corrector + parameter id - clk_offset_corrector_0 + fc _enabled True - ppm - 0 + label + fc - samp_rate - samp_rate + value + 937e6 - fc - 936.6e6 + type + eng_float + + + short_id + f alias - affinity - + _coordinate + (311, 10) - minoutbuf + _rotation 0 + + + parameter - maxoutbuf - 0 + id + samp_rate + + + _enabled + True + + + label + samp_rate + + + value + 1625000.0/6.0*4.0 + + + type + eng_float + + + short_id + s + + + alias + _coordinate - (374, 180) + (656, 8) _rotation @@ -260,30 +283,26 @@ - blocks_file_source + gsm_receiver_hier id - blocks_file_source_0 + gsm_receiver_hier_0 _enabled True - file - input_file_name - - - type - complex + input_rate + samp_rate - repeat - False + osr + 4 - vlen - 1 + arfcn + 0 alias @@ -303,7 +322,7 @@ _coordinate - (118, 171) + (606, 180) _rotation @@ -311,38 +330,50 @@ - parameter + blocks_file_source id - input_file_name + blocks_file_source_0 _enabled True - label + file input_file_name - value - input.cfile + type + complex - type - string + repeat + False - short_id - i + vlen + 1 alias + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + _coordinate - (189, 13) + (118, 171) _rotation @@ -385,7 +416,7 @@ _coordinate - (447, 43) + (488, 77) _rotation @@ -393,101 +424,52 @@ - parameter + clock_offset_corrector id - samp_rate + clock_offset_corrector_0 _enabled True - label - samp_rate + ppm + 0 - value + samp_rate 1625000.0/6.0*4.0 - type - eng_float - - - short_id - s + fc + 936.6e6 alias - _coordinate - (656, 8) + affinity + - _rotation + minoutbuf 0 - - - parameter - - id - fc - - - _enabled - True - - - label - fc - - - value - 937e6 - - - type - eng_float - - - short_id - f - - alias - + maxoutbuf + 0 _coordinate - (311, 10) + (380, 180) _rotation 0 - - gsm_clock_offset_control_0 - clk_offset_corrector_0 - ppm - ppm_msg - - - clk_offset_corrector_0 - gsm_receiver_hier_0 - 0 - 0 - - - blocks_file_source_0 - clk_offset_corrector_0 - 0 - 0 - gsm_receiver_hier_0 gsm_clock_offset_control_0 @@ -512,4 +494,22 @@ bursts bursts + + clock_offset_corrector_0 + gsm_receiver_hier_0 + 0 + 0 + + + blocks_file_source_0 + clock_offset_corrector_0 + 0 + 0 + + + gsm_clock_offset_control_0 + clock_offset_corrector_0 + ppm + ppm + diff --git a/examples/receiver_rtlsdr.grc b/examples/receiver_rtlsdr.grc index 3c1cb5f..5a34ac4 100644 --- a/examples/receiver_rtlsdr.grc +++ b/examples/receiver_rtlsdr.grc @@ -1,11 +1,11 @@ - Wed Aug 6 15:56:33 2014 + Wed Aug 6 19:55:56 2014 options id - rtl + receiver_rtlsdr _enabled @@ -92,65 +92,58 @@ - gsm_get_bcch_or_ccch_bursts + variable_slider id - gsm_get_bcch_or_ccch_bursts_0 + ppm _enabled True - d_fn51_start - 2 - - - alias + label - affinity - + value + 0 - minoutbuf - 0 + min + -50 - maxoutbuf - 0 + max + 50 - _coordinate - (793, 304) + num_steps + 100 - _rotation - 0 + style + wx.SL_HORIZONTAL - - - gsm_message_printer - id - gsm_message_printer_0 + converver + float_converter - _enabled - True + grid_pos + - alias + notebook - affinity + alias _coordinate - (1072, 371) + (462, 28) _rotation @@ -161,7 +154,7 @@ variable_slider id - ppm + fc _enabled @@ -173,19 +166,19 @@ value - 0 + 940e6 min - -50 + 800e6 max - 50 + 1000e6 num_steps - 100 + 1000 style @@ -209,7 +202,7 @@ _coordinate - (462, 28) + (333, 29) _rotation @@ -220,7 +213,7 @@ variable_slider id - fc + g _enabled @@ -232,19 +225,19 @@ value - 940e6 + 43 min - 800e6 + 0 max - 1000e6 + 100 num_steps - 1000 + 100 style @@ -268,7 +261,7 @@ _coordinate - (333, 29) + (217, 29) _rotation @@ -276,42 +269,222 @@ - variable_slider + gsm_get_bcch_or_ccch_bursts id - g + gsm_get_bcch_or_ccch_bursts_0 _enabled True - label + d_fn51_start + 2 + + + alias - value - 43 + affinity + - min + minoutbuf 0 - max - 100 + maxoutbuf + 0 - num_steps - 100 + _coordinate + (669, 359) - style - wx.SL_HORIZONTAL + _rotation + 0 + + + gsm_message_printer - converver - float_converter + id + gsm_message_printer_0 + + + _enabled + True + + + alias + + + + affinity + + + + _coordinate + (1165, 362) + + + _rotation + 0 + + + + gsm_control_channels_decoder + + id + gsm_control_channels_decoder_0 + + + _enabled + True + + + alias + + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (929, 363) + + + _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 + (468, 360) + + + _rotation + 0 + + + + wxgui_fftsink2 + + id + wxgui_fftsink2_0 + + + _enabled + True + + + type + complex + + + title + FFT Plot + + + samp_rate + samp_rate + + + baseband_freq + 0 + + + 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 @@ -321,13 +494,21 @@ notebook + + freqvar + None + alias + + affinity + + _coordinate - (217, 29) + (465, 441) _rotation @@ -335,15 +516,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 @@ -362,30 +551,34 @@ _coordinate - (821, 371) + (185, 220) _rotation - 0 + 270 - gsm_clock_offset_control + clock_offset_corrector id - gsm_clock_offset_control_0 + clock_offset_corrector_0 _enabled True - fc - fc + ppm + 0 samp_rate - samp_rate + 1625000.0/6.0*4.0 + + + fc + 936.6e6 alias @@ -405,7 +598,7 @@ _coordinate - (488, 171) + (263, 360) _rotation @@ -656,212 +849,13 @@ _coordinate - (112, 233) - - - _rotation - 0 - - - - wxgui_fftsink2 - - id - wxgui_fftsink2_0 - - - _enabled - True - - - type - complex - - - title - FFT Plot - - - samp_rate - samp_rate - - - baseband_freq - 0 - - - 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 - - - - notebook - - - - freqvar - None - - - alias - - - - affinity - - - - _coordinate - (582, 387) - - - _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 - (585, 306) - - - _rotation - 0 - - - - clock_offset_corrector - - id - clock_offset_corrector_0 - - - _enabled - True - - - ppm - 0 - - - samp_rate - 1625000.0/6.0*4.0 - - - fc - 936.6e6 - - - alias - - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (340, 306) + (15, 287) _rotation 0 - - gsm_receiver_hier_0 - gsm_get_bcch_or_ccch_bursts_0 - bursts - bursts - gsm_get_bcch_or_ccch_bursts_0 gsm_control_channels_decoder_0 @@ -881,16 +875,16 @@ measurements - rtlsdr_source_0 - clock_offset_corrector_0 - 0 - 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_msg + clock_offset_corrector_0 + gsm_receiver_hier_0 + 0 + 0 clock_offset_corrector_0 @@ -899,9 +893,15 @@ 0 - clock_offset_corrector_0 - gsm_receiver_hier_0 + rtlsdr_source_0 + clock_offset_corrector_0 0 0 + + gsm_clock_offset_control_0 + clock_offset_corrector_0 + ppm + ppm + diff --git a/examples/receiver_usrp.grc b/examples/receiver_usrp.grc index 60e9581..a7a8dcf 100644 --- a/examples/receiver_usrp.grc +++ b/examples/receiver_usrp.grc @@ -1,11 +1,11 @@ - Wed Aug 6 15:18:46 2014 + Wed Aug 6 19:56:07 2014 options id - gsm_receiver_usrp_test + gsm_receiver_usrp _enabled @@ -189,6 +189,65 @@ 0 + + variable_slider + + id + fc + + + _enabled + True + + + label + + + + value + 937e6 + + + min + 900e6 + + + max + 1000e6 + + + num_steps + 500 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + alias + + + + _coordinate + (236, 0) + + + _rotation + 0 + + uhd_usrp_source @@ -869,7 +928,7 @@ _coordinate - (109, 236) + (22, 253) _rotation @@ -877,46 +936,98 @@ - gsm_receiver_hier + wxgui_fftsink2 id - gsm_receiver_hier_0 + wxgui_fftsink2_0 _enabled True - input_rate + type + complex + + + title + FFT Plot + + + samp_rate samp_rate - osr - 4 + baseband_freq + fc - arfcn + y_per_div + 10 + + + y_divs + 10 + + + ref_level 0 - alias + ref_scale + 2.0 + + + fft_size + 1024 + + + fft_rate + 15 + + + peak_hold + False + + + average + False + + + avg_alpha + 0 + + + win + None + + + win_size - affinity + grid_pos + 1,1,1,1 + + + notebook - minoutbuf - 0 + freqvar + None - maxoutbuf - 0 + alias + + + + affinity + _coordinate - (455, 252) + (284, 367) _rotation @@ -955,7 +1066,7 @@ _coordinate - (681, 268) + (452, 268) _rotation @@ -990,7 +1101,7 @@ _coordinate - (946, 272) + (694, 272) _rotation @@ -998,14 +1109,14 @@ - gsm_bursts_printer + gsm_message_printer id - gsm_bursts_printer_1 + gsm_message_printer_0 _enabled - False + True alias @@ -1017,7 +1128,7 @@ _coordinate - (717, 162) + (905, 272) _rotation @@ -1025,87 +1136,27 @@ - wxgui_fftsink2 + gsm_receiver_hier id - wxgui_fftsink2_0 + gsm_receiver_hier_0 _enabled True - type - complex - - - title - FFT Plot - - - samp_rate + input_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 + osr + 4 - avg_alpha + arfcn 0 - - win - None - - - win_size - - - - grid_pos - 1,1,1,1 - - - notebook - - - - freqvar - None - alias @@ -1115,67 +1166,16 @@ - _coordinate - (453, 342) - - - _rotation + minoutbuf 0 - - - variable_slider - - id - fc - - - _enabled - True - - - label - - - - value - 937e6 - - - min - 900e6 - - - max - 1000e6 - - - num_steps - 500 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - notebook - - - - alias - + maxoutbuf + 0 _coordinate - (236, 0) + (266, 269) _rotation @@ -1184,31 +1184,31 @@ uhd_usrp_source_0 - gsm_receiver_hier_0 + wxgui_fftsink2_0 0 0 uhd_usrp_source_0 - wxgui_fftsink2_0 + gsm_receiver_hier_0 0 0 - gsm_receiver_hier_0 - gsm_bursts_printer_1 + gsm_get_bcch_or_ccch_bursts_0 + gsm_control_channels_decoder_0 bursts bursts - gsm_receiver_hier_0 - gsm_get_bcch_or_ccch_bursts_0 - bursts - bursts + gsm_control_channels_decoder_0 + gsm_message_printer_0 + msgs + msgs - 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 -- cgit v1.2.3