From 8f92dc8f31d917cb3a0c364d140bf942f2cc2702 Mon Sep 17 00:00:00 2001 From: DanTheMan-byte Date: Mon, 19 Jan 2026 20:28:13 -0600 Subject: [PATCH 1/2] test --- .../firstinspires/ftc/teamcode/utils/Spindexer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Spindexer.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Spindexer.java index 234afc3..9699c54 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Spindexer.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Spindexer.java @@ -325,21 +325,21 @@ public class Spindexer { commandedIntakePosition = 0; servos.setSpinPos(outakePositions[commandedIntakePosition]); currentIntakeState = Spindexer.IntakeState.SHOOTMOVING; - } else if (ballPositions[1].isEmpty) { + } else if (ballPositions[1].isEmpty) { // Possible error: should it be !ballPosition[1].isEmpty? // Position 2 commandedIntakePosition = 1; servos.setSpinPos(outakePositions[commandedIntakePosition]); currentIntakeState = Spindexer.IntakeState.SHOOTMOVING; - } else if (ballPositions[2].isEmpty) { + } else if (ballPositions[2].isEmpty) { // Possible error: should it be !ballPosition[2].isEmpty? // Position 3 commandedIntakePosition = 2; - servos.setSpinPos(intakePositions[commandedIntakePosition]); + 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]); + moveSpindexerToPos(intakePositions[commandedIntakePosition]); // Possible error: should it be using "outakePositions" instead of "intakePositions" break; case SHOOTMOVING: @@ -358,7 +358,7 @@ public class Spindexer { } else { // Keep moving the spindexer - moveSpindexerToPos(intakePositions[commandedIntakePosition]); + moveSpindexerToPos(intakePositions[commandedIntakePosition]); // Possible error: should it be using "outakePositions" instead of "intakePositions" } break; From ccb52f625d4cc1c86fe92d36938f5a10f7ec0daf Mon Sep 17 00:00:00 2001 From: DanTheMan-byte Date: Mon, 19 Jan 2026 20:42:22 -0600 Subject: [PATCH 2/2] error check --- .../java/org/firstinspires/ftc/teamcode/utils/Flywheel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Flywheel.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Flywheel.java index 412aaaf..495b9db 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Flywheel.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Flywheel.java @@ -74,7 +74,7 @@ public class Flywheel { // Record Current Velocity velo1 = TPS_to_RPM(robot.shooter1.getVelocity()); - velo2 = TPS_to_RPM(robot.shooter1.getVelocity()); + velo2 = TPS_to_RPM(robot.shooter1.getVelocity()); // Possible error: should it be shooter2 not shooter1? velo = Math.max(velo1,velo2); // really should be a running average of the last 5