Skip to content

Commit 063e4ff

Browse files
committed
Add shooter distance adjustment option
1 parent 9d9dba6 commit 063e4ff

2 files changed

Lines changed: 15 additions & 4 deletions

File tree

‎src/main/java/frc/robot/RobotContainer.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,19 +153,18 @@ private void configureBindings() {
153153
driverController::getRightX, // omega
154154
driverController::getRightTriggerAxis // raw slow input
155155
));
156-
157156
auxController.x().onTrue(swerve.runToggleAimHub());
158-
159157
driverController.y().onTrue(swerve.runZeroGyro());
160158
driverController.x().onTrue(swerve.runToggleToXPosition());
161159
driverController.b().onTrue(swerve.runReconfigure());
162160

163161
shooter.setDefaultCommand(shooter.runShooterIdle());
164162
driverController.rightBumper().whileTrue(shooter.runAllFromNetworkSpeed());
163+
auxController.x().onTrue(shooter.incrementShooterDistanceAdjust(true));
164+
auxController.y().onTrue(shooter.incrementShooterDistanceAdjust(false));
165165

166166
intake.setDefaultCommand(intake.runRollers());
167167
driverController.a().onTrue(intake.toggleWristPose());
168-
169168
auxController.a().onTrue(intake.incrementWristSetpointAdjust(true));
170169
auxController.b().onTrue(intake.incrementWristSetpointAdjust(false));
171170
}

‎src/main/java/frc/robot/subsystems/shooter/Shooter.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ public class Shooter extends SubsystemBase {
2424

2525
private final ShooterIOInputsAutoLogged[] shooterInputs = new ShooterIOInputsAutoLogged[5];
2626

27+
private double shooterDistanceAdjust = 0;
28+
2729
public Shooter(ShooterIO shooterIOL, ShooterIO shooterIOM, ShooterIO shooterIOR, ShooterIO feederIO, ShooterIO indexIO) {
2830
this.shooterIOL = shooterIOL;
2931
this.shooterIOM = shooterIOM;
@@ -37,7 +39,7 @@ public Shooter(ShooterIO shooterIOL, ShooterIO shooterIOM, ShooterIO shooterIOR,
3739
}
3840

3941
private void shootWithDistance(double distanceMeters) {
40-
double shooterVelocityRadPerSec = HubShootLUT.getFlywheelSpeedAtDistance(distanceMeters);
42+
double shooterVelocityRadPerSec = HubShootLUT.getFlywheelSpeedAtDistance(distanceMeters + shooterDistanceAdjust);
4143
double feederVelocityRadPerSec = shooterVelocityRadPerSec * ShooterConstants.feederMotorMult;
4244

4345
shooterIOL.setVelocityClosedLoop(shooterVelocityRadPerSec);
@@ -47,6 +49,16 @@ private void shootWithDistance(double distanceMeters) {
4749
indexIO.setVelocityClosedLoop(feederVelocityRadPerSec);
4850
}
4951

52+
public Command incrementShooterDistanceAdjust(boolean positive) {
53+
return runOnce(() -> {
54+
if (positive) {
55+
shooterDistanceAdjust += 0.2;
56+
} else {
57+
shooterDistanceAdjust -= 0.2;
58+
}
59+
});
60+
}
61+
5062
public Command runStopShooter() {
5163
return run(() -> {
5264
shooterIOL.stop();

0 commit comments

Comments
 (0)