diff options
| author | Josh Morman <mormjb@gmail.com> | 2020-06-26 09:08:55 -0400 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-08-14 05:44:26 -0400 |
| commit | 0a89472e5235bb9d3b6872271c23cb167c5d430c (patch) | |
| tree | 96369e7144fc962453690b5dc66221f9ae225aae | |
| parent | d6cb8d359d333c6f9af629bda5950db16d604ce5 (diff) | |
uhd: wrap get_usrp_info to compatible return type
- Move get_usrp_info() to usrp_block
- Casts the return value to std::map so PyBind11 can turn it into
a dictionary in Python
This fixes an issue where get_usrp_info() would cause an Exception with
PyBind11.
Co-authored-by: Martin Braun <martin.braun@ettus.com>
9 files changed, 24 insertions, 38 deletions
diff --git a/gr-uhd/include/gnuradio/uhd/usrp_block.h b/gr-uhd/include/gnuradio/uhd/usrp_block.h index 57a0fdfee3..63f859cb9b 100644 --- a/gr-uhd/include/gnuradio/uhd/usrp_block.h +++ b/gr-uhd/include/gnuradio/uhd/usrp_block.h @@ -572,6 +572,15 @@ public: * @return the filter object */ virtual ::uhd::filter_info_base::sptr get_filter(const std::string& path) = 0; + + /*! + * Returns identifying information about this USRP's configuration. + * Returns motherboard ID, name, and serial. + * Returns daughterboard TX ID, subdev name and spec, serial, and antenna. + * \param chan channel index 0 to N-1 + * \return TX info + */ + virtual ::uhd::dict<std::string, std::string> get_usrp_info(size_t chan = 0) = 0; }; } /* namespace uhd */ diff --git a/gr-uhd/include/gnuradio/uhd/usrp_sink.h b/gr-uhd/include/gnuradio/uhd/usrp_sink.h index 03002b9174..a46d9a726a 100644 --- a/gr-uhd/include/gnuradio/uhd/usrp_sink.h +++ b/gr-uhd/include/gnuradio/uhd/usrp_sink.h @@ -123,15 +123,6 @@ public: virtual void set_start_time(const ::uhd::time_spec_t& time) = 0; /*! - * Returns identifying information about this USRP's configuration. - * Returns motherboard ID, name, and serial. - * Returns daughterboard TX ID, subdev name and spec, serial, and antenna. - * \param chan channel index 0 to N-1 - * \return TX info - */ - virtual ::uhd::dict<std::string, std::string> get_usrp_info(size_t chan = 0) = 0; - - /*! * Get a list of possible LO stage names * \param chan the channel index 0 to N-1 * \return a vector of strings for possible LO names diff --git a/gr-uhd/include/gnuradio/uhd/usrp_source.h b/gr-uhd/include/gnuradio/uhd/usrp_source.h index bd08f08641..304ba5b079 100644 --- a/gr-uhd/include/gnuradio/uhd/usrp_source.h +++ b/gr-uhd/include/gnuradio/uhd/usrp_source.h @@ -120,16 +120,6 @@ public: virtual void set_recv_timeout(const double timeout, const bool one_packet = true) = 0; /*! - * Returns identifying information about this USRP's configuration. - * Returns motherboard ID, name, and serial. - * Returns daughterboard RX ID, subdev name and spec, serial, and antenna. - * \param chan channel index 0 to N-1 - * \return RX info - */ - virtual ::uhd::dict<std::string, std::string> get_usrp_info(size_t chan = 0) = 0; - - - /*! * Get a list of possible LO stage names * \param chan the channel index 0 to N-1 * \return a vector of strings for possible LO names diff --git a/gr-uhd/python/uhd/bindings/docstrings/usrp_block_pydoc_template.h b/gr-uhd/python/uhd/bindings/docstrings/usrp_block_pydoc_template.h index 3ef0dd728b..ed951cc3a3 100644 --- a/gr-uhd/python/uhd/bindings/docstrings/usrp_block_pydoc_template.h +++ b/gr-uhd/python/uhd/bindings/docstrings/usrp_block_pydoc_template.h @@ -186,6 +186,9 @@ static const char* __doc_gr_uhd_usrp_block_set_filter = R"doc()doc"; static const char* __doc_gr_uhd_usrp_block_get_filter = R"doc()doc"; +static const char* __doc_gr_uhd_usrp_block_get_usrp_info = R"doc()doc"; + + static const char* __doc_gr_uhd_cmd_chan_key = R"doc()doc"; diff --git a/gr-uhd/python/uhd/bindings/docstrings/usrp_sink_pydoc_template.h b/gr-uhd/python/uhd/bindings/docstrings/usrp_sink_pydoc_template.h index 233a1f4c3c..3227dede50 100644 --- a/gr-uhd/python/uhd/bindings/docstrings/usrp_sink_pydoc_template.h +++ b/gr-uhd/python/uhd/bindings/docstrings/usrp_sink_pydoc_template.h @@ -30,9 +30,6 @@ static const char* __doc_gr_uhd_usrp_sink_make = R"doc()doc"; static const char* __doc_gr_uhd_usrp_sink_set_start_time = R"doc()doc"; -static const char* __doc_gr_uhd_usrp_sink_get_usrp_info = R"doc()doc"; - - static const char* __doc_gr_uhd_usrp_sink_get_lo_names = R"doc()doc"; diff --git a/gr-uhd/python/uhd/bindings/docstrings/usrp_source_pydoc_template.h b/gr-uhd/python/uhd/bindings/docstrings/usrp_source_pydoc_template.h index f2d93f03a0..6eb5584be6 100644 --- a/gr-uhd/python/uhd/bindings/docstrings/usrp_source_pydoc_template.h +++ b/gr-uhd/python/uhd/bindings/docstrings/usrp_source_pydoc_template.h @@ -36,9 +36,6 @@ static const char* __doc_gr_uhd_usrp_source_issue_stream_cmd = R"doc()doc"; static const char* __doc_gr_uhd_usrp_source_set_recv_timeout = R"doc()doc"; -static const char* __doc_gr_uhd_usrp_source_get_usrp_info = R"doc()doc"; - - static const char* __doc_gr_uhd_usrp_source_get_lo_names = R"doc()doc"; diff --git a/gr-uhd/python/uhd/bindings/usrp_block_python.cc b/gr-uhd/python/uhd/bindings/usrp_block_python.cc index d816a1668d..876dfb52d0 100644 --- a/gr-uhd/python/uhd/bindings/usrp_block_python.cc +++ b/gr-uhd/python/uhd/bindings/usrp_block_python.cc @@ -388,7 +388,18 @@ void bind_usrp_block(py::module& m) py::arg("path"), D(usrp_block, get_filter)) - ; + .def( + "get_usrp_info", + [](usrp_block& self, const size_t chan = 0) { + std::map<std::string, std::string> new_map; + auto usrp_info = self.get_usrp_info(chan); + for (const auto& k : self.get_usrp_info(chan).keys()) { + new_map[k] = usrp_info[k]; + } + return new_map; + }, + py::arg("chan") = 0, + D(usrp_block, get_usrp_info)); m.def("cmd_chan_key", &::gr::uhd::cmd_chan_key, D(cmd_chan_key)); diff --git a/gr-uhd/python/uhd/bindings/usrp_sink_python.cc b/gr-uhd/python/uhd/bindings/usrp_sink_python.cc index d0a7dc482d..2ad0c599d1 100644 --- a/gr-uhd/python/uhd/bindings/usrp_sink_python.cc +++ b/gr-uhd/python/uhd/bindings/usrp_sink_python.cc @@ -57,12 +57,6 @@ void bind_usrp_sink(py::module& m) D(usrp_sink, set_start_time)) - .def("get_usrp_info", - &usrp_sink::get_usrp_info, - py::arg("chan") = 0, - D(usrp_sink, get_usrp_info)) - - .def("get_lo_names", &usrp_sink::get_lo_names, py::arg("chan") = 0, diff --git a/gr-uhd/python/uhd/bindings/usrp_source_python.cc b/gr-uhd/python/uhd/bindings/usrp_source_python.cc index 19f3d6017d..29cd19e267 100644 --- a/gr-uhd/python/uhd/bindings/usrp_source_python.cc +++ b/gr-uhd/python/uhd/bindings/usrp_source_python.cc @@ -70,12 +70,6 @@ void bind_usrp_source(py::module& m) D(usrp_source, set_recv_timeout)) - .def("get_usrp_info", - &usrp_source::get_usrp_info, - py::arg("chan") = 0, - D(usrp_source, get_usrp_info)) - - .def("get_lo_names", &usrp_source::get_lo_names, py::arg("chan") = 0, |