From: maxwtan <100314265+MaxwellTTan20@users.noreply.github.com>
Date: Fri, 13 Feb 2026 16:31:43 +0000 (-0800)
Subject: Merge branch 'arnavs-mega-velocityvoltage-turret' of https://github.com/iron-claw... 
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=051c4cab819a815fbaf430f6a557f483e8339def;p=FRC2026.git

Merge branch 'arnavs-mega-velocityvoltage-turret' of https://github.com/iron-claw-972/FRC2026 into arnavs-mega-velocityvoltage-turret
---

051c4cab819a815fbaf430f6a557f483e8339def
diff --cc src/main/java/frc/robot/subsystems/shooter/ShooterConstants.java
index 95b0c0f,a7c0ba9..381b788
--- a/src/main/java/frc/robot/subsystems/shooter/ShooterConstants.java
+++ b/src/main/java/frc/robot/subsystems/shooter/ShooterConstants.java
@@@ -15,7 -15,9 +15,7 @@@ public class ShooterConstants 
      public static final double EXIT_VELOCITY_TOLERANCE = 1.0;
  
      // for bang bang
 -    public static final double TORQUE_CURRENT_CONTROL_TOLERANCE = 10; // this is how far we should drop to say a ball is detected
 +    public static final double TORQUE_CURRENT_CONTROL_TOLERANCE = 50; // velocity (rotations per second)
  
 -    public static final double TORQUE_CURRENT_CONTROL_GOAL_AMP = 40; // TUNE (this is the target)
 +    public static final double TORQUE_CURRENT_CONTROL_GOAL_AMP = 150; // TUNE
- }
+ }
 -// 8 velcocity is too little
 -// 16 is too much