Skip to content

Commit 6d2fe70

Browse files
committed
changed logging to compile on melodic
1 parent 7ee1df3 commit 6d2fe70

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cuckoo_time_translator_algorithms/include/cuckoo_time_translator/AbstractAssert.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define AASSERT(x, message) \
77
do { \
88
if (!(x)) { \
9-
logError("ASSERTION %s FAILED: %s (%s:%d)", #x, message, __FILE__, __LINE__); \
9+
CONSOLE_BRIDGE_logError("ASSERTION %s FAILED: %s (%s:%d)", #x, message, __FILE__, __LINE__); \
1010
throw std::runtime_error(message); \
1111
} \
1212
} while (0)

cuckoo_time_translator_algorithms/src/KalmanOwt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ LocalTime KalmanOwt::updateAndTranslateToLocalTimestamp(const RemoteTime remoteT
7878
const double mahalDistance = sqrt(measurementResidual*measurementResidual*(1.0/S));
7979

8080
if(config.outlierThreshold && mahalDistance > config.outlierThreshold){
81-
logWarn("KalmanOwt: local_time=%f, remote_time=%f -> measurement_residual=%g, mahal_distance=%g!", localTimeSecs, remoteTimeTics, measurementResidual, mahalDistance);
81+
CONSOLE_BRIDGE_logWarn("KalmanOwt: local_time=%f, remote_time=%f -> measurement_residual=%g, mahal_distance=%g!", localTimeSecs, remoteTimeTics, measurementResidual, mahalDistance);
8282
} else {
8383
x_ = x_ + K * measurementResidual;
8484
P_ = (Eigen::Matrix2d::Identity() - K * H_) * P_;

cuckoo_time_translator_algorithms/src/TimestampUnwrapper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ void WrappingClockParameters::checkNewDeviceStamp(uint64_t wrapsCounter, uint64_
2828
maxStamp_ = std::max(newDeviceStamp, maxStamp_);
2929
if (newDeviceStamp >= wrapAroundNumber_){
3030
const uint64_t newWrapAroundNumber = newDeviceStamp + 1;
31-
logError("newDeviceStamp=%u is larger than wrapAroundNumber=%lu -> adapting wrapAroundNumber to %lu!", newDeviceStamp, wrapAroundNumber_, newWrapAroundNumber);
31+
CONSOLE_BRIDGE_logError("newDeviceStamp=%u is larger than wrapAroundNumber=%lu -> adapting wrapAroundNumber to %lu!", newDeviceStamp, wrapAroundNumber_, newWrapAroundNumber);
3232
wrapAroundNumber_ = newWrapAroundNumber;
3333
}
3434
if(wrapsCounter % 10 == 9 && uint64_t(maxStamp_) < wrapAroundNumber_ * 2u / 3u){
35-
logWarn("Last maxStamp=%u, suspiciously small! Maybe it wraps in fact earlier? (wrapAroundNumber=%lu)", maxStamp_, wrapAroundNumber_);
35+
CONSOLE_BRIDGE_logWarn("Last maxStamp=%u, suspiciously small! Maybe it wraps in fact earlier? (wrapAroundNumber=%lu)", maxStamp_, wrapAroundNumber_);
3636
}
3737
}
3838

0 commit comments

Comments
 (0)