gr-uhd: get_usrp_info has help info and can only be called with a recent enough version of UHD

Author: ncorgan

gr-uhd/include/gr_uhd_usrp_sink.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 Free Software Foundation, Inc.
+ * Copyright 2010-2012 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -130,7 +130,13 @@ class GR_UHD_API uhd_usrp_sink : virtual public gr_sync_block{
      */
     virtual void set_start_time(const uhd::time_spec_t &time) = 0;
 
-    virtual std::vector<std::string> list_property_tree(const std::string &path) = 0;
+    /*!
+     * Returns identifying information about this USRP's configuration.
+     * Returns motherboard ID and serial.
+     * Returns daughterboard TX/RX ID, subdev name, and serial.
+     * \param mboard the motherboard index 0 to M-1
+     * \param chan channel index 0 to N-1
+     */
     virtual uhd::dict<std::string, std::string> get_usrp_info(size_t mboard = 0, size_t chan = 0) = 0;
 
     /*!

gr-uhd/include/gr_uhd_usrp_source.h

@@ -122,7 +122,13 @@ class GR_UHD_API uhd_usrp_source : virtual public gr_sync_block{
      */
     virtual void set_start_time(const uhd::time_spec_t &time) = 0;
 
-    virtual std::vector<std::string> list_property_tree(const std::string &path) = 0;
+    /*!
+     * Returns identifying information about this USRP's configuration.
+     * Returns motherboard ID and serial.
+     * Returns daughterboard TX/RX ID, subdev name, and serial.
+     * \param mboard the motherboard index 0 to M-1
+     * \param chan channel index 0 to N-1
+     */
     virtual uhd::dict<std::string, std::string> get_usrp_info(size_t mboard = 0, size_t chan = 0) = 0;
 
     /*!

gr-uhd/lib/gr_uhd_usrp_sink.cc

@@ -66,12 +66,12 @@ class uhd_usrp_sink_impl : public uhd_usrp_sink{
         _dev = uhd::usrp::multi_usrp::make(device_addr);
     }
 
-    std::vector<std::string> list_property_tree(const std::string &path){
-        return _dev->list_property_tree(path);
-    }
-
     uhd::dict<std::string, std::string> 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){

gr-uhd/lib/gr_uhd_usrp_source.cc

@@ -70,12 +70,12 @@ class uhd_usrp_source_impl : public uhd_usrp_source{
         _dev = uhd::usrp::multi_usrp::make(device_addr);
     }
 
-    std::vector<std::string> list_property_tree(const std::string &path){
-        return _dev->list_property_tree(path);
-    }
-
     uhd::dict<std::string, std::string> 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){

gr-uhd/swig/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2011 Free Software Foundation, Inc.
+# Copyright 2010-2012 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 

gr-uhd/swig/uhd_swig.i

@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2010-2011 Free Software Foundation, Inc.
+ * Copyright 2010-2012 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  *