1 files changed, 54 insertions, 0 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp
index 175633c4c..eab8c5283 100644
--- a/host/lib/usrp/multi_usrp.cpp
+++ b/host/lib/usrp/multi_usrp.cpp
@@ -431,6 +431,9 @@ public:
      ******************************************************************/
     void set_master_clock_rate(double rate, size_t mboard){
         if (mboard != ALL_MBOARDS){
+            if (_tree->exists(mb_root(mboard) / "auto_tick_rate")) {
+                _tree->access<bool>(mb_root(mboard) / "auto_tick_rate").set(false);
+            }
             _tree->access<double>(mb_root(mboard) / "tick_rate").set(rate);
             return;
         }
@@ -828,6 +831,16 @@ public:
         }
     }
 
+    void set_normalized_rx_gain(double gain, size_t chan = 0)
+    {
+      if (gain > 1.0 || gain < 0.0) {
+        throw uhd::runtime_error("Normalized gain out of range, must be in [0, 1].");
+      }
+      gain_range_t gain_range = get_rx_gain_range(ALL_GAINS, chan);
+      double abs_gain = (gain * (gain_range.stop() - gain_range.start())) + gain_range.start();
+      set_rx_gain(abs_gain, ALL_GAINS, chan);
+    }
+
     double get_rx_gain(const std::string &name, size_t chan){
         try {
             return rx_gain_group(chan)->get_value(name);
@@ -836,6 +849,21 @@ public:
         }
     }
 
+    double get_normalized_rx_gain(size_t chan)
+    {
+      gain_range_t gain_range = get_rx_gain_range(ALL_GAINS, chan);
+      double gain_range_width = gain_range.stop() - gain_range.start();
+      // In case we have a device without a range of gains:
+      if (gain_range_width == 0.0) {
+          return 0;
+      }
+      double norm_gain = (get_rx_gain(ALL_GAINS, chan) - gain_range.start()) / gain_range_width;
+      // Avoid rounding errors:
+      if (norm_gain > 1.0) return 1.0;
+      if (norm_gain < 0.0) return 0.0;
+      return norm_gain;
+    }
+
     gain_range_t get_rx_gain_range(const std::string &name, size_t chan){
         try {
             return rx_gain_group(chan)->get_range(name);
@@ -1029,6 +1057,17 @@ public:
         }
     }
 
+    void set_normalized_tx_gain(double gain, size_t chan = 0)
+    {
+      if (gain > 1.0 || gain < 0.0) {
+        throw uhd::runtime_error("Normalized gain out of range, must be in [0, 1].");
+      }
+      gain_range_t gain_range = get_tx_gain_range(ALL_GAINS, chan);
+      double abs_gain = (gain * (gain_range.stop() - gain_range.start())) + gain_range.start();
+      set_tx_gain(abs_gain, ALL_GAINS, chan);
+    }
+
+
     double get_tx_gain(const std::string &name, size_t chan){
         try {
             return tx_gain_group(chan)->get_value(name);
@@ -1037,6 +1076,21 @@ public:
         }
     }
 
+    double get_normalized_tx_gain(size_t chan)
+    {
+      gain_range_t gain_range = get_tx_gain_range(ALL_GAINS, chan);
+      double gain_range_width = gain_range.stop() - gain_range.start();
+      // In case we have a device without a range of gains:
+      if (gain_range_width == 0.0) {
+          return 0.0;
+      }
+      double norm_gain = (get_rx_gain(ALL_GAINS, chan) - gain_range.start()) / gain_range_width;
+      // Avoid rounding errors:
+      if (norm_gain > 1.0) return 1.0;
+      if (norm_gain < 0.0) return 0.0;
+      return norm_gain;
+    }
+
     gain_range_t get_tx_gain_range(const std::string &name, size_t chan){
         try {
             return tx_gain_group(chan)->get_range(name);