diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-03-27 13:35:27 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-03-27 13:35:27 -0700 |
| commit | 88ffeb35dadb3d10593be39c9eae2f90c4d7c008 (patch) | |
| tree | 4dc3fb96097260c3eb46e45ebba39c17efb3af7a /host/lib/usrp/e300/e300_sensor_manager.cpp | |
| parent | 5b285598d367b936caf91b615e30e90af8af2a5d (diff) | |
| parent | 1200721b696751edaceb70a332861f84fb8c16d5 (diff) | |
| download | uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.tar.gz uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.tar.bz2 uhd-88ffeb35dadb3d10593be39c9eae2f90c4d7c008.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/e300/e300_sensor_manager.cpp')
| -rw-r--r-- | host/lib/usrp/e300/e300_sensor_manager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/e300/e300_sensor_manager.cpp b/host/lib/usrp/e300/e300_sensor_manager.cpp index 95f31742b..527cfb91a 100644 --- a/host/lib/usrp/e300/e300_sensor_manager.cpp +++ b/host/lib/usrp/e300/e300_sensor_manager.cpp @@ -159,7 +159,7 @@ public: } UHD_ASSERT_THROW(uhd::ntohx<boost::uint32_t>(transaction.which) == GPS_FOUND); // TODO: Use proper serialization here ... - return static_cast<bool>(uhd::ntohx(transaction.value)); + return (uhd::ntohx(transaction.value) > 0); } uhd::sensor_value_t get_gps_lock(void) @@ -193,7 +193,7 @@ public: } UHD_ASSERT_THROW(uhd::ntohx<boost::uint32_t>(transaction.which) == GPS_LOCK); // TODO: Use proper serialization here ... - return sensor_value_t("GPS lock status", static_cast<bool>(uhd::ntohx(transaction.value)), "locked", "unlocked"); + return sensor_value_t("GPS lock status", (uhd::ntohx(transaction.value) > 0), "locked", "unlocked"); } uhd::sensor_value_t get_ref_lock(void) @@ -227,7 +227,7 @@ public: } UHD_ASSERT_THROW(uhd::ntohx<boost::uint32_t>(transaction.which) == REF_LOCK); // TODO: Use proper serialization here ... - return sensor_value_t("Ref", static_cast<bool>(uhd::ntohx(transaction.value)), "locked", "unlocked"); + return sensor_value_t("Ref", (uhd::ntohx(transaction.value) > 0), "locked", "unlocked"); } private: |