X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=bc3d735e22ec36829f0e05dfaa074f4d42ef1b03;hb=2c9f5abb5057ebd41a3824c329c6bfcca97a5e83;hp=f1ee752d089850174cc523cacbfbba24bc7c28ad;hpb=2ac0cc171e48c4a1ac3b688b2f7861ef49008e35;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 f1ee752d..bc3d735e 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -16,6 +16,7 @@ public class Robot extends IterativeRobot { public static OI oi; public static DriveTrain driveTrain; public static Shooter shooter; + public static Scaler scaler; public static IntakeArm intakeArm; public static DefenseArm defenseArm; @@ -100,20 +101,6 @@ public class Robot extends IterativeRobot { shooter = new Shooter(); } - private void addDefense(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("Cheval De Frise", Defense.CHEVAL_DE_FRISE); - chooser.addObject("Drawbridge", Defense.DRAWBRIDGE); - chooser.addObject("Moat", Defense.MOAT); - chooser.addObject("Rock Wall", Defense.ROCK_WALL); - - shooter = new Shooter(); - - } - @Override public void autonomousInit() { Scheduler.getInstance().run();