diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/hardware/Intake.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/hardware/Intake.java index 5c832a4..ea77fbe 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/hardware/Intake.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/hardware/Intake.java @@ -30,7 +30,7 @@ public class Intake { } //Position - public static double stack1 = 0; + public static double stack1 = 0.02; public static double stack2 = 0.03; public static double stack3 = 0.06; public static double stack4 = 0.09; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/hardware/Slides.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/hardware/Slides.java index af01e0e..928544b 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/hardware/Slides.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/hardware/Slides.java @@ -27,7 +27,7 @@ public class Slides { public static int mini_tier1 = 155; public static int tier1 = 350; public static int tier2 = 500; - public static int tier3 = 760; + public static int tier3 = 720; private int target = 0; diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/autonomous/RedBackStageAuto.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/autonomous/RedBackStageAuto.java index db990e2..900b1e7 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/autonomous/RedBackStageAuto.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/autonomous/RedBackStageAuto.java @@ -107,6 +107,7 @@ public class RedBackStageAuto extends AutoBase { break; // EXTEND AND MOVE TO BACKBOARD case 3: + // extend macro if (robot.macroState != 0) { robot.extendMacro(Slides.mini_tier1, getRuntime()); @@ -160,6 +161,17 @@ public class RedBackStageAuto extends AutoBase { } break; case 9: + // extend macro + if (robot.macroState != 0) { + robot.extendMacro(Slides.mini_tier1, getRuntime()); + } + // if macro and drive are done, move on + if (robot.macroState == 0 && !robot.drive.isBusy()) { + robot.resetMacro(0, getRuntime()); + macroState++; + } + break; + case 10: macroState = -1; // PARK ROBOT // case 6: diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/teleop/MainTeleOp.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/teleop/MainTeleOp.java index dc99ed9..0fccaf6 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/teleop/MainTeleOp.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/teleop/MainTeleOp.java @@ -19,7 +19,7 @@ public class MainTeleOp extends OpMode { public static double normal = 0.5; public static double turbo = 1; public static double slow_mode = 0.15; - public static double intakeMax = 0.65; + public static double intakeMax = 0.5; public static double intakeMax2 = -0.65; private Robot robot;