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 91f0f24..97824bb 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 @@ -807,6 +807,7 @@ public class TeleopV3 extends LinearOpMode { for (LynxModule hub : allHubs) { hub.clearBulkCache(); } + // TELE.addData("Spin1Green", green1 + ": " + ballIn(1)); TELE.addData("Spin2Green", green2 + ": " + ballIn(2)); diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Turret.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Turret.java index 202293c..44ec29e 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Turret.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Turret.java @@ -12,7 +12,7 @@ import org.firstinspires.ftc.vision.apriltag.AprilTagDetection; public class Turret { public static double turretTolerance = 0.02; - public static double turrPosScalar = 1.009; + public static double turrPosScalar = 1; public static double turret180Range = 0.4; public static double turrDefault = 0.4; public static double cameraBearingEqual = 1; @@ -38,7 +38,7 @@ public class Turret { } public double getTurrPos() { - return turrPosScalar * (robot.turr1Pos.getVoltage() / 3.3); + return turrPosScalar * (robot.intake.getCurrentPosition()); }