From 4373e458c7c8c3889399567002d50c264e69a992 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Mon, 27 May 2019 19:45:50 +0000
Subject: [PATCH] - working dictionary on messages

git-svn-id: http://moon:8086/svn/software/trunk/projects/GnuRadio@483 b431acfa-c32f-4a4a-93f1-934dc6c82436
---
 gr-jay/grc/jay_peak_detect.xml |  5 +++++
 gr-jay/lib/peak_detect_impl.cc | 18 ++++++++++++------
 gr-jay/lib/peak_detect_impl.h  |  9 ++++++++-
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/gr-jay/grc/jay_peak_detect.xml b/gr-jay/grc/jay_peak_detect.xml
index 857d652..739bbbf 100644
--- a/gr-jay/grc/jay_peak_detect.xml
+++ b/gr-jay/grc/jay_peak_detect.xml
@@ -63,6 +63,11 @@
     <type>float</type>
     <vlen>$vlen</vlen>
   </sink>
+  <sink>
+    <name>control</name>
+    <type>message</type>
+    <optional>1</optional>
+  </sink>
 
   <!-- Make one 'source' node per output. Sub-nodes:
        * name (an identifier for the GUI)
diff --git a/gr-jay/lib/peak_detect_impl.cc b/gr-jay/lib/peak_detect_impl.cc
index f85632e..4d31f95 100644
--- a/gr-jay/lib/peak_detect_impl.cc
+++ b/gr-jay/lib/peak_detect_impl.cc
@@ -73,7 +73,7 @@ namespace gr {
 		str << name() << unique_id();
 		m_tag_id = pmt::string_to_symbol(str.str());
 		
-		m_msg_port_in = pmt::mp("msgIn");
+		m_msg_port_in = pmt::mp("control");
 		m_msg_port_out = pmt::mp("status");
 		message_port_register_in(m_msg_port_in);
 		message_port_register_out(m_msg_port_out);
@@ -300,7 +300,12 @@ namespace gr {
 					pmt::pmt_t tag_key = pmt::string_to_symbol(std::string("peak"));
 					pmt::pmt_t tag_value = pmt::string_to_symbol(msgStr);
 					add_item_tag(DATA, nitems_written(DATA) + k, tag_key, tag_value, m_tag_id);
-					message_port_pub(m_msg_port_out, pmt::string_to_symbol(msgStr));
+
+					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));
+					message_port_pub(m_msg_port_out, dict);
 				}
 			}
 			
@@ -329,10 +334,11 @@ namespace gr {
 					pmt::pmt_t tag_value = pmt::string_to_symbol(msgStr);
 					add_item_tag(DATA, nitems_written(DATA) + k, tag_key, tag_value, m_tag_id);
 					
-//					pmt::pmt_t dict = pmt::make_dict();
-//					pmt::dict_add(dict, pmt::string_to_symbol(std::string("id=")), pmt::from_long(peak.id));
-//					message_port_pub(m_msg_port_out, dict);
-					message_port_pub(m_msg_port_out, pmt::string_to_symbol(msgStr));
+					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));
+					message_port_pub(m_msg_port_out, dict);
 				}
 			}
 			
diff --git a/gr-jay/lib/peak_detect_impl.h b/gr-jay/lib/peak_detect_impl.h
index ca2bb71..b7e72be 100644
--- a/gr-jay/lib/peak_detect_impl.h
+++ b/gr-jay/lib/peak_detect_impl.h
@@ -174,7 +174,14 @@ namespace jay {
 	private:
 		void set_msg(pmt::pmt_t msg)
 		{
-			
+			if (pmt::is_dict(msg))
+			{
+				fprintf(stderr, "Is dictionary\n!");
+			}
+			else
+			{
+				fprintf(stderr, "Sym: %s\n", pmt::symbol_to_string(msg).c_str());
+			}
 		}
 		
 		Peak peakCheck(float const *pData, Peak const &peak, float thresh)