From: maxwtan <100314265+MaxwellTTan20@users.noreply.github.com> Date: Mon, 6 Apr 2026 19:53:01 +0000 (-0700) Subject: KoushaApprovedNoShootingUnderLadder X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=5c0dbbe5eeaffe590a923d3b547d085dd2d0d041;p=FRC2026.git KoushaApprovedNoShootingUnderLadder --- diff --git a/src/main/java/frc/robot/commands/gpm/RunSpindexer.java b/src/main/java/frc/robot/commands/gpm/RunSpindexer.java index d730b69..7cc1090 100644 --- a/src/main/java/frc/robot/commands/gpm/RunSpindexer.java +++ b/src/main/java/frc/robot/commands/gpm/RunSpindexer.java @@ -27,6 +27,7 @@ public class RunSpindexer extends Command { private Timer reverseTimer = new Timer(); private double storedIntakeSpeed = 0.0; + public RunSpindexer(Spindexer spindexer, Turret turret, Hood hood, Intake intake) { this.spindexer = spindexer; @@ -56,7 +57,7 @@ public class RunSpindexer extends Command { } wasHoodForcedDown = hoodForcedDown; - if (!turret.atSetpoint() || hoodForcedDown) { + if (!turret.atSetpoint() || hoodForcedDown || spindexer.noIndexing) { spindexer.stopSpindexer(); reversing = false; return; // this is so the balls don't fly out when unaligned diff --git a/src/main/java/frc/robot/commands/gpm/Superstructure.java b/src/main/java/frc/robot/commands/gpm/Superstructure.java index 1ffd476..ad6791f 100644 --- a/src/main/java/frc/robot/commands/gpm/Superstructure.java +++ b/src/main/java/frc/robot/commands/gpm/Superstructure.java @@ -209,7 +209,11 @@ public class Superstructure extends Command { turret.setFieldRelativeTarget(new Rotation2d(0.0), 0.0); hood.setFieldRelativeTarget(Rotation2d.fromDegrees(HoodConstants.MAX_ANGLE), 0.0); shooter.setShooter(0.0); - //spindexer.stopSpindexer(); + spindexer.noIndexing = true; + } + + public void underLadder(){ + spindexer.noIndexing = true; } // shoot higher @@ -255,8 +259,11 @@ public class Superstructure extends Command { updateSetpoints(drivepose); if (phaseManager.isIdle()) { - stowEverything(); + underLadder(); } else { + if (spindexer.noIndexing) { + spindexer.noIndexing = false; + } turret.setFieldRelativeTarget(Rotation2d.fromDegrees(turretSetpoint), turretVelocity - drivetrain.getAngularRate(2)); boolean shuttling = !target.equals(FieldConstants.getHubTranslation().toTranslation2d()); // if we're aiming at the hub, we're not shuttling diff --git a/src/main/java/frc/robot/subsystems/spindexer/Spindexer.java b/src/main/java/frc/robot/subsystems/spindexer/Spindexer.java index 4cba8ed..642e5a3 100644 --- a/src/main/java/frc/robot/subsystems/spindexer/Spindexer.java +++ b/src/main/java/frc/robot/subsystems/spindexer/Spindexer.java @@ -22,6 +22,9 @@ public class Spindexer extends SubsystemBase implements SpindexerIO { private boolean reversing = false; private SpindexerIOInputsAutoLogged inputs = new SpindexerIOInputsAutoLogged(); + public boolean noIndexing = false; + + public Spindexer() { updateInputs();