allow logging/config from rootcontainer

Oblarg · Feb 26, 2019 · 91ec500 · 91ec500
1 parent 3e9e2df
commit 91ec500
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/examples/src/main/java/io/github/oblarg/logexample/LoggedSubsystem.java b/examples/src/main/java/io/github/oblarg/logexample/LoggedSubsystem.java
@@ -1,6 +1,8 @@
 package io.github.oblarg.logexample;
 
+import edu.wpi.first.wpilibj.Victor;
 import edu.wpi.first.wpilibj.command.Subsystem;
+import edu.wpi.first.wpilibj.drive.DifferentialDrive;
 import io.github.oblarg.oblog.Loggable;
 import io.github.oblarg.oblog.annotations.Config;
 import io.github.oblarg.oblog.annotations.Log;

diff --git a/examples/src/main/java/io/github/oblarg/logexample/Robot.java b/examples/src/main/java/io/github/oblarg/logexample/Robot.java
@@ -6,7 +6,9 @@
 /*----------------------------------------------------------------------------*/
 
 import edu.wpi.first.wpilibj.TimedRobot;
+import edu.wpi.first.wpilibj.Victor;
 import edu.wpi.first.wpilibj.command.Command;
+import edu.wpi.first.wpilibj.drive.DifferentialDrive;
 import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import io.github.oblarg.oblog.Logger;
@@ -27,6 +29,10 @@ public class Robot extends TimedRobot {
   private LoggedCommand command5Seconds = new LoggedCommand(5);
   private LoggedCommand command10Seconds = new LoggedCommand(10);
 
+
+  @Log.DifferentialDrive
+  private static DifferentialDrive drive = new DifferentialDrive(new Victor(1), new Victor(2));
+
   //This is loggable, but will not be logged due to the exclude annotation.
   @Log.Exclude
   private LoggedCommand commandExcluded = new LoggedCommand(10);

diff --git a/lib/src/main/java/io/github/oblarg/oblog/Logger.java b/lib/src/main/java/io/github/oblarg/oblog/Logger.java
@@ -5,6 +5,7 @@
 import edu.wpi.first.networktables.NetworkTableInstance;
 import edu.wpi.first.wpilibj.AnalogInput;
 import edu.wpi.first.wpilibj.Sendable;
+import edu.wpi.first.wpilibj.shuffleboard.ShuffleboardContainer;
 import io.github.oblarg.oblog.annotations.*;
 import edu.wpi.first.networktables.NetworkTableEntry;
 import edu.wpi.first.wpilibj.shuffleboard.BuiltInWidgets;
@@ -102,6 +103,39 @@ private static void configureLogging(LogType logType,
                                          ShuffleboardWrapper shuffleboard,
                                          NetworkTableInstance nt) {
 
+        ShuffleboardContainerWrapper bin = shuffleboard.getTab(rootContainer.getClass().getSimpleName());
+
+        switch(logType) {
+            case LOG:
+                logFieldsAndMethods(rootContainer,
+                        rootContainer.getClass(),
+                        bin,
+                        new HashSet<>(),
+                        new HashSet<>());
+                break;
+            case CONFIG:
+                configFieldsAndMethods(rootContainer,
+                        rootContainer.getClass(),
+                        bin,
+                        nt,
+                        new HashSet<>(),
+                        new HashSet<>());
+                break;
+            case BOTH:
+                logFieldsAndMethods(rootContainer,
+                        rootContainer.getClass(),
+                        bin,
+                        new HashSet<>(),
+                        new HashSet<>());
+                configFieldsAndMethods(rootContainer,
+                        rootContainer.getClass(),
+                        bin,
+                        nt,
+                        new HashSet<>(),
+                        new HashSet<>());
+                break;
+        }
+
         Consumer<Loggable> log = (toLog) -> logLoggable(logType,
                 toLog,
                 toLog.getClass(),
@@ -477,7 +511,7 @@ private interface SetterProcessor {
 
     );
 
-    private static void configFieldsAndMethods(Loggable loggable,
+    private static void configFieldsAndMethods(Object loggable,
                                                Class loggableClass,
                                                ShuffleboardContainerWrapper bin,
                                                NetworkTableInstance nt,
@@ -540,7 +574,7 @@ private static void configFieldsAndMethods(Loggable loggable,
     }
 
 
-    private static void logFieldsAndMethods(Loggable loggable,
+    private static void logFieldsAndMethods(Object loggable,
                                             Class loggableClass,
                                             ShuffleboardContainerWrapper bin,
                                             Set<Field> registeredFields,