From 84aba36915457f3a134aff596393b5e9619fd22d Mon Sep 17 00:00:00 2001 From: robotics2 Date: Thu, 4 Jan 2024 17:12:27 -0800 Subject: [PATCH] tweaked --- .../ftc/teamcode/BasicOmniOpMode_Linear.java | 2 +- .../org/firstinspires/ftc/teamcode/BlueBackStage.java | 4 ++-- .../org/firstinspires/ftc/teamcode/RedBackStage.java | 2 +- .../java/org/firstinspires/ftc/teamcode/manual.java | 11 ++++++++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BasicOmniOpMode_Linear.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BasicOmniOpMode_Linear.java index b1a528c..fa7b182 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BasicOmniOpMode_Linear.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BasicOmniOpMode_Linear.java @@ -63,7 +63,7 @@ import com.qualcomm.robotcore.util.ElapsedTime; * Remove or comment out the @Disabled line to add this opmode to the Driver Station OpMode list */ -@TeleOp(name="Basic: Omni Linear OpMode", group="Linear Opmode") +@TeleOp(name=" CR file", group="Linear Opmode") @Disabled public class BasicOmniOpMode_Linear extends LinearOpMode { diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBackStage.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBackStage.java index 3f2fd0a..9f029dd 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBackStage.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/BlueBackStage.java @@ -272,8 +272,8 @@ public class BlueBackStage extends LinearOpMode { driveForward(5.25); raisearm(80); arm.setPower(0); - driveForward(-39.5); - straightLeft(4); + driveForward(-38); + straightLeft(5.5); raisearm(80); wrist.setPosition(0); raisearm(100); diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RedBackStage.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RedBackStage.java index 65cdf50..e76d556 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RedBackStage.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/RedBackStage.java @@ -253,7 +253,7 @@ public class RedBackStage extends LinearOpMode { telemetry.update(); turnLeft(90); straightLeft(2); - driveForward(6.5); + driveForward(6); raisearm(80); arm.setPower(0); driveForward(-21); diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/manual.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/manual.java index 6a83d7c..7dfc19e 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/manual.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/manual.java @@ -99,7 +99,8 @@ public class manual extends OpMode { } //double num = 2.25; - final static double MOTOR_HI_SPEED_RATIO = 1.75; + final static double MOTOR_HI_SPEED_RATIO = 2; + final static double MOTOR_MID_SPEED_RATIO = 2.35; final static double MOTOR_LO_SPEED_RATIO = 3.5; final static double ARM_POWER = 3.5; double num = MOTOR_HI_SPEED_RATIO; @@ -121,10 +122,14 @@ public class manual extends OpMode { { num = MOTOR_HI_SPEED_RATIO; } - if (gamepad1.b) + if (gamepad1.x) { num = MOTOR_LO_SPEED_RATIO; } + if (gamepad1.b) + { + num = MOTOR_MID_SPEED_RATIO; + } if(gamepad2.right_stick_y != 0) { arm.setPower(armPower); @@ -138,7 +143,7 @@ public class manual extends OpMode { } if(gamepad2.left_bumper && gamepad2.right_bumper) { - launch.setPosition(1); + launch.setPosition(0); } if(gamepad2.left_trigger > 0.35) {