diff options
| author | Moritz Fischer <moritz.fischer@ettus.com> | 2015-05-01 12:17:10 -0700 |
|---|---|---|
| committer | Moritz Fischer <moritz.fischer@ettus.com> | 2015-05-01 13:46:53 -0700 |
| commit | 4d3b80c338f34d7dc9516e7cdff7782aaf922b9c (patch) | |
| tree | ce210cc24afe86f9eafa5abdd378d3c304d87f6c /host | |
| parent | 06fbb47dae3530c20202414d5c9e77626419079e (diff) | |
| download | uhd-4d3b80c338f34d7dc9516e7cdff7782aaf922b9c.tar.gz uhd-4d3b80c338f34d7dc9516e7cdff7782aaf922b9c.tar.bz2 uhd-4d3b80c338f34d7dc9516e7cdff7782aaf922b9c.zip | |
e300: gps: Keep antenna power supply and pps running all the time.
This is a change from behaviour so far. Before the GPS was only
on while UHD is running. This behaviour was confusing users,
and didn't match our other devices.
Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/e300/e300_impl.cpp | 6 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_ublox_control_impl.cpp | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp index 8a41d44cd..735f109b4 100644 --- a/host/lib/usrp/e300/e300_impl.cpp +++ b/host/lib/usrp/e300/e300_impl.cpp @@ -575,14 +575,14 @@ 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); - // GPS installed: use external ref, time, and init time spec - if (_sensor_manager->get_gps_found()) { + // gps installed: use time and init time spec + if (_sensor_manager->get_sensor("gps_locked").to_bool()) { _tree->access<std::string>(mb_path / "time_source" / "value").set("gpsdo"); 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)); } else { - //init to internal clock and time source + //init to internal time source _tree->access<std::string>(mb_path / "time_source/value").set("internal"); } } diff --git a/host/lib/usrp/e300/e300_ublox_control_impl.cpp b/host/lib/usrp/e300/e300_ublox_control_impl.cpp index 0f56fdb67..0b8a2048d 100644 --- a/host/lib/usrp/e300/e300_ublox_control_impl.cpp +++ b/host/lib/usrp/e300/e300_ublox_control_impl.cpp @@ -83,9 +83,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) |