From: iefomit <timofei.stem@gmail.com>
Date: Wed, 1 Apr 2026 07:10:14 +0000 (-0700)
Subject: Merge branch 'angle-with-vision' into testing_atuos_260329
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=be8353d9609e2c81814ee6d3fd70167fe37b408d;p=FRC2026.git

Merge branch 'angle-with-vision' into testing_atuos_260329
---

be8353d9609e2c81814ee6d3fd70167fe37b408d
diff --cc src/main/java/frc/robot/commands/gpm/RunSpindexer.java
index 4800a44,7dc6bdb..d73cfe5
--- a/src/main/java/frc/robot/commands/gpm/RunSpindexer.java
+++ b/src/main/java/frc/robot/commands/gpm/RunSpindexer.java
@@@ -18,9 -18,9 +18,10 @@@ public class RunSpindexer extends Comma
      private Debouncer jam_debouncer = new Debouncer(SpindexerConstants.JAM_DEBOUNCE_TIME, DebounceType.kRising); // if there is jam I would think this is 0 -> 1
  
      private boolean reversing = false;
-     private Timer reverseTimer = new Timer();
      private boolean wasHoodForcedDown = false;
  
+     private Timer reverseTimer = new Timer();
++    
      public RunSpindexer(Spindexer spindexer, Turret turret, Hood hood) {
          this.spindexer = spindexer;
          this.turret = turret;
diff --cc src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java
index bdeb5a5,48ea33e..8b60740
--- a/src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java
+++ b/src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java
@@@ -1,7 -1,7 +1,6 @@@
  package frc.robot.subsystems.drivetrain;
  
 -import java.util.ArrayList;
  import java.util.Arrays;
- import java.util.ArrayList;
  import java.util.Optional;
  import java.util.concurrent.locks.Lock;
  import java.util.concurrent.locks.ReentrantLock;