diff --git a/simgui-ds.json b/simgui-ds.json index 4a63cc1..73cc713 100644 --- a/simgui-ds.json +++ b/simgui-ds.json @@ -1,9 +1,4 @@ { - "System Joysticks": { - "window": { - "enabled": false - } - }, "keyboardJoysticks": [ { "axisConfig": [ diff --git a/src/main/java/frc4388/robot/Robot.java b/src/main/java/frc4388/robot/Robot.java index 1b78419..c6bf398 100644 --- a/src/main/java/frc4388/robot/Robot.java +++ b/src/main/java/frc4388/robot/Robot.java @@ -76,11 +76,6 @@ public class Robot extends LoggedRobot { // and running subsystem periodic() methods. This must be called from the robot's periodic // block in order for anything in the Command-based framework to work. CommandScheduler.getInstance().run(); - //Hub Shift logs - ShiftInfo info = HubShiftTimer.getShiftInfo(); - Logger.recordOutput("HubShift/IsActive", info.isActive()); - Logger.recordOutput("HubShift/RemainingInShift", info.remainingInShift()); - Logger.recordOutput("HubShift/Phase", info.phase().name()); } /** * This function is called once each time the robot enters Disabled mode. diff --git a/src/main/java/frc4388/robot/constants/BuildConstants.java b/src/main/java/frc4388/robot/constants/BuildConstants.java index 92740de..ae43c17 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 = "2026KPopRobotHunters"; public static final String VERSION = "unspecified"; - public static final int GIT_REVISION = 148; - public static final String GIT_SHA = "5b85bb4ace55dd116c3e80c496ad3ebf986ebfc8"; - public static final String GIT_DATE = "2026-03-09 10:27:13 MDT"; + public static final int GIT_REVISION = 149; + public static final String GIT_SHA = "ed7d0907b189f1b732408164152aca99f1ca5b81"; + public static final String GIT_DATE = "2026-03-17 00:31:53 MDT"; public static final String GIT_BRANCH = "Timer"; - public static final String BUILD_DATE = "2026-03-17 00:27:11 MDT"; - public static final long BUILD_UNIX_TIME = 1773728831770L; + public static final String BUILD_DATE = "2026-03-17 12:46:28 MDT"; + public static final long BUILD_UNIX_TIME = 1773773188939L; public static final int DIRTY = 1; private BuildConstants(){} diff --git a/src/main/java/frc4388/robot/subsystems/shooter/Shooter.java b/src/main/java/frc4388/robot/subsystems/shooter/Shooter.java index 5a8f84d..75e6225 100644 --- a/src/main/java/frc4388/robot/subsystems/shooter/Shooter.java +++ b/src/main/java/frc4388/robot/subsystems/shooter/Shooter.java @@ -104,7 +104,11 @@ public class Shooter extends SubsystemBase { @Override public void periodic() { // FaultReporter.register(this); // TODO Implement fault reporter - + //Hub Shift logs + ShiftInfo info = HubShiftTimer.getShiftInfo(); + Logger.recordOutput("HubShift/IsActive", info.isActive()); + Logger.recordOutput("HubShift/RemainingInShift", info.remainingInShift()); + Logger.recordOutput("HubShift/Phase", info.phase().name()); Logger.processInputs("Shooter", state); io.updateInputs(state);