diff --git a/src/main/java/frc4388/robot/constants/BuildConstants.java b/src/main/java/frc4388/robot/constants/BuildConstants.java index 10968a7..9a50e63 100644 --- a/src/main/java/frc4388/robot/constants/BuildConstants.java +++ b/src/main/java/frc4388/robot/constants/BuildConstants.java @@ -7,12 +7,12 @@ public final class BuildConstants { public static final String MAVEN_GROUP = ""; public static final String MAVEN_NAME = "2025RidgeScape"; public static final String VERSION = "unspecified"; - public static final int GIT_REVISION = 168; - public static final String GIT_SHA = "9fd98bce241ee2aef0855f3ce8bb0b37aee723c2"; - public static final String GIT_DATE = "2025-07-13 19:41:05 MDT"; + public static final int GIT_REVISION = 169; + public static final String GIT_SHA = "aaef829ad2830d39cc9f9e05e61e973658d7784d"; + public static final String GIT_DATE = "2025-07-15 09:33:40 MDT"; public static final String GIT_BRANCH = "advantagekit"; - public static final String BUILD_DATE = "2025-07-14 01:44:15 MDT"; - public static final long BUILD_UNIX_TIME = 1752479055707L; + public static final String BUILD_DATE = "2025-07-15 09:49:13 MDT"; + public static final long BUILD_UNIX_TIME = 1752594553460L; public static final int DIRTY = 1; private BuildConstants(){} diff --git a/src/main/java/frc4388/robot/subsystems/LED.java b/src/main/java/frc4388/robot/subsystems/LED.java index 8f71195..fceffe4 100644 --- a/src/main/java/frc4388/robot/subsystems/LED.java +++ b/src/main/java/frc4388/robot/subsystems/LED.java @@ -7,6 +7,8 @@ package frc4388.robot.subsystems; +import org.littletonrobotics.junction.AutoLogOutput; + import edu.wpi.first.wpilibj.DriverStation; import edu.wpi.first.wpilibj.motorcontrol.Spark; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; @@ -48,6 +50,11 @@ public class LED extends SubsystemBase implements Queryable { LEDController.set(mode.getValue()); } + @AutoLogOutput + public String state() { + return mode.getClass().toString(); + } + @Override public String getName() { return "LEDs"; diff --git a/src/main/java/frc4388/robot/subsystems/Lidar.java b/src/main/java/frc4388/robot/subsystems/Lidar.java index d359a7e..6981d7a 100644 --- a/src/main/java/frc4388/robot/subsystems/Lidar.java +++ b/src/main/java/frc4388/robot/subsystems/Lidar.java @@ -31,20 +31,6 @@ public class Lidar extends SubsystemBase implements Queryable { LidarPWM.setSemiPeriodMode(true); //Set the counter to period measurement LidarPWM.reset(); - - subsystemLayout = Shuffleboard.getTab("Subsystems") - .getLayout(getName(), BuiltInLayouts.kList) - .withSize(2, 2); - - sbDistance = subsystemLayout - .add("Distance", 0) - .withWidget(BuiltInWidgets.kGraph) - .getEntry(); - - sbWithinDistance = subsystemLayout - . add("Within Distance", 0) - .withWidget(BuiltInWidgets.kBooleanBox) - .getEntry(); } @Override @@ -55,7 +41,7 @@ public class Lidar extends SubsystemBase implements Queryable { distance = (LidarPWM.getPeriod() * LiDARConstants.SECONDS_TO_MICROS) / LiDARConstants.LIDAR_MICROS_TO_CM; } - @AutoLogOutput + @AutoLogOutput(key = "Lidar/{name}") public double getDistance(){ return distance; } @@ -74,12 +60,6 @@ public class Lidar extends SubsystemBase implements Queryable { return "Lidar " + name; } - // @Override - // public void queryStatus() { - // sbDistance.setDouble(distance); - // sbWithinDistance.setBoolean(withinDistance()); - // } - @Override public Status diagnosticStatus() { Status s = new Status(); diff --git a/src/main/java/frc4388/utility/status/FaultReporter.java b/src/main/java/frc4388/utility/status/FaultReporter.java index 6a3831a..afd4dd4 100644 --- a/src/main/java/frc4388/utility/status/FaultReporter.java +++ b/src/main/java/frc4388/utility/status/FaultReporter.java @@ -13,22 +13,26 @@ import frc4388.utility.status.Status.ReportLevel; public class FaultReporter { private static final String REPORTS_HEADER = - "▄▖ ▗ \n" + // - "▙▘█▌▛▌▛▌▛▘▜▘▛▘\n" + // - "▌▌▙▖▙▌▙▌▌ ▐▖▄▌\n" + // - " ▌ "; + "###############\n" + // + "#.............#\n" + // + "#...Reports...#\n" + // + "#.............#\n" + // + "###############\n"; + private static final String CAN_HEADER = - "▄▖▄▖▖ ▖ \n" + // - "▌ ▌▌▛▖▌ \n" + // - "▙▖▛▌▌▝▌(t)\n" + // - " "; + "###############\n" + // + "#.............#\n" + // + "#....CAN(t)...#\n" + // + "#.............#\n" + // + "###############\n"; private static final String ERROR_HEADER = - "▄▖▄▖▄▖▄▖▄▖▄▖\n" + // - "▙▖▙▘▙▘▌▌▙▘▚ \n" + // - "▙▖▌▌▌▌▙▌▌▌▄▌\n" + // - " "; + "###############\n" + // + "#.............#\n" + // + "#....ERRORS...#\n" + // + "#.............#\n" + // + "###############\n"; private static List queryables = new ArrayList<>();