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 /gr-uhd/python/uhd/bindings/usrp_block_python.cc | |
| 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>
Diffstat (limited to 'gr-uhd/python/uhd/bindings/usrp_block_python.cc')
| -rw-r--r-- | gr-uhd/python/uhd/bindings/usrp_block_python.cc | 13 |
1 files changed, 12 insertions, 1 deletions
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)); |