diff --git a/gr-jay/lib/peak_detect_impl.h b/gr-jay/lib/peak_detect_impl.h
index f3ca017..a51b1ee 100644
--- a/gr-jay/lib/peak_detect_impl.h
+++ b/gr-jay/lib/peak_detect_impl.h
@@ -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;
diff --git a/peak_det_eval.grc b/peak_det_eval.grc
index c6a92c1..fbf2eae 100644
--- a/peak_det_eval.grc
+++ b/peak_det_eval.grc
@@ -397,7 +397,7 @@
_coordinate
- (656, 540)
+ (656, 508)
gui_hint
@@ -424,6 +424,65 @@
int
+
+ analog_agc_xx
+
+ alias
+
+
+
+ comment
+
+
+
+ affinity
+
+
+
+ _enabled
+ True
+
+
+ _coordinate
+ (1136, 148)
+
+
+ _rotation
+ 0
+
+
+ gain
+ 1.0
+
+
+ id
+ analog_agc_xx_0
+
+
+ max_gain
+ 100
+
+
+ maxoutbuf
+ 0
+
+
+ minoutbuf
+ 0
+
+
+ rate
+ 1e-2
+
+
+ reference
+ 1.0
+
+
+ type
+ float
+
+
analog_am_demod_cf
@@ -460,7 +519,7 @@
_coordinate
- (808, 228)
+ (600, 164)
_rotation
@@ -503,7 +562,7 @@
_coordinate
- (96, 292)
+ (88, 292)
_rotation
@@ -747,7 +806,7 @@
_coordinate
- (1112, 236)
+ (1128, 324)
_rotation
@@ -880,11 +939,11 @@
_enabled
- 0
+ 1
_coordinate
- (1096, 616)
+ (1088, 904)
_rotation
@@ -1107,61 +1166,6 @@
N_FFT
-
- blocks_throttle
-
- alias
-
-
-
- comment
-
-
-
- affinity
-
-
-
- _enabled
- True
-
-
- _coordinate
- (632, 452)
-
-
- _rotation
- 0
-
-
- id
- blocks_throttle_0
-
-
- ignoretag
- True
-
-
- maxoutbuf
- 0
-
-
- minoutbuf
- 0
-
-
- samples_per_second
- samp_rate
-
-
- type
- complex
-
-
- vlen
- 1
-
-
blocks_vector_to_stream
@@ -1264,6 +1268,57 @@
1
+
+ dc_blocker_xx
+
+ alias
+
+
+
+ comment
+
+
+
+ affinity
+
+
+
+ _enabled
+ True
+
+
+ _coordinate
+ (808, 180)
+
+
+ _rotation
+ 0
+
+
+ id
+ dc_blocker_xx_0
+
+
+ length
+ 32
+
+
+ long_form
+ True
+
+
+ maxoutbuf
+ 0
+
+
+ minoutbuf
+ 0
+
+
+ type
+ ff
+
+
fft_vxx
@@ -1355,7 +1410,7 @@
_coordinate
- (504, 316)
+ (504, 324)
_rotation
@@ -1379,7 +1434,7 @@
taps
- 33
+ 1
type
@@ -1402,11 +1457,11 @@
_enabled
- 1
+ 0
_coordinate
- (888, 928)
+ (1096, 488)
_rotation
@@ -1425,6 +1480,45 @@
0
+
+ jay_message_filter
+
+ alias
+
+
+
+ comment
+
+
+
+ affinity
+
+
+
+ _enabled
+ True
+
+
+ _coordinate
+ (888, 552)
+
+
+ _rotation
+ 0
+
+
+ id
+ jay_message_filter_0
+
+
+ maxoutbuf
+ 0
+
+
+ minoutbuf
+ 0
+
+
jay_peak_detect
@@ -1520,7 +1614,7 @@
_coordinate
- (888, 552)
+ (896, 488)
_rotation
@@ -1543,6 +1637,45 @@
1
+
+ jay_squelch
+
+ alias
+
+
+
+ comment
+
+
+
+ affinity
+
+
+
+ _enabled
+ True
+
+
+ _coordinate
+ (968, 160)
+
+
+ _rotation
+ 0
+
+
+ id
+ jay_squelch_0
+
+
+ maxoutbuf
+ 0
+
+
+ minoutbuf
+ 0
+
+
qtgui_freq_sink_x
@@ -1551,7 +1684,7 @@
average
- 1.0
+ 0.1
axislabels
@@ -1559,7 +1692,7 @@
bw
- audio_rate
+ channel_rate
alias
@@ -1591,7 +1724,7 @@
_coordinate
- (1000, 388)
+ (832, 320)
gui_hint
@@ -1787,7 +1920,7 @@
nconnections
- 1
+ 2
showports
@@ -1819,7 +1952,7 @@
update_time
- 0.10
+ 0.05
wintype
@@ -2464,7 +2597,7 @@
gain0
- 50
+ 40
lo_export0
@@ -3616,7 +3749,7 @@
_coordinate
- (64, 188)
+ (64, 180)
_rotation
@@ -3772,11 +3905,17 @@
- analog_am_demod_cf_0
+ analog_agc_xx_0
audio_sink_0
0
0
+
+ analog_am_demod_cf_0
+ dc_blocker_xx_0
+ 0
+ 0
+
analog_noise_source_x_0
blocks_add_xx_0
@@ -3827,7 +3966,7 @@
blocks_multiply_const_vxx_0
- blocks_throttle_0
+ blocks_stream_to_vector_decimator_0
0
0
@@ -3843,12 +3982,6 @@
0
0
-
- blocks_throttle_0
- blocks_stream_to_vector_decimator_0
- 0
- 0
-
blocks_vector_to_stream_0
qtgui_time_sink_x_0
@@ -3861,6 +3994,12 @@
0
1
+
+ dc_blocker_xx_0
+ jay_squelch_0
+ 0
+ 0
+
fft_vxx_0
blocks_complex_to_mag_squared_0
@@ -3879,6 +4018,24 @@
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
+ out
+ freq
+
+
+ jay_message_filter_0
+ qtgui_freq_sink_x_0
+ out
+ freq
+
jay_peak_detect_1
blocks_tag_debug_0
@@ -3897,12 +4054,6 @@
1
0
-
- jay_peak_detect_1
- jay_message_debug_0
- status
- control
-
jay_peak_detect_1
jay_peak_manager_0
@@ -3911,21 +4062,27 @@
jay_peak_manager_0
- blocks_message_debug_0
- freq
- print
+ jay_message_debug_0
+ status
+ control
jay_peak_manager_0
- freq_xlating_fir_filter_xxx_0
- freq
- freq
+ jay_message_filter_0
+ status
+ in
jay_peak_manager_0
- qtgui_freq_sink_x_0
- freq
- freq
+ jay_squelch_0
+ status
+ control
+
+
+ jay_squelch_0
+ analog_agc_xx_0
+ 0
+ 0
uhd_usrp_source_1