From c5ad101e0f93b26521507672813ef28ea533482a Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Tue, 3 Apr 2012 15:53:33 -0700 Subject: gr-uhd: uhd_usrp_source and uhd_usrp_sink can now multi_usrp's list_property_tree and get_usrp_info functions --- gr-uhd/lib/gr_uhd_usrp_sink.cc | 8 ++++++++ gr-uhd/lib/gr_uhd_usrp_source.cc | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'gr-uhd/lib') diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc index 7e7875898..a35474664 100644 --- a/gr-uhd/lib/gr_uhd_usrp_sink.cc +++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc @@ -66,6 +66,14 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } + std::vector list_property_tree(const std::string &path){ + return _dev->list_property_tree(path); + } + + uhd::dict get_usrp_info(size_t mboard, size_t chan){ + return _dev->get_usrp_info(mboard, chan); + } + void set_subdev_spec(const std::string &spec, size_t mboard){ return _dev->set_tx_subdev_spec(spec, mboard); } diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc index bd7f4e21d..fd0cf9d94 100644 --- a/gr-uhd/lib/gr_uhd_usrp_source.cc +++ b/gr-uhd/lib/gr_uhd_usrp_source.cc @@ -70,6 +70,14 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } + std::vector list_property_tree(const std::string &path){ + return _dev->list_property_tree(path); + } + + uhd::dict get_usrp_info(size_t mboard, size_t chan){ + return _dev->get_usrp_info(mboard, chan); + } + void set_subdev_spec(const std::string &spec, size_t mboard){ return _dev->set_rx_subdev_spec(spec, mboard); } -- cgit From 20a083fe0f7990b8796e2e7816687d6c89bda981 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Tue, 3 Apr 2012 16:56:38 -0700 Subject: gr-uhd: get_usrp_info has help info and can only be called with a recent enough version of UHD --- gr-uhd/lib/gr_uhd_usrp_sink.cc | 8 ++++---- gr-uhd/lib/gr_uhd_usrp_source.cc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gr-uhd/lib') diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc index a35474664..66be056df 100644 --- a/gr-uhd/lib/gr_uhd_usrp_sink.cc +++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc @@ -66,12 +66,12 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } - std::vector list_property_tree(const std::string &path){ - return _dev->list_property_tree(path); - } - uhd::dict get_usrp_info(size_t mboard, size_t chan){ + #ifdef UHD_USRP_MULTI_USRP_GET_USRP_INFO_API return _dev->get_usrp_info(mboard, chan); + #else + throw std::runtime_error("not implemented in this version"); + #endif } void set_subdev_spec(const std::string &spec, size_t mboard){ diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc index fd0cf9d94..ba87ae8e0 100644 --- a/gr-uhd/lib/gr_uhd_usrp_source.cc +++ b/gr-uhd/lib/gr_uhd_usrp_source.cc @@ -70,12 +70,12 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } - std::vector list_property_tree(const std::string &path){ - return _dev->list_property_tree(path); - } - uhd::dict get_usrp_info(size_t mboard, size_t chan){ + #ifdef UHD_USRP_MULTI_USRP_GET_USRP_INFO_API return _dev->get_usrp_info(mboard, chan); + #else + throw std::runtime_error("not implemented in this version"); + #endif } void set_subdev_spec(const std::string &spec, size_t mboard){ -- cgit From 27dd737afdab4123e40a1b886635b387b3c063c6 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 4 Apr 2012 16:56:14 -0700 Subject: gr-uhd: uhd_siggen, uhd_siggen_gui, and uhd_fft include information on the user's UHD version and USRP configuration --- gr-uhd/lib/gr_uhd_usrp_sink.cc | 8 ++++++-- gr-uhd/lib/gr_uhd_usrp_source.cc | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'gr-uhd/lib') diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc index 66be056df..d86165f65 100644 --- a/gr-uhd/lib/gr_uhd_usrp_sink.cc +++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc @@ -66,9 +66,9 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } - uhd::dict get_usrp_info(size_t mboard, size_t chan){ + uhd::dict get_usrp_tx_info(size_t chan){ #ifdef UHD_USRP_MULTI_USRP_GET_USRP_INFO_API - return _dev->get_usrp_info(mboard, chan); + return _dev->get_usrp_tx_info(chan); #else throw std::runtime_error("not implemented in this version"); #endif @@ -78,6 +78,10 @@ public: return _dev->set_tx_subdev_spec(spec, mboard); } + std::string get_subdev_spec(size_t mboard){ + return _dev->get_tx_subdev_spec(mboard).to_string(); + } + void set_samp_rate(double rate){ _dev->set_tx_rate(rate); _sample_rate = this->get_samp_rate(); diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc index ba87ae8e0..49558cee6 100644 --- a/gr-uhd/lib/gr_uhd_usrp_source.cc +++ b/gr-uhd/lib/gr_uhd_usrp_source.cc @@ -70,9 +70,9 @@ public: _dev = uhd::usrp::multi_usrp::make(device_addr); } - uhd::dict get_usrp_info(size_t mboard, size_t chan){ + uhd::dict get_usrp_rx_info(size_t chan){ #ifdef UHD_USRP_MULTI_USRP_GET_USRP_INFO_API - return _dev->get_usrp_info(mboard, chan); + return _dev->get_usrp_rx_info(chan); #else throw std::runtime_error("not implemented in this version"); #endif @@ -82,6 +82,10 @@ public: return _dev->set_rx_subdev_spec(spec, mboard); } + std::string get_subdev_spec(size_t mboard){ + return _dev->get_rx_subdev_spec(mboard).to_string(); + } + void set_samp_rate(double rate){ _dev->set_rx_rate(rate); } -- cgit