summaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
authorNick Foster <nick@ettus.com>2011-06-17 13:01:07 -0700
committerNick Foster <nick@ettus.com>2011-06-17 13:35:40 -0700
commit7af605b247ee9331c29c23229252a101b7d40352 (patch)
tree47d8472fc9954b5fdc56de7439523bcc07e06e01 /host/include
parente4e96f2bc406d94d981f5256c972f3d3c4b81fce (diff)
downloaduhd-7af605b247ee9331c29c23229252a101b7d40352.tar.gz
uhd-7af605b247ee9331c29c23229252a101b7d40352.tar.bz2
uhd-7af605b247ee9331c29c23229252a101b7d40352.zip
UHD: GPS work.
* Rewrote NMEA acquisition to be more general * Added GPS sensors instead of member fns for data access * GPS sensors added to mboard sensors to keep ABI compat * VITA time initialized to GPS time on init
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/usrp/gps_ctrl.hpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/host/include/uhd/usrp/gps_ctrl.hpp b/host/include/uhd/usrp/gps_ctrl.hpp
index bd679b165..6ff00e03c 100644
--- a/host/include/uhd/usrp/gps_ctrl.hpp
+++ b/host/include/uhd/usrp/gps_ctrl.hpp
@@ -22,6 +22,8 @@
#include <boost/utility.hpp>
#include <boost/function.hpp>
#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <vector>
+#include <uhd/types/sensors.hpp>
using namespace boost::posix_time;
@@ -38,16 +40,14 @@ public:
static sptr make(gps_send_fn_t, gps_recv_fn_t);
/*!
- * Get the current GPS time and date
- * \return current GPS time and date as boost::posix_time::ptime object
+ * Retrieve the list of sensors this GPS object provides
*/
- virtual ptime get_time(void) = 0;
-
+ virtual std::vector<std::string> get_sensors(void) = 0;
+
/*!
- * Get the epoch time (as time_t, which is int)
- * \return current GPS time and date as time_t
+ * Retrieve the named sensor
*/
- virtual time_t get_epoch_time(void) = 0;
+ virtual uhd::sensor_value_t get_sensor(std::string key) = 0;
/*!
* Tell you if there's a supported GPS connected or not