add option for no auton

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 570b44cfff4b1c4e78951235e9a44ac25f3ff41c..14714a72bc90214a9f43892a36957b8aef64d0cd 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -136,6 +136,6 @@ public class Constants {
   }
 
   public enum Defense {
-    PORTCULLIS, SALLY_PORT, ROUGH_TERRAIN, LOW_BAR, CHIVAL_DE_FRISE, DRAWBRIDGE, MOAT, ROCK_WALL, RAMPART;
+    PORTCULLIS, SALLY_PORT, ROUGH_TERRAIN, LOW_BAR, CHIVAL_DE_FRISE, DRAWBRIDGE, MOAT, ROCK_WALL, RAMPART, NONE;
   }
 }

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index b17303db083e4ce8a87b1b80db29284299c30fc1..a68c32cc56b948ce46b6b0619dd93263bc16a99a 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -51,6 +51,7 @@ public class Robot extends IterativeRobot {
     chooser.addObject(
         "Rock Wall" + Auton.ROCK_WALL_SPEED + " " + Auton.ROCK_WALL_TIME,
         Defense.ROCK_WALL);
+    chooser.addObject("No Auton", Defense.NONE);
   }
 
   @Override

diff --git a/src/org/usfirst/frc/team3501/robot/commands/auton/ChooseStrategy.java b/src/org/usfirst/frc/team3501/robot/commands/auton/ChooseStrategy.java
index 20b85781c63946c52425a9e4b4a369d7c9be6876..607a0eecbec661ca937e3e53fcfa63e182e04512 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/auton/ChooseStrategy.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/auton/ChooseStrategy.java
@@ -36,5 +36,8 @@ public class ChooseStrategy extends CommandGroup {
     else if (defense == Defense.LOW_BAR)
       addSequential(new PassLowBar());
 
+    else if (defense == Defense.NONE)
+      ;// do nothing
+
   }
 }