]> git.taranathan.com Git - FRC2026.git/commitdiff
Merge branch 'main' into LEDs
authoriefomit <timofei.stem@gmail.com>
Wed, 25 Feb 2026 06:32:30 +0000 (22:32 -0800)
committeriefomit <timofei.stem@gmail.com>
Wed, 25 Feb 2026 06:32:30 +0000 (22:32 -0800)
1  2 
src/main/java/frc/robot/RobotContainer.java
src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java

index eae6700712ba6bdabad08d8afc19f89c94e5f1a7,bbe567dea42f8b86cec59921941aa3f8accc0021..5a5f7eaaf0f964d183927021dd7a54ceda7a9d31
@@@ -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;
index 3b5259a7f2c1f090bdeb5272f9e76fadc29a2df5,b646ac80509844b569765bf82fd6c08cc3e90207..580a45b5c5bc82c7d60abab0e29c0cbb4b0436d4
@@@ -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;