Log improvements

Murray-Bridge-Bunyips · Dec 2, 2024 · 0dd8713 · 0dd8713
1 parent 83c69b3
commit 0dd8713
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/au/edu/sa/mbhs/studentrobotics/bunyipslib/AutonomousBunyipsOpMode.java b/src/main/java/au/edu/sa/mbhs/studentrobotics/bunyipslib/AutonomousBunyipsOpMode.java
@@ -84,7 +84,7 @@ private void callback(@Nullable Reference<?> selectedOpMode) {
 
         String timeLeft = getApproximateTimeLeft();
         Text.Builder out = Text.builder();
-        out.append("[AutonomousBunyipsOpMode] onReady() called | %% task(s) queued% | % subsystems\n",
+        out.append("[AutonomousBunyipsOpMode] onReady() called | %% task(s) queued% | % subsystem(s)\n",
                 userSelection != null ? "usr: " + Text.removeHtml(String.valueOf(selectedOpMode)) + " | " : "",
                 taskCount,
                 timeLeft.isEmpty() ? "" : timeLeft + " to complete",
@@ -95,7 +95,7 @@ private void callback(@Nullable Reference<?> selectedOpMode) {
         }
         out.append("\n");
         for (BunyipsSubsystem subsystem : updatedSubsystems) {
-            out.append("   :: %\n", subsystem);
+            out.append("   :: %\n", subsystem.toVerboseString());
         }
         Dbg.logd(out.toString());
     }

diff --git a/src/main/java/au/edu/sa/mbhs/studentrobotics/bunyipslib/BunyipsSubsystem.java b/src/main/java/au/edu/sa/mbhs/studentrobotics/bunyipslib/BunyipsSubsystem.java
@@ -123,7 +123,7 @@ protected void sout(Consumer<String> logger, String format, Object... objs) {
      */
     @NonNull
     public final String toVerboseString() {
-        return Text.format("%%%% (%) <=> %", assertionFailed ? "[error]" : "", threadName != null ? " [async]" : "", parent != null ? " [delegated to " + parent + "]" : "", " " + name, shouldRun ? "enabled" : "disabled", getCurrentTask());
+        return Text.format("%%%% <%> (%) <=> %", assertionFailed ? "[error]" : "", threadName != null ? " [async]" : "", parent != null ? " [delegated to " + parent + "]" : "", " " + name, getClass().getSimpleName(), shouldRun ? "enabled" : "disabled", getCurrentTask());
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         @NonNull
         public final String toVerboseString() {
-            return Text.format("%%%% (%) <=> %", assertionFailed ? "[error]" : "", threadName != null ? " [async]" : "", parent != null ? " [delegated to " + parent + "]" : "", " " + name, shouldRun ? "enabled" : "disabled", getCurrentTask());
+            return Text.format("%%%% <%> (%) <=> %", assertionFailed ? "[error]" : "", threadName != null ? " [async]" : "", parent != null ? " [delegated to " + parent + "]" : "", " " + name, getClass().getSimpleName(), shouldRun ? "enabled" : "disabled", getCurrentTask());
         }
         /**
@@ Expand Down @@