diff --git a/src/main/java/frc/robot/OI.java b/src/main/java/frc/robot/OI.java index 2d75144..c4fd4cf 100644 --- a/src/main/java/frc/robot/OI.java +++ b/src/main/java/frc/robot/OI.java @@ -35,7 +35,7 @@ class OI { public Trigger shootLow; public Trigger shootHighFar; public Trigger shootLaunchpad; - public Trigger abortVisionAlign; + //public Trigger abortVisionAlign; public JoystickButton aimRight; public JoystickButton aimLeft; private double speed; @@ -62,7 +62,7 @@ public OI() { shootLow = gunnerStick.getDPadTrigger("ShootLow"); shootHighFar = gunnerStick.getDPadTrigger("ShootHighFar"); shootLaunchpad = gunnerStick.getDPadTrigger("ShootLaunchpad"); - abortVisionAlign = gunnerStick.getDPadTrigger("AbortVisionAlign"); + //abortVisionAlign = gunnerStick.getDPadTrigger("AbortVisionAlign"); climbMotorUp = gunnerStick.getWPIJoystickButton("ElevatorUp"); climbMotorDown = gunnerStick.getWPIJoystickButton("ElevatorDown"); climbArm = gunnerStick.getWPIJoystickButton("ToggleClimbArm"); diff --git a/src/main/java/frc/robot/Teleop.java b/src/main/java/frc/robot/Teleop.java index 90d552a..a0e7e1b 100644 --- a/src/main/java/frc/robot/Teleop.java +++ b/src/main/java/frc/robot/Teleop.java @@ -171,7 +171,6 @@ public void teleopPeriodic() { xVelocity = joysticks.getXVelocity()*speed; yVelocity = joysticks.getYVelocity()*speed; rotationVelocity = joysticks.getRotationVelocity()*speed* 0.80; - } //Run periodic tasks on the swerve drive, setting the velocity and rotation @@ -197,7 +196,7 @@ private void configureBindings() { ) ); - joysticks.abortVisionAlign + /* joysticks.abortVisionAlign .whenActive(() -> { if (visionTargeting) { visionTargeting = false; @@ -205,7 +204,7 @@ private void configureBindings() { } visionEnabled = !visionEnabled; - }); + }); */ joysticks.intake .whileActiveOnce(