diff --git a/TeamCode/src/main/java/org/timecrafters/FreightFrenzy/Competition/TeleOp/States/TeleOpState.java b/TeamCode/src/main/java/org/timecrafters/FreightFrenzy/Competition/TeleOp/States/TeleOpState.java index 070fb76..3d56424 100644 --- a/TeamCode/src/main/java/org/timecrafters/FreightFrenzy/Competition/TeleOp/States/TeleOpState.java +++ b/TeamCode/src/main/java/org/timecrafters/FreightFrenzy/Competition/TeleOp/States/TeleOpState.java @@ -88,10 +88,12 @@ public class TeleOpState extends CyberarmState { // button x pressed carousel wheel move. - if (engine.gamepad1.x){ + if (engine.gamepad2.x){ + robot.carouselWheel.setPower(0.5); + } + else if (engine.gamepad2.a){ robot.carouselWheel.setPower(1); } - else { robot.carouselWheel.setPower(0); }