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 238b860..7043acd 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 @@ -103,31 +103,25 @@ public class CometBotAutoDevelopment { wrist.grabBlueberrySkyhook(); arm.grabBlueberrySkyhook(); } - if(arm.getState() == ArmSubsystem.ArmState.GRAB_BLUEBERRY_SKYHOOK) - claw.init(); + + /*if(arm.getState() == ArmSubsystem.ArmState.GRAB_BLUEBERRY_SKYHOOK) + claw.closeClaw();*/ } - private void hangSkyhook(){ - if(currentGamepad1.right_bumper && !previousGamepad1.right_bumper){ + private void hangSkyhook() { + if (currentGamepad1.right_bumper && !previousGamepad1.right_bumper) { dualSlides.toHangHeight(); + //check wrist make go throught test files again wrist.hangBlueberrySkyhook(); - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } arm.hangBlueberrySkyhook(); - if(arm.getState() == ArmSubsystem.ArmState.HANG_BLUEBERRY_SKYHOOK){ + if (arm.getState() == ArmSubsystem.ArmState.HANG_BLUEBERRY_SKYHOOK) { try { Thread.sleep(2000); } catch (InterruptedException e) { throw new RuntimeException(e); - }claw.closeClaw(); + } } } - - } - - private void openClaw(){ + }private void openClaw(){ if(currentGamepad2.right_bumper && !previousGamepad2.right_bumper){ claw.switchState(); } diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/configs/RobotConstants.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/configs/RobotConstants.java index 9345f6d..089bccf 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/configs/RobotConstants.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/configs/RobotConstants.java @@ -13,7 +13,7 @@ public class RobotConstants { public final static double armPark = 0.33; //value for grabbing the hook Specimen public final static double grabBlueberry = 0.35; - public final static double armGrabBlueberrySkyhook = 0.15; + public final static double armGrabBlueberrySkyhook = 0.1; public final static double wristGrabBlueberrySkyhook = 0.15; public final static double armHangBlueberrySkyhook = 0.23; public final static double wristHangBlueberrySkyhook = 0.7;