diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index e51b19c..af55ac9 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -220,19 +220,19 @@ public class RobotContainer { // IF the driver is holding the aim button, aim the robot towards the hub and shooter ready new Trigger(() -> getDeadbandedDriverController().getRightTriggerAxis() >= 0.5) - .whileTrue(new RunCommand( - () -> { - // m_robotSwerveDrive.driveFacingPosition( - // getDeadbandedDriverController().getLeft(), - // FieldPositions.HUB_POSITION); - }, m_robotSwerveDrive) - ) + // .whileTrue(new RunCommand( + // () -> { + // m_robotSwerveDrive.driveFacingPosition( + // getDeadbandedDriverController().getLeft(), + // FieldPositions.HUB_POSITION); + // }, m_robotSwerveDrive) + // ) .onTrue(new InstantCommand(() -> { // When Right trigger is pressed, m_robotShooter.setShooterReady(); })) .onFalse(new InstantCommand(() -> { - m_robotIntake.setMode(IntakeMode.Retracted); + // m_robotIntake.setMode(IntakeMode.Retracted); m_robotShooter.setShooterNotReady(); })); diff --git a/src/main/java/frc4388/robot/constants/BuildConstants.java b/src/main/java/frc4388/robot/constants/BuildConstants.java index 4db6750..6cd3db4 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 = 49; - public static final String GIT_SHA = "0425cdd0a1e794109348c7369dc21b377fca569b"; - public static final String GIT_DATE = "2026-02-12 14:36:26 MST"; + public static final int GIT_REVISION = 50; + public static final String GIT_SHA = "8381ac460776aaad24a82786c9fe12e040a99d00"; + public static final String GIT_DATE = "2026-02-14 11:55:51 MST"; public static final String GIT_BRANCH = "shoot-button"; - public static final String BUILD_DATE = "2026-02-14 11:48:31 MST"; - public static final long BUILD_UNIX_TIME = 1771094911048L; + public static final String BUILD_DATE = "2026-02-14 12:44:39 MST"; + public static final long BUILD_UNIX_TIME = 1771098279734L; 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 da6e44b..a5d91f4 100644 --- a/src/main/java/frc4388/robot/subsystems/shooter/Shooter.java +++ b/src/main/java/frc4388/robot/subsystems/shooter/Shooter.java @@ -61,9 +61,9 @@ public class Shooter extends SubsystemBase { private ShooterMode mode = ShooterMode.NotReady; public void setShooterReady() { - if(this.mode == ShooterMode.NotReady) { - this.mode = ShooterMode.Ready; - } + // if(this.mode == ShooterMode.NotReady) { + this.mode = ShooterMode.Ready; + // } } public void setShooterNotReady() { @@ -95,6 +95,9 @@ public class Shooter extends SubsystemBase { double distanceToHub = robotPose2d.getTranslation().minus(FieldPositions.HUB_POSITION).getNorm(); + + this.mode = ShooterMode.Shooting; + // TODO: get if the robot is within the angle of the hub // boolean driverError =