Merge remote-tracking branch 'origin/master'

This commit is contained in:
SpencerPiha
2023-01-28 11:15:49 -06:00

View File

@@ -47,7 +47,7 @@ public class TeleOPTankDriver extends CyberarmState {
} }
} }
if (FreeSpirit) { if (FreeSpirit && System.currentTimeMillis() - lastStepTime >= 2000 && DeltaOdometerR < 4096) {
getCurrentDriveCommand(); getCurrentDriveCommand();
drivePower = -currentDriveCommand; drivePower = -currentDriveCommand;
robot.backLeftDrive.setPower(drivePower); robot.backLeftDrive.setPower(drivePower);
@@ -56,6 +56,10 @@ public class TeleOPTankDriver extends CyberarmState {
robot.frontRightDrive.setPower(drivePower); robot.frontRightDrive.setPower(drivePower);
} }
if (FreeSpirit && System.currentTimeMillis() - lastStepTime >= 2000 && DeltaOdometerR >= 4096) {
FreeSpirit = false;
}
if (Math.abs(engine.gamepad1.left_stick_y) > 0.1 && !FreeSpirit) { if (Math.abs(engine.gamepad1.left_stick_y) > 0.1 && !FreeSpirit) {
drivePower = engine.gamepad1.left_stick_y; drivePower = engine.gamepad1.left_stick_y;
robot.backLeftDrive.setPower(drivePower); robot.backLeftDrive.setPower(drivePower);