aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/gps_ctrl.cpp
diff options
context:
space:
mode:
authormichael-west <michael.west@ettus.com>2017-01-26 12:53:36 -0800
committerMartin Braun <martin.braun@ettus.com>2017-01-30 09:36:38 +0100
commitc613c7edb41de76a667e106c0b31684ac890da03 (patch)
tree170346cf5e09ab5adf2d0eb194e352d822f6a408 /host/lib/usrp/gps_ctrl.cpp
parent7e11bd090058685c1477e4439e53eefe42979451 (diff)
downloaduhd-c613c7edb41de76a667e106c0b31684ac890da03.tar.gz
uhd-c613c7edb41de76a667e106c0b31684ac890da03.tar.bz2
uhd-c613c7edb41de76a667e106c0b31684ac890da03.zip
GPS: Improvements to query_gpsdo_sensor
- Reordered operations to make sure setting clock and time sources is first - Reduced delay waiting for ref lock - Added wait for GPSDO warm up - Made warning messages in gps_ctrl function into log messages to prevent unnecessary output
Diffstat (limited to 'host/lib/usrp/gps_ctrl.cpp')
-rw-r--r--host/lib/usrp/gps_ctrl.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/host/lib/usrp/gps_ctrl.cpp b/host/lib/usrp/gps_ctrl.cpp
index 28f5a28cd..f4a42af34 100644
--- a/host/lib/usrp/gps_ctrl.cpp
+++ b/host/lib/usrp/gps_ctrl.cpp
@@ -92,7 +92,7 @@ private:
sentences[which].get<2>() = true;
}
} catch(std::exception &e) {
- UHD_MSG(warning) << "get_sentence: " << e.what();
+ UHD_LOGV(often) << "get_sentence: " << e.what();
}
if (not sentence.empty() or now > exit_time)
@@ -134,7 +134,7 @@ private:
}
void update_cache() {
- if(not gps_detected() or (_gps_type != GPS_TYPE_INTERNAL_GPSDO)) {
+ if(not gps_detected()) {
return;
}
@@ -352,11 +352,11 @@ private:
return gps_time;
} catch(std::exception &e) {
- UHD_MSG(warning) << "get_time: " << e.what();
+ UHD_LOGV(often) << "get_time: " << e.what();
error_cnt++;
}
}
- throw uhd::value_error("Timeout after no valid message found");
+ throw uhd::value_error("get_time: Timeout after no valid message found");
return gps_time; //keep gcc from complaining
}
@@ -379,7 +379,7 @@ private:
else
return (get_token(reply, 6) != "0");
} catch(std::exception &e) {
- UHD_MSG(warning) << "locked: " << e.what();
+ UHD_LOGV(often) << "locked: " << e.what();
error_cnt++;
}
}