Merge branch 'main' of https://github.com/carokhan/ForteOffseason2024

carokhan · Oct 11, 2024 · 201f06c · 201f06c
2 parents ee45447 + 0db8a00
commit 201f06c
Show file tree

Hide file tree

Showing 4 changed files with 222 additions and 207 deletions.
diff --git a/src/main/java/frc/robot/BuildConstants.java b/src/main/java/frc/robot/BuildConstants.java
@@ -7,12 +7,12 @@ public final class BuildConstants {
   public static final String MAVEN_GROUP = "";
   public static final String MAVEN_NAME = "Forte-2-5";
   public static final String VERSION = "unspecified";
-  public static final int GIT_REVISION = 35;
-  public static final String GIT_SHA = "dd8faba3af165ae3c709ec05260c1183a4fd8a6f";
-  public static final String GIT_DATE = "2024-09-26 06:58:07 EDT";
-  public static final String GIT_BRANCH = "main";
-  public static final String BUILD_DATE = "2024-09-26 20:13:35 EDT";
-  public static final long BUILD_UNIX_TIME = 1727396015795L;
+  public static final int GIT_REVISION = 52;
+  public static final String GIT_SHA = "5a5ec9f0498623c015059646a53857928b1ba114";
+  public static final String GIT_DATE = "2024-09-28 08:07:47 EDT";
+  public static final String GIT_BRANCH = "dev";
+  public static final String BUILD_DATE = "2024-09-28 12:45:11 EDT";
+  public static final long BUILD_UNIX_TIME = 1727541911180L;
   public static final int DIRTY = 1;
 
   private BuildConstants(){}

diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java
@@ -250,7 +250,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;
@@ -284,7 +284,7 @@ public static class ShooterConstants {
     public static final double kVPivot = 0;
     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;