diff options
Diffstat (limited to 'gnuradio-runtime')
-rw-r--r-- | gnuradio-runtime/include/gnuradio/pdu.h | 6 | ||||
-rw-r--r-- | gnuradio-runtime/lib/pdu.cc | 20 | ||||
-rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/bindings/docstrings/pdu_pydoc_template.h | 12 | ||||
-rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/bindings/pdu_python.cc | 15 |
4 files changed, 51 insertions, 2 deletions
diff --git a/gnuradio-runtime/include/gnuradio/pdu.h b/gnuradio-runtime/include/gnuradio/pdu.h index b930f3d0df..bab3564789 100644 --- a/gnuradio-runtime/include/gnuradio/pdu.h +++ b/gnuradio-runtime/include/gnuradio/pdu.h @@ -18,6 +18,8 @@ namespace gr { namespace metadata_keys { GR_RUNTIME_API const pmt::pmt_t pdu_num(); +GR_RUNTIME_API const pmt::pmt_t rx_time(); +GR_RUNTIME_API const pmt::pmt_t sys_time(); GR_RUNTIME_API const pmt::pmt_t tx_eob(); GR_RUNTIME_API const pmt::pmt_t tx_time(); GR_RUNTIME_API const pmt::pmt_t tx_sob(); @@ -26,12 +28,14 @@ GR_RUNTIME_API const pmt::pmt_t tx_sob(); namespace msgport_names { // static const PMT interned string getters for standard port names GR_RUNTIME_API const pmt::pmt_t bpdu(); +GR_RUNTIME_API const pmt::pmt_t conf(); GR_RUNTIME_API const pmt::pmt_t cpdu(); +GR_RUNTIME_API const pmt::pmt_t detects(); GR_RUNTIME_API const pmt::pmt_t dict(); GR_RUNTIME_API const pmt::pmt_t fpdu(); GR_RUNTIME_API const pmt::pmt_t msg(); GR_RUNTIME_API const pmt::pmt_t pdu(); -GR_RUNTIME_API const pmt::pmt_t pdus(); // compatibility, use of pdu() preferred +GR_RUNTIME_API const pmt::pmt_t pdus(); GR_RUNTIME_API const pmt::pmt_t vec(); } /* namespace msgport_names */ diff --git a/gnuradio-runtime/lib/pdu.cc b/gnuradio-runtime/lib/pdu.cc index 7b75fbac1a..79a6de6c79 100644 --- a/gnuradio-runtime/lib/pdu.cc +++ b/gnuradio-runtime/lib/pdu.cc @@ -22,6 +22,16 @@ const pmt::pmt_t pdu_num() static const pmt::pmt_t val = pmt::mp("pdu_num"); return val; } +const pmt::pmt_t rx_time() +{ + static const pmt::pmt_t val = pmt::mp("rx_time"); + return val; +} +const pmt::pmt_t sys_time() +{ + static const pmt::pmt_t val = pmt::mp("sys_time"); + return val; +} const pmt::pmt_t tx_eob() { static const pmt::pmt_t val = pmt::mp("tx_eob"); @@ -47,11 +57,21 @@ const pmt::pmt_t bpdu() static const pmt::pmt_t val = pmt::mp("bpdu"); return val; } +const pmt::pmt_t conf() +{ + static const pmt::pmt_t val = pmt::mp("conf"); + return val; +} const pmt::pmt_t cpdu() { static const pmt::pmt_t val = pmt::mp("cpdu"); return val; } +const pmt::pmt_t detects() +{ + static const pmt::pmt_t val = pmt::mp("detects"); + return val; +} const pmt::pmt_t dict() { static const pmt::pmt_t val = pmt::mp("dict"); diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/docstrings/pdu_pydoc_template.h b/gnuradio-runtime/python/gnuradio/gr/bindings/docstrings/pdu_pydoc_template.h index ebc11a8351..282d505b40 100644 --- a/gnuradio-runtime/python/gnuradio/gr/bindings/docstrings/pdu_pydoc_template.h +++ b/gnuradio-runtime/python/gnuradio/gr/bindings/docstrings/pdu_pydoc_template.h @@ -18,6 +18,12 @@ static const char* __doc_gr_metadata_keys_pdu_num = R"doc()doc"; +static const char* __doc_gr_metadata_keys_rx_time = R"doc()doc"; + + +static const char* __doc_gr_metadata_keys_sys_time = R"doc()doc"; + + static const char* __doc_gr_metadata_keys_tx_eob = R"doc()doc"; @@ -30,9 +36,15 @@ static const char* __doc_gr_metadata_keys_tx_sob = R"doc()doc"; static const char* __doc_gr_msgport_names_bpdu = R"doc()doc"; +static const char* __doc_gr_msgport_names_conf = R"doc()doc"; + + static const char* __doc_gr_msgport_names_cpdu = R"doc()doc"; +static const char* __doc_gr_msgport_names_detects = R"doc()doc"; + + static const char* __doc_gr_msgport_names_dict = R"doc()doc"; diff --git a/gnuradio-runtime/python/gnuradio/gr/bindings/pdu_python.cc b/gnuradio-runtime/python/gnuradio/gr/bindings/pdu_python.cc index 407a72a823..674c633ccf 100644 --- a/gnuradio-runtime/python/gnuradio/gr/bindings/pdu_python.cc +++ b/gnuradio-runtime/python/gnuradio/gr/bindings/pdu_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(pdu.h) */ -/* BINDTOOL_HEADER_FILE_HASH(562b6c641c014996cd7a94b2252030d1) */ +/* BINDTOOL_HEADER_FILE_HASH(6772caeddffe60c0c16148f68d21654f) */ /***********************************************************************************/ #include <pybind11/complex.h> @@ -48,6 +48,12 @@ void bind_pdu(py::module& m) m_metadata_keys.def( "pdu_num", &::gr::metadata_keys::pdu_num, D(metadata_keys, pdu_num)); + m_metadata_keys.def( + "rx_time", &::gr::metadata_keys::rx_time, D(metadata_keys, rx_time)); + + m_metadata_keys.def( + "sys_time", &::gr::metadata_keys::sys_time, D(metadata_keys, sys_time)); + m_metadata_keys.def("tx_eob", &::gr::metadata_keys::tx_eob, D(metadata_keys, tx_eob)); m_metadata_keys.def( @@ -61,9 +67,16 @@ void bind_pdu(py::module& m) m_msgport_names.def("bpdu", &::gr::msgport_names::bpdu, D(msgport_names, bpdu)); + m_msgport_names.def("conf", &::gr::msgport_names::conf, D(msgport_names, conf)); + + m_msgport_names.def("cpdu", &::gr::msgport_names::cpdu, D(msgport_names, cpdu)); + m_msgport_names.def( + "detects", &::gr::msgport_names::detects, D(msgport_names, detects)); + + m_msgport_names.def("dict", &::gr::msgport_names::dict, D(msgport_names, dict)); |