X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=19fa056a857c635282ca337eed87d1db08ca4a96;hp=8beb817d189bba11dd761c6f2f3da5ffa05a60a2;hb=6c72e0a830472f433d7d3a3fbba284abfafeb1f0;hpb=a28e24c71f76b39e7ab73fb3e8932acb0c694ae8 diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 8beb817d..19fa056a 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -26,7 +26,7 @@ public class Robot extends IterativeRobot { // Sendable Choosers send a drop down menu to the Smart Dashboard. SendableChooser positionChooser; SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense, - positionFourDefense, positionFiveDefense; + positionFourDefense, positionFiveDefense; @Override public void robotInit() { @@ -104,28 +104,6 @@ public class Robot extends IterativeRobot { public void autonomousInit() { Scheduler.getInstance().run(); - // // get options chosen from drop down menu - // Integer chosenPosition = (Integer) positionChooser.getSelected(); - // Integer chosenDefense = 0; - // - // if (chosenPosition == 1) - // chosenDefense = (Integer) positionOneDefense.getSelected(); - // else if (chosenPosition == 2) - // chosenDefense = (Integer) positionTwoDefense.getSelected(); - // else if (chosenPosition == 3) - // chosenDefense = (Integer) positionThreeDefense.getSelected(); - // else if (chosenPosition == 4) - // chosenDefense = (Integer) positionFourDefense.getSelected(); - // else if (chosenPosition == 5) - // chosenDefense = (Integer) positionFiveDefense.getSelected(); - // - // System.out.println("Chosen Position: " + chosenPosition); - // System.out.println("Chosen Defense: " + chosenDefense); - } - - @Override - public void autonomousPeriodic() { - Scheduler.getInstance().run(); // Scheduler.getInstance().add(new DriveDistance(24, 5)); // Scheduler.getInstance().add(new DriveForTime(2, 0.3)); // Scheduler.getInstance().add(new TurnForAngle(90, 5)); @@ -136,6 +114,11 @@ public class Robot extends IterativeRobot { // Scheduler.getInstance().add(new Turn180()); } + @Override + public void autonomousPeriodic() { + Scheduler.getInstance().run(); + } + @Override public void teleopInit() { Scheduler.getInstance().add(new JoystickDrive());