Fix deleted stuff that shouldn't have been deleted
authorKevin Zhang <icestormf1@gmail.com>
Sat, 13 Feb 2016 05:38:09 +0000 (21:38 -0800)
committerCindy Zhang <cindyzyx9@gmail.com>
Sat, 13 Feb 2016 20:14:43 +0000 (12:14 -0800)
src/org/usfirst/frc/team3501/robot/Robot.java

index 5d27ce0c11ec4969132ba283b788c4f4c4650376..23412d6c41078e6a668de7eb126d6c825f308f49 100644 (file)
@@ -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);