From 58c11f5241f13633e23bc43f366679abe8b70619 Mon Sep 17 00:00:00 2001 From: DanTheMan-byte Date: Thu, 4 Jun 2026 20:38:45 -0500 Subject: [PATCH] removed bunch of things to remove dash cluter --- .../ftc/teamcode/autonomous/Auto_LT_Close.java | 3 +-- .../ftc/teamcode/autonomous/Auto_LT_Far.java | 3 +-- .../ftc/teamcode/autonomous/actions/AutoActions.java | 1 - .../autonomous/disabled/Auto_LT_Close_12Ball.java | 4 +--- .../autonomous/disabled/Auto_LT_Close_GateOpen.java | 4 +--- .../teamcode/autonomous/disabled/ProtoAutoClose_V3.java | 4 +--- .../org/firstinspires/ftc/teamcode/teleop/TeleopV4.java | 9 +++++++-- .../ftc/teamcode/tests/AprilTagWebcamExample.java | 3 +-- .../org/firstinspires/ftc/teamcode/tests/ColorTest.java | 3 +-- .../ftc/teamcode/tests/MotorDirectionDebugger.java | 2 -- .../firstinspires/ftc/teamcode/tests/ShooterTest.java | 2 -- .../firstinspires/ftc/teamcode/tests/SortingTest.java | 2 -- .../org/firstinspires/ftc/teamcode/tests/TurretTest.java | 2 -- .../java/org/firstinspires/ftc/teamcode/utils/Light.java | 1 - .../ftc/teamcode/utils/PositionalServoProgrammer.java | 2 -- .../java/org/firstinspires/ftc/teamcode/utils/Robot.java | 1 - .../org/firstinspires/ftc/teamcode/utils/Servos.java | 1 - .../org/firstinspires/ftc/teamcode/utils/Turret.java | 1 - 18 files changed, 14 insertions(+), 34 deletions(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto_LT_Close.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto_LT_Close.java index 31430ea..a728805 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto_LT_Close.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto_LT_Close.java @@ -51,8 +51,7 @@ import org.firstinspires.ftc.teamcode.utils.Spindexer; import org.firstinspires.ftc.teamcode.utils.Targeting; import org.firstinspires.ftc.teamcode.utils.Turret; -@Config -@Autonomous(preselectTeleOp = "TeleopV3") + public class Auto_LT_Close extends LinearOpMode { public static double shoot0Vel = 2300, shoot0Hood = 0.93; public static double velGate0Start = 2700, hoodGate0Start = 0.6; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto_LT_Far.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto_LT_Far.java index 763d938..4a0d3bd 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto_LT_Far.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto_LT_Far.java @@ -43,8 +43,7 @@ import org.firstinspires.ftc.teamcode.utils.Spindexer; import org.firstinspires.ftc.teamcode.utils.Targeting; import org.firstinspires.ftc.teamcode.utils.Turret; -@Config -@Autonomous(preselectTeleOp = "TeleopV3") + public class Auto_LT_Far extends LinearOpMode { public static double shoot0Vel = 3300, shoot0Hood = 0.48; double xLeave, yLeave, hLeave; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/actions/AutoActions.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/actions/AutoActions.java index d696af1..fcb4e4e 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/actions/AutoActions.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/actions/AutoActions.java @@ -37,7 +37,6 @@ import org.firstinspires.ftc.teamcode.utils.Turret; import java.util.Objects; -@Config public class AutoActions { Robot robot; MultipleTelemetry TELE; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/Auto_LT_Close_12Ball.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/Auto_LT_Close_12Ball.java index 9d0f8c4..5bf3fd3 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/Auto_LT_Close_12Ball.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/Auto_LT_Close_12Ball.java @@ -85,9 +85,7 @@ import org.firstinspires.ftc.teamcode.utils.Spindexer; import org.firstinspires.ftc.teamcode.utils.Targeting; import org.firstinspires.ftc.teamcode.utils.Turret; -@Disabled -@Config -@Autonomous(preselectTeleOp = "TeleopV3") + public class Auto_LT_Close_12Ball extends LinearOpMode { public static double shoot0Vel = 2300, shoot0Hood = 0.93; public static double autoSpinStartPos = 0.2; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/Auto_LT_Close_GateOpen.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/Auto_LT_Close_GateOpen.java index 1ff9d28..177b60d 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/Auto_LT_Close_GateOpen.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/Auto_LT_Close_GateOpen.java @@ -93,9 +93,7 @@ import org.firstinspires.ftc.teamcode.utils.Turret; import java.util.Objects; -@Disabled -@Config -@Autonomous(preselectTeleOp = "TeleopV3") + public class Auto_LT_Close_GateOpen extends LinearOpMode { public static double shoot0Vel = 2300, shoot0Hood = 0.93; public static double autoSpinStartPos = 0.2; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/ProtoAutoClose_V3.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/ProtoAutoClose_V3.java index 755b71f..21db736 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/ProtoAutoClose_V3.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/ProtoAutoClose_V3.java @@ -82,9 +82,7 @@ import org.firstinspires.ftc.teamcode.utils.Robot; import org.firstinspires.ftc.teamcode.utils.Servos; import java.util.List; -@Disabled -@Config -@Autonomous(preselectTeleOp = "TeleopV3") + public class ProtoAutoClose_V3 extends LinearOpMode { public static double intake1Time = 2.7; public static double intake2Time = 3.0; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV4.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV4.java index db8c8c6..9f4a10b 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV4.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV4.java @@ -28,9 +28,10 @@ public class TeleopV4 extends LinearOpMode { Turret turret; Flywheel flywheel; VelocityCommander commander; - ParkTilter parkTilter; + public static Pose relocalizePose = new Pose(128, 83, 0); + @Override public void runOpMode() throws InterruptedException { @@ -72,8 +73,12 @@ public class TeleopV4 extends LinearOpMode { gamepad1.left_stick_x ); - follower.update(); + if (gamepad1.crossWasPressed()){ + follower.setPose(relocalizePose); + gamepad1.rumble(100); + } + follower.update(); shooter.update(robot.voltage.getVoltage()); spindexerTransferIntake.update(); diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/AprilTagWebcamExample.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/AprilTagWebcamExample.java index b0ae734..93b6f15 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/AprilTagWebcamExample.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/AprilTagWebcamExample.java @@ -9,8 +9,7 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.firstinspires.ftc.teamcode.utils.AprilTagWebcam; import org.firstinspires.ftc.teamcode.utils.Robot; -@Config -@TeleOp + public class AprilTagWebcamExample extends OpMode { MultipleTelemetry TELE; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ColorTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ColorTest.java index 233a608..96967a6 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ColorTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ColorTest.java @@ -12,8 +12,7 @@ import com.qualcomm.robotcore.hardware.NormalizedRGBA; import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit; import org.firstinspires.ftc.teamcode.utils.Robot; -@Config -@TeleOp + public class ColorTest extends LinearOpMode { Robot robot; MultipleTelemetry TELE; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/MotorDirectionDebugger.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/MotorDirectionDebugger.java index fb1c65b..388dc5f 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/MotorDirectionDebugger.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/MotorDirectionDebugger.java @@ -7,8 +7,6 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.firstinspires.ftc.teamcode.utils.Robot; -@Config -@TeleOp public class MotorDirectionDebugger extends LinearOpMode { public static double flPower = 0.0; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ShooterTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ShooterTest.java index 9c4f5bf..0af8750 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ShooterTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ShooterTest.java @@ -27,8 +27,6 @@ import org.firstinspires.ftc.teamcode.utils.Spindexer; import org.firstinspires.ftc.teamcode.utils.Targeting; import org.firstinspires.ftc.teamcode.utils.Turret; -@Config -@TeleOp public class ShooterTest extends LinearOpMode { public static int mode = 1; public static double parameter = 0.0; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/SortingTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/SortingTest.java index de6189d..b308f73 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/SortingTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/SortingTest.java @@ -18,8 +18,6 @@ import org.firstinspires.ftc.teamcode.utils.Spindexer; import org.firstinspires.ftc.teamcode.utils.Targeting; import org.firstinspires.ftc.teamcode.utils.Turret; -@Config -@TeleOp public class SortingTest extends LinearOpMode { Robot robot; MultipleTelemetry TELE; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/TurretTest.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/TurretTest.java index 0b3fcaf..5371229 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/TurretTest.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/TurretTest.java @@ -15,8 +15,6 @@ import org.firstinspires.ftc.teamcode.pedroPathing.Constants; import org.firstinspires.ftc.teamcode.utils.Robot; import org.firstinspires.ftc.teamcode.utils.Turret; -@TeleOp -@Config public class TurretTest extends LinearOpMode { public static boolean zeroTurr = false; @Override diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Light.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Light.java index 6fdd2cd..891697e 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Light.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Light.java @@ -7,7 +7,6 @@ import org.firstinspires.ftc.teamcode.constants.Color; import org.firstinspires.ftc.teamcode.constants.StateEnums.LightState; -@Config public final class Light { private static Light instance; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/PositionalServoProgrammer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/PositionalServoProgrammer.java index 92e8500..7cd8ead 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/PositionalServoProgrammer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/PositionalServoProgrammer.java @@ -10,8 +10,6 @@ import com.qualcomm.robotcore.eventloop.opmode.TeleOp; import org.firstinspires.ftc.vision.apriltag.AprilTagDetection; -@TeleOp -@Config public class PositionalServoProgrammer extends LinearOpMode { Robot robot; MultipleTelemetry TELE; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Robot.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Robot.java index b8a8702..858af2f 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Robot.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Robot.java @@ -16,7 +16,6 @@ import com.qualcomm.robotcore.hardware.VoltageSensor; import org.firstinspires.ftc.robotcore.external.hardware.camera.WebcamName; import org.firstinspires.ftc.vision.apriltag.AprilTagProcessor; -@Config public class Robot { //Initialize Public Components diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Servos.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Servos.java index 232ed35..cdf4af7 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Servos.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Servos.java @@ -6,7 +6,6 @@ import com.acmerobotics.dashboard.config.Config; import com.arcrobotics.ftclib.controller.PIDFController; import com.qualcomm.robotcore.hardware.HardwareMap; -@Config public class Servos { //PID constants // TODO: get PIDF constants diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Turret.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Turret.java index fd80a48..a4106ca 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Turret.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Turret.java @@ -19,7 +19,6 @@ import org.firstinspires.ftc.teamcode.teleop.TeleopV3; import java.util.ArrayList; import java.util.List; -@Config public class Turret {