summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authorNick Foster <nick@ettus.com>2011-06-17 15:13:09 -0700
committerNick Foster <nick@ettus.com>2011-06-17 15:13:09 -0700
commit9101804e6b6d85b7cbdd582dba41c114358db407 (patch)
tree39f1665a6d0368a02de3bd5593c2ce6e0dce973c /host/lib/usrp
parent6f6364f73aad1262fdbe88ad97128f7844764c99 (diff)
downloaduhd-9101804e6b6d85b7cbdd582dba41c114358db407.tar.gz
uhd-9101804e6b6d85b7cbdd582dba41c114358db407.tar.bz2
uhd-9101804e6b6d85b7cbdd582dba41c114358db407.zip
USRP2/N210: set VITA time even if GPS not locked. harmless to do so.
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/gps_ctrl.cpp2
-rw-r--r--host/lib/usrp/usrp2/mboard_impl.cpp9
2 files changed, 3 insertions, 8 deletions
diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp
index 2c2843877..582334cae 100644
--- a/host/lib/usrp/gps_ctrl.cpp
+++ b/host/lib/usrp/gps_ctrl.cpp
@@ -199,7 +199,7 @@ public:
return false;
}
- return (toked[6] != "0"); //sorry, 2d fixes don't count =D
+ return (toked[6] != "0");
}
//return a list of supported sensors
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index 12fff96d0..61ceb95ca 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -184,13 +184,8 @@ usrp2_mboard_impl::usrp2_mboard_impl(
//initialize VITA time to GPS time
if( _gps_ctrl.get()
and _gps_ctrl->gps_detected()) {
- if(_gps_ctrl->get_sensor("gps_locked").to_bool()) {
- UHD_MSG(status) << "Setting device time to GPS time...\n";
- set_time_spec(time_spec_t(double(_gps_ctrl->get_sensor("gps_time").to_int()+1)), false);
- }
- else {
- UHD_MSG(status) << "GPS not locked to satellites. Not initializing VITA time.";
- }
+ UHD_MSG(status) << "Setting device time to GPS time...\n";
+ set_time_spec(time_spec_t(double(_gps_ctrl->get_sensor("gps_time").to_int()+1)), false);
}
}