Delete repeat shooter methods

[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 00ad1cb9d8f13168f8c5668f155c113f2bdbb09f..cc6f1459df0a1d046493936422f2b7d2645094c0 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -2,6 +2,7 @@ package org.usfirst.frc.team3501.robot;
 
 import org.usfirst.frc.team3501.robot.commands.driving.TimeDrive;
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
+import org.usfirst.frc.team3501.robot.subsystems.Intake;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 
 import edu.wpi.first.wpilibj.IterativeRobot;
@@ -12,13 +13,15 @@ public class Robot extends IterativeRobot {
   private static Shooter shooter;
   private static OI oi;
   private static Shooter shooter;
+  private static OI oi;
+  private static Intake intake;
 
   @Override
   public void robotInit() {
     driveTrain = DriveTrain.getDriveTrain();
     oi = OI.getOI();
     shooter = Shooter.getShooter();
-
+    intake = Intake.getIntake();
   }
 
   public static DriveTrain getDriveTrain() {
@@ -33,8 +36,12 @@ public class Robot extends IterativeRobot {
     return OI.getOI();
   }
 
-  public static Shooter getShooter() {
-    return Shooter.getShooter();
+  public static OI getOI() {
+    return OI.getOI();
+  }
+
+  public static Intake getIntake() {
+    return Intake.getIntake()
   }
 
   @Override