From 68354c5575460772c9acd3e1b0ac3b47455a371f Mon Sep 17 00:00:00 2001
From: Titan Robotics Club <trc492@users.noreply.github.com>
Date: Sat, 13 Jul 2024 20:22:16 -0700
Subject: [PATCH] Minor cleanup.

---
 .../main/java/teamcode/autocommands/CmdAuto.java   |  7 ++++---
 .../src/main/java/teamcode/autotasks/TaskAuto.java | 14 ++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/TeamCode/src/main/java/teamcode/autocommands/CmdAuto.java b/TeamCode/src/main/java/teamcode/autocommands/CmdAuto.java
index 6cc9bcf..9c88075 100644
--- a/TeamCode/src/main/java/teamcode/autocommands/CmdAuto.java
+++ b/TeamCode/src/main/java/teamcode/autocommands/CmdAuto.java
@@ -103,17 +103,18 @@ public class CmdAuto implements TrcRobot.RobotCommand
 
         if (state == null)
         {
-            robot.dashboard.displayPrintf(8, "State: disabled or waiting (nextState=%s)...", sm.getNextState());
+            robot.dashboard.displayPrintf(8, "State: disabled or waiting (nextState=" + sm.getNextState() + ")...");
         }
         else
         {
-            robot.dashboard.displayPrintf(8, "State: %s", state);
-
+            robot.dashboard.displayPrintf(8, "State: " + state);
+            robot.globalTracer.tracePreStateInfo(sm.toString(), state);
             switch (state)
             {
                 case START:
                     if (autoChoices.delay > 0.0)
                     {
+                        robot.globalTracer.traceInfo(moduleName, "***** Do delay " + autoChoices.delay + "s.");
                         timer.set(autoChoices.delay, event);
                         sm.waitForSingleEvent(event, State.DONE);
                     }
diff --git a/TeamCode/src/main/java/teamcode/autotasks/TaskAuto.java b/TeamCode/src/main/java/teamcode/autotasks/TaskAuto.java
index 38e5272..8538f5c 100644
--- a/TeamCode/src/main/java/teamcode/autotasks/TaskAuto.java
+++ b/TeamCode/src/main/java/teamcode/autotasks/TaskAuto.java
@@ -74,7 +74,7 @@ public class TaskAuto extends TrcAutoTask<TaskAuto.State>
      */
     public void autoAssist(TrcEvent completionEvent)
     {
-        tracer.traceInfo(moduleName, "event=%s", completionEvent);
+        tracer.traceInfo(moduleName, "event=" + completionEvent);
         startAutoTask(State.START, new TaskParams(), completionEvent);
     }   //autoAssist
 
@@ -113,8 +113,9 @@ public class TaskAuto extends TrcAutoTask<TaskAuto.State>
         {
             TrcOwnershipMgr ownershipMgr = TrcOwnershipMgr.getInstance();
             tracer.traceWarn(
-                moduleName, "Failed to acquire subsystem ownership (currOwner=%s, robotDrive=%s).",
-                currOwner, ownershipMgr.getOwner(robot.robotDrive.driveBase));
+                moduleName,
+                "Failed to acquire subsystem ownership (currOwner=" + currOwner +
+                ", robotDrive=" + ownershipMgr.getOwner(robot.robotDrive.driveBase) + ").");
             releaseSubsystemsOwnership();
         }
 
@@ -132,8 +133,9 @@ public class TaskAuto extends TrcAutoTask<TaskAuto.State>
         {
             TrcOwnershipMgr ownershipMgr = TrcOwnershipMgr.getInstance();
             tracer.traceInfo(
-                moduleName, "Releasing subsystem ownership (currOwner=%s, robotDrive=%s).",
-                currOwner, ownershipMgr.getOwner(robot.robotDrive.driveBase));
+                moduleName,
+                "Releasing subsystem ownership (currOwner=" + currOwner +
+                ", robotDrive=" + ownershipMgr.getOwner(robot.robotDrive.driveBase) + ").");
             robot.robotDrive.driveBase.releaseExclusiveAccess(currOwner);
             currOwner = null;
         }
@@ -163,7 +165,7 @@ public class TaskAuto extends TrcAutoTask<TaskAuto.State>
     protected void runTaskState(
         Object params, State state, TrcTaskMgr.TaskType taskType, TrcRobot.RunMode runMode, boolean slowPeriodicLoop)
     {
-         TaskParams taskParams = (TaskParams) params;
+        TaskParams taskParams = (TaskParams) params;
 
         switch (state)
         {