X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=2f97c9ad36f58f9cf91af5a6c21cda66fe624088;hb=b378dfe;hp=bd22a7244942de053f25cdf5b112b1d745d9647d;hpb=5c7067897a215194968ba6e53c4f19e8516c6ef5;p=3501%2Fstronghold-2016 diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index bd22a724..2f97c9ad 100644 --- 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; @@ -66,12 +67,16 @@ 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" + Auton.LOW_BAR_SPEED + " " + + Auton.LOW_BAR_TIME, 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() {