From d985378ac4a14c0fbacd1a82c9f0efceeb47a1cb Mon Sep 17 00:00:00 2001 From: Carlos Rivas Date: Wed, 30 Oct 2024 22:43:16 -0700 Subject: [PATCH] Fixed misspelling --- .../AsherPathV1.java | 2 +- .../AutoExample.java | 10 +- .../AutoExampleFour.java | 2 +- .../AutoExampleSeason2025V1.java | 2 +- .../AutoExampleThree.java | 2 +- .../AutoExampleTwo.java | 3 +- .../BasicOmniOpMode_Linear.java | 3 +- .../BlueBasketAuto.java | 3 +- .../BluebAutoV1.java | 3 +- .../ftc/teamcode/cometbots/BluenbAutov1.java | 4 + .../{commetbots => cometbots}/CometDrive.java | 2 +- .../SensorIMUOrthogonal.java | 2 +- .../ftc/teamcode/commetbots/BlueBucket.java | 120 ------------------ .../ftc/teamcode/commetbots/BluenbAutov1.java | 4 - 14 files changed, 15 insertions(+), 147 deletions(-) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{commetbots => cometbots}/AsherPathV1.java (99%) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{commetbots => cometbots}/AutoExample.java (83%) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{commetbots => cometbots}/AutoExampleFour.java (98%) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{commetbots => cometbots}/AutoExampleSeason2025V1.java (99%) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{commetbots => cometbots}/AutoExampleThree.java (98%) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{commetbots => cometbots}/AutoExampleTwo.java (95%) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{commetbots => cometbots}/BasicOmniOpMode_Linear.java (99%) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{commetbots => cometbots}/BlueBasketAuto.java (98%) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{commetbots => cometbots}/BluebAutoV1.java (98%) create mode 100644 TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BluenbAutov1.java rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{commetbots => cometbots}/CometDrive.java (94%) rename TeamCode/src/main/java/org/firstinspires/ftc/teamcode/{commetbots => cometbots}/SensorIMUOrthogonal.java (99%) delete mode 100644 TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BlueBucket.java delete mode 100644 TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BluenbAutov1.java diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AsherPathV1.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AsherPathV1.java similarity index 99% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AsherPathV1.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AsherPathV1.java index 666b320..060548e 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AsherPathV1.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AsherPathV1.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.commetbots; +package org.firstinspires.ftc.teamcode.cometbots; import com.acmerobotics.dashboard.FtcDashboard; import com.acmerobotics.dashboard.config.Config; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExample.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExample.java similarity index 83% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExample.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExample.java index dfb2205..a944187 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExample.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExample.java @@ -1,22 +1,14 @@ -package org.firstinspires.ftc.teamcode.commetbots; - -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_LEFT_MOTOR; -import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_RIGHT_MOTOR; -import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_LEFT_MOTOR; -import static org.firstinspires.ftc.teamcode.PedroConstants.FRONT_RIGHT_MOTOR; +package org.firstinspires.ftc.teamcode.cometbots; 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 com.qualcomm.robotcore.hardware.DcMotor; -import com.qualcomm.robotcore.hardware.DcMotorEx; 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; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleFour.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleFour.java similarity index 98% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleFour.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleFour.java index 550307f..64e96f1 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleFour.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleFour.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.commetbots; +package org.firstinspires.ftc.teamcode.cometbots; import com.acmerobotics.dashboard.FtcDashboard; import com.acmerobotics.dashboard.config.Config; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleSeason2025V1.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleSeason2025V1.java similarity index 99% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleSeason2025V1.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleSeason2025V1.java index 50551c6..632804e 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleSeason2025V1.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleSeason2025V1.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.commetbots; +package org.firstinspires.ftc.teamcode.cometbots; import com.acmerobotics.dashboard.FtcDashboard; import com.acmerobotics.dashboard.config.Config; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleThree.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleThree.java similarity index 98% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleThree.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleThree.java index 54c1b99..60fb0ec 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleThree.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleThree.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.commetbots; +package org.firstinspires.ftc.teamcode.cometbots; import com.acmerobotics.dashboard.FtcDashboard; import com.acmerobotics.dashboard.config.Config; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleTwo.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleTwo.java similarity index 95% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleTwo.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleTwo.java index 250d018..0784e81 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/AutoExampleTwo.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/AutoExampleTwo.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.commetbots; +package org.firstinspires.ftc.teamcode.cometbots; import com.acmerobotics.dashboard.FtcDashboard; import com.acmerobotics.dashboard.config.Config; @@ -10,7 +10,6 @@ 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; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BasicOmniOpMode_Linear.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BasicOmniOpMode_Linear.java similarity index 99% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BasicOmniOpMode_Linear.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BasicOmniOpMode_Linear.java index f44d66c..c726774 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BasicOmniOpMode_Linear.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BasicOmniOpMode_Linear.java @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.firstinspires.ftc.teamcode.commetbots; +package org.firstinspires.ftc.teamcode.cometbots; import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_ENCODER; import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_ENCODER_DIRECTION; @@ -44,7 +44,6 @@ import static org.firstinspires.ftc.teamcode.PedroConstants.LEFT_ENCODER_DIRECTI import static org.firstinspires.ftc.teamcode.PedroConstants.RIGHT_ENCODER; import static org.firstinspires.ftc.teamcode.PedroConstants.RIGHT_ENCODER_DIRECTION; -import com.qualcomm.robotcore.eventloop.opmode.Disabled; import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode; import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import com.qualcomm.robotcore.hardware.DcMotor; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BlueBasketAuto.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BlueBasketAuto.java similarity index 98% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BlueBasketAuto.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BlueBasketAuto.java index 1b6f097..c596660 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BlueBasketAuto.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BlueBasketAuto.java @@ -1,5 +1,4 @@ -package org.firstinspires.ftc.teamcode.commetbots; -import static android.os.SystemClock.sleep; +package org.firstinspires.ftc.teamcode.cometbots; import com.qualcomm.robotcore.eventloop.opmode.OpMode; import com.acmerobotics.dashboard.FtcDashboard; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BluebAutoV1.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BluebAutoV1.java similarity index 98% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BluebAutoV1.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BluebAutoV1.java index 29ecf54..778c4c8 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BluebAutoV1.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BluebAutoV1.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.commetbots; +package org.firstinspires.ftc.teamcode.cometbots; import com.acmerobotics.dashboard.FtcDashboard; import com.acmerobotics.dashboard.config.Config; @@ -9,7 +9,6 @@ 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; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BluenbAutov1.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BluenbAutov1.java new file mode 100644 index 0000000..039e835 --- /dev/null +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/BluenbAutov1.java @@ -0,0 +1,4 @@ +package org.firstinspires.ftc.teamcode.cometbots; + +public class BluenbAutov1 { +} diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/CometDrive.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/CometDrive.java similarity index 94% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/CometDrive.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/CometDrive.java index aafa870..e193378 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/CometDrive.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/CometDrive.java @@ -1,4 +1,4 @@ -package org.firstinspires.ftc.teamcode.commetbots; +package org.firstinspires.ftc.teamcode.cometbots; import static org.firstinspires.ftc.teamcode.util.action.FieldConstants.blueBucketStartPose; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/SensorIMUOrthogonal.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/SensorIMUOrthogonal.java similarity index 99% rename from TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/SensorIMUOrthogonal.java rename to TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/SensorIMUOrthogonal.java index c28573c..6473172 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/SensorIMUOrthogonal.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/cometbots/SensorIMUOrthogonal.java @@ -27,7 +27,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.firstinspires.ftc.teamcode.commetbots; +package org.firstinspires.ftc.teamcode.cometbots; import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_ENCODER; import static org.firstinspires.ftc.teamcode.PedroConstants.BACK_ENCODER_DIRECTION; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BlueBucket.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BlueBucket.java deleted file mode 100644 index 8eaaad2..0000000 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BlueBucket.java +++ /dev/null @@ -1,120 +0,0 @@ -package org.firstinspires.ftc.teamcode.commetbots; - -import com.qualcomm.robotcore.eventloop.opmode.Autonomous; -import com.qualcomm.robotcore.eventloop.opmode.OpMode; - -import org.firstinspires.ftc.teamcode.pedroPathing.follower.Follower; -import org.firstinspires.ftc.teamcode.runmodes.Auto; -import org.firstinspires.ftc.teamcode.util.action.Actions; -import org.firstinspires.ftc.teamcode.util.action.SequentialAction; - - -@Autonomous(name = "BlueBucket", group = "B") -public class BlueBucket extends OpMode { - public int pathState; - public Auto auto; - - @Override - public void init() { - auto = new Auto(hardwareMap, telemetry, new Follower(hardwareMap), true, true); - } - - @Override - public void start() { - auto.start(); -// setPathState(0); - } - - @Override - public void loop() { - auto.update(); - pathUpdate(); - - telemetry.addData("state", pathState); - telemetry.addData("x", auto.follower.getPose().getX()); - telemetry.addData("y", auto.follower.getPose().getY()); - telemetry.addData("h", auto.follower.getPose().getHeading()); - } - - public void pathUpdate() { - switch (pathState) { - case 0: - Actions.runBlocking(auto.claw.closeClaw); - //Actions.runBlocking(auto.lift.toHighChamber); - //auto.follower.followPath(auto.preload); - //setPathState(1); - break; - case 1: - if (!auto.follower.isBusy()) { - - // if (auto.lift.isAtTarget()) { - // Actions.runBlocking(auto.lift.releaseHighChamber); - // } - -// if (auto.lift.isAtTarget()) { -// Actions.runBlocking(auto.claw.openClaw); -// } - -// Actions.runBlocking(auto.lift.toZero); -// auto.follower.followPath(auto.element1); -// Actions.runBlocking(auto.intake.pivotGround); -// Actions.runBlocking(auto.intake.spinIn); - setPathState(2); - } - break; - case 2: - if (!auto.follower.isBusy()) { - auto.follower.followPath(auto.score1); -// Actions.runBlocking(auto.intake.spinStop); -// Actions.runBlocking(auto.intake.pivotTransfer); - setPathState(3); - } - break; - case 3: - if (!auto.follower.isBusy()) { - Actions.runBlocking( - new SequentialAction( -// auto.transfer, -// auto.lift.toLowBucket - ) - ); - -// if (auto.lift.isAtTarget()) { -// Actions.runBlocking(auto.box.toScoring); -// } - - auto.follower.followPath(auto.element2); - setPathState(4); - } - break; - case 4: - if (!auto.follower.isBusy()) { - auto.follower.followPath(auto.score2); - setPathState(5); - } - break; - case 5: - if (!auto.follower.isBusy()) { - auto.follower.followPath(auto.element3); - setPathState(6); - } - break; - case 6: - if (!auto.follower.isBusy()) { - auto.follower.followPath(auto.score3); - setPathState(7); - } - break; - case 7: - if (!auto.follower.isBusy()) { - auto.follower.followPath(auto.park); - setPathState(-1); - } - break; - } - } - - public void setPathState(int x) { - pathState = x; - } -} \ No newline at end of file diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BluenbAutov1.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BluenbAutov1.java deleted file mode 100644 index 115f95a..0000000 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/commetbots/BluenbAutov1.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.firstinspires.ftc.teamcode.commetbots; - -public class BluenbAutov1 { -}