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

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / Robot.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index afb5413974011357631aee71844687c5f77c21f2..f4001774cf4e607cfcbb9aa3e1763557c1cf0eda 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -13,14 +13,12 @@ import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 
 public class Robot extends IterativeRobot {
-  public static OI oi;
-  public static DriveTrain driveTrain;
-  public static Shooter shooter;
-
-  public static Scaler scaler;
-  public static DefenseArm defenseArm;
-  public static IntakeArm intakeArm;
-  public static DefenseArm defenseArm;
+       public static OI oi;
+       public static DriveTrain driveTrain;
+       public static Shooter shooter;
+       public static Scaler scaler;
+       public static IntakeArm intakeArm;
+       public static DefenseArm defenseArm;
 
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   SendableChooser positionChooser;
@@ -31,11 +29,10 @@ public class Robot extends IterativeRobot {
   public void robotInit() {
     driveTrain = new DriveTrain();
     oi = new OI();
-
     shooter = new Shooter();
     scaler = new Scaler();
     defenseArm = new DefenseArm();
-       intakeArm = new IntakeArm();
+    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
@@ -94,15 +91,6 @@ public class Robot extends IterativeRobot {
         positionFourDefense);
     SmartDashboard.putData("Position Five Defense Chooser",
         positionFiveDefense);
-<<<<<<< HEAD
-=======
-    SmartDashboard.putData("Position Four Defense Chooser",
-        positionFourDefense);
-    SmartDashboard.putData("Position Five Defense Chooser",
-        positionFiveDefense);
-
-    shooter = new Shooter();
->>>>>>> Initialize AnalogGyro in Robot class
   }
 
   @Override
@@ -142,5 +130,6 @@ public class Robot extends IterativeRobot {
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
+
   }
 }