Commit

# Conflicts:
#	TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DevTeleop.java

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/AsherOrientBlue.java

@@ -0,0 +1,93 @@
+package org.firstinspires.ftc.teamcode;
+
+import com.acmerobotics.dashboard.FtcDashboard;
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.OpMode;
+
+import org.firstinspires.ftc.robotcore.external.Telemetry;
+import org.firstinspires.ftc.teamcode.pedroPathing.follower.Follower;
+import org.firstinspires.ftc.teamcode.pedroPathing.localization.Pose;
+import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.BezierCurve;
+import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.BezierLine;
+import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.PathChain;
+import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.Point;
+
+/**
+ * This is the Circle autonomous OpMode. It runs the robot in a PathChain that's actually not quite
+ * a circle, but some Bezier curves that have control points set essentially in a square. However,
+ * it turns enough to tune your centripetal force correction and some of your heading. Some lag in
+ * heading is to be expected.
+ *
+ * @author Anyi Lin - 10158 Scott's Bots
+ * @author Aaron Yang - 10158 Scott's Bots
+ * @author Harrison Womack - 10158 Scott's Bots
+ * @version 1.0, 3/12/2024
+ */
+@Config
+@Autonomous(name = "AsherOrientBlue", group = "Autonomous Pathing Tuning")
+public class AsherOrientBlue extends OpMode {
+    private Telemetry telemetryA;
+
+    private Follower follower;
+
+    private PathChain path;
+
+    private final Pose startPose = new Pose(9.757, 84.983, 90);
+
+    /**
+     * This initializes the Follower and creates the PathChain for the "circle". Additionally, this
+     * initializes the FTC Dashboard telemetry.
+     */
+    @Override
+    public void init() {
+        follower = new Follower(hardwareMap);
+
+        follower.setMaxPower(.4);
+
+        follower.setStartingPose(startPose);
+
+        path = follower.pathBuilder()
+                /*
+                * Only update this path
+                 */
+                .addPath(
+                        // Line 1
+                        new BezierLine(
+                                new Point(20.500, 7.800, Point.CARTESIAN),
+                                new Point(20.500, 87.500, Point.CARTESIAN)
+                        )
+                )
+                .addPath(
+                        // Line 2
+                        new BezierLine(
+                                new Point(20.500, 87.500, Point.CARTESIAN),
+                                new Point(7.800, 87.500, Point.CARTESIAN)
+                        )
+                )
+
+                .setConstantHeadingInterpolation(Math.toRadians(90)).build();
+                /*
+                * End of only update this path
+                 */
+
+        follower.followPath(path);
+
+        telemetryA = new MultipleTelemetry(this.telemetry, FtcDashboard.getInstance().getTelemetry());
+        telemetryA.update();
+    }
+
+    /**
+     * This runs the OpMode, updating the Follower as well as printing out the debug statements to
+     * the Telemetry, as well as the FTC Dashboard.
+     */
+    @Override
+    public void loop() {
+        follower.update();
+        if (follower.atParametricEnd()) {
+            follower.followPath(path);
+        }
+        follower.telemetryDebug(telemetryA);
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/AsherPathBlueV1.java

@@ -0,0 +1,133 @@
+package org.firstinspires.ftc.teamcode;
+
+import com.acmerobotics.dashboard.FtcDashboard;
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.OpMode;
+
+import org.firstinspires.ftc.robotcore.external.Telemetry;
+import org.firstinspires.ftc.teamcode.pedroPathing.follower.Follower;
+import org.firstinspires.ftc.teamcode.pedroPathing.localization.Pose;
+import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.BezierCurve;
+import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.BezierLine;
+import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.PathChain;
+import org.firstinspires.ftc.teamcode.pedroPathing.pathGeneration.Point;
+
+/**
+ * This is the Circle autonomous OpMode. It runs the robot in a PathChain that's actually not quite
+ * a circle, but some Bezier curves that have control points set essentially in a square. However,
+ * it turns enough to tune your centripetal force correction and some of your heading. Some lag in
+ * heading is to be expected.
+ *
+ * @author Anyi Lin - 10158 Scott's Bots
+ * @author Aaron Yang - 10158 Scott's Bots
+ * @author Harrison Womack - 10158 Scott's Bots
+ * @version 1.0, 3/12/2024
+ */
+@Config
+@Autonomous(name = "AsherPathBlueV1", group = "Autonomous Pathing Tuning")
+public class AsherPathBlueV1 extends OpMode {
+    private Telemetry telemetryA;
+
+    private Follower follower;
+
+    private PathChain path;
+
+    private final Pose startPose = new Pose(9.757, 84.983, 90);
+
+    /**
+     * This initializes the Follower and creates the PathChain for the "circle". Additionally, this
+     * initializes the FTC Dashboard telemetry.
+     */
+    @Override
+    public void init() {
+        follower = new Follower(hardwareMap);
+
+        follower.setMaxPower(.4);
+
+        follower.setStartingPose(startPose);
+
+        path = follower.pathBuilder()
+                /*
+                * Only update this path
+                 */
+                .addPath(
+                        // Line 1
+                        new BezierCurve(
+                                new Point(7.800, 87.5, Point.CARTESIAN),
+                                new Point(19.000, 116.000, Point.CARTESIAN),
+                                new Point(93.000, 118.000, Point.CARTESIAN),
+                                new Point(45.000, 115.000, Point.CARTESIAN)
+                        )
+                )
+                .addPath(
+                        // Line 2
+                        new BezierLine(
+                                new Point(45.000, 115.000, Point.CARTESIAN),
+                                new Point(14.000, 126.000, Point.CARTESIAN)
+                        )
+                )
+                .addPath(
+                        // Line 3
+                        new BezierCurve(
+                                new Point(14.000, 126.000, Point.CARTESIAN),
+                                new Point(43.000, 112.500, Point.CARTESIAN),
+                                new Point(64.000, 92.000, Point.CARTESIAN),
+                                new Point(77.000, 117.000, Point.CARTESIAN)
+                        )
+                )
+                .addPath(
+                        // Line 4
+                        new BezierLine(
+                                new Point(77.000, 117.000, Point.CARTESIAN),
+                                new Point(20.000, 135.000, Point.CARTESIAN)
+                        )
+                )
+                .addPath(
+                        // Line 5
+                        new BezierCurve(
+                                new Point(20.000, 135.000, Point.CARTESIAN),
+                                new Point(113.000, 95.000, Point.CARTESIAN),
+                                new Point(69.000, 135.000, Point.CARTESIAN)
+                        )
+                )
+                .addPath(
+                        // Line 6
+                        new BezierLine(
+                                new Point(69.000, 135.000, Point.CARTESIAN),
+                                new Point(20.500, 135.000, Point.CARTESIAN)
+                        )
+                )
+                .addPath(
+                        // Line 7
+                        new BezierCurve(
+                                new Point(20.500, 135.000, Point.CARTESIAN),
+                                new Point(101.500, 95.500, Point.CARTESIAN),
+                                new Point(72.500, 95.500, Point.CARTESIAN)
+                        )
+                )
+                .setConstantHeadingInterpolation(Math.toRadians(90)).build();
+                /*
+                * End of only update this path
+                 */
+
+        follower.followPath(path);
+
+        telemetryA = new MultipleTelemetry(this.telemetry, FtcDashboard.getInstance().getTelemetry());
+        telemetryA.update();
+    }
+
+    /**
+     * This runs the OpMode, updating the Follower as well as printing out the debug statements to
+     * the Telemetry, as well as the FTC Dashboard.
+     */
+    @Override
+    public void loop() {
+        follower.update();
+        if (follower.atParametricEnd()) {
+            follower.followPath(path);
+        }
+        follower.telemetryDebug(telemetryA);
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DevTeleOpRemix.java

@@ -0,0 +1,97 @@
+package org.firstinspires.ftc.teamcode;
+
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
+import com.qualcomm.robotcore.eventloop.opmode.OpMode;
+import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
+import com.qualcomm.robotcore.hardware.Gamepad;
+
+import org.firstinspires.ftc.teamcode.subsystem.ArmSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.ClawSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.LiftSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.MotorsSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.WristSubsystem;
+
+@TeleOp(name = "Dev Teleop Remix", group = "Debug")
+@Disabled
+public class DevTeleOpRemix extends OpMode {
+
+    public ClawSubsystem claw;
+    public ArmSubsystem arm;
+    public WristSubsystem wrist;
+    public LiftSubsystem lift;
+    public MotorsSubsystem motors;
+
+    public Gamepad currentGamepad1;
+    public Gamepad previousGamepad1;
+    public Gamepad currentGamepad2;
+    public Gamepad previousGamepad2;
+
+    public double power = .6;
+
+    @Override
+    public void init() {
+
+        claw = new ClawSubsystem(hardwareMap, ClawSubsystem.ClawState.CLOSED);
+        arm = new ArmSubsystem(hardwareMap, ArmSubsystem.ArmState.PARK);
+        wrist = new WristSubsystem(hardwareMap, WristSubsystem.WristState.FLOOR);
+        lift = new LiftSubsystem(hardwareMap);
+        motors = new MotorsSubsystem(hardwareMap, telemetry, power);
+
+        claw.init();
+        arm.init();
+        wrist.init();
+        lift.init();
+        motors.init();
+
+        currentGamepad1 = new Gamepad();
+        previousGamepad1 = new Gamepad();
+        currentGamepad2 = new Gamepad();
+        previousGamepad2 = new Gamepad();
+    }
+
+    public void theDrop(ArmSubsystem arm, WristSubsystem wrist) {
+        if (currentGamepad1.a && !previousGamepad1.a) {
+            wrist.floorWrist();
+            arm.engageArm();
+        }
+    }
+
+    public void thePickup(ClawSubsystem claw) {
+        if (currentGamepad1.x && !previousGamepad1.x) {
+            claw.switchState();
+        }
+    }
+
+    public void theLift(ArmSubsystem arm, WristSubsystem wrist) {
+        if (currentGamepad1.b && !previousGamepad1.b) {
+            arm.parkArm();
+            wrist.bucketWrist();
+        }
+    }
+
+    public void theLowBucketScore(LiftSubsystem lift, WristSubsystem wrist, ArmSubsystem arm) {
+        if (currentGamepad1.y && !previousGamepad1.y) {
+            lift.toLowBucket();
+            wrist.bucketWrist();
+        }
+    }
+
+    @Override
+    public void loop() {
+
+        previousGamepad1.copy(currentGamepad1);
+        currentGamepad1.copy(gamepad1);
+
+        previousGamepad2.copy(currentGamepad2);
+        currentGamepad2.copy(gamepad2);
+
+        theDrop(arm, wrist);
+        thePickup(claw);
+        theLift(arm, wrist);
+        theLowBucketScore(lift, wrist, arm);
+
+        motors.calculateTrajectory(gamepad1);
+
+    }
+
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DevTeleOpRemixDeux.java

@@ -0,0 +1,107 @@
+package org.firstinspires.ftc.teamcode;
+
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
+import com.qualcomm.robotcore.eventloop.opmode.OpMode;
+import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
+import com.qualcomm.robotcore.hardware.Gamepad;
+
+import org.firstinspires.ftc.teamcode.pedroPathing.follower.Follower;
+import org.firstinspires.ftc.teamcode.subsystem.ArmSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.ClawSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.LiftSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.MotorsSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.WristSubsystem;
+
+@TeleOp(name = "Dev Teleop Remix Deux", group = "Debug")
+@Disabled
+public class DevTeleOpRemixDeux extends OpMode {
+
+    private Follower follower;
+
+    public ClawSubsystem claw;
+    public ArmSubsystem arm;
+    public WristSubsystem wrist;
+    public LiftSubsystem lift;
+    public MotorsSubsystem motors;
+
+    public Gamepad currentGamepad1;
+    public Gamepad previousGamepad1;
+    public Gamepad currentGamepad2;
+    public Gamepad previousGamepad2;
+
+    public double power = .6;
+
+    @Override
+    public void init() {
+
+        follower = new Follower(hardwareMap);
+
+        claw = new ClawSubsystem(hardwareMap, ClawSubsystem.ClawState.CLOSED);
+        arm = new ArmSubsystem(hardwareMap, ArmSubsystem.ArmState.PARK);
+        wrist = new WristSubsystem(hardwareMap, WristSubsystem.WristState.FLOOR);
+        motors = new MotorsSubsystem(hardwareMap, telemetry);
+        lift = new LiftSubsystem(hardwareMap);
+
+        claw.init();
+        arm.init();
+        wrist.init();
+        lift.init();
+        motors.init();
+
+        currentGamepad1 = new Gamepad();
+        previousGamepad1 = new Gamepad();
+        currentGamepad2 = new Gamepad();
+        previousGamepad2 = new Gamepad();
+
+        follower.setMaxPower(this.power);
+        follower.startTeleopDrive();
+
+    }
+
+    public void theDrop(ArmSubsystem arm, WristSubsystem wrist) {
+        if (currentGamepad1.a && !previousGamepad1.a) {
+            wrist.floorWrist();
+            arm.engageArm();
+        }
+    }
+
+    public void thePickup(ClawSubsystem claw) {
+        if (currentGamepad1.x && !previousGamepad1.x) {
+            claw.switchState();
+        }
+    }
+
+    public void theLift(ArmSubsystem arm, WristSubsystem wrist) {
+        if (currentGamepad1.b && !previousGamepad1.b) {
+            arm.parkArm();
+            wrist.bucketWrist();
+        }
+    }
+
+    public void theLowBucketScore(LiftSubsystem lift, WristSubsystem wrist, ArmSubsystem arm) {
+        if (currentGamepad1.y && !previousGamepad1.y) {
+            lift.toLowBucket();
+            wrist.bucketWrist();
+        }
+    }
+
+    @Override
+    public void loop() {
+
+        previousGamepad1.copy(currentGamepad1);
+        currentGamepad1.copy(gamepad1);
+
+        previousGamepad2.copy(currentGamepad2);
+        currentGamepad2.copy(gamepad2);
+
+        theDrop(arm, wrist);
+        thePickup(claw);
+        theLift(arm, wrist);
+        theLowBucketScore(lift, wrist, arm);
+
+        follower.setTeleOpMovementVectors(-gamepad1.left_stick_y, -gamepad1.left_stick_x, -gamepad1.right_stick_x);
+        follower.update();
+
+    }
+
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/DevTeleop.java

@@ -0,0 +1,196 @@
+package org.firstinspires.ftc.teamcode;
+
+import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_ENCODER;
+import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_ENCODER_DIRECTION;
+import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_LEFT_MOTOR;
+import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_LEFT_MOTOR_DIRECTION;
+import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_RIGHT_MOTOR;
+import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_RIGHT_MOTOR_DIRECTION;
+import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_LEFT_MOTOR;
+import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_LEFT_MOTOR_DIRECTION;
+import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_RIGHT_MOTOR;
+import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_RIGHT_MOTOR_DIRECTION;
+import static org.firstinspires.ftc.teamcode.PedroConstants.LEFT_ENCODER;
+import static org.firstinspires.ftc.teamcode.PedroConstants.LEFT_ENCODER_DIRECTION;
+import static org.firstinspires.ftc.teamcode.PedroConstants.RIGHT_ENCODER;
+import static org.firstinspires.ftc.teamcode.PedroConstants.RIGHT_ENCODER_DIRECTION;
+
+import android.graphics.Point;
+
+import com.qualcomm.robotcore.eventloop.opmode.OpMode;
+import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
+import com.qualcomm.robotcore.hardware.DcMotor;
+import com.qualcomm.robotcore.hardware.DcMotorEx;
+import com.qualcomm.robotcore.hardware.Gamepad;
+
+import org.firstinspires.ftc.teamcode.pedroPathing.localization.Encoder;
+import org.firstinspires.ftc.teamcode.subsystem.ArmSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.ClawSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.LiftSubsystem;
+import org.firstinspires.ftc.teamcode.subsystem.WristSubsystem;
+
+@TeleOp(name = "Dev Teleop", group = "Debug")
+public class DevTeleop extends OpMode {
+
+    public ClawSubsystem claw;
+    public ArmSubsystem arm;
+    public WristSubsystem wrist;
+    public LiftSubsystem lift;
+    public Gamepad currentGamepad1;
+    public Gamepad previousGamepad1;
+    public Gamepad currentGamepad2;
+    public Gamepad previousGamepad2;
+    public DcMotor frontLeftMotor;
+    public DcMotor backLeftMotor;
+    public DcMotor frontRightMotor;
+    public DcMotor backRightMotor;
+
+    private double MAX_POWER = .45;
+    @Override
+    public void init() {
+        claw = new ClawSubsystem(hardwareMap, ClawSubsystem.ClawState.CLOSED);
+        arm = new ArmSubsystem(hardwareMap, ArmSubsystem.ArmState.PARK);
+        wrist = new WristSubsystem(hardwareMap, WristSubsystem.WristState.FLOOR);
+        lift = new LiftSubsystem(hardwareMap);
+        claw.init();
+        arm.init();
+        wrist.init();
+        lift.init();
+
+        frontLeftMotor  = hardwareMap.get(DcMotor.class, FRONT_LEFT_MOTOR);
+        backLeftMotor  = hardwareMap.get(DcMotor.class, BACK_LEFT_MOTOR);
+        frontRightMotor = hardwareMap.get(DcMotor.class, FRONT_RIGHT_MOTOR);
+        backRightMotor = hardwareMap.get(DcMotor.class, BACK_RIGHT_MOTOR);
+
+        frontLeftMotor.setDirection(FRONT_LEFT_MOTOR_DIRECTION);
+        backLeftMotor.setDirection(BACK_LEFT_MOTOR_DIRECTION);
+        frontRightMotor.setDirection(FRONT_RIGHT_MOTOR_DIRECTION);
+        backRightMotor.setDirection(BACK_RIGHT_MOTOR_DIRECTION);
+
+        currentGamepad1 = new Gamepad();
+        previousGamepad1 = new Gamepad();
+        currentGamepad2 = new Gamepad();
+        previousGamepad2 = new Gamepad();
+    }
+
+    public void theDrop(ArmSubsystem arm, WristSubsystem wrist) {
+//pick up
+        if (currentGamepad2.dpad_down && !previousGamepad2.dpad_down) {
+            wrist.floorWrist();
+            arm.engageArm();
+        }
+
+
+
+    }
+    public void thePickup(ClawSubsystem claw) {
+//claw open close
+        if (currentGamepad2.right_bumper && !previousGamepad2.right_bumper) {
+            claw.switchState();
+        }
+
+    }
+
+    /* public void theLift(ArmSubsystem arm, WristSubsystem wrist) {
+
+        if (currentGamepad1.b && !previousGamepad1.b) {
+            arm.parkArm();
+            wrist.bucketWrist();
+        }
+
+    }
+*/
+    public void theLowBucketScore(LiftSubsystem lift, WristSubsystem wrist, ArmSubsystem arm) {
+//low bucket
+        if (currentGamepad2.a && !previousGamepad2.a) {
+            lift.toLowBucket();
+            arm.bucketArm();
+            wrist.bucketWrist();
+        }
+    }
+
+    public void theHighBucketScore(LiftSubsystem lift, WristSubsystem wrist, ArmSubsystem arm) {
+//high basket
+        if (currentGamepad2.b && !previousGamepad2.b) {
+            lift.toHighBucket();
+            arm.bucketArm();
+            wrist.bucketWrist();
+        }
+    }
+
+    public void theTravel(LiftSubsystem lift, ArmSubsystem arm, WristSubsystem wrist){
+//
+        if (currentGamepad2.dpad_right && !previousGamepad2.dpad_right){
+            lift.toFloor();
+            arm.bucketArm();
+            wrist.floorWrist();
+        }
+    }
+
+    public void hoverState(ArmSubsystem arm, WristSubsystem wrist, LiftSubsystem lift){
+        if (currentGamepad1.dpad_left && !previousGamepad2.dpad_left){
+            lift.toHover();
+            wrist.floorWrist();
+            arm.engageArm();
+        }
+
+
+    }
+
+    @Override
+    public void loop() {
+        previousGamepad1.copy(currentGamepad1);
+        currentGamepad1.copy(gamepad1);
+        previousGamepad2.copy(currentGamepad2);
+        currentGamepad2.copy(gamepad2);
+
+
+        theDrop(arm, wrist);
+        thePickup(claw);
+       // theLift(arm, wrist);
+        theLowBucketScore(lift, wrist, arm);
+        theHighBucketScore(lift, wrist, arm);
+        theTravel(lift, arm, wrist);
+
+        double max;
+
+        // POV Mode uses left joystick to go forward & strafe, and right joystick to rotate.
+        double axial   = -gamepad1.left_stick_y;  // Note: pushing stick forward gives negative value
+        double lateral =  gamepad1.left_stick_x;
+        double yaw     =  gamepad1.right_stick_x;
+
+        // Combine the joystick requests for each axis-motion to determine each wheel's power.
+        // Set up a variable for each drive wheel to save the power level for telemetry.
+        double leftFrontPower  = axial + lateral + yaw;
+        double rightFrontPower = axial - lateral - yaw;
+        double leftBackPower   = axial - lateral + yaw;
+        double rightBackPower  = axial + lateral - yaw;
+
+        // Normalize the values so no wheel power exceeds 100%
+        // This ensures that the robot maintains the desired motion.
+        max = Math.max(Math.abs(leftFrontPower), Math.abs(rightFrontPower));
+        max = Math.max(max, Math.abs(leftBackPower));
+        max = Math.max(max, Math.abs(rightBackPower));
+
+        if (max > 1.0) {
+            leftFrontPower  /= max;
+            rightFrontPower /= max;
+            leftBackPower   /= max;
+            rightBackPower  /= max;
+        }
+
+
+        // Send calculated power to wheels
+        frontLeftMotor.setPower(leftFrontPower * MAX_POWER);
+        frontRightMotor.setPower(rightFrontPower * MAX_POWER);
+        backLeftMotor.setPower(leftBackPower * MAX_POWER);
+        backRightMotor.setPower(rightBackPower * MAX_POWER);
+
+        // Show the elapsed game time and wheel power.
+        telemetry.addData("Front left/Right", "%4.2f, %4.2f", leftFrontPower, rightFrontPower);
+        telemetry.addData("Back  left/Right", "%4.2f, %4.2f", leftBackPower, rightBackPower);
+        telemetry.addData("Current Lift Position", lift.getPosition());
+        telemetry.update();
+
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/PedroConstants.java

@@ -14,6 +14,7 @@ public class PedroConstants {
 
 
     // Robot motor configurations
+    public static final String BRAIN_ROT = "Sikidi rizz 360 no teleop tf2 mama mia 2cool 4skool yasyasy yasyasyasyasyasyasyaysy ohio yes heh me is moar skeebeedee than u walked and got tripped on by your aunt my very educaded mother just served us nine what? just kydinfoiwfowefwofwioefoiejfeoiwjfomdsklfnslefknesfklnkfenfenkfeknfenkfeknfenkefnk";
     public static final String FRONT_LEFT_MOTOR = "Drive front lt";
     public static final String BACK_LEFT_MOTOR  = "Drive back lt";
     public static final String FRONT_RIGHT_MOTOR  = "Drive front rt";

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/ArmTest.java

@@ -27,7 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.firstinspires.ftc.teamcode;
+package org.firstinspires.ftc.teamcode.cometbots.tests;
 
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 import com.qualcomm.robotcore.eventloop.opmode.TeleOp;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/ClawTest.java

@@ -27,7 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.firstinspires.ftc.teamcode;
+package org.firstinspires.ftc.teamcode.cometbots.tests;
 
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 import com.qualcomm.robotcore.eventloop.opmode.TeleOp;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/LiftRawTest.java

@@ -27,7 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.firstinspires.ftc.teamcode;
+package org.firstinspires.ftc.teamcode.cometbots.tests;
 
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 import com.qualcomm.robotcore.eventloop.opmode.TeleOp;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/LiftTest.java

@@ -27,12 +27,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.firstinspires.ftc.teamcode;
+package org.firstinspires.ftc.teamcode.cometbots.tests;
 
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
-import com.qualcomm.robotcore.hardware.DcMotor;
-import com.qualcomm.robotcore.hardware.DcMotorSimple;
 import com.qualcomm.robotcore.hardware.Gamepad;
 import com.qualcomm.robotcore.util.ElapsedTime;
 
@@ -64,6 +62,7 @@ public class LiftTest extends LinearOpMode {
         Gamepad currentGamepad1 = new Gamepad();
         Gamepad previousGamepad1 = new Gamepad();
 
+        lift.init();
         waitForStart();
         runtime.reset();
 
@@ -75,7 +74,7 @@ public class LiftTest extends LinearOpMode {
             currentGamepad1.copy(gamepad1);
 
             if (currentGamepad1.square && !previousGamepad1.square) {
-                lift.toZero();
+                lift.toFloor();
             }
 
             if (currentGamepad1.triangle && !previousGamepad1.triangle) {

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/tests/WristTest.java

@@ -27,7 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.firstinspires.ftc.teamcode;
+package org.firstinspires.ftc.teamcode.cometbots.tests;
 
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 import com.qualcomm.robotcore.eventloop.opmode.TeleOp;

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/configs/RobotConstants.java

@@ -4,17 +4,19 @@ import com.acmerobotics.dashboard.config.Config;
 
 @Config
 public class RobotConstants {
-    public static double clawClose = 0.95;
-    public static double clawOpen = 0.5;
+    public static double clawClose = 1.00;
+    public static double clawOpen = 0.05;
 
     public static double armEngage = 0.5;
     public static double armPark = 0.125;
     public static double armBucket = 0.175;
 
     public static double wristFloor = 0.625;
-    public static double wristBucket = 0.25;
-    public static int liftZeroPos = 0;
+    public static double wristBucket = 0.215;
+    public static int liftToFloorPos = 20;
+    public static int liftToFloatPos = 150;
     public static int liftToLowBucketPos = 2250;
-    public static int liftToHighBucketPos = 3700;
+    public static int liftToHighBucketPos = 3900;
     public static double liftPower = .45;
+    public static int liftToHoverState = 60;
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/runmodes/Auto.java

@@ -33,6 +33,8 @@ public class Auto {
     public Follower follower;
     public Telemetry telemetry;
 
+    public int caseState = 1;
+
     public Auto(HardwareMap hardwareMap, Telemetry telemetry, Follower follower) {
         claw = new ClawSubsystem(hardwareMap, ClawSubsystem.ClawState.CLOSED);
         arm = new ArmSubsystem(hardwareMap, ArmSubsystem.ArmState.PARK);
@@ -61,23 +63,52 @@ public class Auto {
     }
 
     public void update() {
-        //follower.update();
-        if (clawTimer.getElapsedTimeSeconds() > 2) {
-            claw.openClaw();
-        }
-        if (armTimer.getElapsedTimeSeconds() > 4) {
-            arm.engageArm();
-        }
-        if (clawTimer.getElapsedTimeSeconds() > 6) {
-            claw.closeClaw();
-        }
-        if (armTimer.getElapsedTimeSeconds() > 8) {
-            arm.bucketArm();
-            wrist.bucketWrist();
-        }
-        if (clawTimer.getElapsedTimeSeconds() > 10) {
-            claw.openClaw();
+
+        this.telemetry.addData("Current State", caseState);
+        this.telemetry.addData("Claw Timer", clawTimer.getElapsedTimeSeconds());
+        this.telemetry.addData("Arm Timer", armTimer.getElapsedTimeSeconds());
+        this.telemetry.addData("Wrist Timer", wristTimer.getElapsedTimeSeconds());
+        this.telemetry.update();
+
+        switch(caseState) {
+            case 1:
+                claw.openClaw();
+                caseState = 2;
+                break;
+            case 2:
+                if (clawTimer.getElapsedTimeSeconds() > 2) {
+                    arm.engageArm();
+                    caseState = 3;
+                }
+                break;
+            case 3:
+                if (armTimer.getElapsedTimeSeconds() > 4) {
+                    wrist.floorWrist();
+                    caseState = 4;
+                }
+                break;
+            case 4:
+                if (clawTimer.getElapsedTimeSeconds() > 6) {
+                    claw.closeClaw();
+                    caseState = 5;
+                }
+                break;
+            case 5:
+                if (armTimer.getElapsedTimeSeconds() > 8) {
+                    arm.bucketArm();
+                    wrist.bucketWrist();
+                    caseState = 6;
+                }
+                break;
+            case 6:
+                if (clawTimer.getElapsedTimeSeconds() > 10) {
+                    claw.openClaw();
+                    caseState = 7;
+                }
+                break;
+            case 7:
+                this.init();
+                break;
         }
     }
-
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/LiftSubsystem.java

@@ -1,9 +1,11 @@
 package org.firstinspires.ftc.teamcode.subsystem;
 
 import static org.firstinspires.ftc.teamcode.configs.RobotConstants.liftPower;
+import static org.firstinspires.ftc.teamcode.configs.RobotConstants.liftToFloatPos;
+import static org.firstinspires.ftc.teamcode.configs.RobotConstants.liftToFloorPos;
 import static org.firstinspires.ftc.teamcode.configs.RobotConstants.liftToHighBucketPos;
 import static org.firstinspires.ftc.teamcode.configs.RobotConstants.liftToLowBucketPos;
-import static org.firstinspires.ftc.teamcode.configs.RobotConstants.liftZeroPos;
+import static org.firstinspires.ftc.teamcode.configs.RobotConstants.liftToHoverState;
 
 import com.qualcomm.robotcore.hardware.DcMotor;
 import com.qualcomm.robotcore.hardware.DcMotorSimple;
@@ -14,16 +16,17 @@ import org.firstinspires.ftc.teamcode.util.action.RunAction;
 public class LiftSubsystem {
 
     public DcMotor lift;
-    public RunAction toZero, toLowBucket, toHighBucket;
+    public RunAction toFloor, toLowBucket, toHighBucket;
+
     public enum LiftState {
-        FLOOR, LOW_BUCKET, HIGH_BUCKET
+        FLOOR, LOW_BUCKET, HIGH_BUCKET, FLOAT, HOVER
     }
+
     private LiftState liftState;
 
     public LiftSubsystem(HardwareMap hardwareMap) {
         lift = hardwareMap.get(DcMotor.class, "lift-motor");
-
-        toZero = new RunAction(this::toZero);
+        toFloor = new RunAction(this::toFloor);
         toLowBucket = new RunAction(this::toLowBucket);
         toHighBucket = new RunAction(this::toHighBucket);
     }
@@ -33,29 +36,41 @@ public class LiftSubsystem {
         lift.setMode(DcMotor.RunMode.RUN_TO_POSITION);
     }
 
-    public void toZero() {
-        setTarget(liftZeroPos);
-        setState(LiftState.FLOOR);
-    }
-
     public void switchState() {
-        if(this.liftState == LiftState.FLOOR) {
+        if (this.liftState == LiftState.FLOOR) {
+            this.toFloor();
+        } else if (this.liftState == LiftState.FLOAT) {
             this.toLowBucket();
         } else if (this.liftState == LiftState.LOW_BUCKET) {
             this.toHighBucket();
         } else if (this.liftState == LiftState.HIGH_BUCKET) {
-            this.toZero();
+            this.toFloor();
         }
     }
 
+     public void toHover() {
+        this.setTarget(liftToHoverState);
+        this.setState(LiftState.HOVER);
+    }
+
+    public void toFloor() {
+        this.setTarget(liftToFloorPos);
+        this.setState(LiftState.FLOOR);
+    }
+
+    public void toFloat() {
+        this.setTarget(liftToFloatPos);
+        this.setState(LiftState.FLOAT);
+    }
+
     public void toLowBucket() {
-        setTarget(liftToLowBucketPos);
-        setState(LiftState.LOW_BUCKET);
+        this.setTarget(liftToLowBucketPos);
+        this.setState(LiftState.LOW_BUCKET);
     }
 
     public void toHighBucket() {
-        setTarget(liftToHighBucketPos);
-        setState(LiftState.HIGH_BUCKET);
+        this.setTarget(liftToHighBucketPos);
+        this.setState(LiftState.HIGH_BUCKET);
     }
 
     public void init() {
@@ -73,7 +88,7 @@ public class LiftSubsystem {
     }
 
     public void start() {
-        setTarget(10);
+        this.toFloor();
     }
 
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystem/MotorsSubsystem.java

@@ -0,0 +1,130 @@
+package org.firstinspires.ftc.teamcode.subsystem;
+
+import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_LEFT_MOTOR;
+import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_LEFT_MOTOR_DIRECTION;
+import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_RIGHT_MOTOR;
+import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_RIGHT_MOTOR_DIRECTION;
+import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_LEFT_MOTOR;
+import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_LEFT_MOTOR_DIRECTION;
+import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_RIGHT_MOTOR;
+import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_RIGHT_MOTOR_DIRECTION;
+
+import com.qualcomm.robotcore.hardware.DcMotor;
+import com.qualcomm.robotcore.hardware.Gamepad;
+import com.qualcomm.robotcore.hardware.HardwareMap;
+
+import org.firstinspires.ftc.robotcore.external.Telemetry;
+
+public class MotorsSubsystem {
+
+    public HardwareMap hardwareMap;
+    public Telemetry telemetry;
+
+    public DcMotor frontLeftMotor;
+    public DcMotor backLeftMotor;
+    public DcMotor frontRightMotor;
+    public DcMotor backRightMotor;
+
+    public enum TravelState {
+        PARKED, BUCKET, SUBMARINE
+    }
+
+    public TravelState travelState;
+
+    public double power;
+
+    public MotorsSubsystem(HardwareMap hardwareMap, Telemetry telemetry) {
+        this.hardwareMap = hardwareMap;
+        this.telemetry = telemetry;
+        this.power = 1.0;
+    }
+
+    public MotorsSubsystem(HardwareMap hardwareMap, Telemetry telemetry, double power) {
+        this.hardwareMap = hardwareMap;
+        this.telemetry = telemetry;
+        this.power = power;
+    }
+
+    public void init() {
+        frontLeftMotor = hardwareMap.get(DcMotor.class, FRONT_LEFT_MOTOR);
+        backLeftMotor = hardwareMap.get(DcMotor.class, BACK_LEFT_MOTOR);
+        frontRightMotor = hardwareMap.get(DcMotor.class, FRONT_RIGHT_MOTOR);
+        backRightMotor = hardwareMap.get(DcMotor.class, BACK_RIGHT_MOTOR);
+
+        frontLeftMotor.setDirection(FRONT_LEFT_MOTOR_DIRECTION);
+        backLeftMotor.setDirection(BACK_LEFT_MOTOR_DIRECTION);
+        frontRightMotor.setDirection(FRONT_RIGHT_MOTOR_DIRECTION);
+        backRightMotor.setDirection(BACK_RIGHT_MOTOR_DIRECTION);
+
+        frontLeftMotor.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.BRAKE);
+        backLeftMotor.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.BRAKE);
+        frontRightMotor.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.BRAKE);
+        backRightMotor.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.BRAKE);
+    }
+
+    public void setFrontLeftMotorPower(double power) {
+        frontLeftMotor.setPower(power);
+    }
+
+    public void setBackLeftMotorPower(double power) {
+        backLeftMotor.setPower(power);
+    }
+
+    public void setFrontRightMotorPower(double power) {
+        frontRightMotor.setPower(power);
+    }
+
+    public void setBackRightMotorPower(double power) {
+        backRightMotor.setPower(power);
+    }
+
+    public void calculateTrajectory(Gamepad gamepad1) {
+        double max;
+
+        // POV Mode uses left joystick to go forward & strafe, and right joystick to rotate.
+        double axial = -gamepad1.left_stick_y;  // Note: pushing stick forward gives negative value
+        double lateral = gamepad1.left_stick_x;
+        double yaw = gamepad1.right_stick_x;
+
+        // Combine the joystick requests for each axis-motion to determine each wheel's power.
+        // Set up a variable for each drive wheel to save the power level for telemetry.
+        double leftFrontPower = axial + lateral + yaw;
+        double leftBackPower = axial - lateral + yaw;
+
+        double rightFrontPower = axial - lateral - yaw;
+        double rightBackPower = axial + lateral - yaw;
+
+        // Normalize the values so no wheel power exceeds 100%
+        // This ensures that the robot maintains the desired motion.
+        max = Math.max(Math.abs(leftFrontPower), Math.abs(rightFrontPower));
+        max = Math.max(max, Math.abs(leftBackPower));
+        max = Math.max(max, Math.abs(rightBackPower));
+
+        if (max > 1.0) {
+            leftFrontPower /= max;
+            rightFrontPower /= max;
+            leftBackPower /= max;
+            rightBackPower /= max;
+        }
+
+        // Send calculated power to wheels
+        this.setFrontLeftMotorPower(leftFrontPower * this.power);
+        this.setFrontRightMotorPower(rightFrontPower * this.power);
+        this.setBackLeftMotorPower(leftBackPower * this.power);
+        this.setBackRightMotorPower(rightBackPower * this.power);
+
+        // Show the elapsed game time and wheel power.
+        this.telemetry.addData("Front left/Right", "%4.2f, %4.2f", leftFrontPower, rightFrontPower);
+        this.telemetry.addData("Back  left/Right", "%4.2f, %4.2f", leftBackPower, rightBackPower);
+        this.telemetry.update();
+    }
+
+    public void setState(TravelState travelState) {
+        this.travelState = travelState;
+    }
+
+    public TravelState getState() {
+        return this.travelState;
+    }
+
+}