Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/subsystems/shooter/Shooter.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading