diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Blue.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Blue.java index a67b224..0a6be35 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Blue.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Blue.java @@ -257,7 +257,7 @@ public class Blue extends LinearOpMode { turnLeft(90); straightLeft(2); driveForward(6.5); - raisearm(80); + raisearm(45); arm.setPower(0); driveForward(-8); terminateOpModeNow(); @@ -285,24 +285,6 @@ public class Blue extends LinearOpMode { raisearm(80); arm.setPower(0); driveForward(-8); - straightRight(11.5); - driveForward(-15); - turnLeft(90); - straightLeft(15); - driveForward(8); - driveForward(-26); - straightRight(29); - driveForward(-1.5); - raisearm(80); - wrist.setPosition(0); - raisearm(100); - gripper.setPosition(0); - sleep(500); - driveForward(5); - raisearm(-270); - raisearm(50); - wrist.setPosition(1); - driveForward(-5); terminateOpModeNow(); diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBackStage.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBackStage.java index 700182e..4103a70 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBackStage.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBackStage.java @@ -243,7 +243,7 @@ public class BlueBackStage extends LinearOpMode { { telemetry.addData("position", "left"); telemetry.update(); - straightLeft(12); + straightLeft(13.5); raisearm(80); arm.setPower(0); driveForward(-15.5); @@ -268,16 +268,13 @@ public class BlueBackStage extends LinearOpMode { { telemetry.addData("position","right"); telemetry.update(); - turnRight(90); + turnRight(88); straightLeft(2); - driveForward(6.5); + driveForward(5.25); raisearm(80); arm.setPower(0); - driveForward(-21); - straightRight(32); - driveForward(-10); - straightLeft(33); - driveForward(-1.5); + driveForward(-40); + straightLeft(3); raisearm(80); wrist.setPosition(0); raisearm(100); @@ -305,7 +302,7 @@ public class BlueBackStage extends LinearOpMode { raisearm(80); wrist.setPosition(0); raisearm(100); - gripper.setPosition(0.25); + gripper.setPosition(0.3); sleep(500); driveForward(5); terminateOpModeNow(); diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Red.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Red.java index cdb4049..6b2e155 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Red.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/Red.java @@ -262,7 +262,7 @@ public class Red extends LinearOpMode { turnRight(90); straightLeft(2); driveForward(6.5); - raisearm(80); + raisearm(45); arm.setPower(0); driveForward(-10); terminateOpModeNow();