From c8ec852e2a43f201e3d82a5dca40900c50f2122e Mon Sep 17 00:00:00 2001 From: Kevin Zhang Date: Fri, 12 Feb 2016 21:38:09 -0800 Subject: [PATCH] Fix deleted stuff that shouldn't have been deleted --- src/org/usfirst/frc/team3501/robot/Robot.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 5d27ce0c..23412d6c 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -26,13 +26,15 @@ 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(); @@ -40,6 +42,11 @@ public class Robot extends IterativeRobot { defenseArm = new DefenseArm(); intakeArm = new IntakeArm(); + initializeSendableChoosers(); + addPositionChooserOptions(); + addDefensesToAllDefenseSendableChoosers(); + sendSendableChoosersToSmartDashboard(); + } private void initializeSendableChoosers() { @@ -59,7 +66,7 @@ public class Robot extends IterativeRobot { positionChooser.addObject("Position 5", 5); } - private void addDefensesToAllDefenseSendableChooosers() { + private void addDefensesToAllDefenseSendableChoosers() { addDefenseOptions(positionOneDefense); addDefenseOptions(positionTwoDefense); addDefenseOptions(positionThreeDefense); -- 2.30.2