diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/actions/AutoActions.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/actions/AutoActions.java index e4db014..968545d 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/actions/AutoActions.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/autonomous/actions/AutoActions.java @@ -54,7 +54,7 @@ public class AutoActions { public static double firstSpindexShootPos = spinStartPos; private boolean shootForward = true; public int motif = 0; - double spinEndPos = ServoPositions.spinEndPos; + double spinEndPos = 0.95; private boolean intaking = false; public AutoActions(Robot rob, MecanumDrive dri, MultipleTelemetry tel, Servos ser, Flywheel fly, Spindexer spi, Targeting tar, Targeting.Settings tS, Turret tur, Light lig) { this.robot = rob; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/ServoPositions.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/ServoPositions.java index 671d02f..51b533a 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/ServoPositions.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/constants/ServoPositions.java @@ -5,19 +5,19 @@ import com.acmerobotics.dashboard.config.Config; @Config public class ServoPositions { - public static double spindexer_intakePos1 = 0.18; //0.13; + public static double spindexer_intakePos1 = 0.26; //0.13; - public static double spindexer_intakePos2 = 0.37; //0.33;//0.5; + public static double spindexer_intakePos2 = 0.45; //0.33;//0.5; - public static double spindexer_intakePos3 = 0.56; //0.53;//0.66; + public static double spindexer_intakePos3 = 0.63; //0.53;//0.66; - public static double spindexer_outtakeBall3 = 0.84; //0.65; //0.24; - public static double spindexer_outtakeBall3b = 0.27; //0.65; //0.24; + public static double spindexer_outtakeBall3 = 0.91; //0.65; //0.24; + public static double spindexer_outtakeBall3b = 0.35; //0.65; //0.24; - public static double spindexer_outtakeBall2 = 0.66; //0.46; //0.6; - public static double spindexer_outtakeBall1 = 0.47; //0.27; //0.4; + public static double spindexer_outtakeBall2 = 0.73; //0.46; //0.6; + public static double spindexer_outtakeBall1 = 0.54; //0.27; //0.4; public static double spinStartPos = 0.05; - public static double spinEndPos = 0.95; + public static double spinEndPos = 0.6; public static double shootAllSpindexerSpeedIncrease = 0.0095;