From 8308fb0eef44f3c4b8d349f7e7d7cdc11a0bd549 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 28 Jun 2011 16:05:08 -0700 Subject: usrp: got probe working w/ the new property tree --- host/utils/uhd_usrp_probe.cpp | 110 ++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 57 deletions(-) (limited to 'host/utils') diff --git a/host/utils/uhd_usrp_probe.cpp b/host/utils/uhd_usrp_probe.cpp index 441f657d0..0605aa621 100644 --- a/host/utils/uhd_usrp_probe.cpp +++ b/host/utils/uhd_usrp_probe.cpp @@ -18,13 +18,8 @@ #include #include #include +#include #include //for split -#include -#include -#include -#include -#include -#include #include #include #include @@ -56,17 +51,15 @@ static std::string make_border(const std::string &text){ return ss.str(); } -static std::string get_dsp_pp_string(const std::string &type, wax::obj dsp){ +static std::string get_dsp_pp_string(const std::string &type, property_tree::sptr tree, const property_tree::path_type &path){ std::stringstream ss; - ss << boost::format("%s DSP: %s") % type % dsp[usrp::DSP_PROP_NAME].as() << std::endl; + ss << boost::format("%s DSP: %s") % type % path.leaf() << std::endl; //ss << std::endl; - ss << boost::format("Codec Rate: %f Msps") % (dsp[usrp::DSP_PROP_CODEC_RATE].as()/1e6) << std::endl; - //ss << boost::format("Host Rate: %f Msps") % (dsp[usrp::DSP_PROP_HOST_RATE].as()/1e6) << std::endl; - //ss << boost::format("Freq Shift: %f Mhz") % (dsp[usrp::DSP_PROP_FREQ_SHIFT].as()/1e6) << std::endl; + ss << boost::format("DSP Rate: %f Msps") % (tree->access(path.branch_path().branch_path() / "tick_rate").get()/1e6) << std::endl; return ss.str(); } -static std::string prop_names_to_pp_string(const prop_names_t &prop_names){ +static std::string prop_names_to_pp_string(const std::vector &prop_names){ std::stringstream ss; size_t count = 0; BOOST_FOREACH(const std::string &prop_name, prop_names){ ss << ((count++)? ", " : "") << prop_name; @@ -74,98 +67,99 @@ static std::string prop_names_to_pp_string(const prop_names_t &prop_names){ return ss.str(); } -static std::string get_subdev_pp_string(const std::string &type, wax::obj subdev){ +static std::string get_subdev_pp_string(const std::string &type, property_tree::sptr tree, const property_tree::path_type &path){ std::stringstream ss; - ss << boost::format("%s Subdev: %s") % type % subdev[usrp::SUBDEV_PROP_NAME].as() << std::endl; + ss << boost::format("%s Subdev: %s") % type % path.leaf() << std::endl; //ss << std::endl; - prop_names_t ant_names(subdev[usrp::SUBDEV_PROP_ANTENNA_NAMES].as()); - ss << boost::format("Antennas: %s") % prop_names_to_pp_string(ant_names) << std::endl; + ss << boost::format("Name: %s") % (tree->access(path / "name").get()) << std::endl; + ss << boost::format("Antennas: %s") % prop_names_to_pp_string(tree->access >(path / "antenna/options").get()) << std::endl; - freq_range_t freq_range(subdev[usrp::SUBDEV_PROP_FREQ_RANGE].as()); + meta_range_t freq_range = tree->access(path / "freq/range").get(); ss << boost::format("Freq range: %.3f to %.3f Mhz") % (freq_range.start()/1e6) % (freq_range.stop()/1e6) << std::endl; - prop_names_t gain_names(subdev[usrp::SUBDEV_PROP_GAIN_NAMES].as()); + std::vector gain_names = tree->list(path / "gains"); if (gain_names.size() == 0) ss << "Gain Elements: None" << std::endl; - BOOST_FOREACH(const std::string &gain_name, gain_names){ - gain_range_t gain_range(subdev[named_prop_t(usrp::SUBDEV_PROP_GAIN_RANGE, gain_name)].as()); - ss << boost::format("Gain range %s: %.1f to %.1f step %.1f dB") % gain_name % gain_range.start() % gain_range.stop() % gain_range.step() << std::endl; + BOOST_FOREACH(const std::string &name, gain_names){ + meta_range_t gain_range = tree->access(path / "gains" / name / "range").get(); + ss << boost::format("Gain range %s: %.1f to %.1f step %.1f dB") % name % gain_range.start() % gain_range.stop() % gain_range.step() << std::endl; } - ss << boost::format("Connection Type: %c") % char(subdev[usrp::SUBDEV_PROP_CONNECTION].as()) << std::endl; - ss << boost::format("Uses LO offset: %s") % (subdev[usrp::SUBDEV_PROP_USE_LO_OFFSET].as()? "Yes" : "No") << std::endl; + ss << boost::format("Connection Type: %s") % (tree->access(path / "connection").get()) << std::endl; + ss << boost::format("Uses LO offset: %s") % ((tree->access(path / "use_lo_offset").get())? "Yes" : "No") << std::endl; return ss.str(); } -static std::string get_codec_pp_string(const std::string &type, wax::obj codec){ +static std::string get_codec_pp_string(const std::string &type, property_tree::sptr tree, const property_tree::path_type &path){ std::stringstream ss; - ss << boost::format("%s Codec: %s") % type % codec[usrp::CODEC_PROP_NAME].as() << std::endl; + ss << boost::format("%s Codec: %s") % type % path.leaf() << std::endl; //ss << std::endl; - prop_names_t gain_names(codec[usrp::CODEC_PROP_GAIN_NAMES].as()); + + ss << boost::format("Name: %s") % (tree->access(path / "name").get()) << std::endl; + std::vector gain_names = tree->list(path / "gains"); if (gain_names.size() == 0) ss << "Gain Elements: None" << std::endl; - BOOST_FOREACH(const std::string &gain_name, gain_names){ - gain_range_t gain_range(codec[named_prop_t(usrp::CODEC_PROP_GAIN_RANGE, gain_name)].as()); - ss << boost::format("Gain range %s: %.1f to %.1f step %.1f dB") % gain_name % gain_range.start() % gain_range.stop() % gain_range.step() << std::endl; + BOOST_FOREACH(const std::string &name, gain_names){ + meta_range_t gain_range = tree->access(path / "gains" / name / "range").get(); + ss << boost::format("Gain range %s: %.1f to %.1f step %.1f dB") % name % gain_range.start() % gain_range.stop() % gain_range.step() << std::endl; } return ss.str(); } -static std::string get_dboard_pp_string(const std::string &type, wax::obj dboard){ +static std::string get_dboard_pp_string(const std::string &type, property_tree::sptr tree, const property_tree::path_type &path){ std::stringstream ss; - ss << boost::format("%s Dboard: %s") % type % dboard[usrp::DBOARD_PROP_NAME].as() << std::endl; + ss << boost::format("%s Dboard: %s") % type % path.leaf() << std::endl; //ss << std::endl; - usrp::dboard_eeprom_t db_eeprom = dboard[usrp::DBOARD_PROP_DBOARD_EEPROM].as(); + const std::string prefix = (type == "RX")? "rx" : "tx"; + usrp::dboard_eeprom_t db_eeprom = tree->access(path / (prefix + "_eeprom")).get(); if (db_eeprom.id != usrp::dboard_id_t::none()) ss << boost::format("ID: %s") % db_eeprom.id.to_pp_string() << std::endl; if (not db_eeprom.serial.empty()) ss << boost::format("Serial: %s") % db_eeprom.serial << std::endl; if (type == "TX"){ - usrp::dboard_eeprom_t gdb_eeprom = dboard[usrp::DBOARD_PROP_GBOARD_EEPROM].as(); - if (gdb_eeprom.id != usrp::dboard_id_t::none()) ss << boost::format("GDB ID: %s") % gdb_eeprom.id.to_pp_string() << std::endl; - if (not gdb_eeprom.serial.empty()) ss << boost::format("GDB Serial: %s") % gdb_eeprom.serial << std::endl; + usrp::dboard_eeprom_t gdb_eeprom = tree->access(path / "gdb_eeprom").get(); + if (gdb_eeprom.id != usrp::dboard_id_t::none()) ss << boost::format("ID: %s") % gdb_eeprom.id.to_pp_string() << std::endl; + if (not gdb_eeprom.serial.empty()) ss << boost::format("Serial: %s") % gdb_eeprom.serial << std::endl; } - BOOST_FOREACH(const std::string &subdev_name, dboard[usrp::DBOARD_PROP_SUBDEV_NAMES].as()){ - ss << make_border(get_subdev_pp_string(type, dboard[named_prop_t(usrp::DBOARD_PROP_SUBDEV, subdev_name)])); + BOOST_FOREACH(const std::string &name, tree->list(path / (prefix + "_frontends"))){ + ss << make_border(get_subdev_pp_string(type, tree, path / (prefix + "_frontends") / name)); } - ss << make_border(get_codec_pp_string(type, dboard[usrp::DBOARD_PROP_CODEC])); + ss << make_border(get_codec_pp_string(type, tree, path.branch_path().branch_path() / (prefix + "_codecs") / path.leaf())); return ss.str(); } -static std::string get_mboard_pp_string(wax::obj mboard){ +static std::string get_mboard_pp_string(property_tree::sptr tree, const property_tree::path_type &path){ std::stringstream ss; - ss << boost::format("Mboard: %s") % mboard[usrp::MBOARD_PROP_NAME].as() << std::endl; + ss << boost::format("Mboard: %s") % (tree->access(path / "name").get()) << std::endl; //ss << std::endl; - usrp::mboard_eeprom_t mb_eeprom = mboard[usrp::MBOARD_PROP_EEPROM_MAP].as(); + usrp::mboard_eeprom_t mb_eeprom = tree->access(path / "eeprom").get(); BOOST_FOREACH(const std::string &key, mb_eeprom.keys()){ if (not mb_eeprom[key].empty()) ss << boost::format("%s: %s") % key % mb_eeprom[key] << std::endl; } - BOOST_FOREACH(const std::string &dsp_name, mboard[usrp::MBOARD_PROP_RX_DSP_NAMES].as()){ - ss << make_border(get_dsp_pp_string("RX", mboard[named_prop_t(usrp::MBOARD_PROP_RX_DSP, dsp_name)])); + BOOST_FOREACH(const std::string &name, tree->list(path / "rx_dsps")){ + ss << make_border(get_dsp_pp_string("RX", tree, path / "rx_dsps" / name)); } - BOOST_FOREACH(const std::string &db_name, mboard[usrp::MBOARD_PROP_RX_DBOARD_NAMES].as()){ - ss << make_border(get_dboard_pp_string("RX", mboard[named_prop_t(usrp::MBOARD_PROP_RX_DBOARD, db_name)])); + BOOST_FOREACH(const std::string &name, tree->list(path / "dboards")){ + ss << make_border(get_dboard_pp_string("RX", tree, path / "dboards" / name)); } - BOOST_FOREACH(const std::string &dsp_name, mboard[usrp::MBOARD_PROP_TX_DSP_NAMES].as()){ - ss << make_border(get_dsp_pp_string("TX", mboard[named_prop_t(usrp::MBOARD_PROP_TX_DSP, dsp_name)])); + BOOST_FOREACH(const std::string &name, tree->list(path / "tx_dsps")){ + ss << make_border(get_dsp_pp_string("TX", tree, path / "tx_dsps" / name)); } - BOOST_FOREACH(const std::string &db_name, mboard[usrp::MBOARD_PROP_TX_DBOARD_NAMES].as()){ - ss << make_border(get_dboard_pp_string("TX", mboard[named_prop_t(usrp::MBOARD_PROP_TX_DBOARD, db_name)])); + BOOST_FOREACH(const std::string &name, tree->list(path / "dboards")){ + ss << make_border(get_dboard_pp_string("TX", tree, path / "dboards" / name)); } return ss.str(); } -static std::string get_device_pp_string(device::sptr dev){ +static std::string get_device_pp_string(property_tree::sptr tree){ std::stringstream ss; - ss << boost::format("Device: %s") % (*dev)[usrp::DEVICE_PROP_NAME].as() << std::endl; + ss << boost::format("Device: %s") % (tree->access("/name").get()) << std::endl; //ss << std::endl; - BOOST_FOREACH(const std::string &mboard_name, (*dev)[usrp::DEVICE_PROP_MBOARD_NAMES].as()){ - ss << make_border(get_mboard_pp_string((*dev)[named_prop_t(usrp::DEVICE_PROP_MBOARD, mboard_name)])); + BOOST_FOREACH(const std::string &name, tree->list("/mboards")){ + ss << make_border(get_mboard_pp_string(tree, "/mboards/" + name)); } return ss.str(); } -#include - void print_tree(const uhd::property_tree::path_type &path, uhd::property_tree::sptr tree){ std::cout << path << std::endl; BOOST_FOREACH(const std::string &name, tree->list(path)){ @@ -178,6 +172,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ desc.add_options() ("help", "help message") ("args", po::value()->default_value(""), "device address args") + ("tree", "specify to print a complete property tree") ; po::variables_map vm; @@ -191,9 +186,10 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){ } device::sptr dev = device::make(vm["args"].as()); + property_tree::sptr tree = (*dev)[0].as(); - //std::cout << make_border(get_device_pp_string(dev)) << std::endl; - print_tree("/", (*dev)[0].as()); + if (vm.count("tree") != 0) print_tree("/", tree); + else std::cout << make_border(get_device_pp_string(tree)) << std::endl; return 0; } -- cgit v1.2.3