diff --git a/gr-jay/lib/peak_detect_impl.cc b/gr-jay/lib/peak_detect_impl.cc index 4d31f95..5922281 100644 --- a/gr-jay/lib/peak_detect_impl.cc +++ b/gr-jay/lib/peak_detect_impl.cc @@ -304,7 +304,8 @@ namespace gr { pmt::pmt_t dict = pmt::make_dict(); dict = pmt::dict_add(dict, pmt::string_to_symbol(std::string("id")), pmt::from_long(peak.id)); dict = pmt::dict_add(dict, pmt::string_to_symbol(std::string("pos")), pmt::from_long(peak.pos)); - dict = pmt::dict_add(dict, pmt::string_to_symbol(std::string("state")), pmt::from_long(0)); + dict = pmt::dict_add(dict, pmt::string_to_symbol(std::string("height")), pmt::from_float(peak.height_rel)); + dict = pmt::dict_add(dict, pmt::string_to_symbol(std::string("state")), pmt::from_bool(0)); message_port_pub(m_msg_port_out, dict); } } @@ -337,7 +338,8 @@ namespace gr { pmt::pmt_t dict = pmt::make_dict(); dict = pmt::dict_add(dict, pmt::string_to_symbol(std::string("id")), pmt::from_long(peak.id)); dict = pmt::dict_add(dict, pmt::string_to_symbol(std::string("pos")), pmt::from_long(peak.pos)); - dict = pmt::dict_add(dict, pmt::string_to_symbol(std::string("state")), pmt::from_long(1)); + dict = pmt::dict_add(dict, pmt::string_to_symbol(std::string("height")), pmt::from_float(peak.height_rel)); + dict = pmt::dict_add(dict, pmt::string_to_symbol(std::string("state")), pmt::from_bool(1)); message_port_pub(m_msg_port_out, dict); } } diff --git a/peak_det_eval.grc b/peak_det_eval.grc index b64519a..43a9de8 100644 --- a/peak_det_eval.grc +++ b/peak_det_eval.grc @@ -779,11 +779,11 @@ _enabled - True + 0 _coordinate - (856, 920) + (928, 512) _rotation @@ -975,7 +975,7 @@ _coordinate - (888, 716) + (888, 676) _rotation @@ -1081,7 +1081,7 @@ _coordinate - (888, 820) + (888, 804) _rotation @@ -1132,7 +1132,7 @@ _coordinate - (888, 868) + (888, 852) _rotation @@ -1226,6 +1226,45 @@ window.blackmanharris(N_FFT) + + jay_message_debug + + alias + + + + comment + + + + affinity + + + + _enabled + 1 + + + _coordinate + (880, 920) + + + _rotation + 0 + + + id + jay_message_debug_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + jay_peak_detect @@ -1628,7 +1667,7 @@ _coordinate - (1080, 828) + (1080, 804) gui_hint @@ -3641,6 +3680,12 @@ status print + + jay_peak_detect_1 + jay_message_debug_0 + status + control + uhd_usrp_source_1 blocks_add_xx_0