commit 2fd847344ac355c0e2690ebbb6bd3e9e1293a1da
author Sabina Davis <sabina1109@gmail.com> Sun Feb 23 17:47:15 2020 -0800
committer Austin Schuh <austin.linux@gmail.com> Sun Feb 23 22:05:48 2020 -0800
tree 7ce0f7307212defc9013b94f01388899408af8ba
parent 82feaffed3fca7de3397102090ca24d2cd3fa97f

Quiet down actions

Change-Id: I889c43b320e639b8d4307fcc6049640410c08c39

aos/actions/actions.cc

diff --git a/aos/actions/actions.cc b/aos/actions/actions.cc
index 528a8b2..67d8b24 100644
--- a/aos/actions/actions.cc
+++ b/aos/actions/actions.cc
@@ -17,15 +17,15 @@
 }
 
 void ActionQueue::CancelCurrentAction() {
-  AOS_LOG(INFO, "Canceling current action\n");
   if (current_action_) {
+    AOS_LOG(INFO, "Canceling current action\n");
     current_action_->Cancel();
   }
 }
 
 void ActionQueue::CancelAllActions() {
-  AOS_LOG(DEBUG, "Cancelling all actions\n");
   if (current_action_) {
+    AOS_LOG(DEBUG, "Canceled all actions\n");
     current_action_->Cancel();
   }
   next_action_.reset();

aos/input/action_joystick_input.cc

diff --git a/aos/input/action_joystick_input.cc b/aos/input/action_joystick_input.cc
index 02e6c51..1178818 100644
--- a/aos/input/action_joystick_input.cc
+++ b/aos/input/action_joystick_input.cc
@@ -32,7 +32,6 @@
     }
     if (!data.GetControlBit(ControlBit::kEnabled)) {
       action_queue_.CancelAllActions();
-      AOS_LOG(DEBUG, "Canceling\n");
     }
     drivetrain_input_reader_->HandleDrivetrain(data);
     HandleTeleop(data);