From a8a8bd5b3ea5b8c9d7d110965dde38ad59b3779f Mon Sep 17 00:00:00 2001 From: Manolis Surligas Date: Sun, 9 Apr 2017 15:44:32 +0300 Subject: [PATCH] Update CW examples --- examples/morse_decoding_flowgraph.grc | 513 +++++++++++++++++++------- examples/test_morse_decoder.grc | 111 +++--- 2 files changed, 439 insertions(+), 185 deletions(-) diff --git a/examples/morse_decoding_flowgraph.grc b/examples/morse_decoding_flowgraph.grc index 407d419..bcd9b17 100644 --- a/examples/morse_decoding_flowgraph.grc +++ b/examples/morse_decoding_flowgraph.grc @@ -1,5 +1,5 @@ - + Sun Jan 17 23:03:00 2016 @@ -10,7 +10,7 @@ window_size - + 2048,1080 category @@ -148,15 +148,16 @@ variable comment - The frequency of the CW signal + The number of taps depends on the number of samples +of a full period of the CW signal with frequency freq. _enabled - True + 1 _coordinate - (840, 13) + (552, 13) _rotation @@ -164,11 +165,11 @@ id - freq + ndelay value - 700.0 + 100 @@ -261,34 +262,6 @@ 8000 - - variable - - comment - The number of taps depends on the number of samples -of a full period of the CW signal with frequency freq. - - - _enabled - True - - - _coordinate - (552, 13) - - - _rotation - 0 - - - id - taps - - - value - int(math.ceil(samp_rate/freq)) - - variable @@ -320,7 +293,7 @@ of a full period of the CW signal with frequency freq. analog_agc2_xx attack_rate - 6.25e-3 + 0.01 alias @@ -336,7 +309,7 @@ of a full period of the CW signal with frequency freq. decay_rate - 6.25e-3 + 0.001 _enabled @@ -344,7 +317,7 @@ of a full period of the CW signal with frequency freq. _coordinate - (608, 336) + (736, 376) _rotation @@ -462,7 +435,7 @@ of a full period of the CW signal with frequency freq. _coordinate - (960, 188) + (711, 291) _rotation @@ -485,6 +458,85 @@ of a full period of the CW signal with frequency freq. samp_rate + + band_pass_filter + + beta + 6.76 + + + alias + + + + comment + + + + affinity + + + + decim + 1 + + + _enabled + True + + + type + fir_filter_fff + + + _coordinate + (511, 355) + + + _rotation + 0 + + + gain + 1 + + + high_cutoff_freq + 1000 + + + id + band_pass_filter_0 + + + interp + 1 + + + low_cutoff_freq + 200 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + samp_rate + samp_rate + + + width + 100 + + + win + firdes.WIN_HAMMING + + blocks_add_xx @@ -536,6 +588,61 @@ of a full period of the CW signal with frequency freq. 1 + + blocks_delay + + alias + + + + comment + + + + affinity + + + + delay + ndelay + + + _enabled + True + + + _coordinate + (1000, 428) + + + _rotation + 0 + + + id + blocks_delay_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + num_ports + 1 + + + type + float + + + vlen + 1 + + blocks_moving_average_xx @@ -556,7 +663,7 @@ of a full period of the CW signal with frequency freq. _coordinate - (1000, 438) + (1304, 556) _rotation @@ -568,7 +675,7 @@ of a full period of the CW signal with frequency freq. length - taps + ndelay max_iter @@ -615,7 +722,7 @@ of a full period of the CW signal with frequency freq. _coordinate - (304, 364) + (296, 268) _rotation @@ -666,7 +773,7 @@ of a full period of the CW signal with frequency freq. _coordinate - (336, 220) + (296, 212) _rotation @@ -693,6 +800,108 @@ of a full period of the CW signal with frequency freq. 1 + + blocks_multiply_xx + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1152, 408) + + + _rotation + 0 + + + id + blocks_multiply_xx_0 + + + type + float + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + num_inputs + 2 + + + vlen + 1 + + + + blocks_multiply_xx + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1502, 407) + + + _rotation + 0 + + + id + blocks_multiply_xx_0_0 + + + type + float + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + num_inputs + 2 + + + vlen + 1 + + blocks_throttle @@ -713,7 +922,7 @@ of a full period of the CW signal with frequency freq. _coordinate - (456, 364) + (335, 403) _rotation @@ -768,7 +977,7 @@ of a full period of the CW signal with frequency freq. file - /home/surligas/workspace/gr-satnogs/examples/morse_ref.wav + ./morse_ref.wav _coordinate @@ -799,6 +1008,61 @@ of a full period of the CW signal with frequency freq. True + + fir_filter_xxx + + alias + + + + comment + + + + affinity + + + + decim + 1 + + + _enabled + True + + + _coordinate + (1296, 412) + + + _rotation + 0 + + + id + fir_filter_xxx_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + samp_delay + 0 + + + taps + [1.0,]*ndelay + + + type + fff + + import @@ -836,6 +1100,10 @@ of a full period of the CW signal with frequency freq. autoscale False + + axislabels + True + alias @@ -862,7 +1130,7 @@ of a full period of the CW signal with frequency freq. _coordinate - (704, 486) + (1032, 612) gui_hint @@ -1134,7 +1402,7 @@ of a full period of the CW signal with frequency freq. size - 1024 + samp_rate srate @@ -1182,7 +1450,7 @@ of a full period of the CW signal with frequency freq. ymax - 150000 + 1 ymin @@ -1195,6 +1463,10 @@ of a full period of the CW signal with frequency freq. autoscale False + + axislabels + True + alias @@ -1221,7 +1493,7 @@ of a full period of the CW signal with frequency freq. _coordinate - (512, 222) + (936, 216) gui_hint @@ -1548,70 +1820,15 @@ of a full period of the CW signal with frequency freq. -10 - - satnogs_cw_matched_filter_ff - - carrier_freq - freq - - - alias - - - - comment - - - - energy - True - - - affinity - - - - _enabled - 1 - - - _coordinate - (808, 351) - - - _rotation - 0 - - - id - satnogs_cw_matched_filter_ff_0 - - - maxoutbuf - 0 - - - minoutbuf - 0 - - - sampling_rate - samp_rate - - - wpm - wpm - - satnogs_cw_to_symbol threshold - 20e3 + 2.0 auto_config - True + False alias @@ -1635,11 +1852,11 @@ of a full period of the CW signal with frequency freq. _coordinate - (272, 559) + (816, 576) _rotation - 0 + 180 id @@ -1682,11 +1899,11 @@ of a full period of the CW signal with frequency freq. _coordinate - (664, 580) + (551, 603) _rotation - 0 + 180 id @@ -1723,18 +1940,30 @@ of a full period of the CW signal with frequency freq. _enabled True + + filename + + _coordinate - (864, 580) + (191, 587) _rotation - 0 + 180 id satnogs_multi_format_msg_sink_0 + + outstream + True + + + timestamp + False + format 0 @@ -1742,28 +1971,52 @@ of a full period of the CW signal with frequency freq. analog_agc2_xx_0_0 - qtgui_time_sink_x_0_0 + blocks_delay_0 0 - 2 + 0 analog_agc2_xx_0_0 - satnogs_cw_matched_filter_ff_0 + blocks_multiply_xx_0 0 0 + + analog_agc2_xx_0_0 + qtgui_time_sink_x_0_0 + 0 + 2 + analog_fastnoise_source_x_0 blocks_add_xx_0 0 1 + + band_pass_filter_0 + analog_agc2_xx_0_0 + 0 + 0 + + + band_pass_filter_0 + audio_sink_0 + 0 + 0 + blocks_add_xx_0 blocks_multiply_const_vxx_0 0 0 + + blocks_delay_0 + blocks_multiply_xx_0 + 0 + 1 + blocks_moving_average_xx_0 qtgui_time_sink_x_0 @@ -1776,12 +2029,6 @@ of a full period of the CW signal with frequency freq. 0 0 - - blocks_multiply_const_vxx_0 - audio_sink_0 - 0 - 0 - blocks_multiply_const_vxx_0 blocks_throttle_0 @@ -1800,9 +2047,21 @@ of a full period of the CW signal with frequency freq. 0 0 + + blocks_multiply_xx_0 + fir_filter_xxx_0 + 0 + 0 + + + blocks_multiply_xx_0_0 + blocks_moving_average_xx_0 + 0 + 0 + blocks_throttle_0 - analog_agc2_xx_0_0 + band_pass_filter_0 0 0 @@ -1819,11 +2078,17 @@ of a full period of the CW signal with frequency freq. 0 - satnogs_cw_matched_filter_ff_0 - blocks_moving_average_xx_0 + fir_filter_xxx_0 + blocks_multiply_xx_0_0 0 0 + + fir_filter_xxx_0 + blocks_multiply_xx_0_0 + 0 + 1 + satnogs_cw_to_symbol_0 satnogs_morse_decoder_0 diff --git a/examples/test_morse_decoder.grc b/examples/test_morse_decoder.grc index a07e07e..8deab6e 100644 --- a/examples/test_morse_decoder.grc +++ b/examples/test_morse_decoder.grc @@ -78,65 +78,7 @@ title - - - - - variable - - comment - - - - _enabled - True - - - _coordinate - (8, 160) - - - _rotation - 0 - - - id - samp_rate - - - value - 32000 - - - - satnogs_clear_text_msg_sink - - alias - - - - comment - - - - affinity - - - - _enabled - True - - - _coordinate - (960, 168) - - - _rotation - 0 - - - id - satnogs_clear_text_msg_sink_0 + Morse Decoder Simple Example @@ -187,7 +129,7 @@ debug_seq - "XPGOLIAT HELLO EARTH WORLD 123456789" + "SATNOGS HELLO EARTH WORLD 123456789" @@ -233,6 +175,53 @@ ord('#') + + satnogs_multi_format_msg_sink + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + filename + + + + _coordinate + (968, 148) + + + _rotation + 0 + + + id + satnogs_multi_format_msg_sink_0 + + + outstream + True + + + timestamp + False + + + format + 0 + + satnogs_morse_debug_source_0 satnogs_morse_decoder_0 @@ -241,7 +230,7 @@ satnogs_morse_decoder_0 - satnogs_clear_text_msg_sink_0 + satnogs_multi_format_msg_sink_0 out in