more photogate incorporation edits

[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 2f97c9ad36f58f9cf91af5a6c21cda66fe624088..30926c7af8a9e6b0168b2fa1181e4b59bda65ba0 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -4,6 +4,7 @@ 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;
+import org.usfirst.frc.team3501.robot.commands.intakearm.Photogate;
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.subsystems.IntakeArm;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
@@ -18,6 +19,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;
@@ -31,6 +33,7 @@ public class Robot extends IterativeRobot {
     intakeArm = new IntakeArm();
 
     oi = new OI();
+    photogate = new Photogate();
 
     initializeSendableChoosers();
     addPositionChooserOptions();
@@ -69,8 +72,7 @@ public class Robot extends IterativeRobot {
     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" + Auton.LOW_BAR_SPEED + " "
-        + Auton.LOW_BAR_TIME, Defense.LOW_BAR);
+    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" + Auton.MOAT_SPEED + " " + Auton.MOAT_TIME,