diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index 7add360..b722623 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -274,7 +274,6 @@ public class RobotContainer { })) .onFalse(new InstantCommand(() -> { m_robotShooter.spinUpIdle(); - m_robotIntake.setMode(IntakeMode.Extended); })); @@ -286,7 +285,6 @@ public class RobotContainer { })) .onFalse(new InstantCommand(() -> { m_robotShooter.spinUpIdle(); - m_robotIntake.setMode(IntakeMode.Extended); })); new JoystickButton(getDeadbandedOperatorController(), XboxController.RIGHT_BUMPER_BUTTON) diff --git a/src/main/java/frc4388/robot/constants/BuildConstants.java b/src/main/java/frc4388/robot/constants/BuildConstants.java index 2e885ef..675a76b 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 = 112; - public static final String GIT_SHA = "e299d3bd0a4dda5addf954455b0628b150cf6d35"; - public static final String GIT_DATE = "2026-02-27 18:44:44 MST"; + public static final int GIT_REVISION = 117; + public static final String GIT_SHA = "f15a26aaef05d6a17e359cc3e189c5b5c1b1ceec"; + public static final String GIT_DATE = "2026-02-27 21:19:01 MST"; public static final String GIT_BRANCH = "shikhar-op-controls"; - public static final String BUILD_DATE = "2026-02-25 17:33:10 MST"; - public static final long BUILD_UNIX_TIME = 1772065990668L; + public static final String BUILD_DATE = "2026-02-27 21:29:33 MST"; + public static final long BUILD_UNIX_TIME = 1772252973524L; public static final int DIRTY = 1; private BuildConstants(){} diff --git a/src/main/java/frc4388/robot/subsystems/intake/IntakeReal.java b/src/main/java/frc4388/robot/subsystems/intake/IntakeReal.java index 1b87897..20e56ad 100644 --- a/src/main/java/frc4388/robot/subsystems/intake/IntakeReal.java +++ b/src/main/java/frc4388/robot/subsystems/intake/IntakeReal.java @@ -137,8 +137,8 @@ public class IntakeReal implements IntakeIO { state.rollerMotorCurrent = m_rollerMotor.getStatorCurrent().getValue(); state.retractedLimit = !m_armLimitSwitch.get(); - state.armMotorVelocity = (Velocity) m_armMotor.getVelocity(); - state.armMotorAcceleration = (Acceleration) m_armMotor.getAcceleration(); + // state.armMotorVelocity = (Velocity) m_armMotor.getVelocity(); + // state.armMotorAcceleration = (Acceleration) m_armMotor.getAcceleration(); if(state.retractedLimit) { // Set the arm motor to be zero if the limit switch is pressed