From 1bf00ae67d6dea7945349657a67ff2d71f9f8fcc Mon Sep 17 00:00:00 2001
From: Kevin Zhang <icestormf1@gmail.com>
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 | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index ebe4ba33..a9dd9d0b 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -21,7 +21,6 @@ public class Robot extends IterativeRobot {
   public static Shooter shooter;
 
   public static Scaler scaler;
-  double then;
 
   public static IntakeArm intakeArm;
   public static DefenseArm defenseArm;
@@ -32,34 +31,22 @@ public class Robot extends IterativeRobot {
       positionFourDefense, positionFiveDefense;
 
   // Gyro stuff
-  short rawValue;
   public GyroLib gyro;
 
-  double now;
-  double degreesIncreased;
-  double degrees;
-
-  Rotation rotation;
-
   @Override
   public void robotInit() {
-    // driveTrain = new DriveTrain();
+    driveTrain = new DriveTrain();
+    oi = new OI();
     gyro = new GyroLib(I2C.Port.kOnboard, false);
-    // oi = new OI();
 
     shooter = new Shooter();
     scaler = new Scaler();
     intakeArm = new IntakeArm();
 
-    // Sendable Choosers allows the driver to select the position of the
-    // robot
-    // and the positions of the defenses from a drop-down menu on the Smart
-    // Dashboard
-    // make the Sendable Choosers
-    // initializeSendableChoosers();
-    // addPositionChooserOptions();
-    // addDefensesToAllDefenseSendableChooosers();
-    // sendSendableChoosersToSmartDashboard();
+    initializeSendableChoosers();
+    addPositionChooserOptions();
+    addDefensesToAllDefenseSendableChoosers();
+    sendSendableChoosersToSmartDashboard();
 
   }
 
@@ -80,7 +67,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