Prefix LOG and CHECK with AOS_
This prepares us for introducing glog more widely and transitioning
things over where they make sense.
Change-Id: Ic6c208882407bc2153fe875ffc736d66f5c8ade5
diff --git a/y2018/control_loops/superstructure/intake/intake.cc b/y2018/control_loops/superstructure/intake/intake.cc
index 6707356..6c07a49 100644
--- a/y2018/control_loops/superstructure/intake/intake.cc
+++ b/y2018/control_loops/superstructure/intake/intake.cc
@@ -107,7 +107,7 @@
switch (state_) {
case State::UNINITIALIZED:
// Wait in the uninitialized state until the intake is initialized.
- LOG(DEBUG, "Uninitialized, waiting for intake\n");
+ AOS_LOG(DEBUG, "Uninitialized, waiting for intake\n");
zeroing_estimator_.Reset();
controller_.Reset();
state_ = State::ZEROING;
@@ -116,7 +116,7 @@
case State::ZEROING:
// Zero by not moving.
if (zeroing_estimator_.zeroed()) {
- LOG(INFO, "Now zeroed\n");
+ AOS_LOG(INFO, "Now zeroed\n");
controller_.UpdateOffset(zeroing_estimator_.offset());
state_ = State::RUNNING;
}
@@ -124,23 +124,23 @@
case State::RUNNING:
if (!(zeroing_estimator_.zeroed())) {
- LOG(ERROR, "Zeroing estimator is no longer zeroed\n");
+ AOS_LOG(ERROR, "Zeroing estimator is no longer zeroed\n");
state_ = State::UNINITIALIZED;
}
if (zeroing_estimator_.error()) {
- LOG(ERROR, "Zeroing estimator error\n");
+ AOS_LOG(ERROR, "Zeroing estimator error\n");
state_ = State::UNINITIALIZED;
}
// ESTOP if we hit the hard limits.
if ((status->motor_position) > controller_.intake_range_.upper ||
(status->motor_position) < controller_.intake_range_.lower) {
- LOG(ERROR, "Hit hard limits\n");
+ AOS_LOG(ERROR, "Hit hard limits\n");
state_ = State::ESTOP;
}
break;
case State::ESTOP:
- LOG(ERROR, "Estop\n");
+ AOS_LOG(ERROR, "Estop\n");
break;
}