diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DevTeleop.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DevTeleop.java index 78aba15..a868ec6 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DevTeleop.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DevTeleop.java @@ -5,7 +5,7 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.firstinspires.ftc.teamcode.runmodes.DevTeleopRunMode; -@TeleOp(name = "Dev Teleop", group = "Debug") +@TeleOp(name = "Dev Teleop Actions", group = "Debug") public class DevTeleop extends OpMode { public DevTeleopRunMode runMode; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/runmodes/DevTeleopRunMode.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/runmodes/DevTeleopRunMode.java index 5f5ce3e..e43e73c 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/runmodes/DevTeleopRunMode.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/runmodes/DevTeleopRunMode.java @@ -105,10 +105,12 @@ public class DevTeleopRunMode { */ public void theLift() { if (this.currentGP1.b && !this.previousGP1.b) { - Actions.runBlocking(new SequentialAction( - this.arm.toParkPosition, - this.wrist.toBucketPosition - )); + if (fieldStates.getFieldLocation() == FieldStates.FieldLocation.FIELD) { + Actions.runBlocking(new SequentialAction( + this.arm.toParkPosition, + this.wrist.toBucketPosition + )); + } } } @@ -154,12 +156,14 @@ public class DevTeleopRunMode { */ public void theTravel(){ if (this.currentGP2.dpad_down && !this.previousGP2.dpad_down){ - fieldStates.setFieldLocation(FieldStates.FieldLocation.FIELD); - Actions.runBlocking(new SequentialAction( - lift.toFloor, - arm.toBucketPosition, - wrist.toFloorPosition - )); + if (fieldStates.getFieldLocation() == FieldStates.FieldLocation.BUCKET) { + Actions.runBlocking(new SequentialAction( + lift.toFloor, + arm.toBucketPosition, + wrist.toFloorPosition + )); + fieldStates.setFieldLocation(FieldStates.FieldLocation.FIELD); + } } }