diff options
| author | Josh Blum <josh@joshknows.com> | 2011-06-22 07:41:56 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-06-22 07:41:56 -0700 |
| commit | cad0b57a94c8dc01cd322435259877dbffc26be8 (patch) | |
| tree | 2f70d745518d6f2637ec59627d3f942214860d28 /host/include | |
| parent | b7f6d905af5993f6c0b554777ab2a4559a36db15 (diff) | |
| parent | ab63a540883bf4c21980ac30b746045e00fffc0a (diff) | |
| download | uhd-cad0b57a94c8dc01cd322435259877dbffc26be8.tar.gz uhd-cad0b57a94c8dc01cd322435259877dbffc26be8.tar.bz2 uhd-cad0b57a94c8dc01cd322435259877dbffc26be8.zip | |
Merge branch 'gps_work'
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/usrp/gps_ctrl.hpp | 14 |
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 |