Merge branch 'main' into 2027

wpilibsuite · Nov 30, 2024 · 847c312 · 847c312
2 parents 7ae4333 + 5012ad7
commit 847c312
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/LoggerGenerator.java b/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/LoggerGenerator.java
@@ -253,7 +253,7 @@ private void writeLoggerFile(
       out.println();
 
       // @Override
-      // public void update(DataLogger dataLogger, Foo object) {
+      // public void update(EpilogueBackend backend, Foo object) {
       out.println("  @Override");
       out.println(
           "  public void update(EpilogueBackend backend, " + simpleClassName + " object) {");

diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/MeasureHandler.java b/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/MeasureHandler.java
@@ -31,7 +31,7 @@ public boolean isLoggable(Element element) {
 
   @Override
   public String logInvocation(Element element) {
-    // DataLogger has builtin support for logging measures
+    // EpilogueBackend has builtin support for logging measures
     return "backend.log(\"" + loggedName(element) + "\", " + elementAccess(element) + ")";
   }
 }
diff --git a/...gue-processor/src/test/java/edu/wpi/first/epilogue/processor/AnnotationProcessorTest.java b/...gue-processor/src/test/java/edu/wpi/first/epilogue/processor/AnnotationProcessorTest.java
@@ -1488,7 +1488,7 @@ public VectorLogger() {
           }
 
           @Override
-          public void update(DataLogger dataLogger, Vector<?> object) {
+          public void update(EpilogueBackend backend, Vector<?> object) {
             // Implementation is irrelevant
           }
         }
@@ -1506,17 +1506,17 @@ class Example {
         import edu.wpi.first.epilogue.Logged;
         import edu.wpi.first.epilogue.Epilogue;
         import edu.wpi.first.epilogue.logging.ClassSpecificLogger;
-        import edu.wpi.first.epilogue.logging.DataLogger;
+        import edu.wpi.first.epilogue.logging.EpilogueBackend;
 
         public class ExampleLogger extends ClassSpecificLogger<Example> {
           public ExampleLogger() {
             super(Example.class);
           }
 
           @Override
-          public void update(DataLogger dataLogger, Example object) {
+          public void update(EpilogueBackend backend, Example object) {
             if (Epilogue.shouldLog(Logged.Importance.DEBUG)) {
-              Epilogue.vectorLogger.tryUpdate(dataLogger.getSubLogger("vec"), object.vec, Epilogue.getConfig().errorHandler);
+              Epilogue.vectorLogger.tryUpdate(backend.getNested("vec"), object.vec, Epilogue.getConfig().errorHandler);
             }
           }
         }
@@ -1543,7 +1543,7 @@ public GenericLogger() {
           }
 
           @Override
-          public void update(DataLogger dataLogger, Generic<T> object) {
+          public void update(EpilogueBackend backend, Generic<T> object) {
             // Implementation is irrelevant
           }
         }