Merge branch 'angle-with-vision' into testing_atuos_260329

diff --cc src/main/java/frc/robot/commands/gpm/RunSpindexer.java
index 4800a44ef231dee58d496ea6ab52244cc9b271c2,7dc6bdb2461912d7c243f222c6b1fe874d24f705..d73cfe5a312088a4edd271d1dc79fc138b3dc57e
--- 1/src/main/java/frc/robot/commands/gpm/RunSpindexer.java
--- 2/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 bdeb5a5ac2a8c90c624926e487abb21bfa3fb703,48ea33e690e3d41a109e18fac4f7d433480a00f0..8b607401f29f8f273ff9409b3d0fb8b838e18bb4
--- 1/src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java
--- 2/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;