From 41853e9ad1b7452183c832567fd46d77f6f9c31d Mon Sep 17 00:00:00 2001 From: Keshav Anand Date: Mon, 9 Mar 2026 16:42:00 -0500 Subject: [PATCH 1/4] Testing new commit stattion --- .../ftc/teamcode/teleop/TeleopV3.java | 30 ++++++++----------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java index 46b7949..8320805 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV3.java @@ -45,9 +45,9 @@ public class TeleopV3 extends LinearOpMode { public double vel = 3000; public boolean autoVel = true; public boolean targetingHood = true; -// public boolean autoHood = true; + // public boolean autoHood = true; public double shootStamp = 0.0; -// boolean fixedTurret = false; + // boolean fixedTurret = false; Robot robot; MultipleTelemetry TELE; Light light; @@ -66,10 +66,10 @@ public class TeleopV3 extends LinearOpMode { double xOffset = 0.0; double yOffset = 0.0; double hOffset = 0.0; -// double headingOffset = 0.0; + // double headingOffset = 0.0; int ticker = 0; -// boolean autoSpintake = false; + // boolean autoSpintake = false; boolean enableSpindexerManager = true; // boolean overrideTurr = false; @@ -142,12 +142,7 @@ public class TeleopV3 extends LinearOpMode { //DRIVETRAIN: - drivetrain.drive( - -gamepad1.right_stick_y, - gamepad1.right_stick_x, - gamepad1.left_stick_x, - gamepad1.left_trigger - ); + drivetrain.drive(-gamepad1.right_stick_y, gamepad1.right_stick_x, gamepad1.left_stick_x, gamepad1.left_trigger); if (gamepad1.right_bumper) { @@ -156,10 +151,10 @@ public class TeleopV3 extends LinearOpMode { light.setState(StateEnums.LightState.BALL_COUNT); - } else if (gamepad2.triangle){ + } else if (gamepad2.triangle) { light.setState(StateEnums.LightState.BALL_COLOR); - } else { + } else { light.setState(StateEnums.LightState.GOAL_LOCK); } @@ -182,17 +177,16 @@ public class TeleopV3 extends LinearOpMode { // double distanceToGoal = Math.sqrt(dx * dx + dy * dy); - targetingSettings = targeting.calculateSettings - (robotX, robotY, robotHeading, 0.0, turretInterpolate); + targetingSettings = targeting.calculateSettings(robotX, robotY, robotHeading, 0.0, turretInterpolate); //RELOCALIZATION - if (gamepad2.squareWasPressed()){ + if (gamepad2.squareWasPressed()) { relocalize = !relocalize; gamepad2.rumble(500); } - if (relocalize){ + if (relocalize) { turret.relocalize(); xOffset = -((turret.getLimelightZ() * 39.3701) + Turret.limelightPosOffset) - robX; yOffset = (turret.getLimelightX() * 39.3701) - robY; @@ -231,6 +225,7 @@ public class TeleopV3 extends LinearOpMode { //HOOD: + if (targetingHood) { servo.setHoodPos(targetingSettings.hoodAngle + autoHoodOffset); } else { @@ -267,7 +262,6 @@ public class TeleopV3 extends LinearOpMode { } - if (enableSpindexerManager) { //if (!shootAll) { spindexer.processIntake(); @@ -299,7 +293,7 @@ public class TeleopV3 extends LinearOpMode { if (shooterTicker == 0) { spindexer.prepareShootAllContinous(); //TELE.addLine("preparing to shoot"); -// } else if (shooterTicker == 2) { +// else if (shooterTicker == 2) { // //servo.setTransferPos(transferServo_in); // spindexer.shootAll(); // TELE.addLine("starting to shoot"); From 369e379eb414cfb7b31f7f4085153b28c12ae50a Mon Sep 17 00:00:00 2001 From: KeshavAnandCode Date: Wed, 18 Mar 2026 15:05:37 -0500 Subject: [PATCH 2/4] test comit --- build.dependencies.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.dependencies.gradle b/build.dependencies.gradle index 81265f9..c893dbd 100644 --- a/build.dependencies.gradle +++ b/build.dependencies.gradle @@ -6,7 +6,6 @@ repositories { maven { url = 'https://maven.brott.dev/' } //RR maven { url = "https://maven.rowanmcalpin.com/" } //Next FTC maven { url = "https://repo.dairy.foundation/releases" } //AS - } dependencies { From bd05090afe0ed5c049121cc691a3b310dc56fa97 Mon Sep 17 00:00:00 2001 From: KeshavAnandCode Date: Wed, 18 Mar 2026 15:08:27 -0500 Subject: [PATCH 3/4] test commit 2 --- build.dependencies.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.dependencies.gradle b/build.dependencies.gradle index c893dbd..37f33ec 100644 --- a/build.dependencies.gradle +++ b/build.dependencies.gradle @@ -25,7 +25,6 @@ dependencies { implementation 'com.pedropathing:telemetry:1.0.0' //PedroTele implementation 'com.bylazar:fullpanels:1.0.2' //Panels - implementation 'org.ftclib.ftclib:core:2.1.1' // FTC LIB implementation 'com.rowanmcalpin.nextftc:core:0.6.2' //NEXT FTC From 7043274ebd14bdbe46ce3f1c9d93c2a49eba5d06 Mon Sep 17 00:00:00 2001 From: KeshavAnandCode Date: Wed, 18 Mar 2026 15:15:38 -0500 Subject: [PATCH 4/4] test commit 3 --- build.dependencies.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.dependencies.gradle b/build.dependencies.gradle index 37f33ec..70755bd 100644 --- a/build.dependencies.gradle +++ b/build.dependencies.gradle @@ -24,7 +24,6 @@ dependencies { implementation 'com.pedropathing:ftc:2.0.6' //PedroCore implementation 'com.pedropathing:telemetry:1.0.0' //PedroTele implementation 'com.bylazar:fullpanels:1.0.2' //Panels - implementation 'org.ftclib.ftclib:core:2.1.1' // FTC LIB implementation 'com.rowanmcalpin.nextftc:core:0.6.2' //NEXT FTC