From 8a1c2f59cfa0bb43ecb39434bda9c0e4df7e567f Mon Sep 17 00:00:00 2001 From: ShayanHasNo <147673319+ShayanHasNo@users.noreply.github.com> Date: Wed, 1 Apr 2026 21:09:05 -0400 Subject: [PATCH 1/2] regression changes --- src/main/java/frc/robot/RobotContainer.java | 2 +- src/main/java/frc/robot/subsystems/shooter/Shooter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 6c8bcf700..36aa768b8 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -378,7 +378,7 @@ private void configureButtonBindings() { .rightTrigger(0.1) .and(() -> !operatorController.pov(0).getAsBoolean()) .toggleOnTrue( - orchestrator.spinUpShooterDistance(orchestrator.getShootWhileDrivingResultDistance())); + 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; From f43a5392db0f59f3b7a2a11bcf9d7a75f327091c Mon Sep 17 00:00:00 2001 From: Elliot Moore Date: Sat, 4 Apr 2026 09:15:38 -0500 Subject: [PATCH 2/2] format --- src/main/java/frc/robot/RobotContainer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 9682be4df..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.getHubDistance())); + .toggleOnTrue(orchestrator.spinUpShooterDistance(orchestrator.getHubDistance())); operatorController .rightTrigger(0.1) .and(operatorController.pov(0))