4 files changed, 55 insertions, 1 deletions
diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp
index ac6294d5a..ce94147e8 100644
--- a/host/lib/usrp/e300/e300_impl.cpp
+++ b/host/lib/usrp/e300/e300_impl.cpp
@@ -1028,6 +1028,8 @@ void e300_impl::_setup_radio(const size_t dspno)
         _tree->create<int>(rf_fe_path / "sensors"); //empty TODO
         _tree->create<sensor_value_t>(rf_fe_path / "sensors" / "lo_locked")
             .publish(boost::bind(&e300_impl::_get_fe_pll_lock, this, direction == "tx"));
+        _tree->create<sensor_value_t>(rf_fe_path / "sensors" / "temp")
+            .publish(boost::bind(&ad9361_ctrl::get_temperature, _codec_ctrl));
         BOOST_FOREACH(const std::string &name, ad9361_ctrl::get_gain_names(key))
         {
             _tree->create<meta_range_t>(rf_fe_path / "gains" / name / "range")
diff --git a/host/lib/usrp/e300/e300_network.cpp b/host/lib/usrp/e300/e300_network.cpp
index bb904773b..3396931e3 100644
--- a/host/lib/usrp/e300/e300_network.cpp
+++ b/host/lib/usrp/e300/e300_network.cpp
@@ -226,6 +226,14 @@ static void e300_codec_ctrl_tunnel(
                 break;
             case codec_xact_t::ACTION_GET_RSSI:
                 out->rssi = _codec_ctrl->get_rssi(which_str).to_real();
+            case codec_xact_t::ACTION_GET_TEMPERATURE:
+                out->temp = _codec_ctrl->get_temperature().to_real();
+                break;
+            case codec_xact_t::ACTION_SET_DC_OFFSET_AUTO:
+                _codec_ctrl->set_dc_offset_auto(which_str, in->use_dc_correction == 1);
+                break;
+            case codec_xact_t::ACTION_SET_IQ_BALANCE_AUTO:
+                _codec_ctrl->set_iq_balance_auto(which_str, in->use_iq_correction == 1);
                 break;
             default:
                 UHD_MSG(status) << "Got unknown request?!" << std::endl;
diff --git a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp
index ed8131e2f..15222a96a 100644
--- a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp
+++ b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp
@@ -116,10 +116,48 @@ public:
         _args.bits = uhd::htonx<boost::uint32_t>(0);
 
         _transact();
-
         return sensor_value_t("RSSI", _retval.rssi, "dB");
     }
 
+    sensor_value_t get_temperature()
+    {
+        _clear();
+        _args.action = uhd::htonx<boost::uint32_t>(transaction_t::ACTION_GET_TEMPERATURE);
+        _args.which  = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_NONE);  /*Unused*/
+        _args.bits = uhd::htonx<boost::uint32_t>(0);
+
+        _transact();
+        return sensor_value_t("temp", _retval.temp, "C");
+    }
+
+    void set_dc_offset_auto(const std::string &which, const bool on)
+    {
+        _clear();
+        _args.action = uhd::htonx<boost::uint32_t>(transaction_t::ACTION_SET_DC_OFFSET_AUTO);
+        if (which == "TX1")      _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX1);
+        else if (which == "TX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX2);
+        else if (which == "RX1") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX1);
+        else if (which == "RX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX2);
+        else throw std::runtime_error("e300_remote_codec_ctrl_impl incorrect chain string.");
+        _args.use_dc_correction = on ? 1 : 0;
+
+        _transact();
+    }
+
+    void set_iq_balance_auto(const std::string &which, const bool on)
+    {
+        _clear();
+       _args.action = uhd::htonx<boost::uint32_t>(transaction_t::ACTION_SET_IQ_BALANCE_AUTO);
+       if (which == "TX1")      _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX1);
+       else if (which == "TX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX2);
+       else if (which == "RX1") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX1);
+       else if (which == "RX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX2);
+       else throw std::runtime_error("e300_remote_codec_ctrl_impl incorrect chain string.");
+       _args.use_iq_correction = on ? 1 : 0;
+
+       _transact();
+    }
+
 private:
     void _transact() {
         {
diff --git a/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp b/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp
index cbc4b52d2..855ab0f42 100644
--- a/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp
+++ b/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp
@@ -34,6 +34,9 @@ public:
             double          gain;
             double          freq;
             double          rssi;
+            double          temp;
+            boost::uint32_t use_dc_correction;
+            boost::uint32_t use_iq_correction;
             boost::uint64_t bits;
         };
 
@@ -44,6 +47,9 @@ public:
         static const boost::uint32_t ACTION_TUNE                = 13;
         static const boost::uint32_t ACTION_SET_LOOPBACK        = 14;
         static const boost::uint32_t ACTION_GET_RSSI            = 15;
+        static const boost::uint32_t ACTION_GET_TEMPERATURE     = 16;
+        static const boost::uint32_t ACTION_SET_DC_OFFSET_AUTO  = 17;
+        static const boost::uint32_t ACTION_SET_IQ_BALANCE_AUTO = 18;
 
         //Values for "which"
         static const boost::uint32_t CHAIN_NONE = 0;