add assist the driver in lining up if the intake is open

FRC3476 · Mar 24, 2022 · 0ef4661 · 0ef4661
1 parent 1853a13
commit 0ef4661
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java
@@ -19,6 +19,7 @@
 import frc.auton.guiauto.serialization.reflection.ClassInformationSender;
 import frc.subsystem.*;
 import frc.subsystem.Climber.ClimbState;
+import frc.subsystem.Intake.IntakeSolState;
 import frc.utility.*;
 import frc.utility.Controller.XboxAxes;
 import frc.utility.Controller.XboxButtons;
@@ -464,7 +465,7 @@ public void teleopPeriodic() {
             shooter.setFiring(false);
             shooter.setSpeed(0);
             visionManager.unForceVisionOn(driverForcingVisionOn);
-            if (xbox.getRawAxis(XboxAxes.LEFT_TRIGGER) > 0.1) {
+            if (xbox.getRawAxis(XboxAxes.LEFT_TRIGGER) > 0.1 && intake.getIntakeSolState() == IntakeSolState.OPEN) {
                 drive.centerOntoBall(getControllerDriveInputs(), useFieldRelative);
             } else if (climber.getClimbState() == ClimbState.IDLE || climber.isPaused()) { // If we're climbing don't allow the robot to be
                 // driven