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 5027eb7..6ce65a0 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 @@ -150,14 +150,14 @@ public class TeleopV3 extends LinearOpMode { PIDFController tController = new PIDFController(tp, ti, td, tf); tController.setTolerance(0.001); +// +// if (redAlliance) { +// robot.limelight.pipelineSwitch(3); +// } else { +// robot.limelight.pipelineSwitch(2); +// } - if (redAlliance) { - robot.limelight.pipelineSwitch(3); - } else { - robot.limelight.pipelineSwitch(2); - } - - robot.limelight.start(); +// robot.limelight.start(); waitForStart(); if (isStopRequested()) return; @@ -434,28 +434,28 @@ public class TeleopV3 extends LinearOpMode { TELE.addData("posS2", pos); - if (y < 0.3 && y > -0.3 && x < 0.3 && x > -0.3 && rx < 0.3 && rx > -0.3) { //not moving - double bearing; - - LLResult result = robot.limelight.getLatestResult(); - if (result != null) { - if (result.isValid()) { - bearing = result.getTx() * bMult; - - double bearingCorrection = bearing / bDiv; - - error += bearingCorrection; - - camTicker++; - TELE.addData("tx", bearingCorrection); - TELE.addData("ty", result.getTy()); - } - } - - } else { - camTicker = 0; - overrideTurr = false; - } +// if (y < 0.3 && y > -0.3 && x < 0.3 && x > -0.3 && rx < 0.3 && rx > -0.3) { //not moving +// double bearing; +// +// LLResult result = robot.light.getLatestResult(); +// if (result != null) { +// if (result.isValid()) { +// bearing = result.getTx() * bMult; +// +// double bearingCorrection = bearing / bDiv; +// +// error += bearingCorrection; +// +// camTicker++; +// TELE.addData("tx", bearingCorrection); +// TELE.addData("ty", result.getTy()); +// } +// } +// +// } else { +// camTicker = 0; +// overrideTurr = false; +// } if (!overrideTurr) { turretPos = pos; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Robot.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Robot.java index 6047743..a3cb45c 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Robot.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utils/Robot.java @@ -20,7 +20,7 @@ public class Robot { //Initialize Public Components - public static boolean usingLimelight = true; + public static boolean usingLimelight = false; public static boolean usingCamera = true; public DcMotorEx frontLeft; public DcMotorEx frontRight;