From: iefomit <timofei.stem@gmail.com>
Date: Wed, 25 Feb 2026 06:32:30 +0000 (-0800)
Subject: Merge branch 'main' into LEDs
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=4c8937ef3947df4fb23199ee9e30048917be3576;p=FRC2026.git

Merge branch 'main' into LEDs
---

4c8937ef3947df4fb23199ee9e30048917be3576
diff --cc src/main/java/frc/robot/RobotContainer.java
index eae6700,bbe567d..5a5f7ea
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@@ -30,9 -27,9 +29,10 @@@ import frc.robot.controls.Operator
  import frc.robot.controls.PS5ControllerDriverConfig;
  import frc.robot.subsystems.Climb.LinearClimb;
  import frc.robot.subsystems.Intake.Intake;
 +import frc.robot.subsystems.LED.LED;
  import frc.robot.subsystems.drivetrain.Drivetrain;
  import frc.robot.subsystems.drivetrain.GyroIOPigeon2;
+ import frc.robot.subsystems.hood.Hood;
  import frc.robot.subsystems.shooter.Shooter;
  import frc.robot.subsystems.spindexer.Spindexer;
  import frc.robot.subsystems.turret.Turret;
diff --cc src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
index 3b5259a,b646ac8..580a45b
--- a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
+++ b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
@@@ -18,8 -22,8 +22,9 @@@ import frc.robot.subsystems.spindexer.S
  import frc.robot.subsystems.turret.Turret;
  import frc.robot.subsystems.hood.Hood;
  import frc.robot.subsystems.Intake.Intake;
 +import frc.robot.subsystems.LED.LED;
  import lib.controllers.PS5Controller;
+ import lib.controllers.PS5Controller.DPad;
  import lib.controllers.PS5Controller.PS5Axis;
  import lib.controllers.PS5Controller.PS5Button;