Merge remote-tracking branch 'origin/branch-rc-chassis-14493-subsystem-actions' into branch-rc-chassis-14493-subsystem-actions

This commit is contained in:
2024-11-06 23:16:27 -08:00
2 changed files with 15 additions and 11 deletions

View File

@ -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;

View File

@ -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);
}
}
}