jens/GnuRadio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

peak detect: change threshold is 3.0 dB

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/GnuRadio@508 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2019-05-29 14:46:22 +00:00
parent 880e46bce9
commit e78ef5b772
2 changed files with 257 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gr-jay/lib/peak_detect_impl.h
+4 -4
View File
@@ -97,7 +97,7 @@ namespace jay {
}
height_rel = newHeight;
if (std::fabs(height_rel_last-newHeight) >= 1.0f)
if (std::fabs(height_rel_last-newHeight) >= 3.0f)
{
isModified = true;
height_rel_last = height_rel;
@@ -127,7 +127,7 @@ namespace jay {
}
height_abs = newHeight;
if (std::fabs(height_abs_last-newHeight) >= 1.0f)
if (std::fabs(height_abs_last-newHeight) >= 3.0f)
{
isModified = true;
height_abs_last = height_abs;
@@ -201,12 +201,12 @@ namespace jay {
bool update(const Peak &other)
{
if (std::fabs(height_rel_last-other.height_rel) >= 1.0f)
if (std::fabs(height_rel_last-other.height_rel) >= 3.0f)
{
height_rel_last = other.height_rel;
isModified = true;
}
if (std::fabs(height_abs-other.height_abs) >= 1.0f)
if (std::fabs(height_abs-other.height_abs) >= 3.0f)
{
height_abs_last = other.height_abs;
isModified = true;
peak_det_eval.grc
+253 -96
View File
@@ -397,7 +397,7 @@
</param>
<param>
<key>_coordinate</key>
<value>(656, 540)</value>
<value>(656, 508)</value>
</param>
<param>
<key>gui_hint</key>
@@ -424,6 +424,65 @@
<value>int</value>
</param>
</block>
<block>
<key>analog_agc_xx</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(1136, 148)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>gain</key>
<value>1.0</value>
</param>
<param>
<key>id</key>
<value>analog_agc_xx_0</value>
</param>
<param>
<key>max_gain</key>
<value>100</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>rate</key>
<value>1e-2</value>
</param>
<param>
<key>reference</key>
<value>1.0</value>
</param>
<param>
<key>type</key>
<value>float</value>
</param>
</block>
<block>
<key>analog_am_demod_cf</key>
<param>
@@ -460,7 +519,7 @@
</param>
<param>
<key>_coordinate</key>
<value>(808, 228)</value>
<value>(600, 164)</value>
</param>
<param>
<key>_rotation</key>
@@ -503,7 +562,7 @@
</param>
<param>
<key>_coordinate</key>
<value>(96, 292)</value>
<value>(88, 292)</value>
</param>
<param>
<key>_rotation</key>
@@ -747,7 +806,7 @@
</param>
<param>
<key>_coordinate</key>
<value>(1112, 236)</value>
<value>(1128, 324)</value>
</param>
<param>
<key>_rotation</key>
@@ -880,11 +939,11 @@
</param>
<param>
<key>_enabled</key>
<value>0</value>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
<value>(1096, 616)</value>
<value>(1088, 904)</value>
</param>
<param>
<key>_rotation</key>
@@ -1107,61 +1166,6 @@
<value>N_FFT</value>
</param>
</block>
<block>
<key>blocks_throttle</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(632, 452)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>blocks_throttle_0</value>
</param>
<param>
<key>ignoretag</key>
<value>True</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>samples_per_second</key>
<value>samp_rate</value>
</param>
<param>
<key>type</key>
<value>complex</value>
</param>
<param>
<key>vlen</key>
<value>1</value>
</param>
</block>
<block>
<key>blocks_vector_to_stream</key>
<param>
@@ -1264,6 +1268,57 @@
<value>1</value>
</param>
</block>
<block>
<key>dc_blocker_xx</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(808, 180)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>dc_blocker_xx_0</value>
</param>
<param>
<key>length</key>
<value>32</value>
</param>
<param>
<key>long_form</key>
<value>True</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
<param>
<key>type</key>
<value>ff</value>
</param>
</block>
<block>
<key>fft_vxx</key>
<param>
@@ -1355,7 +1410,7 @@
</param>
<param>
<key>_coordinate</key>
<value>(504, 316)</value>
<value>(504, 324)</value>
</param>
<param>
<key>_rotation</key>
@@ -1379,7 +1434,7 @@
</param>
<param>
<key>taps</key>
<value>33</value>
<value>1</value>
</param>
<param>
<key>type</key>
@@ -1402,11 +1457,11 @@
</param>
<param>
<key>_enabled</key>
<value>1</value>
<value>0</value>
</param>
<param>
<key>_coordinate</key>
<value>(888, 928)</value>
<value>(1096, 488)</value>
</param>
<param>
<key>_rotation</key>
@@ -1425,6 +1480,45 @@
<value>0</value>
</param>
</block>
<block>
<key>jay_message_filter</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(888, 552)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>jay_message_filter_0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
</block>
<block>
<key>jay_peak_detect</key>
<param>
@@ -1520,7 +1614,7 @@
</param>
<param>
<key>_coordinate</key>
<value>(888, 552)</value>
<value>(896, 488)</value>
</param>
<param>
<key>_rotation</key>
@@ -1543,6 +1637,45 @@
<value>1</value>
</param>
</block>
<block>
<key>jay_squelch</key>
<param>
<key>alias</key>
<value></value>
</param>
<param>
<key>comment</key>
<value></value>
</param>
<param>
<key>affinity</key>
<value></value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
<key>_coordinate</key>
<value>(968, 160)</value>
</param>
<param>
<key>_rotation</key>
<value>0</value>
</param>
<param>
<key>id</key>
<value>jay_squelch_0</value>
</param>
<param>
<key>maxoutbuf</key>
<value>0</value>
</param>
<param>
<key>minoutbuf</key>
<value>0</value>
</param>
</block>
<block>
<key>qtgui_freq_sink_x</key>
<param>
@@ -1551,7 +1684,7 @@
</param>
<param>
<key>average</key>
<value>1.0</value>
<value>0.1</value>
</param>
<param>
<key>axislabels</key>
@@ -1559,7 +1692,7 @@
</param>
<param>
<key>bw</key>
<value>audio_rate</value>
<value>channel_rate</value>
</param>
<param>
<key>alias</key>
@@ -1591,7 +1724,7 @@
</param>
<param>
<key>_coordinate</key>
<value>(1000, 388)</value>
<value>(832, 320)</value>
</param>
<param>
<key>gui_hint</key>
@@ -1787,7 +1920,7 @@
</param>
<param>
<key>nconnections</key>
<value>1</value>
<value>2</value>
</param>
<param>
<key>showports</key>
@@ -1819,7 +1952,7 @@
</param>
<param>
<key>update_time</key>
<value>0.10</value>
<value>0.05</value>
</param>
<param>
<key>wintype</key>
@@ -2464,7 +2597,7 @@
</param>
<param>
<key>gain0</key>
<value>50</value>
<value>40</value>
</param>
<param>
<key>lo_export0</key>
@@ -3616,7 +3749,7 @@
</param>
<param>
<key>_coordinate</key>
<value>(64, 188)</value>
<value>(64, 180)</value>
</param>
<param>
<key>_rotation</key>
@@ -3772,11 +3905,17 @@
</param>
</block>
<connection>
<source_block_id>analog_am_demod_cf_0</source_block_id>
<source_block_id>analog_agc_xx_0</source_block_id>
<sink_block_id>audio_sink_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>analog_am_demod_cf_0</source_block_id>
<sink_block_id>dc_blocker_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>analog_noise_source_x_0</source_block_id>
<sink_block_id>blocks_add_xx_0</sink_block_id>
@@ -3827,7 +3966,7 @@
</connection>
<connection>
<source_block_id>blocks_multiply_const_vxx_0</source_block_id>
<sink_block_id>blocks_throttle_0</sink_block_id>
<sink_block_id>blocks_stream_to_vector_decimator_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
@@ -3843,12 +3982,6 @@
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>blocks_throttle_0</source_block_id>
<sink_block_id>blocks_stream_to_vector_decimator_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>blocks_vector_to_stream_0</source_block_id>
<sink_block_id>qtgui_time_sink_x_0</sink_block_id>
@@ -3861,6 +3994,12 @@
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>dc_blocker_xx_0</source_block_id>
<sink_block_id>jay_squelch_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>fft_vxx_0</source_block_id>
<sink_block_id>blocks_complex_to_mag_squared_0</sink_block_id>
@@ -3879,6 +4018,24 @@
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>freq_xlating_fir_filter_xxx_0</source_block_id>
<sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>jay_message_filter_0</source_block_id>
<sink_block_id>freq_xlating_fir_filter_xxx_0</sink_block_id>
<source_key>out</source_key>
<sink_key>freq</sink_key>
</connection>
<connection>
<source_block_id>jay_message_filter_0</source_block_id>
<sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
<source_key>out</source_key>
<sink_key>freq</sink_key>
</connection>
<connection>
<source_block_id>jay_peak_detect_1</source_block_id>
<sink_block_id>blocks_tag_debug_0</sink_block_id>
@@ -3897,12 +4054,6 @@
<source_key>1</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>jay_peak_detect_1</source_block_id>
<sink_block_id>jay_message_debug_0</sink_block_id>
<source_key>status</source_key>
<sink_key>control</sink_key>
</connection>
<connection>
<source_block_id>jay_peak_detect_1</source_block_id>
<sink_block_id>jay_peak_manager_0</sink_block_id>
@@ -3911,21 +4062,27 @@
</connection>
<connection>
<source_block_id>jay_peak_manager_0</source_block_id>
<sink_block_id>blocks_message_debug_0</sink_block_id>
<source_key>freq</source_key>
<sink_key>print</sink_key>
<sink_block_id>jay_message_debug_0</sink_block_id>
<source_key>status</source_key>
<sink_key>control</sink_key>
</connection>
<connection>
<source_block_id>jay_peak_manager_0</source_block_id>
<sink_block_id>freq_xlating_fir_filter_xxx_0</sink_block_id>
<source_key>freq</source_key>
<sink_key>freq</sink_key>
<sink_block_id>jay_message_filter_0</sink_block_id>
<source_key>status</source_key>
<sink_key>in</sink_key>
</connection>
<connection>
<source_block_id>jay_peak_manager_0</source_block_id>
<sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
<source_key>freq</source_key>
<sink_key>freq</sink_key>
<sink_block_id>jay_squelch_0</sink_block_id>
<source_key>status</source_key>
<sink_key>control</sink_key>
</connection>
<connection>
<source_block_id>jay_squelch_0</source_block_id>
<sink_block_id>analog_agc_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>uhd_usrp_source_1</source_block_id>