diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV4.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV4.java index 65b6d7b..76638a3 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV4.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop/TeleopV4.java @@ -31,7 +31,7 @@ public class TeleopV4 extends LinearOpMode { ParkTilter parkTilter; MeasuringLoopTimes loopTimes; - public static Pose relocalizePose = new Pose(56, 11, 0); + public static Pose relocalizePose = new Pose(54.7, 11.4, 0); public static Pose teleStart = new Pose(0,0,0); private boolean firstTickFull = true; @@ -122,9 +122,9 @@ public class TeleopV4 extends LinearOpMode { if (gamepad1.crossWasPressed()){ if (Color.redAlliance){ - relocalizePose = new Pose(57.5, 5, 0); + relocalizePose = new Pose(54.4, 12, 0); } else { - relocalizePose = new Pose(-57.5, 5, Math.toRadians(180)); + relocalizePose = new Pose(-54.4, 12, Math.toRadians(180)); } follower.setPose(relocalizePose); sleep(500); diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/SpindexerTransferIntake.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/SpindexerTransferIntake.java index 324f965..4526bbc 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/SpindexerTransferIntake.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/utilsv2/SpindexerTransferIntake.java @@ -53,7 +53,7 @@ public class SpindexerTransferIntake { } int[] shootOrder = {0, 1, 2}; - public static final double sensorDistanceThreshold = 5.35; + public static final double sensorDistanceThreshold = 4.75;//4.85//5.35 final long pulseTime = 70; // ms private DesiredPattern desiredPattern = DesiredPattern.GPP; @@ -205,7 +205,7 @@ public class SpindexerTransferIntake { private RapidMode rapidMode = RapidMode.INTAKE; private SortedIntakeStates sortedIntakeStates = SortedIntakeStates.IDLE; private BallStates[] ballColors = {BallStates.UNKNOWN, BallStates.UNKNOWN, BallStates.UNKNOWN}; - final double greenThresh = 0.39; + final double greenThresh = 0.41; final double spinMovementTime = 250; /**