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

diff --cc src/main/java/frc/robot/subsystems/shooter/Shooter.java
Simple merge

diff --cc src/main/java/frc/robot/subsystems/shooter/ShooterConstants.java
index 95b0c0f3b7b904eea9e580b0c7cd5a96ab026bf7,a7c0ba9fd8148899ecec534122ceaee6e2445116..381b788e76872d9ad0a1c77f1796311288ce0468
--- 1/src/main/java/frc/robot/subsystems/shooter/ShooterConstants.java
--- 2/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