aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Braun <martin.braun@ettus.com>2018-03-01 11:58:36 -0800
committerMartin Braun <martin.braun@ettus.com>2018-03-02 13:48:14 -0800
commitd04b6e3a62e2ad213ef3ac8ce80649d1932a6e04 (patch)
tree4b3d8218d1eedbca9d94fddbe4125e76295359d4
parent0cb30c8412385982e5af856e7dc90609c0ad9760 (diff)
downloaduhd-d04b6e3a62e2ad213ef3ac8ce80649d1932a6e04.tar.gz
uhd-d04b6e3a62e2ad213ef3ac8ce80649d1932a6e04.tar.bz2
uhd-d04b6e3a62e2ad213ef3ac8ce80649d1932a6e04.zip
mpm: uhd: RPC server reports MPM version, uhd_usrp_probe reads it
-rw-r--r--host/utils/uhd_usrp_probe.cpp3
-rw-r--r--mpm/python/usrp_mpm/rpc_server.py1
2 files changed, 4 insertions, 0 deletions
diff --git a/host/utils/uhd_usrp_probe.cpp b/host/utils/uhd_usrp_probe.cpp
index 42ec7c6a1..a838049e2 100644
--- a/host/utils/uhd_usrp_probe.cpp
+++ b/host/utils/uhd_usrp_probe.cpp
@@ -157,6 +157,9 @@ static std::string get_mboard_pp_string(property_tree::sptr tree, const fs_path
if (tree->exists(path / "fw_version")){
ss << "FW Version: " << tree->access<std::string>(path / "fw_version").get() << std::endl;
}
+ if (tree->exists(path / "mpm_version")){
+ ss << "MPM Version: " << tree->access<std::string>(path / "mpm_version").get() << std::endl;
+ }
if (tree->exists(path / "fpga_version")){
ss << "FPGA Version: " << tree->access<std::string>(path / "fpga_version").get() << std::endl;
}
diff --git a/mpm/python/usrp_mpm/rpc_server.py b/mpm/python/usrp_mpm/rpc_server.py
index 4f8058f2f..3dbda4161 100644
--- a/mpm/python/usrp_mpm/rpc_server.py
+++ b/mpm/python/usrp_mpm/rpc_server.py
@@ -385,6 +385,7 @@ class MPMServer(RPCServer):
This is as safe method which can be called without a claim on the device
"""
info = self.periph_manager.get_device_info()
+ info["mpm_version"] = "{}.{}".format(*MPM_COMPAT_NUM)
if self.client_host in net.get_local_ip_addrs():
info["connection"] = "local"
else: