Merge remote-tracking branch 'origin/intake_slides_code' into intake_…

…slides_code
ftc16072 · Nov 9, 2024 · 37c1973 · 37c1973
2 parents ae34767 + 5783783
commit 37c1973
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/OpModes/NoTurnTeleop.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/OpModes/NoTurnTeleop.java
@@ -48,8 +48,6 @@ public void loop(){
 
             robot.controlHub.resetGyro();
         }
-        robot.arm.manualPositionChange(-MANUAL_CHANGE);
-    }
 
         if (gamepad1.right_trigger > TRIGGER_THRESHOLD) {
             robot.claw.close();

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/Robot.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/ftc16072/Robot.java
@@ -2,7 +2,6 @@
 
 import com.qualcomm.robotcore.hardware.HardwareMap;
 
-import org.firstinspires.ftc.teamcode.ftc16072.Mechanisms.Arm;
 import org.firstinspires.ftc.teamcode.ftc16072.Mechanisms.Claw;
 import org.firstinspires.ftc.teamcode.ftc16072.Mechanisms.ControlHub;
 import org.firstinspires.ftc.teamcode.ftc16072.Mechanisms.IntakeSlides;