From: Arnav495 <arnieincyberland@gmail.com>
Date: Wed, 25 Feb 2026 05:39:30 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin' into shooter-calcs
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=0643ad86025058ff286a66d1fe321f46c7c7207d;p=FRC2026.git

Merge remote-tracking branch 'origin' into shooter-calcs
---

0643ad86025058ff286a66d1fe321f46c7c7207d
diff --cc src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
index cd49105,b646ac8..419f0f9
--- a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
+++ b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
@@@ -22,7 -20,10 +22,8 @@@ import frc.robot.subsystems.hood.Hood
  import frc.robot.subsystems.shooter.Shooter;
  import frc.robot.subsystems.spindexer.Spindexer;
  import frc.robot.subsystems.turret.Turret;
 -import frc.robot.subsystems.hood.Hood;
 -import frc.robot.subsystems.Intake.Intake;
  import lib.controllers.PS5Controller;
+ import lib.controllers.PS5Controller.DPad;
  import lib.controllers.PS5Controller.PS5Axis;
  import lib.controllers.PS5Controller.PS5Button;
  
@@@ -79,14 -79,23 +79,23 @@@ public class PS5ControllerDriverConfig 
                  interrupted -> getDrivetrain().setStateDeadband(true),
                  () -> false, getDrivetrain()).withTimeout(2));
  
+         // Trench align
+         controller.get(DPad.LEFT).onTrue(new InstantCommand(() -> {
+             getDrivetrain().setTrenchAssist(true);
+             getDrivetrain().setTrenchAlign(true);
+         }))
+                 .onFalse(new InstantCommand(() -> {
+                     getDrivetrain().setTrenchAssist(false);
+                     getDrivetrain().setTrenchAlign(false);
+                 }));
+ 
          // Reverse motors
-         if (intake != null && spindexer != null && shooter != null){
-             driver.get(PS5Button.CIRCLE).onTrue(new InstantCommand(()->{
+         if (intake != null && spindexer != null && shooter != null) {
+             controller.get(PS5Button.CIRCLE).onTrue(new InstantCommand(() -> {
                  reverseMotors = new ReverseMotors(intake, spindexer);
 -                reverseMotors.schedule();
 +				CommandScheduler.getInstance().schedule(reverseMotors);
-             })
-             ).onFalse(new InstantCommand(()->{
-                 if(reverseMotors != null){
+             })).onFalse(new InstantCommand(() -> {
+                 if (reverseMotors != null) {
                      reverseMotors.cancel();
                  }
              }));