From: Kevin Zhang Date: Sat, 13 Feb 2016 05:38:09 +0000 (-0800) Subject: Fix deleted stuff that shouldn't have been deleted X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=9742fe2ec09da63a719afbb635894e9bacab3bb8 Fix deleted stuff that shouldn't have been deleted --- diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 9b94e18e..a9a878d2 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -26,19 +26,26 @@ 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; // Gyro stuff public GyroLib gyro; @Override public void robotInit() { + driveTrain = new DriveTrain(); + oi = new OI(); gyro = new GyroLib(I2C.Port.kOnboard, false); shooter = new Shooter(); scaler = new Scaler(); intakeArm = new IntakeArm(); + initializeSendableChoosers(); + addPositionChooserOptions(); + addDefensesToAllDefenseSendableChoosers(); + sendSendableChoosersToSmartDashboard(); + } private void initializeSendableChoosers() { @@ -58,7 +65,7 @@ public class Robot extends IterativeRobot { positionChooser.addObject("Position 5", 5); } - private void addDefensesToAllDefenseSendableChooosers() { + private void addDefensesToAllDefenseSendableChoosers() { addDefenseOptions(positionOneDefense); addDefenseOptions(positionTwoDefense); addDefenseOptions(positionThreeDefense);