From 814c4de75ed24048ba2781d851a5c96ab04d2dbe Mon Sep 17 00:00:00 2001
From: maxwtan <100314265+MaxwellTTan20@users.noreply.github.com>
Date: Fri, 20 Feb 2026 16:18:10 -0800
Subject: [PATCH] b

---
 .../java/frc/robot/controls/PS5ControllerDriverConfig.java    | 4 ++--
 src/main/java/frc/robot/subsystems/shooter/Shooter.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
index 00278b1..f4d0bcc 100644
--- a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
+++ b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
@@ -110,7 +110,7 @@ public class PS5ControllerDriverConfig extends BaseDriverConfig {
         }
 
         // Auto shoot
-        if (turret != null) {
+        if (turret != null && hood != null && shooter != null) {
             driver.get(PS5Button.SQUARE).onTrue(
                     new InstantCommand(() -> {
                         if (autoShoot != null && autoShoot.isScheduled()) {
@@ -123,7 +123,7 @@ public class PS5ControllerDriverConfig extends BaseDriverConfig {
         }
 
         if (climb != null) {
-            driver.get(PS5Button.CIRCLE).onTrue(new InstantCommand(() -> {
+            driver.get(PS5Button.PS).onTrue(new InstantCommand(() -> {
                 climb.hardstopCalibration();
             })).onFalse(new InstantCommand(() -> {
                 climb.stopCalibrating();
diff --git a/src/main/java/frc/robot/subsystems/shooter/Shooter.java b/src/main/java/frc/robot/subsystems/shooter/Shooter.java
index 076e8fe..9b1a45a 100644
--- a/src/main/java/frc/robot/subsystems/shooter/Shooter.java
+++ b/src/main/java/frc/robot/subsystems/shooter/Shooter.java
@@ -63,7 +63,7 @@ public class Shooter extends SubsystemBase implements ShooterIO {
         SmartDashboard.putNumber("shooter power modifier", powerModifier);
         
         // Convert to RPS
-        double targetVelocityRPS = Units.radiansToRotations(shooterTargetSpeed / (ShooterConstants.SHOOTER_LAUNCH_DIAMETER/2));
+        double targetVelocityRPS = Units.radiansToRotations(shooterTargetSpeed / (ShooterConstants.SHOOTER_LAUNCH_DIAMETER/2)) * powerModifier;
 
         // Sets the motor control to target velocity
         shooterMotorLeft.setControl(voltageRequest.withVelocity(targetVelocityRPS));
-- 
2.39.5