Delete copies of methods, and change initialize code in runIntakeContinuous and runRe...

[3501/2017steamworks] / 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 63a11d04b6286e9e61e517e65d3785943cf1691b..c2e4f996d49458d36e9e300d101888b341214047 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -12,8 +12,6 @@ public class Robot extends IterativeRobot {
   private static DriveTrain driveTrain;
   private static Shooter shooter;
   private static OI oi;
-  private static Shooter shooter;
-  private static OI oi;
   private static Intake intake;
 
   @Override
@@ -36,19 +34,10 @@ public class Robot extends IterativeRobot {
     return OI.getOI();
   }
 
-  public static OI getOI() {
-    return OI.getOI();
-  }
-
   public static Intake getIntake() {
     return Intake.getIntake();
   }
 
-  public static Intake getIntake() {
-    return Intake.getIntake();
-
-  }
-
   @Override
   public void autonomousInit() {
     Scheduler.getInstance().add(new TimeDrive(1.5, 0.4));