diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index d6520d5..91398c7 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -20,7 +20,7 @@ install(FILES
satnogs_cw_matched_filter_ff.xml
satnogs_morse_decoder.xml
satnogs_morse_debug_source.xml
- satnogs_clear_text_msg_sink.xml
+ satnogs_multi_format_msg_sink.xml
satnogs_cw_to_symbol.xml
satnogs_afsk_decoder.xml
satnogs_sine_matched_filter_ff.xml
diff --git a/grc/satnogs_clear_text_msg_sink.xml b/grc/satnogs_clear_text_msg_sink.xml
deleted file mode 100644
index 497c8f5..0000000
--- a/grc/satnogs_clear_text_msg_sink.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- Clear Text Message Sink
- satnogs_clear_text_msg_sink
- satnogs
- import satnogs
- satnogs.clear_text_msg_sink()
-
-
- in
- message
-
-
diff --git a/grc/satnogs_multi_format_msg_sink.xml b/grc/satnogs_multi_format_msg_sink.xml
new file mode 100644
index 0000000..a1cbd07
--- /dev/null
+++ b/grc/satnogs_multi_format_msg_sink.xml
@@ -0,0 +1,31 @@
+
+
+ Multi Format Message Sink
+ satnogs_multi_format_msg_sink
+ satnogs
+ import satnogs
+ satnogs.multi_format_msg_sink($format)
+
+
+ Output format
+ format
+ enum
+
+
+
+
+
+
+ in
+ message
+
+
diff --git a/include/satnogs/CMakeLists.txt b/include/satnogs/CMakeLists.txt
index 1741ed3..23f41a3 100644
--- a/include/satnogs/CMakeLists.txt
+++ b/include/satnogs/CMakeLists.txt
@@ -30,7 +30,7 @@ install(FILES
morse.h
morse_decoder.h
morse_debug_source.h
- clear_text_msg_sink.h
+ multi_format_msg_sink.h
cw_to_symbol.h
afsk_decoder.h
sine_matched_filter_ff.h
diff --git a/include/satnogs/clear_text_msg_sink.h b/include/satnogs/multi_format_msg_sink.h
similarity index 82%
rename from include/satnogs/clear_text_msg_sink.h
rename to include/satnogs/multi_format_msg_sink.h
index 4164581..e281a87 100644
--- a/include/satnogs/clear_text_msg_sink.h
+++ b/include/satnogs/multi_format_msg_sink.h
@@ -18,8 +18,8 @@
* along with this program. If not, see .
*/
-#ifndef INCLUDED_SATNOGS_CLEAR_TEXT_MSG_SINK_H
-#define INCLUDED_SATNOGS_CLEAR_TEXT_MSG_SINK_H
+#ifndef INCLUDED_SATNOGS_MULTI_FORMAT_MSG_SINK_H
+#define INCLUDED_SATNOGS_MULTI_FORMAT_MSG_SINK_H
#include
#include
@@ -37,10 +37,10 @@ namespace gr
* \ingroup satnogs
*
*/
- class SATNOGS_API clear_text_msg_sink : virtual public gr::block
+ class SATNOGS_API multi_format_msg_sink : virtual public gr::block
{
public:
- typedef boost::shared_ptr sptr;
+ typedef boost::shared_ptr sptr;
/*!
* \brief Block accepting clear text messages from various decoders.
@@ -49,11 +49,11 @@ namespace gr
*
*/
static sptr
- make ();
+ make (size_t format);
};
} // namespace satnogs
} // namespace gr
-#endif /* INCLUDED_SATNOGS_CLEAR_TEXT_MSG_SINK_H */
+#endif /* INCLUDED_SATNOGS_multi_format_MSG_SINK_H */
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 217edcb..436577a 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -29,7 +29,7 @@ list(APPEND satnogs_sources
morse_tree.cc
morse_decoder_impl.cc
morse_debug_source_impl.cc
- clear_text_msg_sink_impl.cc
+ multi_format_msg_sink_impl.cc
cw_to_symbol_impl.cc
afsk_decoder_impl.cc
sine_matched_filter_ff_impl.cc
diff --git a/lib/clear_text_msg_sink_impl.cc b/lib/multi_format_msg_sink_impl.cc
similarity index 54%
rename from lib/clear_text_msg_sink_impl.cc
rename to lib/multi_format_msg_sink_impl.cc
index e10abc0..61c8f58 100644
--- a/lib/clear_text_msg_sink_impl.cc
+++ b/lib/multi_format_msg_sink_impl.cc
@@ -23,37 +23,55 @@
#endif
#include
-#include "clear_text_msg_sink_impl.h"
+#include "multi_format_msg_sink_impl.h"
namespace gr {
namespace satnogs {
- clear_text_msg_sink::sptr
- clear_text_msg_sink::make()
+ multi_format_msg_sink::sptr
+ multi_format_msg_sink::make(size_t format)
{
return gnuradio::get_initial_sptr
- (new clear_text_msg_sink_impl());
+ (new multi_format_msg_sink_impl(format));
}
void
- clear_text_msg_sink_impl::msg_handler (pmt::pmt_t msg)
+ multi_format_msg_sink_impl::msg_handler (pmt::pmt_t msg)
{
std::string s((const char *)pmt::blob_data(msg), pmt::blob_length(msg));
- std::cout << "Received text sequence:" << s << " " << std::endl;
+ switch(d_format){
+ case 0:
+ std::cout << "Received text sequence:" << s << " " << std::endl;
+ break;
+ case 1:
+ //for(size_t i=0; i< pmt::blob_length(msg); i++)
+ for (size_t i = 0; i < s.length(); ++i)
+ std::cout << std::hex << std::setfill('0') << std::setw(2) <<(int)s[i];
+ std::cout<(((uint8_t*)pmt::blob_data(msg))[i]);
+ std::cout<.
*/
-#ifndef INCLUDED_SATNOGS_CLEAR_TEXT_MSG_SINK_IMPL_H
-#define INCLUDED_SATNOGS_CLEAR_TEXT_MSG_SINK_IMPL_H
+#ifndef INCLUDED_SATNOGS_MULTI_FORMAT_MSG_SINK_IMPL_H
+#define INCLUDED_SATNOGS_MULTI_FORMAT_MSG_SINK_IMPL_H
-#include
+#include
namespace gr
{
namespace satnogs
{
- class clear_text_msg_sink_impl : public clear_text_msg_sink
+ class multi_format_msg_sink_impl : public multi_format_msg_sink
{
private:
void
msg_handler(pmt::pmt_t msg);
+ size_t d_format;
+
public:
- clear_text_msg_sink_impl ();
+ multi_format_msg_sink_impl (size_t format);
};
} // namespace satnogs
} // namespace gr
-#endif /* INCLUDED_SATNOGS_CLEAR_TEXT_MSG_SINK_IMPL_H */
+#endif /* INCLUDED_SATNOGS_multi_format_MSG_SINK_IMPL_H */
diff --git a/swig/satnogs_swig.i b/swig/satnogs_swig.i
index f89622b..29442eb 100644
--- a/swig/satnogs_swig.i
+++ b/swig/satnogs_swig.i
@@ -13,7 +13,7 @@
#include "satnogs/morse_tree.h"
#include "satnogs/morse_decoder.h"
#include "satnogs/morse_debug_source.h"
-#include "satnogs/clear_text_msg_sink.h"
+#include "satnogs/multi_format_msg_sink.h"
#include "satnogs/cw_to_symbol.h"
#include "satnogs/afsk_decoder.h"
#include "satnogs/sine_matched_filter_ff.h"
@@ -40,8 +40,8 @@ GR_SWIG_BLOCK_MAGIC2(satnogs, cw_matched_filter_ff);
GR_SWIG_BLOCK_MAGIC2(satnogs, morse_decoder);
%include "satnogs/morse_debug_source.h"
GR_SWIG_BLOCK_MAGIC2(satnogs, morse_debug_source);
-%include "satnogs/clear_text_msg_sink.h"
-GR_SWIG_BLOCK_MAGIC2(satnogs, clear_text_msg_sink);
+%include "satnogs/multi_format_msg_sink.h"
+GR_SWIG_BLOCK_MAGIC2(satnogs, multi_format_msg_sink);
%include "satnogs/cw_to_symbol.h"
GR_SWIG_BLOCK_MAGIC2(satnogs, cw_to_symbol);
%include "satnogs/afsk_decoder.h"