prepare to bring photogate

[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 bd22a7244942de053f25cdf5b112b1d745d9647d..5bc3c0123be8ca2d5354bdfd733aae0965e5dbdd 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,5 +1,6 @@
 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;
@@ -17,6 +18,7 @@ public class Robot extends IterativeRobot {
   public static DriveTrain driveTrain;
   public static Shooter shooter;
   public static IntakeArm intakeArm;
+  // public static Photogate photogate;
 
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   SendableChooser positionChooser;
@@ -30,6 +32,7 @@ public class Robot extends IterativeRobot {
     intakeArm = new IntakeArm();
 
     oi = new OI();
+    // photogate = new Photogate();
 
     initializeSendableChoosers();
     addPositionChooserOptions();
@@ -66,12 +69,15 @@ 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", Defense.ROUGH_TERRAIN);
-    chooser.addObject("Low Bar", Defense.LOW_BAR);
+    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("Chival De Frise", Defense.CHIVAL_DE_FRISE);
     chooser.addObject("Drawbridge", Defense.DRAWBRIDGE);
-    chooser.addObject("Moat", Defense.MOAT);
-    chooser.addObject("Rock Wall", Defense.ROCK_WALL);
+    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);
   }
 
   private void sendSendableChoosersToSmartDashboard() {