Updated burst printer to accept a pmt string which will be prepended to any printed messages for situations where multiple print blocks are desired.
diff --git a/grc/misc_utils/gsm_bursts_printer.xml b/grc/misc_utils/gsm_bursts_printer.xml
index 6c520bd..5459872 100644
--- a/grc/misc_utils/gsm_bursts_printer.xml
+++ b/grc/misc_utils/gsm_bursts_printer.xml
@@ -3,7 +3,17 @@
<name>Bursts printer</name>
<key>gsm_bursts_printer</key>
<import>import grgsm</import>
- <make>grgsm.bursts_printer()</make>
+ <import>import pmt</import>
+ <make>grgsm.bursts_printer(pmt.intern($prepend_string))</make>
+
+ <param>
+ <name>Prepend String</name>
+ <key>prepend_string</key>
+ <value></value>
+ <type>string</type>
+ <hide>part</hide>
+ </param>
+
<sink>
<name>bursts</name>
<type>message</type>
diff --git a/include/grgsm/misc_utils/bursts_printer.h b/include/grgsm/misc_utils/bursts_printer.h
index 5fb9b1b..908ffd9 100644
--- a/include/grgsm/misc_utils/bursts_printer.h
+++ b/include/grgsm/misc_utils/bursts_printer.h
@@ -50,7 +50,7 @@
* class. gsm::bursts_printer::make is the public interface for
* creating new instances.
*/
- static sptr make();
+ static sptr make(pmt::pmt_t prepend_string);
};
} // namespace gsm
diff --git a/lib/misc_utils/bursts_printer_impl.cc b/lib/misc_utils/bursts_printer_impl.cc
index 8803a84..cd42f12 100644
--- a/lib/misc_utils/bursts_printer_impl.cc
+++ b/lib/misc_utils/bursts_printer_impl.cc
@@ -44,6 +44,7 @@
int8_t * burst = (int8_t *)(pmt::blob_data(header_plus_burst))+sizeof(gsmtap_hdr);
size_t burst_len=pmt::blob_length(header_plus_burst)-sizeof(gsmtap_hdr);
+ std::cout << d_prepend_string;
for(int ii=0; ii<burst_len; ii++)
{
std::cout << std::setprecision(1) << static_cast<int>(burst[ii]) << "";
@@ -52,20 +53,21 @@
}
bursts_printer::sptr
- bursts_printer::make()
+ bursts_printer::make(pmt::pmt_t prepend_string)
{
return gnuradio::get_initial_sptr
- (new bursts_printer_impl());
+ (new bursts_printer_impl(prepend_string));
}
/*
* The private constructor
*/
- bursts_printer_impl::bursts_printer_impl()
+ bursts_printer_impl::bursts_printer_impl(pmt::pmt_t prepend_string)
: gr::block("bursts_printer",
gr::io_signature::make(0, 0, 0),
gr::io_signature::make(0, 0, 0))
{
+ d_prepend_string = prepend_string;
message_port_register_in(pmt::mp("bursts"));
set_msg_handler(pmt::mp("bursts"), boost::bind(&bursts_printer_impl::bursts_print, this, _1));
}
diff --git a/lib/misc_utils/bursts_printer_impl.h b/lib/misc_utils/bursts_printer_impl.h
index 0ee6923..21ca62e 100644
--- a/lib/misc_utils/bursts_printer_impl.h
+++ b/lib/misc_utils/bursts_printer_impl.h
@@ -33,8 +33,9 @@
{
private:
void bursts_print(pmt::pmt_t burst);
+ pmt::pmt_t d_prepend_string;
public:
- bursts_printer_impl();
+ bursts_printer_impl(pmt::pmt_t prepend_string);
~bursts_printer_impl();
};