From 0c6759f3f3b3f78d8362e62bfeb74031f3f9721f Mon Sep 17 00:00:00 2001 From: Sodi Date: Sat, 29 Oct 2022 11:44:13 -0500 Subject: [PATCH] Slowing the button rotation on TeleOP, Sprint 3 TeleOP, take 3. --- .../testing/states/PrototypeTeleOPState.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/TeamCode/src/main/java/org/timecrafters/testing/states/PrototypeTeleOPState.java b/TeamCode/src/main/java/org/timecrafters/testing/states/PrototypeTeleOPState.java index 040b144..34aeda9 100644 --- a/TeamCode/src/main/java/org/timecrafters/testing/states/PrototypeTeleOPState.java +++ b/TeamCode/src/main/java/org/timecrafters/testing/states/PrototypeTeleOPState.java @@ -153,14 +153,14 @@ public class PrototypeTeleOPState extends CyberarmState { RobotRotation = robot.imu.getAngularOrientation().firstAngle; RotationTarget = -180; if (RobotRotation < 0 && RobotRotation > -177) { - drivePower = (1 * (Math.abs(RobotRotation - RotationTarget)/180)) + 0.3; + drivePower = 1 * (Math.abs(RobotRotation) - Math.abs(RotationTarget))/180 + 0.3; robot.backLeftDrive.setPower(drivePower); robot.backRightDrive.setPower(-drivePower); robot.frontLeftDrive.setPower(drivePower); robot.frontRightDrive.setPower(-drivePower); } if (RobotRotation > 0) { - drivePower = (-1 * (Math.abs(RobotRotation - RotationTarget)/180)) - 0.3; + drivePower = -1 * (Math.abs(RobotRotation) - Math.abs(RotationTarget))/180 + 0.3; robot.backLeftDrive.setPower(drivePower); robot.backRightDrive.setPower(-drivePower); robot.frontLeftDrive.setPower(drivePower); @@ -179,14 +179,14 @@ public class PrototypeTeleOPState extends CyberarmState { RobotRotation = robot.imu.getAngularOrientation().firstAngle; RotationTarget = 0; if (RobotRotation < -3) { - drivePower = (-1 * (Math.abs(RobotRotation - RotationTarget)/180)) - 0.3; + drivePower = -1 * (Math.abs(RobotRotation) - Math.abs(RotationTarget))/180 + 0.3; robot.backLeftDrive.setPower(drivePower); robot.backRightDrive.setPower(-drivePower); robot.frontLeftDrive.setPower(drivePower); robot.frontRightDrive.setPower(-drivePower); } if (RobotRotation > 3) { - drivePower = (1 * (Math.abs(RobotRotation - RotationTarget)/180)) + 0.3; + drivePower = 1 * (Math.abs(RobotRotation) - Math.abs(RotationTarget))/180 + 0.3; robot.backLeftDrive.setPower(drivePower); robot.backRightDrive.setPower(-drivePower); robot.frontLeftDrive.setPower(drivePower); @@ -204,14 +204,14 @@ public class PrototypeTeleOPState extends CyberarmState { RobotRotation = robot.imu.getAngularOrientation().firstAngle; RotationTarget = 135; if (RobotRotation > -45 && RobotRotation < 132) {//CCW - drivePower = (-1 * (Math.abs(RobotRotation - RotationTarget)/180)) - 0.3; + drivePower = -1 * (Math.abs(RobotRotation) - Math.abs(RotationTarget))/180 + 0.3; robot.backLeftDrive.setPower(drivePower); robot.backRightDrive.setPower(-drivePower); robot.frontLeftDrive.setPower(drivePower); robot.frontRightDrive.setPower(-drivePower); } if (RobotRotation < -45 || RobotRotation > 138) {//CW - drivePower = (1 * (Math.abs(RobotRotation - RotationTarget)/180)) + 0.3; + drivePower = 1 * (Math.abs(RobotRotation) - Math.abs(RotationTarget))/180 + 0.3; robot.backLeftDrive.setPower(drivePower); robot.backRightDrive.setPower(-drivePower); robot.frontLeftDrive.setPower(drivePower); @@ -229,14 +229,14 @@ public class PrototypeTeleOPState extends CyberarmState { RobotRotation = robot.imu.getAngularOrientation().firstAngle; RotationTarget = -135; if (RobotRotation < 45 && RobotRotation > -132) {//CCW - drivePower = (1 * (Math.abs(RobotRotation - RotationTarget)/180)) + 0.3; + drivePower = 1 * (Math.abs(RobotRotation) - Math.abs(RotationTarget))/180 + 0.3; robot.backLeftDrive.setPower(drivePower); robot.backRightDrive.setPower(-drivePower); robot.frontLeftDrive.setPower(drivePower); robot.frontRightDrive.setPower(-drivePower); } if (RobotRotation > 45 || RobotRotation < -138) {//CW - drivePower = (-1 * (Math.abs(RobotRotation - RotationTarget)/180)) - 0.3; + drivePower = -1 * (Math.abs(RobotRotation) - Math.abs(RotationTarget))/180 + 0.3; robot.backLeftDrive.setPower(drivePower); robot.backRightDrive.setPower(-drivePower); robot.frontLeftDrive.setPower(drivePower);