Merge remote-tracking branch 'origin/danielv5' into update-teleop

# Conflicts:
#	TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/NewShooterTest.java
#	TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/Shooter.java

.slothLoad/SlothLoad.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="SlothLoad" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="TeamCode:deploySloth" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.teamCodeRun/TeamCode.run.xml

@@ -0,0 +1,75 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="TeamCode" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
+    <module name="DecodeFTCMain.TeamCode" />
+    <option name="ANDROID_RUN_CONFIGURATION_SCHEMA_VERSION" value="1" />
+    <option name="DEPLOY" value="true" />
+    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
+    <option name="DEPLOY_AS_INSTANT" value="false" />
+    <option name="ARTIFACT_NAME" value="" />
+    <option name="PM_INSTALL_OPTIONS" value="" />
+    <option name="ALL_USERS" value="false" />
+    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="ALLOW_ASSUME_VERIFIED" value="false" />
+    <option name="CLEAR_APP_STORAGE" value="false" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
+    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+    <option name="MODE" value="default_activity" />
+    <option name="RESTORE_ENABLED" value="false" />
+    <option name="RESTORE_FILE" value="" />
+    <option name="RESTORE_FRESH_INSTALL_ONLY" value="false" />
+    <option name="CLEAR_LOGCAT" value="false" />
+    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+    <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+    <option name="DEBUGGER_TYPE" value="Auto" />
+    <Auto>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Auto>
+    <Hybrid>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Hybrid>
+    <Java>
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Java>
+    <Native>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
+    </Native>
+    <Profilers>
+      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+    </Profilers>
+    <option name="DEEP_LINK" value="" />
+    <option name="ACTIVITY" value="" />
+    <option name="ACTIVITY_CLASS" value="" />
+    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+    <method v="2">
+      <option name="Gradle.BeforeRunTask" enabled="true" tasks="removeSlothRemote" externalProjectPath="$PROJECT_DIR$/TeamCode" vmOptions="" scriptParameters="" />
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+    </method>
+  </configuration>
+</component>

FtcRobotController/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="60"
+    android:versionCode="61"
-          android:versionName="11.0">
+          android:versionName="11.1">
 
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptAprilTag.java

@@ -92,24 +92,22 @@ public class ConceptAprilTag extends LinearOpMode {
         telemetry.update();
         waitForStart();
 
-        if (opModeIsActive()) {
+        while (opModeIsActive()) {
-            while (opModeIsActive()) {
 
-                telemetryAprilTag();
+            telemetryAprilTag();
 
-                // Push telemetry to the Driver Station.
+            // Push telemetry to the Driver Station.
-                telemetry.update();
+            telemetry.update();
 
-                // Save CPU resources; can resume streaming when needed.
+            // Save CPU resources; can resume streaming when needed.
-                if (gamepad1.dpad_down) {
+            if (gamepad1.dpad_down) {
-                    visionPortal.stopStreaming();
+                visionPortal.stopStreaming();
-                } else if (gamepad1.dpad_up) {
+            } else if (gamepad1.dpad_up) {
-                    visionPortal.resumeStreaming();
+                visionPortal.resumeStreaming();
-                }
-
-                // Share the CPU.
-                sleep(20);
             }
+
+            // Share the CPU.
+            sleep(20);
         }
 
         // Save more CPU resources when camera is no longer needed.

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptAprilTagEasy.java

@@ -88,24 +88,22 @@ public class ConceptAprilTagEasy extends LinearOpMode {
         telemetry.update();
         waitForStart();
 
-        if (opModeIsActive()) {
+        while (opModeIsActive()) {
-            while (opModeIsActive()) {
 
-                telemetryAprilTag();
+            telemetryAprilTag();
 
-                // Push telemetry to the Driver Station.
+            // Push telemetry to the Driver Station.
-                telemetry.update();
+            telemetry.update();
 
-                // Save CPU resources; can resume streaming when needed.
+            // Save CPU resources; can resume streaming when needed.
-                if (gamepad1.dpad_down) {
+            if (gamepad1.dpad_down) {
-                    visionPortal.stopStreaming();
+                visionPortal.stopStreaming();
-                } else if (gamepad1.dpad_up) {
+            } else if (gamepad1.dpad_up) {
-                    visionPortal.resumeStreaming();
+                visionPortal.resumeStreaming();
-                }
-
-                // Share the CPU.
-                sleep(20);
             }
+
+            // Share the CPU.
+            sleep(20);
         }
 
         // Save more CPU resources when camera is no longer needed.

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptAprilTagSwitchableCameras.java

@@ -81,27 +81,25 @@ public class ConceptAprilTagSwitchableCameras extends LinearOpMode {
         telemetry.update();
         waitForStart();
 
-        if (opModeIsActive()) {
+        while (opModeIsActive()) {
-            while (opModeIsActive()) {
 
-                telemetryCameraSwitching();
+            telemetryCameraSwitching();
-                telemetryAprilTag();
+            telemetryAprilTag();
 
-                // Push telemetry to the Driver Station.
+            // Push telemetry to the Driver Station.
-                telemetry.update();
+            telemetry.update();
 
-                // Save CPU resources; can resume streaming when needed.
+            // Save CPU resources; can resume streaming when needed.
-                if (gamepad1.dpad_down) {
+            if (gamepad1.dpad_down) {
-                    visionPortal.stopStreaming();
+                visionPortal.stopStreaming();
-                } else if (gamepad1.dpad_up) {
+            } else if (gamepad1.dpad_up) {
-                    visionPortal.resumeStreaming();
+                visionPortal.resumeStreaming();
-                }
-
-                doCameraSwitching();
-
-                // Share the CPU.
-                sleep(20);
             }
+
+            doCameraSwitching();
+
+            // Share the CPU.
+            sleep(20);
         }
 
         // Save more CPU resources when camera is no longer needed.

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/ConceptGamepadEdgeDetection.java

@@ -83,6 +83,22 @@ public class ConceptGamepadEdgeDetection extends LinearOpMode {
         telemetry.addData("Gamepad 1 Right Bumper Released", gamepad1.rightBumperWasReleased());
         telemetry.addData("Gamepad 1 Right Bumper Status", gamepad1.right_bumper);
 
+        // Add an empty line to separate the buttons in telemetry
+        telemetry.addLine();
+
+        // Add the status of the Gamepad 1 Left trigger
+        telemetry.addData("Gamepad 1 Left Trigger Pressed", gamepad1.leftTriggerWasPressed());
+        telemetry.addData("Gamepad 1 Left Trigger Released", gamepad1.leftTriggerWasReleased());
+        telemetry.addData("Gamepad 1 Left Trigger Status", gamepad1.left_trigger_pressed);
+
+        // Add an empty line to separate the buttons in telemetry
+        telemetry.addLine();
+
+        // Add the status of the Gamepad 1 Right trigger
+        telemetry.addData("Gamepad 1 Right Trigger Pressed", gamepad1.rightTriggerWasPressed());
+        telemetry.addData("Gamepad 1 Right Trigger Released", gamepad1.rightTriggerWasReleased());
+        telemetry.addData("Gamepad 1 Right Trigger Status", gamepad1.right_trigger_pressed);
+
         // Add a note that the telemetry is only updated every 2 seconds
         telemetry.addLine("\nTelemetry is updated every 2 seconds.");
 

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/externalhardware/ConceptExternalHardwareClass.java

@@ -27,7 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.firstinspires.ftc.robotcontroller.external.samples;
+package org.firstinspires.ftc.robotcontroller.external.samples.externalhardware;
 
 import com.qualcomm.robotcore.eventloop.opmode.Disabled;
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;

FtcRobotController/src/main/java/org/firstinspires/ftc/robotcontroller/external/samples/externalhardware/RobotHardware.java

@@ -27,7 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package org.firstinspires.ftc.robotcontroller.external.samples;
+package org.firstinspires.ftc.robotcontroller.external.samples.externalhardware;
 
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 import com.qualcomm.robotcore.hardware.DcMotor;

README.md

@@ -59,6 +59,21 @@ The readme.md file located in the [/TeamCode/src/main/java/org/firstinspires/ftc
 
 # Release Information
 
+## Version 11.1 (20251231-104637)
+
+### Enhancements
+
+* Gamepad triggers can now be accessed as booleans and have edge detection supported.
+* GoBildaPinpointDriver now supports Pinpoint v2 functionality
+* Adds webcam calibrations for goBILDA's USB camera.
+
+### Bug Fixes
+* Fixes issue [1654](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues/1654) in GoBildaPinpointDriver that caused error if resolution was set in other than MM
+* Fixes issue [1628](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues/1628) Blocks editor displays incorrect Java code for gamepad edge detection blocks.
+* Fixes possible race condition issue [1884](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues/1884) on Driver Station startup when Driver Station name doesn't match the Robot Controller name.
+* Fixes issue [1863](https://github.com/FIRST-Tech-Challenge/FtcRobotController/issues/1863) - Incorrect package paths in samples.
+* Fixes an issue where an OnBotJava filename that begins with a lowercase character would fail to properly rename the file if the user tried to rename it so that it begins with an uppercase character.
+
 ## Version 11.0 (20250827-105138)
 
 ### Enhancements

TeamCode/build.gradle

@@ -12,8 +12,25 @@
 // Custom definitions may go here
 
 // Include common definitions from above.
+
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            url "https://repo.dairy.foundation/releases"
+        }
+    }
+    dependencies {
+        classpath "dev.frozenmilk:Load:0.2.4"
+    }
+}
+
+
 apply from: '../build.common.gradle'
 apply from: '../build.dependencies.gradle'
+// there should be 2 or 3 more lines that start with 'apply plugin:' here
+apply plugin: 'dev.frozenmilk.sinister.sloth.load'
+
 
 android {
     namespace = 'org.firstinspires.ftc.teamcode'
@@ -28,14 +45,32 @@ repositories {
     maven {
         url = 'https://maven.brott.dev/'
     }
+    // Dairy releases repository
+    maven {
+        url = "https://repo.dairy.foundation/releases"
+    }
+    // Dairy snapshots repository
+    maven {
+        url = "https://repo.dairy.foundation/snapshots"
+    }
 }
 
 dependencies {
     implementation project(':FtcRobotController')
-    implementation "com.acmerobotics.roadrunner:ftc:0.1.25"
+    implementation("dev.frozenmilk.sinister:Sloth:0.2.4")
-    implementation "com.acmerobotics.roadrunner:core:1.0.1"
-    implementation "com.acmerobotics.roadrunner:actions:1.0.1"
-    implementation "com.acmerobotics.dashboard:dashboard:0.5.1"
     implementation 'org.ftclib.ftclib:core:2.1.1' // core
+    implementation("com.acmerobotics.roadrunner:ftc:0.1.25") {
+        exclude group: "com.acmerobotics.dashboard"
+    }
+    implementation("com.acmerobotics.roadrunner:actions:1.0.1") {
+        exclude group: "com.acmerobotics.dashboard"
+    }
+    implementation("com.acmerobotics.roadrunner:core:1.0.1") {
+        exclude group: "com.acmerobotics.dashboard"
+    }
+
+    implementation("com.acmerobotics.slothboard:dashboard:0.2.4+0.5.1") //Slothdashboard
+
 
 }
+

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto12BallPedroPathing.java

@@ -0,0 +1,392 @@
+package org.firstinspires.ftc.teamcode.autonomous;
+
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spinStartPos;
+import static org.firstinspires.ftc.teamcode.utils.Targeting.turretInterpolate;
+import static org.firstinspires.ftc.teamcode.utils.Turret.limelightUsed;
+import static org.firstinspires.ftc.teamcode.utils.Turret.turrDefault;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStartPoseH;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStartPoseY;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStartPoseX;
+
+import com.acmerobotics.dashboard.FtcDashboard;
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.pedropathing.follower.Follower;
+import com.pedropathing.geometry.BezierCurve;
+import com.pedropathing.geometry.BezierLine;
+import com.pedropathing.geometry.Pose;
+import com.pedropathing.paths.PathChain;
+import com.qualcomm.hardware.lynx.LynxModule;
+import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
+
+import org.firstinspires.ftc.teamcode.constants.Color;
+import org.firstinspires.ftc.teamcode.pedroPathing.Constants;
+import org.firstinspires.ftc.teamcode.utilsv2.Flywheel;
+import org.firstinspires.ftc.teamcode.utils.MeasuringLoopTimes;
+import org.firstinspires.ftc.teamcode.utilsv2.Robot;
+import org.firstinspires.ftc.teamcode.utils.Servos;
+import org.firstinspires.ftc.teamcode.utils.Spindexer;
+import org.firstinspires.ftc.teamcode.utils.Targeting;
+import org.firstinspires.ftc.teamcode.utilsv2.Turret;
+
+import java.util.List;
+
+@Config
+@Autonomous (preselectTeleOp = "TeleopV4")
+public class Auto12BallPedroPathing extends LinearOpMode {
+    Robot robot;
+    MultipleTelemetry TELE;
+//    Flywheel flywheel;
+//    Targeting targeting;
+//    Targeting.Settings targetingSettings;
+    Follower follower;
+//    Turret turret;
+//    Spindexer spindexer;
+//    Servos servos;
+    MeasuringLoopTimes loopTimes;
+
+    // Wait Times
+    public static double shootTime = 2;
+
+    // Extra Variables
+    public static double intakePower = 0.3;
+    double shootX, shootY, shootH;
+
+    // Initialize path state machine
+    private enum PathState {
+        DRIVE_SHOOT0, WAIT_SHOOT0,
+        DRIVE_PICKUP1, PICKUP1, DRIVE_SHOOT1, WAIT_SHOOT1,
+        DRIVE_PICKUP2, PICKUP2, DRIVE_SHOOT2, WAIT_SHOOT2,
+        DRIVE_PICKUP3, PICKUP3, DRIVE_SHOOT3, WAIT_SHOOT3
+    }
+    PathState pathState = PathState.DRIVE_SHOOT0;
+
+    // Poses
+    public static double startPoseX = 112, startPoseY = 132.5, startPoseH = -90;
+    public static double shoot0X = 106, shoot0Y = 106, shoot0H = -40;
+    public static double drivePickup1X = 102, drivePickup1Y = 82, drivePickup1H = 0;
+    public static double pickup1X = 126, pickup1Y = 82, pickup1H = 0;
+    public static double shoot1X = 86, shoot1Y = 82, shoot1H = -80;
+    public static double drivePickup2ControlX = 91.69828844730904, drivePickup2ControlY = 66.724457099909;
+    public static double drivePickup2X = 102, drivePickup2Y = 58.5, drivePickup2H = 0;
+    public static double pickup2X = 132, pickup2Y = 57, pickup2H = 0;
+    public static double shoot2ControlX = 86, shoot2ControlY = 57;
+    public static double shoot2X = 86, shoot2Y = 82, shoot2H = -90;
+    public static double drivePickup3ControlX = 97.97800291788306, drivePickup3ControlY = 50.10765863138859;
+    public static double drivePickup3X = 102, drivePickup3Y = 34.5, drivePickup3H = 0;
+    public static double pickup3X = 132, pickup3Y = 34.5, pickup3H = 0;
+    public static double shoot3ControlX = 86, shoot3ControlY = 34.5;
+    public static double shoot3X = 84, shoot3Y = 102, shoot3H = -90;
+    Pose startPose, shoot0,
+            drivePickup1, pickup1, shoot1,
+            drivePickup2Control, drivePickup2, pickup2, shoot2Control, shoot2,
+            drivePickup3Control, drivePickup3, pickup3, shoot3Control, shoot3;
+    private void initializePoses(){
+        startPose = new Pose(startPoseX, startPoseY, Math.toRadians(startPoseH));
+        shoot0 = new Pose(shoot0X, shoot0Y, Math.toRadians(shoot0H));
+        drivePickup1 = new Pose(drivePickup1X, drivePickup1Y, Math.toRadians(drivePickup1H));
+        pickup1 = new Pose(pickup1X, pickup1Y, Math.toRadians(pickup1H));
+        shoot1 = new Pose(shoot1X, shoot1Y, Math.toRadians(shoot1H));
+        drivePickup2Control = new Pose(drivePickup2ControlX, drivePickup2ControlY);
+        drivePickup2 = new Pose(drivePickup2X, drivePickup2Y, Math.toRadians(drivePickup2H));
+        pickup2 = new Pose(pickup2X, pickup2Y, Math.toRadians(pickup2H));
+        shoot2Control = new Pose(shoot2ControlX, shoot2ControlY);
+        shoot2 = new Pose(shoot2X, shoot2Y, Math.toRadians(shoot2H));
+        drivePickup3Control = new Pose(drivePickup3ControlX, drivePickup3ControlY);
+        drivePickup3 = new Pose(drivePickup3X, drivePickup3Y, Math.toRadians(drivePickup3H));
+        pickup3 = new Pose(pickup3X, pickup3Y, Math.toRadians(pickup3H));
+        shoot3Control = new Pose(shoot3ControlX, shoot3ControlY);
+        shoot3 = new Pose(shoot3X, shoot3Y, Math.toRadians(shoot3H));
+    } // add poses to void
+
+    //Building Paths
+    PathChain startPose_shoot0,
+            shoot0_drivePickup1, drivePickup1_pickup1, pickup1_shoot1,
+            shoot1_drivePickup2, drivePickup2_pickup2, pickup2_shoot2,
+            shoot2_drivePickup3, drivePickup3_pickup3, pickup3_shoot3;
+    private void buildPaths(){
+        startPose_shoot0 = follower.pathBuilder()
+                .addPath(new BezierLine(startPose, shoot0))
+                .setLinearHeadingInterpolation(startPose.getHeading(), shoot0.getHeading())
+                .build();
+
+        shoot0_drivePickup1 = follower.pathBuilder()
+                .addPath(new BezierLine(shoot0, drivePickup1))
+                .setLinearHeadingInterpolation(shoot0.getHeading(), drivePickup1.getHeading())
+                .build();
+
+        drivePickup1_pickup1 = follower.pathBuilder()
+                .addPath(new BezierLine(drivePickup1, pickup1))
+                .setTangentHeadingInterpolation()
+                .build();
+
+        pickup1_shoot1 = follower.pathBuilder()
+                .addPath(new BezierLine(pickup1, shoot1))
+                .setLinearHeadingInterpolation(pickup1.getHeading(), shoot1.getHeading())
+                .build();
+
+        shoot1_drivePickup2 = follower.pathBuilder()
+                .addPath(new BezierCurve(shoot1, drivePickup2Control, drivePickup2))
+                .setLinearHeadingInterpolation(shoot1.getHeading(), drivePickup2.getHeading())
+                .build();
+
+        drivePickup2_pickup2 = follower.pathBuilder()
+                .addPath(new BezierLine(drivePickup2, pickup2))
+                .setConstantHeadingInterpolation(pickup2.getHeading())
+                .build();
+
+        pickup2_shoot2 = follower.pathBuilder()
+                .addPath(new BezierCurve(pickup2, shoot2Control, shoot2))
+                .setLinearHeadingInterpolation(pickup2.getHeading(), shoot2.getHeading())
+                .build();
+
+        shoot2_drivePickup3 = follower.pathBuilder()
+                .addPath(new BezierCurve(shoot2, drivePickup3Control, drivePickup3))
+                .setLinearHeadingInterpolation(shoot2.getHeading(), drivePickup3.getHeading())
+                .build();
+
+        drivePickup3_pickup3 = follower.pathBuilder()
+                .addPath(new BezierLine(drivePickup3, pickup3))
+                .setTangentHeadingInterpolation()
+                .build();
+
+        pickup3_shoot3 = follower.pathBuilder()
+                .addPath(new BezierCurve(pickup3, shoot3Control, shoot3))
+                .setLinearHeadingInterpolation(pickup3.getHeading(), shoot3.getHeading())
+                .build();
+    }
+
+    //Path State Machine
+    private boolean startAuto = true;
+    private double timeStamp = 0;
+    private void pathStateMachine(){
+        double currentTime = (double) System.currentTimeMillis() / 1000;
+        switch(pathState){
+            case DRIVE_SHOOT0:
+                if (startAuto){
+                    follower.followPath(startPose_shoot0, true);
+                    startAuto = false;
+                    shootX = shoot0X;
+                    shootY = shoot0Y;
+                    shootH = shoot0H;
+                }
+                driveShoot(PathState.WAIT_SHOOT0, currentTime);
+                break;
+            case WAIT_SHOOT0:
+                waitShoot(PathState.DRIVE_PICKUP1, shoot0_drivePickup1, currentTime);
+                break;
+            case DRIVE_PICKUP1:
+                drivePickup(PathState.PICKUP1, drivePickup1_pickup1);
+                break;
+            case PICKUP1:
+                pickup(PathState.DRIVE_SHOOT1, pickup1_shoot1);
+                shootX = shoot1X;
+                shootY = shoot1Y;
+                shootH = shoot1H;
+                break;
+            case DRIVE_SHOOT1:
+                intakePowerDown(timeStamp, currentTime);
+                driveShoot(PathState.WAIT_SHOOT1, currentTime);
+                break;
+            case WAIT_SHOOT1:
+                waitShoot(PathState.DRIVE_PICKUP2, shoot1_drivePickup2, currentTime);
+                break;
+            case DRIVE_PICKUP2:
+                drivePickup(PathState.PICKUP2, drivePickup2_pickup2);
+                break;
+            case PICKUP2:
+                pickup(PathState.DRIVE_SHOOT2, pickup2_shoot2);
+                shootX = shoot2X;
+                shootY = shoot2Y;
+                shootH = shoot2H;
+                break;
+            case DRIVE_SHOOT2:
+                intakePowerDown(timeStamp, currentTime);
+                driveShoot(PathState.WAIT_SHOOT2, currentTime);
+                break;
+            case WAIT_SHOOT2:
+                waitShoot(PathState.DRIVE_PICKUP3, shoot2_drivePickup3, currentTime);
+                break;
+            case DRIVE_PICKUP3:
+                drivePickup(PathState.PICKUP3, drivePickup3_pickup3);
+                break;
+            case PICKUP3:
+                pickup(PathState.DRIVE_SHOOT3, pickup3_shoot3);
+                shootX = shoot3X;
+                shootY = shoot3Y;
+                shootH = shoot3H;
+                break;
+            case DRIVE_SHOOT3:
+                intakePowerDown(timeStamp, currentTime);
+                driveShoot(PathState.WAIT_SHOOT3, currentTime);
+                break;
+            case WAIT_SHOOT3:
+//                if (spindexer.shootAllComplete()){
+//                    spindexer.resetSpindexer();
+//                    TELE.addLine("Done Auto");
+//                }
+                break;
+            default:
+                break;
+        }
+        TELE.update(); // use for debugging
+    }
+
+    // Voids for State Machine
+    private void intakePowerDown(double stamp, double currentTime) {
+        double pow = (stamp - currentTime) / 2; // adjust denominator to see how much time to adjust
+        if (pow < -1) {pow = 0;}
+//        spindexer.setIntakePower(pow);
+    }
+    private void driveShoot(PathState nextState, double currentTime){
+        if (!follower.isBusy()){
+            pathState = nextState;
+            timeStamp = currentTime;
+//            spindexer.prepareShootAllContinous();
+        }
+    }
+    private void waitShoot(PathState nextState, PathChain nextPath, double currentTime) {
+        if (currentTime - timeStamp > shootTime) { // spindexer.shootAllComplete() ||
+//            spindexer.resetSpindexer();
+            pathState = nextState;
+            follower.followPath(nextPath, true);
+//            spindexer.setIntakePower(1);
+        }
+    }
+    private void drivePickup(PathState nextState, PathChain nextPath) {
+        if (!follower.isBusy()) {
+            pathState = nextState;
+            follower.followPath(nextPath, intakePower, false);
+        }
+    }
+    private void pickup(PathState nextState, PathChain nextPath) {
+        if (!follower.isBusy()) {
+            pathState = nextState;
+            follower.followPath(nextPath, true);
+        }
+    }
+
+    // Helps manage spindexer
+    private boolean driveToShoot(){
+        return pathState == PathState.DRIVE_SHOOT0 ||
+                pathState == PathState.DRIVE_SHOOT1 ||
+                pathState == PathState.DRIVE_SHOOT2 ||
+                pathState == PathState.DRIVE_SHOOT3;
+    }
+
+    // Used for changing alliance
+    private double adjustXPoseBasedOnAlliance(double pose) {return (144-pose);}
+    private double adjustHeadingBasedOnAlliance(double heading){
+        heading = 180 - heading;
+        while (heading > 180) {heading-=360;}
+        while (heading <= -180) {heading+=360;}
+        return heading;
+    }
+
+    @Override
+    public void runOpMode() throws InterruptedException {
+        Robot.resetInstance();
+        robot = Robot.getInstance(hardwareMap);
+        List<LynxModule> allHubs = hardwareMap.getAll(LynxModule.class);
+        for (LynxModule hub : allHubs) {
+            hub.setBulkCachingMode(LynxModule.BulkCachingMode.MANUAL);
+        }
+        TELE = new MultipleTelemetry(telemetry, FtcDashboard.getInstance().getTelemetry());
+//        flywheel = new Flywheel(hardwareMap);
+//        targeting = new Targeting();
+//        targetingSettings = new Targeting.Settings(0,0);
+        follower = Constants.createFollower(hardwareMap);
+        follower.setStartingPose(new Pose(72,72,0));
+//        turret = new Turret(robot, TELE, robot.limelight);
+//        spindexer = new Spindexer(hardwareMap);
+//        servos = new Servos(hardwareMap);
+        loopTimes = new MeasuringLoopTimes();
+        loopTimes.init();
+
+//        robot.light.setPosition(Color.LightRed);
+
+        boolean initializeRobot = false;
+        while (opModeInInit()){
+            follower.update();
+
+            if (gamepad1.crossWasPressed() && !initializeRobot){
+                Color.redAlliance = !Color.redAlliance;
+//                if (Color.redAlliance){
+//                    robot.light.setPosition(Color.LightRed);
+//                } else {
+//                    robot.light.setPosition(Color.LightBlue);
+//                }
+
+                double[] xPoses = {startPoseX, shoot0X,
+                        drivePickup1X, pickup1X, shoot1X,
+                        drivePickup2ControlX, drivePickup2X, pickup2X, shoot2ControlX, shoot2X,
+                        drivePickup3ControlX, drivePickup3X, pickup3X, shoot3ControlX, shoot3X};
+
+                double[] headings = {startPoseH, shoot0H,
+                        drivePickup1H, pickup1H, shoot1H,
+                        drivePickup2H, pickup2H, shoot2H,
+                        drivePickup3H, pickup3H, shoot3H};
+
+                for (int i = 0; i < xPoses.length; i++) {xPoses[i] = adjustXPoseBasedOnAlliance(xPoses[i]);}
+                for (int i = 0; i < headings.length; i++) {headings[i] = adjustHeadingBasedOnAlliance(headings[i]);}
+            }
+
+            if (gamepad1.triangleWasPressed()){
+                initializeRobot = true;
+                initializePoses();
+                follower.setPose(startPose);
+                buildPaths();
+                sleep(2000);
+
+//                turret.setTurret(turrDefault);
+//                servos.setSpinPos(spinStartPos);
+            }
+
+            TELE.addData("Red Alliance?", Color.redAlliance);
+            TELE.addData("Initialized Robot? (Don't change this until alliance is selected)", initializeRobot);
+            TELE.addData("Start Pose", follower.getPose());
+            TELE.update();
+        }
+
+        waitForStart();
+
+        if (isStopRequested()) return;
+
+//        robot.transfer.setPower(1);
+        limelightUsed = false;
+
+        while (opModeIsActive()){
+            follower.update();
+            pathStateMachine();
+            Pose currentPose = follower.getPose();
+//            teleStartPoseX = currentPose.getX();
+//            teleStartPoseY = currentPose.getY();
+//            teleStartPoseH = Math.toDegrees(currentPose.getHeading());
+//
+//            turret.trackGoal(new Pose(shootX, shootY, Math.toRadians(shootH)));
+//            targetingSettings = targeting.calculateSettings(shootX, shootY, Math.toRadians(shootH), 0, turretInterpolate);
+//
+//            double voltage = robot.voltage.getVoltage();
+//            flywheel.setPIDF(Robot.shooterPIDF_P, Robot.shooterPIDF_I, Robot.shooterPIDF_D, Robot.shooterPIDF_F / voltage);
+//            flywheel.manageFlywheel(targetingSettings.flywheelRPM);
+//            servos.setHoodPos(targetingSettings.hoodAngle);
+//
+//            if (driveToShoot()){servos.setSpinPos(spinStartPos);}
+//            else {spindexer.processIntake();}
+
+            for (LynxModule hub : allHubs) {
+                hub.clearBulkCache();
+            }
+            loopTimes.loop();
+
+            TELE.addData("Avg Loop Time", loopTimes.getAvgLoopTime());
+            TELE.addData("Min Loop Time", loopTimes.getMinLoopTimeOneMin());
+            TELE.addData("Max Loop Time", loopTimes.getMaxLoopTimeOneMin());
+            TELE.addData("X:", currentPose.getX());
+            TELE.addData("Y:", currentPose.getY());
+            TELE.addData("H:", currentPose.getHeading());
+            TELE.update();
+        }
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto12Ball_Back_Sorted.java

@@ -0,0 +1,366 @@
+package org.firstinspires.ftc.teamcode.autonomous;
+
+import static org.firstinspires.ftc.teamcode.utils.Turret.limelightUsed;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStartPoseH;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStartPoseY;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStartPoseX;
+
+import com.acmerobotics.dashboard.FtcDashboard;
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.pedropathing.follower.Follower;
+import com.pedropathing.geometry.BezierCurve;
+import com.pedropathing.geometry.BezierLine;
+import com.pedropathing.geometry.Pose;
+import com.pedropathing.paths.PathChain;
+import com.qualcomm.hardware.lynx.LynxModule;
+import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
+
+import org.firstinspires.ftc.teamcode.constants.Color;
+import org.firstinspires.ftc.teamcode.pedroPathing.Constants;
+import org.firstinspires.ftc.teamcode.utilsv2.Flywheel;
+import org.firstinspires.ftc.teamcode.utils.MeasuringLoopTimes;
+import org.firstinspires.ftc.teamcode.utilsv2.Robot;
+import org.firstinspires.ftc.teamcode.utilsv2.Turret;
+
+import java.util.List;
+
+@Config
+@Autonomous (preselectTeleOp = "TeleopV4")
+public class Auto12Ball_Back_Sorted extends LinearOpMode {
+    Robot robot;
+    MultipleTelemetry TELE;
+    Follower follower;
+    MeasuringLoopTimes loopTimes;
+
+    // Wait Times
+    public static double shootTime = 2;
+    public static double openGateTime = 1.5;
+
+    // Extra Variables
+    public static double intakePower = 0.3;
+    double shootX, shootY, shootH;
+
+    // Initialize path state machine
+    private enum PathState {
+        PUSHBOT, DRIVE_SHOOT0, WAIT_SHOOT0,
+        PICKUP1, DRIVE_OPENGATE, OPENGATE, DRIVE_SHOOT1, WAIT_SHOOT1,
+        DRIVE_PICKUP2, PICKUP2, DRIVE_SHOOT2, WAIT_SHOOT2,
+        DRIVE_PICKUP3, PICKUP3, DRIVE_SHOOT3, WAIT_SHOOT3
+    }
+    PathState pathState = PathState.PUSHBOT;
+
+    // Poses
+    public static double startPoseX = 84, startPoseY = 7, startPoseH = 90;
+    public static double pushBotX = 94, pushBotY = 9, pushBotH = 100;
+    public static double shoot0ControlX = 88.29667812142038, shoot0ControlY = 52.03493699885454;
+    public static double shoot0X = 91, shoot0Y = 80, shoot0H = 0;
+    public static double pickup1ControlX = 109.29381443298968, pickup1ControlY = 82.70618556701031;
+    public static double pickup1X = 126, pickup1Y = 82, pickup1H = 0;
+    public static double openGateControlX = 109.184421534937, openGateControlY = 74.24455899198165;
+    public static double openGateX = 129, openGateY = 74, openGateH = 0;
+    public static double shoot1ControlX = 112, shoot1ControlY = 75;
+    public static double shoot1X = 91, shoot1Y = 80, shoot1H = -12;
+    public static double drivePickup2X = 102, drivePickup2Y = 58.5, drivePickup2H = 0;
+    public static double pickup2X = 133, pickup2Y = 57, pickup2H = 0;
+    public static double shoot2ControlX = 102, shoot2ControlY = 63;
+    public static double shoot2X = 91, shoot2Y = 80, shoot2H = -50;
+    public static double drivePickup3X = 102, drivePickup3Y = 34.5, drivePickup3H = 0;
+    public static double pickup3X = 133, pickup3Y = 34.5, pickup3H = 0;
+    public static double shoot3ControlX = 97.62371134020621, shoot3ControlY = 34.813287514318446;
+    public static double shoot3X = 84, shoot3Y = 105, shoot3H = -80;
+    Pose startPose, pushBot, shoot0Control, shoot0,
+            pickup1Control, pickup1, openGateControl, openGate, shoot1Control, shoot1,
+            drivePickup2, pickup2, shoot2Control, shoot2,
+            drivePickup3, pickup3, shoot3Control, shoot3;
+    private void initializePoses(){
+        startPose = new Pose(startPoseX, startPoseY, Math.toRadians(startPoseH));
+        pushBot = new Pose(pushBotX, pushBotY, Math.toRadians(pushBotH));
+        shoot0Control = new Pose(shoot0ControlX, shoot0ControlY);
+        shoot0 = new Pose(shoot0X, shoot0Y, Math.toRadians(shoot0H));
+        pickup1Control = new Pose(pickup1ControlX, pickup1ControlY);
+        pickup1 = new Pose(pickup1X, pickup1Y, Math.toRadians(pickup1H));
+        openGateControl = new Pose(openGateControlX, openGateControlY);
+        openGate = new Pose(openGateX, openGateY, Math.toRadians(openGateH));
+        shoot1Control = new Pose(shoot1ControlX, shoot1ControlY);
+        shoot1 = new Pose(shoot1X, shoot1Y, Math.toRadians(shoot1H));
+        drivePickup2 = new Pose(drivePickup2X, drivePickup2Y, Math.toRadians(drivePickup2H));
+        pickup2 = new Pose(pickup2X, pickup2Y, Math.toRadians(pickup2H));
+        shoot2Control = new Pose(shoot2ControlX, shoot2ControlY);
+        shoot2 = new Pose(shoot2X, shoot2Y, Math.toRadians(shoot2H));
+        drivePickup3 = new Pose(drivePickup3X, drivePickup3Y, Math.toRadians(drivePickup3H));
+        pickup3 = new Pose(pickup3X, pickup3Y, Math.toRadians(pickup3H));
+        shoot3Control = new Pose(shoot3ControlX, shoot3ControlY);
+        shoot3 = new Pose(shoot3X, shoot3Y, Math.toRadians(shoot3H));
+    }
+
+    //Building Paths
+    PathChain startPose_pushBot, pushBot_shoot0,
+            shoot0_pickup1, pickup1_openGate, openGate_shoot1,
+            shoot1_drivePickup2, drivePickup2_pickup2, pickup2_shoot2,
+            shoot2_drivePickup3, drivePickup3_pickup3, pickup3_shoot3;
+    private void buildPaths(){
+        startPose_pushBot = follower.pathBuilder()
+                .addPath(new BezierLine(startPose, pushBot))
+                .setLinearHeadingInterpolation(startPose.getHeading(), pushBot.getHeading())
+                .build();
+
+        pushBot_shoot0 = follower.pathBuilder()
+                .addPath(new BezierCurve(pushBot, shoot0Control, shoot0))
+                .setLinearHeadingInterpolation(pushBot.getHeading(), shoot0.getHeading())
+                .build();
+
+        shoot0_pickup1 = follower.pathBuilder()
+                .addPath(new BezierCurve(shoot0, pickup1Control, pickup1))
+                .setLinearHeadingInterpolation(shoot0.getHeading(), pickup1.getHeading())
+                .build();
+
+        pickup1_openGate = follower.pathBuilder()
+                .addPath(new BezierCurve(pickup1, openGateControl, openGate))
+                .setLinearHeadingInterpolation(pickup1.getHeading(), openGate.getHeading())
+                .build();
+
+        openGate_shoot1 = follower.pathBuilder()
+                .addPath(new BezierCurve(openGate, shoot1Control, shoot1))
+                .setLinearHeadingInterpolation(openGate.getHeading(), shoot1.getHeading())
+                .build();
+
+        shoot1_drivePickup2 = follower.pathBuilder()
+                .addPath(new BezierLine(shoot1, drivePickup2))
+                .setLinearHeadingInterpolation(shoot1.getHeading(), drivePickup2.getHeading())
+                .build();
+
+        drivePickup2_pickup2 = follower.pathBuilder()
+                .addPath(new BezierLine(drivePickup2, pickup2))
+                .setLinearHeadingInterpolation(drivePickup2.getHeading(), pickup2.getHeading())
+                .build();
+
+        pickup2_shoot2 = follower.pathBuilder()
+                .addPath(new BezierCurve(pickup2, shoot2Control, shoot2))
+                .setLinearHeadingInterpolation(pickup2.getHeading(), shoot2.getHeading())
+                .build();
+
+        shoot2_drivePickup3 = follower.pathBuilder()
+                .addPath(new BezierLine(shoot2, drivePickup3))
+                .setLinearHeadingInterpolation(shoot2.getHeading(), drivePickup3.getHeading())
+                .build();
+
+        drivePickup3_pickup3 = follower.pathBuilder()
+                .addPath(new BezierLine(drivePickup3, pickup3))
+                .setLinearHeadingInterpolation(drivePickup3.getHeading(), pickup3.getHeading())
+                .build();
+
+        pickup3_shoot3 = follower.pathBuilder()
+                .addPath(new BezierCurve(pickup3, shoot3Control, shoot3))
+                .setLinearHeadingInterpolation(pickup3.getHeading(), shoot3.getHeading())
+                .build();
+    }
+
+    //Path State Machine
+    private boolean startAuto = true;
+    private double timeStamp = 0;
+    private void pathStateMachine(){
+        double currentTime = (double) System.currentTimeMillis() / 1000;
+        switch(pathState){
+            case PUSHBOT:
+                if (startAuto){
+                    follower.followPath(startPose_pushBot, true);
+                    startAuto = false;
+                    shootX = shoot0X;
+                    shootY = shoot0Y;
+                    shootH = shoot0H;
+                }
+                if (!follower.isBusy()){
+                    follower.followPath(pushBot_shoot0, true);
+                    pathState = PathState.DRIVE_SHOOT0;
+                }
+                break;
+            case DRIVE_SHOOT0:
+                if (!follower.isBusy()){
+                    timeStamp = currentTime;
+                    pathState = PathState.WAIT_SHOOT0;
+                }
+                break;
+            case WAIT_SHOOT0:
+                if (currentTime - timeStamp > shootTime){
+                    follower.followPath(shoot0_pickup1, intakePower, false);
+                    pathState = PathState.PICKUP1;
+                }
+                break;
+            case PICKUP1:
+                if (!follower.isBusy()){
+                    follower.followPath(pickup1_openGate, true);
+                    pathState = PathState.OPENGATE;
+                    shootX = shoot1X;
+                    shootY = shoot1Y;
+                    shootH = shoot1H;
+                }
+                break;
+            case DRIVE_OPENGATE:
+                if (!follower.isBusy()){
+                    pathState = PathState.OPENGATE;
+                    timeStamp = currentTime;
+                }
+                break;
+            case OPENGATE:
+                if (currentTime - timeStamp > openGateTime){
+                    follower.followPath(openGate_shoot1, true);
+                    pathState = PathState.DRIVE_SHOOT1;
+                }
+                break;
+            case DRIVE_SHOOT1:
+                if (!follower.isBusy()){
+                    pathState = PathState.WAIT_SHOOT1;
+                    timeStamp = currentTime;
+                }
+                break;
+            case WAIT_SHOOT1:
+                if (currentTime - timeStamp > shootTime){
+                    follower.followPath(shoot1_drivePickup2, true);
+                    pathState = PathState.DRIVE_PICKUP2;
+                }
+                break;
+            case DRIVE_PICKUP2:
+                if (!follower.isBusy()) {
+                    follower.followPath(drivePickup2_pickup2, intakePower, false);
+                    pathState = PathState.PICKUP2;
+                }
+                break;
+            case PICKUP2:
+                if (!follower.isBusy()){
+                    follower.followPath(pickup2_shoot2, true);
+                    pathState = PathState.DRIVE_SHOOT2;
+                }
+                shootX = shoot2X;
+                shootY = shoot2Y;
+                shootH = shoot2H;
+                break;
+            case DRIVE_SHOOT2:
+                if (!follower.isBusy()){
+                    pathState = PathState.WAIT_SHOOT2;
+                    timeStamp = currentTime;
+                }
+                break;
+            case WAIT_SHOOT2:
+                if (currentTime - timeStamp > shootTime){
+                    follower.followPath(shoot2_drivePickup3, true);
+                    pathState = PathState.DRIVE_PICKUP3;
+                }
+                break;
+            case DRIVE_PICKUP3:
+                if (!follower.isBusy()){
+                    follower.followPath(drivePickup3_pickup3, intakePower, false);
+                    pathState = PathState.PICKUP3;
+                }
+                break;
+            case PICKUP3:
+                if (!follower.isBusy()){
+                    follower.followPath(pickup3_shoot3, true);
+                    pathState = PathState.DRIVE_SHOOT3;
+                }
+                shootX = shoot3X;
+                shootY = shoot3Y;
+                shootH = shoot3H;
+                break;
+            case DRIVE_SHOOT3:
+                if (!follower.isBusy()){
+                    pathState = PathState.WAIT_SHOOT3;
+                }
+                break;
+            case WAIT_SHOOT3:
+                // add line here to say "done auto'
+                break;
+            default:
+                break;
+        }
+        TELE.update(); // use for debugging
+    }
+
+    // Used for changing alliance
+    private double adjustXPoseBasedOnAlliance(double pose) {return (144-pose);}
+    private double adjustHeadingBasedOnAlliance(double heading){
+        heading = 180 - heading;
+        while (heading > 180) {heading-=360;}
+        while (heading <= -180) {heading+=360;}
+        return heading;
+    }
+
+    @Override
+    public void runOpMode() throws InterruptedException {
+        Robot.resetInstance();
+        robot = Robot.getInstance(hardwareMap);
+        List<LynxModule> allHubs = hardwareMap.getAll(LynxModule.class);
+        for (LynxModule hub : allHubs) {
+            hub.setBulkCachingMode(LynxModule.BulkCachingMode.MANUAL);
+        }
+        TELE = new MultipleTelemetry(telemetry, FtcDashboard.getInstance().getTelemetry());
+        follower = Constants.createFollower(hardwareMap);
+        follower.setStartingPose(new Pose(72,72,0));
+        loopTimes = new MeasuringLoopTimes();
+        loopTimes.init();
+
+        boolean initializeRobot = false;
+        while (opModeInInit()){
+            follower.update();
+
+            if (gamepad1.crossWasPressed() && !initializeRobot){
+                Color.redAlliance = !Color.redAlliance;
+
+                double[] xPoses = {startPoseX, pushBotX, shoot0ControlX, shoot0X,
+                        pickup1ControlX, pickup1X, openGateControlX, openGateX, shoot1ControlX, shoot1X,
+                        drivePickup2X, pickup2X, shoot2ControlX, shoot2X,
+                        drivePickup3X, pickup3X, shoot3ControlX, shoot3X};
+
+                double[] headings = {startPoseH, pushBotH, shoot0H,
+                        pickup1H, openGateH, shoot1H,
+                        drivePickup2H, pickup2H, shoot2H,
+                        drivePickup3H, pickup3H, shoot3H};
+
+                for (int i = 0; i < xPoses.length; i++) {xPoses[i] = adjustXPoseBasedOnAlliance(xPoses[i]);}
+                for (int i = 0; i < headings.length; i++) {headings[i] = adjustHeadingBasedOnAlliance(headings[i]);}
+            }
+
+            if (gamepad1.triangleWasPressed()){
+                initializeRobot = true;
+                initializePoses();
+                follower.setPose(startPose);
+                buildPaths();
+                sleep(2000);
+            }
+
+            TELE.addData("Red Alliance?", Color.redAlliance);
+            TELE.addData("Initialized Robot? (Don't change this until alliance is selected)", initializeRobot);
+            TELE.addData("Start Pose", follower.getPose());
+            TELE.update();
+        }
+
+        waitForStart();
+
+        if (isStopRequested()) return;
+
+        limelightUsed = false;
+
+        while (opModeIsActive()){
+            follower.update();
+            pathStateMachine();
+            Pose currentPose = follower.getPose();
+            teleStartPoseX = currentPose.getX();
+            teleStartPoseY = currentPose.getY();
+            teleStartPoseH = Math.toDegrees(currentPose.getHeading());
+
+            for (LynxModule hub : allHubs) {
+                hub.clearBulkCache();
+            }
+            loopTimes.loop();
+
+            TELE.addData("Avg Loop Time", loopTimes.getAvgLoopTime());
+            TELE.addData("Min Loop Time", loopTimes.getMinLoopTimeOneMin());
+            TELE.addData("Max Loop Time", loopTimes.getMaxLoopTimeOneMin());
+            TELE.addData("X:", currentPose.getX());
+            TELE.addData("Y:", currentPose.getY());
+            TELE.addData("H:", currentPose.getHeading());
+            TELE.update();
+        }
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/AutoClose_V3.java

@@ -1,751 +0,0 @@
-package org.firstinspires.ftc.teamcode.autonomous;
-
-import static org.firstinspires.ftc.teamcode.constants.Color.*;
-import static org.firstinspires.ftc.teamcode.constants.Poses.*;
-import static org.firstinspires.ftc.teamcode.constants.ServoPositions.*;
-import static org.firstinspires.ftc.teamcode.constants.ShooterVars.*;
-
-import androidx.annotation.NonNull;
-
-import com.acmerobotics.dashboard.FtcDashboard;
-import com.acmerobotics.dashboard.config.Config;
-import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
-import com.acmerobotics.dashboard.telemetry.TelemetryPacket;
-import com.acmerobotics.roadrunner.Action;
-import com.acmerobotics.roadrunner.ParallelAction;
-import com.acmerobotics.roadrunner.Pose2d;
-import com.acmerobotics.roadrunner.SequentialAction;
-import com.acmerobotics.roadrunner.TrajectoryActionBuilder;
-import com.acmerobotics.roadrunner.Vector2d;
-import com.acmerobotics.roadrunner.ftc.Actions;
-import com.qualcomm.hardware.limelightvision.LLResult;
-import com.qualcomm.hardware.limelightvision.LLResultTypes;
-import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
-import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
-
-import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
-import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
-import org.firstinspires.ftc.teamcode.utils.FlywheelV2;
-import org.firstinspires.ftc.teamcode.utils.Robot;
-import org.firstinspires.ftc.teamcode.utils.Servos;
-
-import java.util.List;
-
-@Config
-@Autonomous(preselectTeleOp = "TeleopV3")
-public class AutoClose_V3 extends LinearOpMode {
-    Robot robot;
-    MultipleTelemetry TELE;
-    MecanumDrive drive;
-    FlywheelV2 flywheel;
-    Servos servo;
-
-    double velo = 0.0;
-    public static double intake1Time = 2.7;
-    public static double intake2Time = 3.0;
-    public static double colorDetect = 3.0;
-    boolean gpp = false;
-    boolean pgp = false;
-    boolean ppg = false;
-    double powPID = 0.0;
-    double bearing = 0.0;
-    int b1 = 0; // 0 = no ball, 1 = green, 2 = purple
-    int b2 = 0;// 0 = no ball, 1 = green, 2 = purple
-    int b3 = 0;// 0 = no ball, 1 = green, 2 = purple
-    public static double holdTurrPow = 0.1; // power to hold turret in place
-
-    public Action initShooter(int vel) {
-        return new Action() {
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                powPID = flywheel.manageFlywheel(vel, robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                velo = flywheel.getVelo(robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                robot.shooter1.setPower(powPID);
-                robot.shooter2.setPower(powPID);
-
-                TELE.addData("Velocity", velo);
-                TELE.update();
-
-                return !flywheel.getSteady();
-            }
-        };
-    }
-
-    public Action Obelisk() {
-        return new Action() {
-            int id = 0;
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                LLResult result = robot.limelight.getLatestResult();
-                if (result != null && result.isValid()) {
-                    List<LLResultTypes.FiducialResult> fiducials = result.getFiducialResults();
-                    for (LLResultTypes.FiducialResult fiducial : fiducials) {
-                        id = fiducial.getFiducialId();
-                        TELE.addData("ID", id);
-                        TELE.update();
-                    }
-
-                }
-
-                if (id == 21){
-                    gpp = true;
-                } else if (id == 22){
-                    pgp = true;
-                } else if (id == 23){
-                    ppg = true;
-                }
-
-                TELE.addData("Velocity", velo);
-                TELE.addData("21", gpp);
-                TELE.addData("22", pgp);
-                TELE.addData("23", ppg);
-                TELE.update();
-
-                if (gpp || pgp || ppg) {
-                    if (redAlliance){
-                        robot.limelight.pipelineSwitch(3);
-                        double turretPID = turret_redClose;
-                        robot.turr1.setPosition(turretPID);
-                        robot.turr2.setPosition(-turretPID);
-                        return false;
-
-                    } else {
-                        robot.limelight.pipelineSwitch(2);
-                        double turretPID = turret_blueClose;
-                        robot.turr1.setPosition(turretPID);
-                        robot.turr2.setPosition(-turretPID);
-                        return false;
-                    }
-                } else {
-                    return true;
-                }
-            }
-        };
-    }
-
-    public Action spindex(double spindexer, int vel) {
-        return new Action() {
-            double spinPID = 0.0;
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                powPID = flywheel.manageFlywheel(vel, robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                velo = flywheel.getVelo(robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                robot.shooter1.setPower(powPID);
-                robot.shooter2.setPower(powPID);
-
-                spinPID = servo.setSpinPos(spindexer);
-                robot.spin1.setPosition(spinPID);
-                robot.spin2.setPosition(-spinPID);
-                TELE.addData("Velocity", velo);
-                TELE.addLine("spindex");
-                TELE.update();
-
-                drive.updatePoseEstimate();
-                teleStart = drive.localizer.getPose();
-
-                if (servo.spinEqual(spindexer)){
-                    robot.spin1.setPosition(0);
-                    robot.spin2.setPosition(0);
-                    return false;
-                } else {
-                    return true;
-                }
-            }
-        };
-    }
-
-    public Action Shoot(int vel) {
-        return new Action() {
-            double transferStamp = 0.0;
-            int ticker = 1;
-            boolean transferIn = false;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                TELE.addData("Velocity", velo);
-                TELE.addLine("shooting");
-                TELE.update();
-
-                powPID = flywheel.manageFlywheel(vel, robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                velo = flywheel.getVelo(robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                robot.shooter1.setPower(powPID);
-                robot.shooter2.setPower(powPID);
-
-                drive.updatePoseEstimate();
-                detectTag();
-
-                teleStart = drive.localizer.getPose();
-
-                if (ticker == 1) {
-                    transferStamp = getRuntime();
-                    ticker++;
-                }
-                if (getRuntime() - transferStamp > waitTransfer && !transferIn) {
-                    robot.transferServo.setPosition(transferServo_in);
-                    TELE.addData("Velocity", velo);
-                    TELE.addData("ticker", ticker);
-                    TELE.update();
-                    transferIn = true;
-                    return true;
-                } else if (getRuntime() - transferStamp > waitTransfer + waitTransferOut && transferIn) {
-                    robot.transferServo.setPosition(transferServo_out);
-                    robot.turr1.setPosition(holdTurrPow);
-                    robot.turr2.setPosition(holdTurrPow);
-                    TELE.addData("Velocity", velo);
-                    TELE.addLine("shot once");
-                    TELE.update();
-                    return false;
-                } else {
-                    return true;
-                }
-
-            }
-        };
-    }
-
-    public Action intake(double intakeTime) {
-        return new Action() {
-            double position = spindexer_intakePos1;
-            double stamp = 0.0;
-            int ticker = 0;
-            double pow = 1.0;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                if (ticker == 0) {
-                    stamp = getRuntime();
-                }
-                ticker++;
-
-                robot.intake.setPower(pow);
-
-                double s1D = robot.color1.getDistance(DistanceUnit.MM);
-                double s2D = robot.color2.getDistance(DistanceUnit.MM);
-                double s3D = robot.color3.getDistance(DistanceUnit.MM);
-
-                if (!servo.spinEqual(position)){
-                    double spinPID = servo.setSpinPos(position);
-                    robot.spin1.setPosition(spinPID);
-                    robot.spin2.setPosition(-spinPID);
-                }
-
-                if (s1D < 43 && servo.spinEqual(position) && getRuntime() - stamp > 0.5){
-                    if (s2D > 60){
-                        if (servo.spinEqual(spindexer_intakePos1)){
-                            position = spindexer_intakePos2;
-                        } else if (servo.spinEqual(spindexer_intakePos2)){
-                            position = spindexer_intakePos3;
-                        } else if (servo.spinEqual(spindexer_intakePos3)){
-                            position = spindexer_intakePos1;
-                        }
-                    } else if (s3D > 33){
-                        if (servo.spinEqual(spindexer_intakePos1)){
-                            position = spindexer_intakePos3;
-                        } else if (servo.spinEqual(spindexer_intakePos2)){
-                            position = spindexer_intakePos1;
-                        } else if (servo.spinEqual(spindexer_intakePos3)){
-                            position = spindexer_intakePos2;
-                        }
-                    }
-                    stamp = getRuntime();
-                }
-
-                TELE.addData("Velocity", velo);
-                TELE.addLine("Intaking");
-                TELE.update();
-
-                drive.updatePoseEstimate();
-
-                teleStart = drive.localizer.getPose();
-
-                robot.intake.setPower(1);
-                if ((s1D < 43.0 && s2D < 60.0 && s3D < 33.0) || getRuntime() - stamp > intakeTime) {
-                    robot.spin1.setPosition(0);
-                    robot.spin2.setPosition(0);
-                    if (getRuntime() - stamp - intakeTime < 1){
-                        pow = -2*(getRuntime() - stamp - intakeTime);
-                        return true;
-                    } else {
-                        robot.intake.setPower(0);
-                        return false;
-                    }
-                } else {
-                    return true;
-                }
-            }
-        };
-    }
-
-    public Action ColorDetect(int vel) {
-        return new Action() {
-            double stamp = 0.0;
-            int ticker = 0;
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                if (ticker == 0) {
-                    stamp = getRuntime();
-                }
-                ticker++;
-
-                powPID = flywheel.manageFlywheel(vel, robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                velo = flywheel.getVelo(robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                robot.shooter1.setPower(powPID);
-                robot.shooter2.setPower(powPID);
-
-                double s1D = robot.color1.getDistance(DistanceUnit.MM);
-                double s2D = robot.color2.getDistance(DistanceUnit.MM);
-                double s3D = robot.color3.getDistance(DistanceUnit.MM);
-
-                drive.updatePoseEstimate();
-
-                teleStart = drive.localizer.getPose();
-
-                if (s1D < 43) {
-
-                    double green = robot.color1.getNormalizedColors().green;
-                    double red = robot.color1.getNormalizedColors().red;
-                    double blue = robot.color1.getNormalizedColors().blue;
-
-                    double gP = green / (green + red + blue);
-
-                    if (gP >= 0.4) {
-                        b1 = 2;
-                    } else {
-                        b1 = 1;
-                    }
-                }
-
-                if (s2D < 60) {
-
-                    double green = robot.color2.getNormalizedColors().green;
-                    double red = robot.color2.getNormalizedColors().red;
-                    double blue = robot.color2.getNormalizedColors().blue;
-
-                    double gP = green / (green + red + blue);
-
-                    if (gP >= 0.4) {
-                        b2 = 2;
-                    } else {
-                        b2 = 1;
-                    }
-                }
-
-                if (s3D < 33) {
-
-                    double green = robot.color3.getNormalizedColors().green;
-                    double red = robot.color3.getNormalizedColors().red;
-                    double blue = robot.color3.getNormalizedColors().blue;
-
-                    double gP = green / (green + red + blue);
-
-                    if (gP >= 0.4) {
-                        b3 = 2;
-                    } else {
-                        b3 = 1;
-                    }
-                }
-
-                TELE.addData("Velocity", velo);
-                TELE.addLine("Detecting");
-                TELE.addData("Distance 1", s1D);
-                TELE.addData("Distance 2", s2D);
-                TELE.addData("Distance 3", s3D);
-                TELE.addData("B1", b1);
-                TELE.addData("B2", b2);
-                TELE.addData("B3", b3);
-                TELE.update();
-
-                return (b1 + b2 + b3 < 4) && !(getRuntime() - stamp > colorDetect);
-            }
-        };
-    }
-
-    @Override
-    public void runOpMode() throws InterruptedException {
-
-        robot = new Robot(hardwareMap);
-
-        flywheel = new FlywheelV2();
-
-        TELE = new MultipleTelemetry(
-                telemetry, FtcDashboard.getInstance().getTelemetry()
-        );
-
-        drive = new MecanumDrive(hardwareMap, new Pose2d(
-                0, 0, 0
-        ));
-
-        robot.limelight.pipelineSwitch(1);
-        robot.limelight.start();
-
-        TrajectoryActionBuilder shoot0 = drive.actionBuilder(new Pose2d(0, 0, 0))
-                .strafeToLinearHeading(new Vector2d(bx1, by1), bh1);
-
-        TrajectoryActionBuilder pickup1 = drive.actionBuilder(new Pose2d(bx1, by1, bh1))
-                .strafeToLinearHeading(new Vector2d(bx2a, by2a), bh2a)
-                .strafeToLinearHeading(new Vector2d(bx2b, by2b), bh2b);
-
-        TrajectoryActionBuilder shoot1 = drive.actionBuilder(new Pose2d(bx2b, by2b, bh2b))
-                .strafeToLinearHeading(new Vector2d(bx1, by1), bh1);
-
-        TrajectoryActionBuilder pickup2 = drive.actionBuilder(new Pose2d(bx1, by1, bh1))
-                .strafeToLinearHeading(new Vector2d(bx3a, by3a), bh3a)
-                .strafeToLinearHeading(new Vector2d(bx3b, by3b), bh3b);
-
-        TrajectoryActionBuilder shoot2 = drive.actionBuilder(new Pose2d(bx3b, by3b, bh3b))
-                .strafeToLinearHeading(new Vector2d(bx1, by1), bh1);
-
-        while (opModeInInit()) {
-
-            if (gamepad2.dpadUpWasPressed()) {
-                hoodAuto -= 0.01;
-            }
-
-            if (gamepad2.dpadDownWasPressed()) {
-                hoodAuto += 0.01;
-            }
-
-            if (gamepad2.crossWasPressed()){
-                redAlliance = !redAlliance;
-            }
-
-            double turrPID;
-
-            if (redAlliance){
-                turrPID = turret_detectRedClose;
-
-                shoot0 = drive.actionBuilder(new Pose2d(0, 0, 0))
-                        .strafeToLinearHeading(new Vector2d(rx1, ry1), rh1);
-
-                pickup1 = drive.actionBuilder(new Pose2d(rx1, ry1, rh1))
-                        .strafeToLinearHeading(new Vector2d(rx2a, ry2a), rh2a)
-                        .strafeToLinearHeading(new Vector2d(rx2b, ry2b), rh2b);
-
-                shoot1 = drive.actionBuilder(new Pose2d(rx2b, ry2b, rh2b))
-                        .strafeToLinearHeading(new Vector2d(rx1, ry1), rh1);
-
-                pickup2 = drive.actionBuilder(new Pose2d(rx1, ry1, rh1))
-                        .strafeToLinearHeading(new Vector2d(rx3a, ry3a), rh3a)
-                        .strafeToLinearHeading(new Vector2d(rx3b, ry3b), rh3b);
-
-                shoot2 = drive.actionBuilder(new Pose2d(rx3b, ry3b, rh3b))
-                        .strafeToLinearHeading(new Vector2d(rx1, ry1), rh1);
-            } else {
-                turrPID = turret_detectBlueClose;
-
-                shoot0 = drive.actionBuilder(new Pose2d(0, 0, 0))
-                        .strafeToLinearHeading(new Vector2d(bx1, by1), bh1);
-
-                pickup1 = drive.actionBuilder(new Pose2d(bx1, by1, bh1))
-                        .strafeToLinearHeading(new Vector2d(bx2a, by2a), bh2a)
-                        .strafeToLinearHeading(new Vector2d(bx2b, by2b), bh2b);
-
-                shoot1 = drive.actionBuilder(new Pose2d(bx2b, by2b, bh2b))
-                        .strafeToLinearHeading(new Vector2d(bx1, by1), bh1);
-
-                pickup2 = drive.actionBuilder(new Pose2d(bx1, by1, bh1))
-                        .strafeToLinearHeading(new Vector2d(bx3a, by3a), bh3a)
-                        .strafeToLinearHeading(new Vector2d(bx3b, by3b), bh3b);
-
-                shoot2 = drive.actionBuilder(new Pose2d(bx3b, by3b, bh3b))
-                        .strafeToLinearHeading(new Vector2d(bx1, by1), bh1);
-            }
-
-            robot.turr1.setPosition(turrPID);
-            robot.turr2.setPosition(-turrPID);
-
-            robot.hood.setPosition(hoodAuto);
-
-            robot.transferServo.setPosition(transferServo_out);
-
-            TELE.addData("Velocity", velo);
-            TELE.addData("Turret Pos", servo.getTurrPos());
-            TELE.addData("Spin Pos", servo.getSpinPos());
-            TELE.update();
-        }
-
-        waitForStart();
-
-        if (isStopRequested()) return;
-
-        if (opModeIsActive()) {
-
-            Actions.runBlocking(
-                    new ParallelAction(
-                            shoot0.build(),
-                            initShooter(AUTO_CLOSE_VEL),
-                            Obelisk()
-                    )
-            );
-            drive.updatePoseEstimate();
-
-            teleStart = drive.localizer.getPose();
-
-            robot.transfer.setPower(1);
-
-            shootingSequence();
-
-            robot.transfer.setPower(0);
-
-            drive.updatePoseEstimate();
-
-            teleStart = drive.localizer.getPose();
-
-            Actions.runBlocking(
-                    new ParallelAction(
-                            pickup1.build(),
-                            intake(intake1Time)
-                    )
-            );
-            drive.updatePoseEstimate();
-
-            teleStart = drive.localizer.getPose();
-
-            Actions.runBlocking(
-                    new ParallelAction(
-                            shoot1.build(),
-                            ColorDetect(AUTO_CLOSE_VEL)
-                    )
-            );
-
-            drive.updatePoseEstimate();
-
-            teleStart = drive.localizer.getPose();
-
-            robot.transfer.setPower(1);
-
-            shootingSequence();
-
-            robot.transfer.setPower(0);
-
-            drive.updatePoseEstimate();
-
-            teleStart = drive.localizer.getPose();
-
-            Actions.runBlocking(
-                    new ParallelAction(
-                            pickup2.build(),
-                            intake(intake2Time)
-                    )
-            );
-            drive.updatePoseEstimate();
-
-            teleStart = drive.localizer.getPose();
-
-            Actions.runBlocking(
-                    new ParallelAction(
-                            shoot2.build(),
-                            ColorDetect(AUTO_CLOSE_VEL)
-                    )
-            );
-
-            robot.transfer.setPower(1);
-
-            shootingSequence();
-
-            robot.transfer.setPower(0);
-
-            drive.updatePoseEstimate();
-
-            teleStart = drive.localizer.getPose();
-
-            TELE.addData("Velocity", velo);
-            TELE.addLine("finished");
-            TELE.update();
-
-            sleep(2000);
-
-        }
-
-    }
-    //TODO: adjust this according to Teleop numbers
-    public void detectTag() {
-        LLResult result = robot.limelight.getLatestResult();
-        if (result != null) {
-            if (result.isValid()) {
-                bearing = result.getTx();
-            }
-        }
-        double turretPos = servo.getTurrPos() - (bearing / 1300);
-        double turretPID = turretPos;
-        robot.turr1.setPosition(turretPID);
-        robot.turr2.setPosition(-turretPID);
-    }
-
-    public void shootingSequence() {
-        TELE.addData("Velocity", velo);
-        if (gpp) {
-            if (b1 + b2 + b3 == 4) {
-                if (b1 == 2 && b2 - b3 == 0) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                } else if (b2 == 2 && b1 - b3 == 0) {
-                    sequence3();
-                    TELE.addLine("sequence3");
-                } else if (b3 == 2 && b1 - b2 == 0) {
-                    sequence6();
-                    TELE.addLine("sequence6");
-                } else {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                }
-            } else if (b1 + b2 + b3 >= 5) {
-                if (b1 == 2) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                } else if (b2 == 2) {
-                    sequence3();
-                    TELE.addLine("sequence3");
-                } else if (b3 == 2) {
-                    sequence6();
-                    TELE.addLine("sequence6");
-                }
-            } else {
-                sequence1();
-                TELE.addLine("sequence1");
-            }
-        } else if (pgp) {
-            if (b1 + b2 + b3 == 4) {
-                if (b1 == 2 && b2 - b3 == 0) {
-                    sequence3();
-                    TELE.addLine("sequence3");
-                } else if (b2 == 2 && b1 - b3 == 0) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                } else if (b3 == 2 && b1 - b2 == 0) {
-                    sequence4();
-                    TELE.addLine("sequence4");
-                } else {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                }
-            } else if (b1 + b2 + b3 >= 5) {
-                if (b1 == 2) {
-                    sequence3();
-                    TELE.addLine("sequence3");
-                } else if (b2 == 2) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                } else if (b3 == 2) {
-                    sequence4();
-                    TELE.addLine("sequence4");
-                }
-            } else {
-                sequence3();
-                TELE.addLine("sequence3");
-            }
-        } else if (ppg) {
-            if (b1 + b2 + b3 == 4) {
-                if (b1 == 2 && b2 - b3 == 0) {
-                    sequence6();
-                    TELE.addLine("sequence6");
-                } else if (b2 == 2 && b1 - b3 == 0) {
-                    sequence5();
-                    TELE.addLine("sequence5");
-                } else if (b3 == 2 && b1 - b2 == 0) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                } else {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                }
-            } else if (b1 + b2 + b3 >= 5) {
-                if (b1 == 2) {
-                    sequence6();
-                    TELE.addLine("sequence6");
-                } else if (b2 == 2) {
-                    sequence5();
-                    TELE.addLine("sequence5");
-                } else if (b3 == 2) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                }
-            } else {
-                sequence6();
-                TELE.addLine("sequence6");
-            }
-        } else {
-            sequence1();
-            TELE.addLine("sequence1");
-        }
-        TELE.update();
-    }
-
-    public void sequence1() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall1, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall2, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall3, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL)
-                )
-        );
-    }
-
-    public void sequence2() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall1, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall3, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall2, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL)
-                )
-        );
-    }
-
-    public void sequence3() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall2, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall1, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall3, AUTO_CLOSE_VEL),
-
-                        Shoot(AUTO_CLOSE_VEL)
-                )
-        );
-    }
-
-    public void sequence4() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall2, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall3, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall1, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL)
-                )
-        );
-    }
-
-    public void sequence5() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall3, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall1, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall2, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL)
-                )
-        );
-    }
-
-    public void sequence6() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall3, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall2, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL),
-                        spindex(spindexer_outtakeBall1, AUTO_CLOSE_VEL),
-                        Shoot(AUTO_CLOSE_VEL)
-                )
-        );
-    }
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/AutoFar_V1.java

@@ -1,650 +0,0 @@
-package org.firstinspires.ftc.teamcode.autonomous;
-
-import static org.firstinspires.ftc.teamcode.constants.Color.*;
-import static org.firstinspires.ftc.teamcode.constants.Poses.*;
-import static org.firstinspires.ftc.teamcode.constants.ServoPositions.*;
-import static org.firstinspires.ftc.teamcode.constants.ShooterVars.*;
-
-import androidx.annotation.NonNull;
-
-import com.acmerobotics.dashboard.FtcDashboard;
-import com.acmerobotics.dashboard.config.Config;
-import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
-import com.acmerobotics.dashboard.telemetry.TelemetryPacket;
-import com.acmerobotics.roadrunner.Action;
-import com.acmerobotics.roadrunner.ParallelAction;
-import com.acmerobotics.roadrunner.Pose2d;
-import com.acmerobotics.roadrunner.SequentialAction;
-import com.acmerobotics.roadrunner.TrajectoryActionBuilder;
-import com.acmerobotics.roadrunner.Vector2d;
-import com.acmerobotics.roadrunner.ftc.Actions;
-import com.qualcomm.hardware.limelightvision.LLResult;
-import com.qualcomm.hardware.limelightvision.LLResultTypes;
-import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
-import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
-
-import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
-import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
-import org.firstinspires.ftc.teamcode.utils.FlywheelV2;
-import org.firstinspires.ftc.teamcode.utils.Robot;
-import org.firstinspires.ftc.teamcode.utils.Servos;
-
-import java.util.List;
-
-
-public class AutoFar_V1 extends LinearOpMode {
-    Robot robot;
-    MultipleTelemetry TELE;
-    MecanumDrive drive;
-    FlywheelV2 flywheel;
-    Servos servo;
-
-    double velo = 0.0;
-    public static double intake1Time = 2.7;
-    public static double intake2Time = 3.0;
-    public static double colorDetect = 3.0;
-    boolean gpp = false;
-    boolean pgp = false;
-    boolean ppg = false;
-    double powPID = 0.0;
-    double bearing = 0.0;
-    int b1 = 0; // 0 = no ball, 1 = green, 2 = purple
-    int b2 = 0;// 0 = no ball, 1 = green, 2 = purple
-    int b3 = 0;// 0 = no ball, 1 = green, 2 = purple
-    public static double holdTurrPow = 0.1; // power to hold turret in place
-
-    public Action initShooter(int vel) {
-        return new Action() {
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                powPID = flywheel.manageFlywheel(vel, robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                velo = flywheel.getVelo(robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                robot.shooter1.setPower(powPID);
-                robot.shooter2.setPower(powPID);
-
-                TELE.addData("Velocity", velo);
-                TELE.update();
-
-                return !flywheel.getSteady();
-            }
-        };
-    }
-
-    public Action Obelisk() {
-        return new Action() {
-            int id = 0;
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                LLResult result = robot.limelight.getLatestResult();
-                if (result != null && result.isValid()) {
-                    List<LLResultTypes.FiducialResult> fiducials = result.getFiducialResults();
-                    for (LLResultTypes.FiducialResult fiducial : fiducials) {
-                        id = fiducial.getFiducialId();
-                        TELE.addData("ID", id);
-                        TELE.update();
-                    }
-
-                }
-
-                if (id == 21){
-                    gpp = true;
-                } else if (id == 22){
-                    pgp = true;
-                } else if (id == 23){
-                    ppg = true;
-                }
-
-                TELE.addData("Velocity", velo);
-                TELE.addData("21", gpp);
-                TELE.addData("22", pgp);
-                TELE.addData("23", ppg);
-                TELE.update();
-
-                if (gpp || pgp || ppg) {
-                    if (redAlliance){
-                        robot.limelight.pipelineSwitch(3);
-                        robot.turr1.setPosition(turret_redFar);
-                        robot.turr2.setPosition(-turret_redFar);
-
-                    } else {
-                        robot.limelight.pipelineSwitch(2);
-
-                        robot.turr1.setPosition(turret_blueFar);
-                        robot.turr2.setPosition(-turret_blueFar);
-
-                    }
-
-                    return false;
-                } else {
-                    return true;
-                }
-            }
-        };
-    }
-
-    public Action spindex(double spindexer, int vel) {
-        return new Action() {
-            double spinPID = 0.0;
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                powPID = flywheel.manageFlywheel(vel, robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                velo = flywheel.getVelo(robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                robot.shooter1.setPower(powPID);
-                robot.shooter2.setPower(powPID);
-
-                spinPID = servo.setSpinPos(spindexer);
-                robot.spin1.setPosition(spinPID);
-                robot.spin2.setPosition(-spinPID);
-                TELE.addData("Velocity", velo);
-                TELE.addLine("spindex");
-                TELE.update();
-
-                drive.updatePoseEstimate();
-                teleStart = drive.localizer.getPose();
-
-                if (servo.spinEqual(spindexer)){
-                    robot.spin1.setPosition(0);
-                    robot.spin2.setPosition(0);
-                    return false;
-                } else {
-                    return true;
-                }
-            }
-        };
-    }
-
-    public Action Shoot(int vel) {
-        return new Action() {
-            double transferStamp = 0.0;
-            int ticker = 1;
-            boolean transferIn = false;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                TELE.addData("Velocity", velo);
-                TELE.addLine("shooting");
-                TELE.update();
-
-                powPID = flywheel.manageFlywheel(vel, robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                velo = flywheel.getVelo(robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                robot.shooter1.setPower(powPID);
-                robot.shooter2.setPower(powPID);
-
-                drive.updatePoseEstimate();
-                detectTag();
-
-                teleStart = drive.localizer.getPose();
-
-                if (ticker == 1) {
-                    transferStamp = getRuntime();
-                    ticker++;
-                }
-                if (getRuntime() - transferStamp > waitTransfer && !transferIn) {
-                    robot.transferServo.setPosition(transferServo_in);
-                    TELE.addData("Velocity", velo);
-                    TELE.addData("ticker", ticker);
-                    TELE.update();
-                    transferIn = true;
-                    return true;
-                } else if (getRuntime() - transferStamp > waitTransfer + waitTransferOut && transferIn) {
-                    robot.transferServo.setPosition(transferServo_out);
-                    robot.turr1.setPosition(holdTurrPow);
-                    robot.turr2.setPosition(holdTurrPow);
-                    TELE.addData("Velocity", velo);
-                    TELE.addLine("shot once");
-                    TELE.update();
-                    return false;
-                } else {
-                    return true;
-                }
-
-            }
-        };
-    }
-
-    public Action intake(double intakeTime) {
-        return new Action() {
-            double position = spindexer_intakePos1;
-            double stamp = 0.0;
-            int ticker = 0;
-            double pow = 1.0;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                if (ticker == 0) {
-                    stamp = getRuntime();
-                }
-                ticker++;
-
-                robot.intake.setPower(pow);
-
-                double s1D = robot.color1.getDistance(DistanceUnit.MM);
-                double s2D = robot.color2.getDistance(DistanceUnit.MM);
-                double s3D = robot.color3.getDistance(DistanceUnit.MM);
-
-                if (!servo.spinEqual(position)){
-                    double spinPID = servo.setSpinPos(position);
-                    robot.spin1.setPosition(spinPID);
-                    robot.spin2.setPosition(-spinPID);
-                }
-
-                if (s1D < 43 && servo.spinEqual(position) && getRuntime() - stamp > 0.5){
-                    if (s2D > 60){
-                        if (servo.spinEqual(spindexer_intakePos1)){
-                            position = spindexer_intakePos2;
-                        } else if (servo.spinEqual(spindexer_intakePos2)){
-                            position = spindexer_intakePos3;
-                        } else if (servo.spinEqual(spindexer_intakePos3)){
-                            position = spindexer_intakePos1;
-                        }
-                    } else if (s3D > 33){
-                        if (servo.spinEqual(spindexer_intakePos1)){
-                            position = spindexer_intakePos3;
-                        } else if (servo.spinEqual(spindexer_intakePos2)){
-                            position = spindexer_intakePos1;
-                        } else if (servo.spinEqual(spindexer_intakePos3)){
-                            position = spindexer_intakePos2;
-                        }
-                    }
-                    stamp = getRuntime();
-                }
-
-                TELE.addData("Velocity", velo);
-                TELE.addLine("Intaking");
-                TELE.update();
-
-                drive.updatePoseEstimate();
-
-                teleStart = drive.localizer.getPose();
-
-                robot.intake.setPower(1);
-                if ((s1D < 43.0 && s2D < 60.0 && s3D < 33.0) || getRuntime() - stamp > intakeTime) {
-                    robot.spin1.setPosition(0);
-                    robot.spin2.setPosition(0);
-                    if (getRuntime() - stamp - intakeTime < 1){
-                        pow = -2*(getRuntime() - stamp - intakeTime);
-                        return true;
-                    } else {
-                        robot.intake.setPower(0);
-                        return false;
-                    }
-                } else {
-                    return true;
-                }
-            }
-        };
-    }
-
-    public Action ColorDetect(int vel) {
-        return new Action() {
-            double stamp = 0.0;
-            int ticker = 0;
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                if (ticker == 0) {
-                    stamp = getRuntime();
-                }
-                ticker++;
-
-                powPID = flywheel.manageFlywheel(vel, robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                velo = flywheel.getVelo(robot.shooter1.getCurrentPosition(), robot.shooter2.getCurrentPosition());
-                robot.shooter1.setPower(powPID);
-                robot.shooter2.setPower(powPID);
-
-                double s1D = robot.color1.getDistance(DistanceUnit.MM);
-                double s2D = robot.color2.getDistance(DistanceUnit.MM);
-                double s3D = robot.color3.getDistance(DistanceUnit.MM);
-
-                drive.updatePoseEstimate();
-
-                teleStart = drive.localizer.getPose();
-
-                if (s1D < 43) {
-
-                    double green = robot.color1.getNormalizedColors().green;
-                    double red = robot.color1.getNormalizedColors().red;
-                    double blue = robot.color1.getNormalizedColors().blue;
-
-                    double gP = green / (green + red + blue);
-
-                    if (gP >= 0.4) {
-                        b1 = 2;
-                    } else {
-                        b1 = 1;
-                    }
-                }
-
-                if (s2D < 60) {
-
-                    double green = robot.color2.getNormalizedColors().green;
-                    double red = robot.color2.getNormalizedColors().red;
-                    double blue = robot.color2.getNormalizedColors().blue;
-
-                    double gP = green / (green + red + blue);
-
-                    if (gP >= 0.4) {
-                        b2 = 2;
-                    } else {
-                        b2 = 1;
-                    }
-                }
-
-                if (s3D < 33) {
-
-                    double green = robot.color3.getNormalizedColors().green;
-                    double red = robot.color3.getNormalizedColors().red;
-                    double blue = robot.color3.getNormalizedColors().blue;
-
-                    double gP = green / (green + red + blue);
-
-                    if (gP >= 0.4) {
-                        b3 = 2;
-                    } else {
-                        b3 = 1;
-                    }
-                }
-
-                TELE.addData("Velocity", velo);
-                TELE.addLine("Detecting");
-                TELE.addData("Distance 1", s1D);
-                TELE.addData("Distance 2", s2D);
-                TELE.addData("Distance 3", s3D);
-                TELE.addData("B1", b1);
-                TELE.addData("B2", b2);
-                TELE.addData("B3", b3);
-                TELE.update();
-
-                return (b1 + b2 + b3 < 4) && !(getRuntime() - stamp > colorDetect);
-            }
-        };
-    }
-
-    @Override
-    public void runOpMode() throws InterruptedException {
-
-        robot = new Robot(hardwareMap);
-
-        flywheel = new FlywheelV2();
-
-        TELE = new MultipleTelemetry(
-                telemetry, FtcDashboard.getInstance().getTelemetry()
-        );
-
-        drive = new MecanumDrive(hardwareMap, new Pose2d(
-                0, 0, 0
-        ));
-
-        robot.limelight.pipelineSwitch(1);
-        robot.limelight.start();
-
-        //TODO: add positions to develop auto
-        
-        TrajectoryActionBuilder park = drive.actionBuilder(new Pose2d(0,0,0))
-                .strafeToLinearHeading(new Vector2d(rfx1, rfy1), rfh1);
-
-        while (opModeInInit()) {
-
-            if (gamepad2.dpadUpWasPressed()) {
-                hoodAuto -= 0.01;
-            }
-
-            if (gamepad2.dpadDownWasPressed()) {
-                hoodAuto += 0.01;
-            }
-
-            if (gamepad2.crossWasPressed()){
-                redAlliance = !redAlliance;
-            }
-
-            double turrPID;
-
-            if (redAlliance){
-                turrPID = turret_detectRedClose;
-            } else {
-                turrPID = turret_detectBlueClose;
-            }
-
-            robot.turr1.setPosition(turrPID);
-            robot.turr2.setPosition(-turrPID);
-
-            robot.hood.setPosition(hoodAutoFar);
-
-            robot.transferServo.setPosition(transferServo_out);
-
-            TELE.addData("Velocity", velo);
-            TELE.addData("Turret Pos", servo.getTurrPos());
-            TELE.addData("Spin Pos", servo.getSpinPos());
-            TELE.update();
-        }
-
-        waitForStart();
-
-        if (isStopRequested()) return;
-
-        if (opModeIsActive()) {
-
-            Actions.runBlocking(
-                    new ParallelAction(
-                            initShooter(AUTO_FAR_VEL),
-                            Obelisk()
-                    )
-            );
-            drive.updatePoseEstimate();
-
-            teleStart = drive.localizer.getPose();
-
-            robot.transfer.setPower(1);
-
-            shootingSequence();
-
-            robot.transfer.setPower(0);
-
-            drive.updatePoseEstimate();
-
-            teleStart = drive.localizer.getPose();
-            
-            Actions.runBlocking(park.build());
-
-            drive.updatePoseEstimate();
-
-            teleStart = drive.localizer.getPose();
-
-            TELE.addData("Velocity", velo);
-            TELE.addLine("finished");
-            TELE.update();
-
-            sleep(2000);
-
-        }
-
-    }
-    //TODO: adjust this according to Teleop numbers
-    public void detectTag() {
-        LLResult result = robot.limelight.getLatestResult();
-        if (result != null) {
-            if (result.isValid()) {
-                bearing = result.getTx();
-            }
-        }
-        double turretPos = servo.getTurrPos() - (bearing / 1300);
-        double turretPID = turretPos;
-        robot.turr1.setPosition(turretPID);
-        robot.turr2.setPosition(-turretPID);
-    }
-
-    public void shootingSequence() {
-        TELE.addData("Velocity", velo);
-        if (gpp) {
-            if (b1 + b2 + b3 == 4) {
-                if (b1 == 2 && b2 - b3 == 0) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                } else if (b2 == 2 && b1 - b3 == 0) {
-                    sequence3();
-                    TELE.addLine("sequence3");
-                } else if (b3 == 2 && b1 - b2 == 0) {
-                    sequence6();
-                    TELE.addLine("sequence6");
-                } else {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                }
-            } else if (b1 + b2 + b3 >= 5) {
-                if (b1 == 2) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                } else if (b2 == 2) {
-                    sequence3();
-                    TELE.addLine("sequence3");
-                } else if (b3 == 2) {
-                    sequence6();
-                    TELE.addLine("sequence6");
-                }
-            } else {
-                sequence1();
-                TELE.addLine("sequence1");
-            }
-        } else if (pgp) {
-            if (b1 + b2 + b3 == 4) {
-                if (b1 == 2 && b2 - b3 == 0) {
-                    sequence3();
-                    TELE.addLine("sequence3");
-                } else if (b2 == 2 && b1 - b3 == 0) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                } else if (b3 == 2 && b1 - b2 == 0) {
-                    sequence4();
-                    TELE.addLine("sequence4");
-                } else {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                }
-            } else if (b1 + b2 + b3 >= 5) {
-                if (b1 == 2) {
-                    sequence3();
-                    TELE.addLine("sequence3");
-                } else if (b2 == 2) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                } else if (b3 == 2) {
-                    sequence4();
-                    TELE.addLine("sequence4");
-                }
-            } else {
-                sequence3();
-                TELE.addLine("sequence3");
-            }
-        } else if (ppg) {
-            if (b1 + b2 + b3 == 4) {
-                if (b1 == 2 && b2 - b3 == 0) {
-                    sequence6();
-                    TELE.addLine("sequence6");
-                } else if (b2 == 2 && b1 - b3 == 0) {
-                    sequence5();
-                    TELE.addLine("sequence5");
-                } else if (b3 == 2 && b1 - b2 == 0) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                } else {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                }
-            } else if (b1 + b2 + b3 >= 5) {
-                if (b1 == 2) {
-                    sequence6();
-                    TELE.addLine("sequence6");
-                } else if (b2 == 2) {
-                    sequence5();
-                    TELE.addLine("sequence5");
-                } else if (b3 == 2) {
-                    sequence1();
-                    TELE.addLine("sequence1");
-                }
-            } else {
-                sequence6();
-                TELE.addLine("sequence6");
-            }
-        } else {
-            sequence1();
-            TELE.addLine("sequence1");
-        }
-        TELE.update();
-    }
-
-    public void sequence1() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall1, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall2, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall3, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL)
-                )
-        );
-    }
-
-    public void sequence2() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall1, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall3, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall2, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL)
-                )
-        );
-    }
-
-    public void sequence3() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall2, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall1, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall3, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL)
-                )
-        );
-    }
-
-    public void sequence4() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall2, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall3, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall1, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL)
-                )
-        );
-    }
-
-    public void sequence5() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall3, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall1, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall2, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL)
-                )
-        );
-    }
-
-    public void sequence6() {
-        Actions.runBlocking(
-                new SequentialAction(
-                        spindex(spindexer_outtakeBall3, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall2, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL),
-                        spindex(spindexer_outtakeBall1, AUTO_FAR_VEL),
-                        Shoot(AUTO_FAR_VEL)
-                )
-        );
-    }
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto_LT_Close.java

@@ -0,0 +1,822 @@
+package org.firstinspires.ftc.teamcode.autonomous;
+
+import static org.firstinspires.ftc.teamcode.constants.Color.redAlliance;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.*;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.blueObeliskTurrPos0;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.blueObeliskTurrPos1;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.blueObeliskTurrPos2;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.blueObeliskTurrPos3;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.redObeliskTurrPos0;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.redObeliskTurrPos1;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.redObeliskTurrPos2;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.redObeliskTurrPos3;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spinStartPos;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_intakePos1;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall1;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall2;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall3;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall3b;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_out;
+import static org.firstinspires.ftc.teamcode.utils.Turret.limelightUsed;
+import static org.firstinspires.ftc.teamcode.utils.Turret.turrDefault;
+
+
+import androidx.annotation.NonNull;
+
+import com.acmerobotics.dashboard.FtcDashboard;
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.acmerobotics.dashboard.telemetry.TelemetryPacket;
+import com.acmerobotics.roadrunner.Action;
+import com.acmerobotics.roadrunner.ParallelAction;
+import com.acmerobotics.roadrunner.Pose2d;
+import com.acmerobotics.roadrunner.PoseVelocity2d;
+import com.acmerobotics.roadrunner.SequentialAction;
+import com.acmerobotics.roadrunner.TrajectoryActionBuilder;
+import com.acmerobotics.roadrunner.TranslationalVelConstraint;
+import com.acmerobotics.roadrunner.Vector2d;
+import com.acmerobotics.roadrunner.ftc.Actions;
+import com.acmerobotics.roadrunner.ftc.PinpointIMU;
+import com.qualcomm.hardware.gobilda.GoBildaPinpointDriver;
+import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
+
+import org.firstinspires.ftc.teamcode.autonomous.actions.AutoActions;
+import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
+import org.firstinspires.ftc.teamcode.utils.Flywheel;
+import org.firstinspires.ftc.teamcode.utils.Light;
+import org.firstinspires.ftc.teamcode.utils.Robot;
+import org.firstinspires.ftc.teamcode.utils.Servos;
+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;
+
+    public static double velGate0End = 2700, hoodGate0End = 0.35;
+    public static double hood0MoveTime = 2;
+    public static double spindexerSpeedIncrease = 0.014;
+
+    public static double shootAllTime  = 6.0;
+    public static double intake1Time = 3.3;
+    public static double intake2Time = 4.2;
+
+    public static double intake3Time = 5.4;
+
+    public static double flywheel0Time = 1.9;
+    public static double pickup1Speed = 14;
+    // ---- POSITION TOLERANCES ----
+    public static double posXTolerance = 5.0;
+    public static double posYTolerance = 5.0;
+    // ---- OBELISK DETECTION ----
+    public static double shoot1Time = 2.5;
+    public static double shoot2Time = 2.5;
+    public static double shoot3Time = 2.5;
+    public static double colorSenseTime = 1.2;
+    public static double waitToShoot0 = 0.5;
+    public static double waitToPickupGate2 = 0.3;
+    public static double pickupStackGateSpeed = 19;
+    public static double intake2TimeGate = 5;
+    public static double shoot2GateTime = 1.7;
+    public static double endGateTime = 22;
+    public static double waitToPickupGateWithPartner = 0.7;
+    public static double waitToPickupGateSolo = 0.01;
+    public static double intakeGateTime = 5.6;
+    public static double shootGateTime = 1.5;
+    public static double shoot1GateTime = 1.7;
+    public static double intake1GateTime = 3.3;
+    public static double lastShootTime = 27;
+
+    Robot robot;
+    MultipleTelemetry TELE;
+    MecanumDrive drive;
+    Servos servos;
+    Spindexer spindexer;
+    Flywheel flywheel;
+    Turret turret;
+    Targeting targeting;
+    Targeting.Settings targetingSettings;
+    AutoActions autoActions;
+    Light light;
+
+    int motif = 0;
+    double x1, y1, h1;
+    double x2a, y2a, h2a, t2a;
+
+    double x2b, y2b, h2b, t2b;
+    double x2c, y2c, h2c, t2c;
+
+    double x3a, y3a, h3a;
+    double x3b, y3b, h3b;
+    double x4a, y4a, h4a;
+    double x4b, y4b, h4b;
+
+    double xShoot, yShoot, hShoot;
+    double xShoot0, yShoot0, hShoot0;
+    double pickupGateAX, pickupGateAY, pickupGateAH;
+    double pickupGateBX, pickupGateBY, pickupGateBH;
+    double xShootGate, yShootGate, hShootGate;
+    double xLeave, yLeave, hLeave;
+    double xLeaveGate, yLeaveGate, hLeaveGate;
+    double openGateCloseX = 0, openGateCloseY = 0, openGateCloseH = 0;
+    double openGateMiddleX = 0, openGateMiddleY = 0, openGateMiddleH = 0;
+
+    int ballCycles = 3;
+    int prevMotif = 0;
+    boolean gateCycle = true;
+    boolean withPartner = true;
+    double obeliskTurrPos1 = 0.0;
+    double obeliskTurrPos2 = 0.0;
+    double obeliskTurrPos3 = 0.0;
+    double waitToPickupGate = 0;
+    double obeliskTurrPosAutoStart = 0;
+    boolean limelightStart = false;
+
+    // initialize path variables here
+    TrajectoryActionBuilder shoot0 = null;
+    TrajectoryActionBuilder pickup1 = null;
+    TrajectoryActionBuilder shoot1 = null;
+    TrajectoryActionBuilder pickup2 = null;
+    TrajectoryActionBuilder shoot2 = null;
+    TrajectoryActionBuilder pickup3 = null;
+    TrajectoryActionBuilder shoot3 = null;
+    TrajectoryActionBuilder shoot0ToPickup2 = null;
+    TrajectoryActionBuilder gateCyclePickup = null;
+    TrajectoryActionBuilder gateCycleShoot = null;
+
+    @Override
+    public void runOpMode() throws InterruptedException {
+
+        robot = new Robot(hardwareMap);
+
+        TELE = new MultipleTelemetry(
+                telemetry, FtcDashboard.getInstance().getTelemetry()
+        );
+
+        flywheel = new Flywheel(hardwareMap);
+
+        targeting = new Targeting();
+        targetingSettings = new Targeting.Settings(0.0, 0.0);
+
+        spindexer = new Spindexer(hardwareMap);
+
+        servos = new Servos(hardwareMap);
+
+        turret = new Turret(robot, TELE, robot.limelight);
+
+        drive = new MecanumDrive(hardwareMap, new Pose2d(0, 0, 0));
+
+        light = Light.getInstance();
+
+        light.init(robot.light, spindexer, turret);
+
+        autoActions = new AutoActions(robot, drive, TELE, servos, flywheel, spindexer, targeting, targetingSettings, turret, light);
+
+        servos.setSpinPos(spindexer_intakePos1);
+
+        servos.setTransferPos(transferServo_out);
+        limelightUsed = false;
+//        Spindexer.teleop = false;
+
+        robot.light.setPosition(1);
+
+        hardwareMap.get(GoBildaPinpointDriver.class, "pinpoint").resetPosAndIMU();
+
+        while (opModeInInit()) {
+            if (limelightUsed && !gateCycle && limelightStart){
+                Actions.runBlocking(
+                        autoActions.detectObelisk(
+                                0.1,
+                                0.501,
+                                0.501,
+                                0.501,
+                                0.501,
+                                obeliskTurrPosAutoStart
+                        )
+                );
+                motif = turret.getObeliskID();
+
+                if (motif == 21){
+                    AutoActions.firstSpindexShootPos = spindexer_outtakeBall1;
+                } else if (motif == 22){
+                    AutoActions.firstSpindexShootPos = spindexer_outtakeBall3b;
+                } else {
+                    AutoActions.firstSpindexShootPos = spindexer_outtakeBall2;
+                }
+            }
+
+            if (gateCycle) {
+                servos.setHoodPos(hoodGate0Start);
+            } else {
+                servos.setHoodPos(shoot0Hood);
+            }
+
+            if (gamepad2.crossWasPressed()) {
+                redAlliance = !redAlliance;
+            }
+
+            if (gamepad2.dpadLeftWasPressed()) {
+                turrDefault -= 0.01;
+            }
+
+            if (gamepad2.dpadRightWasPressed()) {
+                turrDefault += 0.01;
+            }
+
+            if (gamepad2.rightBumperWasPressed()) {
+                ballCycles++;
+            }
+            if (gamepad2.leftBumperWasPressed()) {
+                ballCycles--;
+            }
+
+            if (gamepad2.triangleWasPressed()){
+                gateCycle = !gateCycle;
+            }
+
+
+
+            if (gamepad2.squareWasPressed()) {
+
+                drive = new MecanumDrive(hardwareMap,new Pose2d(0,0,0));
+                sleep(100);
+                robot.limelight.start();
+                limelightUsed = true;
+                limelightStart = true;
+
+                gamepad2.rumble(500);
+            }
+
+            if (redAlliance) {
+                robot.light.setPosition(0.28);
+
+                if (gateCycle){
+                    turret.pipelineSwitch(1);
+                } else {
+                    turret.pipelineSwitch(4);
+                }
+
+                // ---- FIRST SHOT ----
+                x1 = rx1;
+                y1 = ry1;
+                h1 = rh1;
+
+                // ---- PICKUP PATH ----
+                x2a = rx2a;
+                y2a = ry2a;
+                h2a = rh2a;
+                x2b = rx2b;
+                y2b = ry2b;
+                h2b = rh2b;
+                x3a = rx3a;
+                y3a = ry3a;
+                h3a = rh3a;
+                x3b = rx3b;
+                y3b = ry3b;
+                h3b = rh3b;
+                x4a = rx4a;
+                y4a = ry4a;
+                h4a = rh4a;
+                x4b = rx4b;
+                y4b = ry4b;
+                h4b = rh4b;
+
+                xShoot = rShootX;
+                yShoot = rShootY;
+                hShoot = rShootH;
+                xLeave = rLeaveX;
+                yLeave = rLeaveY;
+                hLeave = rLeaveH;
+
+                xShoot0 = rShoot0X;
+                yShoot0 = rShoot0Y;
+                hShoot0 = rShoot0H;
+                xShootGate = rShootGateX;
+                yShootGate = rShootGateY;
+                hShootGate = rShootGateH;
+                xLeaveGate = rLeaveGateX;
+                yLeaveGate = rLeaveGateY;
+                hLeaveGate = rLeaveGateH;
+
+                pickupGateAX = rPickupGateAX;
+                pickupGateAY = rPickupGateAY;
+                pickupGateAH = rPickupGateAH;
+                pickupGateBX = rPickupGateBX;
+                pickupGateBY = rPickupGateBY;
+                pickupGateBH = rPickupGateBH;
+
+                openGateCloseX = rOpenGateCloseX;
+                openGateCloseY = rOpenGateCloseY;
+                openGateCloseH = rOpenGateCloseH;
+
+                openGateMiddleX = rOpenGateMiddleX;
+                openGateMiddleY = rOpenGateMiddleY;
+                openGateMiddleH = rOpenGateMiddleH;
+
+                obeliskTurrPosAutoStart = turrDefault + redObeliskTurrPos0;
+                obeliskTurrPos1 = turrDefault + redObeliskTurrPos1;
+                obeliskTurrPos2 = turrDefault + redObeliskTurrPos2;
+                obeliskTurrPos3 = turrDefault + redObeliskTurrPos3;
+            } else {
+                robot.light.setPosition(0.6);
+
+                if (gateCycle){
+                    turret.pipelineSwitch(5);
+                } else {
+                    turret.pipelineSwitch(2);
+                }
+
+                // ---- FIRST SHOT ----
+                x1 = bx1;
+                y1 = by1;
+                h1 = bh1;
+
+                // ---- PICKUP PATH ----
+                x2a = bx2a;
+                y2a = by2a;
+                h2a = bh2a;
+                x2b = bx2b;
+                y2b = by2b;
+                h2b = bh2b;
+                x3a = bx3a;
+                y3a = by3a;
+                h3a = bh3a;
+                x3b = bx3b;
+                y3b = by3b;
+                h3b = bh3b;
+                x4a = bx4a;
+                y4a = by4a;
+                h4a = bh4a;
+                x4b = bx4b;
+                y4b = by4b;
+                h4b = bh4b;
+
+                xShoot = bShootX;
+                yShoot = bShootY;
+                hShoot = bShootH;
+                xLeave = bLeaveX;
+                yLeave = bLeaveY;
+                hLeave = bLeaveH;
+
+                xShoot0 = bShoot0X;
+                yShoot0 = bShoot0Y;
+                hShoot0 = bShoot0H;
+                xShootGate = bShootGateX;
+                yShootGate = bShootGateY;
+                hShootGate = bShootGateH;
+                xLeaveGate = bLeaveGateX;
+                yLeaveGate = bLeaveGateY;
+                hLeaveGate = bLeaveGateH;
+
+                pickupGateAX = bPickupGateAX;
+                pickupGateAY = bPickupGateAY;
+                pickupGateAH = bPickupGateAH;
+                pickupGateBX = bPickupGateBX;
+                pickupGateBY = bPickupGateBY;
+                pickupGateBH = bPickupGateBH;
+
+                openGateCloseX = bOpenGateCloseX;
+                openGateCloseY = bOpenGateCloseY;
+                openGateCloseH = bOpenGateCloseH;
+
+                openGateMiddleX = bOpenGateMiddleX;
+                openGateMiddleY = bOpenGateMiddleY;
+                openGateMiddleH = bOpenGateMiddleH;
+
+                obeliskTurrPosAutoStart = turrDefault + blueObeliskTurrPos0;
+                obeliskTurrPos1 = turrDefault + blueObeliskTurrPos1;
+                obeliskTurrPos2 = turrDefault + blueObeliskTurrPos2;
+                obeliskTurrPos3 = turrDefault + blueObeliskTurrPos3;
+            }
+
+//            if (gateCycle) {
+//                shoot0 = drive.actionBuilder(new Pose2d(0, 0, 0))
+//                        .strafeToLinearHeading(new Vector2d(xShoot0, yShoot0), Math.toRadians(hShoot0));
+//            } else {
+                shoot0 = drive.actionBuilder(new Pose2d(0, 0, 0))
+                        .strafeToLinearHeading(new Vector2d(x1, y1), Math.toRadians(h1));
+//            }
+
+            if (gateCycle) {
+                pickup2 = shoot0.endTrajectory().fresh()
+                        .strafeToLinearHeading(new Vector2d(x3a, y3a), Math.toRadians(h3a))
+                        .strafeToLinearHeading(new Vector2d(x3b, y3b), Math.toRadians(h3b),
+                                new TranslationalVelConstraint(pickupStackGateSpeed))
+                        .strafeToLinearHeading(new Vector2d(openGateMiddleX, openGateMiddleY), Math.toRadians(openGateMiddleH));
+            } else {
+                pickup2 = drive.actionBuilder(new Pose2d(xShoot, yShoot, Math.toRadians(hShoot)))
+                        .strafeToLinearHeading(new Vector2d(x3a, y3a), Math.toRadians(h3a))
+                        .strafeToLinearHeading(new Vector2d(x3b, y3b), Math.toRadians(h3b),
+                                new TranslationalVelConstraint(pickup1Speed));
+            }
+
+//            if (gateCycle && withPartner) {
+//                shoot2 = pickup2.endTrajectory().fresh()
+//                        .strafeToLinearHeading(new Vector2d(openGateX, openGateY), Math.toRadians(openGateH))
+//                        .strafeToLinearHeading(new Vector2d(xShootGate, yShootGate), Math.toRadians(pickupGateAH));
+//            } else
+            if (gateCycle) {
+                shoot2 = pickup2.endTrajectory().fresh()
+                        .strafeToLinearHeading(new Vector2d(xLeave, yLeave), Math.toRadians(hLeave));
+            } else if (ballCycles < 3) {
+                shoot2 = drive.actionBuilder(new Pose2d(x3b, y3b, Math.toRadians(h3b)))
+                        .strafeToLinearHeading(new Vector2d(xLeave, yLeave), Math.toRadians(hLeave));
+            } else {
+                shoot2 = drive.actionBuilder(new Pose2d(x3b, y3b, Math.toRadians(h3b)))
+                        .strafeToLinearHeading(new Vector2d(xShoot, yShoot), Math.toRadians(hShoot));
+            }
+
+            gateCyclePickup = shoot2.endTrajectory().fresh()
+                    .strafeToLinearHeading(new Vector2d(pickupGateAX, pickupGateAY), Math.toRadians(pickupGateAH))
+                    .waitSeconds(waitToPickupGate)
+                    .strafeToLinearHeading(new Vector2d(pickupGateBX, pickupGateBY), Math.toRadians(pickupGateBH))
+                    .waitSeconds(0.1)
+                    .strafeToLinearHeading(new Vector2d(pickupGateCX, pickupGateCY), Math.toRadians(pickupGateCH),
+                            new TranslationalVelConstraint(13));
+
+            gateCycleShoot = gateCyclePickup.endTrajectory().fresh()
+                    .strafeToLinearHeading(new Vector2d(xShootGate, yShootGate), Math.toRadians(hShootGate));
+
+
+            if (gateCycle) {
+                pickup1 = drive.actionBuilder(new Pose2d(x1, y1, Math.toRadians(h1)))
+                        .strafeToLinearHeading(new Vector2d(x2a, y2a), Math.toRadians(h2a))
+                        .strafeToLinearHeading(new Vector2d(x2b, y2b), Math.toRadians(h2b),
+                                new TranslationalVelConstraint(pickupStackGateSpeed))
+                        .strafeToLinearHeading(new Vector2d(openGateCloseX, openGateCloseY), Math.toRadians(openGateCloseH));
+            } else {
+                pickup1 = drive.actionBuilder(new Pose2d(x1, y1, Math.toRadians(h1)))
+                        .strafeToLinearHeading(new Vector2d(x2a, y2a), Math.toRadians(h2a))
+                        .strafeToLinearHeading(new Vector2d(x2b, y2b), Math.toRadians(h2b),
+                                new TranslationalVelConstraint(pickup1Speed));
+            }
+
+
+            if (gateCycle) {
+                shoot1 = pickup1.endTrajectory().fresh()
+                        .strafeToLinearHeading(new Vector2d(xShoot, yShoot), Math.toRadians(hShoot));
+            } else if (ballCycles < 2) {
+                shoot1 = drive.actionBuilder(new Pose2d(x2b, y2b, Math.toRadians(h2b)))
+                        .strafeToLinearHeading(new Vector2d(xLeave, yLeave), Math.toRadians(hLeave));
+            } else {
+                shoot1 = drive.actionBuilder(new Pose2d(x2b, y2b, Math.toRadians(h2b)))
+                        .strafeToLinearHeading(new Vector2d(xShoot, yShoot), Math.toRadians(hShoot));
+            }
+
+            pickup3 = drive.actionBuilder(new Pose2d(xShoot, yShoot, Math.toRadians(hShoot)))
+                    .strafeToLinearHeading(new Vector2d(x4a, y4a), Math.toRadians(h4a))
+                    .strafeToLinearHeading(new Vector2d(x4b, y4b), Math.toRadians(h4b),
+                            new TranslationalVelConstraint(pickup1Speed));
+
+            shoot3 = drive.actionBuilder(new Pose2d(x4b, y4b, Math.toRadians(h4b)))
+                    .strafeToLinearHeading(new Vector2d(xLeave, yLeave), Math.toRadians(hLeave));
+
+            if (withPartner) {
+                waitToPickupGate = waitToPickupGateWithPartner;
+            } else {
+                waitToPickupGate = waitToPickupGateSolo;
+            }
+
+            teleStart = drive.localizer.getPose();
+            TELE.addData("Red?", redAlliance);
+            TELE.addData("Turret Default", turrDefault);
+            TELE.addData("Gate Cycle?", gateCycle);
+            TELE.addData("Ball Cycles", ballCycles);
+            TELE.addData("Limelight Started?", limelightUsed);
+            TELE.addData("Motif", motif);
+
+            TELE.update();
+        }
+
+        waitForStart();
+
+        if (isStopRequested()) return;
+
+        if (opModeIsActive()) {
+
+            double stamp = getRuntime();
+
+            robot.transfer.setPower(1);
+
+
+            if (gateCycle) {
+                startAuto();
+                shoot(0.501, 0.501, 0.501);
+                cycleStackClose();
+                shoot(0.501,0.501, 0.501);
+                cycleStackMiddle();
+                shoot(0.501, 0.501, 0.501);
+            } else {
+                startAuto();
+                shoot(0.501, 0.501,0.501);
+
+                if (ballCycles > 0) {
+                    cycleStackClose();
+                    shoot(xShoot, yShoot, hShoot);
+                }
+
+                if (ballCycles > 1) {
+                    cycleStackMiddle();
+                    shoot(xShoot, yShoot, hShoot);
+                }
+
+                if (ballCycles > 2) {
+                    cycleStackFar();
+                    shoot(xLeave, yLeave, hLeave);
+                }
+            }
+
+            while (opModeIsActive()) {
+
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
+
+                flywheel.manageFlywheel(0);
+                robot.transfer.setPower(0);
+
+                TELE.addLine("finished");
+                TELE.update();
+            }
+
+        }
+
+    }
+
+    void shoot(double x, double y, double z) {
+        Actions.runBlocking(autoActions.shootAllAuto(shootAllTime, spindexerSpeedIncrease, x, y, z));
+    }
+
+    void startAuto() {
+        assert shoot0 != null;
+
+        Actions.runBlocking(
+                new ParallelAction(
+                        shoot0.build(),
+                        autoActions.prepareShootAll(
+                                0.8,
+                                flywheel0Time,
+                                motif,
+                                x1,
+                                y1,
+                                h1
+                        )
+                )
+        );
+
+    }
+
+
+
+    void startAutoGate() {
+        assert shoot0 != null;
+
+        Actions.runBlocking(
+                new ParallelAction(
+                        shoot0.build(),
+                        autoActions.prepareShootAll(
+                                colorSenseTime,
+                                flywheel0Time,
+                                motif,
+                                xShoot0,
+                                yShoot0,
+                                hShoot0
+                        )
+                )
+        );
+
+
+    }
+
+    void cycleStackClose() {
+        Actions.runBlocking(
+                new ParallelAction(
+                        pickup1.build(),
+                        autoActions.intake(
+                                intake1Time,
+                                x2b,
+                                y2b,
+                                h2b
+                        )
+                )
+        );
+
+        double posX;
+        double posY;
+        double posH;
+        if (ballCycles > 1) {
+            posX = xShoot;
+            posY = yShoot;
+            posH = hShoot;
+        } else {
+            posX = xLeave;
+            posY = yLeave;
+            posH = hLeave;
+        }
+
+        Actions.runBlocking(
+                new ParallelAction(
+                        shoot1.build(),
+                        autoActions.prepareShootAll(
+                                colorSenseTime,
+                                shoot1Time,
+                                motif,
+                                posX,
+                                posY,
+                                posH
+                        )
+                )
+        );
+    }
+
+    void cycleStackMiddle() {
+        Actions.runBlocking(
+                new ParallelAction(
+                        pickup2.build(),
+                        autoActions.intake(
+                                intake2Time,
+                                x3b,
+                                y3b,
+                                h3b
+                        )
+                )
+        );
+
+        double posX;
+        double posY;
+        double posH;
+        if (ballCycles > 2) {
+            posX = xShoot;
+            posY = yShoot;
+            posH = hShoot;
+        } else {
+            posX = xLeave;
+            posY = yLeave;
+            posH = hLeave;
+        }
+
+        Actions.runBlocking(
+                new ParallelAction(
+                        shoot2.build(),
+                        autoActions.prepareShootAll(
+                                colorSenseTime,
+                                shoot2Time,
+                                motif,
+                                posX,
+                                posY,
+                                posH)
+                )
+        );
+    }
+
+    void cycleStackFar() {
+        Actions.runBlocking(
+                new ParallelAction(
+                        pickup3.build(),
+                        autoActions.intake(
+                                intake3Time,
+                                x4b,
+                                y4b,
+                                h4b
+                        )
+                )
+        );
+
+        motif = turret.getObeliskID();
+
+        if (motif == 0) motif = prevMotif;
+        prevMotif = motif;
+
+        Actions.runBlocking(
+                new ParallelAction(
+                        shoot3.build(),
+                        autoActions.prepareShootAll(
+                                colorSenseTime,
+                                shoot3Time,
+                                motif,
+                                xLeave,
+                                yLeave,
+                                hLeave
+                        )
+                )
+        );
+    }
+
+    void cycleStackMiddleGate() {
+        drive.updatePoseEstimate();
+        pickup2 = drive.actionBuilder(drive.localizer.getPose())
+                .strafeToLinearHeading(new Vector2d(x3a, y3a), Math.toRadians(h3a))
+                .strafeToLinearHeading(new Vector2d(x3b, y3b), Math.toRadians(h3b),
+                        new TranslationalVelConstraint(pickupStackGateSpeed));
+        Actions.runBlocking(
+                new ParallelAction(
+                        pickup2.build(),
+                        autoActions.intake(
+                                intake2TimeGate,
+                                x3b,
+                                y3b,
+                                h3b
+                        )
+                )
+        );
+
+        servos.setSpinPos(spinStartPos);
+        Actions.runBlocking(
+                new ParallelAction(
+                        shoot2.build(),
+                        autoActions.prepareShootAll(
+                                colorSenseTime,
+                                shoot2Time,
+                                motif,
+                                xShootGate,
+                                yShootGate,
+                                pickupGateAH)
+                )
+        );
+    }
+
+    void cycleGateIntake() {
+        drive.updatePoseEstimate();
+
+        Actions.runBlocking(
+                new ParallelAction(
+                        gateCyclePickup.build(),
+                        autoActions.intake(
+                                intakeGateTime,
+                                xShootGate,
+                                yShootGate,
+                                hShootGate
+                        )
+                )
+        );
+    }
+
+    void cycleGateShoot() {
+
+        drive.updatePoseEstimate();
+        servos.setSpinPos(spinStartPos);
+
+        gateCycleShoot = drive.actionBuilder(drive.localizer.getPose())
+                .strafeToLinearHeading(new Vector2d(xShootGate, yShootGate), Math.toRadians(pickupGateAH));
+
+        Actions.runBlocking(
+                new ParallelAction(
+                        gateCycleShoot.build(),
+                        autoActions.manageShooterAuto(
+                                shootGateTime,
+                                xShootGate,
+                                yShootGate,
+                                pickupGateAH,
+                                false
+                        )
+                )
+        );
+    }
+
+    void cycleStackCloseIntakeGate() {
+        drive.updatePoseEstimate();
+
+        pickup1 = drive.actionBuilder(drive.localizer.getPose())
+                .strafeToLinearHeading(new Vector2d(x2a, y2a), Math.toRadians(h2a))
+                .strafeToLinearHeading(new Vector2d(x2b, y2b), Math.toRadians(h2b),
+                        new TranslationalVelConstraint(pickupStackGateSpeed));
+
+
+        Actions.runBlocking(
+                new ParallelAction(
+                        pickup1.build(),
+                        autoActions.intake(
+                                intake1GateTime,
+                                xShootGate,
+                                yShootGate,
+                                hShootGate
+                        )
+                )
+        );
+    }
+
+    void cycleStackCloseShootGate(){
+        servos.setSpinPos(spinStartPos);
+        drive.updatePoseEstimate();
+
+        shoot1 = drive.actionBuilder(drive.localizer.getPose())
+                .strafeToLinearHeading(new Vector2d(xLeaveGate, yLeaveGate), Math.toRadians(hLeaveGate));
+
+        Actions.runBlocking(
+                new ParallelAction(
+                        shoot1.build(),
+                        autoActions.manageShooterAuto(
+                                shoot1GateTime,
+                                xLeaveGate,
+                                yLeaveGate,
+                                hLeaveGate,
+                                false
+                        )
+                )
+        );
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto_LT_Far.java

@@ -0,0 +1,439 @@
+package org.firstinspires.ftc.teamcode.autonomous;
+
+import static org.firstinspires.ftc.teamcode.constants.Back_Poses.*;
+import static org.firstinspires.ftc.teamcode.constants.Back_Poses.bStackPickupFarAH;
+import static org.firstinspires.ftc.teamcode.constants.Back_Poses.bStackPickupFarAY;
+import static org.firstinspires.ftc.teamcode.constants.Back_Poses.bStackPickupFarBH;
+import static org.firstinspires.ftc.teamcode.constants.Back_Poses.bStackPickupFarBX;
+import static org.firstinspires.ftc.teamcode.constants.Back_Poses.bStackPickupFarBY;
+import static org.firstinspires.ftc.teamcode.constants.Color.redAlliance;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStart;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.blueObeliskTurrPos1;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.blueObeliskTurrPos2;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.blueObeliskTurrPos3;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.blueTurretShootPos;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.redObeliskTurrPos1;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.redObeliskTurrPos2;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.redObeliskTurrPos3;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.redTurretShootPos;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spinStartPos;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_out;
+import static org.firstinspires.ftc.teamcode.utils.Turret.limelightUsed;
+import static org.firstinspires.ftc.teamcode.utils.Turret.turrDefault;
+
+import com.acmerobotics.dashboard.FtcDashboard;
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.acmerobotics.roadrunner.ParallelAction;
+import com.acmerobotics.roadrunner.Pose2d;
+import com.acmerobotics.roadrunner.TrajectoryActionBuilder;
+import com.acmerobotics.roadrunner.TranslationalVelConstraint;
+import com.acmerobotics.roadrunner.Vector2d;
+import com.acmerobotics.roadrunner.ftc.Actions;
+import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
+
+import org.firstinspires.ftc.teamcode.autonomous.actions.AutoActions;
+import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
+import org.firstinspires.ftc.teamcode.utils.Flywheel;
+import org.firstinspires.ftc.teamcode.utils.Light;
+import org.firstinspires.ftc.teamcode.utils.Robot;
+import org.firstinspires.ftc.teamcode.utils.Servos;
+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;
+    public int motif = 0;
+    double turretShootPos = 0.0;
+    Robot robot;
+    MultipleTelemetry TELE;
+    MecanumDrive drive;
+    Servos servos;
+    Spindexer spindexer;
+    Flywheel flywheel;
+    Turret turret;
+    Targeting targeting;
+    Targeting.Settings targetingSettings;
+    AutoActions autoActions;
+    Light light;
+    double xShoot, yShoot, hShoot;
+    double pickupGateX = 0, pickupGateY = 0, pickupGateH = 0;
+    public static double flywheel0Time = 1.5;
+    boolean gatePickup = true;
+    boolean stack3 = true;
+    double xStackPickupA, yStackPickupA, hStackPickupA;
+    double xStackPickupB, yStackPickupB, hStackPickupB;
+    public static int pickupStackSpeed = 12;
+    public static int pickupGateSpeed = 30;
+    int prevMotif = 0;
+    public static double spindexerSpeedIncrease = 0.014;
+    public static double shootAllTime = 2;
+    // ---- POSITION TOLERANCES ----
+    public static double posXTolerance = 5.0;
+    public static double posYTolerance = 5.0;
+    public static double shootStackTime = 2;
+    public static double shootGateTime = 2.5;
+    public static double colorSenseTime = 1;
+    public static double intakeStackTime = 5;
+    public static double intakeGateTime = 3.75;
+    double obeliskTurrPos1 = 0.0;
+    double obeliskTurrPos2 = 0.0;
+    double obeliskTurrPos3 = 0.0;
+    public static double endAutoTime = 26;
+
+    // initialize path variables here
+    TrajectoryActionBuilder leave3Ball = null;
+    TrajectoryActionBuilder leaveFromShoot = null;
+    TrajectoryActionBuilder pickup3 = null;
+    TrajectoryActionBuilder shoot3 = null;
+    TrajectoryActionBuilder pickupGate = null;
+    TrajectoryActionBuilder shootGate = null;
+    Pose2d autoStart = new Pose2d(0,0,0);
+
+    @Override
+    public void runOpMode() throws InterruptedException {
+
+        robot = new Robot(hardwareMap);
+
+        TELE = new MultipleTelemetry(
+                telemetry, FtcDashboard.getInstance().getTelemetry()
+        );
+
+        flywheel = new Flywheel(hardwareMap);
+
+        targeting = new Targeting();
+        targetingSettings = new Targeting.Settings(0.0, 0.0);
+
+        spindexer = new Spindexer(hardwareMap);
+
+        servos = new Servos(hardwareMap);
+
+        light = Light.getInstance();
+
+        light.init(robot.light, spindexer, turret);
+
+        robot.limelight.start();
+
+        robot.limelight.pipelineSwitch(1);
+
+        turret = new Turret(robot, TELE, robot.limelight);
+        limelightUsed = false;
+
+
+//        Spindexer.teleop = false;
+
+        while (opModeInInit()) {
+
+            if (gamepad2.leftBumperWasPressed()){
+                gatePickup = !gatePickup;
+            }
+            if (gamepad2.rightBumperWasPressed()){
+                stack3 = !stack3;
+            }
+
+            turret.setTurret(turretShootPos);
+
+            robot.hood.setPosition(shoot0Hood);
+
+            if (gamepad2.crossWasPressed()) {
+                redAlliance = !redAlliance;
+            }
+
+            if (gamepad2.dpadLeftWasPressed()) {
+                turrDefault -= 0.01;
+            }
+
+            if (gamepad2.dpadRightWasPressed()) {
+                turrDefault += 0.01;
+            }
+
+            if (redAlliance) {
+                robot.light.setPosition(0.28);
+
+                autoStart = new Pose2d(autoStartRX, autoStartRY, Math.toRadians(autoStartRH));
+                drive = new MecanumDrive(hardwareMap, autoStart);
+                autoActions = new AutoActions(robot, drive, TELE, servos, flywheel, spindexer, targeting, targetingSettings, turret, light);
+
+                xLeave = rLeaveX;
+                yLeave = rLeaveY;
+                hLeave = rLeaveH;
+
+                xShoot = rShootX;
+                yShoot = rShootY;
+                hShoot = rShootH;
+
+                xStackPickupA = rStackPickupFarAX;
+                yStackPickupA = rStackPickupFarAY;
+                hStackPickupA = rStackPickupFarAH;
+
+                xStackPickupB = rStackPickupFarBX;
+                yStackPickupB = rStackPickupFarBY;
+                hStackPickupB = rStackPickupFarBH;
+
+                pickupGateX = rPickupGateXA;
+                pickupGateY = rPickupGateYA;
+                pickupGateH = rPickupGateHA;
+
+                obeliskTurrPos1 = turrDefault + redObeliskTurrPos1;
+                obeliskTurrPos2 = turrDefault + redObeliskTurrPos2;
+                obeliskTurrPos3 = turrDefault + redObeliskTurrPos3;
+                turretShootPos = turrDefault + redTurretShootPos;
+
+                if (gamepad2.squareWasPressed()){
+                    turret.pipelineSwitch(4);
+                    robot.limelight.start();
+                    gamepad2.rumble(500);
+                    sleep(1000);
+                    turret.setTurret(turrDefault);
+
+                    servos.setSpinPos(spinStartPos);
+                    limelightUsed = true;
+
+                    servos.setTransferPos(transferServo_out);
+                }
+            } else {
+                robot.light.setPosition(0.6);
+
+                autoStart = new Pose2d(autoStartBX, autoStartBY, Math.toRadians(autoStartBH));
+                drive = new MecanumDrive(hardwareMap, autoStart);
+                autoActions = new AutoActions(robot, drive, TELE, servos, flywheel, spindexer, targeting, targetingSettings, turret, light);
+
+                xLeave = bLeaveX;
+                yLeave = bLeaveY;
+                hLeave = bLeaveH;
+
+                xShoot = bShootX;
+                yShoot = bShootY;
+                hShoot = bShootH;
+
+                xStackPickupA = bStackPickupFarAX;
+                yStackPickupA = bStackPickupFarAY;
+                hStackPickupA = bStackPickupFarAH;
+
+                xStackPickupB = bStackPickupFarBX;
+                yStackPickupB = bStackPickupFarBY;
+                hStackPickupB = bStackPickupFarBH;
+
+                pickupGateX = bPickupGateXA;
+                pickupGateY = bPickupGateYA;
+                pickupGateH = bPickupGateHA;
+
+                obeliskTurrPos1 = turrDefault + blueObeliskTurrPos1;
+                obeliskTurrPos2 = turrDefault + blueObeliskTurrPos2;
+                obeliskTurrPos3 = turrDefault + blueObeliskTurrPos3;
+                turretShootPos = turrDefault + blueTurretShootPos;
+
+                if (gamepad2.squareWasPressed()){
+                    turret.pipelineSwitch(2);
+                    robot.limelight.start();
+                    gamepad2.rumble(500);
+                    sleep(1000);
+                    turret.setTurret(turrDefault);
+                    limelightUsed = true;
+
+                    servos.setSpinPos(spinStartPos);
+
+                    servos.setTransferPos(transferServo_out);
+                }
+            }
+
+            leave3Ball = drive.actionBuilder(autoStart)
+                    .strafeToLinearHeading(new Vector2d(xLeave, yLeave), Math.toRadians(hLeave));
+
+            leaveFromShoot = drive.actionBuilder(new Pose2d(xShoot, yShoot, Math.toRadians(hShoot)))
+                    .strafeToLinearHeading(new Vector2d(xLeave, yLeave), Math.toRadians(hLeave));
+
+            pickup3 = drive.actionBuilder(new Pose2d(xShoot, yShoot, Math.toRadians(hShoot)))
+                    .strafeToLinearHeading(new Vector2d(xStackPickupA, yStackPickupA), Math.toRadians(hStackPickupA))
+                    .strafeToLinearHeading(new Vector2d(xStackPickupB, yStackPickupB), Math.toRadians(hStackPickupB),
+                            new TranslationalVelConstraint(pickupStackSpeed));
+
+            shoot3 = drive.actionBuilder(new Pose2d(xStackPickupB, yStackPickupB, Math.toRadians(hStackPickupB)))
+                    .strafeToLinearHeading(new Vector2d(xShoot, yShoot), Math.toRadians(hShoot));
+
+            pickupGate = drive.actionBuilder(new Pose2d(xShoot, yShoot, Math.toRadians(hShoot)))
+                    .strafeToLinearHeading(new Vector2d(pickupGateX, pickupGateY), Math.toRadians(pickupGateH),
+                            new TranslationalVelConstraint(pickupGateSpeed));
+
+            shootGate = drive.actionBuilder(new Pose2d(pickupGateX, pickupGateY, Math.toRadians(pickupGateH)))
+                    .strafeToLinearHeading(new Vector2d(xShoot, yShoot), Math.toRadians(hShoot));
+
+
+            TELE.addData("Red?", redAlliance);
+            TELE.addData("Turret Default", turrDefault);
+            TELE.addData("Limelight On?",limelightUsed);
+            TELE.addData("Gate Cycle?", gatePickup);
+            TELE.addData("Pickup Stack?", stack3);
+            TELE.addData("Start Position", autoStart);
+            TELE.addData("Current Position", drive.localizer.getPose()); // use this to test standstill drift
+            TELE.update();
+        }
+
+        waitForStart();
+
+        if (isStopRequested()) return;
+
+        // Currently only shoots; keep this start and modify times and then add extra paths
+        if (opModeIsActive()) {
+            double stamp = getRuntime();
+
+            robot.transfer.setPower(1);
+
+            startAuto();
+            if (redAlliance){
+                shoot(autoStartRX, autoStartRY, autoStartRH);
+
+            } else {
+                shoot(autoStartBX, autoStartBY, autoStartBH);
+
+            }
+
+            if (stack3){
+                cycleStackFar();
+                shoot(xShoot, yShoot, hShoot);
+            }
+
+            while (gatePickup && getRuntime() - stamp < endAutoTime){
+                cycleGatePickupBalls();
+                if (getRuntime() - stamp > endAutoTime){
+                    break;
+                }
+                cycleGatePrepareShoot();
+                shoot(xShoot, yShoot, hShoot);
+            }
+
+            if (gatePickup || stack3){
+                leave();
+            } else {
+                leave3Ball();
+            }
+
+            // Actual way to end autonomous in to find final position
+            while (opModeIsActive()) {
+
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
+
+                flywheel.manageFlywheel(0);
+                robot.transfer.setPower(0);
+
+                TELE.addLine("finished");
+                TELE.update();
+            }
+
+        }
+
+    }
+
+    void shoot(double x, double y, double z){
+        Actions.runBlocking(
+                new ParallelAction(
+                        autoActions.shootAllAuto(shootAllTime, spindexerSpeedIncrease, x, y, z)
+                )
+
+        );
+    }
+
+    void startAuto(){
+
+        if (redAlliance){
+            Actions.runBlocking(
+                    new ParallelAction(
+                            autoActions.manageShooterAuto(
+                                    flywheel0Time,
+                                    autoStartRX,
+                                    autoStartRY,
+                                    autoStartRH,
+                                    true
+                            )
+
+                    )
+            );
+
+        } else {
+            Actions.runBlocking(
+                    new ParallelAction(
+                            autoActions.manageShooterAuto(
+                                    flywheel0Time,
+                                    autoStartBX,
+                                    autoStartBY,
+                                    autoStartBH,
+                                    true
+                            )
+
+                    )
+            );
+        }
+
+    }
+
+    void leave3Ball(){
+        assert leave3Ball != null;
+        Actions.runBlocking(leave3Ball.build());
+    }
+
+    void leave(){
+        assert leaveFromShoot != null;
+        Actions.runBlocking(leaveFromShoot.build());
+    }
+
+    void cycleStackFar(){
+        Actions.runBlocking(
+                new ParallelAction(
+                        pickup3.build(),
+                        autoActions.intake(
+                                intakeStackTime,
+                                xStackPickupB,
+                                yStackPickupB,
+                                hStackPickupB
+                        )
+                )
+        );
+        servos.setSpinPos(spinStartPos);
+        spindexer.setIntakePower(-0.1);
+        Actions.runBlocking(
+                new ParallelAction(
+                        shoot3.build(),
+                        autoActions.manageShooterAuto(
+                                shootStackTime,xShoot, yShoot, hShoot, false
+                        )
+                )
+        );
+    }
+
+    void cycleGatePickupBalls(){
+        Actions.runBlocking(
+                new ParallelAction(
+                        pickupGate.build(),
+                        autoActions.intake(
+                                intakeGateTime,
+                                pickupGateX,
+                                pickupGateY,
+                                pickupGateH
+                        )
+                )
+        );
+    }
+
+    void cycleGatePrepareShoot(){
+        spindexer.setIntakePower(-0.1);
+        Actions.runBlocking(
+                new ParallelAction(
+                        shootGate.build(),
+                        autoActions.manageShooterAuto(
+                               shootGateTime,
+                                xShoot,
+                                yShoot,
+                                hShoot,
+                                false
+                        )
+                )
+        );
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/Auto_LT_Unindexed.java

@@ -1,804 +0,0 @@
-package org.firstinspires.ftc.teamcode.autonomous;
-
-import static org.firstinspires.ftc.teamcode.constants.Color.redAlliance;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bHGate;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bShoot1Tangent;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bShootH;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bShootX;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bShootY;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bXGate;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bYGate;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bh1;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bh2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bh2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bh2c;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bt2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bt2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bt2c;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bx1;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bx2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bx2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.bx2c;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.by1;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.by2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.by2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.by2c;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rHGate;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rShoot1Tangent;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rShootH;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rShootX;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rShootY;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rXGate;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rYGate;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rh1;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rh2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rh2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rh2c;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rt2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rt2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rt2c;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rx1;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rx2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rx2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.rx2c;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.ry1;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.ry2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.ry2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.ry2c;
-import static org.firstinspires.ftc.teamcode.constants.Poses_V2.teleStart;
-import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_in;
-import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_out;
-
-import androidx.annotation.NonNull;
-
-import com.acmerobotics.dashboard.FtcDashboard;
-import com.acmerobotics.dashboard.config.Config;
-import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
-import com.acmerobotics.dashboard.telemetry.TelemetryPacket;
-import com.acmerobotics.roadrunner.Action;
-import com.acmerobotics.roadrunner.ParallelAction;
-import com.acmerobotics.roadrunner.Pose2d;
-import com.acmerobotics.roadrunner.TrajectoryActionBuilder;
-import com.acmerobotics.roadrunner.TranslationalVelConstraint;
-import com.acmerobotics.roadrunner.Vector2d;
-import com.acmerobotics.roadrunner.ftc.Actions;
-import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
-import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
-import com.qualcomm.robotcore.hardware.Servo;
-
-import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
-import org.firstinspires.ftc.teamcode.utils.Flywheel;
-import org.firstinspires.ftc.teamcode.utils.Robot;
-import org.firstinspires.ftc.teamcode.utils.Servos;
-import org.firstinspires.ftc.teamcode.utils.Spindexer;
-import org.firstinspires.ftc.teamcode.utils.Targeting;
-import org.firstinspires.ftc.teamcode.utils.Turret;
-
-@Autonomous(preselectTeleOp = "TeleopV3")
-@Config
-public class Auto_LT_Unindexed extends LinearOpMode {
-
-    public static double shoot0Vel = 2300, shoot0Hood = 0.93;
-    public static double autoSpinStartPos = 0.2;
-    public static double shoot0SpinSpeedIncrease = 0.014;
-
-    public static double spindexerSpeedIncrease = 0.02;
-
-    public static double obeliskTurrPos = 0.53;
-    public static double gatePickupTime = 3.0;
-    public static double shoot1Turr = 0.57;
-    public static double shoot0XTolerance = 1.0;
-    public static double turretShootPos = 0.72;
-    public static double shootAllTime = 1.8;
-    public static double shoot0Time = 1.6;
-    public static double intake1Time = 3.0;
-    public static double flywheel0Time = 3.5;
-    public static double pickup1Speed = 80.0;
-    // ---- SECOND SHOT / PICKUP ----
-    public static double shoot1Vel = 2300;
-    public static double shoot1Hood = 0.93;
-    
-    public static double shootAllVelocity = 2500;
-    public static double shootAllHood = 0.78;
-    // ---- PICKUP TIMING ----
-    public static double pickup1Time = 3.0;
-    // ---- PICKUP POSITION TOLERANCES ----
-    public static double pickup1XTolerance = 2.0;
-    public static double pickup1YTolerance = 2.0;
-    // ---- OBELISK DETECTION ----
-    public static double obelisk1Time = 1.5;
-    public static double obelisk1XTolerance = 2.0;
-    public static double obelisk1YTolerance = 2.0;
-    public static double shoot1ToleranceX = 2.0;
-    public static double shoot1ToleranceY = 2.0;
-    public static double shoot1Time = 2.0;
-    public static double shootCycleTime = 2.5;
-    public int motif = 0;
-    Robot robot;
-    MultipleTelemetry TELE;
-    MecanumDrive drive;
-    Servos servos;
-    Spindexer spindexer;
-    Flywheel flywheel;
-    Turret turret;
-    Targeting targeting;
-    Targeting.Settings targetingSettings;
-    private double x1, y1, h1;
-
-    private double x2a, y2a, h2a, t2a;
-
-    private double x2b, y2b, h2b, t2b;
-    private double x2c, y2c, h2c, t2c;
-
-    private double xShoot, yShoot, hShoot;
-    private double xGate, yGate, hGate;
-
-    private double shoot1Tangent;
-
-    public Action prepareShootAll(double time) {
-        return new Action() {
-            double stamp = 0.0;
-            int ticker = 0;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                if (ticker == 0) {
-                    stamp = System.currentTimeMillis();
-                }
-                ticker++;
-
-                robot.spin1.setPosition(autoSpinStartPos);
-                robot.spin2.setPosition(1 - autoSpinStartPos);
-
-                robot.transferServo.setPosition(transferServo_out);
-
-                turret.manualSetTurret(turretShootPos);
-
-                robot.intake.setPower(-((System.currentTimeMillis() - stamp)) / 1000);
-
-                return (System.currentTimeMillis() - stamp) < (time * 1000);
-
-            }
-        };
-    }
-
-    public Action shootAll(int vel, double shootTime, double spindexSpeed) {
-        return new Action() {
-            int ticker = 1;
-
-            double stamp = 0.0;
-
-            double velo = vel;
-
-            int shooterTicker = 0;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                TELE.addData("Velocity", velo);
-                TELE.addLine("shooting");
-                TELE.update();
-
-                flywheel.manageFlywheel(vel);
-                velo = flywheel.getVelo();
-
-                drive.updatePoseEstimate();
-
-                teleStart = drive.localizer.getPose();
-
-                robot.intake.setPower(-0.3);
-
-                if (ticker == 1) {
-                    stamp = getRuntime();
-                }
-                ticker++;
-
-                robot.intake.setPower(0);
-
-                if (getRuntime() - stamp < shootTime) {
-
-                    if (shooterTicker == 0 && !servos.spinEqual(autoSpinStartPos)) {
-                        robot.spin1.setPosition(autoSpinStartPos);
-                        robot.spin2.setPosition(1 - autoSpinStartPos);
-                    } else {
-                        robot.transferServo.setPosition(transferServo_in);
-                        shooterTicker++;
-                        double prevSpinPos = robot.spin1.getPosition();
-                        robot.spin1.setPosition(prevSpinPos + spindexSpeed);
-                        robot.spin2.setPosition(1 - prevSpinPos - spindexSpeed);
-                    }
-
-                    return true;
-
-                } else {
-                    robot.transferServo.setPosition(transferServo_out);
-                    //spindexPos = spindexer_intakePos1;
-
-                    spindexer.resetSpindexer();
-                    spindexer.processIntake();
-
-                    return false;
-
-                }
-
-            }
-        };
-    }
-
-    public Action shootAllAuto(double shootTime, double spindexSpeed) {
-        return new Action() {
-            int ticker = 1;
-
-            double stamp = 0.0;
-
-            double velo = 0.0;
-
-            int shooterTicker = 0;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                TELE.addData("Velocity", velo);
-                TELE.addLine("shooting");
-                TELE.update();
-
-                velo = flywheel.getVelo();
-
-                drive.updatePoseEstimate();
-
-                teleStart = drive.localizer.getPose();
-
-                robot.intake.setPower(-0.3);
-
-                if (ticker == 1) {
-                    stamp = getRuntime();
-                }
-                ticker++;
-
-                robot.intake.setPower(0);
-
-                if (getRuntime() - stamp < shootTime) {
-
-                    if (shooterTicker == 0 && !servos.spinEqual(autoSpinStartPos)) {
-                        robot.spin1.setPosition(autoSpinStartPos);
-                        robot.spin2.setPosition(1 - autoSpinStartPos);
-                    } else {
-                        robot.transferServo.setPosition(transferServo_in);
-                        shooterTicker++;
-                        double prevSpinPos = robot.spin1.getPosition();
-                        robot.spin1.setPosition(prevSpinPos + spindexSpeed);
-                        robot.spin2.setPosition(1 - prevSpinPos - spindexSpeed);
-                    }
-
-                    return true;
-
-                } else {
-                    robot.transferServo.setPosition(transferServo_out);
-                    //spindexPos = spindexer_intakePos1;
-
-                    spindexer.resetSpindexer();
-                    spindexer.processIntake();
-
-                    return false;
-
-                }
-
-            }
-        };
-    }
-
-    public Action intake(double intakeTime) {
-        return new Action() {
-            double stamp = 0.0;
-            int ticker = 0;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                if (ticker == 0) {
-                    stamp = System.currentTimeMillis();
-                }
-                ticker++;
-
-                spindexer.processIntake();
-                robot.intake.setPower(1);
-
-                motif = turret.detectObelisk();
-                
-                spindexer.ballCounterLight();
-
-                return (System.currentTimeMillis() - stamp) < (intakeTime * 1000);
-
-            }
-        };
-    }
-
-    public Action detectObelisk(
-            double time,
-            double posX,
-            double posY,
-            double posXTolerance,
-            double posYTolerance,
-            double turrPos
-    ) {
-
-        boolean timeFallback = (time != 0.501);
-        boolean posXFallback = (posX != 0.501);
-        boolean posYFallback = (posY != 0.501);
-
-        return new Action() {
-
-            double stamp = 0.0;
-            int ticker = 0;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-
-                drive.updatePoseEstimate();
-                Pose2d currentPose = drive.localizer.getPose();
-
-                if (ticker == 0) {
-                    stamp = System.currentTimeMillis();
-                }
-
-                ticker++;
-
-                motif = turret.detectObelisk();
-
-                robot.turr1.setPosition(turrPos);
-                robot.turr2.setPosition(1 - turrPos);
-
-                boolean timeDone = timeFallback && (System.currentTimeMillis() - stamp) > time * 1000;
-                boolean xDone = posXFallback && Math.abs(currentPose.position.x - posX) < posXTolerance;
-                boolean yDone = posYFallback && Math.abs(currentPose.position.y - posY) < posYTolerance;
-
-                boolean shouldFinish = timeDone || xDone || yDone;
-
-                return !shouldFinish;
-
-            }
-        };
-    }
-
-    public Action manageFlywheel(
-            double vel,
-            double hoodPos,
-            double time,
-            double posX,
-            double posY,
-            double posXTolerance,
-            double posYTolerance
-    ) {
-
-        boolean timeFallback = (time != 0.501);
-        boolean posXFallback = (posX != 0.501);
-        boolean posYFallback = (posY != 0.501);
-
-        return new Action() {
-
-            double stamp = 0.0;
-            int ticker = 0;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-
-                drive.updatePoseEstimate();
-                Pose2d currentPose = drive.localizer.getPose();
-
-                if (ticker == 0) {
-                    stamp = System.currentTimeMillis();
-                }
-
-                ticker++;
-
-                flywheel.manageFlywheel(vel);
-                robot.hood.setPosition(hoodPos);
-
-                boolean timeDone = timeFallback && (System.currentTimeMillis() - stamp) > time * 1000;
-                boolean xDone = posXFallback && Math.abs(currentPose.position.x - posX) < posXTolerance;
-                boolean yDone = posYFallback && Math.abs(currentPose.position.y - posY) < posYTolerance;
-
-                boolean shouldFinish = timeDone || xDone || yDone;
-
-                return !shouldFinish;
-
-            }
-        };
-    }
-
-    public Action manageShooterAuto(
-            double time,
-            double posX,
-            double posY,
-            double posXTolerance,
-            double posYTolerance
-    ) {
-
-        boolean timeFallback = (time != 0.501);
-        boolean posXFallback = (posX != 0.501);
-        boolean posYFallback = (posY != 0.501);
-
-        return new Action() {
-
-            double stamp = 0.0;
-            int ticker = 0;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-
-                drive.updatePoseEstimate();
-                Pose2d currentPose = drive.localizer.getPose();
-
-                if (ticker == 0) {
-                    stamp = System.currentTimeMillis();
-                }
-
-                ticker++;
-
-                double robotX = drive.localizer.getPose().position.x;
-                double robotY = drive.localizer.getPose().position.y;
-
-                double robotHeading = drive.localizer.getPose().heading.toDouble();
-
-                double goalX = -15;
-                double goalY = 0;
-
-                double dx = robotX - goalX;  // delta x from robot to goal
-                double dy = robotY - goalY;  // delta y from robot to goal
-                Pose2d deltaPose = new Pose2d(dx, dy, robotHeading);
-
-                double distanceToGoal = Math.sqrt(dx * dx + dy * dy);
-
-                targetingSettings = targeting.calculateSettings
-                        (robotX, robotY, robotHeading, 0.0, false);
-
-                turret.trackGoal(deltaPose);
-
-                robot.hood.setPosition(targetingSettings.hoodAngle);
-
-                flywheel.manageFlywheel(targetingSettings.flywheelRPM);
-
-                boolean timeDone = timeFallback && (System.currentTimeMillis() - stamp) > time * 1000;
-                boolean xDone = posXFallback && Math.abs(currentPose.position.x - posX) < posXTolerance;
-                boolean yDone = posYFallback && Math.abs(currentPose.position.y - posY) < posYTolerance;
-
-                boolean shouldFinish = timeDone || xDone || yDone;
-
-                return !shouldFinish;
-
-            }
-        };
-    }
-
-    public Action manageFlywheelAuto(
-            double time,
-            double posX,
-            double posY,
-            double posXTolerance,
-            double posYTolerance
-    ) {
-
-        boolean timeFallback = (time != 0.501);
-        boolean posXFallback = (posX != 0.501);
-        boolean posYFallback = (posY != 0.501);
-
-        return new Action() {
-
-            double stamp = 0.0;
-            int ticker = 0;
-
-            @Override
-            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-
-                drive.updatePoseEstimate();
-                Pose2d currentPose = drive.localizer.getPose();
-
-                if (ticker == 0) {
-                    stamp = System.currentTimeMillis();
-                }
-
-                ticker++;
-
-                double robotX = drive.localizer.getPose().position.x;
-                double robotY = drive.localizer.getPose().position.y;
-
-                double robotHeading = drive.localizer.getPose().heading.toDouble();
-
-                double goalX = -15;
-                double goalY = 0;
-
-                double dx = robotX - goalX;  // delta x from robot to goal
-                double dy = robotY - goalY;  // delta y from robot to goal
-                Pose2d deltaPose = new Pose2d(dx, dy, robotHeading);
-
-                double distanceToGoal = Math.sqrt(dx * dx + dy * dy);
-
-                targetingSettings = targeting.calculateSettings
-                        (robotX, robotY, robotHeading, 0.0, false);
-
-
-                robot.hood.setPosition(targetingSettings.hoodAngle);
-
-                flywheel.manageFlywheel(targetingSettings.flywheelRPM);
-
-                boolean timeDone = timeFallback && (System.currentTimeMillis() - stamp) > time * 1000;
-                boolean xDone = posXFallback && Math.abs(currentPose.position.x - posX) < posXTolerance;
-                boolean yDone = posYFallback && Math.abs(currentPose.position.y - posY) < posYTolerance;
-
-                boolean shouldFinish = timeDone || xDone || yDone;
-
-                return !shouldFinish;
-
-            }
-        };
-    }
-
-    @Override
-    public void runOpMode() throws InterruptedException {
-
-        hardwareMap.get(Servo.class, "light").setPosition(0);
-
-        robot = new Robot(hardwareMap);
-
-        TELE = new MultipleTelemetry(
-                telemetry, FtcDashboard.getInstance().getTelemetry()
-        );
-
-        flywheel = new Flywheel(hardwareMap);
-
-        targeting = new Targeting();
-        targetingSettings = new Targeting.Settings(0.0, 0.0);
-
-        spindexer = new Spindexer(hardwareMap);
-
-        servos = new Servos(hardwareMap);
-
-        robot.limelight.pipelineSwitch(1);
-
-        turret = new Turret(robot, TELE, robot.limelight);
-
-        turret.manualSetTurret(0.4);
-
-        drive = new MecanumDrive(hardwareMap, new Pose2d(0, 0, 0));
-
-        TrajectoryActionBuilder shoot0 = null;
-        TrajectoryActionBuilder pickup1 = null;
-        TrajectoryActionBuilder shoot1 = null;
-        TrajectoryActionBuilder gatePickup = null;
-        TrajectoryActionBuilder shootCycle = null;
-
-        robot.spin1.setPosition(autoSpinStartPos);
-        robot.spin2.setPosition(1 - autoSpinStartPos);
-
-        robot.transferServo.setPosition(transferServo_out);
-
-        robot.light.setPosition(1);
-
-        while (opModeInInit()) {
-
-            robot.hood.setPosition(shoot0Hood);
-
-            if (gamepad2.crossWasPressed()) {
-                redAlliance = !redAlliance;
-            }
-
-            if (redAlliance) {
-                robot.light.setPosition(0.28);
-
-                // ---- FIRST SHOT ----
-                x1 = rx1;
-                y1 = ry1;
-                h1 = rh1;
-
-                // ---- PICKUP PATH ----
-                x2a = rx2a;
-                y2a = ry2a;
-                h2a = rh2a;
-                t2a = rt2a;
-                x2b = rx2b;
-                y2b = ry2b;
-                h2b = rh2b;
-                t2b = rt2b;
-                x2c = rx2c;
-                y2c = ry2c;
-                h2c = rh2c;
-                t2c = rt2c;
-
-                xShoot = rShootX;
-                yShoot = rShootY;
-                hShoot = rShootH;
-                shoot1Tangent = rShoot1Tangent;
-                
-                xGate = rXGate;
-                yGate = rYGate;
-                hGate = rHGate;
-                
-
-            } else {
-                robot.light.setPosition(0.6);
-
-                // ---- FIRST SHOT ----
-                x1 = bx1;
-                y1 = by1;
-                h1 = bh1;
-
-                // ---- PICKUP PATH ----
-                x2a = bx2a;
-                y2a = by2a;
-                h2a = bh2a;
-                t2a = bt2a;
-                x2b = bx2b;
-                y2b = by2b;
-                h2b = bh2b;
-                t2b = bt2b;
-                x2c = bx2c;
-                y2c = by2c;
-                h2c = bh2c;
-                t2c = bt2c;
-
-                xShoot = bShootX;
-                yShoot = bShootY;
-                hShoot = bShootH;
-
-                shoot1Tangent = bShoot1Tangent;
-
-                xGate = bXGate;
-                yGate = bYGate;
-                hGate = bHGate;
-            }
-
-            shoot0 = drive.actionBuilder(new Pose2d(0, 0, 0))
-                    .strafeToLinearHeading(new Vector2d(x1, y1), h1);
-
-            pickup1 = drive.actionBuilder(new Pose2d(x1, y1, h1))
-                    .strafeToLinearHeading(new Vector2d(x2a, y2a), h2a)
-                    .strafeToLinearHeading(new Vector2d(x2b, y2b), h2b,
-                            new TranslationalVelConstraint(pickup1Speed));
-            shoot1 = drive.actionBuilder(new Pose2d(x2b, y2b, h2b))
-                    .setReversed(true)
-                    .splineTo(new Vector2d(x2a, y2a), shoot1Tangent)
-                    .splineToSplineHeading(new Pose2d(xShoot, yShoot, hShoot), shoot1Tangent);
-            
-            gatePickup = drive.actionBuilder(new Pose2d(xShoot, yShoot, hShoot))
-                    .strafeToLinearHeading(new Vector2d(xGate, yGate), hGate);
-
-            shootCycle = drive.actionBuilder(new Pose2d(xGate, yGate, hGate))
-                    .strafeToLinearHeading(new Vector2d(xShoot, yShoot), hShoot);
-
-        }
-
-        waitForStart();
-
-        if (isStopRequested()) return;
-
-        if (opModeIsActive()) {
-
-            robot.transfer.setPower(1);
-
-            assert shoot0 != null;
-
-            Actions.runBlocking(
-                    new ParallelAction(
-                            shoot0.build(),
-                            manageFlywheel(
-                                    shoot0Vel,
-                                    shoot0Hood,
-                                    flywheel0Time,
-                                    x1,
-                                    0.501,
-                                    shoot0XTolerance,
-                                    0.501
-                            )
-
-                    )
-            );
-
-            Actions.runBlocking(
-                    shootAll((int) shoot0Vel, shoot0Time, shoot0SpinSpeedIncrease)
-            );
-
-            Actions.runBlocking(
-                    new ParallelAction(
-                            pickup1.build(),
-                            manageFlywheel(
-                                    shootAllVelocity, 
-                                    shootAllHood,
-                                    pickup1Time,
-                                    x2b,
-                                    y2b,
-                                    pickup1XTolerance,
-                                    pickup1YTolerance
-                            ),
-                            intake(intake1Time),
-                            detectObelisk(
-                                    obelisk1Time,
-                                    x2b,
-                                    y2c,
-                                    obelisk1XTolerance,
-                                    obelisk1YTolerance,
-                                    obeliskTurrPos
-                            )
-                    )
-            );
-
-            motif = turret.detectObelisk();
-
-            Actions.runBlocking(
-                    new ParallelAction(
-                            manageFlywheel(
-                                    shootAllVelocity, 
-                                    shootAllHood,
-                                    shoot1Time,
-                                    0.501,
-                                    0.501,
-                                    0.501,
-                                    0.501
-                            ),
-                            shoot1.build(),
-                            prepareShootAll(shoot1Time)
-                    )
-            );
-
-            Actions.runBlocking(
-                    new ParallelAction(
-                            manageShooterAuto(
-                                    shootAllTime,
-                                    0.501,
-                                    0.501,
-                                    0.501,
-                                    0.501
-                            ),
-                            shootAllAuto(shootAllTime, spindexerSpeedIncrease)
-                    )
-
-            );
-
-            while (opModeIsActive()) {
-
-                Actions.runBlocking(
-                        new ParallelAction(
-                                gatePickup.build(),
-                                manageShooterAuto(
-                                        gatePickupTime,
-                                        x2b,
-                                        y2b,
-                                        pickup1XTolerance,
-                                        pickup1YTolerance
-                                ),
-                                intake(gatePickupTime)
-
-                        )
-                );
-
-                Actions.runBlocking(
-                        new ParallelAction(
-                                manageFlywheelAuto(
-                                        shootCycleTime,
-                                        0.501,
-                                        0.501,
-                                        0.501,
-                                        0.501
-                                ),
-                                shootCycle.build(),
-                                prepareShootAll(shootCycleTime)
-                        )
-                );
-
-                Actions.runBlocking(
-                        new ParallelAction(
-                                manageShooterAuto(
-                                        shootAllTime,
-                                        0.501,
-                                        0.501,
-                                        0.501,
-                                        0.501
-                                ),
-                                shootAllAuto(shootAllTime, spindexerSpeedIncrease)
-                        )
-
-                );
-
-            }
-
-
-        }
-
-    }
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/actions/AutoActions.java

@@ -0,0 +1,719 @@
+package org.firstinspires.ftc.teamcode.autonomous.actions;
+
+import static org.firstinspires.ftc.teamcode.constants.Color.redAlliance;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStart;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spinStartPos;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_intakePos1;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall1;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall2;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall3;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall3b;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_in;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_out;
+
+import androidx.annotation.NonNull;
+
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.acmerobotics.dashboard.telemetry.TelemetryPacket;
+import com.acmerobotics.roadrunner.Action;
+import com.acmerobotics.roadrunner.Pose2d;
+import com.pedropathing.geometry.Pose;
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
+import com.qualcomm.robotcore.hardware.NormalizedRGBA;
+
+import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
+import org.firstinspires.ftc.teamcode.constants.Color;
+import org.firstinspires.ftc.teamcode.constants.ServoPositions;
+import org.firstinspires.ftc.teamcode.constants.StateEnums;
+import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
+import org.firstinspires.ftc.teamcode.utils.Flywheel;
+import org.firstinspires.ftc.teamcode.utils.Light;
+import org.firstinspires.ftc.teamcode.utils.Robot;
+import org.firstinspires.ftc.teamcode.utils.Servos;
+import org.firstinspires.ftc.teamcode.utils.Spindexer;
+import org.firstinspires.ftc.teamcode.utils.Targeting;
+import org.firstinspires.ftc.teamcode.utils.Turret;
+
+import java.util.Objects;
+
+@Config
+public class AutoActions {
+    Robot robot;
+    MultipleTelemetry TELE;
+    Servos servos;
+    Flywheel flywheel;
+    MecanumDrive drive;
+    Spindexer spindexer;
+    Targeting targeting;
+    Targeting.Settings targetingSettings;
+    Light light;
+    Turret turret;
+    private int driverSlotGreen = 0;
+    private int passengerSlotGreen = 0;
+    private int rearSlotGreen = 0;
+    private int mostGreenSlot = 0;
+    public static double firstSpindexShootPos = spinStartPos;
+    private boolean shootForward = true;
+    public int motif = 0;
+    double spinEndPos = 0.95;
+    private boolean intaking = false;
+    public AutoActions(Robot rob, MecanumDrive dri, MultipleTelemetry tel, Servos ser, Flywheel fly, Spindexer spi, Targeting tar, Targeting.Settings tS, Turret tur, Light lig) {
+        this.robot = rob;
+        this.drive = dri;
+        this.TELE = tel;
+        this.servos = ser;
+        this.flywheel = fly;
+        this.spindexer = spi;
+        this.targeting = tar;
+        this.targetingSettings = tS;
+        this.turret = tur;
+        this.light = lig;
+    }
+
+    public Action prepareShootAll(
+            double colorSenseTime,
+            double time,
+            int motif_id,
+            double posX,
+            double posY,
+            double posH
+    ) {
+        return new Action() {
+            double stamp = 0.0;
+            int ticker = 0;
+
+            double spindexerWiggle = 0.01;
+
+            boolean decideGreenSlot = false;
+
+            void spin1PosFirst() {
+                firstSpindexShootPos = spindexer_outtakeBall1;
+                shootForward = true;
+                spinEndPos = 0.95;
+            }
+
+            void spin2PosFirst() {
+                firstSpindexShootPos = spindexer_outtakeBall2;
+                shootForward = false;
+                spinEndPos = 0.05;
+            }
+
+            void reverseSpin2PosFirst() {
+                firstSpindexShootPos = spindexer_outtakeBall2;
+                shootForward = true;
+                spinEndPos = 0.95;
+            }
+
+            void spin3PosFirst() {
+                firstSpindexShootPos = spindexer_outtakeBall3;
+                shootForward = false;
+                spinEndPos = 0.05;
+            }
+
+            void oddSpin3PosFirst() {
+                firstSpindexShootPos = spindexer_outtakeBall3b;
+                shootForward = true;
+                spinEndPos = 0.95;
+            }
+
+            Action manageShooter = null;
+
+            @Override
+            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
+                if (ticker == 0) {
+                    stamp = System.currentTimeMillis();
+                    manageShooter = manageShooterAuto(time, posX, posY, posH, false);
+                    driverSlotGreen = 0;
+                    passengerSlotGreen = 0;
+                    rearSlotGreen = 0;
+                }
+                ticker++;
+                servos.setTransferPos(transferServo_out);
+                drive.updatePoseEstimate();
+
+                light.setState(StateEnums.LightState.GOAL_LOCK);
+
+                teleStart = drive.localizer.getPose();
+
+                manageShooter.run(telemetryPacket);
+
+                TELE.addData("Most Green Slot", mostGreenSlot);
+                TELE.addData("Driver Slot Greeness", driverSlotGreen);
+                TELE.addData("Passenger Slot Greeness", passengerSlotGreen);
+                TELE.addData("Rear Greeness", rearSlotGreen);
+                TELE.update();
+
+                if ((System.currentTimeMillis() - stamp) < (colorSenseTime * 1000)) {
+
+                    spindexerWiggle *= -1.0;
+
+                    servos.setSpinPos(spindexer_intakePos1 + spindexerWiggle);
+
+
+// Rear Center (Position 1)
+                    double distanceRearCenter = robot.color1.getDistance(DistanceUnit.MM);
+                    if (distanceRearCenter < 52) {
+                        NormalizedRGBA color1RGBA = robot.color1.getNormalizedColors();
+                        double gP1 = color1RGBA.green / (color1RGBA.green + color1RGBA.red + color1RGBA.blue);
+                        if (gP1 >= 0.38) {
+                            rearSlotGreen++;
+                        }
+                    }
+
+// Front Driver (Position 2)
+                    double distanceFrontDriver = robot.color2.getDistance(DistanceUnit.MM);
+                    if (distanceFrontDriver < 50) {
+                        NormalizedRGBA color2RGBA = robot.color2.getNormalizedColors();
+                        double gP2 = color2RGBA.green / (color2RGBA.green + color2RGBA.red + color2RGBA.blue);
+                        if (gP2 >= 0.4) {
+                            driverSlotGreen++;
+                        }
+                    }
+
+// Front Passenger (Position 3)
+                    double distanceFrontPassenger = robot.color3.getDistance(DistanceUnit.MM);
+                    if (distanceFrontPassenger < 29) {
+                        NormalizedRGBA color3RGBA = robot.color3.getNormalizedColors();
+                        double gP3 = color3RGBA.green / (color3RGBA.green + color3RGBA.red + color3RGBA.blue);
+                        if (gP3 >= 0.4) {
+                            passengerSlotGreen++;
+                        }
+                    }
+
+                    spindexer.setIntakePower(-0.1);
+
+                    decideGreenSlot = true;
+
+                    return true;
+                } else if (decideGreenSlot) {
+
+                    if (driverSlotGreen >= passengerSlotGreen && driverSlotGreen >= rearSlotGreen) {
+                        mostGreenSlot = 3;
+                    } else if (passengerSlotGreen >= driverSlotGreen && passengerSlotGreen >= rearSlotGreen) {
+                        mostGreenSlot = 2;
+                    } else {
+                        mostGreenSlot = 1;
+                    }
+
+                    decideGreenSlot = false;
+
+                    if (motif_id == 21) {
+                        if (mostGreenSlot == 1) {
+                            firstSpindexShootPos = spindexer_outtakeBall1;
+                            shootForward = true;
+                            spinEndPos = 0.95;
+                        } else if (mostGreenSlot == 2) {
+                            firstSpindexShootPos = spindexer_outtakeBall2;
+                            shootForward = false;
+                            spinEndPos = 0.05;
+                        } else {
+                            firstSpindexShootPos = spindexer_outtakeBall3b;
+                            shootForward = true;
+                            spinEndPos = 0.95;
+                        }
+                    } else if (motif_id == 22) {
+                        if (mostGreenSlot == 1) {
+                            firstSpindexShootPos = spindexer_outtakeBall3b;
+                            shootForward = true;
+                            spinEndPos = 0.95;
+                        } else if (mostGreenSlot == 2) {
+                            firstSpindexShootPos = spindexer_outtakeBall1;
+                            shootForward = true;
+                            spinEndPos = 0.95;
+                        } else {
+                            firstSpindexShootPos = spindexer_outtakeBall1;
+                            shootForward = false;
+                            spinEndPos = 0.03;
+                        }
+
+                    } else {
+                        if (mostGreenSlot == 1) {
+                            firstSpindexShootPos = spindexer_outtakeBall3;
+                            shootForward = false;
+                            spinEndPos = 0.05;
+                        } else if (mostGreenSlot == 2) {
+                            firstSpindexShootPos = spindexer_outtakeBall3b;
+                            shootForward = true;
+                            spinEndPos = 0.95;
+                        } else {
+                            firstSpindexShootPos = spindexer_outtakeBall1;
+                            shootForward = true;
+                            spinEndPos = 0.95;                        }
+                    }
+
+                    return true;
+                } else if ((System.currentTimeMillis() - stamp) < (time * 1000)) {
+                    spindexer.setIntakePower(-((System.currentTimeMillis() - stamp - colorSenseTime)) / 1000);
+
+                    servos.setSpinPos(firstSpindexShootPos);
+
+                    return true;
+                } else {
+                    return false;
+                }
+
+            }
+        };
+    }
+
+    public Action shootAllAuto(double shootTime, double spindexSpeed, double posX, double posY, double posH) {
+        return new Action() {
+            int ticker = 1;
+
+            double stamp = 0.0;
+
+            int shooterTicker = 0;
+            Action manageShooter = null;
+
+            @Override
+            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
+
+                spindexer.setIntakePower(-0.1);
+
+                light.setState(StateEnums.LightState.BALL_COLOR);
+                light.update();
+
+                if (ticker == 1) {
+                    stamp = System.currentTimeMillis();
+                    manageShooter = manageShooterAuto(shootTime, posX, posY, posH, false);
+
+                }
+                ticker++;
+
+                manageShooter.run(telemetryPacket);
+
+                double prevSpinPos = servos.getSpinCmdPos();
+
+                boolean end;
+                if (shootForward) {
+                    end = servos.getSpinPos() > spinEndPos;
+                } else {
+                    end = servos.getSpinPos() < spinEndPos;
+                }
+
+                if (System.currentTimeMillis() - stamp < shootTime * 1000 && (!end || shooterTicker < Spindexer.waitFirstBallTicks + 1)) {
+
+                    if (!servos.spinEqual(firstSpindexShootPos) && shooterTicker < 1) {
+                        servos.setSpinPos(firstSpindexShootPos);
+                    } else {
+                        servos.setTransferPos(transferServo_in);
+                        shooterTicker++;
+                        Spindexer.whileShooting = true;
+                        if (shootForward && shooterTicker > Spindexer.waitFirstBallTicks) {
+                            servos.setSpinPos(prevSpinPos + spindexSpeed);
+                        } else if (shooterTicker > Spindexer.waitFirstBallTicks) {
+                            servos.setSpinPos(prevSpinPos - spindexSpeed);
+                        }
+
+                    }
+
+                    return true;
+
+                } else {
+                    servos.setTransferPos(transferServo_out);
+                    Spindexer.whileShooting = false;
+                    spindexer.resetSpindexer();
+                    spindexer.processIntake();
+
+                    return false;
+
+                }
+            }
+        };
+    }
+
+    public Action shootAllManual(
+            double shootTime,
+            double hoodMoveTime, //Set to 0.501 to show that you are not using, but you must set hoodPoses equal
+            double spindexSpeed,
+            double velStart,
+            double hoodStart,
+            double velEnd,
+            double hoodEnd,
+            double turr) {
+        return new Action() {
+            int ticker = 1;
+
+            double stamp = 0.0;
+
+            int shooterTicker = 0;
+            Action manageShooter = null;
+
+            @Override
+            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
+
+                spindexer.setIntakePower(-0.1);
+
+                light.setState(StateEnums.LightState.BALL_COLOR);
+                light.update();
+
+                if (ticker == 1) {
+                    stamp = System.currentTimeMillis();
+                    manageShooter = manageShooterManual(shootTime, hoodMoveTime, velStart, hoodStart, velEnd, hoodEnd, turr);
+
+                }
+                ticker++;
+
+                manageShooter.run(telemetryPacket);
+
+                double prevSpinPos = servos.getSpinCmdPos();
+
+                boolean end;
+                if (shootForward) {
+                    end = prevSpinPos > spinEndPos;
+                } else {
+                    end = prevSpinPos < spinEndPos;
+                }
+
+                if (System.currentTimeMillis() - stamp < shootTime * 1000 && !end) {
+                    servos.setTransferPos(transferServo_in);
+                    shooterTicker++;
+                    Spindexer.whileShooting = true;
+                    if (shootForward && shooterTicker > Spindexer.waitFirstBallTicks) {
+                        servos.setSpinPos(prevSpinPos + spindexSpeed);
+                    } else if (shooterTicker > Spindexer.waitFirstBallTicks) {
+                        servos.setSpinPos(prevSpinPos - spindexSpeed);
+                    }
+
+                    return true;
+
+                } else {
+                    servos.setTransferPos(transferServo_out);
+                    Spindexer.whileShooting = false;
+                    spindexer.resetSpindexer();
+                    spindexer.processIntake();
+
+                    return false;
+
+                }
+            }
+        };
+    }
+
+    public Action intake(
+            double time,
+            double posX,
+            double posY,
+            double posH
+    ) {
+        return new Action() {
+            double stamp = 0.0;
+            int ticker = 0;
+            Action manageShooter = null;
+
+            @Override
+            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
+                if (ticker == 0) {
+                    stamp = System.currentTimeMillis();
+                    manageShooter = manageShooterAuto(time, posX, posY, posH, false);
+                }
+                ticker++;
+
+                spindexer.processIntake();
+                spindexer.setIntakePower(1);
+                light.setState(StateEnums.LightState.BALL_COUNT);
+                light.update();
+
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
+
+                manageShooter.run(telemetryPacket);
+
+                if ((System.currentTimeMillis() - stamp) > (time * 1000)) {
+                    servos.setSpinPos(spindexer_intakePos1);
+                    intaking = false;
+                    return false;
+                } else {
+                    intaking = true;
+                    return true;
+                }
+            }
+        };
+    }
+
+    private boolean detectingObelisk = false;
+
+    public Action detectObelisk(
+            double time,
+            double posX,
+            double posY,
+            double posXTolerance,
+            double posYTolerance,
+            double turrPos
+    ) {
+
+        boolean timeFallback = (time != 0.501);
+        boolean posXFallback = (posX != 0.501);
+        boolean posYFallback = (posY != 0.501);
+
+        return new Action() {
+
+            double stamp = 0.0;
+            int ticker = 0;
+            int prevMotif = 0;
+
+            @Override
+            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
+                detectingObelisk = true;
+                drive.updatePoseEstimate();
+                Pose2d currentPose = drive.localizer.getPose();
+
+                if (ticker == 0) {
+                    stamp = System.currentTimeMillis();
+                    turret.pipelineSwitch(1);
+                    ticker++;
+                }
+
+                motif = turret.detectObelisk();
+
+                if (prevMotif == motif){
+                    ticker++;
+                }
+                prevMotif = motif;
+
+                turret.setTurret(turrPos);
+
+                boolean timeDone = timeFallback && (System.currentTimeMillis() - stamp) > time * 1000;
+                boolean xDone = posXFallback && Math.abs(currentPose.position.x - posX) < posXTolerance;
+                boolean yDone = posYFallback && Math.abs(currentPose.position.y - posY) < posYTolerance;
+
+                boolean shouldFinish = timeDone || (xDone && yDone) || spindexer.isFull() || ticker > 10;
+
+                teleStart = currentPose;
+
+                if (shouldFinish) {
+                    if (redAlliance) {
+                        turret.pipelineSwitch(4);
+                    } else {
+                        turret.pipelineSwitch(2);
+                    }
+                    detectingObelisk = false;
+                    return false;
+                } else {
+                    return true;
+                }
+
+            }
+        };
+    }
+
+    public Action manageShooterAuto(
+            double time,
+            double posX,
+            double posY,
+            double posH,
+            boolean flywheelSensor
+    ) {
+
+        return new Action() {
+
+            double stamp = 0.0;
+            int ticker = 0;
+
+            final boolean timeFallback = (time != 0.501);
+
+
+            @Override
+            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
+
+
+
+                drive.updatePoseEstimate();
+                Pose2d currentPose = null; //drive.localizer.getPose();
+
+                if (ticker == 0) {
+                    stamp = System.currentTimeMillis();
+
+                    if (redAlliance) {
+                        turret.pipelineSwitch(4);
+                        light.setManualLightColor(Color.LightRed);
+                    } else {
+                        turret.pipelineSwitch(2);
+                        light.setManualLightColor(Color.LightBlue);
+
+                    }
+                }
+
+                ticker++;
+
+                double robotX = 0.0;//currentPose.position.x;
+                double robotY = 0.0;//currentPose.position.y;
+
+                double robotHeading = 0.0;//currentPose.heading.toDouble();
+
+                double goalX = -15;
+                double goalY = 0;
+
+                double dx = robotX - goalX;  // delta x from robot to goal
+                double dy = robotY - goalY;  // delta y from robot to goal
+
+
+                Pose deltaPose;
+                if (posX != 0.501) {
+                    deltaPose = new Pose(posX, posY, Math.toRadians(posH));
+                } else {
+                    deltaPose = new Pose(dx, dy, robotHeading);
+                }
+                Turret.limelightUsed = true;
+
+//                double distanceToGoal = Math.sqrt(dx * dx + dy * dy);
+
+                targetingSettings = targeting.calculateSettings
+                        (robotX, robotY, robotHeading, 0.0, false);
+
+                if (!detectingObelisk) {
+                    turret.trackGoal(deltaPose);
+                }
+
+                servos.setHoodPos(targetingSettings.hoodAngle);
+
+                double voltage = robot.voltage.getVoltage();
+                flywheel.setPIDF(Robot.shooterPIDF_P, Robot.shooterPIDF_I, Robot.shooterPIDF_D, Robot.shooterPIDF_F / voltage);
+                flywheel.manageFlywheel(targetingSettings.flywheelRPM);
+
+                boolean timeDone = timeFallback && (System.currentTimeMillis() - stamp) > time * 1000;
+                boolean shouldFinish = timeDone || (flywheel.getSteady() && flywheelSensor);
+
+                teleStart = currentPose;
+
+                TELE.addData("Steady?", flywheel.getSteady());
+                TELE.update();
+
+                return !shouldFinish;
+            }
+        };
+    }
+
+    public Action Wait(double time) {
+        return new Action() {
+            boolean ticker = false;
+            double stamp = 0.0;
+
+            @Override
+            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
+                if (!ticker) {
+                    stamp = System.currentTimeMillis();
+                    ticker = true;
+                }
+
+                return (System.currentTimeMillis() - stamp < time * 1000);
+
+            }
+        };
+    }
+
+    public Action manageShooterManual(
+            double maxTime,
+            double hoodMoveTime, //Set to 0.501 to show that you are not using, but you must set hoodPoses equal
+            double velStart,
+            double hoodStart,
+            double velEnd,
+            double hoodEnd,
+            double turr
+    ) {
+        return new Action() {
+
+            double stamp = 0.0;
+            int ticker = 0;
+
+            final boolean timeFallback = (maxTime != 0.501);
+
+            @Override
+            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
+
+                drive.updatePoseEstimate();
+                Pose2d currentPose = drive.localizer.getPose();
+
+                if (ticker == 0) {
+                    stamp = System.currentTimeMillis();
+                }
+
+                ticker++;
+
+                double robotX = currentPose.position.x;
+                double robotY = currentPose.position.y;
+
+                double robotHeading = currentPose.heading.toDouble();
+
+                double goalX = -15;
+                double goalY = 0;
+
+                double dx = robotX - goalX;  // delta x from robot to goal
+                double dy = robotY - goalY;  // delta y from robot to goal
+                Pose deltaPose;
+                if (turr == 0.501) {
+                    deltaPose = new Pose(dx, dy, robotHeading);
+                    if (!detectingObelisk) {
+                        turret.trackGoal(deltaPose);
+                    }
+                } else {
+                    turret.setTurret(turr);
+                }
+
+                servos.setHoodPos(hoodStart + ((hoodEnd - hoodStart) * Math.min(((System.currentTimeMillis() - stamp) / (hoodMoveTime * 1000)), 1)));
+                double vel = velStart + (velEnd - velStart) * Math.min(((System.currentTimeMillis() - stamp) / (hoodMoveTime * 1000)), 1);
+
+                double voltage = robot.voltage.getVoltage();
+                flywheel.setPIDF(Robot.shooterPIDF_P, Robot.shooterPIDF_I, Robot.shooterPIDF_D, Robot.shooterPIDF_F / voltage);
+                flywheel.manageFlywheel(vel);
+
+                boolean timeDone = timeFallback && (System.currentTimeMillis() - stamp) > maxTime * 1000;
+
+                teleStart = currentPose;
+
+                TELE.addData("Steady?", flywheel.getSteady());
+                TELE.update();
+
+                return !timeDone;
+            }
+        };
+    }
+
+    public Action ShakeDrivetrain(
+            double time
+    ){
+        return new Action() {
+            int ticker = 0;
+            double stamp = 0;
+            @Override
+            public boolean run(@NonNull TelemetryPacket telemetryPacket) {
+                if (ticker == 0){
+                    stamp = System.currentTimeMillis();
+                }
+                ticker++;
+
+                double currentStamp = System.currentTimeMillis();
+                if (currentStamp - stamp < time*1000 && (intaking || ticker < 50)) {
+                    if (ticker % 10000 < 5000) {
+                        robot.frontLeft.setPower(0.5);
+                        robot.backLeft.setPower(0.5);
+                        robot.frontRight.setPower(0.5);
+                        robot.backRight.setPower(0.5);
+                    } else {
+                        robot.frontLeft.setPower(-0.5);
+                        robot.backLeft.setPower(-0.5);
+                        robot.frontRight.setPower(-0.5);
+                        robot.backRight.setPower(-0.5);
+                    }
+                    return true;
+                } else {
+                    robot.frontLeft.setPower(0);
+                    robot.backLeft.setPower(0);
+                    robot.frontRight.setPower(0);
+                    robot.backRight.setPower(0);
+                    return false;
+                }
+            }
+        };
+    }
+}
+
+

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/Auto_LT_Close_12Ball.java

@@ -1,51 +1,61 @@
-package org.firstinspires.ftc.teamcode.autonomous;
+package org.firstinspires.ftc.teamcode.autonomous.disabled;
 
 import static org.firstinspires.ftc.teamcode.constants.Color.redAlliance;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bHGate;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bShootH;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bShoot1Tangent;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bShootX;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bShootH;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bShootY;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bShootX;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh1;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bShootY;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bXGate;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bYGate;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh3a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bh1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh3b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bh2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh4a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bh2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh4b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bh2c;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bhPrep;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bt2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx1;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bt2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bt2c;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bx1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx3a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bx2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx3b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bx2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx4a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.bx2c;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx4b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.by1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bxPrep;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.by2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by1;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.by2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.by2c;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rHGate;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by3a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rShoot1Tangent;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by3b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rShootH;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by4a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rShootX;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by4b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rShootY;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.byPrep;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rXGate;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rShootH;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rYGate;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rShootX;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rh1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rShootY;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rh2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh1;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rh2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rh2c;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rt2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh3a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rt2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh3b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rt2c;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh4a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rx1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh4b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rx2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rhPrep;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rx2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx1;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.rx2c;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.ry1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.ry2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx3a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.ry2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx3b;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.ry2c;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx4a;
-import static org.firstinspires.ftc.teamcode.constants.Poses_LT_Indexed.teleStart;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx4b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rxPrep;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry3a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry3b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry4a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry4b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ryPrep;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStart;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_in;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_out;
 
@@ -58,14 +68,14 @@ import com.acmerobotics.dashboard.telemetry.TelemetryPacket;
 import com.acmerobotics.roadrunner.Action;
 import com.acmerobotics.roadrunner.ParallelAction;
 import com.acmerobotics.roadrunner.Pose2d;
-import com.acmerobotics.roadrunner.SequentialAction;
 import com.acmerobotics.roadrunner.TrajectoryActionBuilder;
 import com.acmerobotics.roadrunner.TranslationalVelConstraint;
 import com.acmerobotics.roadrunner.Vector2d;
 import com.acmerobotics.roadrunner.ftc.Actions;
+import com.pedropathing.geometry.Pose;
 import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
-import com.qualcomm.robotcore.hardware.Servo;
 
 import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
 import org.firstinspires.ftc.teamcode.utils.Flywheel;
@@ -75,13 +85,10 @@ import org.firstinspires.ftc.teamcode.utils.Spindexer;
 import org.firstinspires.ftc.teamcode.utils.Targeting;
 import org.firstinspires.ftc.teamcode.utils.Turret;
 
-import java.util.ArrayList;
+@Disabled
-import java.util.List;
-
-@Autonomous(preselectTeleOp = "TeleopV3")
 @Config
-public class Auto_LT_12Ball extends LinearOpMode {
+@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;
     public static double shoot0SpinSpeedIncrease = 0.014;
@@ -89,18 +96,15 @@ public class Auto_LT_12Ball extends LinearOpMode {
     public static double spindexerSpeedIncrease = 0.02;
 
     public static double obeliskTurrPos = 0.53;
-    public static double gatePickupTime = 3.0;
+    public static double normalIntakeTime = 3.0;
     public static double shoot1Turr = 0.57;
     public static double shoot0XTolerance = 1.0;
-    public static double turretShootPos = 0.72;
+    public static double turretShootPos = 0.53;
     public static double shootAllTime = 1.8;
     public static double shoot0Time = 1.6;
     public static double intake1Time = 3.0;
     public static double flywheel0Time = 3.5;
-    public static double pickup1Speed = 20.0;
+    public static double pickup1Speed = 17;
-    public static double pickup2Speed = 20.0;
-    public static double pickup3Speed = 20.0;
-
     // ---- SECOND SHOT / PICKUP ----
     public static double shoot1Vel = 2300;
     public static double shoot1Hood = 0.93;
@@ -120,11 +124,6 @@ public class Auto_LT_12Ball extends LinearOpMode {
     public static double shoot1ToleranceY = 2.0;
     public static double shoot1Time = 2.0;
     public static double shootCycleTime = 2.5;
-
-    List<Boolean> s1 = new ArrayList<>();
-
-    List<Boolean> s2 = new ArrayList<>();
-    List<Boolean> s3 = new ArrayList<>();
     public int motif = 0;
     Robot robot;
     MultipleTelemetry TELE;
@@ -142,24 +141,17 @@ public class Auto_LT_12Ball extends LinearOpMode {
     private double x2b, y2b, h2b, t2b;
     private double x2c, y2c, h2c, t2c;
 
-    private double xShoot, yShoot, hShoot;
+    private double x3a, y3a, h3a;
-    private double xGate, yGate, hGate;
+    private double x3b, y3b, h3b;
-
-    private double shoot1Tangent;
-
-    // ---- OPEN GATE / MIDFIELD ----
-    private double x3, y3, h3, t3;
-
-    // ---- PICKUP 2 ----
     private double x4a, y4a, h4a;
     private double x4b, y4b, h4b;
 
-    // ---- PICKUP 3 ----
+    private double xShoot, yShoot, hShoot;
-    private double x5a, y5a, h5a;
+    private double xGate, yGate, hGate;
-    private double x5b, y5b, h5b;
+    private double xPrep, yPrep, hPrep;
+
+    private double shoot1Tangent;
 
-    // ---- PARK ----
-    private double xPark, yPark, hPark;
 
     public Action prepareShootAll(double time) {
         return new Action() {
@@ -178,15 +170,23 @@ public class Auto_LT_12Ball extends LinearOpMode {
 
                 robot.transferServo.setPosition(transferServo_out);
 
-                turret.manualSetTurret(turretShootPos);
+                turret.setTurret(turretShootPos);
 
                 robot.intake.setPower(-((System.currentTimeMillis() - stamp)) / 1000);
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
+
+                TELE.addData("Velocity", flywheel.getVelo());
+                TELE.addData("Hood", robot.hood.getPosition());
+                TELE.update();
 
                 return (System.currentTimeMillis() - stamp) < (time * 1000);
 
             }
         };
     }
+
     public Action shootAll(int vel, double shootTime, double spindexSpeed) {
         return new Action() {
             int ticker = 1;
@@ -199,8 +199,8 @@ public class Auto_LT_12Ball extends LinearOpMode {
 
             @Override
             public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                TELE.addData("Velocity", velo);
+                TELE.addData("Velocity", flywheel.getVelo());
-                TELE.addLine("shooting");
+                TELE.addData("Hood", robot.hood.getPosition());
                 TELE.update();
 
                 flywheel.manageFlywheel(vel);
@@ -218,6 +218,9 @@ public class Auto_LT_12Ball extends LinearOpMode {
                 ticker++;
 
                 robot.intake.setPower(0);
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
 
                 if (getRuntime() - stamp < shootTime) {
 
@@ -261,8 +264,8 @@ public class Auto_LT_12Ball extends LinearOpMode {
 
             @Override
             public boolean run(@NonNull TelemetryPacket telemetryPacket) {
-                TELE.addData("Velocity", velo);
+                TELE.addData("Velocity", flywheel.getVelo());
-                TELE.addLine("shooting");
+                TELE.addData("Hood", robot.hood.getPosition());
                 TELE.update();
 
                 velo = flywheel.getVelo();
@@ -279,6 +282,9 @@ public class Auto_LT_12Ball extends LinearOpMode {
                 ticker++;
 
                 robot.intake.setPower(0);
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
 
                 if (getRuntime() - stamp < shootTime) {
 
@@ -305,7 +311,6 @@ public class Auto_LT_12Ball extends LinearOpMode {
                     return false;
 
                 }
-
             }
         };
     }
@@ -328,6 +333,12 @@ public class Auto_LT_12Ball extends LinearOpMode {
                 motif = turret.detectObelisk();
 
                 spindexer.ballCounterLight();
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
+                TELE.addData("Velocity", flywheel.getVelo());
+                TELE.addData("Hood", robot.hood.getPosition());
+                TELE.update();
 
                 return (System.currentTimeMillis() - stamp) < (intakeTime * 1000);
 
@@ -375,6 +386,12 @@ public class Auto_LT_12Ball extends LinearOpMode {
                 boolean yDone = posYFallback && Math.abs(currentPose.position.y - posY) < posYTolerance;
 
                 boolean shouldFinish = timeDone || xDone || yDone;
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
+                TELE.addData("Velocity", flywheel.getVelo());
+                TELE.addData("Hood", robot.hood.getPosition());
+                TELE.update();
 
                 return !shouldFinish;
 
@@ -421,6 +438,12 @@ public class Auto_LT_12Ball extends LinearOpMode {
                 boolean yDone = posYFallback && Math.abs(currentPose.position.y - posY) < posYTolerance;
 
                 boolean shouldFinish = timeDone || xDone || yDone;
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
+                TELE.addData("Velocity", flywheel.getVelo());
+                TELE.addData("Hood", robot.hood.getPosition());
+                TELE.update();
 
                 return !shouldFinish;
 
@@ -467,7 +490,7 @@ public class Auto_LT_12Ball extends LinearOpMode {
 
                 double dx = robotX - goalX;  // delta x from robot to goal
                 double dy = robotY - goalY;  // delta y from robot to goal
-                Pose2d deltaPose = new Pose2d(dx, dy, robotHeading);
+                Pose deltaPose = new Pose(dx, dy, robotHeading);
 
                 double distanceToGoal = Math.sqrt(dx * dx + dy * dy);
 
@@ -485,6 +508,12 @@ public class Auto_LT_12Ball extends LinearOpMode {
                 boolean yDone = posYFallback && Math.abs(currentPose.position.y - posY) < posYTolerance;
 
                 boolean shouldFinish = timeDone || xDone || yDone;
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
+                TELE.addData("Velocity", flywheel.getVelo());
+                TELE.addData("Hood", robot.hood.getPosition());
+                TELE.update();
 
                 return !shouldFinish;
 
@@ -538,6 +567,7 @@ public class Auto_LT_12Ball extends LinearOpMode {
                 targetingSettings = targeting.calculateSettings
                         (robotX, robotY, robotHeading, 0.0, false);
 
+
                 robot.hood.setPosition(targetingSettings.hoodAngle);
 
                 flywheel.manageFlywheel(targetingSettings.flywheelRPM);
@@ -547,6 +577,12 @@ public class Auto_LT_12Ball extends LinearOpMode {
                 boolean yDone = posYFallback && Math.abs(currentPose.position.y - posY) < posYTolerance;
 
                 boolean shouldFinish = timeDone || xDone || yDone;
+                drive.updatePoseEstimate();
+
+                teleStart = drive.localizer.getPose();
+                TELE.addData("Velocity", flywheel.getVelo());
+                TELE.addData("Hood", robot.hood.getPosition());
+                TELE.update();
 
                 return !shouldFinish;
 
@@ -557,8 +593,6 @@ public class Auto_LT_12Ball extends LinearOpMode {
     @Override
     public void runOpMode() throws InterruptedException {
 
-        hardwareMap.get(Servo.class, "light").setPosition(0);
-
         robot = new Robot(hardwareMap);
 
         TELE = new MultipleTelemetry(
@@ -578,25 +612,24 @@ public class Auto_LT_12Ball extends LinearOpMode {
 
         turret = new Turret(robot, TELE, robot.limelight);
 
-        turret.manualSetTurret(0.4);
+        turret.setTurret(0.4);
 
         drive = new MecanumDrive(hardwareMap, new Pose2d(0, 0, 0));
 
-        TrajectoryActionBuilder shoot0 = null;
+        robot.spin1.setPosition(autoSpinStartPos);
+        robot.spin2.setPosition(1 - autoSpinStartPos);
 
+        robot.transferServo.setPosition(transferServo_out);
+
+        TrajectoryActionBuilder shoot0 = null;
         TrajectoryActionBuilder pickup1 = null;
         TrajectoryActionBuilder shoot1 = null;
         TrajectoryActionBuilder pickup2 = null;
         TrajectoryActionBuilder shoot2 = null;
         TrajectoryActionBuilder pickup3 = null;
         TrajectoryActionBuilder shoot3 = null;
-        TrajectoryActionBuilder openGate = null;
-        TrajectoryActionBuilder park = null;
 
-        robot.spin1.setPosition(autoSpinStartPos);
+        robot.limelight.start();
-        robot.spin2.setPosition(1 - autoSpinStartPos);
-
-        robot.transferServo.setPosition(transferServo_out);
 
         robot.light.setPosition(1);
 
@@ -611,72 +644,73 @@ public class Auto_LT_12Ball extends LinearOpMode {
             if (redAlliance) {
                 robot.light.setPosition(0.28);
 
-                // ===== FIRST SHOT =====
+                // ---- FIRST SHOT ----
                 x1 = rx1;
                 y1 = ry1;
                 h1 = rh1;
 
-                // ===== PICKUP PATH =====
+                // ---- PICKUP PATH ----
                 x2a = rx2a;
                 y2a = ry2a;
                 h2a = rh2a;
-                t2a = rt2a;
-
                 x2b = rx2b;
                 y2b = ry2b;
                 h2b = rh2b;
-                t2b = rt2b;
+                x3a = rx3a;
-
+                y3a = ry3a;
-                x2c = rx2c;
+                h3a = rh3a;
-                y2c = ry2c;
+                x3b = rx3b;
-                h2c = rh2c;
+                y3b = ry3b;
-                t2c = rt2c;
+                h3b = rh3b;
-
+                x4a = rx4a;
-                // ===== SHOOT POSE =====
+                y4a = ry4a;
+                h4a = rh4a;
+                x4b = rx4b;
+                y4b = ry4b;
+                h4b = rh4b;
+                xPrep = rxPrep;
+                yPrep = ryPrep;
+                hPrep = rhPrep;
                 xShoot = rShootX;
                 yShoot = rShootY;
                 hShoot = rShootH;
-                shoot1Tangent = rShoot1Tangent;
 
-                // ===== GATE =====
-                xGate = rXGate;
-                yGate = rYGate;
-                hGate = rHGate;
 
             } else {
                 robot.light.setPosition(0.6);
 
-                // ===== FIRST SHOT =====
+                // ---- FIRST SHOT ----
                 x1 = bx1;
                 y1 = by1;
                 h1 = bh1;
 
-                // ===== PICKUP PATH =====
+                // ---- PICKUP PATH ----
                 x2a = bx2a;
                 y2a = by2a;
                 h2a = bh2a;
-                t2a = bt2a;
-
                 x2b = bx2b;
                 y2b = by2b;
                 h2b = bh2b;
-                t2b = bt2b;
+                x3a = bx3a;
+                y3a = by3a;
+                h3a = bh3a;
+                x3b = bx3b;
+                y3b = by3b;
+                h3b = bh3b;
+                x4a = bx4a;
+                y4a = by4a;
+                h4a = bh4a;
+                x4b = bx4b;
+                y4b = by4b;
+                h4b = bh4b;
 
-                x2c = bx2c;
+                xPrep = bxPrep;
-                y2c = by2c;
+                yPrep = byPrep;
-                h2c = bh2c;
+                hPrep = bhPrep;
-                t2c = bt2c;
-
-                // ===== SHOOT POSE =====
                 xShoot = bShootX;
                 yShoot = bShootY;
                 hShoot = bShootH;
-                shoot1Tangent = bShoot1Tangent;
 
-                // ===== GATE =====
-                xGate = bXGate;
-                yGate = bYGate;
-                hGate = bHGate;
             }
 
             shoot0 = drive.actionBuilder(new Pose2d(0, 0, 0))
@@ -687,29 +721,28 @@ public class Auto_LT_12Ball extends LinearOpMode {
                     .strafeToLinearHeading(new Vector2d(x2b, y2b), h2b,
                             new TranslationalVelConstraint(pickup1Speed));
 
-            openGate = drive.actionBuilder(new Pose2d(x2b, y2b, h2b))
+            shoot1 = drive.actionBuilder(new Pose2d(x2b, y2b, h2b))
-                    .setReversed(true)
-                    .splineToConstantHeading(new Vector2d(x3, y3), t3);
-
-            shoot1 = drive.actionBuilder(new Pose2d(x3, y3, h2b))
                     .strafeToLinearHeading(new Vector2d(xShoot, yShoot), hShoot);
 
             pickup2 = drive.actionBuilder(new Pose2d(xShoot, yShoot, hShoot))
+                    .strafeToLinearHeading(new Vector2d(x3a, y3a), h3a)
+                    .strafeToLinearHeading(new Vector2d(x3b, y3b), h3b,
+                            new TranslationalVelConstraint(pickup1Speed));
+
+            shoot2 = drive.actionBuilder(new Pose2d(x3b, y3b, h3b))
+                    .strafeToLinearHeading(new Vector2d(xShoot, yShoot), hShoot);
+
+            pickup3 = drive.actionBuilder(new Pose2d(x1, y1, h1))
                     .strafeToLinearHeading(new Vector2d(x4a, y4a), h4a)
                     .strafeToLinearHeading(new Vector2d(x4b, y4b), h4b,
-                            new TranslationalVelConstraint(pickup2Speed));
+                            new TranslationalVelConstraint(pickup1Speed));
-            shoot2 = drive.actionBuilder(new Pose2d(x4b, y4b, h4b))
+            shoot3 = drive.actionBuilder(new Pose2d(x4b, y4b, h4b))
                     .strafeToLinearHeading(new Vector2d(xShoot, yShoot), hShoot);
 
-            pickup3 = drive.actionBuilder(new Pose2d(xShoot, yShoot, hShoot))
-                    .strafeToLinearHeading(new Vector2d(x5a, y5a), h5a)
-                    .strafeToLinearHeading(new Vector2d(x5b, y5b), h5b,
-                            new TranslationalVelConstraint(pickup3Speed));
-            shoot3 = drive.actionBuilder(new Pose2d(x5b, y5b, h5b))
-                    .strafeToLinearHeading(new Vector2d(xShoot, yShoot), hShoot);
-            park = drive.actionBuilder(new Pose2d(xShoot, yShoot, hShoot))
-                    .strafeToLinearHeading(new Vector2d(xPark, yPark), hPark);
 
+
+            TELE.addData("Red?", redAlliance);
+            TELE.update();
         }
 
         waitForStart();
@@ -742,42 +775,23 @@ public class Auto_LT_12Ball extends LinearOpMode {
                     shootAll((int) shoot0Vel, shoot0Time, shoot0SpinSpeedIncrease)
             );
 
-            //WORKING SHOOT ALL for the preload
-
-            //Pickup first pile
-
             Actions.runBlocking(
-                    new SequentialAction(
+                    new ParallelAction(
-                            new ParallelAction(
+                            pickup1.build(),
-                                    pickup1.build(),
+                            manageFlywheel(
-                                    manageFlywheel(
+                                    shootAllVelocity,
-                                            shootAllVelocity,
+                                    shootAllHood,
-                                            shootAllHood,
+                                    pickup1Time,
-                                            pickup1Time,
+                                    x2b,
-                                            x2b,
+                                    y2b,
-                                            y2b,
+                                    pickup1XTolerance,
-                                            pickup1XTolerance,
+                                    pickup1YTolerance
-                                            pickup1YTolerance
-                                    ),
-                                    intake(intake1Time),
-                                    detectObelisk(
-                                            obelisk1Time,
-                                            x2b,
-                                            y2c,
-                                            obelisk1XTolerance,
-                                            obelisk1YTolerance,
-                                            obeliskTurrPos
-                                    )
                             ),
-                            new ParallelAction(
+                            intake(intake1Time)
-                                    openGate.build() //TODO: Add other managing stuff here
+
-                            )
                     )
-
             );
 
-            motif = turret.detectObelisk(); //Detect Obelisk if not alr
-
             Actions.runBlocking(
                     new ParallelAction(
                             manageFlywheel(
@@ -808,9 +822,99 @@ public class Auto_LT_12Ball extends LinearOpMode {
 
             );
 
-            //Shoot from first pile
+            Actions.runBlocking(
+                    new ParallelAction(
+                            pickup2.build(),
+                            manageShooterAuto(
+                                    normalIntakeTime,
+                                    x2b,
+                                    y2b,
+                                    pickup1XTolerance,
+                                    pickup1YTolerance
+                            ),
+                            intake(normalIntakeTime)
+
+                    )
+            );
+
+            Actions.runBlocking(
+                    new ParallelAction(
+                            manageFlywheelAuto(
+                                    shootCycleTime,
+                                    0.501,
+                                    0.501,
+                                    0.501,
+                                    0.501
+                            ),
+                            shoot2.build(),
+                            prepareShootAll(shootCycleTime)
+                    )
+            );
+
+            Actions.runBlocking(
+                    new ParallelAction(
+                            manageShooterAuto(
+                                    shootAllTime,
+                                    0.501,
+                                    0.501,
+                                    0.501,
+                                    0.501
+                            ),
+                            shootAllAuto(shootAllTime, spindexerSpeedIncrease)
+                    )
+
+            );
+
+            Actions.runBlocking(
+                    new ParallelAction(
+                            pickup3.build(),
+                            manageShooterAuto(
+                                    normalIntakeTime,
+                                    x2b,
+                                    y2b,
+                                    pickup1XTolerance,
+                                    pickup1YTolerance
+                            ),
+                            intake(normalIntakeTime)
+
+                    )
+            );
+
+            Actions.runBlocking(
+                    new ParallelAction(
+                            manageFlywheelAuto(
+                                    shootCycleTime,
+                                    0.501,
+                                    0.501,
+                                    0.501,
+                                    0.501
+                            ),
+                            shoot3.build(),
+                            prepareShootAll(shootCycleTime)
+                    )
+            );
+
+            Actions.runBlocking(
+                    new ParallelAction(
+                            manageShooterAuto(
+                                    shootAllTime,
+                                    0.501,
+                                    0.501,
+                                    0.501,
+                                    0.501
+                            ),
+                            shootAllAuto(shootAllTime, spindexerSpeedIncrease)
+                    )
+
+            );
+
+
+            TELE.addLine("finished");
+            TELE.update();
+
+            sleep(2000);
 
         }
 
     }
-}
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/disabled/ProtoAutoClose_V3.java

@@ -1,49 +1,49 @@
-package org.firstinspires.ftc.teamcode.autonomous;
+package org.firstinspires.ftc.teamcode.autonomous.disabled;
 
 import static org.firstinspires.ftc.teamcode.constants.Color.redAlliance;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bh1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh1;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bh2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bh2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bh3a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh3a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bh3b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh3b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bh4a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh4a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bh4b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bh4b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bx1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx1;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bx2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bx2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bx3a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx3a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bx3b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx3b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bx4a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx4a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.bx4b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.bx4b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.by1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by1;
-import static org.firstinspires.ftc.teamcode.constants.Poses.by2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.by2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.by3a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by3a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.by3b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by3b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.by4a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by4a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.by4b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.by4b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rh1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh1;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rh2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rh2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rh3a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh3a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rh3b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh3b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rh4a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh4a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rh4b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rh4b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rx1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx1;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rx2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rx2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rx3a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx3a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rx3b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx3b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rx4a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx4a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.rx4b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.rx4b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.ry1;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry1;
-import static org.firstinspires.ftc.teamcode.constants.Poses.ry2a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry2a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.ry2b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry2b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.ry3a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry3a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.ry3b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry3b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.ry4a;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry4a;
-import static org.firstinspires.ftc.teamcode.constants.Poses.ry4b;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.ry4b;
-import static org.firstinspires.ftc.teamcode.constants.Poses.teleStart;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStart;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.hoodAuto;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall1;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall2;
@@ -72,6 +72,7 @@ import com.acmerobotics.roadrunner.ftc.Actions;
 import com.qualcomm.hardware.limelightvision.LLResult;
 import com.qualcomm.hardware.limelightvision.LLResultTypes;
 import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 
 import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
@@ -81,7 +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 {

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/Back_Poses.java

@@ -0,0 +1,35 @@
+package org.firstinspires.ftc.teamcode.constants;
+
+import com.acmerobotics.dashboard.config.Config;
+
+@Config
+public class Back_Poses {
+    public static double rLeaveX = 90, rLeaveY = 50, rLeaveH = 50.1;
+    public static double bLeaveX = 90, bLeaveY = -50, bLeaveH = -50;
+
+    public static double rShootX = 100, rShootY = 60, rShootH = 125.2;
+    public static double bShootX = 100, bShootY = -60, bShootH = -125.2;
+
+    public static double rStackPickupFarAX = 75, rStackPickupFarAY = 45, rStackPickupFarAH = 150;
+    public static double bStackPickupFarAX = 75, bStackPickupFarAY = -45, bStackPickupFarAH = -150;
+
+    public static double rStackPickupFarBX = 45, rStackPickupFarBY = 80, rStackPickupFarBH = 145.1;
+    public static double bStackPickupFarBX = 45, bStackPickupFarBY = -80, bStackPickupFarBH = -145.1;
+
+    public static double rStackPickupMiddleAX = 55, rStackPickupMiddleAY = 39, rStackPickupMiddleAH = 145;
+    public static double bStackPickupMiddleAX = 55, bStackPickupMiddleAY = -39, bStackPickupMiddleAH = -145;
+
+    public static double rStackPickupMiddleBX = 45, rStackPickupMiddleBY = 49, rStackPickupMiddleBH = 145.1;
+    public static double bStackPickupMiddleBX = 45, bStackPickupMiddleBY = -49, bStackPickupMiddleBH = -145.1;
+
+    public static double rPickupGateXA = 60, rPickupGateYA = 90, rPickupGateHA = 140;
+    public static double bPickupGateXA = 60, bPickupGateYA = -90, bPickupGateHA = -140;
+    public static double rPickupGateXB = 84, rPickupGateYB = 76, rPickupGateHB = 145;
+    public static double bPickupGateXB = 84, bPickupGateYB = -76, bPickupGateHB = -145;
+    public static double rPickupGateXC = 50, rPickupGateYC = 83, rPickupGateHC = 190;
+    public static double bPickupGateXC = 50, bPickupGateYC = -83, bPickupGateHC = -190;
+
+    public static double autoStartRX = 103, autoStartRY = 63.5, autoStartRH = 54;
+    public static double autoStartBX = 103, autoStartBY = -63.5, autoStartBH = -54;
+
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/Color.java

@@ -1,6 +1,16 @@
 package org.firstinspires.ftc.teamcode.constants;
 
+import com.acmerobotics.dashboard.config.Config;
+
+@Config
 public class Color {
     public static boolean redAlliance = true;
     public static double Light0 = 0.28, Light1 = 0.67, Light2 = 0.36, Light3 = 0.5;
+    public static double LightGreen = 0.5;
+    public static double LightPurple = 0.715;
+    public static double LightOrange = 0.33;
+    public static double LightRed = 0.28;
+    public static double LightBlue = 0.6;
+
+    public static double colorFilterAlpha = 1;
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/Front_Poses.java

@@ -0,0 +1,71 @@
+package org.firstinspires.ftc.teamcode.constants;
+
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.roadrunner.Pose2d;
+
+@Config
+public class Front_Poses {
+
+
+    public static double rx1 = 30, ry1 = 5, rh1 = 0.1;
+    public static double bx1 = 30, by1 = -5, bh1 = -0.1;
+
+    public static double rx2a = 41, ry2a = 18, rh2a = 140;
+    public static double bx2a = 41, by2a = -18, bh2a = -140;
+
+    public static double rx2b = 21, ry2b = 34, rh2b = 140.1;
+    public static double bx2b = 23, by2b = -34, bh2b = -140.1;
+
+    public static double rx3a = 55, ry3a = 39, rh3a = 140;
+    public static double bx3a = 55, by3a = -39, bh3a = -140;
+
+    public static double rx3aG = 60, ry3aG = 34, rh3aG = 140;
+    public static double bx3aG = 60, by3aG = -34, bh3aG = -140;
+
+    public static double rx3b = 36, ry3b = 58, rh3b = 140.1;
+    public static double bx3b = 36, by3b = -58, bh3b = -140.1;
+
+    public static double rx4a = 75, ry4a = 53, rh4a = 140;
+    public static double bx4a = 75, by4a = -53, bh4a = -140;
+
+    public static double rx4b = 50, ry4b = 78, rh4b = 140.1;
+    public static double bx4b = 50, by4b = -78, bh4b = -140.1;
+
+    public static double rfx1 = 10, rfy1 = 0, rfh1 = 0;
+
+    public static double rShootX = 60, rShootY = 10, rShootH = 50;
+    public static double bShootX = 60, bShootY = -10, bShootH = -50;
+
+    public static double rxPrep = 45, ryPrep = 10, rhPrep = 50;
+    public static double bxPrep = 45, byPrep = -10, bhPrep = -50;
+
+    public static double rLeaveX = 40, rLeaveY = -7, rLeaveH = 55;
+    public static double bLeaveX = 40, bLeaveY = 7, bLeaveH = -55;
+
+    public static double rShoot0X = 53, rShoot0Y = 10.1, rShoot0H = 80.1;
+    public static double bShoot0X = 53, bShoot0Y = -10.1, bShoot0H = -80.1;
+
+    public static double rShootGateX = 50, rShootGateY = 10, rShootGateH = 90;
+    public static double bShootGateX = 50, bShootGateY = -10, bShootGateH = -90;
+
+    public static double rLeaveGateX = 40, rLeaveGateY = -7, rLeaveGateH = 55;
+    public static double bLeaveGateX = 40, bLeaveGateY = 7, bLeaveGateH = -55;
+
+    public static double rPickupGateAX = 31, rPickupGateAY = 53, rPickupGateAH = 150;
+    public static double bPickupGateAX = 24, bPickupGateAY = -50, bPickupGateAH = -150;
+
+    public static double rPickupGateBX = 38, rPickupGateBY = 62, rPickupGateBH = 210;
+    public static double bPickupGateBX = 38, bPickupGateBY = -68, bPickupGateBH = -180;
+    public static double pickupGateCX = 34, pickupGateCY = 58, pickupGateCH = 220;
+
+    public static double rOpenGateCloseX = 20, rOpenGateCloseY = 35, rOpenGateCloseH = 230;
+    public static double bOpenGateCloseX = 20, bOpenGateCloseY = -35, bOpenGateCloseH = -230;
+
+    public static double rOpenGateMiddleX = 36, rOpenGateMiddleY = 59, rOpenGateMiddleH = 50;
+    public static double bOpenGateMiddleX = 36, bOpenGateMiddleY = -59, bOpenGateMiddleH = -50;
+
+    public static Pose2d teleStart = new Pose2d(0, 0, 0);
+
+    //For PedroPathing TODO: figure out how to change start poses in auto
+    public static double teleStartPoseX = 72, teleStartPoseY = 72, teleStartPoseH = 0;
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/Poses.java

@@ -1,43 +0,0 @@
-package org.firstinspires.ftc.teamcode.constants;
-
-import com.acmerobotics.dashboard.config.Config;
-import com.acmerobotics.roadrunner.Pose2d;
-
-@Config
-public class Poses {
-
-    public static double goalHeight = 42; //in inches
-
-    public static double turretHeight = 12;
-
-    public static double relativeGoalHeight = goalHeight - turretHeight;
-
-    public static Pose2d goalPose = new Pose2d(-10, 0, 0);
-
-    public static double rx1 = 40, ry1 = -7, rh1 = 0;
-    public static double rx2a = 41, ry2a = 18, rh2a = Math.toRadians(140);
-    public static double rx2b = 23, ry2b = 36, rh2b = Math.toRadians(140);
-
-    public static double rx2c = 34, ry2c = 50, rh2c = Math.toRadians(140);
-
-    public static double rx3a = 55, ry3a = 39, rh3a = Math.toRadians(140);
-    public static double rx3b = 33, ry3b = 61, rh3b = Math.toRadians(140);
-
-    public static double rx4a = 72, ry4a = 55, rh4a = Math.toRadians(140);
-    public static double rx4b = 48, ry4b = 79, rh4b = Math.toRadians(140);
-
-    public static double bx1 = 40, by1 = 7, bh1 = 0;
-    public static double bx2a = 45, by2a = -18, bh2a = Math.toRadians(-140);
-    public static double bx2b = 25, by2b = -38, bh2b = Math.toRadians(-140);
-    public static double bx2c = 34, by2c = -50, bh2c = Math.toRadians(-140);
-
-    public static double bx3a = 55, by3a = -43, bh3a = Math.toRadians(-140);
-    public static double bx3b = 37, by3b = -61, bh3b = Math.toRadians(-140);
-
-    public static double bx4a = 72, by4a = -55, bh4a = Math.toRadians(-140);
-    public static double bx4b = 48, by4b = -79, bh4b = Math.toRadians(-140);
-    public static double rfx1 = 10, rfy1 = 0, rfh1 = 0; //TODO: test this
-
-    public static Pose2d teleStart = new Pose2d(0, 0, 0);
-
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/Poses_LT_Indexed.java

@@ -1,86 +0,0 @@
-package org.firstinspires.ftc.teamcode.constants;
-
-import com.acmerobotics.dashboard.config.Config;
-import com.acmerobotics.roadrunner.Pose2d;
-
-@Config
-public class Poses_LT_Indexed {
-
-    // ================= FIELD / GOAL =================
-    public static double goalHeight = 42; // inches
-    public static double turretHeight = 12;
-    public static double relativeGoalHeight = goalHeight - turretHeight;
-
-    public static Pose2d goalPose = new Pose2d(-10, 0, 0);
-    public static Pose2d teleStart = new Pose2d(0, 0, 0);
-
-    // =================================================
-    // ================= RED ALLIANCE ==================
-    // =================================================
-
-    // -------- FIRST SHOT --------
-    public static double rx1 = 20, ry1 = 0, rh1 = 0;
-
-    // -------- PICKUP 1 --------
-    public static double rx2a = 55, ry2a = 39, rh2a = Math.toRadians(140), rt2a = Math.toRadians(Math.PI / 2);
-    public static double rx2b = 33, ry2b = 61, rh2b = Math.toRadians(140), rt2b = Math.toRadians(Math.PI / 2);
-    public static double rx2c = 34, ry2c = 50, rh2c = Math.toRadians(140), rt2c = Math.toRadians(Math.PI / 2);
-
-    // -------- OPEN GATE --------
-    public static double rXGate = 30, rYGate = 63, rHGate = Math.toRadians(179);
-
-    // -------- PICKUP 2 --------
-    public static double rx3 = 0, ry3 = 0, rh3 = 0, rt3 = 0;
-
-    public static double rx3a = 55, ry3a = 39, rh3a = Math.toRadians(140);
-    public static double rx3b = 33, ry3b = 61, rh3b = Math.toRadians(140);
-
-    // -------- PICKUP 3 --------
-    public static double rx4a = 72, ry4a = 55, rh4a = Math.toRadians(140);
-    public static double rx4b = 48, ry4b = 79, rh4b = Math.toRadians(140);
-
-    public static double rx5a = 0, ry5a = 0, rh5a = 0;
-    public static double rx5b = 0, ry5b = 0, rh5b = 0;
-
-    // -------- SHOOT --------
-    public static double rShootX = 40, rShootY = 7, rShootH = Math.toRadians(140);
-    public static double rShoot1Tangent = Math.toRadians(0);
-
-    // -------- PARK --------
-    public static double rXPark = 0, rYPark = 0, rHPark = 0;
-
-    // =================================================
-    // ================= BLUE ALLIANCE =================
-    // =================================================
-
-    // -------- FIRST SHOT --------
-    public static double bx1 = 20, by1 = 0, bh1 = 0;
-
-    // -------- PICKUP 1 --------
-    public static double bx2a = 45, by2a = -18, bh2a = Math.toRadians(-140), bt2a = Math.toRadians(140);
-    public static double bx2b = 25, by2b = -38, bh2b = Math.toRadians(-140), bt2b = Math.toRadians(140);
-    public static double bx2c = 34, by2c = -50, bh2c = Math.toRadians(-140), bt2c = Math.toRadians(140);
-
-    // -------- OPEN GATE --------
-    public static double bXGate = 25, bYGate = 69, bHGate = Math.toRadians(165);
-
-    // -------- PICKUP 2 --------
-    public static double bx3 = 0, by3 = 0, bh3 = 0, bt3 = 0;
-
-    public static double bx3a = 55, by3a = -43, bh3a = Math.toRadians(-140);
-    public static double bx3b = 37, by3b = -61, bh3b = Math.toRadians(-140);
-
-    // -------- PICKUP 3 --------
-    public static double bx4a = 72, by4a = -55, bh4a = Math.toRadians(-140);
-    public static double bx4b = 48, by4b = -79, bh4b = Math.toRadians(-140);
-
-    public static double bx5a = 0, by5a = 0, bh5a = 0;
-    public static double bx5b = 0, by5b = 0, bh5b = 0;
-
-    // -------- SHOOT --------
-    public static double bShootX = 20, bShootY = 30, bShootH = Math.toRadians(140);
-    public static double bShoot1Tangent = Math.toRadians(0);
-
-    // -------- PARK --------
-    public static double bXPark = 0, bYPark = 0, bHPark = 0;
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/Poses_V2.java

@@ -1,56 +1,21 @@
 package org.firstinspires.ftc.teamcode.constants;
 
 import com.acmerobotics.dashboard.config.Config;
-import com.acmerobotics.roadrunner.Pose2d;
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
 
+@Disabled
 @Config
 public class Poses_V2 {
 
-    public static double goalHeight = 42; //in inches
+    public static double rXGateA = 35.5, rYGateA = 46.5, rHGateA = 2.7;
 
-    public static double turretHeight = 12;
+    public static double rXGateB = 56, rYGateB = 37, rHGateB = 2.7750735106709836;
 
-    public static double relativeGoalHeight = goalHeight - turretHeight;
+    public static double rXGate = 28, rYGate = 65, rHGate = Math.toRadians(179);
 
-    public static Pose2d goalPose = new Pose2d(-10, 0, 0);
+    public static double bXGateA = 35.5, bYGateA = -46.5, bHGateA = -2.7;
+    public static double bXGateB = 56, bYGateB = -37, bHGateB = -2.7750735106709836;
 
-    public static double rx1 = 20, ry1 = 0, rh1 = 0;
+    public static double bXGate = 28, bYGate = -65, bHGate = Math.toRadians(-179);
-    public static double rx2a = 55, ry2a = 39, rh2a = Math.toRadians(140), rt2a  = Math.toRadians(Math.PI/2);
-    public static double rx2b = 33, ry2b = 61, rh2b = Math.toRadians(140), rt2b  = Math.toRadians(Math.PI/2);
-
-    public static double rx2c = 34, ry2c = 50, rh2c = Math.toRadians(140), rt2c  = Math.toRadians(Math.PI/2);
-
-    public static double rXGate = 30, rYGate = 63, rHGate = Math.toRadians(179);
-
-    public static double rx3a = 55, ry3a = 39, rh3a = Math.toRadians(140);
-    public static double rx3b = 33, ry3b = 61, rh3b = Math.toRadians(140);
-
-    public static double rx4a = 72, ry4a = 55, rh4a = Math.toRadians(140);
-    public static double rx4b = 48, ry4b = 79, rh4b = Math.toRadians(140);
-
-    public static double bx1 = 20, by1 = 0, bh1 = 0;
-    public static double bx2a = 45, by2a = -18, bh2a = Math.toRadians(-140), bt2a  = Math.toRadians(140);
-    public static double bx2b = 25, by2b = -38, bh2b = Math.toRadians(-140), bt2b  = Math.toRadians(140);
-    public static double bx2c = 34, by2c = -50, bh2c = Math.toRadians(-140), bt2c  = Math.toRadians(140);
-
-    public static double rShootX = 40, rShootY = 7, rShootH = Math.toRadians(140);
-
-    public static double bShootX = 20, bShootY = 30, bShootH = Math.toRadians(140);
-    public static double bXGate = 25, bYGate = 69, bHGate = Math.toRadians(165);
-
-
-    public static double bx3a = 55, by3a = -43, bh3a = Math.toRadians(-140);
-    public static double bx3b = 37, by3b = -61, bh3b = Math.toRadians(-140);
-
-    public static double bx4a = 72, by4a = -55, bh4a = Math.toRadians(-140);
-    public static double bx4b = 48, by4b = -79, bh4b = Math.toRadians(-140);
-    public static double rfx1 = 10, rfy1 = 0, rfh1 = 0; //TODO: test this
-
-    public static double rShoot1Tangent = Math.toRadians(0);
-    public static double bShoot1Tangent = Math.toRadians(0);
-
-
-
-    public static Pose2d teleStart = new Pose2d(0, 0, 0);
 
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/ServoPositions.java

@@ -5,47 +5,62 @@ import com.acmerobotics.dashboard.config.Config;
 @Config
 public class ServoPositions {
 
-    public static double spindexer_intakePos1 = 0;
+    public static double rapidFireBlocker_Closed = 0.35;
+    public static double rapidFireBlocker_Open = 0.5;
 
-    public static double spindexer_intakePos2 = 0.19;//0.5;
+    public static double spindexBlocker_Closed = 0.31;
+    public static double spindexBlocker_Open = 0.5;
 
-    public static double spindexer_intakePos3 = 0.38;//0.66;
+    public static double spindexer_A1 = 0.16;
-
+    public static double spindexer_A2 = 0.35;
-    public static double spindexer_outtakeBall3 = 0.65;
+    public static double spindexer_A3 = 0.54;
-
+    public static double spindexer_B1 = 0.73;
-    public static double spindexer_outtakeBall2 = 0.46;
+    public static double spindexer_B2 = 0.92;
-    public static double spindexer_outtakeBall1 = 0.27;
-    public static double spinStartPos = spindexer_outtakeBall1 - 0.08;
 
 
-    public static double transferServo_out = 0.15;
+    public static double spindexer_intakePos1 = 0.18; //0.13;
 
-    public static double transferServo_in = 0.38;
+    public static double spindexer_intakePos2 = 0.37; //0.33;//0.5;
 
-    public static double turret_range = 0.9;
+    public static double spindexer_intakePos3 = 0.55; //0.53;//0.66;
 
-    public static double hoodDefault = 0.6;
+    public static double spindexer_outtakeBall3 = 0.83; //0.65; //0.24;
+    public static double spindexer_outtakeBall3b = 0.27; //0.65; //0.24;
+
+    public static double spindexer_outtakeBall2 = 0.65; //0.46; //0.6;
+    public static double spindexer_outtakeBall1 = 0.46; //0.27; //0.4;
+    public static double spinStartPos = 0;
+    public static double spinEndPos = 0.6;
+
+    public static double shootAllSpindexerSpeedIncrease = 0.01;
+
+    public static double transferServo_out = 0.57;
+
+    public static double transferServo_in = 0.77;
 
     public static double hoodAuto = 0.27;
 
-    public static double hoodAutoFar = 0.5; //TODO: change this;
+    public static double hoodOffset = 0; // offset from 0.93 (or position at 0,0 in targeting class)
 
-    public static double hoodHigh = 0.21; //TODO: change this;
+    public static double turret_redClose = 0;
+    public static double turret_blueClose = 0;
 
-    public static double hoodLow = 1.0; //TODO: change this;
+    // These values are ADDED to turrDefault
+    public static double redObeliskTurrPos0 = -0.35;
+    public static double redObeliskTurrPos1 = 0.15;
+    public static double redObeliskTurrPos2 = 0.16;
+    public static double redObeliskTurrPos3 = 0.17;
+    public static double blueObeliskTurrPos0 = 0.35;
+    public static double blueObeliskTurrPos1 = -0.15;
+    public static double blueObeliskTurrPos2 = -0.16;
+    public static double blueObeliskTurrPos3 = -0.17;
+    public static double redTurretShootPos = 0.05;
+    public static double blueTurretShootPos = -0.05;
 
-    public static double turret_redClose = 0.42;
+    public static double tilt1_down = 0.6;
-    public static double turret_blueClose = 0.38;
+    public static double tilt2_down = 0.4;
-    public static double turret_redFar = 0.5; //TODO: change this
+    public static double tilt1_up = 0.08;
-    public static double turret_blueFar = 0.5; // TODO: change this
+    public static double tilt2_up = 0.97;
-
-    public static double turret_detectRedClose = 0.2;
-
-    public static double turret_detectBlueClose = 0.6;
-    public static double turrDefault = 0.4;
-
-    public static double turrMin = 0.2;
-    public static double turrMax = 0.8;
 
 
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/ShooterVars.java

@@ -1,26 +1,13 @@
 package org.firstinspires.ftc.teamcode.constants;
 
 import com.acmerobotics.dashboard.config.Config;
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
 
+@Disabled
 @Config
 public class ShooterVars {
-    public static double turret_GearRatio = 0.9974;
-
-    public static double turret_Range = 355;
-
-    public static int velTolerance = 300;
-
-    public static int initTolerance = 1000;
-
-    public static int maxVel = 4500;
-    public static double waitTransferOut = 0.3;
-    public static double waitTransfer = 0.4;
-    public static double kP = 0.001;           // small proportional gain (tune this)
-    public static double maxStep = 0.06;         // prevents sudden jumps
 
     // VELOCITY CONSTANTS
     public static int AUTO_CLOSE_VEL = 3175; //3300;
-    public static int AUTO_FAR_VEL = 4000; //TODO: test this
 
-    public static Types.Motif currentMotif = Types.Motif.NONE;
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/StateEnums.java

@@ -1,10 +1,19 @@
 package org.firstinspires.ftc.teamcode.constants;
 
-public class Types {
+public class StateEnums {
     public enum Motif {
         NONE,
         GPP,  // Green, Purple, Purple
         PGP,  // Purple, Green, Purple
         PPG   // Purple, Purple, Green
     }
+
+    public enum LightState {
+        BALL_COUNT,
+        BALL_COLOR,
+        GOAL_LOCK,
+        MANUAL,
+        DISABLED,
+        OFF
+    }
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/disabled/blank.java

@@ -1,4 +0,0 @@
-package org.firstinspires.ftc.teamcode.disabled;
-
-public class blank {
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/libs/RR/MecanumDrive.java

@@ -192,27 +192,27 @@ public final class MecanumDrive {
 
         // drive model parameters
         public double inPerTick = 0.001978956;
-        public double lateralInPerTick = 0.0013863732202094405;
+        public double lateralInPerTick = 0.001367789463080072;
-        public double trackWidthTicks = 6488.883015684446;
+        public double trackWidthTicks = 6913.070212622687;
 
         // feedforward parameters (in tick units)
-        public double kS = 1.2147826978829488;
+        public double kS = 1.23;
-        public double kV = 0.00032;
+        public double kV = 0.00035;
-        public double kA = 0.000046;
+        public double kA = 0.00008;
 
         // path profile parameters (in inches)
-        public double maxWheelVel = 250;
+        public double maxWheelVel = 70;
         public double minProfileAccel = -40;
-        public double maxProfileAccel = 250;
+        public double maxProfileAccel = 70;
 
         // turn profile parameters (in radians)
-        public double maxAngVel = 4 * Math.PI; // shared with path
+        public double maxAngVel = 2 *Math.PI; // shared with path
-        public double maxAngAccel = 4 * Math.PI;
+        public double maxAngAccel = 2 * Math.PI;
 
         // path controller gains
-        public double axialGain = 4;
+        public double axialGain = 6.0;
-        public double lateralGain = 4;
+        public double lateralGain = 6.0;
-        public double headingGain = 4; // shared with turn
+        public double headingGain = 6.0; // shared with turn
 
         public double axialVelGain = 0.0;
         public double lateralVelGain = 0.0;
@@ -345,7 +345,16 @@ public final class MecanumDrive {
                 t = Actions.now() - beginTs;
             }
 
-            if (t >= timeTrajectory.duration) {
+            Pose2dDual<Time> txWorldTarget = timeTrajectory.get(t);
+            targetPoseWriter.write(new PoseMessage(txWorldTarget.value()));
+
+            PoseVelocity2d robotVelRobot = updatePoseEstimate();
+
+            Pose2d error = txWorldTarget.value().minusExp(localizer.getPose());
+
+            if ((t >= timeTrajectory.duration && error.position.norm() < 1
+                    && robotVelRobot.linearVel.norm() < 0.5)
+                    || t >= timeTrajectory.duration + 0.01) {
                 leftFront.setPower(0);
                 leftBack.setPower(0);
                 rightBack.setPower(0);
@@ -354,10 +363,6 @@ public final class MecanumDrive {
                 return false;
             }
 
-            Pose2dDual<Time> txWorldTarget = timeTrajectory.get(t);
-            targetPoseWriter.write(new PoseMessage(txWorldTarget.value()));
-
-            PoseVelocity2d robotVelRobot = updatePoseEstimate();
 
             PoseVelocity2dDual<Time> command = new HolonomicController(
                     PARAMS.axialGain, PARAMS.lateralGain, PARAMS.headingGain,
@@ -388,7 +393,6 @@ public final class MecanumDrive {
             p.put("y", localizer.getPose().position.y);
             p.put("heading (deg)", Math.toDegrees(localizer.getPose().heading.toDouble()));
 
-            Pose2d error = txWorldTarget.value().minusExp(localizer.getPose());
             p.put("xError", error.position.x);
             p.put("yError", error.position.y);
             p.put("headingError (deg)", Math.toDegrees(error.heading.toDouble()));

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/libs/RR/PinpointLocalizer.java

@@ -16,10 +16,11 @@ import java.util.Objects;
 @Config
 public final class PinpointLocalizer implements Localizer {
     public static class Params {
-        public double parYTicks = -3765.023079161767; // y position of the parallel encoder (in tick units)
+        public double parYTicks = -3758.6603115671537; // y position of the parallel encoder (in tick units)
-        public double perpXTicks = -1962.6377639490684; // x position of the perpendicular encoder (in tick units)
+        public double perpXTicks = -2088.4296466563774; // x position of the perpendicular encoder (in tick units)
     }
 
+
     public static Params PARAMS = new Params();
 
     public final GoBildaPinpointDriver driver;
@@ -48,6 +49,8 @@ public final class PinpointLocalizer implements Localizer {
         txWorldPinpoint = initialPose;
     }
 
+
+
     @Override
     public void setPose(Pose2d pose) {
         txWorldPinpoint = pose.times(txPinpointRobot.inverse());

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/libs/pedroPathing/Constants.java

@@ -1,19 +0,0 @@
-package org.firstinspires.ftc.teamcode.libs.pedroPathing;
-
-import com.pedropathing.follower.Follower;
-import com.pedropathing.follower.FollowerConstants;
-import com.pedropathing.ftc.FollowerBuilder;
-import com.pedropathing.paths.PathConstraints;
-import com.qualcomm.robotcore.hardware.HardwareMap;
-
-public class Constants {
-    public static FollowerConstants followerConstants = new FollowerConstants();
-
-    public static PathConstraints pathConstraints = new PathConstraints(0.99, 100, 1, 1);
-
-    public static Follower createFollower(HardwareMap hardwareMap) {
-        return new FollowerBuilder(followerConstants, hardwareMap)
-                .pathConstraints(pathConstraints)
-                .build();
-    }
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/Constants.java

@@ -0,0 +1,60 @@
+package org.firstinspires.ftc.teamcode.pedroPathing;
+
+import com.acmerobotics.dashboard.config.Config;
+import com.pedropathing.control.FilteredPIDFCoefficients;
+import com.pedropathing.control.PIDFCoefficients;
+import com.pedropathing.follower.Follower;
+import com.pedropathing.follower.FollowerConstants;
+import com.pedropathing.ftc.FollowerBuilder;
+import com.pedropathing.ftc.drivetrains.MecanumConstants;
+import com.pedropathing.ftc.localization.constants.PinpointConstants;
+import com.pedropathing.paths.PathConstraints;
+import com.qualcomm.hardware.gobilda.GoBildaPinpointDriver;
+import com.qualcomm.robotcore.hardware.DcMotorSimple;
+import com.qualcomm.robotcore.hardware.HardwareMap;
+
+import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
+@Config
+public class Constants {
+    public static FollowerConstants followerConstants = new FollowerConstants()
+            .mass(14.37888)
+            .forwardZeroPowerAcceleration(-30.322)
+            .lateralZeroPowerAcceleration(-60.876)
+            .translationalPIDFCoefficients(new PIDFCoefficients(0.15, 0, 0.015, 0.02))
+            .headingPIDFCoefficients(new PIDFCoefficients(1, 0, 0.02, 0.02))
+            .drivePIDFCoefficients(new FilteredPIDFCoefficients(0.02, 0, 0.00001, 0.6, 0.015))
+            .centripetalScaling(0.0005);
+
+    public static MecanumConstants driveConstants = new MecanumConstants()
+            .maxPower(1)
+            .rightFrontMotorName("fr")
+            .rightRearMotorName("br")
+            .leftRearMotorName("bl")
+            .leftFrontMotorName("fl")
+            .leftFrontMotorDirection(DcMotorSimple.Direction.REVERSE)
+            .leftRearMotorDirection(DcMotorSimple.Direction.REVERSE)
+            .rightFrontMotorDirection(DcMotorSimple.Direction.FORWARD)
+            .rightRearMotorDirection(DcMotorSimple.Direction.FORWARD)
+            .xVelocity(84.376)
+            .yVelocity(64.052);
+
+    public static double breakingStrength = 1;
+    public static PathConstraints pathConstraints = new PathConstraints(0.99, 100, breakingStrength, 1);
+
+    public static PinpointConstants localizerConstants = new PinpointConstants()
+            .forwardPodY(3.7795)
+            .strafePodX(-3.676)
+            .distanceUnit(DistanceUnit.INCH)
+            .hardwareMapName("pinpoint")
+            .encoderResolution(GoBildaPinpointDriver.GoBildaOdometryPods.goBILDA_4_BAR_POD)
+            .forwardEncoderDirection(GoBildaPinpointDriver.EncoderDirection.REVERSED)
+            .strafeEncoderDirection(GoBildaPinpointDriver.EncoderDirection.FORWARD);
+
+    public static Follower createFollower(HardwareMap hardwareMap) {
+        return new FollowerBuilder(followerConstants, hardwareMap)
+                .pathConstraints(pathConstraints)
+                .mecanumDrivetrain(driveConstants)
+                .pinpointLocalizer(localizerConstants)
+                .build();
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV2.java

@@ -1,896 +0,0 @@
-package org.firstinspires.ftc.teamcode.teleop;
-
-import static org.firstinspires.ftc.teamcode.constants.Poses.*;
-import static org.firstinspires.ftc.teamcode.constants.ServoPositions.*;
-import static org.firstinspires.ftc.teamcode.constants.ShooterVars.*;
-import static org.firstinspires.ftc.teamcode.tests.PIDServoTest.*;
-
-import com.acmerobotics.dashboard.FtcDashboard;
-import com.acmerobotics.dashboard.config.Config;
-import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
-import com.acmerobotics.roadrunner.Pose2d;
-import com.qualcomm.hardware.lynx.LynxModule;
-import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
-import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
-
-import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
-import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
-import org.firstinspires.ftc.teamcode.utils.AprilTagWebcam;
-import org.firstinspires.ftc.teamcode.utils.Flywheel;
-import org.firstinspires.ftc.teamcode.utils.Robot;
-import org.firstinspires.ftc.teamcode.utils.Servos;
-import org.firstinspires.ftc.vision.apriltag.AprilTagDetection;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@TeleOp
-@Config
-public class TeleopV2 extends LinearOpMode {
-    Servos servo;
-    Flywheel flywheel;
-    public static double manualVel = 3000;
-    public static double hood = 0.5;
-    public static double hoodDefaultPos = 0.5;
-    public static double desiredTurretAngle = 180;
-    public static double velMultiplier = 20;
-    public static double shootStamp2 = 0.0;
-
-    public double vel = 3000;
-    public boolean autoVel = true;
-    public double manualOffset = 0.0;
-    public boolean autoHood = true;
-    public boolean green1 = false;
-    public boolean green2 = false;
-    public boolean green3 = false;
-    public double shootStamp = 0.0;
-    public boolean circle = false;
-    public boolean square = false;
-    public boolean triangle = false;
-    double autoHoodOffset = 0.0;
-    Robot robot;
-    MultipleTelemetry TELE;
-    boolean intake = false;
-    boolean reject = false;
-    double xOffset = 0.0;
-    double yOffset = 0.0;
-    double headingOffset = 0.0;
-    int ticker = 0;
-    int camTicker = 0;
-    List<Double> s1G = new ArrayList<>();
-    List<Double> s2G = new ArrayList<>();
-    List<Double> s3G = new ArrayList<>();
-    List<Double> s1T = new ArrayList<>();
-    List<Double> s2T = new ArrayList<>();
-    List<Double> s3T = new ArrayList<>();
-    List<Boolean> s1 = new ArrayList<>();
-    List<Boolean> s2 = new ArrayList<>();
-    List<Boolean> s3 = new ArrayList<>();
-    boolean oddBallColor = false;
-    AprilTagWebcam aprilTagWebcam = new AprilTagWebcam();
-    MecanumDrive drive;
-    double hoodOffset = 0.0;
-    boolean shoot1 = false;
-    // Make these class-level flags
-    boolean shootA = true;
-    boolean shootB = true;
-    boolean shootC = true;
-    boolean manualTurret = false;
-
-    boolean outtake1 = false;
-    boolean outtake2 = false;
-    boolean outtake3 = false;
-    boolean overrideTurr = false;
-
-    List<Integer> shootOrder = new ArrayList<>();
-    boolean emergency = false;
-    private double lastEncoderRevolutions = 0.0;
-    private double lastTimeStamp = 0.0;
-    private double velo1, velo;
-    private double stamp1, stamp, initPos;
-    private boolean shootAll = false;
-    private double transferStamp = 0.0;
-    private int tickerA = 1;
-    private boolean transferIn = false;
-    double turretPID = 0.0;
-    double turretPos = 0.5;
-    double spindexPID = 0.0;
-    double spindexPos = spindexer_intakePos1;
-    double error = 0.0;
-
-    public static double velPrediction(double distance) {
-
-        if (distance < 30) {
-            return 2750;
-        } else if (distance > 100) {
-            if (distance > 160) {
-                return 4200;
-            }
-            return 3700;
-        } else {
-            // linear interpolation between 40->2650 and 120->3600
-            double slope = (3700.0 - 2750.0) / (100.0 - 30);
-            return (int) Math.round(2750 + slope * (distance - 30));
-        }
-
-    }
-
-    @Override
-    public void runOpMode() throws InterruptedException {
-
-        List<LynxModule> allHubs = hardwareMap.getAll(LynxModule.class);
-
-        for (LynxModule hub : allHubs) {
-            hub.setBulkCachingMode(LynxModule.BulkCachingMode.MANUAL);
-        }
-
-        robot = new Robot(hardwareMap);
-        TELE = new MultipleTelemetry(
-                telemetry, FtcDashboard.getInstance().getTelemetry()
-        );
-        servo = new Servos(hardwareMap);
-        flywheel = new Flywheel(hardwareMap);
-
-        drive = new MecanumDrive(hardwareMap, teleStart);
-
-        Pose2d shootPos = teleStart;
-
-        aprilTagWebcam.init(new Robot(hardwareMap), TELE);
-
-        waitForStart();
-        if (isStopRequested()) return;
-        while (opModeIsActive()) {
-
-            //DRIVETRAIN:
-
-            double y = -gamepad1.right_stick_y; // Remember, Y stick value is reversed
-            double x = gamepad1.right_stick_x * 1.1; // Counteract imperfect strafing
-            double rx = gamepad1.left_stick_x;
-
-            double denominator = Math.max(Math.abs(y) + Math.abs(x) + Math.abs(rx), 1);
-            double frontLeftPower = (y + x + rx) / denominator;
-            double backLeftPower = (y - x + rx) / denominator;
-            double frontRightPower = (y - x - rx) / denominator;
-            double backRightPower = (y + x - rx) / denominator;
-
-            robot.frontLeft.setPower(frontLeftPower);
-            robot.backLeft.setPower(backLeftPower);
-            robot.frontRight.setPower(frontRightPower);
-            robot.backRight.setPower(backRightPower);
-
-
-            //TODO: make sure changing position works throughout opmode
-            if (!servo.spinEqual(spindexPos)){
-                spindexPID = servo.setSpinPos(spindexPos);
-                robot.spin1.setPosition(spindexPID);
-                robot.spin2.setPosition(-spindexPID);
-            } else{
-                robot.spin1.setPosition(0);
-                robot.spin2.setPosition(0);
-            }
-
-            //INTAKE:
-
-            if (gamepad1.rightBumperWasPressed()) {
-                intake = !intake;
-                reject = false;
-                shootAll = false;
-                emergency = false;
-                overrideTurr = false;
-
-            }
-
-            if (gamepad1.leftBumperWasPressed()) {
-                intake = false;
-                emergency = !emergency;
-
-            }
-
-            if (intake) {
-
-                robot.transferServo.setPosition(transferServo_out);
-
-                robot.intake.setPower(1);
-
-                if ((getRuntime() % 0.3) > 0.15) {
-                    spindexPos = spindexer_intakePos1 + 0.015;
-                } else {
-                    spindexPos = spindexer_intakePos1 - 0.015;
-                }
-
-            } else if (reject) {
-                robot.intake.setPower(-1);
-                spindexPos = spindexer_intakePos1;
-            } else {
-                robot.intake.setPower(0);
-            }
-
-            //COLOR:
-
-            double s1D = robot.color1.getDistance(DistanceUnit.MM);
-            double s2D = robot.color2.getDistance(DistanceUnit.MM);
-            double s3D = robot.color3.getDistance(DistanceUnit.MM);
-
-            if (s1D < 40) {
-
-                double green = robot.color1.getNormalizedColors().green;
-                double red = robot.color1.getNormalizedColors().red;
-                double blue = robot.color1.getNormalizedColors().blue;
-
-                double gP = green / (green + red + blue);
-
-                s1G.add(gP);
-
-                if (gP >= 0.43) {
-                    s1.add(true);
-                } else {
-                    s1.add(false);
-                }
-
-                s1T.add(getRuntime());
-
-            }
-
-            if (s2D < 40) {
-
-                double green = robot.color2.getNormalizedColors().green;
-                double red = robot.color2.getNormalizedColors().red;
-                double blue = robot.color2.getNormalizedColors().blue;
-
-                double gP = green / (green + red + blue);
-
-                s2G.add(gP);
-
-                if (gP >= 0.43) {
-                    s2.add(true);
-                } else {
-                    s2.add(false);
-                }
-
-                s2T.add(getRuntime());
-            }
-
-            if (s3D < 30) {
-
-                double green = robot.color3.getNormalizedColors().green;
-                double red = robot.color3.getNormalizedColors().red;
-                double blue = robot.color3.getNormalizedColors().blue;
-
-                double gP = green / (green + red + blue);
-
-                s3G.add(gP);
-
-                if (gP >= 0.43) {
-                    s3.add(true);
-                } else {
-                    s3.add(false);
-                }
-
-                s3T.add(getRuntime());
-            }
-
-            if (!s1.isEmpty()) {
-                green1 = checkGreen(s1, s1T);
-            }
-            if (!s2.isEmpty()) {
-                green2 = checkGreen(s2, s2T);
-
-            }
-            if (!s3.isEmpty()) {
-                green3 = checkGreen(s3, s3T);
-            }
-
-            //SHOOTER:
-
-            double powPID = flywheel.manageFlywheel((int) vel);
-
-             robot.transfer.setPower(1);
-
-            //TURRET:
-
-            double offset;
-
-            double robX = drive.localizer.getPose().position.x;
-            double robY = drive.localizer.getPose().position.y;
-
-            double robotX = robX - xOffset;
-            double robotY = robY - yOffset;
-            double robotHeading = drive.localizer.getPose().heading.toDouble();
-
-            double goalX = -10;
-            double goalY = 0;
-
-            double dx = goalX - robotX;  // delta x from robot to goal
-            double dy = goalY - robotY;  // delta y from robot to goal
-
-            double distanceToGoal = Math.sqrt(dx * dx + dy * dy);
-
-            desiredTurretAngle = (Math.toDegrees(Math.atan2(dy, dx)) + 360) % 360;
-
-            desiredTurretAngle += manualOffset;
-
-            offset = desiredTurretAngle - 180 - (Math.toDegrees(robotHeading - headingOffset));
-
-            if (offset > 135) {
-                offset -= 360;
-            }
-
-            //TODO: test the camera teleop code
-            double pos = turrDefault + (error/8); // adds the overall error to the default
-
-            TELE.addData("offset", offset);
-
-            pos -= offset * (0.9 / 360);
-
-            if (pos < 0.02) {
-                pos = 0.02;
-            } else if (pos > 0.97) {
-                pos = 0.97;
-            }
-
-            if (y < 0.1 && y > -0.1 && x < 0.1 && x > -0.1 && rx < 0.1 && rx > -0.1){ //not moving
-                AprilTagDetection d20 = aprilTagWebcam.getTagById(20);
-                AprilTagDetection d24 = aprilTagWebcam.getTagById(24);
-
-                double bearing = 0.0;
-                if (d20 != null || d24 != null){
-                    if (d20 != null) {
-                        bearing = d20.ftcPose.bearing;
-                    }
-                    if (d24 != null) {
-                        bearing = d24.ftcPose.bearing;
-                    }
-                    overrideTurr = true;
-                    turretPos = servo.getTurrPos() - (bearing/1300);
-                    TELE.addData("Bear", bearing);
-
-                    double bearingCorrection = bearing / 1300;
-
-
-                    // deadband: ignore tiny noise
-                    if (Math.abs(bearing) > 0.3 && camTicker < 8) {
-
-                        // only accumulate if bearing direction is consistent
-                        if (Math.signum(bearingCorrection) == Math.signum(error) || error == 0) {
-                            error += bearingCorrection;
-                        }
-                    }
-
-                    camTicker++;
-
-                }
-
-
-            } else {
-                camTicker = 0;
-                overrideTurr = false;
-
-            }
-
-            if (manualTurret) {
-                pos = turrDefault + (manualOffset / 100);
-            }
-
-            if (!overrideTurr) {
-                turretPos = pos;
-            }
-
-            if (gamepad2.dpad_right) {
-                manualOffset -= 2;
-            } else if (gamepad2.dpad_left) {
-                manualOffset += 2;
-            }
-
-            //VELOCITY AUTOMATIC
-
-            if (autoVel) {
-                vel = velPrediction(distanceToGoal);
-            } else {
-                vel = manualVel;
-            }
-
-            if (gamepad2.right_stick_button) {
-                autoVel = true;
-            } else if (gamepad2.right_stick_y < -0.5) {
-                autoVel = false;
-                manualVel = 4100;
-            } else if (gamepad2.right_stick_y > 0.5) {
-                autoVel = false;
-                manualVel = 2700;
-            } else if (gamepad2.right_stick_x > 0.5) {
-                autoVel = false;
-                manualVel = 3600;
-            } else if (gamepad2.right_stick_x < -0.5) {
-                autoVel = false;
-                manualVel = 3100;
-            }
-
-            //HOOD:
-
-            if (autoHood) {
-                robot.hood.setPosition(hoodAnglePrediction(distanceToGoal) + autoHoodOffset);
-            } else {
-                robot.hood.setPosition(hoodDefaultPos + hoodOffset);
-            }
-
-            if (gamepad2.dpadUpWasPressed()) {
-                hoodOffset -= 0.03;
-                autoHoodOffset -= 0.02;
-
-            } else if (gamepad2.dpadDownWasPressed()) {
-                hoodOffset += 0.03;
-                autoHoodOffset += 0.02;
-
-            }
-
-            if (gamepad2.left_stick_x > 0.5) {
-                manualTurret = false;
-            } else if (gamepad2.left_stick_x < -0.5) {
-                manualOffset = 0;
-                manualTurret = false;
-                if (gamepad2.left_bumper) {
-                    drive = new MecanumDrive(hardwareMap, new Pose2d(2, 0, 0));
-                    sleep(1200);
-                }
-            }
-
-            if (gamepad2.left_stick_y < -0.5) {
-                autoHood = true;
-            } else if (gamepad2.left_stick_y > 0.5) {
-                autoHood = false;
-                hoodOffset = 0;
-                if (gamepad2.left_bumper) {
-                    xOffset = robotX;
-                    yOffset = robotY;
-                    headingOffset = robotHeading;
-                }
-            }
-
-            //SHOOT ALL:]
-
-            if (emergency) {
-                intake = false;
-                reject = true;
-
-                if (getRuntime() % 3 > 1.5) {
-                    spindexPos = 1;
-                } else {
-                    spindexPos = 0;
-                }
-
-                robot.transferServo.setPosition(transferServo_out);
-
-                robot.transfer.setPower(1);
-
-            } else if (shootAll) {
-
-                TELE.addData("100% works", shootOrder);
-
-                intake = false;
-                reject = false;
-
-                if (!shootOrder.isEmpty() && (getRuntime() - shootStamp < 12)) {
-                    int currentSlot = shootOrder.get(0); // Peek, do NOT remove yet
-                    boolean shootingDone = false;
-
-                    if (!outtake1) {
-                        outtake1 = (servo.spinEqual(spindexer_outtakeBall1));
-                    }
-                    if (!outtake2) {
-                        outtake2 = (servo.spinEqual(spindexer_outtakeBall2));
-                    }
-                    if (!outtake3) {
-                        outtake3 = (servo.spinEqual(spindexer_outtakeBall3));
-                    }
-
-                    switch (currentSlot) {
-                        case 1:
-                            shootA = shootTeleop(spindexer_outtakeBall1, outtake1, shootStamp2);
-                            TELE.addData("shootA", shootA);
-
-                            if ((getRuntime() - shootStamp) < 4 * (4 - shootOrder.size())) {
-                                shootingDone = !shootA;
-                            } else {
-                                shootingDone = true;
-                            }
-                            break;
-                        case 2:
-                            shootB = shootTeleop(spindexer_outtakeBall2, outtake2, shootStamp2);
-                            TELE.addData("shootB", shootB);
-                            if ((getRuntime() - shootStamp) < 4 * (4 - shootOrder.size())) {
-                                shootingDone = !shootB;
-                            } else {
-                                shootingDone = true;
-                            }
-                            break;
-                        case 3:
-                            shootC = shootTeleop(spindexer_outtakeBall3, outtake3, shootStamp2);
-                            TELE.addData("shootC", shootC);
-                            if ((getRuntime() - shootStamp) < 4 * (4 - shootOrder.size())) {
-                                shootingDone = !shootC;
-                            } else {
-                                shootingDone = true;
-                            }
-                            break;
-                    }
-
-                    // Remove from the list only if shooting is complete
-                    if (shootingDone) {
-                        shootOrder.remove(0);
-                        shootStamp2 = getRuntime();
-
-                    }
-
-                } else {
-                    // Finished shooting all balls
-                    spindexPos = spindexer_intakePos1;
-                    shootA = true;
-                    shootB = true;
-                    shootC = true;
-                    reject = false;
-                    intake = true;
-                    shootAll = false;
-                    outtake1 = false;
-                    outtake2 = false;
-                    outtake3 = false;
-
-                    overrideTurr = false;
-
-                }
-
-            }
-
-            if (gamepad2.squareWasPressed()) {
-                square = true;
-                shootStamp = getRuntime();
-                shootStamp2 = getRuntime();
-                outtake1 = false;
-                outtake2 = false;
-                outtake3 = false;
-            }
-
-            if (gamepad2.circleWasPressed()) {
-                circle = true;
-                shootStamp = getRuntime();
-                shootStamp2 = getRuntime();
-
-                outtake1 = false;
-                outtake2 = false;
-                outtake3 = false;
-
-            }
-
-            if (gamepad2.triangleWasPressed()) {
-                triangle = true;
-                shootStamp = getRuntime();
-                shootStamp2 = getRuntime();
-
-                outtake1 = false;
-                outtake2 = false;
-                outtake3 = false;
-
-            }
-
-            if (square || circle || triangle) {
-
-                // Count green balls
-                int greenCount = 0;
-                if (green1) greenCount++;
-                if (green2) greenCount++;
-                if (green3) greenCount++;
-
-                // Determine the odd ball color
-                oddBallColor = greenCount < 2; // true = green, false = purple
-
-                shootOrder.clear();
-
-                // Determine shooting order based on button pressed
-                // square = odd ball first, triangle = odd ball second, circle = odd ball third
-                if (square) {
-                    // Odd ball first
-                    addOddThenRest(shootOrder, oddBallColor);
-
-                } else if (triangle) {
-                    // Odd ball second
-                    addOddInMiddle(shootOrder, oddBallColor);
-                } else if (circle) {
-                    // Odd ball last
-                    addOddLast(shootOrder, oddBallColor);
-                }
-
-                circle = false;
-                square = false;
-                triangle = false;
-
-            }
-
-            // Right bumper shoots all balls fastest, ignoring colors
-            if (gamepad2.rightBumperWasPressed()) {
-                shootOrder.clear();
-                shootStamp = getRuntime();
-
-                outtake1 = false;
-                outtake2 = false;
-                outtake3 = false;
-
-                // Fastest order (example: slot 3 → 2 → 1)
-
-                if (ballIn(3)) {
-                    shootOrder.add(3);
-
-                }
-
-                if (ballIn(2)) {
-                    shootOrder.add(2);
-
-                }
-
-                if (ballIn(1)) {
-                    shootOrder.add(1);
-
-                }
-
-                if (!shootOrder.contains(3)) {
-
-                    shootOrder.add(3);
-                }
-
-                if (!shootOrder.contains(2)) {
-
-                    shootOrder.add(2);
-                }
-
-                if (!shootOrder.contains(1)) {
-
-                    shootOrder.add(1);
-                }
-
-                shootAll = true;
-                shootPos = drive.localizer.getPose();
-
-            }
-
-//            // Right bumper shoots all balls fastest, ignoring colors
-//            if (gamepad2.leftBumperWasPressed()) {
-//                shootOrder.clear();
-//                shootStamp = getRuntime();
-//
-//                outtake1 = false;
-//                outtake2 = false;
-//                outtake3 = false;
-//
-//                // Fastest order (example: slot 3 → 2 → 1)
-//
-//                if (ballIn(3)) {
-//                    shootOrder.add(3);
-//                }
-//
-//                if (ballIn(2)) {
-//                    shootOrder.add(2);
-//                }
-//                if (ballIn(1)) {
-//                    shootOrder.add(1);
-//                }
-//                shootAll = true;
-//                shootPos = drive.localizer.getPose();
-//
-//            }
-//
-            if (gamepad2.crossWasPressed()) {
-                emergency = true;
-
-            }
-
-            if (gamepad2.leftBumperWasPressed()) {
-                emergency = false;
-            }
-
-            //MISC:
-
-            drive.updatePoseEstimate();
-
-            for (LynxModule hub : allHubs) {
-                hub.clearBulkCache();
-            }
-
-            TELE.addData("Spin1Green", green1 + ": " + ballIn(1));
-            TELE.addData("Spin2Green", green2 + ": " + ballIn(2));
-            TELE.addData("Spin3Green", green3 + ": " + ballIn(3));
-
-            TELE.addData("pose", drive.localizer.getPose());
-            TELE.addData("heading", drive.localizer.getPose().heading.toDouble());
-            TELE.addData("distanceToGoal", distanceToGoal);
-            TELE.addData("hood", robot.hood.getPosition());
-            TELE.addData("targetVel", vel);
-
-            TELE.addData("shootOrder", shootOrder);
-            TELE.addData("oddColor", oddBallColor);
-
-            aprilTagWebcam.update();
-
-            TELE.update();
-
-            ticker++;
-
-        }
-    }
-
-    // Helper method
-    private boolean checkGreen(List<Boolean> s, List<Double> sT) {
-        if (s.isEmpty()) return false;
-
-        double lastTime = sT.get(sT.size() - 1);
-        int countTrue = 0;
-        int countWindow = 0;
-
-        for (int i = 0; i < s.size(); i++) {
-            if (lastTime - sT.get(i) <= 3.0) {  // element is within 2s of last
-                countWindow++;
-                if (s.get(i)) {
-                    countTrue++;
-                }
-            }
-        }
-
-        if (countWindow == 0) return false; // avoid divide by zero
-        return countTrue > countWindow / 2.0; // more than 50% true
-    }
-
-    public boolean shootTeleop(double spindexer, boolean spinOk, double stamp) {
-        // Set spin positions
-        spindexPos = spindexer;
-
-        // Check if spindexer has reached the target position
-        if (spinOk || getRuntime() - stamp > 1.5) {
-            if (tickerA == 1) {
-                transferStamp = getRuntime();
-                tickerA++;
-                TELE.addLine("tickerSet");
-            }
-
-            if (getRuntime() - transferStamp > waitTransfer && !transferIn) {
-                robot.transferServo.setPosition(transferServo_in);
-                transferIn = true;
-                TELE.addLine("transferring");
-
-                return true; // still in progress
-
-            } else if (getRuntime() - transferStamp > waitTransfer + waitTransferOut && transferIn) {
-                robot.transferServo.setPosition(transferServo_out);
-                transferIn = false; // reset for next shot
-                tickerA = 1;        // reset ticker
-                transferStamp = 0.0;
-
-                TELE.addLine("shotFinished");
-
-                return false;       // finished shooting
-            } else {
-                TELE.addLine("sIP");
-                return true; // still in progress
-            }
-        } else {
-            robot.transferServo.setPosition(transferServo_out);
-            tickerA = 1;
-            transferStamp = getRuntime();
-            transferIn = false;
-            return true; // still moving spin
-        }
-    }
-
-    public double hoodAnglePrediction(double x) {
-        if (x < 34) {
-            double L = 1.04471;
-            double U = 0.711929;
-            double Q = 120.02263;
-            double B = 0.780982;
-            double M = 20.61191;
-            double v = 10.40506;
-
-            double inner = 1 + Q * Math.exp(-B * (x - M));
-            return L + (U - L) / Math.pow(inner, 1.0 / v);
-
-        } else {
-            // x >= 34
-            return 1.94372 * Math.exp(-0.0528731 * x) + 0.39;
-        }
-    }
-
-    void addOddThenRest(List<Integer> order, boolean oddColor) {
-        // Odd ball first
-        for (int i = 1; i <= 3; i++) if (getBallColor(i) == oddColor) order.add(i);
-        TELE.addData("1", shootOrder);
-        for (int i = 1; i <= 3; i++) if (getBallColor(i) != oddColor) order.add(i);
-        TELE.addData("works", shootOrder);
-        TELE.addData("oddBall", oddColor);
-        shootAll = true;
-
-    }
-
-    void addOddInMiddle(List<Integer> order, boolean oddColor) {
-
-        boolean[] used = new boolean[4];   // index 1..3
-
-        // 1) Add a NON-odd ball first
-        for (int i = 1; i <= 3; i++) {
-            if (getBallColor(i) != oddColor) {
-                order.add(i);
-                used[i] = true;
-                break;
-            }
-        }
-
-        // 2) Add the odd ball second
-        for (int i = 1; i <= 3; i++) {
-            if (!used[i] && getBallColor(i) == oddColor) {
-                order.add(i);
-                used[i] = true;
-                break;
-            }
-        }
-
-        // 3) Add the remaining non-odd ball third
-        for (int i = 1; i <= 3; i++) {
-            if (!used[i] && getBallColor(i) != oddColor) {
-                order.add(i);
-                used[i] = true;
-                break;
-            }
-        }
-
-        TELE.addData("works", order);
-        TELE.addData("oddBall", oddColor);
-        shootAll = true;
-
-    }
-
-    void addOddLast(List<Integer> order, boolean oddColor) {
-        // Odd ball last
-        for (int i = 1; i <= 3; i++) if (getBallColor(i) != oddColor) order.add(i);
-        TELE.addData("1", shootOrder);
-        for (int i = 1; i <= 3; i++) if (getBallColor(i) == oddColor) order.add(i);
-        TELE.addData("works", shootOrder);
-        TELE.addData("oddBall", oddColor);
-        shootAll = true;
-
-    }
-
-    // Returns color of ball in slot i (1-based)
-    boolean getBallColor(int slot) {
-        switch (slot) {
-            case 1:
-                return green1;
-            case 2:
-                return green2;
-            case 3:
-                return green3;
-        }
-        return false; // default
-    }
-
-    boolean ballIn(int slot) {
-        switch (slot) {
-            case 1:
-
-                if (!s1T.isEmpty()) {
-
-                    return !(s1T.get(s1T.size() - 1) < (getRuntime()) - 3);
-                }
-
-            case 2:
-
-                if (!s2T.isEmpty()) {
-
-                    return !(s2T.get(s2T.size() - 1) < (getRuntime()) - 3);
-                }
-
-            case 3:
-
-                if (!s3T.isEmpty()) {
-
-                    return !(s3T.get(s3T.size() - 1) < (getRuntime()) - 3);
-
-                }
-        }
-        return true; // default
-    }
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV4.java

@@ -0,0 +1,107 @@
+package org.firstinspires.ftc.teamcode.teleop;
+
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStartPoseH;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStartPoseX;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStartPoseY;
+
+import com.acmerobotics.dashboard.FtcDashboard;
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.pedropathing.follower.Follower;
+import com.pedropathing.geometry.Pose;
+import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
+import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
+
+import org.firstinspires.ftc.teamcode.constants.Color;
+import org.firstinspires.ftc.teamcode.pedroPathing.Constants;
+import org.firstinspires.ftc.teamcode.utilsv2.*;
+
+@TeleOp
+@Config
+public class TeleopV4 extends LinearOpMode {
+    Robot robot;
+    Drivetrain drivetrain;
+    Shooter shooter;
+    MultipleTelemetry TELE;
+    Follower follower;
+    SpindexerTransferIntake spindexerTransferIntake;
+    Turret turret;
+    Flywheel flywheel;
+
+    @Override
+    public void runOpMode() throws InterruptedException {
+
+        robot = Robot.getInstance(hardwareMap);
+
+        TELE = new MultipleTelemetry(
+                FtcDashboard.getInstance().getTelemetry(), telemetry
+        );
+
+        drivetrain = new Drivetrain(robot, TELE);
+        follower = Constants.createFollower(hardwareMap);
+        Pose start = new Pose(teleStartPoseX, teleStartPoseY, Math.toRadians(teleStartPoseH));
+        follower.setStartingPose(start);
+
+        flywheel = new Flywheel(robot);
+        turret = new Turret(robot);
+
+
+        shooter = new Shooter(robot, TELE, follower, Color.redAlliance, turret, flywheel);
+        shooter.setState(Shooter.ShooterState.TRACK_GOAL);
+        spindexerTransferIntake = new SpindexerTransferIntake(robot, TELE);
+        spindexerTransferIntake.setSpindexerMode(SpindexerTransferIntake.SpindexerMode.RAPID);
+
+
+        waitForStart();
+
+        if (isStopRequested()) return;
+
+        while (opModeIsActive()) {
+
+            //Drivetrain
+
+            drivetrain.drive(
+                    -gamepad1.right_stick_y,
+                    gamepad1.right_stick_x,
+                    gamepad1.left_stick_x
+            );
+
+            shooter.update();
+            spindexerTransferIntake.update();
+
+            SpindexerTransferIntake.RapidMode state = spindexerTransferIntake.getRapidState();
+
+            if (gamepad1.xWasPressed() &&
+                    (state == SpindexerTransferIntake.RapidMode.INTAKE ||
+                            state == SpindexerTransferIntake.RapidMode.TRANSFER_OFF ||
+                            state == SpindexerTransferIntake.RapidMode.BEFORE_PULSE_OUT ||
+                            state == SpindexerTransferIntake.RapidMode.PULSE_OUT ||
+                            state == SpindexerTransferIntake.RapidMode.PULSE_IN ||
+                            state == SpindexerTransferIntake.RapidMode.HOLD_BALLS)) {
+
+                spindexerTransferIntake.setRapidMode(SpindexerTransferIntake.RapidMode.OPEN_GATE);
+            }
+
+            if (gamepad1.aWasPressed() &&
+                    (state == SpindexerTransferIntake.RapidMode.INTAKE ||
+                            state == SpindexerTransferIntake.RapidMode.TRANSFER_OFF)) {
+
+                spindexerTransferIntake.setRapidMode(
+                        SpindexerTransferIntake.RapidMode.HOLD_BALLS
+                );
+            }
+
+            if (gamepad1.yWasPressed()
+                    && state == SpindexerTransferIntake.RapidMode.HOLD_BALLS) {
+
+                spindexerTransferIntake.setRapidMode(
+                        SpindexerTransferIntake.RapidMode.INTAKE
+                );
+            }
+
+
+            TELE.update();
+        }
+
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/blank.java

@@ -1,4 +0,0 @@
-package org.firstinspires.ftc.teamcode.teleop;
-
-public class blank {
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/old.txt

@@ -1,793 +0,0 @@
-package org.firstinspires.ftc.teamcode.teleop;
-
-import static org.firstinspires.ftc.teamcode.constants.Poses.*;
-import static org.firstinspires.ftc.teamcode.constants.ServoPositions.*;
-
-import com.acmerobotics.dashboard.FtcDashboard;
-import com.acmerobotics.dashboard.config.Config;
-import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
-import com.acmerobotics.roadrunner.Pose2d;
-import com.arcrobotics.ftclib.gamepad.GamepadEx;
-import com.arcrobotics.ftclib.gamepad.GamepadKeys;
-import com.arcrobotics.ftclib.gamepad.ToggleButtonReader;
-import com.qualcomm.robotcore.eventloop.opmode.Disabled;
-import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
-import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
-
-import org.firstinspires.ftc.robotcore.external.navigation.AngleUnit;
-import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
-import org.firstinspires.ftc.teamcode.subsystems.Drivetrain;
-import org.firstinspires.ftc.teamcode.subsystems.Intake;
-import org.firstinspires.ftc.teamcode.subsystems.Shooter;
-import org.firstinspires.ftc.teamcode.subsystems.Spindexer;
-import org.firstinspires.ftc.teamcode.subsystems.Transfer;
-import org.firstinspires.ftc.teamcode.utils.Robot;
-
-@Config
-@TeleOp
-@Disabled
-public class old extends LinearOpMode {
-
-    Robot robot;
-
-    Drivetrain drivetrain;
-
-    Intake intake;
-
-    Spindexer spindexer;
-
-    Transfer transfer;
-
-    MultipleTelemetry TELE;
-
-    GamepadEx g1;
-
-    GamepadEx g2;
-
-    public static double defaultSpeed = 1;
-
-    public static double slowMoSpeed = 0.4;
-
-    public static double power = 0.0;
-
-    public static double pos = hoodDefault;
-
-    public boolean all = false;
-
-    public int ticker = 0;
-
-    ToggleButtonReader g1RightBumper;
-
-    ToggleButtonReader g2Circle;
-
-    ToggleButtonReader g2Square;
-
-    ToggleButtonReader g2Triangle;
-
-    ToggleButtonReader g2RightBumper;
-
-    ToggleButtonReader g1LeftBumper;
-
-    ToggleButtonReader g2LeftBumper;
-
-    ToggleButtonReader g2DpadUp;
-
-    ToggleButtonReader g2DpadDown;
-
-    ToggleButtonReader g2DpadRight;
-
-    ToggleButtonReader g2DpadLeft;
-
-    public boolean leftBumper = false;
-    public double g1RightBumperStamp = 0.0;
-
-    public double g1LeftBumperStamp = 0.0;
-
-    public double g2LeftBumperStamp = 0.0;
-
-    public static int spindexerPos = 0;
-
-    public boolean green = false;
-
-    Shooter shooter;
-
-    public boolean scoreAll = false;
-
-    MecanumDrive drive;
-
-    public boolean autotrack = false;
-
-    public int last = 0;
-    public int second = 0;
-
-    public double offset = 0.0;
-
-    public static double rIn = 0.59;
-
-    public static double rOut = 0;
-
-    public boolean notShooting = true;
-
-    public boolean circle = false;
-
-    public boolean square = false;
-
-    public boolean tri = false;
-
-    @Override
-    public void runOpMode() throws InterruptedException {
-
-        drive = new MecanumDrive(hardwareMap, teleStart);
-
-        robot = new Robot(hardwareMap);
-
-        TELE = new MultipleTelemetry(
-                FtcDashboard.getInstance().getTelemetry(),
-                telemetry
-        );
-
-        g1 = new GamepadEx(gamepad1);
-
-        g1RightBumper = new ToggleButtonReader(
-                g1, GamepadKeys.Button.RIGHT_BUMPER
-        );
-
-        g2 = new GamepadEx(gamepad2);
-
-        g1LeftBumper = new ToggleButtonReader(
-                g1, GamepadKeys.Button.LEFT_BUMPER
-        );
-
-        g2Circle = new ToggleButtonReader(
-                g2, GamepadKeys.Button.B
-        );
-
-        g2Triangle = new ToggleButtonReader(
-                g2, GamepadKeys.Button.Y
-        );
-
-        g2Square = new ToggleButtonReader(
-                g2, GamepadKeys.Button.X
-        );
-
-        g2RightBumper = new ToggleButtonReader(
-                g2, GamepadKeys.Button.RIGHT_BUMPER
-        );
-
-        g2LeftBumper = new ToggleButtonReader(
-                g2, GamepadKeys.Button.LEFT_BUMPER
-        );
-
-        g2DpadUp = new ToggleButtonReader(
-                g2, GamepadKeys.Button.DPAD_UP
-        );
-
-        g2DpadDown = new ToggleButtonReader(
-                g2, GamepadKeys.Button.DPAD_DOWN
-        );
-
-        g2DpadLeft = new ToggleButtonReader(
-                g2, GamepadKeys.Button.DPAD_LEFT
-        );
-
-        g2DpadRight = new ToggleButtonReader(
-                g2, GamepadKeys.Button.DPAD_RIGHT
-        );
-
-        drivetrain = new Drivetrain(robot, TELE, g1);
-
-        drivetrain.setMode("Default");
-
-        drivetrain.setDefaultSpeed(defaultSpeed);
-
-        drivetrain.setSlowSpeed(slowMoSpeed);
-
-        intake = new Intake(robot);
-
-        transfer = new Transfer(robot);
-
-        spindexer = new Spindexer(robot, TELE);
-
-        spindexer.setTelemetryOn(true);
-
-        shooter = new Shooter(robot, TELE);
-
-        shooter.setShooterMode("MANUAL");
-
-        robot.rejecter.setPosition(rIn);
-
-        waitForStart();
-
-        if (isStopRequested()) return;
-
-        drive = new MecanumDrive(hardwareMap, teleStart);
-
-        while (opModeIsActive()) {
-
-            drive.updatePoseEstimate();
-
-            TELE.addData("pose", drive.localizer.getPose());
-
-            TELE.addData("heading", drive.localizer.getPose().heading.toDouble());
-
-            TELE.addData("off", offset);
-
-            robot.hood.setPosition(pos);
-
-            g1LeftBumper.readValue();
-
-            if (g1LeftBumper.wasJustPressed()) {
-                g2LeftBumperStamp = getRuntime();
-
-                spindexer.intakeShake(getRuntime());
-
-                leftBumper = true;
-            }
-
-            if (leftBumper) {
-                double time = getRuntime() - g2LeftBumperStamp;
-
-                if (time < 1.0) {
-                    robot.rejecter.setPosition(rOut);
-                } else {
-                    robot.rejecter.setPosition(rIn);
-                }
-
-            }
-
-            intake();
-
-            drivetrain.update();
-
-            TELE.update();
-
-            transfer.update();
-
-            g2RightBumper.readValue();
-
-            g2LeftBumper.readValue();
-
-            g2DpadDown.readValue();
-
-            g2DpadUp.readValue();
-
-            if (!scoreAll) {
-                spindexer.checkForBalls();
-            }
-
-            if (g2DpadUp.wasJustPressed()) {
-                pos -= 0.02;
-            }
-
-            if (g2DpadDown.wasJustPressed()) {
-                pos += 0.02;
-            }
-
-            g2DpadLeft.readValue();
-
-            g2DpadRight.readValue();
-
-            if (g2DpadLeft.wasJustPressed()) {
-                offset -= 0.02;
-            }
-
-            if (g2DpadRight.wasJustPressed()) {
-                offset += 0.02;
-            }
-
-            TELE.addData("hood", pos);
-
-            if (Math.abs(gamepad2.right_stick_x) < 0.1 && autotrack) {
-
-                shooter.trackGoal(drive.localizer.getPose(), new Pose2d(-10, 0, 0), offset);
-
-            } else {
-
-                autotrack = false;
-
-                shooter.moveTurret(0.3 + offset);
-
-            }
-
-            if (gamepad2.right_stick_button) {
-                autotrack = true;
-            }
-
-            if (g2RightBumper.wasJustPressed()) {
-                transfer.setTransferPower(1);
-                transfer.transferIn();
-                shooter.setManualPower(1);
-
-                notShooting = false;
-
-            }
-
-            if (g2RightBumper.wasJustReleased()) {
-                transfer.setTransferPower(1);
-                transfer.transferOut();
-            }
-
-            if (gamepad2.left_stick_y > 0.5) {
-
-                shooter.setManualPower(0);
-            } else if (gamepad2.left_stick_y < -0.5) {
-                shooter.setManualPower(1);
-            }
-
-            if (g2LeftBumper.wasJustPressed()) {
-                g2LeftBumperStamp = getRuntime();
-                notShooting = false;
-                scoreAll = true;
-            }
-
-            if (scoreAll) {
-                double time = getRuntime() - g2LeftBumperStamp;
-
-                shooter.setManualPower(1);
-
-                TELE.addData("greenImportant", green);
-
-                TELE.addData("last", last);
-                TELE.addData("2ndLast", second);
-
-                int numGreen = spindexer.greens();
-
-                if (square) {
-
-                    if (time < 0.3) {
-
-                        ticker = 0;
-
-                        last = 0;
-                        second = 0;
-
-                        transfer.transferOut();
-                        transfer.setTransferPower(1);
-                    } else if (time < 2) {
-
-                        if (ticker == 0) {
-
-                            if (numGreen == 2) {
-                                last = spindexer.outtakePurple(second, last);
-                                second = last;
-                            } else {
-                                last = spindexer.outtakeGreen(second, last);
-                                second = last;
-
-                            }
-                        }
-
-                        second = last;
-
-                        ticker++;
-
-                    } else if (time < 2.5) {
-
-                        ticker = 0;
-
-                        second = last;
-
-                        transfer.transferIn();
-                    } else if (time < 4) {
-                        transfer.transferOut();
-
-                        if (ticker == 0) {
-
-                            if (numGreen == 2) {
-                                last = spindexer.outtakeGreen(second, last);
-                            } else {
-                                last = spindexer.outtakePurple(second, last);
-
-                            }
-                        }
-
-                        ticker++;
-                    } else if (time < 4.5) {
-
-                        ticker = 0;
-
-                        transfer.transferIn();
-                    } else if (time < 6) {
-
-                        transfer.transferOut();
-
-                        if (ticker == 0) {
-
-                            if (numGreen == 2) {
-                                last = spindexer.outtakeGreen(second, last);
-                            } else {
-                                last = spindexer.outtakePurple(second, last);
-
-                            }
-                        }
-
-                        ticker++;
-
-                    } else if (time < 6.5) {
-                        transfer.transferIn();
-                    } else {
-
-                        ticker = 0;
-
-                        scoreAll = false;
-                        transfer.transferOut();
-
-                        shooter.setManualPower(0);
-
-                    }
-                } else if (tri) {
-
-                    if (time < 0.3) {
-
-                        ticker = 0;
-
-                        last = 0;
-                        second = 0;
-
-                        transfer.transferOut();
-                        transfer.setTransferPower(1);
-                    } else if (time < 2) {
-
-                        if (ticker == 0) {
-
-                            if (numGreen == 2) {
-                                last = spindexer.outtakeGreen(second, last);
-                                second = last;
-                            } else {
-                                last = spindexer.outtakePurple(second, last);
-                                second = last;
-
-                            }
-                        }
-
-                        second = last;
-
-                        ticker++;
-
-                    } else if (time < 2.5) {
-
-                        ticker = 0;
-
-                        second = last;
-
-                        transfer.transferIn();
-                    } else if (time < 4) {
-                        transfer.transferOut();
-
-                        if (ticker == 0) {
-
-                            if (numGreen == 2) {
-                                last = spindexer.outtakePurple(second, last);
-                            } else {
-                                last = spindexer.outtakeGreen(second, last);
-
-                            }
-                        }
-
-                        ticker++;
-                    } else if (time < 4.5) {
-
-                        ticker = 0;
-
-                        transfer.transferIn();
-                    } else if (time < 6) {
-
-                        transfer.transferOut();
-
-                        if (ticker == 0) {
-
-                            if (numGreen == 2) {
-                                last = spindexer.outtakeGreen(second, last);
-                            } else {
-                                last = spindexer.outtakePurple(second, last);
-
-                            }
-                        }
-
-                        ticker++;
-
-                    } else if (time < 6.5) {
-                        transfer.transferIn();
-                    } else {
-
-                        ticker = 0;
-
-                        scoreAll = false;
-                        transfer.transferOut();
-
-                        shooter.setManualPower(0);
-
-                    }
-                } else if (circle) {
-
-                    if (time < 0.3) {
-
-                        ticker = 0;
-
-                        last = 0;
-                        second = 0;
-
-                        transfer.transferOut();
-                        transfer.setTransferPower(1);
-                    } else if (time < 2) {
-
-                        if (ticker == 0) {
-
-                            if (numGreen == 2) {
-                                last = spindexer.outtakeGreen(second, last);
-                                second = last;
-                            } else {
-                                last = spindexer.outtakePurple(second, last);
-                                second = last;
-
-                            }
-                        }
-
-                        second = last;
-
-                        ticker++;
-
-                    } else if (time < 2.5) {
-
-                        ticker = 0;
-
-                        second = last;
-
-                        transfer.transferIn();
-                    } else if (time < 4) {
-                        transfer.transferOut();
-
-                        if (ticker == 0) {
-
-                            if (numGreen == 2) {
-                                last = spindexer.outtakeGreen(second, last);
-                            } else {
-                                last = spindexer.outtakePurple(second, last);
-
-                            }
-                        }
-
-                        ticker++;
-                    } else if (time < 4.5) {
-
-                        ticker = 0;
-
-                        transfer.transferIn();
-                    } else if (time < 6) {
-
-                        transfer.transferOut();
-
-                        if (ticker == 0) {
-
-                            if (numGreen == 2) {
-                                last = spindexer.outtakePurple(second, last);
-                            } else {
-                                last = spindexer.outtakeGreen(second, last);
-
-                            }
-                        }
-
-                        ticker++;
-
-                    } else if (time < 6.5) {
-                        transfer.transferIn();
-                    } else {
-
-                        ticker = 0;
-
-                        scoreAll = false;
-                        transfer.transferOut();
-
-                        shooter.setManualPower(0);
-
-                    }
-                } else {
-
-                    if (time < 0.3) {
-
-                        ticker = 0;
-
-                        last = 0;
-                        second = 0;
-
-                        if (gamepad2.right_trigger > 0.5) {
-                            green = false;
-
-                            all = gamepad2.left_trigger > 0.5;
-
-                        } else if (gamepad2.left_trigger > 0.5) {
-                            green = true;
-
-                            all = false;
-                        } else {
-                            all = true;
-                        }
-
-                        transfer.transferOut();
-                        transfer.setTransferPower(1);
-                    } else if (time < 2) {
-
-                        if (ticker == 0) {
-
-                            if (all) {
-                                spindexer.outtake3();
-                                last = 3;
-                                second = 3;
-                            } else if (green) {
-                                last = spindexer.outtakeGreen(second, last);
-                                second = last;
-                            } else {
-                                last = spindexer.outtakePurple(second, last);
-                                second = last;
-
-                            }
-                        }
-
-                        second = last;
-
-                        ticker++;
-
-                    } else if (time < 2.5) {
-
-                        ticker = 0;
-
-                        second = last;
-
-                        if (gamepad2.right_trigger > 0.5) {
-                            green = false;
-
-                            all = gamepad2.left_trigger > 0.5;
-
-                        } else if (gamepad2.left_trigger > 0.5) {
-                            green = true;
-
-                            all = false;
-
-                        }
-
-                        transfer.transferIn();
-                    } else if (time < 4) {
-                        transfer.transferOut();
-
-                        if (ticker == 0) {
-
-                            if (all) {
-                                spindexer.outtake2();
-
-                                last = 2;
-                            } else if (green) {
-                                last = spindexer.outtakeGreen(second, last);
-                            } else {
-                                last = spindexer.outtakePurple(second, last);
-
-                            }
-                        }
-
-                        ticker++;
-                    } else if (time < 4.5) {
-
-                        ticker = 0;
-
-                        if (gamepad2.right_trigger > 0.5) {
-                            green = false;
-
-                            all = gamepad2.left_trigger > 0.5;
-
-                        } else if (gamepad2.left_trigger > 0.5) {
-                            green = true;
-
-                            all = false;
-                        }
-
-                        transfer.transferIn();
-                    } else if (time < 6) {
-
-                        transfer.transferOut();
-
-                        if (ticker == 0) {
-
-                            if (all) {
-                                spindexer.outtake1();
-                            } else if (green) {
-                                last = spindexer.outtakeGreen(second, last);
-                            } else {
-                                last = spindexer.outtakePurple(second, last);
-
-                            }
-                        }
-
-                        ticker++;
-
-                    } else if (time < 6.5) {
-                        transfer.transferIn();
-                    } else {
-
-                        ticker = 0;
-
-                        scoreAll = false;
-                        transfer.transferOut();
-
-                        shooter.setManualPower(0);
-
-                    }
-
-                }
-            }
-
-            shooter.update();
-
-        }
-
-    }
-
-    public void intake() {
-
-        g1RightBumper.readValue();
-
-        g2Circle.readValue();
-
-        g2Square.readValue();
-
-        g2Triangle.readValue();
-
-        if (g1RightBumper.wasJustPressed()) {
-
-            notShooting = true;
-
-            if (getRuntime() - g1RightBumperStamp < 0.3) {
-                intake.reverse();
-            } else {
-                intake.toggle();
-            }
-
-            if (intake.getIntakeState() == 1) {
-                shooter.setManualPower(0);
-            }
-
-            spindexer.intake();
-
-            transfer.transferOut();
-
-            g1RightBumperStamp = getRuntime();
-
-        }
-
-        if (intake.getIntakeState() == 1 && notShooting) {
-
-            spindexer.intakeShake(getRuntime());
-
-        } else {
-            if (g2Circle.wasJustPressed()) {
-                circle = true;
-                tri = false;
-                square = false;
-
-            }
-
-            if (g2Triangle.wasJustPressed()) {
-                circle = false;
-                tri = true;
-                square = false;
-            }
-
-            if (g2Square.wasJustPressed()) {
-                circle = false;
-                tri = false;
-                square = true;
-            }
-
-            if (gamepad2.x) {
-                circle = false;
-                tri = false;
-                square = false;
-            }
-
-        }
-
-        intake.update();
-
-        spindexer.update();
-
-    }
-}
-

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ActiveColorSensorTest.txt

@@ -1,144 +0,0 @@
-package org.firstinspires.ftc.teamcode.tests;
-
-import static org.firstinspires.ftc.teamcode.constants.ServoPositions.*;
-
-import com.acmerobotics.dashboard.FtcDashboard;
-import com.acmerobotics.dashboard.config.Config;
-import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
-import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
-import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
-
-import org.firstinspires.ftc.teamcode.utils.Robot;
-
-
-@TeleOp
-@Config
-public class ActiveColorSensorTest extends LinearOpMode {
-    Robot robot;
-    MultipleTelemetry TELE;
-
-    @Override
-    public void runOpMode() throws InterruptedException{
-        robot = new Robot(hardwareMap);
-        TELE = new MultipleTelemetry(telemetry, FtcDashboard.getInstance().getTelemetry());
-        int b1Purple = 1;
-        int b1Total = 1;
-        int b2Purple = 1;
-        int b2Total = 1;
-        int b3Purple = 1;
-        int b3Total = 1;
-
-        double totalStamp1 = 0.0;
-        double purpleStamp1 = 0.0;
-        double totalStamp2 = 0.0;
-        double purpleStamp2 = 0.0;
-        double totalStamp3 = 0.0;
-        double purpleStamp3 = 0.0;
-
-        String b1 = "none";
-        String b2 = "none";
-        String b3 = "none";
-
-        double position = 0.0;
-
-        double stamp = getRuntime();
-
-        waitForStart();
-        if (isStopRequested()) return;
-
-        while (opModeIsActive()){
-
-            if ((getRuntime() % 0.3) >0.15) {
-                position = spindexer_intakePos1 + 0.015;
-            } else {
-                position = spindexer_intakePos1 - 0.015;
-            }
-            robot.spin1.setPosition(position);
-            robot.spin2.setPosition(1-position);
-
-            robot.intake.setPower(1);
-
-            // Reset the counters after 1 second of not reading a ball.
-            final double ColorCounterResetDelay = 1.0;
-            // Number of times the loop needs to run before deciding on a color.
-            final int ColorCounterTotalMinCount = 20;
-            // If the color sensor reads a color this percentage of time
-            // out of the total, declare the color.
-            // Usage: (Color Count)/(Total Count) > ColorCounterThreshold
-            final double ColorCounterThreshold  = 0.65;
-
-            if (robot.pin1.getState()){
-                if (robot.pin0.getState()){
-                    b1Purple ++;
-                }
-                b1Total++;
-                totalStamp1 = getRuntime();
-            }
-            if (getRuntime() - totalStamp1 > ColorCounterResetDelay) {
-                // Too Much time has passed without detecting ball
-                b1 = "none";
-                b1Total = 1;
-                b1Purple = 1;
-            }else if ((b1Total > ColorCounterTotalMinCount) && ((double) b1Purple / b1Total) >= ColorCounterThreshold){
-            // Enough Time has passed and we met the threshold
-                b1 = "Purple";
-            }else if (b1Total > ColorCounterTotalMinCount) {
-            // Enough Time passed WITHOUT meeting the threshold
-                b1 = "Green";
-            }
-
-            if (robot.pin3.getState()){
-                if (robot.pin2.getState()){
-                    b2Purple ++;
-                }
-                b2Total++;
-                totalStamp2 = getRuntime();
-            }
-            if (getRuntime() - totalStamp2 > ColorCounterResetDelay) {
-                // Too Much time has passed without detecting ball
-                b2 = "none";
-                b2Total = 1;
-                b2Purple = 1;
-            }else if ((b2Total > ColorCounterTotalMinCount) && ((double) b2Purple / b2Total) >= ColorCounterThreshold){
-                // Enough Time has passed and we met the threshold
-                b2 = "Purple";
-            }else if (b2Total > ColorCounterTotalMinCount) {
-                // Enough Time passed WITHOUT meeting the threshold
-                b2 = "Green";
-            }
-
-            if (robot.pin5.getState()){
-                if (robot.pin4.getState()){
-                    b3Purple ++;
-                }
-                b3Total++;
-                totalStamp3 = getRuntime();
-            }
-            if (getRuntime() - totalStamp3 > ColorCounterResetDelay) {
-                // Too Much time has passed without detecting ball
-                b3 = "none";
-                b3Total = 1;
-                b3Purple = 1;
-            }else if ((b3Total > ColorCounterTotalMinCount) && ((double) b3Purple / b3Total) >= ColorCounterThreshold){
-                // Enough Time has passed and we met the threshold
-                b3 = "Purple";
-            }else if (b3Total > ColorCounterTotalMinCount) {
-                // Enough Time passed WITHOUT meeting the threshold
-                b3 = "Green";
-            }
-
-            TELE.addData("Green1:", robot.pin1.getState());
-            TELE.addData("Purple1:", robot.pin0.getState());
-            TELE.addData("Green2:", robot.pin3.getState());
-            TELE.addData("Purple2:", robot.pin2.getState());
-            TELE.addData("Green3:", robot.pin5.getState());
-            TELE.addData("Purple3:", robot.pin4.getState());
-            TELE.addData("1", b1);
-            TELE.addData("2",b2);
-            TELE.addData("3",b3);
-
-            TELE.update();
-        }
-    }
-
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ColorSensorTest.txt

@@ -1,63 +0,0 @@
-package org.firstinspires.ftc.teamcode.tests;
-
-import com.acmerobotics.dashboard.FtcDashboard;
-import com.acmerobotics.dashboard.config.Config;
-import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
-import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
-import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
-
-import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
-import org.firstinspires.ftc.teamcode.utils.Robot;
-
-@TeleOp
-@Config
-public class ColorSensorTest extends LinearOpMode {
-    Robot robot;
-    MultipleTelemetry TELE;
-
-    @Override
-    public void runOpMode() throws InterruptedException {
-        robot = new Robot(hardwareMap);
-        TELE = new MultipleTelemetry(telemetry, FtcDashboard.getInstance().getTelemetry());
-
-        waitForStart();
-        if (isStopRequested()) return;
-
-        while (opModeIsActive()) {
-
-// ----- COLOR 1 -----
-            double green1 = robot.color1.getNormalizedColors().green;
-            double blue1  = robot.color1.getNormalizedColors().blue;
-            double red1   = robot.color1.getNormalizedColors().red;
-
-            TELE.addData("Color1 toColor", robot.color1.getNormalizedColors().toColor());
-            TELE.addData("Color1 green", green1 / (green1 + blue1 + red1));
-            TELE.addData("Color1 distance (mm)", robot.color1.getDistance(DistanceUnit.MM));
-
-
-// ----- COLOR 2 -----
-            double green2 = robot.color2.getNormalizedColors().green;
-            double blue2  = robot.color2.getNormalizedColors().blue;
-            double red2   = robot.color2.getNormalizedColors().red;
-
-            TELE.addData("Color2 toColor", robot.color2.getNormalizedColors().toColor());
-            TELE.addData("Color2 green", green2 / (green2 + blue2 + red2));
-            TELE.addData("Color2 distance (mm)", robot.color2.getDistance(DistanceUnit.MM));
-
-
-// ----- COLOR 3 -----
-            double green3 = robot.color3.getNormalizedColors().green;
-            double blue3  = robot.color3.getNormalizedColors().blue;
-            double red3   = robot.color3.getNormalizedColors().red;
-
-            TELE.addData("Color3 toColor", robot.color3.getNormalizedColors().toColor());
-            TELE.addData("Color3 green", green3 / (green3 + blue3 + red3));
-            TELE.addData("Color3 distance (mm)", robot.color3.getDistance(DistanceUnit.MM));
-
-
-            TELE.update();
-        }
-    }
-
-
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ColorTest.java

@@ -1,10 +1,13 @@
 package org.firstinspires.ftc.teamcode.tests;
 
+import static org.firstinspires.ftc.teamcode.constants.Color.colorFilterAlpha;
+
 import com.acmerobotics.dashboard.FtcDashboard;
 import com.acmerobotics.dashboard.config.Config;
 import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
+import com.qualcomm.robotcore.hardware.NormalizedRGBA;
 
 import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
 import org.firstinspires.ftc.teamcode.utils.Robot;
@@ -18,36 +21,49 @@ public class ColorTest extends LinearOpMode {
     public void runOpMode() throws InterruptedException {
         robot = new Robot(hardwareMap);
         TELE = new MultipleTelemetry(telemetry, FtcDashboard.getInstance().getTelemetry());
+        double color1Distance = 0;
+        double color2Distance = 0;
+        double color3Distance = 0;
 
         waitForStart();
         if (isStopRequested()) return;
 
         while(opModeIsActive()){
-            double green1 = robot.color1.getNormalizedColors().green;
+
-            double blue1 = robot.color1.getNormalizedColors().blue;
+
-            double red1 = robot.color1.getNormalizedColors().red;
+            NormalizedRGBA color1RGBA = robot.color1.getNormalizedColors();
+
+            double gP1 = color1RGBA.green / (color1RGBA.green + color1RGBA.red + color1RGBA.blue);
+
+            double dist1 = robot.color1.getDistance(DistanceUnit.MM);
+            color1Distance = (colorFilterAlpha * dist1) + ((1-colorFilterAlpha) * color1Distance);
 
             TELE.addData("Color1 toColor", robot.color1.getNormalizedColors().toColor());
-            TELE.addData("Color1 green", green1 / (green1 + blue1 + red1));
+            TELE.addData("Color1 green", gP1);
-            TELE.addData("Color1 distance (mm)", robot.color1.getDistance(DistanceUnit.MM));
+            TELE.addData("Color1 distance (mm)", color1Distance);
+
 
 // ----- COLOR 2 -----
             double green2 = robot.color2.getNormalizedColors().green;
             double blue2 = robot.color2.getNormalizedColors().blue;
             double red2 = robot.color2.getNormalizedColors().red;
+            double dist2 = robot.color2.getDistance(DistanceUnit.MM);
+            color2Distance = (colorFilterAlpha * dist2) + ((1-colorFilterAlpha) * color2Distance);
 
             TELE.addData("Color2 toColor", robot.color2.getNormalizedColors().toColor());
             TELE.addData("Color2 green", green2 / (green2 + blue2 + red2));
-            TELE.addData("Color2 distance (mm)", robot.color2.getDistance(DistanceUnit.MM));
+            TELE.addData("Color2 distance (mm)", color2Distance);
 
 // ----- COLOR 3 -----
             double green3 = robot.color3.getNormalizedColors().green;
             double blue3 = robot.color3.getNormalizedColors().blue;
             double red3 = robot.color3.getNormalizedColors().red;
+            double dist3 = robot.color3.getDistance(DistanceUnit.MM);
+            color3Distance = (colorFilterAlpha * dist3) + ((1-colorFilterAlpha) * color3Distance);
 
             TELE.addData("Color3 toColor", robot.color3.getNormalizedColors().toColor());
             TELE.addData("Color3 green", green3 / (green3 + blue3 + red3));
-            TELE.addData("Color3 distance (mm)", robot.color3.getDistance(DistanceUnit.MM));
+            TELE.addData("Color3 distance (mm)", color3Distance);
 
             TELE.update();
         }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/Hardware_Tester.java

@@ -0,0 +1,141 @@
+package org.firstinspires.ftc.teamcode.tests;
+
+import com.acmerobotics.dashboard.FtcDashboard;
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+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.NormalizedRGBA;
+
+import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
+import org.firstinspires.ftc.teamcode.utilsv2.Robot;
+
+@Config
+@TeleOp
+public class Hardware_Tester extends LinearOpMode {
+    Robot robot;
+    MultipleTelemetry TELE;
+
+    public static boolean subsystemMode = true;
+
+    // Bare Motor Powers
+    public static double flPow = 0;
+    public static double frPow = 0;
+    public static double blPow = 0;
+    public static double brPow = 0;
+    public static double intakePow = 0;
+    public static double transferPow = 0;
+    public static double shooter1Pow = 0;
+    public static double shooter2Pow = 0;
+
+    // Subsystem Motor Powers
+    public static double drivetrainPow = 0;
+    public static double shooterPow = 0;
+
+    // Bare Servo Positions
+    public static double spin1Pos = 0.501;
+    public static double spin2Pos = 0.501;
+    public static double turr1Pos = 0.501;
+    public static double turr2Pos = 0.501;
+    public static double transferServosPos = 0.501;
+    public static double hoodPos = 0.501;
+    public static double spindexBlockerPos = 0.501;
+    public static double rapidFireBlockerPos = 0.501;
+    public static double tilt1Pos = 0.501;
+    public static double tilt2Pos = 0.501;
+
+    // Subsystem Servo Positions
+    public static double spinPos = 0.501;
+    public static double turrPos = 0.501;
+
+    @Override
+    public void runOpMode() throws InterruptedException {
+        Robot.resetInstance();
+        robot = Robot.getInstance(hardwareMap);
+        TELE = new MultipleTelemetry(telemetry, FtcDashboard.getInstance().getTelemetry());
+
+        robot.shooter1.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
+        robot.shooter2.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
+
+        waitForStart();
+
+        if (isStopRequested()) return;
+        while (opModeIsActive()){
+            // Non-subsystem based components
+            robot.setIntakePower(intakePow);
+            robot.setTransferPower(transferPow);
+
+            if (transferServosPos != 0.501){
+                robot.setTransferServoPos(transferServosPos);
+            }
+            if (hoodPos != 0.501){
+                robot.setHoodPos(hoodPos);
+            }
+            if (rapidFireBlockerPos != 0.501){
+                robot.setRapidFireBlockerPos(rapidFireBlockerPos);
+            }
+            if (spindexBlockerPos != 0.501){
+                robot.setSpindexBlockerPos(spindexBlockerPos);
+            }
+            if (tilt1Pos != 0.501){
+                robot.setTilt1Pos(tilt1Pos);
+            }
+            if (tilt2Pos != 0.501){
+                robot.setTilt2Pos(tilt2Pos);
+            }
+
+            // Subsystem based components
+            if (subsystemMode){
+                robot.setFrontLeftPower(drivetrainPow);
+                robot.setFrontRightPower(drivetrainPow);
+                robot.setBackLeftPower(drivetrainPow);
+                robot.setBackRightPower(drivetrainPow);
+                robot.shooter1.setPower(shooterPow);
+                robot.shooter2.setPower(shooterPow);
+
+                if (spinPos != 0.501){
+                    robot.setSpinPos(spinPos);
+                }
+                if (turrPos != 0.501){
+                    robot.setTurretPos(turrPos);
+                }
+            } else {
+                robot.setFrontLeftPower(flPow);
+                robot.setFrontRightPower(frPow);
+                robot.setBackLeftPower(blPow);
+                robot.setBackRightPower(brPow);
+                robot.shooter1.setPower(shooter1Pow);
+                robot.shooter2.setPower(shooter2Pow);
+
+                if (spin1Pos != 0.501){
+                    robot.spin1.setPosition(spin1Pos);
+                }
+                if (spin2Pos != 0.501){
+                    robot.spin2.setPosition(spin2Pos);
+                }
+                if (turr1Pos != 0.501){
+                    robot.turr1.setPosition(turr1Pos);
+                }
+                if (turr2Pos != 0.501){
+                    robot.turr2.setPosition(turr2Pos);
+                }
+            }
+
+            // Sensor Data
+
+            TELE.addData("Beam Break insideBeam?", robot.insideBeam.isPressed());
+            TELE.addData("Beam Break outsideBeam?", robot.outsideBeam.isPressed());
+//            TELE.addData("Beam Break 2?", robot.beam2.isPressed());
+//            TELE.addData("Beam Break 3?", robot.beam3.isPressed());
+
+            NormalizedRGBA revColor = robot.revSensor.getNormalizedColors();
+            TELE.addData("REV Distance", robot.revSensor.getDistance(DistanceUnit.MM));
+            TELE.addData("REV Green", revColor.green / (revColor.red + revColor.blue + revColor.green));
+
+            TELE.addData("Voltage Sensor", robot.voltage.getVoltage());
+
+            TELE.update();
+        }
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/LimelightTest.java

@@ -60,7 +60,7 @@ public class LimelightTest extends LinearOpMode {
 
             if (turretMode){
                 if (turretPos != 0.501){
-                    turret.manualSetTurret(turretPos);
+                    turret.setTurret(turretPos);
                 }
             }
 

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/NewShooterTest.java

@@ -0,0 +1,147 @@
+package org.firstinspires.ftc.teamcode.tests;
+
+import com.acmerobotics.dashboard.FtcDashboard;
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
+import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
+
+import org.firstinspires.ftc.teamcode.constants.ServoPositions;
+import org.firstinspires.ftc.teamcode.pedroPathing.Constants;
+import org.firstinspires.ftc.teamcode.utilsv2.Flywheel;
+import org.firstinspires.ftc.teamcode.utilsv2.Robot;
+import org.firstinspires.ftc.teamcode.utilsv2.Shooter;
+import org.firstinspires.ftc.teamcode.utilsv2.Turret;
+
+@Config
+@TeleOp
+public class NewShooterTest extends LinearOpMode {
+
+    Robot robot;
+    Flywheel flywheel;
+    Turret turret;
+    MultipleTelemetry TELE;
+
+
+    public static boolean intake = true;
+    public static boolean shoot = false;
+    public static double intakePower = 1.0;
+    public static double transferShootPower = -1;
+    public static double transferIntakePower = -1;
+    public static double turretPos = 0.51;
+    public static double hoodPos = 0.51;
+    public static double flywheel_velo = 0;
+
+    public static double shooterP = 255, shooterI = 0, shooterD = 0, shooterF = 75;
+
+    private enum ShootState {
+        IDLE,
+        WAIT_GATE,
+        WAIT_PUSH
+    }
+
+    private ShootState shootState = ShootState.IDLE;
+    private long timestamp = 0;
+
+    @Override
+    public void runOpMode() throws InterruptedException {
+
+        Robot.resetInstance();
+
+        robot = Robot.getInstance(hardwareMap);
+
+        TELE = new MultipleTelemetry(telemetry, FtcDashboard.getInstance().getTelemetry());
+
+
+        flywheel = new Flywheel(robot);
+        turret = new Turret(robot);
+
+        Shooter shooter = new Shooter(
+                robot,
+                TELE,
+                Constants.createFollower(hardwareMap),
+                true,
+                turret,
+                flywheel
+        );
+
+        shooter.setState(Shooter.ShooterState.MANUAL);
+
+        waitForStart();
+
+        if (isStopRequested()) return;
+
+        while (opModeIsActive()) {
+
+            robot.setHoodPos(hoodPos);
+            shooter.setTurretPosition(turretPos);
+            shooter.setFlywheelVelocity(flywheel_velo);
+            double voltage = robot.voltage.getVoltage();
+            flywheel.setPIDF(shooterP, shooterI, shooterD, shooterF / voltage);
+
+            robot.setSpinPos(ServoPositions.spindexer_A2);
+
+            if (intake && !shoot) {
+
+                shootState = ShootState.IDLE;
+
+                robot.setRapidFireBlockerPos(
+                        ServoPositions.rapidFireBlocker_Closed);
+
+                robot.setTransferPower(transferIntakePower);
+                robot.setIntakePower(intakePower);
+                robot.setTransferServoPos(
+                        ServoPositions.transferServo_out);
+            } else if (shoot) {
+                robot.setIntakePower(intakePower);
+
+
+                switch (shootState) {
+
+                    case IDLE:
+
+                        robot.setTransferPower(transferShootPower);
+
+                        timestamp = System.currentTimeMillis();
+                        shootState = ShootState.WAIT_GATE;
+
+                        break;
+
+                    case WAIT_GATE:
+
+                        if (System.currentTimeMillis() - timestamp >= 300) {
+
+                            robot.setRapidFireBlockerPos(
+                                    ServoPositions.rapidFireBlocker_Open);
+
+                            timestamp = System.currentTimeMillis();
+                            shootState = ShootState.WAIT_PUSH;
+                        }
+
+                        break;
+
+                    case WAIT_PUSH:
+
+                        if (System.currentTimeMillis() - timestamp >= 100) {
+
+                            robot.setTransferServoPos(
+                                    ServoPositions.transferServo_in);
+
+                            shootState = ShootState.IDLE;
+                        }
+
+                        break;
+                }
+            }
+
+            TELE.addData("Flywheel Velocity1", (robot.shooter1.getVelocity() * 60) / 28);
+            TELE.addData("Flywheel Velocity2", (robot.shooter2.getVelocity() * 60) / 28);
+            TELE.addData("Flywheel Averag Velocity", flywheel.getAverageVelocity());
+            TELE.addData("PIDF Coefficients", Flywheel.shooterPIDF);
+            TELE.addData("Power", flywheel.getShooterPower());
+            TELE.update();
+
+            shooter.update();
+        }
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ShooterTest.java

@@ -1,23 +1,31 @@
 package org.firstinspires.ftc.teamcode.tests;
 
+import static org.firstinspires.ftc.teamcode.constants.Color.redAlliance;
+import static org.firstinspires.ftc.teamcode.constants.Front_Poses.teleStart;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.hoodOffset;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spinStartPos;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_intakePos1;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall1;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_in;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_out;
-import static org.firstinspires.ftc.teamcode.teleop.TeleopV3.spinSpeedIncrease;
+import static org.firstinspires.ftc.teamcode.utils.Targeting.turretInterpolate;
 
 import com.acmerobotics.dashboard.FtcDashboard;
 import com.acmerobotics.dashboard.config.Config;
 import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.acmerobotics.roadrunner.Pose2d;
+import com.pedropathing.geometry.Pose;
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
 import com.qualcomm.robotcore.hardware.DcMotorEx;
 
+import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
 import org.firstinspires.ftc.teamcode.utils.Flywheel;
 import org.firstinspires.ftc.teamcode.utils.Robot;
 import org.firstinspires.ftc.teamcode.utils.Servos;
 import org.firstinspires.ftc.teamcode.utils.Spindexer;
+import org.firstinspires.ftc.teamcode.utils.Targeting;
+import org.firstinspires.ftc.teamcode.utils.Turret;
 
 @Config
 @TeleOp
@@ -26,22 +34,23 @@ public class ShooterTest extends LinearOpMode {
     public static double parameter = 0.0;
     // --- CONSTANTS YOU TUNE ---
 
-    //TODO: @Daniel FIX THE BELOW CONSTANTS A LITTLE IF NEEDED
     public static double Velocity = 0.0;
     public static double P = 255.0;
     public static double I = 0.0;
     public static double D = 0.0;
-    public static double F = 7.5;
+    public static double F = 75;
     public static double transferPower = 1.0;
     public static double hoodPos = 0.501;
     public static double turretPos = 0.501;
     public static boolean shoot = false;
 
     public static boolean intake = false;
+    public static boolean turretTrack = true;
     Robot robot;
     Flywheel flywheel;
     Servos servo;
-
+    MecanumDrive drive;
+    Turret turret;
     double shootStamp = 0.0;
     boolean shootAll = false;
 
@@ -51,6 +60,7 @@ public class ShooterTest extends LinearOpMode {
     public double hoodAdjust = 0.0;
     public static double hoodAdjustFactor = 1.0;
     private int shooterTicker = 0;
+    public static double spinSpeed = 0.02;
     Spindexer spindexer ;
 
     @Override
@@ -62,30 +72,66 @@ public class ShooterTest extends LinearOpMode {
         flywheel = new Flywheel(hardwareMap);
         spindexer = new Spindexer(hardwareMap);
         servo = new Servos(hardwareMap);
+        drive = new MecanumDrive(hardwareMap, new Pose2d(0,0,0));
 
         MultipleTelemetry TELE = new MultipleTelemetry(
                 telemetry, FtcDashboard.getInstance().getTelemetry()
         );
+        turret = new Turret(robot, TELE, robot.limelight);
+        Turret.limelightUsed = true;
 
         waitForStart();
 
+        robot.limelight.start();
+
         if (isStopRequested()) return;
 
         while (opModeIsActive()) {
 
+            if (redAlliance){
+                robot.limelight.pipelineSwitch(4);
+            } else {
+                robot.limelight.pipelineSwitch(2);
+            }
+
+            //TURRET TRACKING
+            drive.updatePoseEstimate();
+
+            double robX = drive.localizer.getPose().position.x;
+            double robY = drive.localizer.getPose().position.y;
+
+            double robotHeading = drive.localizer.getPose().heading.toDouble();
+
+            double goalX = -15;
+            double goalY = 0;
+
+            double dx = robX - goalX;  // delta x from robot to goal
+            double dy = robY - goalY;  // delta y from robot to goal
+            Pose deltaPose = new Pose(dx, dy, robotHeading);
+
+            double distanceToGoal = Math.sqrt(dx * dx + dy * dy);
+
+            if (turretTrack){
+                turret.trackGoal(deltaPose);
+            } else if (turretPos != 0.501){
+                turret.setTurret(turretPos);
+            }
+
+            double voltage = robot.voltage.getVoltage();
+
             if (mode == 0) {
                 rightShooter.setPower(parameter);
                 leftShooter.setPower(parameter);
             } else if (mode == 1) {
-                flywheel.setPIDF(P, I, D, F);
+                flywheel.setPIDF(P, I, D, F / voltage);
                 flywheel.manageFlywheel((int) Velocity);
             }
 
             if (hoodPos != 0.501) {
                 if (enableHoodAutoOpen) {
-                    robot.hood.setPosition(hoodPos+(hoodAdjustFactor*(flywheel.getVelo()/Velocity)));
+                    robot.hood.setPosition(hoodPos+(hoodAdjustFactor*(flywheel.getVelo()/Velocity)) + hoodOffset);
                 } else {
-                    robot.hood.setPosition(hoodPos);
+                    robot.hood.setPosition(hoodPos + hoodOffset);
                 }
             }
 
@@ -109,7 +155,6 @@ public class ShooterTest extends LinearOpMode {
                 //intake = false;
                 //reject = false;
 
-                // TODO: Change starting position based on desired order to shoot green ball
                 //spindexPos = spindexer_intakePos1;
                 if (getRuntime() - shootStamp < 3.5) {
 
@@ -120,8 +165,11 @@ public class ShooterTest extends LinearOpMode {
                         robot.transferServo.setPosition(transferServo_in);
                         shooterTicker++;
                         double prevSpinPos = robot.spin1.getPosition();
-                        robot.spin1.setPosition(prevSpinPos + spinSpeedIncrease);
+
-                        robot.spin2.setPosition(1 - prevSpinPos - spinSpeedIncrease);
+                        if (prevSpinPos < 0.9){
+                            robot.spin1.setPosition(prevSpinPos + spinSpeed);
+                            robot.spin2.setPosition(1 - prevSpinPos - spinSpeed);
+                        }
                     }
 
 
@@ -150,6 +198,7 @@ public class ShooterTest extends LinearOpMode {
             TELE.addData("Power", robot.shooter1.getPower());
             TELE.addData("Steady?", flywheel.getSteady());
             TELE.addData("Position", robot.shooter1.getCurrentPosition());
+            TELE.addData("Voltage", voltage);
 
             TELE.update();
 

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/SortingTest.java

@@ -0,0 +1,115 @@
+package org.firstinspires.ftc.teamcode.tests;
+
+import com.acmerobotics.dashboard.FtcDashboard;
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.acmerobotics.roadrunner.ftc.Actions;
+import com.acmerobotics.roadrunner.Pose2d;
+import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
+import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
+
+import org.firstinspires.ftc.teamcode.autonomous.actions.AutoActions;
+import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
+import org.firstinspires.ftc.teamcode.utils.Flywheel;
+import org.firstinspires.ftc.teamcode.utils.Light;
+import org.firstinspires.ftc.teamcode.utils.Robot;
+import org.firstinspires.ftc.teamcode.utils.Servos;
+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;
+    MecanumDrive drive;
+    Servos servos;
+    Spindexer spindexer;
+    Flywheel flywheel;
+    Turret turret;
+    Targeting targeting;
+    Targeting.Settings targetingSettings;
+    AutoActions autoActions;
+    Light light;
+    @Override
+    public void runOpMode() throws InterruptedException {
+        robot = new Robot(hardwareMap);
+
+        TELE = new MultipleTelemetry(
+                telemetry, FtcDashboard.getInstance().getTelemetry()
+        );
+
+        flywheel = new Flywheel(hardwareMap);
+
+        targeting = new Targeting();
+        targetingSettings = new Targeting.Settings(0.0, 0.0);
+
+        spindexer = new Spindexer(hardwareMap);
+
+        servos = new Servos(hardwareMap);
+
+        turret = new Turret(robot, TELE, robot.limelight);
+
+        drive = new MecanumDrive(hardwareMap, new Pose2d(0, 0, 0));
+
+        light = Light.getInstance();
+
+        light.init(robot.light, spindexer, turret);
+
+        autoActions = new AutoActions(robot, drive, TELE, servos, flywheel, spindexer, targeting, targetingSettings, turret, light);
+
+        int motif = 21;
+        boolean intaking = true;
+
+        waitForStart();
+        if (isStopRequested()) return;
+
+        if (opModeIsActive()){
+            Actions.runBlocking(
+                    autoActions.ShakeDrivetrain(
+                            100
+                    )
+            );
+//            spindexer.setIntakePower(1);
+//            robot.transfer.setPower(1);
+//
+//            if (gamepad1.crossWasPressed()){
+//                motif = 21;
+//            } else if (gamepad1.squareWasPressed()){
+//                motif = 22;
+//            } else if (gamepad1.triangleWasPressed()){
+//                motif = 23;
+//            }
+//            flywheel.manageFlywheel(2500);
+//
+//            if (gamepad1.leftBumperWasPressed()){
+//                intaking = false;
+//                Actions.runBlocking(
+//                        autoActions.prepareShootAll(
+//                                3,
+//                                5,
+//                                motif,
+//                                0.501,
+//                                0.501,
+//                                0.501
+//                        )
+//                );
+//            } else if (gamepad1.rightBumperWasPressed()){
+//                intaking = false;
+//                Actions.runBlocking(
+//                        autoActions.shootAllAuto(
+//                                3.5,
+//                                0.014,
+//                                0.501,
+//                                0.501,
+//                                0.501
+//                        )
+//                );
+//                intaking = true;
+//            } else if (intaking){
+//                spindexer.processIntake();
+//            }
+        }
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/TurretTest.java

@@ -4,14 +4,18 @@ import com.acmerobotics.dashboard.FtcDashboard;
 import com.acmerobotics.dashboard.config.Config;
 import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
 import com.acmerobotics.roadrunner.Pose2d;
+import com.pedropathing.follower.Follower;
+import com.pedropathing.geometry.Pose;
 import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
+import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
 
 import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
+import org.firstinspires.ftc.teamcode.pedroPathing.Constants;
 import org.firstinspires.ftc.teamcode.utils.Robot;
 import org.firstinspires.ftc.teamcode.utils.Turret;
 
-@Autonomous
+@TeleOp
 @Config
 public class TurretTest extends LinearOpMode {
     public static boolean zeroTurr = false;
@@ -24,26 +28,31 @@ public class TurretTest extends LinearOpMode {
         );
 
         Turret turret = new Turret(robot, TELE, robot.limelight);
+
+        Follower follower;
+        follower = Constants.createFollower(hardwareMap);
+        Pose start = new Pose(72, 72, 0);
+        follower.setStartingPose(start);
+        follower.update();
         waitForStart();
 
-        MecanumDrive drive = new MecanumDrive(hardwareMap, new Pose2d(15, 0,0));
+        Turret.limelightUsed = false;
 
         while(opModeIsActive()){
+            follower.update();
+            turret.trackGoal(follower.getPose());
 
-            drive.updatePoseEstimate();
+//            TELE.addData("tpos", turret.getTurrPos());
-            turret.trackGoal(drive.localizer.getPose());
+//            TELE.addData("Limelight tx", turret.getBearing());
+//            TELE.addData("Limelight ty", turret.getTy());
+//            TELE.addData("Limelight X", turret.getLimelightX());
+//            TELE.addData("Limelight Y", turret.getLimelightY());
 
-            TELE.addData("tpos", turret.getTurrPos());
+//            if(zeroTurr){
-            TELE.addData("Limelight tx", turret.getBearing());
+//                turret.zeroTurretEncoder();
-            TELE.addData("Limelight ty", turret.getTy());
+//            }
-            TELE.addData("Limelight X", turret.getLimelightX());
-            TELE.addData("Limelight Y", turret.getLimelightY());
 
-            if(zeroTurr){
+//            TELE.update();
-                turret.zeroTurretEncoder();
-            }
-
-            TELE.update();
         }
 
     }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tests/ed.txt

@@ -1,210 +0,0 @@
-package org.firstinspires.ftc.teamcode.tests;
-
-import static org.firstinspires.ftc.teamcode.constants.ServoPositions.*;
-
-import com.acmerobotics.dashboard.FtcDashboard;
-import com.acmerobotics.dashboard.config.Config;
-import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
-import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
-import com.qualcomm.robotcore.eventloop.opmode.TeleOp;
-import com.qualcomm.robotcore.hardware.DcMotor;
-
-import org.firstinspires.ftc.teamcode.utils.Robot;
-import org.firstinspires.ftc.teamcode.subsystems.Shooter;
-
-@TeleOp
-@Config
-public class ShooterTest extends LinearOpMode {
-
-    Robot robot;
-
-    public static double pow = 0.0;
-    public static double vel = 0.0;
-    public static double ecpr = 1024.0; // CPR of the encoder
-    public static double hoodPos = 0.5;
-    public static double turretPos = 0.9;
-
-    public static String flyMode = "VEL";
-
-    public static boolean AutoTrack = false;
-
-    double initPos = 0.0;
-
-    double velo = 0.0;
-    double velo1 = 0.0;
-    double velo2 = 0.0;
-    double velo3 = 0.0;
-    double velo4 = 0.0;
-    double velo5 = 0.0;
-
-    double stamp1 = 0.0;
-
-    double initPos1 = 0.0;
-
-    double powPID = 0.0;
-
-    public static int maxVel = 4500;
-
-    public static boolean shoot = false;
-
-    public static int spindexPos = 1;
-
-    public static boolean intake = true;
-
-    public static int tolerance = 50;
-
-    double stamp = 0.0;
-
-    public static double kP = 0.001;           // small proportional gain (tune this)
-    public static double maxStep = 0.06;         // prevents sudden jumps
-    public static double distance = 50;
-
-    MultipleTelemetry TELE;
-
-    @Override
-    public void runOpMode() throws InterruptedException {
-
-        robot = new Robot(hardwareMap);
-
-        TELE = new MultipleTelemetry(telemetry, FtcDashboard.getInstance().getTelemetry());
-
-        Shooter shooter = new Shooter(robot, TELE);
-
-        robot.shooter1.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
-        robot.shooter2.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
-
-        shooter.setTelemetryOn(true);
-
-        shooter.setShooterMode(flyMode);
-
-        initPos = shooter.getECPRPosition();
-
-        int ticker = 0;
-
-        waitForStart();
-
-        if (isStopRequested()) return;
-
-        while (opModeIsActive()) {
-
-            ticker++;
-
-            if (AutoTrack){
-                hoodPos = hoodAnglePrediction(distance);
-                vel = velPrediction(distance);
-            }
-
-
-
-            shooter.setShooterMode(flyMode);
-
-            shooter.setManualPower(pow);
-
-            robot.hood.setPosition(hoodPos);
-            robot.turr1.setPosition(turretPos);
-            robot.turr2.setPosition(1 - turretPos);
-            if (intake) {
-                robot.transfer.setPower(0);
-                robot.intake.setPower(0.75);
-                robot.spin1.setPosition(spindexer_intakePos1);
-                robot.spin2.setPosition(1 - spindexer_intakePos1);
-            } else {
-                robot.transfer.setPower(.75 + (powPID/4));
-                robot.intake.setPower(0);
-                if (spindexPos == 1) {
-                    robot.spin1.setPosition(spindexer_outtakeBall1);
-                    robot.spin2.setPosition(1 - spindexer_outtakeBall1);
-                } else if (spindexPos == 2) {
-                    robot.spin1.setPosition(spindexer_outtakeBall2);
-                    robot.spin2.setPosition(1 - spindexer_outtakeBall2);
-                } else if (spindexPos == 3) {
-                    robot.spin1.setPosition(spindexer_outtakeBall3);
-                    robot.spin2.setPosition(1 - spindexer_outtakeBall3);
-                }
-            }
-
-            double penguin = 0;
-            if (ticker % 8 ==0){
-                penguin = shooter.getECPRPosition();
-                stamp = getRuntime();
-                velo1 = -60 * ((penguin - initPos1) / (stamp - stamp1));
-                initPos1 = penguin;
-                stamp1 = stamp;
-            }
-
-
-            velo = velo1;
-
-            double feed = vel / maxVel;        // Example: vel=2500 → feed=0.5
-
-            if (vel > 500){
-                feed = Math.log((668.39 / (vel + 591.96)) - 0.116) / -4.18;
-            }
-
-            // --- PROPORTIONAL CORRECTION ---
-            double error = vel - velo1;
-            double correction = kP * error;
-
-            // limit how fast power changes (prevents oscillation)
-            correction = Math.max(-maxStep, Math.min(maxStep, correction));
-
-            // --- FINAL MOTOR POWER ---
-            powPID = feed + correction;
-
-            // clamp to allowed range
-            powPID = Math.max(0, Math.min(1, powPID));
-
-            if (vel - velo > 1000){
-                powPID = 1;
-            } else if (velo - vel > 1000){
-                powPID = 0;
-            }
-
-            shooter.setVelocity(powPID);
-
-            if (shoot) {
-                robot.transferServo.setPosition(transferServo_in);
-            } else {
-                robot.transferServo.setPosition(transferServo_out);
-            }
-
-            shooter.update();
-
-            TELE.addData("Revolutions", shooter.getECPRPosition());
-            TELE.addData("hoodPos", shooter.gethoodPosition());
-            TELE.addData("turretPos", shooter.getTurretPosition());
-            TELE.addData("Power Fly 1", robot.shooter1.getPower());
-            TELE.addData("Power Fly 2", robot.shooter2.getPower());
-            TELE.addData("powPID", shooter.getpowPID());
-            TELE.addData("Velocity", velo);
-            TELE.update();
-
-
-        }
-
-    }
-
-    public double hoodAnglePrediction(double distance) {
-        double L = 0.298317;
-        double A = 1.02124;
-        double k = 0.0157892;
-        double n = 3.39375;
-
-        double dist = Math.sqrt(distance*distance+24*24);
-
-        return L + A * Math.exp(-Math.pow(k * dist, n));
-    }
-    public static double velPrediction(double distance) {
-
-        double x = Math.sqrt(distance*distance+24*24);
-
-
-
-        double A = -211149.992;
-        double B = -1.19943;
-        double C = 3720.15909;
-
-        return A * Math.pow(x, B) + C;
-    }
-
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Drivetrain.java

@@ -0,0 +1,103 @@
+package org.firstinspires.ftc.teamcode.utils;
+
+import com.acmerobotics.roadrunner.ProfileAccelConstraint;
+import com.acmerobotics.roadrunner.TranslationalVelConstraint;
+import com.pedropathing.follower.Follower;
+import com.pedropathing.geometry.BezierLine;
+import com.pedropathing.geometry.Pose;
+import com.pedropathing.paths.PathChain;
+import com.qualcomm.robotcore.hardware.DcMotor;
+
+public class Drivetrain {
+
+    Robot robot;
+    boolean autoDrive = false;
+
+    Pose brakePos = new Pose(0, 0, 0);
+
+//    MecanumDrive drive;
+    Follower follower;
+
+    private final TranslationalVelConstraint VEL_CONSTRAINT = new TranslationalVelConstraint(200);
+    private final ProfileAccelConstraint ACCEL_CONSTRAINT = new ProfileAccelConstraint(-Math.abs(60), 200);
+
+
+    public Drivetrain(Robot rob, Follower follower){
+
+        this.robot = rob;
+        this.follower = follower;
+
+    }
+
+    private double prevY = 0;
+    private double prevX = 0;
+    private double prevRX = 0;
+    private double prevBrake = 0;
+    public void drive(double y, double x, double rx, double brake){
+        int countConstant = 0;
+        boolean brakeChange = false;
+        if (Math.abs(prevY - y) > 0.05){
+            prevY = y;
+            countConstant++;
+        }
+        if (Math.abs(prevX - x) > 0.05){
+            prevX = x;
+            countConstant++;
+        }
+        if (Math.abs(prevRX - rx) > 0.05){
+            prevRX = rx;
+            countConstant++;
+        }
+        if (Math.abs(prevBrake - brake) > 0.05){
+            prevBrake = brake;
+            brakeChange = true;
+        }
+
+        if (!autoDrive && countConstant > 0) {
+
+            x = x* 1.1; // Counteract imperfect strafing
+
+
+            double denominator = Math.max(Math.abs(prevY) + Math.abs(prevX) + Math.abs(prevRX), 1);
+            double frontLeftPower = (prevY + prevX + prevRX) / denominator;
+            double backLeftPower = (prevY - prevX + prevRX) / denominator;
+            double frontRightPower = (prevY - prevX - prevRX) / denominator;
+            double backRightPower = (prevY + prevX - prevRX) / denominator;
+
+            robot.frontLeft.setPower(frontLeftPower);
+            robot.backLeft.setPower(backLeftPower);
+            robot.frontRight.setPower(frontRightPower);
+            robot.backRight.setPower(backRightPower);
+        }
+        Pose currentPos = follower.getPose();
+        brakePos = currentPos;
+
+        if (brake > 0.4 && robot.frontLeft.getZeroPowerBehavior() != DcMotor.ZeroPowerBehavior.BRAKE && !autoDrive) {
+            robot.frontLeft.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.BRAKE);
+            robot.frontRight.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.BRAKE);
+            robot.backLeft.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.BRAKE);
+            robot.backRight.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.BRAKE);
+
+            autoDrive = true;
+
+        } else if (brake > 0.4) {
+
+            PathChain traj2 = follower.pathBuilder()
+                    .addPath(new BezierLine(currentPos, brakePos))
+                    .setLinearHeadingInterpolation(currentPos.getHeading(), brakePos.getHeading())
+                    .build();
+
+            if (Math.abs(currentPos.getX() - brakePos.getX()) > 1 || Math.abs(currentPos.getY() - brakePos.getY()) > 1) {
+                follower.followPath(traj2);
+            }
+        } else {
+            autoDrive = false;
+            robot.frontLeft.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+            robot.frontRight.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+            robot.backLeft.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+            robot.backRight.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+
+        }
+
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Flywheel.java

@@ -12,14 +12,13 @@ public class Flywheel {
     public double velo1 = 0.0;
     public double velo2 = 0.0;
     double targetVelocity = 0.0;
-    double powPID = 0.0;
     boolean steady = false;
     public Flywheel (HardwareMap hardwareMap) {
         robot = new Robot(hardwareMap);
         shooterPIDF1 = new PIDFCoefficients
-                (robot.shooterPIDF_P, robot.shooterPIDF_I, robot.shooterPIDF_D, robot.shooterPIDF_F);
+                (Robot.shooterPIDF_P, Robot.shooterPIDF_I, Robot.shooterPIDF_D, Robot.shooterPIDF_F);
         shooterPIDF2 = new PIDFCoefficients
-                (robot.shooterPIDF_P, robot.shooterPIDF_I, robot.shooterPIDF_D, robot.shooterPIDF_F);
+                (Robot.shooterPIDF_P, Robot.shooterPIDF_I, Robot.shooterPIDF_D, Robot.shooterPIDF_F);
     }
 
     public double getVelo () {
@@ -37,6 +36,8 @@ public class Flywheel {
     }
 
     // Set the robot PIDF for the next cycle.
+    private double prevF = 0;
+    public static double voltagePIDFDifference = 0.8;
     public void setPIDF(double p, double i, double d, double f) {
         shooterPIDF1.p = p;
         shooterPIDF1.i = i;
@@ -46,6 +47,11 @@ public class Flywheel {
         shooterPIDF2.i = i;
         shooterPIDF2.d = d;
         shooterPIDF2.f = f;
+        if (Math.abs(prevF - f) > voltagePIDFDifference){
+            robot.shooter1.setPIDFCoefficients(DcMotor.RunMode.RUN_USING_ENCODER, shooterPIDF1);
+            robot.shooter2.setPIDFCoefficients(DcMotor.RunMode.RUN_USING_ENCODER, shooterPIDF2);
+            prevF = f;
+        }
     }
 
     // Convert from RPM to Ticks per Second
@@ -54,25 +60,23 @@ public class Flywheel {
     // Convert from Ticks per Second to RPM
     private double TPS_to_RPM (double TPS) { return (TPS*60.0)/28.0;}
 
-    public double manageFlywheel(double commandedVelocity) {
+    public void manageFlywheel(double commandedVelocity) {
-        targetVelocity = commandedVelocity;
 
-        // Add code here to set PIDF based on desired RPM
+        if (Math.abs(targetVelocity - commandedVelocity) > 0.0001) {
+            targetVelocity = commandedVelocity;
+            // Add code here to set PIDF based on desired RPM
+            //robot.shooter1.setPIDFCoefficients(DcMotor.RunMode.RUN_USING_ENCODER, shooterPIDF1);
+            //robot.shooter2.setPIDFCoefficients(DcMotor.RunMode.RUN_USING_ENCODER, shooterPIDF2);
 
-        robot.shooter1.setPIDFCoefficients(DcMotor.RunMode.RUN_USING_ENCODER, shooterPIDF1);
+        }
-        robot.shooter2.setPIDFCoefficients(DcMotor.RunMode.RUN_USING_ENCODER, shooterPIDF2);
         robot.shooter1.setVelocity(RPM_to_TPS(targetVelocity));
         robot.shooter2.setVelocity(RPM_to_TPS(targetVelocity));
-
-        // Record Current Velocity
         velo1 = TPS_to_RPM(robot.shooter1.getVelocity());
         velo2 = TPS_to_RPM(robot.shooter2.getVelocity());
-        velo = Math.max(velo1,velo2);
+        velo = Math.max(velo1, velo2);
-
         // really should be a running average of the last 5
-        steady = (Math.abs(targetVelocity - velo) < 200.0);
+        steady = (Math.abs(commandedVelocity - velo) < 50);
 
-        return powPID;
     }
 
     public void update()

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/FlywheelV2.java

@@ -1,110 +0,0 @@
-package org.firstinspires.ftc.teamcode.utils;
-
-import com.acmerobotics.dashboard.config.Config;
-
-@Config
-public class FlywheelV2 {
-    public static double kP = 0.001;           // small proportional gain (tune this)
-    public static double maxStep = 0.06;         // prevents sudden jumps
-    double initPos1 = 0.0;
-    double initPos2 = 0.0;
-    double stamp = 0.0;
-    double stamp1 = 0.0;
-    double ticker = 0.0;
-    double currentPos1 = 0.0;
-    double currentPos2 = 0.0;
-    double velo = 0.0;
-    double velo1 = 0.0;
-    double velo1a = 0.0;
-    double velo1b = 0.0;
-    double velo2 = 0.0;
-    double velo3 = 0.0;
-    double velo4 = 0.0;
-    double velo5 = 0.0;
-    double targetVelocity = 0.0;
-    double powPID = 0.0;
-    boolean steady = false;
-
-    public FlywheelV2() {
-        //robot = new Robot(hardwareMap);
-    }
-
-    public double getVelo(double shooter1CurPos, double shooter2CurPos) {
-        ticker++;
-        if (ticker % 2 == 0) {
-            velo5 = velo4;
-            velo4 = velo3;
-            velo3 = velo2;
-            velo2 = velo1;
-
-            currentPos1 = shooter1CurPos / 28;
-            currentPos2 = shooter2CurPos / 28;
-            stamp = getTimeSeconds(); //getRuntime();
-            velo1a = 60 * ((currentPos1 - initPos1) / (stamp - stamp1));
-            velo1b = 60 * ((currentPos2 - initPos2) / (stamp - stamp1));
-            initPos1 = currentPos1;
-            initPos2 = currentPos2;
-            stamp1 = stamp;
-
-            if (velo1a < 200){
-                velo1 = velo1b;
-            } else if (velo1b < 200){
-                velo1 = velo1a;
-            } else {
-                velo1 = (velo1a + velo1b) / 2;
-            }
-        }
-        return ((velo1 + velo2 + velo3 + velo4 + velo5) / 5);
-    }
-
-    public double getVelo1() { return (velo1a + velo2 + velo3 + velo4 + velo5) / 5; }
-
-    public double getVelo2() { return (velo1b + velo2 + velo3 + velo4 + velo5) / 5; }
-
-    public boolean getSteady() {
-        return steady;
-    }
-
-    private double getTimeSeconds() {
-        return (double) System.currentTimeMillis() / 1000.0;
-    }
-
-    public double manageFlywheel(int commandedVelocity, double shooter1CurPos, double shooter2CurPos) {
-        targetVelocity = commandedVelocity;
-        velo = getVelo(shooter1CurPos, shooter2CurPos);
-        // Flywheel PID code here
-        if (targetVelocity - velo > 4500) {
-            powPID = 1.0;
-        } else if (velo - targetVelocity > 4500) {
-            powPID = 0.0;
-        } else {
-
-            double a = 2539.07863;
-            double c = 1967.6498;
-            double d = -0.289647;
-            double h = -1.1569;
-
-            double feed = Math.log10((a / (targetVelocity + c)) + d) / h;
-
-            // --- PROPORTIONAL CORRECTION ---
-            double error = targetVelocity - velo;
-            double correction = kP * error;
-
-            // limit how fast power changes (prevents oscillation)
-            correction = Math.max(-maxStep, Math.min(maxStep, correction));
-
-            // --- FINAL MOTOR POWER ---
-            powPID = feed + correction;
-
-            // clamp to allowed range
-            powPID = Math.max(0, Math.min(1, powPID));
-        }
-
-        steady = (Math.abs(targetVelocity - velo) < 100.0);
-
-        return powPID;
-    }
-
-    public void update() {
-    }
-}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Light.java

@@ -0,0 +1,108 @@
+package org.firstinspires.ftc.teamcode.utils;
+
+import com.acmerobotics.dashboard.config.Config;
+import com.qualcomm.robotcore.hardware.Servo;
+
+import org.firstinspires.ftc.teamcode.constants.Color;
+import org.firstinspires.ftc.teamcode.constants.StateEnums.LightState;
+
+
+@Config
+public final class Light {
+
+    private static Light instance;
+    public static  double ballColorCycleTime = 1000; //in ms
+    public static double restingTime = 125; //in ms
+
+    private Servo lightServo;
+    private LightState state = LightState.DISABLED;
+
+    // References to other systems (NOT static)
+    private Spindexer spindexer;
+    private Turret turret;
+    private double manualLightColor = Color.Light0;
+
+    private double lightColor = Color.Light0;
+    private double previousLightColor = lightColor;
+
+    private Light() {
+    }
+
+    public static synchronized Light getInstance() {
+        if (instance == null) {
+            instance = new Light();
+        }
+        return instance;
+    }
+
+    // Call once in OpMode init()
+    public void init(
+            Servo servo,
+            Spindexer spin,
+            Turret turr
+    ) {
+        this.lightServo = servo;
+        this.spindexer = spin;
+        this.turret = turr;
+    }
+
+    public void setManualLightColor(double value) {
+        this.manualLightColor = value;
+    }
+
+    public void setState(LightState newState) {
+        state = newState;
+    }
+
+    public void update() {
+        if (lightServo == null) return;
+
+        switch (state) {
+
+            case BALL_COUNT:
+                lightColor = spindexer.ballCounterLight();
+                break;
+
+            case BALL_COLOR:
+                double currentTime = System.currentTimeMillis();
+                if ((currentTime % ballColorCycleTime) < ((ballColorCycleTime / 3) - restingTime)) {
+                    lightColor = spindexer.getRearCenterLight();
+                } else if ((currentTime % ballColorCycleTime) < (ballColorCycleTime / 3)) {
+                    lightColor = 0;
+                } else if ((currentTime % ballColorCycleTime) < ((2 * ballColorCycleTime / 3) - restingTime)) {
+                    lightColor = spindexer.getDriverLight();
+
+                } else if ((currentTime % ballColorCycleTime) < (2 * ballColorCycleTime / 3)) {
+                    lightColor = 0;
+                } else if ((currentTime % ballColorCycleTime) < (ballColorCycleTime - restingTime)) {
+                    lightColor = spindexer.getPassengerLight();
+
+                } else {
+                    lightColor = 0;
+                }
+                break;
+
+            case GOAL_LOCK:
+                lightColor = turret.getLightColor();
+                break;
+
+            case MANUAL:
+                lightColor = manualLightColor;
+                break;
+
+            case DISABLED:
+                break;
+
+            case OFF:
+                lightColor = 0;
+                break;
+        }
+
+        if (lightColor != previousLightColor) {
+            lightServo.setPosition(lightColor);
+        }
+
+        previousLightColor = lightColor;
+
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/MeasuringLoopTimes.java

@@ -0,0 +1,66 @@
+package org.firstinspires.ftc.teamcode.utils;
+
+import com.qualcomm.robotcore.util.ElapsedTime;
+
+public class MeasuringLoopTimes {
+    private ElapsedTime elapsedtime;
+    private double minLoopTime = 999999999999.0;
+
+    private double maxLoopTime = 0.0;
+    double mainLoopTime = 0.0;
+
+    private double MeasurementStart = 0.0;
+    double currentTime = 0.0;
+
+    private double avgLoopTime = 0.0;
+    private int avgLoopTimeTicker = 0;
+    private double avgLoopTimeSum = 0;
+
+    private double getTimeSeconds ()
+    {
+        return (double) System.currentTimeMillis()/1000.0;
+    }
+
+    public void init() {
+        elapsedtime = new ElapsedTime();
+        elapsedtime.reset();
+
+        MeasurementStart = getTimeSeconds();
+    }
+
+
+    public double getAvgLoopTime() {
+        return avgLoopTime;
+    }
+
+    public double getMaxLoopTimeOneMin() {
+        return maxLoopTime;
+    }
+
+    public double getMinLoopTimeOneMin() {
+        return minLoopTime;
+    }
+
+    public void loop() {
+        currentTime = getTimeSeconds();
+        if ((MeasurementStart + 5.0) < currentTime)
+        {
+            minLoopTime = 9999999.0;
+            maxLoopTime = 0.0;
+            MeasurementStart = currentTime;
+
+            avgLoopTime = avgLoopTimeSum / (double) avgLoopTimeTicker;
+            avgLoopTimeSum = 0.0;
+            avgLoopTimeTicker = 0;
+        }
+
+        mainLoopTime = elapsedtime.milliseconds();
+        elapsedtime.reset();
+
+        avgLoopTimeSum += mainLoopTime;
+        avgLoopTimeTicker++;
+        minLoopTime = Math.min(minLoopTime,mainLoopTime);
+        maxLoopTime = Math.max(maxLoopTime,mainLoopTime);
+    }
+
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/PositionalServoProgrammer.java

@@ -35,7 +35,7 @@ public class PositionalServoProgrammer extends LinearOpMode {
         waitForStart();
         if (isStopRequested()) return;
         while (opModeIsActive()){
-            if (spindexPos != 0.501 && !servo.spinEqual(spindexPos)){
+            if (spindexPos != 0.501){
                 robot.spin1.setPosition(spindexPos);
                 robot.spin2.setPosition(1-spindexPos);
             }
@@ -52,16 +52,6 @@ public class PositionalServoProgrammer extends LinearOpMode {
             if (light !=0.501){
                 robot.light.setPosition(light);
             }
-            // To check configuration of spindexer:
-            // Set "mode" to 1 and spindexPow to 0.1
-            // If the spindexer is turning clockwise, the servos are reversed. Swap the configuration of the two servos, DO NOT TOUCH THE ACTUAL CODE
-            // Do the previous test again to confirm
-            // Set "mode" to 0 but keep spindexPos at 0.501
-            // Manually turn the spindexer until "spindexer pos" is set close to 0
-            // Check each spindexer voltage:
-                // If "spindexer voltage 1" is closer to 0 than "spindexer voltage 2," then you are done!
-                // If "spindexer voltage 2" is closer to 0 than "spindexer voltage 1," swap the two spindexer analog inputs in the configuration, DO NOT TOUCH THE ACTUAL CODE
-            //TODO: @KeshavAnandCode do the above please
 
             TELE.addData("spindexer pos", servo.getSpinPos());
             TELE.addData("turret pos", robot.turr1.getPosition());

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Robot.java

@@ -1,17 +1,17 @@
 package org.firstinspires.ftc.teamcode.utils;
 
 import com.acmerobotics.dashboard.config.Config;
-import com.arcrobotics.ftclib.hardware.ServoEx;
 import com.qualcomm.hardware.limelightvision.Limelight3A;
 import com.qualcomm.hardware.rev.RevColorSensorV3;
 import com.qualcomm.robotcore.hardware.AnalogInput;
-import com.qualcomm.robotcore.hardware.CRServo;
 import com.qualcomm.robotcore.hardware.DcMotor;
 import com.qualcomm.robotcore.hardware.DcMotorEx;
 import com.qualcomm.robotcore.hardware.DcMotorSimple;
 import com.qualcomm.robotcore.hardware.HardwareMap;
 import com.qualcomm.robotcore.hardware.PIDFCoefficients;
 import com.qualcomm.robotcore.hardware.Servo;
+import com.qualcomm.robotcore.hardware.TouchSensor;
+import com.qualcomm.robotcore.hardware.VoltageSensor;
 
 import org.firstinspires.ftc.robotcore.external.hardware.camera.WebcamName;
 import org.firstinspires.ftc.vision.apriltag.AprilTagProcessor;
@@ -30,21 +30,31 @@ public class Robot {
     public DcMotorEx intake;
     public DcMotorEx transfer;
     public PIDFCoefficients shooterPIDF;
-    public double shooterPIDF_P = 255.0;
+    public static double shooterPIDF_P = 255;
-    public double shooterPIDF_I = 0.0;
+    public static double shooterPIDF_I = 0.0;
-    public double shooterPIDF_D = 0.0;
+    public static double shooterPIDF_D = 0.0;
-    public double shooterPIDF_F = 7.5;
+    public static double shooterPIDF_F = 75;
-    public double[] shooterPIDF_StepSizes = {10.0, 1.0, 0.001, 0.0001};
+//    public double[] shooterPIDF_StepSizes = {10.0, 1.0, 0.001, 0.0001};
     public DcMotorEx shooter1;
     public DcMotorEx shooter2;
     public Servo hood;
     public Servo transferServo;
+    public Servo spindexBlocker;
+    public Servo rapidFireBlocker;
+    public Servo tilt1;
+    public Servo tilt2;
     public Servo turr1;
     public Servo turr2;
-
     public Servo spin1;
-
     public Servo spin2;
+    public TouchSensor beam1;
+    public TouchSensor beam2;
+    public TouchSensor beam3;
+    public RevColorSensorV3 revSensor;
+
+    public VoltageSensor voltage;
+
+    // Below is disregarded
     public AnalogInput spin1Pos;
     public AnalogInput spin2Pos;
     public AnalogInput turr1Pos;
@@ -60,7 +70,6 @@ public class Robot {
     public Robot(HardwareMap hardwareMap) {
 
         //Define components w/ hardware map
-        //TODO: fix the configuration of these - I trust you to figure it out yourself @KeshavAnandCode
         frontLeft = hardwareMap.get(DcMotorEx.class, "fl");
         frontRight = hardwareMap.get(DcMotorEx.class, "fr");
         backLeft = hardwareMap.get(DcMotorEx.class, "bl");
@@ -74,11 +83,12 @@ public class Robot {
         backRight.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
 
         intake = hardwareMap.get(DcMotorEx.class, "intake");
+        intake.setDirection(DcMotorSimple.Direction.REVERSE);
 
         shooter1 = hardwareMap.get(DcMotorEx.class, "shooter1");
 
         shooter2 = hardwareMap.get(DcMotorEx.class, "shooter2");
-        //TODO: figure out which shooter motor is reversed using ShooterTest and change it in code @KeshavAnandCode
+
         shooter1.setDirection(DcMotorSimple.Direction.REVERSE);
         shooterPIDF = new PIDFCoefficients(shooterPIDF_P, shooterPIDF_I, shooterPIDF_D, shooterPIDF_F);
         shooter1.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
@@ -90,35 +100,50 @@ public class Robot {
 
         hood = hardwareMap.get(Servo.class, "hood");
 
-        turr1 = hardwareMap.get(Servo.class, "t1");
+        turr1 = hardwareMap.get(Servo.class, "turr1");
 
-        turr2 = hardwareMap.get(Servo.class, "t2");
+        turr2 = hardwareMap.get(Servo.class, "turr2");
 
-        turr1Pos = hardwareMap.get(AnalogInput.class, "t1Pos"); // Encoder of turret plugged in intake port
+        spin1 = hardwareMap.get(Servo.class, "spin1");
 
-        //TODO: check spindexer configuration (both servo and analog input) - check comments in PositionalServoProgrammer
+        spin2 = hardwareMap.get(Servo.class, "spin2");
-        spin1 = hardwareMap.get(Servo.class, "spin2");
-
-        spin1Pos = hardwareMap.get(AnalogInput.class, "spin1Pos");
-
-        spin2 = hardwareMap.get(Servo.class, "spin1");
-
-        spin2Pos = hardwareMap.get(AnalogInput.class, "spin2Pos");
 
         transfer = hardwareMap.get(DcMotorEx.class, "transfer");
+        transfer.setDirection(DcMotorSimple.Direction.REVERSE);
 
         transferServo = hardwareMap.get(Servo.class, "transferServo");
 
-        transferServoPos = hardwareMap.get(AnalogInput.class, "tSPos");
-
         transfer.setDirection(DcMotorSimple.Direction.REVERSE);
         transfer.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
 
-        color1 = hardwareMap.get(RevColorSensorV3.class, "c1");
+        spindexBlocker = hardwareMap.get(Servo.class, "spinB");
 
-        color2 = hardwareMap.get(RevColorSensorV3.class, "c2");
+        rapidFireBlocker = hardwareMap.get(Servo.class, "rapidB");
 
-        color3 = hardwareMap.get(RevColorSensorV3.class, "c3");
+        tilt1 = hardwareMap.get(Servo.class, "tilt1");
+        tilt2 = hardwareMap.get(Servo.class, "tilt2");
+
+//        beam1 = hardwareMap.get(TouchSensor.class, "beam1");
+//        beam2 = hardwareMap.get(TouchSensor.class, "beam2");
+//        beam3 = hardwareMap.get(TouchSensor.class, "beam3");
+
+        revSensor = hardwareMap.get(RevColorSensorV3.class, "rev");
+
+        // Below is disregarded
+
+//        turr1Pos = hardwareMap.get(AnalogInput.class, "t1Pos"); // Encoder of turret plugged in intake port
+//
+//        spin1Pos = hardwareMap.get(AnalogInput.class, "spin1Pos");
+//
+//        spin2Pos = hardwareMap.get(AnalogInput.class, "spin2Pos");
+//
+//        transferServoPos = hardwareMap.get(AnalogInput.class, "tSPos");
+//
+//        color1 = hardwareMap.get(RevColorSensorV3.class, "c1");
+//
+//        color2 = hardwareMap.get(RevColorSensorV3.class, "c2");
+//
+//        color3 = hardwareMap.get(RevColorSensorV3.class, "c3");
 
         if (usingLimelight) {
             limelight = hardwareMap.get(Limelight3A.class, "limelight");
@@ -127,6 +152,144 @@ public class Robot {
             aprilTagProcessor = AprilTagProcessor.easyCreateWithDefaults();
         }
 
-        light = hardwareMap.get(Servo.class, "light");
+//        light = hardwareMap.get(Servo.class, "light");
+
+        voltage = hardwareMap.voltageSensor.iterator().next();
+    }
+
+    // Voids below are used to minimize hardware calls to minimize loop times
+
+    // Used to cut off digits that are negligible
+    private final int maxDigits = 5;
+    private final int roundingFactor = (int) Math.pow(10, maxDigits);
+
+    private double prevFrontLeftPower = -10.501;
+    public void setFrontLeftPower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevFrontLeftPower){
+            frontLeft.setPower(pow);
+        }
+        prevFrontLeftPower = pow;
+    }
+
+    private double prevFrontRightPower = -10.501;
+    public void setFrontRightPower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevFrontRightPower){
+            frontRight.setPower(pow);
+        }
+        prevFrontRightPower = pow;
+    }
+
+    private double prevBackLeftPower = -10.501;
+    public void setBackLeftPower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevBackLeftPower){
+            backLeft.setPower(pow);
+        }
+        prevBackLeftPower = pow;
+    }
+
+    private double prevBackRightPower = -10.501;
+    public void setBackRightPower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevBackRightPower){
+            backRight.setPower(pow);
+        }
+        prevBackRightPower = pow;
+    }
+
+    private double prevIntakePower = -10.501;
+    public void setIntakePower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevIntakePower){
+            intake.setPower(pow);
+        }
+        prevIntakePower = pow;
+    }
+
+    private double prevTransferPower = -10.501;
+    public void setTransferPower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevTransferPower){
+            transfer.setPower(pow);
+        }
+        prevTransferPower = pow;
+    }
+
+    // shooter motors are done in separate class
+
+    private double prevHoodPos = -10.501;
+    public void setHoodPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevHoodPos){
+            hood.setPosition(pos);
+        }
+        prevHoodPos = pos;
+    }
+
+    private double prevTransferServoPos = -10.501;
+    public void setTransferServoPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevTransferServoPos){
+            transferServo.setPosition(pos);
+        }
+        prevTransferServoPos = pos;
+    }
+
+    private double prevSpinPos = -10.501;
+    public void setSpinPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevSpinPos){
+            spin1.setPosition(pos);
+            spin2.setPosition(pos);
+        }
+        prevSpinPos = pos;
+    }
+
+    private double prevTurretPos = -10.501;
+    public void setTurretPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevTurretPos){
+            turr1.setPosition(pos);
+            turr2.setPosition(pos);
+        }
+        prevTurretPos = pos;
+    }
+
+    private double prevTilt1Pos = -10.501;
+    public void setTilt1Pos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevTilt1Pos){
+            tilt1.setPosition(pos);
+        }
+        prevTilt1Pos = pos;
+    }
+
+    private double prevTilt2Pos = -10.501;
+    public void setTilt2Pos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevTilt2Pos){
+            tilt2.setPosition(pos);
+        }
+        prevTilt2Pos = pos;
+    }
+
+    private double prevSpindexBlockerPos = -10.501;
+    public void setSpindexBlockerPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevSpindexBlockerPos){
+            spindexBlocker.setPosition(pos);
+        }
+        prevSpindexBlockerPos = pos;
+    }
+
+    private double prevRapidFireBlockerPos = -10.501;
+    public void setRapidFireBlockerPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevRapidFireBlockerPos){
+            rapidFireBlocker.setPosition(pos);
+        }
+        prevRapidFireBlockerPos = pos;
     }
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Servos.java

@@ -1,5 +1,7 @@
 package org.firstinspires.ftc.teamcode.utils;
 
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.hoodOffset;
+
 import com.acmerobotics.dashboard.config.Config;
 import com.arcrobotics.ftclib.controller.PIDFController;
 import com.qualcomm.robotcore.hardware.HardwareMap;
@@ -12,12 +14,19 @@ public class Servos {
     public static double turrP = 1.1, turrI = 0.25, turrD = 0.0625, turrF = 0;
     public static double spin_scalar = 1.112;
     public static double spin_restPos = 0.155;
-    public static double turret_scalar = 1.009;
-    public static double turret_restPos = 0.0;
     Robot robot;
     PIDFController spinPID;
     PIDFController turretPID;
 
+    private double prevSpinPos = 0.0;
+    private boolean firstSpinPos = true;
+
+    private double prevTransferPos = 0.0;
+    private boolean firstTransferPos = true;
+
+    private double prevHoodPos = 0.0;
+    private boolean firstHoodPos = true;
+
     public Servos(HardwareMap hardwareMap) {
         robot = new Robot(hardwareMap);
         spinPID = new PIDFController(spinP, spinI, spinD, spinF);
@@ -32,24 +41,44 @@ public class Servos {
         return spin_scalar * ((robot.spin1Pos.getVoltage() - spin_restPos) / 3.3);
     }
 
-    public double setSpinPos(double pos) {
+    public double getSpinCmdPos() {
+        return prevSpinPos;
+    }
 
+    public static boolean servoPosEqual(double pos1, double pos2) {
+        return (Math.abs(pos1 - pos2) < 0.005);
+    }
+
+    public void setTransferPos(double pos) {
+        if (firstTransferPos || !servoPosEqual(pos, prevTransferPos)) {
+            robot.transferServo.setPosition(pos);
+            firstTransferPos = false;
+        }
+
+        prevTransferPos = pos;
+    }
+
+    public double setSpinPos(double pos) {
+        if (firstSpinPos || !servoPosEqual(pos, prevSpinPos)) {
+            robot.spin1.setPosition(pos);
+            robot.spin2.setPosition(1-pos);
+            firstSpinPos = false;
+        }
+
+        prevSpinPos = pos;
         return pos;
     }
 
+    public void setHoodPos(double pos){
+        if (firstHoodPos || !servoPosEqual(pos, prevHoodPos)) {
+            robot.hood.setPosition(pos + hoodOffset);
+            firstHoodPos = false;
+        }
+
+        prevHoodPos = pos;
+    }
+
     public boolean spinEqual(double pos) {
-        return Math.abs(pos - this.getSpinPos()) < 0.03;
+        return Math.abs(pos - this.getSpinPos()) < 0.05;
-    }
-
-    public double getTurrPos() {
-        return 1.0;
-    }
-
-    public double setTurrPos(double pos) {
-        return 1.0;
-    }
-
-    public boolean turretEqual(double pos) {
-        return true;
     }
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Spindexer.java

@@ -3,23 +3,32 @@ package org.firstinspires.ftc.teamcode.utils;
 import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
 import com.arcrobotics.ftclib.controller.PIDFController;
 import com.qualcomm.robotcore.hardware.HardwareMap;
+import com.qualcomm.robotcore.hardware.NormalizedColorSensor;
+import com.qualcomm.robotcore.hardware.NormalizedRGBA;
 
 import static org.firstinspires.ftc.teamcode.constants.Color.*;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.shootAllSpindexerSpeedIncrease;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spinEndPos;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spinStartPos;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_intakePos1;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_intakePos2;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_intakePos3;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall1;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall2;
 import static org.firstinspires.ftc.teamcode.constants.ServoPositions.spindexer_outtakeBall3;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_in;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.transferServo_out;
 import static org.firstinspires.ftc.teamcode.utils.Servos.spinD;
 import static org.firstinspires.ftc.teamcode.utils.Servos.spinF;
 import static org.firstinspires.ftc.teamcode.utils.Servos.spinI;
 import static org.firstinspires.ftc.teamcode.utils.Servos.spinP;
 
 import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
-import org.firstinspires.ftc.teamcode.constants.Types;
+import org.firstinspires.ftc.teamcode.constants.StateEnums;
 import org.firstinspires.ftc.teamcode.libs.RR.MecanumDrive;
 
+import java.util.Objects;
+
 public class Spindexer {
 
     Robot robot;
@@ -39,7 +48,16 @@ public class Spindexer {
     public double distanceFrontDriver = 0.0;
     public double distanceFrontPassenger = 0.0;
 
-    public Types.Motif desiredMotif = Types.Motif.NONE;
+    public double spindexerWiggle = 0.03;
+
+    public double spindexerOuttakeWiggle = 0.01;
+    private double prevPos = 0.0;
+    public double spindexerPosOffset = 0.00;
+    public static int shootWaitMax = 4;
+    public static boolean whileShooting = false;
+    public static int waitFirstBallTicks = 4;
+    private int shootTicks = 0;
+    public StateEnums.Motif desiredMotif = StateEnums.Motif.NONE;
     // For Use
     enum RotatedBallPositionNames {
         REARCENTER,
@@ -67,12 +85,17 @@ public class Spindexer {
         SHOOTMOVING,
         SHOOTWAIT,
         SHOOT_ALL_PREP,
-        SHOOT_ALL_READY
+        SHOOT_ALL_READY,
+        SHOOT_PREP_CONTINOUS,
+        SHOOT_CONTINOUS
     }
 
+    int shootWaitCount = 0;
+
     public IntakeState currentIntakeState = IntakeState.UNKNOWN_START;
+    public IntakeState prevIntakeState = IntakeState.UNKNOWN_START;
     public int unknownColorDetect = 0;
-    enum BallColor {
+    public enum BallColor {
         UNKNOWN,
         GREEN,
         PURPLE
@@ -107,7 +130,9 @@ public class Spindexer {
 
 
     double[] outakePositions =
-            {spindexer_outtakeBall1, spindexer_outtakeBall2, spindexer_outtakeBall3};
+            {spindexer_outtakeBall1+spindexerPosOffset,
+                    spindexer_outtakeBall2+spindexerPosOffset,
+                    spindexer_outtakeBall3+spindexerPosOffset};
 
     double[] intakePositions =
             {spindexer_intakePos1, spindexer_intakePos2, spindexer_intakePos3};
@@ -133,6 +158,9 @@ public class Spindexer {
         ballPositions[pos].isEmpty = true;
         ballPositions[pos].foundEmpty = 0;
         ballPositions[pos].ballColor = BallColor.UNKNOWN;
+        distanceRearCenter = 61;
+        distanceFrontDriver = 61;
+        distanceFrontPassenger = 61;
     }
 
     public void resetSpindexer () {
@@ -145,55 +173,69 @@ public class Spindexer {
     // Detects if a ball is found and what color.
     // Returns true is there was a new ball found in Position 1
     // FIXIT: Reduce number of times that we read the color sensors for loop times.
+    public static boolean teleop = false;
     public boolean detectBalls(boolean detectRearColor, boolean detectFrontColor) {
 
         boolean newPos1Detection = false;
         int spindexerBallPos = 0;
+        double rearDistance;
+        double frontDriverDistance;
+        double frontPassengerDistance;
+        if (teleop){
+            rearDistance = 48;
+            frontDriverDistance = 50;
+            frontPassengerDistance = 29;
+            detectFrontColor = false;
+            detectRearColor = false;
+        } else {
+            rearDistance = 48;
+            frontDriverDistance = 56;
+            frontPassengerDistance = 29;
+        }
 
         // Read Distances
-        distanceRearCenter = robot.color1.getDistance(DistanceUnit.MM);
+        double dRearCenter = robot.color1.getDistance(DistanceUnit.MM);
-        distanceFrontDriver = robot.color2.getDistance(DistanceUnit.MM);
+        distanceRearCenter = (colorFilterAlpha * dRearCenter) + ((1-colorFilterAlpha) * distanceRearCenter);
-        distanceFrontPassenger = robot.color3.getDistance(DistanceUnit.MM);
+        double dFrontDriver = robot.color2.getDistance(DistanceUnit.MM);
+        distanceFrontDriver = (colorFilterAlpha * dFrontDriver) + ((1-colorFilterAlpha) * distanceFrontDriver);
+        double dFrontPassenger = robot.color3.getDistance(DistanceUnit.MM);
+        distanceFrontPassenger = (colorFilterAlpha * dFrontPassenger) + ((1-colorFilterAlpha) * distanceFrontPassenger);
 
         // Position 1
-        if (distanceRearCenter < 43) {
+        if (distanceRearCenter < rearDistance) {
 
             // Mark Ball Found
             newPos1Detection = true;
 
-            if (detectRearColor) {
+            if (detectRearColor && !teleop) {
                 // Detect which color
-                double green = robot.color1.getNormalizedColors().green;
+                NormalizedRGBA color1RGBA = robot.color1.getNormalizedColors();
-                double red = robot.color1.getNormalizedColors().red;
-                double blue = robot.color1.getNormalizedColors().blue;
 
-                double gP = green / (green + red + blue);
+                double gP = color1RGBA.green / (color1RGBA.green + color1RGBA.red + color1RGBA.blue);
 
                 // FIXIT - Add filtering to improve accuracy.
-                if (gP >= 0.4) {
+                if (gP >= 0.38) {
-                    ballPositions[commandedIntakePosition].ballColor = BallColor.PURPLE;  // purple
+                    ballPositions[commandedIntakePosition].ballColor = BallColor.GREEN;  // green
                 } else {
-                    ballPositions[commandedIntakePosition].ballColor = BallColor.GREEN;  // purple
+                    ballPositions[commandedIntakePosition].ballColor = BallColor.PURPLE;  // purple
                 }
-           }
+            }
         }
         // Position 2
         // Find which ball position this is in the spindexer
         spindexerBallPos = RotatedBallPositions[commandedIntakePosition][RotatedBallPositionNames.FRONTDRIVER.ordinal()];
-        if (distanceFrontDriver < 60) {
+        if (distanceFrontDriver < frontDriverDistance) {
             // reset FoundEmpty because looking for 3 in a row before reset
             ballPositions[spindexerBallPos].foundEmpty = 0;
-            if (detectFrontColor) {
+            if (detectFrontColor && !teleop) {
-                double green = robot.color2.getNormalizedColors().green;
+                NormalizedRGBA color2RGBA = robot.color2.getNormalizedColors();
-                double red = robot.color2.getNormalizedColors().red;
-                double blue = robot.color2.getNormalizedColors().blue;
 
-                double gP = green / (green + red + blue);
+                double gP = color2RGBA.green / (color2RGBA.green + color2RGBA.red + color2RGBA.blue);
 
                 if (gP >= 0.4) {
-                    ballPositions[spindexerBallPos].ballColor = BallColor.PURPLE;  // purple
+                    ballPositions[spindexerBallPos].ballColor = BallColor.GREEN;  // green
                 } else {
-                    ballPositions[spindexerBallPos].ballColor = BallColor.GREEN;  // purple
+                    ballPositions[spindexerBallPos].ballColor = BallColor.PURPLE;  // purple
                 }
             }
         } else {
@@ -208,21 +250,19 @@ public class Spindexer {
 
         // Position 3
         spindexerBallPos = RotatedBallPositions[commandedIntakePosition][RotatedBallPositionNames.FRONTPASSENGER.ordinal()];
-        if (distanceFrontPassenger < 33) {
+        if (distanceFrontPassenger < frontPassengerDistance) {
 
             // reset FoundEmpty because looking for 3 in a row before reset
             ballPositions[spindexerBallPos].foundEmpty = 0;
-            if (detectFrontColor) {
+            if (detectFrontColor && !teleop) {
-                double green = robot.color3.getNormalizedColors().green;
+                NormalizedRGBA color3RGBA = robot.color3.getNormalizedColors();
-                double red = robot.color3.getNormalizedColors().red;
-                double blue = robot.color3.getNormalizedColors().blue;
 
-                double gP = green / (green + red + blue);
+                double gP = color3RGBA.green / (color3RGBA.green + color3RGBA.red + color3RGBA.blue);
 
-                if (gP >= 0.4) {
+                if (gP >= 0.42) {
-                    ballPositions[spindexerBallPos].ballColor = BallColor.PURPLE;  // purple
+                    ballPositions[spindexerBallPos].ballColor = BallColor.GREEN;  // green
                 } else {
-                    ballPositions[spindexerBallPos].ballColor = BallColor.GREEN;  // purple
+                    ballPositions[spindexerBallPos].ballColor = BallColor.PURPLE;  // purple
                 }
             }
         } else {
@@ -246,41 +286,94 @@ public class Spindexer {
 
         return newPos1Detection;
     }
-
+    // Has code to unjam spindexer
-    public void moveSpindexerToPos(double pos) {
+    private void moveSpindexerToPos(double pos) {
-        robot.spin1.setPosition(pos);
+        servos.setSpinPos(pos);
-        robot.spin2.setPosition(1-pos);
+//        double currentPos = servos.getSpinPos();
+//        if (!servos.spinEqual(pos) && Math.abs(prevPos - currentPos) <= 0){
+//            if (currentPos > pos){
+//                robot.spin1.setPosition(servos.getSpinPos() + 0.05);
+//                robot.spin2.setPosition(1 - servos.getSpinPos() - 0.05);
+//            } else {
+//                robot.spin1.setPosition(servos.getSpinPos() - 0.05);
+//                robot.spin2.setPosition(1 - servos.getSpinPos() + 0.05);
+//            }
+//        }
+//        prevPos = pos;
     }
 
     public void stopSpindexer() {
 
     }
 
-    public void ballCounterLight(){
+    public double getRearCenterLight() {
-        int counter = 0;
+        BallColor color = GetRearCenterColor();
-        if (!ballPositions[0].isEmpty){
+        if (Objects.equals(color, BallColor.GREEN)) {
-            counter++;
+            return LightGreen;
-        }
+        } else if (Objects.equals(color, BallColor.PURPLE)) {
-        if (!ballPositions[1].isEmpty){
+            return LightPurple;
-            counter++;
-        }
-        if (!ballPositions[2].isEmpty){
-            counter++;
-        }
-        if (counter == 3){
-            robot.light.setPosition(Light3);
-        } else if (counter == 2){
-            robot.light.setPosition(Light2);
-        } else if (counter == 1){
-            robot.light.setPosition(Light1);
         } else {
-            robot.light.setPosition(Light0);
+            return LightOrange;
         }
     }
 
+
+    public double getDriverLight() {
+        BallColor color = GetFrontDriverColor();
+        if (Objects.equals(color, BallColor.GREEN)) {
+            return LightGreen;
+        } else if (Objects.equals(color, BallColor.PURPLE)) {
+            return LightPurple;
+        } else {
+            return LightOrange;
+        }
+    }
+
+    public double getPassengerLight() {
+        BallColor color = GetFrontPassengerColor();
+        if (Objects.equals(color, BallColor.GREEN)) {
+            return LightGreen;
+        } else if (Objects.equals(color, BallColor.PURPLE)) {
+            return LightPurple;
+        } else {
+            return LightOrange;
+        }
+    }
+    public double ballCounterLight() {
+        int counter = 0;
+        if (!ballPositions[0].isEmpty) {
+            counter++;
+        }
+        if (!ballPositions[1].isEmpty) {
+            counter++;
+        }
+        if (!ballPositions[2].isEmpty) {
+            counter++;
+        }
+
+        if (counter == 3) {
+            return Light3;
+        } else if (counter == 2) {
+            return Light2;
+        } else if (counter == 1) {
+            return Light1;
+        } else {
+            return Light0;
+        }
+    }
+
+
+
+
+    public boolean slotIsEmpty(int slot){
+        return !ballPositions[slot].isEmpty;
+    }
+
     public boolean isFull () {
         return (!ballPositions[0].isEmpty && !ballPositions[1].isEmpty && !ballPositions[2].isEmpty);
     }
+
+    private double intakeTicker = 0;
     public boolean processIntake() {
 
         switch (currentIntakeState) {
@@ -289,6 +382,7 @@ public class Spindexer {
                 commandedIntakePosition = 0;
                 servos.setSpinPos(intakePositions[0]);
                 currentIntakeState = Spindexer.IntakeState.UNKNOWN_MOVE;
+                servos.setTransferPos(transferServo_out);
                 break;
             case UNKNOWN_MOVE:
                 // Stopping when we get to the new position
@@ -298,8 +392,9 @@ public class Spindexer {
                     unknownColorDetect = 0;
                 } else {
                     // Keep moving the spindexer
-                    moveSpindexerToPos(intakePositions[commandedIntakePosition]);
+                    servos.setSpinPos(intakePositions[commandedIntakePosition]);
                 }
+                servos.setTransferPos(transferServo_out);
                 break;
             case UNKNOWN_DETECT:
                 if (unknownColorDetect >5) {
@@ -308,6 +403,7 @@ public class Spindexer {
                     //detectBalls(true, true);
                     unknownColorDetect++;
                 }
+                servos.setTransferPos(transferServo_out);
                 break;
             case INTAKE:
                 // Ready for intake and Detecting a New Ball
@@ -316,34 +412,33 @@ public class Spindexer {
                     currentIntakeState = Spindexer.IntakeState.FINDNEXT;
                 } else {
                     // Maintain Position
-                    moveSpindexerToPos(intakePositions[commandedIntakePosition]);
+                    spindexerWiggle *= -1.0;
+                    servos.setSpinPos(intakePositions[commandedIntakePosition]+spindexerWiggle);
                 }
+                servos.setTransferPos(transferServo_out);
                 break;
             case FINDNEXT:
                 // Find Next Open Position and start movement
                 double currentSpindexerPos = servos.getSpinPos();
                 double commandedtravelDistance = 2.0;
-                //double proposedTravelDistance = Math.abs(intakePositions[0] - currentSpindexerPos);
+                double proposedTravelDistance = Math.abs(intakePositions[0] - currentSpindexerPos);
                 //if (ballPositions[0].isEmpty && (proposedTravelDistance < commandedtravelDistance)) {
                 if (ballPositions[0].isEmpty) {
                     // Position 1
                     commandedIntakePosition = 0;
-                    servos.setSpinPos(intakePositions[commandedIntakePosition]);
                     currentIntakeState = Spindexer.IntakeState.MOVING;
                 }
                 //proposedTravelDistance = Math.abs(intakePositions[1] - currentSpindexerPos);
                 //if (ballPositions[1].isEmpty && (proposedTravelDistance < commandedtravelDistance)) {
-                if (ballPositions[1].isEmpty) {
+                else if (ballPositions[1].isEmpty) {
                     // Position 2
                     commandedIntakePosition = 1;
-                    servos.setSpinPos(intakePositions[commandedIntakePosition]);
                     currentIntakeState = Spindexer.IntakeState.MOVING;
                 }
                 //proposedTravelDistance = Math.abs(intakePositions[2] - currentSpindexerPos);
-                if (ballPositions[2].isEmpty) {
+                else if (ballPositions[2].isEmpty) {
                     // Position 3
                     commandedIntakePosition = 2;
-                    servos.setSpinPos(intakePositions[commandedIntakePosition]);
                     currentIntakeState = Spindexer.IntakeState.MOVING;
                 }
                 if (currentIntakeState != Spindexer.IntakeState.MOVING) {
@@ -351,19 +446,25 @@ public class Spindexer {
                     //commandedIntakePosition = bestFitMotif();
                     currentIntakeState = Spindexer.IntakeState.FULL;
                 }
-                moveSpindexerToPos(intakePositions[commandedIntakePosition]);
+                servos.setSpinPos(intakePositions[commandedIntakePosition]);
+                servos.setTransferPos(transferServo_out);
                 break;
-
             case MOVING:
                 // Stopping when we get to the new position
                 if (servos.spinEqual(intakePositions[commandedIntakePosition])) {
-                    currentIntakeState = Spindexer.IntakeState.INTAKE;
+                    //if (intakeTicker > 1){
-                    stopSpindexer();
+                        currentIntakeState = Spindexer.IntakeState.INTAKE;
+                        stopSpindexer();
+                        intakeTicker = 0;
+                    //} else {
+                    //    intakeTicker++;
+                    //}
                     //detectBalls(false, false);
                 } else {
                     // Keep moving the spindexer
-                    moveSpindexerToPos(intakePositions[commandedIntakePosition]);
+                    servos.setSpinPos(intakePositions[commandedIntakePosition]);
                 }
+                servos.setTransferPos(transferServo_out);
                 break;
 
             case FULL:
@@ -374,29 +475,30 @@ public class Spindexer {
                     currentIntakeState = Spindexer.IntakeState.FINDNEXT;
                 }
                 // Maintain Position
-                moveSpindexerToPos(intakePositions[commandedIntakePosition]);
+                spindexerWiggle *= -1.0;
+                servos.setSpinPos(intakePositions[commandedIntakePosition]+spindexerWiggle);
+                servos.setTransferPos(transferServo_out);
                 break;
 
             case SHOOT_ALL_PREP:
                 // We get here with function call to prepareToShootMotif
                 // Stopping when we get to the new position
-                if (servos.spinEqual(intakePositions[commandedIntakePosition])) {
+                commandedIntakePosition = 0;
-                    currentIntakeState = Spindexer.IntakeState.SHOOT_ALL_READY;
+                if (!servos.spinEqual(outakePositions[commandedIntakePosition])) {
-                } else {
                     // Keep moving the spindexer
-                    moveSpindexerToPos(intakePositions[commandedIntakePosition]); // Possible error: should it be using "outakePositions" instead of "intakePositions"
+                    servos.setSpinPos(outakePositions[commandedIntakePosition]); // Possible error: should it be using "outakePositions" instead of "intakePositions"
                 }
                 break;
 
-            case SHOOT_ALL_READY:
+            case SHOOT_ALL_READY: // Not used
                 // Double Check Colors
                 //detectBalls(false, false); // Minimize hardware calls
                 if (ballPositions[0].isEmpty && ballPositions[1].isEmpty && ballPositions[2].isEmpty) {
                     // All ball shot move to intake state
-                    currentIntakeState = Spindexer.IntakeState.FINDNEXT;
+                    currentIntakeState = Spindexer.IntakeState.SHOOTNEXT;
                 }
                 // Maintain Position
-                moveSpindexerToPos(intakePositions[commandedIntakePosition]);
+                servos.setSpinPos(outakePositions[commandedIntakePosition]);
                 break;
 
             case SHOOTNEXT:
@@ -404,23 +506,20 @@ public class Spindexer {
                 if (!ballPositions[0].isEmpty) {
                     // Position 1
                     commandedIntakePosition = 0;
-                    servos.setSpinPos(outakePositions[commandedIntakePosition]);
                     currentIntakeState = Spindexer.IntakeState.SHOOTMOVING;
-                } else if (ballPositions[1].isEmpty) { // Possible error: should it be !ballPosition[1].isEmpty?
+                } else if (!ballPositions[1].isEmpty) {
                     // Position 2
                     commandedIntakePosition = 1;
-                    servos.setSpinPos(outakePositions[commandedIntakePosition]);
                     currentIntakeState = Spindexer.IntakeState.SHOOTMOVING;
-                } else if (ballPositions[2].isEmpty) { // Possible error: should it be !ballPosition[2].isEmpty?
+                } else if (!ballPositions[2].isEmpty) {
                     // Position 3
                     commandedIntakePosition = 2;
-                    servos.setSpinPos(intakePositions[commandedIntakePosition]); // Possible error: should it be using "outakePositions" instead of "intakePositions"
                     currentIntakeState = Spindexer.IntakeState.SHOOTMOVING;
                 } else {
                     // Empty return to intake state
                     currentIntakeState = IntakeState.FINDNEXT;
                 }
-                moveSpindexerToPos(intakePositions[commandedIntakePosition]); // Possible error: should it be using "outakePositions" instead of "intakePositions"
+                servos.setSpinPos(outakePositions[commandedIntakePosition]);
                 break;
 
             case SHOOTMOVING:
@@ -429,32 +528,74 @@ public class Spindexer {
                     currentIntakeState = Spindexer.IntakeState.SHOOTWAIT;
                 } else {
                     // Keep moving the spindexer
-                    moveSpindexerToPos(intakePositions[commandedIntakePosition]); // Possible error: should it be using "outakePositions" instead of "intakePositions"
+                    servos.setSpinPos(outakePositions[commandedIntakePosition]);
                 }
                 break;
 
             case SHOOTWAIT:
                 // Stopping when we get to the new position
-                if (servos.spinEqual(intakePositions[commandedIntakePosition])) {
+                if (prevIntakeState != currentIntakeState) {
-                    currentIntakeState = Spindexer.IntakeState.INTAKE;
+                    if (commandedIntakePosition==2) {
-                    stopSpindexer();
+                        shootWaitMax = 5;
-                    //detectBalls(true, false);
+                    }
+                    shootWaitCount = 0;
                 } else {
-                    // Keep moving the spindexer
+                    shootWaitCount++;
-                    moveSpindexerToPos(intakePositions[commandedIntakePosition]);
+                }
+                // wait 10 cycles
+                if (shootWaitCount > shootWaitMax) {
+                    currentIntakeState = Spindexer.IntakeState.SHOOTNEXT;
+                    ballPositions[commandedIntakePosition].isEmpty = true;
+                    shootWaitCount = 0;
+                    //stopSpindexer();
+                    //detectBalls(true, false);
+                }
+                // Keep moving the spindexer
+                spindexerOuttakeWiggle *= -1.0;
+                servos.setSpinPos(outakePositions[commandedIntakePosition]+spindexerOuttakeWiggle);
+                break;
+
+            case SHOOT_PREP_CONTINOUS:
+                if (servos.spinEqual(spinStartPos)){
+                    servos.setTransferPos(transferServo_in);
+                    currentIntakeState = Spindexer.IntakeState.SHOOT_CONTINOUS;
+                } else {
+                    servos.setTransferPos(transferServo_out);
+                    servos.setSpinPos(spinStartPos);
+                }
+                break;
+
+            case SHOOT_CONTINOUS:
+                whileShooting = true;
+                ballPositions[0].isEmpty = false;
+                ballPositions[1].isEmpty = false;
+                ballPositions[2].isEmpty = false;
+                if (servos.getSpinPos() > spinEndPos){
+                    whileShooting = false;
+                    servos.setTransferPos(transferServo_out);
+                    shootTicks = 0;
+                    currentIntakeState = IntakeState.FINDNEXT;
+                } else {
+                    double spinPos = robot.spin1.getPosition() + shootAllSpindexerSpeedIncrease;
+                    if (spinPos > spinEndPos + 0.03){
+                        spinPos = spinEndPos + 0.03;
+                    }
+                    servos.setSpinPos(spinPos);
                 }
                 break;
 
             default:
                 // Statements to execute if no case matches
         }
+
+        prevIntakeState = currentIntakeState;
         //TELE.addData("commandedIntakePosition", commandedIntakePosition);
         //TELE.update();
         // Signal a successful intake
         return false;
     }
 
-    public void setDesiredMotif (Types.Motif newMotif) {
+    public void setDesiredMotif (StateEnums.Motif newMotif) {
         desiredMotif = newMotif;
     }
 
@@ -476,7 +617,7 @@ public class Spindexer {
                 } else if (ballPositions[1].ballColor == BallColor.GREEN) {
                     return 1;
                 } else {
-                    return 3;
+                    return 2;
                 }
                 //break;
             case PPG:
@@ -490,7 +631,7 @@ public class Spindexer {
                 //break;
             case NONE:
                 return 0;
-                //break;
+            //break;
         }
         return 0;
     }
@@ -499,6 +640,36 @@ public class Spindexer {
         commandedIntakePosition = bestFitMotif();
     }
 
+    public void prepareShootAll(){
+        currentIntakeState = Spindexer.IntakeState.SHOOT_ALL_PREP;
+    }
+    public void prepareShootAllContinous(){
+        currentIntakeState = Spindexer.IntakeState.SHOOT_PREP_CONTINOUS;
+    }
+    public void shootAll () {
+        ballPositions[0].isEmpty = false;
+        ballPositions[1].isEmpty = false;
+        ballPositions[2].isEmpty = false;
+        currentIntakeState = Spindexer.IntakeState.SHOOTNEXT;
+    }
+    public void shootAllContinous(){
+        ballPositions[0].isEmpty = false;
+        ballPositions[1].isEmpty = false;
+        ballPositions[2].isEmpty = false;
+        currentIntakeState = Spindexer.IntakeState.SHOOT_CONTINOUS;
+    }
+
+    public boolean shootAllComplete ()
+    {
+        return ((currentIntakeState != Spindexer.IntakeState.SHOOT_ALL_PREP) &&
+                (currentIntakeState != Spindexer.IntakeState.SHOOT_ALL_READY) &&
+                (currentIntakeState != Spindexer.IntakeState.SHOOTMOVING) &&
+                (currentIntakeState != Spindexer.IntakeState.SHOOTNEXT) &&
+                (currentIntakeState != Spindexer.IntakeState.SHOOTWAIT) &&
+                (currentIntakeState != Spindexer.IntakeState.SHOOT_PREP_CONTINOUS) &&
+                (currentIntakeState != Spindexer.IntakeState.SHOOT_CONTINOUS));
+    }
+
     void shootAllToIntake () {
         currentIntakeState = Spindexer.IntakeState.FINDNEXT;
     }
@@ -506,4 +677,23 @@ public class Spindexer {
     public void update()
     {
     }
+
+    public BallColor GetFrontDriverColor () {
+        return ballPositions[RotatedBallPositions[commandedIntakePosition][RotatedBallPositionNames.FRONTDRIVER.ordinal()]].ballColor;
+    }
+
+    public BallColor GetFrontPassengerColor () {
+        return ballPositions[RotatedBallPositions[commandedIntakePosition][RotatedBallPositionNames.FRONTPASSENGER.ordinal()]].ballColor;
+    }
+
+    public BallColor GetRearCenterColor () {
+        return ballPositions[RotatedBallPositions[commandedIntakePosition][RotatedBallPositionNames.REARCENTER.ordinal()]].ballColor;
+    }
+    private double prevPow = 0.501;
+    public void setIntakePower(double pow){
+        if (prevPow != 0.501 && prevPow != pow){
+            robot.intake.setPower(pow);
+        }
+        prevPow = pow;
+    }
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Targeting.java

@@ -1,197 +1,264 @@
 package org.firstinspires.ftc.teamcode.utils;
 
-import android.provider.Settings;
+import static org.firstinspires.ftc.teamcode.constants.Color.redAlliance;
+import static org.firstinspires.ftc.teamcode.constants.ServoPositions.hoodOffset;
 
 import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
-import com.qualcomm.robotcore.hardware.DcMotor;
+import java.lang.Math;
-import com.qualcomm.robotcore.hardware.HardwareMap;
+
+import org.firstinspires.ftc.teamcode.constants.Color;
+import org.firstinspires.ftc.teamcode.constants.ServoPositions;
 
 public class Targeting {
-    MultipleTelemetry TELE;
-
-    double cancelOffsetX = 0.0;  // was -40.0
-    double cancelOffsetY = 0.0;  // was 7.0
-    double unitConversionFactor = 0.95;
-
-    int tileSize = 24; //inches
-    public final int TILE_UPPER_QUARTILE = 18;
-    public final int TILE_LOWER_QUARTILE = 6;
-
-    public double robotInchesX, robotInchesY = 0.0;
-
-    public int robotGridX, robotGridY = 0;
-
-
-    public static class Settings {
-        public double flywheelRPM = 0.0;
-        public double hoodAngle = 0.0;
-
-        public Settings (double flywheelRPM, double hoodAngle) {
-            this.flywheelRPM = flywheelRPM;
-            this.hoodAngle = hoodAngle;
-        }
-    }
-
     // Known settings discovered using shooter test.
     // Keep the fidelity at 1 floor tile for now but we could also half it if more
     // accuracy is needed.
     public static final Settings[][] KNOWNTARGETING;
+
     static {
         KNOWNTARGETING = new Settings[6][6];
         // ROW 0 - Closet to the goals
-        KNOWNTARGETING[0][0] = new Settings (2300.0, 0.93);
+        KNOWNTARGETING[0][0] = new Settings(2300.0, 0.93);
-        KNOWNTARGETING[0][1] = new Settings (2300.0, 0.93);
+        KNOWNTARGETING[0][1] = new Settings(2300.0, 0.93);
-        KNOWNTARGETING[0][2] = new Settings (2500.0, 0.78);
+        KNOWNTARGETING[0][2] = new Settings(2500.0, 0.78);
-        KNOWNTARGETING[0][3] = new Settings (2800.0, 0.68);
+        KNOWNTARGETING[0][3] = new Settings(2800.0, 0.68);
-        KNOWNTARGETING[0][4] = new Settings (3000.0, 0.58);
+        KNOWNTARGETING[0][4] = new Settings(3000.0, 0.58);
-        KNOWNTARGETING[0][5] = new Settings (3000.0, 0.58);
+        KNOWNTARGETING[0][5] = new Settings(3000.0, 0.58);
         // ROW 1
-        KNOWNTARGETING[1][0] = new Settings (2300.0, 0.93);
+        KNOWNTARGETING[1][0] = new Settings(2300.0, 0.93);
-        KNOWNTARGETING[1][1] = new Settings (2300.0, 0.93);
+        KNOWNTARGETING[1][1] = new Settings(2300.0, 0.93);
-        KNOWNTARGETING[1][2] = new Settings (2600.0, 0.78);
+        KNOWNTARGETING[1][2] = new Settings(2600.0, 0.78);
-        KNOWNTARGETING[1][3] = new Settings (2800.0, 0.62);
+//        KNOWNTARGETING[1][3] = new Settings (2800.0, 0.62);
-        KNOWNTARGETING[1][4] = new Settings (3000.0, 0.55);
+//        KNOWNTARGETING[1][4] = new Settings (3000.0, 0.55);
-        KNOWNTARGETING[1][5] = new Settings (3200.0, 0.50);
+//        KNOWNTARGETING[1][5] = new Settings (3200.0, 0.50);
+        KNOWNTARGETING[1][3] = new Settings(2800.0, 0.68);  // Real settings replaced with (0,3) new Settings (2800.0, 0.62);
+        KNOWNTARGETING[1][4] = new Settings(3000.0, 0.58);  // Real setting replaced with (0,4)  new Settings (3000.0, 0.55);
+        KNOWNTARGETING[1][5] = new Settings(3200.0, 0.50);
         // ROW 2
-        KNOWNTARGETING[2][0] = new Settings (2500.0, 0.78);
+//        KNOWNTARGETING[2][0] = new Settings (2500.0, 0.78);
-        KNOWNTARGETING[2][1] = new Settings (2500.0, 0.78);
+//        KNOWNTARGETING[2][1] = new Settings (2500.0, 0.78);
-        KNOWNTARGETING[2][2] = new Settings (2700.0, 0.60);
+//        KNOWNTARGETING[2][2] = new Settings (2700.0, 0.60);
-        KNOWNTARGETING[2][3] = new Settings (2900.0, 0.53);
+//        KNOWNTARGETING[2][3] = new Settings (2900.0, 0.53);
-        KNOWNTARGETING[2][4] = new Settings (3100.0, 0.50);
+//        KNOWNTARGETING[2][4] = new Settings (3100.0, 0.50);
-        KNOWNTARGETING[2][5] = new Settings (3100.0, 0.50);
+//        KNOWNTARGETING[2][5] = new Settings (3100.0, 0.50);
+        KNOWNTARGETING[2][0] = new Settings(2500.0, 0.78);
+        KNOWNTARGETING[2][1] = new Settings(2500.0, 0.78);
+        KNOWNTARGETING[2][2] = new Settings(2700.0, 0.60);
+        KNOWNTARGETING[2][3] = new Settings(2800.0, 0.62);  // Real settings replaced with (1,3) new Settings (2900.0, 0.53);
+        KNOWNTARGETING[2][4] = new Settings(3000.0, 0.55);  // real settings replaces with (1,4) new Settings (3100.0, 0.50);
+        KNOWNTARGETING[2][5] = new Settings(3200.0, 0.50);  // real settings replaced with (1,5) new Settings (3100.0, 0.50);
         // ROW 3
-        KNOWNTARGETING[3][0] = new Settings (2900.0, 0.50);
+        KNOWNTARGETING[3][0] = new Settings(2900.0, 0.50);
-        KNOWNTARGETING[3][1] = new Settings (2900.0, 0.50);
+        KNOWNTARGETING[3][1] = new Settings(2900.0, 0.50);
-        KNOWNTARGETING[3][2] = new Settings (2900.0, 0.50);
+        KNOWNTARGETING[3][2] = new Settings(2900.0, 0.50);
-        KNOWNTARGETING[3][3] = new Settings (3100.0, 0.47);
+        KNOWNTARGETING[3][3] = new Settings(3100.0, 0.47);
-        KNOWNTARGETING[3][4] = new Settings (3100.0, 0.47);
+        KNOWNTARGETING[3][4] = new Settings(3100.0, 0.47);
-        KNOWNTARGETING[3][5] = new Settings (3100.0, 0.47);
+        KNOWNTARGETING[3][5] = new Settings(3100.0, 0.47);
         // ROW 4
-        KNOWNTARGETING[4][0] = new Settings (4540.0, 0.1);
+        KNOWNTARGETING[4][0] = new Settings(3100, 0.49);
-        KNOWNTARGETING[4][1] = new Settings (4541.0, 0.1);
+        KNOWNTARGETING[4][1] = new Settings(3100, 0.49);
-        KNOWNTARGETING[4][2] = new Settings (4542.0, 0.1);
+        KNOWNTARGETING[4][2] = new Settings(3100, 0.5);
-        KNOWNTARGETING[4][3] = new Settings (4543.0, 0.1);
+        KNOWNTARGETING[4][3] = new Settings(3200, 0.5);
-        KNOWNTARGETING[4][4] = new Settings (4544.0, 0.1);
+        KNOWNTARGETING[4][4] = new Settings(3250, 0.49);
-        KNOWNTARGETING[4][5] = new Settings (4545.0, 0.1);
+        KNOWNTARGETING[4][5] = new Settings(3300, 0.49);
-        // ROW 1
+        // ROW 5
-        KNOWNTARGETING[5][0] = new Settings (4550.0, 0.1);
+        KNOWNTARGETING[5][0] = new Settings(3200, 0.48);
-        KNOWNTARGETING[5][1] = new Settings (4551.0, 0.1);
+        KNOWNTARGETING[5][1] = new Settings(3200, 0.48);
-        KNOWNTARGETING[5][2] = new Settings (4552.0, 0.1);
+        KNOWNTARGETING[5][2] = new Settings(3300, 0.48);
-        KNOWNTARGETING[5][3] = new Settings (4553.0, 0.1);
+        KNOWNTARGETING[5][3] = new Settings(3350, 0.48);
-        KNOWNTARGETING[5][4] = new Settings (4554.0, 0.1);
+        KNOWNTARGETING[5][4] = new Settings(3350, 0.48);
-        KNOWNTARGETING[5][5] = new Settings (4555.0, 0.1);
+        KNOWNTARGETING[5][5] = new Settings(3350, 0.48);
+
     }
 
-    public Targeting()
+    public final int TILE_UPPER_QUARTILE = 18;
-    {
+    public final int TILE_LOWER_QUARTILE = 6;
+    public double robotInchesX, robotInchesY = 0.0;
+    public int robotGridX = 0, robotGridY = 0;
+    MultipleTelemetry TELE;
+    double cancelOffsetX = 0.0;  // was -40.0
+    double cancelOffsetY = 0.0;  // was 7.0
+    double unitConversionFactor = 0.95;
+    int tileSize = 24; //inches
+    public static boolean turretInterpolate = false;
+
+    public Targeting() {
     }
 
+    //TODO: change code so it uses pedropathing paths
     public Settings calculateSettings(double robotX, double robotY, double robotHeading, double robotVelocity, boolean interpolate) {
         Settings recommendedSettings = new Settings(0.0, 0.0);
-
+        int gridX;
-        double cos45 = Math.cos(Math.toRadians(-45));
+        int gridY;
-        double sin45 = Math.sin(Math.toRadians(-45));
+        int remX = 0;
-        double rotatedY = (robotX + cancelOffsetX) * sin45 + (robotY + cancelOffsetY) * cos45;
+        int remY = 0;
-        double rotatedX = (robotX + cancelOffsetX) * cos45 - (robotY + cancelOffsetY) * sin45;
+        // Old code
-
+//        if (!redAlliance){
-        // Convert robot coordinates to inches
+//            sin54 = Math.sin(Math.toRadians(54));
-        robotInchesX = rotatedX * unitConversionFactor;
+//            double rotatedY = (robotX + cancelOffsetX) * sin54 + (robotY + cancelOffsetY) * cos54;
-        robotInchesY = rotatedY * unitConversionFactor;
+//            double rotatedX = (robotX + cancelOffsetX) * cos54 - (robotY + cancelOffsetY) * sin54;
-
+//
-        // Find approximate location in the grid
+//            // Convert robot coordinates to inches
-        int gridX = Math.abs(Math.floorDiv((int) robotInchesX, tileSize) + 1);
+//            robotInchesX = rotatedX * unitConversionFactor + 20;
-        int gridY = Math.abs(Math.floorDiv((int) robotInchesY, tileSize));
+//            robotInchesY = rotatedY * unitConversionFactor + 20;
-
+//
-        int remX = Math.floorMod((int)robotInchesX, tileSize);
+//            // Find approximate location in the grid
-        int remY = Math.floorMod((int)robotInchesX, tileSize);
+//            gridX = Math.abs(Math.floorDiv((int) robotInchesX, tileSize));
-
+//            gridY = Math.abs(Math.floorDiv((int) robotInchesY, tileSize));
-        // Determine if we need to interpolate based on tile position.
+//        } else {
-        // if near upper or lower quarter or tile interpolate with next tile.
+//            sin54 = Math.sin(Math.toRadians(-54));
-        int x1 = 0;
+//            double rotatedY = (robotX + cancelOffsetX) * sin54 + (robotY + cancelOffsetY) * cos54;
-        int y1 = 0;
+//            double rotatedX = (robotX + cancelOffsetX) * cos54 - (robotY + cancelOffsetY) * sin54;
-//        interpolate = false;
+//
-//        if ((remX > TILE_UPPER_QUARTILE) && (remY > TILE_UPPER_QUARTILE) &&
+//            // Convert robot coordinates to inches
-//                (robotGridX < 5) && (robotGridY <5)) {
+//            robotInchesX = rotatedX * unitConversionFactor;
-//            // +X, +Y
+//            robotInchesY = rotatedY * unitConversionFactor;
-//            interpolate = true;
+//
-//            x1 = robotGridX + 1;
+//            // Find approximate location in the grid
-//            y1 = robotGridY + 1;
+//            gridX = Math.abs(Math.floorDiv((int) robotInchesX, tileSize) + 1);
-//        } else if ((remX < TILE_LOWER_QUARTILE) && (remY < TILE_LOWER_QUARTILE) &&
+//            gridY = Math.abs(Math.floorDiv((int) robotInchesY, tileSize));
-//                (robotGridX > 0) && (robotGridY > 0)) {
+//        }
-//            // -X, -Y
+//
-//            interpolate = true;
+//
-//            x1 = robotGridX - 1;
+        remX = Math.floorMod((int) robotX, tileSize);
-//            y1 = robotGridY - 1;
+        remY = Math.floorMod((int) robotY, tileSize);
-//        } else if ((remX > TILE_UPPER_QUARTILE) && (remY < TILE_LOWER_QUARTILE) &&
+//
-//                (robotGridX < 5) && (robotGridY > 0)) {
+//        //clamp
-//            // +X, -Y
+//
-//            interpolate = true;
+//        if (redAlliance) {
-//            x1 = robotGridX + 1;
+//            robotGridX = Math.max(0, Math.min(gridX, KNOWNTARGETING[0].length - 1));
-//            y1 = robotGridY - 1;
+//            robotGridY = Math.max(0, Math.min(gridY, KNOWNTARGETING.length - 1));
-//        } else if ((remX < TILE_LOWER_QUARTILE) && (remY > TILE_UPPER_QUARTILE) &&
+//        } else {
-//                (robotGridX > 0) && (robotGridY < 5)) {
+//            robotGridX = Math.max(0, Math.min(gridX, KNOWNTARGETING[0].length - 1));
-//            // -X, +Y
+//            robotGridY = Math.max(0, Math.min(gridY, KNOWNTARGETING.length - 1));
-//            interpolate = true;
-//            x1 = robotGridX - 1;
-//            y1 = robotGridY + 1;
-//        } else if ((remX < TILE_LOWER_QUARTILE) && (robotGridX > 0)) {
-//            // -X, Y
-//            interpolate = true;
-//            x1 = robotGridX - 1;
-//            y1 = robotGridY;
-//        } else if ((remY < TILE_LOWER_QUARTILE) && (robotGridY > 0)) {
-//            // X, -Y
-//            interpolate = true;
-//            x1 = robotGridX;
-//            y1 = robotGridY - 1;
-//        } else if ((remX > TILE_UPPER_QUARTILE) && (robotGridX < 5)) {
-//            // +X, Y
-//            interpolate = true;
-//            x1 = robotGridX + 1;
-//            y1 = robotGridY;
-//        } else if ((remY > TILE_UPPER_QUARTILE) && (robotGridY < 5)) {
-//            // X, +Y
-//            interpolate = true;
-//            x1 = robotGridX;
-//            y1 = robotGridY + 1;
 //        }
 
-        //clamp
+        // New code
+        if (redAlliance){
+            gridY = Math.round((float) (((144-robotX)-12) / 24));
+        } else {
+            gridY = Math.round((float) ((robotX-12) / 24));
+        }
+        gridX = Math.round((float) (((144-robotY)-12) / 24));
+
         robotGridX = Math.max(0, Math.min(gridX, KNOWNTARGETING[0].length - 1));
         robotGridY = Math.max(0, Math.min(gridY, KNOWNTARGETING.length - 1));
 
+        // Determine if we need to interpolate based on tile position.
+        // if near upper or lower quarter or tile interpolate with next tile.
+        int x0 = 0;
+        int y0 = 0;
+        int x1 = 0;
+        int y1 = 0;
+        interpolate = false;
+        if ((remX > TILE_UPPER_QUARTILE) && (remY > TILE_UPPER_QUARTILE) &&
+                (robotGridX < 5) && (robotGridY < 5)) {
+            // +X, +Y
+            interpolate = true;
+            x0 = robotGridX;
+            x1 = robotGridX + 1;
+            y0 = robotGridY;
+            y1 = robotGridY + 1;
+        } else if ((remX < TILE_LOWER_QUARTILE) && (remY < TILE_LOWER_QUARTILE) &&
+                (robotGridX > 0) && (robotGridY > 0)) {
+            // -X, -Y
+            interpolate = true;
+            x0 = robotGridX - 1;
+            x1 = robotGridX;
+            y0 = robotGridY - 1;
+            y1 = robotGridY;
+        } else if ((remX > TILE_UPPER_QUARTILE) && (remY < TILE_LOWER_QUARTILE) &&
+                (robotGridX < 5) && (robotGridY > 0)) {
+            // +X, -Y
+            interpolate = true;
+            x0 = robotGridX;
+            x1 = robotGridX + 1;
+            y0 = robotGridY - 1;
+            y1 = robotGridY;
+        } else if ((remX < TILE_LOWER_QUARTILE) && (remY > TILE_UPPER_QUARTILE) &&
+                (robotGridX > 0) && (robotGridY < 5)) {
+            // -X, +Y
+            interpolate = true;
+            x0 = robotGridX - 1;
+            x1 = robotGridX;
+            y0 = robotGridY;
+            y1 = robotGridY + 1;
+        } else if ((remX < TILE_LOWER_QUARTILE) && (robotGridX > 0)) {
+            // -X, Y
+            interpolate = true;
+            x0 = robotGridX - 1;
+            x1 = robotGridX;
+            y0 = robotGridY;
+            y1 = robotGridY;
+        } else if ((remY < TILE_LOWER_QUARTILE) && (robotGridY > 0)) {
+            // X, -Y
+            interpolate = true;
+            x0 = robotGridX;
+            x1 = robotGridX;
+            y0 = robotGridY - 1;
+            y1 = robotGridY;
+        } else if ((remX > TILE_UPPER_QUARTILE) && (robotGridX < 5)) {
+            // +X, Y
+            interpolate = true;
+            x0 = robotGridX;
+            x1 = robotGridX + 1;
+            y0 = robotGridY;
+            y1 = robotGridY;
+        } else if ((remY > TILE_UPPER_QUARTILE) && (robotGridY < 5)) {
+            // X, +Y
+            interpolate = true;
+            x0 = robotGridX;
+            x1 = robotGridX;
+            y0 = robotGridY;
+            y1 = robotGridY + 1;
+        } else {
+            interpolate = false;
+        }
+
         // basic search
-        if(!interpolate) {
+        if (true) { //!interpolate) {
-            if ((robotGridY < 6) && (robotGridX <6)) {
+            if ((robotGridY < 6) && (robotGridX < 6)) {
                 recommendedSettings.flywheelRPM = KNOWNTARGETING[robotGridX][robotGridY].flywheelRPM;
-                recommendedSettings.hoodAngle = KNOWNTARGETING[robotGridX][robotGridY].hoodAngle;
+                recommendedSettings.hoodAngle = KNOWNTARGETING[robotGridX][robotGridY].hoodAngle + hoodOffset;
             }
             return recommendedSettings;
         } else {
 
             // bilinear interpolation
-            int x0 = robotGridX;
+            //int x0 = robotGridX;
             //int x1 = Math.min(x0 + 1, KNOWNTARGETING[0].length - 1);
-            int y0 = robotGridY;
+            //int y0 = robotGridY;
             //int y1 = Math.min(y0 + 1, KNOWNTARGETING.length - 1);
 
-            double x = (robotInchesX - (x0 * tileSize)) / tileSize;
+//            double x = (robotInchesX - (x0 * tileSize)) / tileSize;
-            double y = (robotInchesY - (y0 * tileSize)) / tileSize;
+//            double y = (robotInchesY - (y0 * tileSize)) / tileSize;
 
-            double rpm00 = KNOWNTARGETING[y0][x0].flywheelRPM;
+//            double rpm00 = KNOWNTARGETING[y0][x0].flywheelRPM;
-            double rpm10 = KNOWNTARGETING[y0][x1].flywheelRPM;
+//            double rpm10 = KNOWNTARGETING[y0][x1].flywheelRPM;
-            double rpm01 = KNOWNTARGETING[y1][x0].flywheelRPM;
+//            double rpm01 = KNOWNTARGETING[y1][x0].flywheelRPM;
-            double rpm11 = KNOWNTARGETING[y1][x1].flywheelRPM;
+//            double rpm11 = KNOWNTARGETING[y1][x1].flywheelRPM;
-
+//
-            double angle00 = KNOWNTARGETING[y0][x0].hoodAngle;
+//            double angle00 = KNOWNTARGETING[y0][x0].hoodAngle;
-            double angle10 = KNOWNTARGETING[y0][x1].hoodAngle;
+//            double angle10 = KNOWNTARGETING[y0][x1].hoodAngle;
-            double angle01 = KNOWNTARGETING[y1][x0].hoodAngle;
+//            double angle01 = KNOWNTARGETING[y1][x0].hoodAngle;
-            double angle11 = KNOWNTARGETING[y1][x1].hoodAngle;
+//            double angle11 = KNOWNTARGETING[y1][x1].hoodAngle;
-
-            recommendedSettings.flywheelRPM = (1 - x) * (1 - y) * rpm00 + x * (1 - y) * rpm10 + (1 - x) * y * rpm01 + x * y * rpm11;
-            recommendedSettings.hoodAngle = (1 - x) * (1 - y) * angle00 + x * (1 - y) * angle10 + (1 - x) * y * angle01 + x * y * angle11;
 
+//            recommendedSettings.flywheelRPM = (1 - x) * (1 - y) * rpm00 + x * (1 - y) * rpm10 + (1 - x) * y * rpm01 + x * y * rpm11;
+//            recommendedSettings.hoodAngle = (1 - x) * (1 - y) * angle00 + x * (1 - y) * angle10 + (1 - x) * y * angle01 + x * y * angle11;
+            // Average target tiles
+            recommendedSettings.flywheelRPM = (KNOWNTARGETING[x0][y0].flywheelRPM + KNOWNTARGETING[x1][y1].flywheelRPM) / 2.0;
+            recommendedSettings.hoodAngle = (KNOWNTARGETING[x0][y0].hoodAngle + KNOWNTARGETING[x1][y1].hoodAngle) / 2.0;
             return recommendedSettings;
         }
     }
+
+    public static class Settings {
+        public double flywheelRPM = 0.0;
+        public double hoodAngle = 0.0;
+
+        public Settings(double flywheelRPM, double hoodAngle) {
+            this.flywheelRPM = flywheelRPM;
+            this.hoodAngle = hoodAngle;
+        }
+    }
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Turret.java

@@ -1,113 +1,132 @@
 package org.firstinspires.ftc.teamcode.utils;
 
-import static org.firstinspires.ftc.teamcode.constants.Color.redAlliance;
-
 import static java.lang.Math.abs;
 
 import com.acmerobotics.dashboard.config.Config;
 import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
 import com.acmerobotics.roadrunner.Pose2d;
 import com.arcrobotics.ftclib.controller.PIDController;
+import com.pedropathing.geometry.Pose;
 import com.qualcomm.hardware.limelightvision.LLResult;
 import com.qualcomm.hardware.limelightvision.LLResultTypes;
 import com.qualcomm.hardware.limelightvision.Limelight3A;
 import com.qualcomm.robotcore.hardware.DcMotor;
 
 import org.firstinspires.ftc.robotcore.external.navigation.Pose3D;
+import org.firstinspires.ftc.teamcode.constants.Color;
+import org.firstinspires.ftc.teamcode.teleop.TeleopV3;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Config
+
 public class Turret {
 
     public static double turretTolerance = 0.02;
     public static double turrPosScalar = 0.00011264432;
-    public static double turret180Range = 0.4;
+    public static double turret180Range = 0.58;
-    public static double turrDefault = 0.4;
+    public static double turrDefault = 0.51;
-    public static double turrMin = 0.15;
+    public static double turrMin = 0.05;
-    public static double turrMax = 0.85;
+    public static double turrMax = 0.95;
+    public static boolean limelightUsed = true;
+    public static double limelightPosOffset = 5;
+    public static double manualOffset = 0.0;
 
-    public static double visionCorrectionGain = 0.08;  // Single tunable gain
+//    public static double visionCorrectionGain = 0.08;  // Single tunable gain
-    public static double maxOffsetChangePerCycle = 5.0; // Degrees per cycle
+//    public static double maxOffsetChangePerCycle = 5.0; // Degrees per cycle
-    public static double cameraBearingEqual = 0.5;      // Deadband
+//    public static double cameraBearingEqual = 0.5;      // Deadband
 
-    // TODO: tune these values for limelight
+//    public static double clampTolerance = 0.03;
-
+    //public static double B_PID_P = 0.105, B_PID_I = 0.0, B_PID_D = 0.0125;
-    public static double clampTolerance = 0.03;
+    public static double B_PID_P = 0.08, B_PID_I = 0.0, B_PID_D = 0.007;
     Robot robot;
     MultipleTelemetry TELE;
     Limelight3A webcam;
-
     double tx = 0.0;
     double ty = 0.0;
     double limelightPosX = 0.0;
     double limelightPosY = 0.0;
+    LLResult result;
+    public static double TARGET_POSITION_TOLERANCE = 0.5;
+    public static double COLOR_OK_TOLERANCE = 2;
+    boolean bearingAligned = false;
     private boolean lockOffset = false;
     private int obeliskID = 0;
-
     private double offset = 0.0;
     private double currentTrackOffset = 0.0;
+    private double lightColor = Color.LightRed;
     private int currentTrackCount = 0;
+    double permanentOffset = 0.0;
+    private int prevPipeline = -1;
+    PIDController bearingPID;
 
-    private double permanentOffset = 0.0;
+    public int llCoast = 0;
-
+    public int LL_COAST_TICKS = 60;
-    LLResult result;
-
-    private PIDController bearingPID;
-    public static double B_PID_P = 0.3, B_PID_I = 0.0, B_PID_D = 0.05;
-    boolean bearingAligned = false;
 
     public Turret(Robot rob, MultipleTelemetry tele, Limelight3A cam) {
         this.TELE = tele;
         this.robot = rob;
         this.webcam = cam;
-        webcam.start();
-        if (redAlliance) {
-            webcam.pipelineSwitch(4);
-        } else {
-            webcam.pipelineSwitch(2);
-        }
         bearingPID = new PIDController(B_PID_P, B_PID_I, B_PID_D);
     }
 
+    public double getLightColor() {
+        return lightColor;
+    }
+
     public void zeroTurretEncoder() {
         robot.intake.setMode(DcMotor.RunMode.STOP_AND_RESET_ENCODER);
         robot.intake.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
     }
 
     public double getTurrPos() {
-        return turrPosScalar * (robot.turr1Pos.getVoltage() / 3.3) + turrDefault;
+        return robot.turr1.getPosition();
 
     }
-
+    private double prevTurrPos = 0;
-    public void manualSetTurret(double pos) {
+    private boolean isFirstTurretPos = true;
-        robot.turr1.setPosition(pos);
+    public void setTurret(double pos) {
-        robot.turr2.setPosition(1 - pos);
+        if (isFirstTurretPos || prevTurrPos != pos){
+            robot.turr1.setPosition(pos);
+            robot.turr2.setPosition(1-pos);
+            isFirstTurretPos = false;
+        }
+        prevTurrPos = pos;
+    }
+    public void pipelineSwitch(int pipeline){
+        if (prevPipeline != pipeline){
+            robot.limelight.pipelineSwitch(pipeline);
+        }
+        prevPipeline = pipeline;
     }
 
     public boolean turretEqual(double pos) {
         return Math.abs(pos - this.getTurrPos()) < turretTolerance;
     }
 
+    public static double alphaPosConstant = 0.3;
     private void limelightRead() { // only for tracking purposes, not general reads
-        if (redAlliance) {
+        Double xPos = null;
-            webcam.pipelineSwitch(4);
+        Double yPos = null;
-        } else {
+        double zPos;
-            webcam.pipelineSwitch(2);
+        Double hPos = null;
-        }
-
         result = webcam.getLatestResult();
         if (result != null) {
             if (result.isValid()) {
                 tx = result.getTx();
                 ty = result.getTy();
-                // MegaTag1 code for receiving position
+                if (TeleopV3.relocalize){
-                Pose3D botpose = result.getBotpose();
+                    zPos = result.getBotpose().getPosition().z;
-                if (botpose != null) {
+                    if (zPos < 0.15){
-                    limelightPosX = botpose.getPosition().x;
+                        xPos = result.getBotpose().getPosition().x;
-                    limelightPosY = botpose.getPosition().y;
+                        yPos = result.getBotpose().getPosition().y;
+                        hPos = result.getBotpose().getOrientation().getYaw();
+                        limelightTagX = (alphaPosConstant * xPos) + ((1 - alphaPosConstant) * limelightTagX);
+                        limelightTagY = (alphaPosConstant * yPos) + ((1 - alphaPosConstant) * limelightTagY);
+                        limelightTagH = (alphaPosConstant * hPos) + ((1 - alphaPosConstant) * limelightTagH);
+                    }
                 }
-
             }
         }
     }
@@ -119,18 +138,23 @@ public class Turret {
     }
 
     public double getTy() {
-        limelightRead();
         return ty;
     }
 
+    double limelightTagX = 0.0;
+    double limelightTagY = 0.0;
+    double limelightTagZ = 0.0;
+    double limelightTagH = 0.0;
     public double getLimelightX() {
-        limelightRead();
+        return limelightTagX;
-        return limelightPosX;
     }
+    public double getLimelightY() {return limelightTagY;}
+    public double getLimelightZ(){return limelightTagZ;}
+    public double getLimelightH(){return limelightTagH;}
 
-    public double getLimelightY() {
+    public void relocalize(){
+        setTurret(turrDefault);
         limelightRead();
-        return limelightPosY;
     }
 
     public int detectObelisk() {
@@ -138,8 +162,12 @@ public class Turret {
         LLResult result = webcam.getLatestResult();
         if (result != null && result.isValid()) {
             List<LLResultTypes.FiducialResult> fiducials = result.getFiducialResults();
+            double prevTx  = -1000;
             for (LLResultTypes.FiducialResult fiducial : fiducials) {
-                obeliskID = fiducial.getFiducialId();
+                double currentTx = fiducial.getTargetXDegrees();
+                if (currentTx > prevTx){
+                    obeliskID = fiducial.getFiducialId();
+                }
             }
         }
         return obeliskID;
@@ -160,26 +188,30 @@ public class Turret {
     /*
         Param @deltaPos = Pose2d when subtracting robot x, y, heading from goal x, y, heading
      */
-
+    private double targetTx = 0;
-
+    public static double alphaTX = 0.5;
-    private double bearingAlign (LLResult llResult) {
+    private double bearingAlign(LLResult llResult) {
         double bearingOffset = 0.0;
-        double targetTx = llResult.getTx();   // How far left or right the target is (degrees)
+        double tx = llResult.getTx();   // How far left or right the target is (degrees)
-        final double MIN_OFFSET_POWER = 0.15;
+        targetTx = (tx*alphaTX)+(targetTx*(1-alphaTX));
-        final double TARGET_POSITION_TOLERANCE = 1.0;
+//        final double MIN_OFFSET_POWER = 0.15;
-        // LL has 54.5 degree total Horizontal FOV; very edges are not useful.
+//        // LL has 54.5 degree total Horizontal FOV; very edges are not useful.
-        final double HORIZONTAL_FOV_RANGE = 26.0;  // Total usable horizontal degrees from center +/-
+//        final double HORIZONTAL_FOV_RANGE = 26.0;  // Total usable horizontal degrees from center +/-
-        final double DRIVE_POWER_REDUCTION = 2.0;
+//        final double DRIVE_POWER_REDUCTION = 2.0;
 
         if (abs(targetTx) < TARGET_POSITION_TOLERANCE) {
             bearingAligned = true;
-        } else {
+            lightColor = Color.LightBlue;
+        } else if (abs(targetTx) < COLOR_OK_TOLERANCE) {
             bearingAligned = false;
+            lightColor = Color.LightPurple;
+        }  else {
+            bearingAligned = false;
+            lightColor = Color.LightOrange;
         }
 
         // Only with valid data and if too far off target
-        if (llResult.isValid() && !bearingAligned)
+        if (llResult.isValid() && !bearingAligned) {
-        {
 
             // Adjust Robot Speed based on how far the target is located
             // Only drive at half speed max
@@ -201,18 +233,31 @@ public class Turret {
         return bearingOffset;
     }
 
-
+    double targetTurretPos;
-    public void trackGoal(Pose2d deltaPos) {
+    public void trackGoal(Pose deltaPos) {
 
         /* ---------------- FIELD → TURRET GEOMETRY ---------------- */
+        double posX;
+        if (Color.redAlliance){
+            posX = 134 - deltaPos.getX();
+        } else {
+            posX = deltaPos.getX() - 10;
+        }
+        double posY = 140 - deltaPos.getY();
+        double posH = Math.toDegrees(deltaPos.getHeading());
+        while (posH > 180) posH -= 360;
+        while (posH < -180) posH += 360;
 
         // Angle from robot to goal in robot frame
-        double desiredTurretAngleDeg = Math.toDegrees(
+        double desiredTurretAngleDeg = Math.toDegrees(Math.atan2(posY, posX)) - 45;
-                Math.atan2(deltaPos.position.y, deltaPos.position.x)
-        );
 
         // Robot heading (field → robot)
-        double robotHeadingDeg = Math.toDegrees(deltaPos.heading.toDouble());
+        double robotHeadingDeg;
+        if (Color.redAlliance){
+            robotHeadingDeg = posH + 135;
+        } else {
+            robotHeadingDeg = posH + 45;
+        }
 
         // Turret angle needed relative to robot
         double turretAngleDeg = desiredTurretAngleDeg - robotHeadingDeg;
@@ -230,11 +275,18 @@ public class Turret {
 
         turretAngleDeg += permanentOffset;
 
+
         limelightRead();
         // Active correction if we see the target
-        if (result.isValid() && !lockOffset) {
+        if (result.isValid() && !lockOffset && limelightUsed && targetTurretPos > turrMin && targetTurretPos < turrMax) {
             currentTrackOffset += bearingAlign(result);
             currentTrackCount++;
+
+            TELE.addData("LL Tracking: ", llCoast);
+
+            // Assume the last tracked value is always better than
+            // any previous value, even if its not fully aligned.
+            llCoast = LL_COAST_TICKS;
 //            double bearingError = Math.abs(tagBearingDeg);
 //
 //            if (bearingError > cameraBearingEqual) {
@@ -265,8 +317,15 @@ public class Turret {
 //            if (currentTrackCount > 20) {
 //                offset = currentTrackOffset;
 //            }
-            currentTrackOffset = 0.0;
+            if (llCoast <= 0) {
-            currentTrackCount = 0;
+                TELE.addData("LL No Track: ", llCoast);
+                lightColor = Color.LightRed;
+                currentTrackOffset = 0.0;
+                currentTrackCount = 0;
+            } else {
+                TELE.addData("LL Coasting: ", llCoast);
+                llCoast--;
+            }
         }
 
         // Apply accumulated offset
@@ -275,13 +334,13 @@ public class Turret {
 
         /* ---------------- ANGLE → SERVO POSITION ---------------- */
 
-        double targetTurretPos = turrDefault + (turretAngleDeg * (turret180Range * 2.0) / 360);
+        targetTurretPos = turrDefault + (turretAngleDeg * (turret180Range * 2.0) / 360);
 
         // Clamp to physical servo limits
         targetTurretPos = Math.max(turrMin, Math.min(targetTurretPos, turrMax));
 
         // Interpolate towards target position
-        double currentPos = getTurrPos();
+//        double currentPos = getTurrPos();
         double turretPos = targetTurretPos;
 
         if (targetTurretPos == turrMin) {
@@ -291,21 +350,23 @@ public class Turret {
         }
 
         // Set servo positions
-        robot.turr1.setPosition(turretPos);
+        if (!Spindexer.whileShooting || abs(targetTx) > COLOR_OK_TOLERANCE){
-        robot.turr2.setPosition(1.0 - turretPos);
+            setTurret(turretPos + manualOffset);
+        }
 
 
         /* ---------------- TELEMETRY ---------------- */
 
-        TELE.addData("Turret Angle (deg)", "%.2f", turretAngleDeg);
+//        TELE.addData("Turret Angle (deg)", "%.2f", turretAngleDeg);
-        TELE.addData("Target Pos", "%.3f", targetTurretPos);
+//        TELE.addData("Target Pos", "%.3f", targetTurretPos);
-        TELE.addData("Current Pos", "%.3f", currentPos);
+//        TELE.addData("Current Localization Pos", deltaPos);
-        TELE.addData("Commanded Pos", "%.3f", turretPos);
+//        TELE.addData("Commanded Pos", "%.3f", turretPos);
-        TELE.addData("LL Valid", result.isValid());
+//        TELE.addData("LL Valid", result.isValid());
-        TELE.addData("LL getTx", result.getTx());
+//        TELE.addData("LL getTx", result.getTx());
-        TELE.addData("LL Offset", offset);
+//        TELE.addData("LL Offset", offset);
-        //TELE.addData("Bearing Error", hasValidTarget ? String.format("%.2f", tagBearingDeg) : "NO TARGET");
+//        TELE.addData("Bearing Error", hasValidTarget ? String.format("%.2f", tagBearingDeg) : "NO TARGET");
-        TELE.addData("Learned Offset", "%.2f", offset);
+//        TELE.addData("Learned Offset", "%.2f", offset);
+//        TELE.update();
     }
 
 }

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/Drivetrain.java

@@ -0,0 +1,96 @@
+package org.firstinspires.ftc.teamcode.utilsv2;
+
+import com.acmerobotics.dashboard.config.Config;
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.qualcomm.robotcore.hardware.DcMotor;
+
+@Config
+public class Drivetrain {
+
+    Robot robot;
+
+    MultipleTelemetry telemetry;
+
+    private static final double DEADZONE = 0.15;
+    private static final double AXIS_SNAP_THRESHOLD = 0.12;
+
+    private static final double STRAFE_MULTIPLIER = 1.2;
+
+    public static double FORWARD_ROTATION_CORRECTION = 0;
+    public static double STRAFE_ROTATION_CORRECTION = -0;
+
+    private boolean tele = false;
+
+    public Drivetrain(Robot rob, MultipleTelemetry TELE) {
+
+        this.robot = rob;
+
+        robot.frontLeft.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+        robot.frontRight.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+        robot.backLeft.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+        robot.backRight.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+
+        this.telemetry = TELE;
+    }
+
+    public void setTelemetry(boolean input) {
+        tele = input;
+    }
+
+    public void drive(double y, double x, double rx) {
+
+        boolean snappedForward = false;
+        boolean snappedStrafe = false;
+
+        if (Math.abs(y) < DEADZONE) y = 0;
+        if (Math.abs(x) < DEADZONE) x = 0;
+        if (Math.abs(rx) < DEADZONE) rx = 0;
+
+        if (Math.abs(x) < AXIS_SNAP_THRESHOLD) {
+            x = 0;
+            snappedForward = true;
+        }
+
+        if (Math.abs(y) < AXIS_SNAP_THRESHOLD) {
+            y = 0;
+            snappedStrafe = true;
+        }
+
+        x *= STRAFE_MULTIPLIER;
+
+        double correctionRX = 0;
+
+        if (rx == 0) {
+            correctionRX += (y * FORWARD_ROTATION_CORRECTION);
+            correctionRX += (x * STRAFE_ROTATION_CORRECTION);
+
+            rx += correctionRX;
+        }
+
+        double denominator = Math.max(Math.abs(y) + Math.abs(x) + Math.abs(rx), 1);
+
+        double frontLeftPower = (y + x + rx) / denominator;
+        double backLeftPower = (y - x + rx) / denominator;
+        double frontRightPower = (y - x - rx) / denominator;
+        double backRightPower = (y + x - rx) / denominator;
+
+        robot.setFrontLeftPower(frontLeftPower);
+        robot.setBackLeftPower(backLeftPower);
+        robot.setFrontRightPower(frontRightPower);
+        robot.setBackRightPower(backRightPower);
+
+        if (tele) {
+
+            telemetry.addData("Forward Snap", snappedForward);
+            telemetry.addData("Strafe Snap", snappedStrafe);
+
+            telemetry.addData("Correction RX", correctionRX);
+
+            telemetry.addData("FL", frontLeftPower);
+            telemetry.addData("BL", backLeftPower);
+            telemetry.addData("FR", frontRightPower);
+            telemetry.addData("BR", backRightPower);
+
+        }
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/Flywheel.java

@@ -0,0 +1,132 @@
+package org.firstinspires.ftc.teamcode.utilsv2;
+
+import com.qualcomm.robotcore.hardware.DcMotor;
+
+import com.qualcomm.robotcore.hardware.HardwareMap;
+import com.qualcomm.robotcore.hardware.PIDFCoefficients;
+
+import org.firstinspires.ftc.teamcode.utilsv2.Robot;
+
+import java.util.LinkedList;
+
+public class Flywheel {
+    Robot robot;
+
+//    public PIDFCoefficients shooterPIDF1, shooterPIDF2;
+    public static PIDFCoefficients shooterPIDF;
+    public static double shooterPIDF_P = 255;
+    public static double shooterPIDF_I = 0.0;
+    public static double shooterPIDF_D = 0.0;
+    public static double shooterPIDF_F = 75;
+
+    private double velo = 0.0;
+    private double velo1 = 0.0;
+    private double velo2 = 0.0;
+
+    private double averageVelocity = 0.0;
+
+    double targetVelocity = 0.0;
+
+    boolean steady = false;
+
+    private final LinkedList<Double> velocityHistory = new LinkedList<>();
+
+    public Flywheel(Robot rob) {
+        robot = rob;
+        shooterPIDF = new PIDFCoefficients(shooterPIDF_P, shooterPIDF_I, shooterPIDF_D, shooterPIDF_F / 12);
+    }
+
+    public double getVelo() {
+        return velo;
+    }
+
+    public double getVelo1() {
+        return velo1;
+    }
+
+    public double getVelo2() {
+        return velo2;
+    }
+
+    public double getAverageVelocity() {
+        return averageVelocity;
+    }
+
+    public boolean getSteady() {
+        return steady;
+    }
+
+    // Set the robot PIDF for the next cycle.
+
+    public void setPIDF(double p, double i, double d, double f) {
+
+        shooterPIDF.p = p;
+        shooterPIDF.i = i;
+        shooterPIDF.d = d;
+        shooterPIDF.f = f;
+
+        robot.shooter1.setPIDFCoefficients(DcMotor.RunMode.RUN_USING_ENCODER, shooterPIDF);
+    }
+
+    private double prevF = 0;
+
+    public static double voltagePIDFDifference = 0.8;
+    public void setF(double f){
+        if (Math.abs(prevF - f) > voltagePIDFDifference) {
+            shooterPIDF.f = f;
+            robot.shooter1.setPIDFCoefficients(DcMotor.RunMode.RUN_USING_ENCODER, shooterPIDF);
+            prevF = f;
+        }
+    }
+
+    // Convert from RPM to Ticks per Second
+    private double RPM_to_TPS(double RPM) {
+        return (RPM * 28.0) / 60.0;
+    }
+
+    // Convert from Ticks per Second to RPM
+    private double TPS_to_RPM(double TPS) {
+        return (TPS * 60.0) / 28.0;
+    }
+
+    private void updateVelocityAverage(double newVelocity) {
+
+        velocityHistory.add(newVelocity);
+
+        int velocityHistorySize = 5;
+        if (velocityHistory.size() > velocityHistorySize) {
+            velocityHistory.removeFirst();
+        }
+
+        double sum = 0.0;
+
+        for (double v : velocityHistory) {
+            sum += v;
+        }
+
+        averageVelocity = sum / velocityHistory.size();
+    }
+
+    double power;
+    public void manageFlywheel(double commandedVelocity) {
+
+        if (Math.abs(targetVelocity - commandedVelocity) > 0.0001) {
+            targetVelocity = commandedVelocity;
+        }
+
+        robot.shooter1.setVelocity(RPM_to_TPS(targetVelocity));
+        power = robot.shooter1.getPower();
+        robot.shooter2.setPower(power);
+
+        velo1 = TPS_to_RPM(robot.shooter1.getVelocity());
+
+        velo2 = TPS_to_RPM(robot.shooter2.getVelocity());
+
+        velo = (velo1 + velo2) / 2.0;
+
+        updateVelocityAverage(velo);
+
+        steady = (Math.abs(commandedVelocity - averageVelocity) < 50);
+    }
+    public double getShooterPower(){return power;}
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/Robot.java

@@ -0,0 +1,305 @@
+package org.firstinspires.ftc.teamcode.utilsv2;
+
+import android.view.View;
+
+import com.qualcomm.hardware.limelightvision.Limelight3A;
+import com.qualcomm.hardware.rev.RevColorSensorV3;
+import com.qualcomm.robotcore.hardware.AnalogInput;
+import com.qualcomm.robotcore.hardware.DcMotor;
+import com.qualcomm.robotcore.hardware.DcMotorEx;
+import com.qualcomm.robotcore.hardware.DcMotorSimple;
+import com.qualcomm.robotcore.hardware.HardwareMap;
+import com.qualcomm.robotcore.hardware.PIDFCoefficients;
+import com.qualcomm.robotcore.hardware.Servo;
+import com.qualcomm.robotcore.hardware.TouchSensor;
+import com.qualcomm.robotcore.hardware.VoltageSensor;
+
+import org.firstinspires.ftc.robotcore.external.hardware.camera.WebcamName;
+import org.firstinspires.ftc.vision.apriltag.AprilTagProcessor;
+
+public class Robot {
+    // Singleton instance
+    private static Robot instance;
+
+
+    /**
+     * Returns the existing Robot instance or creates one if it doesn't exist.
+     */
+    public static Robot getInstance(HardwareMap hardwareMap) {
+        if (instance == null) {
+            instance = new Robot(hardwareMap);
+        }
+        return instance;
+    }
+
+    /**
+     * Optional: clears the singleton.
+     * Useful when switching OpModes.
+     */
+    public static void resetInstance() {
+        instance = null;
+    }
+
+    public static boolean usingLimelight = true;
+    public static boolean usingCamera = false;
+    public DcMotorEx frontLeft;
+    public DcMotorEx frontRight;
+    public DcMotorEx backLeft;
+    public DcMotorEx backRight;
+    public DcMotorEx intake;
+    public DcMotorEx transfer;
+    //    public double[] shooterPIDF_StepSizes = {10.0, 1.0, 0.001, 0.0001};
+    public DcMotorEx shooter1;
+    public DcMotorEx shooter2;
+    public Servo hood;
+    public Servo transferServo;
+    public Servo spindexBlocker;
+    public Servo rapidFireBlocker;
+    public Servo tilt1;
+    public Servo tilt2;
+    public Servo turr1;
+    public Servo turr2;
+    public Servo spin1;
+    public Servo spin2;
+    public TouchSensor insideBeam;
+    public TouchSensor outsideBeam;
+    public RevColorSensorV3 revSensor;
+
+    public VoltageSensor voltage;
+
+    // Below is disregarded
+    public AnalogInput spin1Pos;
+    public AnalogInput spin2Pos;
+    public AnalogInput turr1Pos;
+    public AnalogInput transferServoPos;
+    public AprilTagProcessor aprilTagProcessor;
+    public WebcamName webcam;
+    public RevColorSensorV3 color1;
+    public RevColorSensorV3 color2;
+    public RevColorSensorV3 color3;
+    public Limelight3A limelight;
+    public Servo light;
+
+    public Robot(HardwareMap hardwareMap) {
+
+        //Define components w/ hardware map
+        frontLeft = hardwareMap.get(DcMotorEx.class, "fl");
+        frontRight = hardwareMap.get(DcMotorEx.class, "fr");
+        backLeft = hardwareMap.get(DcMotorEx.class, "bl");
+        backRight = hardwareMap.get(DcMotorEx.class, "br");
+        frontLeft.setDirection(DcMotorSimple.Direction.REVERSE);
+        backLeft.setDirection(DcMotorSimple.Direction.REVERSE);
+
+        frontLeft.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+        frontRight.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+        backLeft.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+        backRight.setZeroPowerBehavior(DcMotor.ZeroPowerBehavior.FLOAT);
+
+        intake = hardwareMap.get(DcMotorEx.class, "intake");
+        intake.setDirection(DcMotorSimple.Direction.REVERSE);
+
+        shooter1 = hardwareMap.get(DcMotorEx.class, "shooter1");
+
+        shooter2 = hardwareMap.get(DcMotorEx.class, "shooter2");
+
+        shooter1.setDirection(DcMotorSimple.Direction.REVERSE);
+//        shooterPIDF = new PIDFCoefficients(shooterPIDF_P, shooterPIDF_I, shooterPIDF_D, shooterPIDF_F / 12);
+        shooter1.setMode(DcMotor.RunMode.RUN_USING_ENCODER);
+//        shooter1.setPIDFCoefficients(DcMotor.RunMode.RUN_USING_ENCODER, shooterPIDF);
+        shooter2.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
+
+        hood = hardwareMap.get(Servo.class, "hood");
+
+        turr1 = hardwareMap.get(Servo.class, "turr1");
+
+        turr2 = hardwareMap.get(Servo.class, "turr2");
+
+        spin1 = hardwareMap.get(Servo.class, "spin1");
+
+        spin2 = hardwareMap.get(Servo.class, "spin2");
+
+        transfer = hardwareMap.get(DcMotorEx.class, "transfer");
+
+
+        transferServo = hardwareMap.get(Servo.class, "transferServo");
+
+        transfer.setDirection(DcMotorSimple.Direction.REVERSE);
+        transfer.setMode(DcMotor.RunMode.RUN_WITHOUT_ENCODER);
+
+        spindexBlocker = hardwareMap.get(Servo.class, "spinB");
+
+        rapidFireBlocker = hardwareMap.get(Servo.class, "rapidB");
+
+        tilt1 = hardwareMap.get(Servo.class, "tilt1");
+        tilt2 = hardwareMap.get(Servo.class, "tilt2");
+
+        insideBeam = hardwareMap.get(TouchSensor.class, "beam1");
+        outsideBeam = hardwareMap.get(TouchSensor.class, "beam2");
+
+        revSensor = hardwareMap.get(RevColorSensorV3.class, "rev");
+
+        // Below is disregarded
+
+//        turr1Pos = hardwareMap.get(AnalogInput.class, "t1Pos"); // Encoder of turret plugged in intake port
+//
+//        spin1Pos = hardwareMap.get(AnalogInput.class, "spin1Pos");
+//
+//        spin2Pos = hardwareMap.get(AnalogInput.class, "spin2Pos");
+//
+//        transferServoPos = hardwareMap.get(AnalogInput.class, "tSPos");
+//
+//        color1 = hardwareMap.get(RevColorSensorV3.class, "c1");
+//
+//        color2 = hardwareMap.get(RevColorSensorV3.class, "c2");
+//
+//        color3 = hardwareMap.get(RevColorSensorV3.class, "c3");
+
+        if (usingLimelight) {
+            limelight = hardwareMap.get(Limelight3A.class, "limelight");
+        } else if (usingCamera) {
+            webcam = hardwareMap.get(WebcamName.class, "Webcam 1");
+            aprilTagProcessor = AprilTagProcessor.easyCreateWithDefaults();
+        }
+
+//        light = hardwareMap.get(Servo.class, "light");
+
+        voltage = hardwareMap.voltageSensor.iterator().next();
+    }
+
+    // Voids below are used to minimize hardware calls to minimize loop times
+
+    // Used to cut off digits that are negligible
+    private final int maxDigits = 5;
+    private final int roundingFactor = (int) Math.pow(10, maxDigits);
+
+    private double prevFrontLeftPower = -10.501;
+    public void setFrontLeftPower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevFrontLeftPower){
+            frontLeft.setPower(pow);
+        }
+        prevFrontLeftPower = pow;
+    }
+
+    private double prevFrontRightPower = -10.501;
+    public void setFrontRightPower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevFrontRightPower){
+            frontRight.setPower(pow);
+        }
+        prevFrontRightPower = pow;
+    }
+
+    private double prevBackLeftPower = -10.501;
+    public void setBackLeftPower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevBackLeftPower){
+            backLeft.setPower(pow);
+        }
+        prevBackLeftPower = pow;
+    }
+
+    private double prevBackRightPower = -10.501;
+    public void setBackRightPower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevBackRightPower){
+            backRight.setPower(pow);
+        }
+        prevBackRightPower = pow;
+    }
+
+    private double prevIntakePower = -10.501;
+    public void setIntakePower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevIntakePower){
+            intake.setPower(pow);
+        }
+        prevIntakePower = pow;
+    }
+
+    private double prevTransferPower = -10.501;
+    public void setTransferPower(double pow){
+        pow = (double) Math.round(pow * roundingFactor) / roundingFactor;
+        if (pow != prevTransferPower){
+            transfer.setPower(pow);
+        }
+        prevTransferPower = pow;
+    }
+
+    // shooter motors are done in separate class
+
+    private double prevHoodPos = -10.501;
+    public void setHoodPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevHoodPos){
+            hood.setPosition(pos);
+        }
+        prevHoodPos = pos;
+    }
+
+    private double prevTransferServoPos = -10.501;
+    public void setTransferServoPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevTransferServoPos){
+            transferServo.setPosition(pos);
+        }
+        prevTransferServoPos = pos;
+    }
+
+    private double prevSpinPos = -10.501;
+    public void setSpinPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevSpinPos){
+            spin1.setPosition(pos);
+            spin2.setPosition(pos);
+        }
+        prevSpinPos = pos;
+    }
+
+    private double prevTurretPos = -10.501;
+    public void setTurretPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevTurretPos){
+            turr1.setPosition(pos);
+            turr2.setPosition(pos);
+        }
+        prevTurretPos = pos;
+    }
+
+    private double prevTilt1Pos = -10.501;
+    public void setTilt1Pos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevTilt1Pos){
+            tilt1.setPosition(pos);
+        }
+        prevTilt1Pos = pos;
+    }
+
+    private double prevTilt2Pos = -10.501;
+    public void setTilt2Pos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevTilt2Pos){
+            tilt2.setPosition(pos);
+        }
+        prevTilt2Pos = pos;
+    }
+
+    private double prevSpindexBlockerPos = -10.501;
+    public void setSpindexBlockerPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevSpindexBlockerPos){
+            spindexBlocker.setPosition(pos);
+        }
+        prevSpindexBlockerPos = pos;
+    }
+
+    private double prevRapidFireBlockerPos = -10.501;
+    public void setRapidFireBlockerPos(double pos){
+        pos = (double) Math.round(pos * roundingFactor) / roundingFactor;
+        if (pos != prevRapidFireBlockerPos){
+            rapidFireBlocker.setPosition(pos);
+        }
+        prevRapidFireBlockerPos = pos;
+    }
+
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/Shooter.java

@@ -0,0 +1,161 @@
+package org.firstinspires.ftc.teamcode.utilsv2;
+
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+import com.pedropathing.follower.Follower;
+
+
+public class Shooter {
+
+    Robot robot;
+    Flywheel fly;
+    Turret turr;
+    VelocityCommander commander;
+
+    double goalX = 0.0;
+    double goalY = 0.0;
+    double obeliskX = 72;
+    double obeliskY = 144;
+
+    private boolean red = true;
+
+
+    Follower follow;
+
+    public Shooter(Robot rob, MultipleTelemetry TELE, Follower follower, boolean redAlliance, Turret turret, Flywheel flywheel) {
+        this.robot = rob;
+        this.fly = flywheel;
+        this.turr = turret;
+        this.follow = follower;
+        this.commander = new VelocityCommander();
+
+        setRedAlliance(redAlliance);
+
+    }
+
+    public void setRedAlliance(boolean input) {
+        this.red = input;
+
+        if (this.red) {
+            goalX = 144;
+        } else {
+            goalX = 0;
+        }
+        goalY = 144;
+    }
+
+    private double flywheelVelocity = 0.0;
+    private double turretPosition = 0.5;
+
+    public enum ShooterState {
+        READ_OBELISK,
+        TRACK_GOAL,
+        MANUAL_FLYWHEEL_TRACK_TURR,
+        MANUAL_TURRET_TRACK_FLY,
+        MANUAL,
+        NOTHING
+    }
+
+
+    private ShooterState state = ShooterState.NOTHING;
+
+    public void setState(ShooterState shooterState) {
+        this.state = shooterState;
+    }
+
+    public void setTurretPosition(double input) {
+        this.turretPosition = input;
+    }
+
+    public void setFlywheelVelocity(double input) {
+        this.flywheelVelocity = input;
+    }
+
+    public int getObeliskID() {
+        return turr.getObeliskID();
+    }
+
+
+    public void update() {
+
+        switch (state) {
+            case NOTHING:
+                break;
+            case MANUAL:
+                fly.manageFlywheel(flywheelVelocity);
+                turr.manual(turretPosition);
+                break;
+            case TRACK_GOAL:
+                turr.trackGoal(
+                        (follow.getPose().getX() - goalX),
+                        (follow.getPose().getY() - goalY),
+                        follow.getHeading(),
+                        follow.getAngularVelocity(),
+                        follow.getVelocity().getXComponent(),
+                        follow.getAcceleration().getXComponent(),
+                        follow.getVelocity().getYComponent(),
+                        follow.getAcceleration().getYComponent()
+                );
+
+                flywheelVelocity = commander.getVeloPredictive(
+                        (follow.getPose().getX() - goalX),
+                        (follow.getPose().getY() - goalY),
+                        follow.getVelocity().getXComponent(),
+                        follow.getAcceleration().getXComponent(),
+                        follow.getVelocity().getYComponent(),
+                        follow.getAcceleration().getYComponent()
+                );
+
+                fly.manageFlywheel(flywheelVelocity);
+                break;
+            case READ_OBELISK:
+                turr.trackObelisk(
+                        (follow.getPose().getX() - goalX),
+                        (follow.getPose().getY() - goalY),
+                        follow.getHeading()
+                );
+
+                flywheelVelocity = commander.getVeloPredictive(
+                        (follow.getPose().getX() - goalX),
+                        (follow.getPose().getY() - goalY),
+                        follow.getVelocity().getXComponent(),
+                        follow.getAcceleration().getXComponent(),
+                        follow.getVelocity().getYComponent(),
+                        follow.getAcceleration().getYComponent()
+                );
+
+                fly.manageFlywheel(flywheelVelocity);
+                break;
+
+            case MANUAL_TURRET_TRACK_FLY:
+                turr.manual(turretPosition);
+                flywheelVelocity = commander.getVeloPredictive(
+                        (follow.getPose().getX() - goalX),
+                        (follow.getPose().getY() - goalY),
+                        follow.getVelocity().getXComponent(),
+                        follow.getAcceleration().getXComponent(),
+                        follow.getVelocity().getYComponent(),
+                        follow.getAcceleration().getYComponent()
+                );
+
+                fly.manageFlywheel(flywheelVelocity);
+                break;
+
+            case MANUAL_FLYWHEEL_TRACK_TURR:
+                turr.trackGoal(
+                        (follow.getPose().getX() - goalX),
+                        (follow.getPose().getY() - goalY),
+                        follow.getHeading(),
+                        follow.getAngularVelocity(),
+                        follow.getVelocity().getXComponent(),
+                        follow.getAcceleration().getXComponent(),
+                        follow.getVelocity().getYComponent(),
+                        follow.getAcceleration().getYComponent()
+                );
+                fly.manageFlywheel(flywheelVelocity);
+                break;
+
+        }
+
+    }
+
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/SpindexerTransferIntake.java

@@ -0,0 +1,183 @@
+package org.firstinspires.ftc.teamcode.utilsv2;
+
+import com.acmerobotics.dashboard.telemetry.MultipleTelemetry;
+
+import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
+import org.firstinspires.ftc.teamcode.constants.ServoPositions;
+
+public class SpindexerTransferIntake {
+
+    private final Robot robot;
+
+    public SpindexerTransferIntake(Robot rob, MultipleTelemetry TELE) {
+        this.robot = rob;
+    }
+
+    private final double sensorDistanceThreshold = 4.0;
+    private final long pulseTime = 50; // ms
+
+    public enum SpindexerMode {
+        RAPID,
+        SORTED
+    }
+
+    public enum RapidMode {
+        INTAKE,
+        TRANSFER_OFF,
+        BEFORE_PULSE_OUT,
+        PULSE_OUT,
+        PULSE_IN,
+        HOLD_BALLS,
+        OPEN_GATE,
+        SHOOT
+    }
+
+    private SpindexerMode mode = SpindexerMode.RAPID;
+    private RapidMode rapidMode = RapidMode.INTAKE;
+
+    /**
+     * Time when current state was entered.
+     */
+    private long stateStartTime = System.currentTimeMillis();
+
+    public void setRapidMode(RapidMode newMode) {
+        if (rapidMode != newMode) {
+            rapidMode = newMode;
+            stateStartTime = System.currentTimeMillis();
+        }
+    }
+
+    public void setSpindexerMode(SpindexerMode spindexerMode) {
+        this.mode = spindexerMode;
+    }
+
+    public RapidMode getRapidState(){
+        return this.rapidMode;
+    }
+
+    private long stateTime() {
+        return System.currentTimeMillis() - stateStartTime;
+    }
+
+    public void update() {
+
+        switch (mode) {
+
+            case RAPID:
+
+                robot.setSpindexBlockerPos(
+                        ServoPositions.spindexBlocker_Open
+                );
+
+                switch (rapidMode) {
+
+                    case INTAKE:
+
+                        robot.setIntakePower(1);
+                        robot.setTransferPower(1);
+                        robot.setRapidFireBlockerPos(
+                                ServoPositions.rapidFireBlocker_Closed
+                        );
+                        robot.setSpinPos(
+                                ServoPositions.spindexer_A2
+                        );
+                        robot.setTransferServoPos(
+                                ServoPositions.transferServo_out
+                        );
+
+                        if (robot.insideBeam.isPressed() && robot.revSensor.getDistance(DistanceUnit.CM) < sensorDistanceThreshold) {
+
+                            setRapidMode(RapidMode.TRANSFER_OFF);
+                        }
+
+
+                        break;
+
+                    case TRANSFER_OFF:
+
+                        robot.setTransferPower(0.3);
+
+                        if (robot.insideBeam.isPressed() && robot.outsideBeam.isPressed()) {
+                            setRapidMode(RapidMode.BEFORE_PULSE_OUT);
+                        }
+
+                        break;
+
+                    case BEFORE_PULSE_OUT:
+
+                        robot.setIntakePower(1.0);
+
+                        if (stateTime() >= 300) {
+                            setRapidMode(RapidMode.PULSE_OUT);
+                        }
+
+                        break;
+
+                    case PULSE_OUT:
+
+                        robot.setIntakePower(-0.1);
+
+                        if (stateTime() >= pulseTime) {
+                            setRapidMode(RapidMode.PULSE_IN);
+                        }
+
+                        break;
+
+                    case PULSE_IN:
+
+                        robot.setIntakePower(1.0);
+
+                        if (stateTime() >= 200) {
+                            setRapidMode(RapidMode.HOLD_BALLS);
+                        }
+
+
+                        break;
+
+                    case HOLD_BALLS:
+
+                        if (robot.insideBeam.isPressed()
+                                && robot.outsideBeam.isPressed()) {
+
+                            robot.setIntakePower(0.1);
+
+                        } else {
+
+                            robot.setIntakePower(1);
+                        }
+
+
+
+                        break;
+
+                    case OPEN_GATE:
+
+                        robot.setRapidFireBlockerPos(
+                                ServoPositions.rapidFireBlocker_Open
+                        );
+
+                        if (stateTime() >= 100) {
+                            setRapidMode(RapidMode.SHOOT);
+                        }
+
+                        break;
+
+                    case SHOOT:
+
+                        robot.setTransferServoPos(
+                                ServoPositions.transferServo_in
+                        );
+                        if (stateTime() >= 400) {
+                            setRapidMode(RapidMode.INTAKE);
+                        }
+                        break;
+                }
+                break;
+
+            case SORTED:
+
+                // Future sorted-intake logic
+                break;
+        }
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/Turret.java

@@ -0,0 +1,111 @@
+package org.firstinspires.ftc.teamcode.utilsv2;
+
+import com.acmerobotics.dashboard.config.Config;
+import com.qualcomm.hardware.limelightvision.LLResult;
+import com.qualcomm.hardware.limelightvision.LLResultTypes;
+import com.qualcomm.robotcore.util.Range;
+
+
+import java.util.List;
+
+@Config
+public class Turret {
+    Robot robot;
+
+    private final double servoTicksPer180 = 0.58;
+    private final double neutralPosition = 0.51;
+    private final double turretMin = 0.05;
+    private final double turretMax = 0.95;
+    private final double hVelK = 0; // TODO: Tune
+    private final double xVelK = 0; // TODO: Tune
+    private final double xAccK = 0; // TODO: Tune
+    private final double yVelK = 0; // TODO: Tune
+    private final double yAccK = 0; // TODO: Tune
+
+    private int obeliskID = 0;
+
+
+
+    public Turret(Robot rob) {
+        this.robot = rob;
+    }
+
+    private double wrapAngle(double angle) {
+        while (angle > Math.PI) angle -= 2.0 * Math.PI;
+        while (angle < -Math.PI) angle += 2.0 * Math.PI;
+        return angle;
+    }
+
+    public void trackObelisk(double dx, double dy, double h) {
+
+        double heading = wrapAngle(h);
+
+        double fieldRelativeHeading = Math.atan2(dy, dx);
+
+        double desiredAngle = fieldRelativeHeading - heading;
+        double angleDelta = desiredAngle - Math.PI;
+        angleDelta = wrapAngle(angleDelta);
+
+        double servoTicksFromNeutral = (angleDelta / (2.0 * Math.PI)) * (2.0 * servoTicksPer180);
+
+        double servoAngle = neutralPosition + servoTicksFromNeutral;
+
+        servoAngle = Range.clip(servoAngle, turretMin, turretMax);
+
+        robot.setTurretPos(servoAngle);
+
+
+        detectObelisk();
+
+    }
+
+    public int getObeliskID() {
+        return obeliskID;
+    }
+
+    private int detectObelisk() {
+        robot.limelight.pipelineSwitch(1);
+        LLResult result = robot.limelight.getLatestResult();
+        if (result != null && result.isValid()) {
+            List<LLResultTypes.FiducialResult> fiducials = result.getFiducialResults();
+            double prevTx  = -1000;
+            for (LLResultTypes.FiducialResult fiducial : fiducials) {
+                double currentTx = fiducial.getTargetXDegrees();
+                if (currentTx > prevTx){
+                    obeliskID = fiducial.getFiducialId();
+                }
+            }
+        }
+        return obeliskID;
+    }
+
+    public void manual (double pos) {
+        robot.setTurretPos(pos);
+
+    }
+
+
+    public void trackGoal(double dx, double dy, double h, double hVel, double xVel, double xAcc, double yVel, double yAcc) {
+        // dx, dy, dz is target - robot
+        // h is the raw heading where 0 degrees is positive x in the system of x, y
+
+        double predictedDx = dx - (xVel * xVelK) - (0.5 * xAcc * xAccK); // Negative bc dx = target - robot
+        double predictedDy = dy - (yVel * yVelK) - (0.5 * yAcc * yAccK);  // Negative bc dy = target - robot
+        double predictedH = h + (hVel * hVelK); // Positive bc h = robot heading
+
+        predictedH = wrapAngle(predictedH);
+
+        double fieldRelativeHeading = Math.atan2(predictedDy, predictedDx);
+
+        double angleDelta = fieldRelativeHeading - predictedH;
+        angleDelta = wrapAngle(angleDelta);
+
+        double servoTicksFromNeutral = (angleDelta / (2.0 * Math.PI)) * (2.0 * servoTicksPer180);
+
+        double servoAngle = neutralPosition + servoTicksFromNeutral;
+
+        servoAngle = Range.clip(servoAngle, turretMin, turretMax);
+
+        robot.setTurretPos(servoAngle);
+    }
+}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/VelocityCommander.java

@@ -0,0 +1,34 @@
+package org.firstinspires.ftc.teamcode.utilsv2;
+
+public class VelocityCommander {
+    private final double goalH = 20.0; //TODO: Tune
+    private final double xVelK = 0; // TODO: Tune
+    private final double xAccK = 0; // TODO: Tune
+    private final double yVelK = 0; // TODO: Tune
+    private final double yAccK = 0; // TODO: Tune
+
+    public VelocityCommander() {
+
+    }
+
+    private double distToRPM (double dist){
+        return Math.sqrt(dist*dist + goalH*goalH);
+        //TODO: Add regression here using goalH
+    }
+
+    public double getVeloStationary (double distance){
+        return distToRPM(distance);
+    }
+
+    public double getVeloPredictive(double dx, double dy, double xVel, double xAcc, double yVel, double yAcc) {
+
+        double predictedDx = dx - (xVel * xVelK) - (0.5 * xAcc * xAccK); // Negative bc dx = target - robot
+        double predictedDy = dy - (yVel * yVelK) - (0.5 * yAcc * yAccK);  // Negative bc dy = target - robot
+
+        double predictedDist = Math.sqrt(dx*dx + dy*dy);
+
+        return distToRPM(predictedDist);
+    }
+
+
+}

build.dependencies.gradle

@@ -9,28 +9,21 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.firstinspires.ftc:Inspection:11.0.0'
+    implementation 'org.firstinspires.ftc:Inspection:11.1.0'
-    implementation 'org.firstinspires.ftc:Blocks:11.0.0'
+    implementation 'org.firstinspires.ftc:Blocks:11.1.0'
-    implementation 'org.firstinspires.ftc:RobotCore:11.0.0'
+    //noinspection Aligned16KB
-    implementation 'org.firstinspires.ftc:RobotServer:11.0.0'
+    implementation 'org.firstinspires.ftc:RobotCore:11.1.0'
-    implementation 'org.firstinspires.ftc:OnBotJava:11.0.0'
+    implementation 'org.firstinspires.ftc:RobotServer:11.1.0'
-    implementation 'org.firstinspires.ftc:Hardware:11.0.0'
+    implementation 'org.firstinspires.ftc:OnBotJava:11.1.0'
-    implementation 'org.firstinspires.ftc:FtcCommon:11.0.0'
+    implementation 'org.firstinspires.ftc:Hardware:11.1.0'
-    implementation 'org.firstinspires.ftc:Vision:11.0.0'
+    implementation 'org.firstinspires.ftc:FtcCommon:11.1.0'
+    implementation 'org.firstinspires.ftc:Vision:11.1.0'
     implementation 'androidx.appcompat:appcompat:1.2.0'
 
 
-
+    implementation 'com.pedropathing:ftc:2.1.1'
-    implementation 'com.pedropathing:ftc:2.0.1' //PedroCore
+    implementation 'com.pedropathing:telemetry:1.0.0'
-    implementation 'com.pedropathing:telemetry:0.0.6' //PedroTele
+    implementation 'com.bylazar:fullpanels:1.0.12'
-
-    implementation 'com.bylazar:fullpanels:1.0.2' //Panels
-
-    implementation "com.acmerobotics.roadrunner:ftc:0.1.25"
-    implementation "com.acmerobotics.roadrunner:core:1.0.1"
-    implementation "com.acmerobotics.roadrunner:actions:1.0.1"
-    implementation "com.acmerobotics.dashboard:dashboard:0.5.1"
-
     implementation 'org.ftclib.ftclib:core:2.1.1' // FTC LIB
 
     implementation 'com.rowanmcalpin.nextftc:core:0.6.2' //NEXT FTC
@@ -40,11 +33,5 @@ dependencies {
     implementation("page.j5155.AdvantageScope:lite:v26.0.0") //AS
 
 
-
-
-
-
-
-
 }