diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-05-04 16:25:55 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-05-04 16:25:55 -0700 |
| commit | 47ba30d96b41e7824d059e29b3e5e640b4cab21f (patch) | |
| tree | 58b94ee1ae86b4de1911edc3400b549de87ead0d /host/lib/usrp | |
| parent | eb9cfef46721a212c3e0340035d9ef7a8128e7f0 (diff) | |
| parent | 96f044e2734b6bac56f54537d5b1ccd104ae4a1d (diff) | |
| download | uhd-47ba30d96b41e7824d059e29b3e5e640b4cab21f.tar.gz uhd-47ba30d96b41e7824d059e29b3e5e640b4cab21f.tar.bz2 uhd-47ba30d96b41e7824d059e29b3e5e640b4cab21f.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/e300/e300_impl.cpp | 4 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_ublox_control_impl.cpp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp index 76e0bc2e2..4f3b9866a 100644 --- a/host/lib/usrp/e300/e300_impl.cpp +++ b/host/lib/usrp/e300/e300_impl.cpp @@ -573,6 +573,10 @@ e300_impl::e300_impl(const uhd::device_addr_t &device_addr) } _tree->access<subdev_spec_t>(mb_path / "rx_subdev_spec").set(rx_spec); _tree->access<subdev_spec_t>(mb_path / "tx_subdev_spec").set(tx_spec); + + UHD_MSG(status) << "Initializing time to the internal GPSDO" << std::endl; + const time_t tp = time_t(_sensor_manager->get_sensor("gps_time").to_int()+1); + _tree->access<time_spec_t>(mb_path / "time" / "pps").set(time_spec_t(tp)); } boost::uint8_t e300_impl::_get_internal_gpio(gpio_core_200::sptr gpio) diff --git a/host/lib/usrp/e300/e300_ublox_control_impl.cpp b/host/lib/usrp/e300/e300_ublox_control_impl.cpp index 0f56fdb67..389bf79fa 100644 --- a/host/lib/usrp/e300/e300_ublox_control_impl.cpp +++ b/host/lib/usrp/e300/e300_ublox_control_impl.cpp @@ -65,7 +65,10 @@ std::vector<std::string> control_impl::get_sensors(void) uhd::sensor_value_t control_impl::get_sensor(std::string key) { if (key == "gps_time") { - return sensor_value_t("GPS epoch time", int(_get_epoch_time()), "seconds"); + bool lock; + _locked.wait_and_see(lock); + return sensor_value_t("GPS epoch time", + lock ? int(_get_epoch_time()) : 0, "seconds"); } else if (key == "gps_locked") { bool lock; _locked.wait_and_see(lock); @@ -83,9 +86,6 @@ std::time_t control_impl::_get_epoch_time(void) control_impl::~control_impl(void) { - // turn it all off again - configure_antenna(0x001a, 0x8251); - configure_pps(0xf4240, 0x3d090, 1, 1, 0, 0, 0, 0); } void control_impl::_decode_init(void) |