diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/CometBotAutoDevelopment.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/CometBotAutoDevelopment.java index ece2fcb..abde96c 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/CometBotAutoDevelopment.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/CometBotAutoDevelopment.java @@ -107,20 +107,22 @@ public class CometBotAutoDevelopment { claw.init(); } private void hangSkyhook (){ - dualSlides.toHangHeight(); - wrist.hangBlueberrySkyhook(); - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - arm.hangBlueberrySkyhook(); - if(arm.getState() == ArmSubsystem.ArmState.HANG_BLUEBERRY_SKYHOOK){ + if(currentGamepad1.right_bumper && !previousGamepad1.right_bumper){ + dualSlides.toHangHeight(); + wrist.hangBlueberrySkyhook(); try { Thread.sleep(1000); } catch (InterruptedException e) { throw new RuntimeException(e); - }claw.closeClaw(); + } + arm.hangBlueberrySkyhook(); + if(arm.getState() == ArmSubsystem.ArmState.HANG_BLUEBERRY_SKYHOOK){ + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + }claw.closeClaw(); + } } } @@ -137,7 +139,6 @@ public class CometBotAutoDevelopment { } private void armAndWristToFloor(){ if(currentGamepad2.a && !previousGamepad2.a){ - double increment = 0.7 - arm.getPosition(); for(int i = 0; i < 3; i ++){ arm.setPosition(arm.getPosition() + increment);