log WPILogs to flash only, not console.

Team766 · Mar 30, 2024 · 5ec1db8 · 5ec1db8
1 parent 3e6afee
commit 5ec1db8
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/src/main/java/com/team766/logging/Logger.java b/src/main/java/com/team766/logging/Logger.java
@@ -2,17 +2,20 @@
 
 import com.team766.config.ConfigFileReader;
 import com.team766.library.CircularBuffer;
+import edu.wpi.first.util.datalog.StringLogEntry;
 import edu.wpi.first.wpilibj.DataLogManager;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.EnumMap;
+import java.util.concurrent.atomic.AtomicReference;
 
 public final class Logger {
 
-    private static boolean alsoLogToDataLog = false;
+    private static AtomicReference<StringLogEntry> wpiLogEntryReference =
+            new AtomicReference<StringLogEntry>();
 
     private static class LogUncaughtException implements Thread.UncaughtExceptionHandler {
         public void uncaughtException(final Thread t, final Throwable e) {
@@ -73,7 +76,12 @@ public void uncaughtException(final Thread t, final Throwable e) {
     }
 
     public static void enableLoggingToDataLog(boolean enabled) {
-        alsoLogToDataLog = enabled;
+        if (enabled) {
+            wpiLogEntryReference.compareAndSet(
+                    null, new StringLogEntry(DataLogManager.getLog(), "/maroon/logs"));
+        } else {
+            wpiLogEntryReference.set(null);
+        }
     }
 
     public static Logger get(final Category category) {
@@ -99,7 +107,7 @@ private Logger(final Category category) {
     }
 
     public static boolean isLoggingToDataLog() {
-        return alsoLogToDataLog;
+        return wpiLogEntryReference.get() != null;
     }
 
     public Collection<LogEntry> recentEntries() {
@@ -125,8 +133,9 @@ public void logData(final Severity severity, final String format, final Object..
         if (m_logWriter != null) {
             m_logWriter.logStoredFormat(entry);
         }
-        if (alsoLogToDataLog && (severity.compareTo(Severity.INFO) >= 0)) {
-            DataLogManager.log(message);
+        StringLogEntry stringLogEntry = wpiLogEntryReference.get();
+        if (stringLogEntry != null && (severity.compareTo(Severity.INFO) >= 0)) {
+            stringLogEntry.append(message);
         }
     }
 
@@ -142,8 +151,9 @@ public void logRaw(final Severity severity, final String message) {
         if (m_logWriter != null) {
             m_logWriter.log(entry);
         }
-        if (alsoLogToDataLog && (severity.compareTo(Severity.INFO) >= 0)) {
-            DataLogManager.log(message);
+        StringLogEntry stringLogEntry = wpiLogEntryReference.get();
+        if (stringLogEntry != null && (severity.compareTo(Severity.INFO) >= 0)) {
+            stringLogEntry.append(message);
         }
     }