move to here

Sorry we got to use a locked comp branch. BUt i'm tired

diff --git a/src/main/java/frc/robot/commands/gpm/Superstructure.java b/src/main/java/frc/robot/commands/gpm/Superstructure.java
index 029bae1c4ee1431c4fc46799d0cd5ad6a57cea75..ca044a1eda4370b33b98db6c6f3e533f1f143658 100644 (file)
--- a/src/main/java/frc/robot/commands/gpm/Superstructure.java
+++ b/src/main/java/frc/robot/commands/gpm/Superstructure.java
@@ -62,7 +62,7 @@ public class Superstructure extends Command {
 
     private double hoodOffset = 0.0;
 
-    private double turretOffset = 0.0;
+    private double turretOffset = 5.0;
 
     private double distanceFromTarget = 0.0;
 

diff --git a/src/main/java/frc/robot/constants/ShotInterpolation.java b/src/main/java/frc/robot/constants/ShotInterpolation.java
index 1aaf37b01e296bc82124f52174904caa1bd63d47..5f2cb38644b66808262f4f452cf2e41c045a8ef1 100644 (file)
--- a/src/main/java/frc/robot/constants/ShotInterpolation.java
+++ b/src/main/java/frc/robot/constants/ShotInterpolation.java
@@ -46,12 +46,11 @@ public class ShotInterpolation {
         // currently regresses to y = 1.34959x + 9.79618
         shooterVelocityMap.put(0.0, 9.55);
         shooterVelocityMap.put(1.00, 11.5);
-        shooterVelocityMap.put(1.49, 11.5);
-        shooterVelocityMap.put(2.09, 12.5);
-        shooterVelocityMap.put(2.95, 14.1);
-        shooterVelocityMap.put(4.07, 15.5);
-        shooterVelocityMap.put(5.05, 16.7);
-        shooterVelocityMap.put(5.79, 18.0);
+        shooterVelocityMap.put(2.00, 12.3);
+        shooterVelocityMap.put(3.00, 14.0);
+        shooterVelocityMap.put(4.00, 15.5);
+        shooterVelocityMap.put(5.00, 16.4);
+        shooterVelocityMap.put(5.60, 17.4);
         shooterVelocityMap.put(25.0, 43.44);
 
         newHoodMap.put(1.00, 78.0);