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/aos/input/action_joystick_input.cc b/aos/input/action_joystick_input.cc
index 4c3fef1..509f4c5 100644
--- a/aos/input/action_joystick_input.cc
+++ b/aos/input/action_joystick_input.cc
@@ -31,7 +31,7 @@
}
if (!data.GetControlBit(ControlBit::kEnabled)) {
action_queue_.CancelAllActions();
- LOG(DEBUG, "Canceling\n");
+ AOS_LOG(DEBUG, "Canceling\n");
}
drivetrain_input_reader_->HandleDrivetrain(data);
HandleTeleop(data);
@@ -48,14 +48,14 @@
}
void ActionJoystickInput::StartAuto() {
- LOG(INFO, "Starting auto mode\n");
+ AOS_LOG(INFO, "Starting auto mode\n");
action_queue_.EnqueueAction(
autonomous_action_factory_.Make(GetAutonomousMode()));
auto_action_running_ = true;
}
void ActionJoystickInput::StopAuto() {
- LOG(INFO, "Stopping auto mode\n");
+ AOS_LOG(INFO, "Stopping auto mode\n");
action_queue_.CancelAllActions();
auto_action_running_ = false;
AutoEnded();
diff --git a/aos/input/action_joystick_input.h b/aos/input/action_joystick_input.h
index 2536a8d..3057ace 100644
--- a/aos/input/action_joystick_input.h
+++ b/aos/input/action_joystick_input.h
@@ -96,7 +96,7 @@
virtual uint32_t GetAutonomousMode() {
autonomous_mode_fetcher_.Fetch();
if (autonomous_mode_fetcher_.get() == nullptr) {
- LOG(WARNING, "no auto mode values\n");
+ AOS_LOG(WARNING, "no auto mode values\n");
return 0;
}
return autonomous_mode_fetcher_->mode;
diff --git a/aos/input/drivetrain_input.cc b/aos/input/drivetrain_input.cc
index eddbdc5..a0bbf2c 100644
--- a/aos/input/drivetrain_input.cc
+++ b/aos/input/drivetrain_input.cc
@@ -100,7 +100,7 @@
new_drivetrain_goal->linear.max_acceleration = 20.0;
if (!new_drivetrain_goal.Send()) {
- LOG(WARNING, "sending stick values failed\n");
+ AOS_LOG(WARNING, "sending stick values failed\n");
}
last_is_control_loop_driving_ = is_control_loop_driving;
diff --git a/aos/input/joystick_input.cc b/aos/input/joystick_input.cc
index 0bbba41..d1bd302 100644
--- a/aos/input/joystick_input.cc
+++ b/aos/input/joystick_input.cc
@@ -24,37 +24,37 @@
for (int button = 1; button <= ButtonLocation::kButtons; ++button) {
ButtonLocation location(joystick, button);
if (data_.PosEdge(location)) {
- LOG(INFO, "PosEdge(%d, %d)\n", joystick, button);
+ AOS_LOG(INFO, "PosEdge(%d, %d)\n", joystick, button);
}
if (data_.NegEdge(location)) {
- LOG(INFO, "NegEdge(%d, %d)\n", joystick, button);
+ AOS_LOG(INFO, "NegEdge(%d, %d)\n", joystick, button);
}
}
if (data_.GetPOV(joystick) != data_.GetOldPOV(joystick)) {
- LOG(INFO, "POV %d %d->%d\n", joystick, data_.GetOldPOV(joystick),
- data_.GetPOV(joystick));
+ AOS_LOG(INFO, "POV %d %d->%d\n", joystick, data_.GetOldPOV(joystick),
+ data_.GetPOV(joystick));
}
}
}
{
using driver_station::ControlBit;
if (data_.PosEdge(ControlBit::kFmsAttached)) {
- LOG(INFO, "PosEdge(kFmsAttached)\n");
+ AOS_LOG(INFO, "PosEdge(kFmsAttached)\n");
}
if (data_.NegEdge(ControlBit::kFmsAttached)) {
- LOG(INFO, "NegEdge(kFmsAttached)\n");
+ AOS_LOG(INFO, "NegEdge(kFmsAttached)\n");
}
if (data_.PosEdge(ControlBit::kAutonomous)) {
- LOG(INFO, "PosEdge(kAutonomous)\n");
+ AOS_LOG(INFO, "PosEdge(kAutonomous)\n");
}
if (data_.NegEdge(ControlBit::kAutonomous)) {
- LOG(INFO, "NegEdge(kAutonomous)\n");
+ AOS_LOG(INFO, "NegEdge(kAutonomous)\n");
}
if (data_.PosEdge(ControlBit::kEnabled)) {
- LOG(INFO, "PosEdge(kEnabled)\n");
+ AOS_LOG(INFO, "PosEdge(kEnabled)\n");
}
if (data_.NegEdge(ControlBit::kEnabled)) {
- LOG(INFO, "NegEdge(kEnabled)\n");
+ AOS_LOG(INFO, "NegEdge(kEnabled)\n");
}
}