Merge remote-tracking branch 'origin/master'

This commit is contained in:
SpencerPiha
2022-11-07 16:36:13 -06:00

View File

@@ -360,7 +360,7 @@ public class PrototypeTeleOPState extends CyberarmState {
}
if (engine.gamepad2.dpad_up) {
if (robot.HighRiserLeft.getPosition() < 0.9) {
if (robot.HighRiserLeft.getPosition() < 1.0) {
if (System.currentTimeMillis() - lastStepTime >= 150) {
lastStepTime = System.currentTimeMillis();
robot.HighRiserLeft.setPosition(robot.HighRiserLeft.getPosition() + 0.05);
@@ -380,7 +380,7 @@ public class PrototypeTeleOPState extends CyberarmState {
}
if (engine.gamepad2.y) {
if (robot.HighRiserLeft.getPosition() < 0.84) {
if (robot.HighRiserLeft.getPosition() < 0.9) {
if (System.currentTimeMillis() - lastStepTime >= 150) {
lastStepTime = System.currentTimeMillis();
robot.HighRiserLeft.setPosition(robot.HighRiserLeft.getPosition() + 0.05);