diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index bf5f4c1ba..465b90e29 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -383,8 +383,7 @@ private void configureButtonBindings() { operatorController .rightTrigger(0.1) .and(() -> !operatorController.pov(0).getAsBoolean()) - .toggleOnTrue( - orchestrator.spinUpShooterDistance(orchestrator.getShootWhileDrivingResultDistance())); + .toggleOnTrue(orchestrator.spinUpShooterDistance(orchestrator.getHubDistance())); operatorController .rightTrigger(0.1) .and(operatorController.pov(0)) diff --git a/src/main/java/frc/robot/subsystems/shooter/Shooter.java b/src/main/java/frc/robot/subsystems/shooter/Shooter.java index b9aac7cf9..b906761fd 100644 --- a/src/main/java/frc/robot/subsystems/shooter/Shooter.java +++ b/src/main/java/frc/robot/subsystems/shooter/Shooter.java @@ -174,7 +174,7 @@ public double getAirTimeSeconds(DoubleSupplier distance) { public DoubleSupplier calculateSetpoint(DoubleSupplier distance) { // calculate rad/s depending on distance return () -> { - double setpoint = 183.35 * distance.getAsDouble() + 750.93; + double setpoint = 223 * distance.getAsDouble() + 750.93; if (setpoint > 5000) { return 5000; } else return setpoint;