From: Arnav495 <arnieincyberland@gmail.com>
Date: Sat, 7 Mar 2026 00:29:10 +0000 (-0800)
Subject: Merge branch 'main' into week-0-comp
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=ffb7d155f5636a333c04d8c6781f7d224f6db793;p=FRC2026.git

Merge branch 'main' into week-0-comp
---

ffb7d155f5636a333c04d8c6781f7d224f6db793
diff --cc src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
index 58dc1c3,127a2be..be44154
--- a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
+++ b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
@@@ -8,20 -8,13 +8,18 @@@ import edu.wpi.first.wpilibj2.command.C
  import edu.wpi.first.wpilibj2.command.CommandScheduler;
  import edu.wpi.first.wpilibj2.command.FunctionalCommand;
  import edu.wpi.first.wpilibj2.command.InstantCommand;
- import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
 +import edu.wpi.first.wpilibj2.command.StartEndCommand;
- import edu.wpi.first.wpilibj2.command.WaitCommand;
  import frc.robot.Robot;
 -import frc.robot.commands.gpm.AutoShootCommand;
  import frc.robot.commands.gpm.ClimbDriveCommand;
 +import frc.robot.commands.gpm.IntakeMovementCommand;
  import frc.robot.commands.gpm.ReverseMotors;
 +import frc.robot.commands.gpm.RunSpindexer;
 +import frc.robot.commands.gpm.Superstructure;
  import frc.robot.constants.Constants;
  import frc.robot.subsystems.Climb.LinearClimb;
 +import frc.robot.subsystems.Intake.Intake;
  import frc.robot.subsystems.drivetrain.Drivetrain;
 +import frc.robot.subsystems.hood.Hood;
  import frc.robot.subsystems.shooter.Shooter;
  import frc.robot.subsystems.spindexer.Spindexer;
  import frc.robot.subsystems.turret.Turret;