From: iefomit <timofei.stem@gmail.com>
Date: Sun, 22 Mar 2026 02:23:41 +0000 (-0700)
Subject: Merge branch 'main' into week-2-comp-locked
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=cc4ea58699472e2e0fce9b44e92a5d3f1bc352d3;p=FRC2026.git

Merge branch 'main' into week-2-comp-locked
---

cc4ea58699472e2e0fce9b44e92a5d3f1bc352d3
diff --cc src/main/java/frc/robot/RobotContainer.java
index df84e51,fe64006..6b6dc4a
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@@ -216,19 -212,8 +212,8 @@@ public class RobotContainer 
        }));
      }
  
-     // if (intake != null && spindexer != null){
-     // NamedCommands.registerCommand("Spin Intake Rollers", new
-     // ParallelCommandGroup(
-     // new InstantCommand(()->intake.spin(IntakeConstants.SPEED))
-     // ));
-     // NamedCommands.registerCommand("Stop Intake Rollers", new
-     // ParallelCommandGroup(
-     // new InstantCommand(()->intake.spinStop())
-     // ));
-     // }
- 
      if (turret != null && drive != null && hood != null && shooter != null && spindexer != null) {
 -      Command runSpindexer = new RunSpindexer(spindexer, turret);
 +      Command runSpindexer = new RunSpindexer(spindexer, turret, hood);
        NamedCommands.registerCommand("Auto shoot", new AutoShootCommand(turret, drive, hood, shooter, spindexer));
        NamedCommands.registerCommand("Start Spindexer",
            new InstantCommand(() -> CommandScheduler.getInstance().schedule(runSpindexer)));