diff options
| author | Josh Blum <josh@joshknows.com> | 2011-02-17 18:55:13 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-02-17 18:55:13 -0800 |
| commit | dd75aa585afb9e59fcbb61507ad1a44fa4a00d38 (patch) | |
| tree | be25749e4aac04e7832375254440e70f41ff7511 /host/lib/usrp/dboard/db_wbx.cpp | |
| parent | 1628434a32321f8af6355f5eb828e8b06da52b90 (diff) | |
| parent | 4613f454c781d258d6d9b210ff1b9043a2125981 (diff) | |
| download | uhd-dd75aa585afb9e59fcbb61507ad1a44fa4a00d38.tar.gz uhd-dd75aa585afb9e59fcbb61507ad1a44fa4a00d38.tar.bz2 uhd-dd75aa585afb9e59fcbb61507ad1a44fa4a00d38.zip | |
Merge branch 'sensors' into usrp2_dual_dsp
Conflicts:
host/include/uhd/usrp/dsp_props.hpp
host/include/uhd/usrp/mboard_props.hpp
Diffstat (limited to 'host/lib/usrp/dboard/db_wbx.cpp')
| -rw-r--r-- | host/lib/usrp/dboard/db_wbx.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/host/lib/usrp/dboard/db_wbx.cpp b/host/lib/usrp/dboard/db_wbx.cpp index 135997789..0bc2d0ca1 100644 --- a/host/lib/usrp/dboard/db_wbx.cpp +++ b/host/lib/usrp/dboard/db_wbx.cpp @@ -68,6 +68,7 @@ #include <uhd/types/dict.hpp> #include <uhd/usrp/subdev_props.hpp> #include <uhd/types/ranges.hpp> +#include <uhd/types/sensors.hpp> #include <uhd/utils/assert.hpp> #include <uhd/utils/static.hpp> #include <uhd/utils/algorithm.hpp> @@ -521,8 +522,13 @@ void wbx_xcvr::rx_get(const wax::obj &key_, wax::obj &val){ val = false; return; - case SUBDEV_PROP_LO_LOCKED: - val = this->get_locked(dboard_iface::UNIT_RX); + case SUBDEV_PROP_SENSOR: + UHD_ASSERT_THROW(key.name == "lo_locked"); + val = sensor_value_t("LO", this->get_locked(dboard_iface::UNIT_RX), "locked", "unlocked"); + return; + + case SUBDEV_PROP_SENSOR_NAMES: + val = prop_names_t(1, "lo_locked"); return; case SUBDEV_PROP_BANDWIDTH: @@ -622,8 +628,13 @@ void wbx_xcvr::tx_get(const wax::obj &key_, wax::obj &val){ val = false; return; - case SUBDEV_PROP_LO_LOCKED: - val = this->get_locked(dboard_iface::UNIT_TX); + case SUBDEV_PROP_SENSOR: + UHD_ASSERT_THROW(key.name == "lo_locked"); + val = sensor_value_t("LO", this->get_locked(dboard_iface::UNIT_TX), "locked", "unlocked"); + return; + + case SUBDEV_PROP_SENSOR_NAMES: + val = prop_names_t(1, "lo_locked"); return; case SUBDEV_PROP_BANDWIDTH: |