fix Robot.java bug: intantiate IntakeArm subsystem, not constants

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index a9dd9d0b21ee10eff701a407e2a1d27a5287c347..a971b3446e1e027e3ec4116d7a95812ca236e3d9 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,8 +1,6 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.AnotherGyroClass.Rotation;
 import org.usfirst.frc.team3501.robot.Constants.Defense;
-import org.usfirst.frc.team3501.robot.GyroLib.Rotation;
 import org.usfirst.frc.team3501.robot.subsystems.DefenseArm;
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.subsystems.IntakeArm;
@@ -30,9 +28,6 @@ public class Robot extends IterativeRobot {
   SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
       positionFourDefense, positionFiveDefense;
 
-  // Gyro stuff
-  public GyroLib gyro;
-
   @Override
   public void robotInit() {
     driveTrain = new DriveTrain();
@@ -41,8 +36,13 @@ public class Robot extends IterativeRobot {
 
     shooter = new Shooter();
     scaler = new Scaler();
-    intakeArm = new IntakeArm();
+    defenseArm = new DefenseArm();
+       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();
     addDefensesToAllDefenseSendableChoosers();