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=7cde18d7854b34da626e72e2ec12395a85c21923;hpb=35e19c59f80db44890fc798ba71b9c4d2d193534;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 7cde18d7..2f97c9ad 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -1,8 +1,9 @@ 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.SetHighGear; +import org.usfirst.frc.team3501.robot.commands.driving.SetLowGear; import org.usfirst.frc.team3501.robot.subsystems.DriveTrain; import org.usfirst.frc.team3501.robot.subsystems.IntakeArm; import org.usfirst.frc.team3501.robot.subsystems.Shooter; @@ -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() { @@ -115,7 +120,7 @@ public class Robot extends IterativeRobot { @Override public void teleopInit() { - Scheduler.getInstance().add(new SetHighGear()); + Scheduler.getInstance().add(new SetLowGear()); } @Override