X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;fp=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=532d25415fb7b47fc56b7fd66d968eba63b58cb2;hb=b26407834f93b26caa7617d3cfcdd7a39c732818;hp=b99f059d9aaa77085ca6381d27fd609061d0d9fb;hpb=3cd438bd5b650a27b84ef37224025cd7f6086e7c;p=ozzloy%40gmail.com%2F3501-spark-go diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index b99f059..532d254 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -22,8 +22,9 @@ public class Robot extends IterativeRobot { public static OI oi; - private SendableChooser autoChooser; + public static AutonData autonData; + private SendableChooser autonChooser; private Command autonomousCommand; public void robotInit() { @@ -35,6 +36,8 @@ public class Robot extends IterativeRobot { pneumatics = new Pneumatics(); + autonData = new AutonData(); + chooseAuto(); } @@ -45,7 +48,9 @@ public class Robot extends IterativeRobot { public void autonomousInit() { schedule(new TurnOnCompressor()); - autonomousCommand = (Command) autoChooser.getSelected(); + autonData.update(); + + autonomousCommand = (Command) autonChooser.getSelected(); autonomousCommand.start(); } @@ -68,13 +73,13 @@ public class Robot extends IterativeRobot { } private void chooseAuto() { - autoChooser = new SendableChooser(); + autonChooser = new SendableChooser(); - autoChooser.addDefault("Pick up container", new ContainerOverStep()); - autoChooser.addObject("Drive over step", new DriveOverStep()); - autoChooser.addObject("Drive past step", new DrivePastStep()); + autonChooser.addDefault("Pick up container", new ContainerOverStep()); + autonChooser.addObject("Drive over step", new DriveOverStep()); + autonChooser.addObject("Drive past step", new DrivePastStep()); - SmartDashboard.putData("Auto Mode", autoChooser); + SmartDashboard.putData("Auto Mode", autonChooser); } private void schedule(Command c) {