From: moo <moogoesmeow123@gmail.com>
Date: Tue, 1 Sep 2026 23:44:22 +0000 (-0700)
Subject: Merge branch 'choreo' into fall-254
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=8691cba443377db51f1f0ce6d1fc7c0e7a3e1192;p=FRC2026.git

Merge branch 'choreo' into fall-254
---

8691cba443377db51f1f0ce6d1fc7c0e7a3e1192
diff --cc src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
index 9ae380e,37e1d23..3d53d3f
--- a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
+++ b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
@@@ -7,8 -7,8 +7,9 @@@ import edu.wpi.first.wpilibj.DriverStat
  import edu.wpi.first.wpilibj2.command.Command;
  import edu.wpi.first.wpilibj2.command.CommandScheduler;
  import edu.wpi.first.wpilibj2.command.InstantCommand;
 +import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
  import frc.robot.Robot;
+ import frc.robot.commands.drive_comm.SysIDDriveCommand;
  import frc.robot.commands.gpm.IntakeMovementCommand;
  import frc.robot.commands.gpm.ReverseMotors;
  import frc.robot.commands.gpm.RunSpindexer;