Merge branch 'main' of https://github.com/Team334/R2024

Team334 · Apr 6, 2024 · 8515564 · 8515564
2 parents 7d012e9 + 472e2c7
commit 8515564
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/frc/robot/commands/auto/AutoAmp.java b/src/main/java/frc/robot/commands/auto/AutoAmp.java
@@ -26,7 +26,7 @@ public AutoAmp(
     // Add your commands in the addCommands() call, e.g.
     // addCommands(new FooCommand(), new BarCommand());
     addCommands(
-      new SpinShooter(shooter, ShooterState.AMP, false).withTimeout(0.25),
+      new SpinShooter(shooter, ShooterState.AMP, false).withTimeout(0.20),
       new FeedActuate(intake, ActuatorState.STOWED, FeedMode.OUTTAKE).withTimeout(0.5)
       // new SpinShooter(shooter, ShooterState.SLOW, false).withTimeout(0.1)
     );

diff --git a/src/main/java/frc/robot/subsystems/ShooterSubsystem.java b/src/main/java/frc/robot/subsystems/ShooterSubsystem.java
@@ -54,7 +54,7 @@ public class ShooterSubsystem extends SubsystemBase {
 
   private final Timer _revTimer = new Timer();
 
-  private double _shooterTrim = 3;
+  private double _shooterTrim = 0;
 
   private boolean _holdNote = false;