commit f257f3c5a398331fd55ad05cb2f48e8320d82fc8
author Austin Schuh <austin.linux@gmail.com> Sun Oct 27 21:00:43 2019 -0700
committer Austin Schuh <austin.linux@gmail.com> Sun Oct 27 22:35:15 2019 -0700
tree 968907e4a541c78fb60c2c4f36fac76e1674e089
parent 40485ed8f5ffe81e3268f7142aedcf65062af9c0

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

y2014_bot3/actors/autonomous_actor.cc

diff --git a/y2014_bot3/actors/autonomous_actor.cc b/y2014_bot3/actors/autonomous_actor.cc
index 1a25c55..ee67813 100644
--- a/y2014_bot3/actors/autonomous_actor.cc
+++ b/y2014_bot3/actors/autonomous_actor.cc
@@ -31,14 +31,15 @@
 bool AutonomousActor::RunAction(
     const ::frc971::autonomous::AutonomousActionParams &params) {
   const monotonic_clock::time_point start_time = monotonic_now();
-  LOG(INFO, "Starting autonomous action with mode %" PRId32 "\n", params.mode);
+  AOS_LOG(INFO, "Starting autonomous action with mode %" PRId32 "\n",
+          params.mode);
   Reset();
 
   StartDrive(1.0, 0.0, kDrive, kTurn);
   if (!WaitForDriveDone()) return true;
 
-  LOG(INFO, "Done %f\n",
-      ::aos::time::DurationInSeconds(monotonic_now() - start_time));
+  AOS_LOG(INFO, "Done %f\n",
+          ::aos::time::DurationInSeconds(monotonic_now() - start_time));
 
   ::aos::time::PhasedLoop phased_loop(::std::chrono::milliseconds(5),
                                       monotonic_now(),
@@ -46,7 +47,7 @@
   while (!ShouldCancel()) {
     phased_loop.SleepUntilNext();
   }
-  LOG(DEBUG, "Done running\n");
+  AOS_LOG(DEBUG, "Done running\n");
 
   return true;
 }

y2014_bot3/joystick_reader.cc

diff --git a/y2014_bot3/joystick_reader.cc b/y2014_bot3/joystick_reader.cc
index 44eb2b8..dc43f30 100644
--- a/y2014_bot3/joystick_reader.cc
+++ b/y2014_bot3/joystick_reader.cc
@@ -85,7 +85,7 @@
   void HandleTeleop(const ::aos::input::driver_station::Data &data) {
     if (!data.GetControlBit(ControlBit::kEnabled)) {
       action_queue_.CancelAllActions();
-      LOG(DEBUG, "Canceling\n");
+      AOS_LOG(DEBUG, "Canceling\n");
     }
 
     // Rollers.
@@ -103,20 +103,20 @@
       rollers_goal->human_player = true;
     }
     if (!rollers_goal.Send()) {
-      LOG(WARNING, "Sending rollers values failed.\n");
+      AOS_LOG(WARNING, "Sending rollers values failed.\n");
     }
   }
 
  private:
   void StartAuto() {
-    LOG(INFO, "Starting auto mode.\n");
+    AOS_LOG(INFO, "Starting auto mode.\n");
     ::frc971::autonomous::AutonomousActionParams params;
     params.mode = 0;
     action_queue_.EnqueueAction(autonomous_action_factory_.Make(params));
   }
 
   void StopAuto() {
-    LOG(INFO, "Stopping auto mode\n");
+    AOS_LOG(INFO, "Stopping auto mode\n");
     action_queue_.CancelAllActions();
   }
 

y2014_bot3/wpilib_interface.cc

diff --git a/y2014_bot3/wpilib_interface.cc b/y2014_bot3/wpilib_interface.cc
index c526742..9b1d4e8 100644
--- a/y2014_bot3/wpilib_interface.cc
+++ b/y2014_bot3/wpilib_interface.cc
@@ -163,14 +163,14 @@
 
   void Loop(const int iterations) {
     if (iterations != 1) {
-      LOG(DEBUG, "Solenoids skipped %d iterations\n", iterations - 1);
+      AOS_LOG(DEBUG, "Solenoids skipped %d iterations\n", iterations - 1);
     }
 
     // Drivetrain
     {
       drivetrain_.Fetch();
       if (drivetrain_.get()) {
-        LOG_STRUCT(DEBUG, "solenoids", *drivetrain_);
+        AOS_LOG_STRUCT(DEBUG, "solenoids", *drivetrain_);
         drivetrain_left_->Set(drivetrain_->left_high);
         drivetrain_right_->Set(drivetrain_->right_high);
       }
@@ -180,7 +180,7 @@
     {
       rollers_.Fetch();
       if (rollers_.get()) {
-        LOG_STRUCT(DEBUG, "solenoids", *rollers_);
+        AOS_LOG_STRUCT(DEBUG, "solenoids", *rollers_);
         rollers_front_->Set(rollers_->front_extended);
         rollers_back_->Set(rollers_->back_extended);
       }
@@ -202,7 +202,7 @@
 
       pcm_->Flush();
       to_log.read_solenoids = pcm_->GetAll();
-      LOG_STRUCT(DEBUG, "pneumatics info", to_log);
+      AOS_LOG_STRUCT(DEBUG, "pneumatics info", to_log);
     }
   }
 
@@ -247,7 +247,7 @@
  private:
   virtual void Write(const ::y2014_bot3::control_loops::RollersQueue::Output
                          &output) override {
-    LOG_STRUCT(DEBUG, "will output", output);
+    AOS_LOG_STRUCT(DEBUG, "will output", output);
     rollers_front_left_intake_talon_->SetSpeed(output.front_intake_voltage /
                                                12.0);
     rollers_front_right_intake_talon_->SetSpeed(
@@ -260,7 +260,7 @@
   }
 
   virtual void Stop() override {
-    LOG(WARNING, "Intake output too old\n");
+    AOS_LOG(WARNING, "Intake output too old\n");
     rollers_front_left_intake_talon_->SetDisabled();
     rollers_front_right_intake_talon_->SetDisabled();
     rollers_back_left_intake_talon_->SetDisabled();