Merge pull request ftctechnh#269 from sahithi-thumuluri/master

testing switches comp
6150FTC · Jan 26, 2019 · 69e26e8 · 69e26e8
2 parents 830219e + 59c811c
commit 69e26e8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/AutonomousBlueFinalPicture.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/AutonomousBlueFinalPicture.java
@@ -1,8 +1,9 @@
 package org.firstinspires.ftc.teamcode;
 
 import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
-
+@Disabled
 @Autonomous(name = "!BlueFinalPictureFirst")
 public class AutonomousBlueFinalPicture extends LinearOpMode
 {

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/AutonomousFinalDepot.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/AutonomousFinalDepot.java
@@ -1,10 +1,12 @@
 package org.firstinspires.ftc.teamcode;
 
 import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 
 import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
 
+@Disabled
 @Autonomous(name = "!FinalDepot")
 public class AutonomousFinalDepot extends LinearOpMode
 {

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/AutonomousRedFinalPictureFirst.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/AutonomousRedFinalPictureFirst.java
@@ -1,10 +1,11 @@
 package org.firstinspires.ftc.teamcode;
 
 import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 
 import org.firstinspires.ftc.robotcore.external.navigation.DistanceUnit;
-
+@Disabled
 @Autonomous(name = "!RedFinalPictureFirst")
 public class AutonomousRedFinalPictureFirst extends LinearOpMode
 {

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/CompRobotCalibration.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/CompRobotCalibration.java
@@ -1,8 +1,10 @@
 package org.firstinspires.ftc.teamcode;
 
 import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
+import com.qualcomm.robotcore.eventloop.opmode.Disabled;
 import com.qualcomm.robotcore.eventloop.opmode.LinearOpMode;
 
+@Disabled
 @Autonomous(name = "CompRobotCalibration")
 public class CompRobotCalibration extends LinearOpMode
 {

diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/SwitchAutoPictureV1.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/SwitchAutoPictureV1.java
@@ -69,6 +69,7 @@ else if(vuforiaFunctions.getTfod().getRecognitions().size() >= 2)
         compRobot.climbDown();
 
         if (switchDepot) //gonna need to edit these values when testing
+//            if (switchDepot) //gonna need to edit these values when testing
         {
             compRobot.driveStraight(8, .8f);
             compRobot.pivotenc(90, .8f); //100 worked about 2/3 of the time