diff --git a/peak_det_eval.grc b/peak_det_eval.grc index fbf2eae..f918d65 100644 --- a/peak_det_eval.grc +++ b/peak_det_eval.grc @@ -10,7 +10,7 @@ window_size - + (1920, 1200) category @@ -519,7 +519,7 @@ _coordinate - (600, 164) + (592, 164) _rotation @@ -923,6 +923,49 @@ N_FFT + + blocks_complex_to_mag_squared + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1680, 308) + + + _rotation + 0 + + + id + blocks_complex_to_mag_squared_0_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + vlen + N_FFT + + blocks_message_debug @@ -1005,6 +1048,57 @@ 1 + + blocks_multiply_const_vxx + + alias + + + + comment + + + + const + 1.0/N_FFT + + + affinity + + + + _enabled + True + + + _coordinate + (1432, 196) + + + _rotation + 0 + + + id + blocks_multiply_const_vxx_0_0 + + + type + complex + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + vlen + 1 + + blocks_nlog10_ff @@ -1056,6 +1150,57 @@ 10 + + blocks_nlog10_ff + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1360, 500) + + + _rotation + 0 + + + id + blocks_nlog10_ff_0_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + vlen + N_FFT + + + k + 0 + + + n + 10 + + blocks_stream_to_vector_decimator @@ -1112,7 +1257,7 @@ - blocks_tag_debug + blocks_stream_to_vector_decimator alias @@ -1125,17 +1270,13 @@ affinity - - display - False - _enabled True _coordinate - (888, 676) + (1648, 180) _rotation @@ -1143,28 +1284,32 @@ id - blocks_tag_debug_0 + blocks_stream_to_vector_decimator_0_0 type - float + complex - filter - "peak" + maxoutbuf + 0 - name - + minoutbuf + 0 - num_inputs - 1 + sample_rate + channel_rate vlen N_FFT + + vec_rate + FRAME_RATE + blocks_vector_to_stream @@ -1182,7 +1327,7 @@ _enabled - True + 1 _coordinate @@ -1233,7 +1378,7 @@ _enabled - True + 1 _coordinate @@ -1268,6 +1413,108 @@ 1 + + blocks_vector_to_stream + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1392, 772) + + + _rotation + 0 + + + id + blocks_vector_to_stream_0_0_0 + + + type + float + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + num_items + N_FFT + + + vlen + 1 + + + + blocks_vector_to_stream + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1392, 724) + + + _rotation + 0 + + + id + blocks_vector_to_stream_0_1 + + + type + float + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + num_items + N_FFT + + + vlen + 1 + + dc_blocker_xx @@ -1382,6 +1629,69 @@ window.blackmanharris(N_FFT) + + fft_vxx + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + fft_size + N_FFT + + + forward + True + + + _coordinate + (1432, 276) + + + _rotation + 0 + + + id + fft_vxx_0_0 + + + type + complex + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + nthreads + 1 + + + shift + True + + + window + window.blackmanharris(N_FFT) + + freq_xlating_fir_filter_xxx @@ -1410,7 +1720,7 @@ _coordinate - (504, 324) + (456, 308) _rotation @@ -1441,6 +1751,65 @@ ccc + + freq_xlating_fir_filter_xxx + + alias + + + + center_freq + 0 + + + comment + + + + affinity + + + + decim + 1 + + + _enabled + 1 + + + _coordinate + (728, 324) + + + _rotation + 0 + + + id + freq_xlating_fir_filter_xxx_0_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + samp_rate + channel_rate + + + taps + 1 + + + type + ccc + + jay_message_debug @@ -1519,6 +1888,45 @@ 0 + + jay_message_filter + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1128, 688) + + + _rotation + 0 + + + id + jay_message_filter_0_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + jay_peak_detect @@ -1579,7 +1987,82 @@ peak_height_min - 20 + 18 + + + peak_width_max + 55 + + + peak_width_min + 5 + + + vlen + N_FFT + + + + jay_peak_detect + + alpha_m + 0.04 + + + alpha_s + 0.2 + + + bandwidth + channel_rate + + + alias + + + + fcenter + 0 + + + comment + + + + affinity + + + + _enabled + True + + + framerate + FRAME_RATE + + + _coordinate + (1544, 468) + + + _rotation + 0 + + + id + jay_peak_detect_1_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + peak_height_min + 18 peak_width_max @@ -1637,6 +2120,49 @@ 1 + + jay_peak_manager + + alias + + + + comment + + + + affinity + + + + _enabled + True + + + _coordinate + (1136, 624) + + + _rotation + 0 + + + id + jay_peak_manager_0_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + numPeaksMax + 1 + + jay_squelch @@ -1684,7 +2210,7 @@ average - 0.1 + 0.2 axislabels @@ -1724,7 +2250,7 @@ _coordinate - (832, 320) + (984, 36) gui_hint @@ -1920,7 +2446,7 @@ nconnections - 2 + 1 showports @@ -2007,7 +2533,7 @@ _enabled - True + 1 _coordinate @@ -2275,7 +2801,7 @@ name - "" + "Coarse" nconnections @@ -2342,6 +2868,373 @@ -120 + + qtgui_time_sink_x + + autoscale + False + + + axislabels + True + + + alias + + + + comment + + + + ctrlpanel + False + + + affinity + + + + entags + True + + + _enabled + True + + + _coordinate + (1584, 724) + + + gui_hint + + + + _rotation + 0 + + + grid + True + + + id + qtgui_time_sink_x_0_0 + + + legend + True + + + alpha1 + 1.0 + + + color1 + "blue" + + + label1 + + + + marker1 + -1 + + + style1 + 1 + + + width1 + 1 + + + alpha10 + 1.0 + + + color10 + "blue" + + + label10 + + + + marker10 + -1 + + + style10 + 1 + + + width10 + 1 + + + alpha2 + 1.0 + + + color2 + "red" + + + label2 + + + + marker2 + -1 + + + style2 + 1 + + + width2 + 1 + + + alpha3 + 1.0 + + + color3 + "green" + + + label3 + + + + marker3 + -1 + + + style3 + 1 + + + width3 + 1 + + + alpha4 + 1.0 + + + color4 + "black" + + + label4 + + + + marker4 + -1 + + + style4 + 1 + + + width4 + 1 + + + alpha5 + 1.0 + + + color5 + "cyan" + + + label5 + + + + marker5 + -1 + + + style5 + 1 + + + width5 + 1 + + + alpha6 + 1.0 + + + color6 + "magenta" + + + label6 + + + + marker6 + -1 + + + style6 + 1 + + + width6 + 1 + + + alpha7 + 1.0 + + + color7 + "yellow" + + + label7 + + + + marker7 + -1 + + + style7 + 1 + + + width7 + 1 + + + alpha8 + 1.0 + + + color8 + "dark red" + + + label8 + + + + marker8 + -1 + + + style8 + 1 + + + width8 + 1 + + + alpha9 + 1.0 + + + color9 + "dark green" + + + label9 + + + + marker9 + -1 + + + style9 + 1 + + + width9 + 1 + + + name + "Fine" + + + nconnections + 2 + + + size + N_FFT + + + srate + channel_rate + + + stemplot + False + + + tr_chan + 0 + + + tr_delay + 0 + + + tr_level + 0.0 + + + tr_mode + qtgui.TRIG_MODE_FREE + + + tr_slope + qtgui.TRIG_SLOPE_POS + + + tr_tag + "" + + + type + float + + + update_time + 1.0/FRAME_RATE + + + ylabel + Amplitude + + + yunit + "" + + + ymax + 0 + + + ymin + -120 + + qtgui_waterfall_sink_x @@ -2597,7 +3490,7 @@ gain0 - 40 + 46 lo_export0 @@ -3964,24 +4857,48 @@ 0 0 + + blocks_complex_to_mag_squared_0_0 + blocks_nlog10_ff_0_0 + 0 + 0 + blocks_multiply_const_vxx_0 blocks_stream_to_vector_decimator_0 0 0 + + blocks_multiply_const_vxx_0_0 + blocks_stream_to_vector_decimator_0_0 + 0 + 0 + blocks_nlog10_ff_0 jay_peak_detect_1 0 0 + + blocks_nlog10_ff_0_0 + jay_peak_detect_1_0 + 0 + 0 + blocks_stream_to_vector_decimator_0 fft_vxx_0 0 0 + + blocks_stream_to_vector_decimator_0_0 + fft_vxx_0_0 + 0 + 0 + blocks_vector_to_stream_0 qtgui_time_sink_x_0 @@ -3994,6 +4911,18 @@ 0 1 + + blocks_vector_to_stream_0_0_0 + qtgui_time_sink_x_0_0 + 0 + 1 + + + blocks_vector_to_stream_0_1 + qtgui_time_sink_x_0_0 + 0 + 0 + dc_blocker_xx_0 jay_squelch_0 @@ -4006,24 +4935,36 @@ 0 0 + + fft_vxx_0_0 + blocks_complex_to_mag_squared_0_0 + 0 + 0 + freq_xlating_fir_filter_xxx_0 + blocks_multiply_const_vxx_0_0 + 0 + 0 + + + freq_xlating_fir_filter_xxx_0 + freq_xlating_fir_filter_xxx_0_0 + 0 + 0 + + + freq_xlating_fir_filter_xxx_0_0 analog_am_demod_cf_0 0 0 - freq_xlating_fir_filter_xxx_0 + freq_xlating_fir_filter_xxx_0_0 qtgui_freq_sink_x_0 0 0 - - freq_xlating_fir_filter_xxx_0 - qtgui_freq_sink_x_0 - 0 - 1 - jay_message_filter_0 freq_xlating_fir_filter_xxx_0 @@ -4031,17 +4972,11 @@ freq - jay_message_filter_0 - qtgui_freq_sink_x_0 + jay_message_filter_0_0 + freq_xlating_fir_filter_xxx_0_0 out freq - - jay_peak_detect_1 - blocks_tag_debug_0 - 0 - 0 - jay_peak_detect_1 blocks_vector_to_stream_0 @@ -4060,6 +4995,24 @@ status control + + jay_peak_detect_1_0 + blocks_vector_to_stream_0_1 + 0 + 0 + + + jay_peak_detect_1_0 + blocks_vector_to_stream_0_0_0 + 1 + 0 + + + jay_peak_detect_1_0 + jay_peak_manager_0_0 + status + control + jay_peak_manager_0 jay_message_debug_0 @@ -4078,6 +5031,12 @@ status control + + jay_peak_manager_0_0 + jay_message_filter_0_0 + status + in + jay_squelch_0 analog_agc_xx_0