Merge branch 'main' into pivot2

carokhan · Oct 11, 2024 · 00c6400 · 00c6400
2 parents 561a04a + 0db8a00
commit 00c6400
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
@@ -247,7 +247,7 @@ public static class FeederConstants {
 
     public static final int currentLimit = 50;
 
-    public static double kPReal = 0.001;
+    public static double kPReal = 0.00025;
     public static double kVReal = 0.0;
 
     public static final double kPSim = 0.1;
@@ -285,7 +285,7 @@ public static class ShooterConstants {
     public static final double kVPivot = 0.875;
     public static final double kAPivot = 0.00;
 
-    public static final double kVShooter = 0.0055;
+    public static final double kVShooter = 0.0055; // COMP: 0.0055, DEMO: 0.0041875
     public static final double kAShooter = 0.00;
 
     public static final double kPShooterReal = 0.0000;

diff --git a/vendordeps/yagsl.json b/vendordeps/yagsl.json