Merge branch 'master' into 8psk

2 files changed, 32 insertions, 0 deletions

diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc
index d44af25ab..ce9d89d8d 100644
--- a/gr-uhd/lib/gr_uhd_usrp_sink.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc
@@ -76,14 +76,30 @@ public:
         return _dev->set_tx_gain(gain, chan);
     }
 
+    void set_gain(double gain, const std::string &name, size_t chan){
+        return _dev->set_tx_gain(gain, name, chan);
+    }
+
     double get_gain(size_t chan){
         return _dev->get_tx_gain(chan);
     }
 
+    double get_gain(const std::string &name, size_t chan){
+        return _dev->get_tx_gain(name, chan);
+    }
+
+    std::vector<std::string> get_gain_names(size_t chan){
+        return _dev->get_tx_gain_names(chan);
+    }
+
     uhd::gain_range_t get_gain_range(size_t chan){
         return _dev->get_tx_gain_range(chan);
     }
 
+    uhd::gain_range_t get_gain_range(const std::string &name, size_t chan){
+        return _dev->get_tx_gain_range(name, chan);
+    }
+
     void set_antenna(const std::string &ant, size_t chan){
         return _dev->set_tx_antenna(ant, chan);
     }
diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc
index fed8e6624..9983489c3 100644
--- a/gr-uhd/lib/gr_uhd_usrp_source.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_source.cc
@@ -78,14 +78,30 @@ public:
         return _dev->set_rx_gain(gain, chan);
     }
 
+    void set_gain(double gain, const std::string &name, size_t chan){
+        return _dev->set_rx_gain(gain, name, chan);
+    }
+
     double get_gain(size_t chan){
         return _dev->get_rx_gain(chan);
     }
 
+    double get_gain(const std::string &name, size_t chan){
+        return _dev->get_rx_gain(name, chan);
+    }
+
+    std::vector<std::string> get_gain_names(size_t chan){
+        return _dev->get_rx_gain_names(chan);
+    }
+
     uhd::gain_range_t get_gain_range(size_t chan){
         return _dev->get_rx_gain_range(chan);
     }
 
+    uhd::gain_range_t get_gain_range(const std::string &name, size_t chan){
+        return _dev->get_rx_gain_range(name, chan);
+    }
+
     void set_antenna(const std::string &ant, size_t chan){
         return _dev->set_rx_antenna(ant, chan);
     }