argilo
/
gr-osmosdr
forked from sdr/gr-osmosdr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

uhd: include type, name (if available) and serial in label property

This commit is contained in:
Dimitri Stolnikov 2012-06-09 16:00:24 +02:00
parent 8099f783c0
commit 3c3bdc15cf
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/uhd/uhd_source_c.cc
View File

@ -20,6 +20,7 @@
#include <boost/foreach.hpp>
#include <boost/assign.hpp>
#include <boost/algorithm/string.hpp>
//#include <uhd/property_tree.hpp>
@ -82,7 +83,26 @@ std::vector< std::string > uhd_source_c::get_devices()
uhd::device_addr_t hint;
BOOST_FOREACH(const uhd::device_addr_t &dev, uhd::device::find(hint)) {
std::string args = "uhd=," + dev.to_string();
args += ",label='Ettus USRP'";
std::string label = "Ettus";
std::string type = dev.cast< std::string >("type", "USRP");
std::string name = dev.cast< std::string >("name", "");
std::string serial = dev.cast< std::string >("serial", "");
if (type.length()) {
boost::to_upper(type);
label += " " + type;
}
if (name.length())
label += " " + name;
if (serial.length())
label += " " + serial;
args += ",label='" + label + + "'";
devices.push_back( args );
}