From 29d7b7ef65bbd62f8fde6925ff59ea5247a36e4d Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Mon, 27 May 2019 19:46:24 +0000 Subject: [PATCH] - added message debug git-svn-id: http://moon:8086/svn/software/trunk/projects/GnuRadio@484 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- gr-jay/grc/CMakeLists.txt | 3 ++- gr-jay/include/jay/CMakeLists.txt | 3 ++- gr-jay/lib/CMakeLists.txt | 3 ++- gr-jay/lib/message_debug_impl.h | 8 +++++++- gr-jay/python/CMakeLists.txt | 1 + gr-jay/swig/jay_swig.i | 3 +++ 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/gr-jay/grc/CMakeLists.txt b/gr-jay/grc/CMakeLists.txt index 95dc5d5..c29c615 100644 --- a/gr-jay/grc/CMakeLists.txt +++ b/gr-jay/grc/CMakeLists.txt @@ -24,5 +24,6 @@ install(FILES jay_pocsag_decoder.xml jay_bit_packer.xml jay_add.xml - jay_peak_detect.xml DESTINATION share/gnuradio/grc/blocks + jay_peak_detect.xml + jay_message_debug.xml DESTINATION share/gnuradio/grc/blocks ) diff --git a/gr-jay/include/jay/CMakeLists.txt b/gr-jay/include/jay/CMakeLists.txt index 34ea0c2..40e3715 100644 --- a/gr-jay/include/jay/CMakeLists.txt +++ b/gr-jay/include/jay/CMakeLists.txt @@ -29,5 +29,6 @@ install(FILES pocsag_decoder.h bit_packer.h add.h - peak_detect.h DESTINATION include/jay + peak_detect.h + message_debug.h DESTINATION include/jay ) diff --git a/gr-jay/lib/CMakeLists.txt b/gr-jay/lib/CMakeLists.txt index 7a41dc9..27f3588 100644 --- a/gr-jay/lib/CMakeLists.txt +++ b/gr-jay/lib/CMakeLists.txt @@ -33,7 +33,8 @@ list(APPEND jay_sources pocsag_decoder_impl.cc bit_packer_impl.cc add_impl.cc - peak_detect_impl.cc ) + peak_detect_impl.cc + message_debug_impl.cc ) set(jay_sources "${jay_sources}" PARENT_SCOPE) if(NOT jay_sources) diff --git a/gr-jay/lib/message_debug_impl.h b/gr-jay/lib/message_debug_impl.h index 482b089..67f8e1e 100644 --- a/gr-jay/lib/message_debug_impl.h +++ b/gr-jay/lib/message_debug_impl.h @@ -37,7 +37,13 @@ namespace gr { { if (pmt::is_dict(msg)) { - fprintf(stderr, "Is dictionary\n!"); + fprintf(stderr, "Is dictionary.\n"); + pmt::pmt_t keys = pmt::dict_keys(msg); + for (int i=0; i < pmt::length(keys); i++) + { + pmt::pmt_t key = pmt::nth(i, keys); + fprintf(stderr, "Key: %s\n!", pmt::symbol_to_string(key)); + } } else { diff --git a/gr-jay/python/CMakeLists.txt b/gr-jay/python/CMakeLists.txt index e9a9b1e..a79d606 100644 --- a/gr-jay/python/CMakeLists.txt +++ b/gr-jay/python/CMakeLists.txt @@ -49,3 +49,4 @@ GR_ADD_TEST(qa_pocsag_decoder ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/q GR_ADD_TEST(qa_bit_packer ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_bit_packer.py) GR_ADD_TEST(qa_add ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_add.py) GR_ADD_TEST(qa_peak_detect ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_peak_detect.py) +GR_ADD_TEST(qa_message_debug ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_message_debug.py) diff --git a/gr-jay/swig/jay_swig.i b/gr-jay/swig/jay_swig.i index a4216a0..7e059ac 100644 --- a/gr-jay/swig/jay_swig.i +++ b/gr-jay/swig/jay_swig.i @@ -15,6 +15,7 @@ #include "jay/bit_packer.h" #include "jay/add.h" #include "jay/peak_detect.h" +#include "jay/message_debug.h" %} @@ -33,3 +34,5 @@ GR_SWIG_BLOCK_MAGIC2(jay, bit_packer); GR_SWIG_BLOCK_MAGIC2(jay, add); %include "jay/peak_detect.h" GR_SWIG_BLOCK_MAGIC2(jay, peak_detect); +%include "jay/message_debug.h" +GR_SWIG_BLOCK_MAGIC2(jay, message_debug);