Minor fixes after merging

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / Robot.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 1fe6b76305ef1335b6a5810acf54c252a589ac49..ee2e03da66e5fbf8ff3ab8926d64e57eaec685b8 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,6 +1,5 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.Constants.Auton;
 import org.usfirst.frc.team3501.robot.Constants.Defense;
 import org.usfirst.frc.team3501.robot.commands.auton.ChooseStrategy;
 import org.usfirst.frc.team3501.robot.commands.driving.SetLowGear;
@@ -31,9 +30,9 @@ public class Robot extends IterativeRobot {
     driveTrain = new DriveTrain();
     shooter = new Shooter();
     intakeArm = new IntakeArm();
+    photogate = new Photogate();
 
     oi = new OI();
-    photogate = new Photogate();
 
     defenseChooser = new SendableChooser();
     addDefenseOptions(defenseChooser);
@@ -52,16 +51,12 @@ public class Robot extends IterativeRobot {
   private void addDefenseOptions(SendableChooser chooser) {
     chooser.addDefault("Portcullis", Defense.PORTCULLIS);
     chooser.addObject("Sally Port", Defense.SALLY_PORT);
-    chooser.addObject("Rough Terrain" + Auton.ROUGH_TERRAIN_SPEED + " "
-        + Auton.ROUGH_TERRAIN_TIME, Defense.ROUGH_TERRAIN);
-    chooser.addObject("Low Bar" + " Will probably work...", Defense.LOW_BAR);
+    chooser.addObject("Rough Terrain", Defense.ROUGH_TERRAIN);
+    chooser.addObject("Low Bar", Defense.LOW_BAR);
     chooser.addObject("Chival De Frise", Defense.CHIVAL_DE_FRISE);
     chooser.addObject("Drawbridge", Defense.DRAWBRIDGE);
-    chooser.addObject("Moat" + Auton.MOAT_SPEED + " " + Auton.MOAT_TIME,
-        Defense.MOAT);
-    chooser.addObject(
-        "Rock Wall" + Auton.ROCK_WALL_SPEED + " " + Auton.ROCK_WALL_TIME,
-        Defense.ROCK_WALL);
+    chooser.addObject("Moat", Defense.MOAT);
+    chooser.addObject("Rock Wall", Defense.ROCK_WALL);
     chooser.addObject("No Auton", Defense.NONE);
   }