Add intake instance and getter method for intake
authorArunima DIvya <adivya822@student.fuhsd.org>
Tue, 24 Jan 2017 03:11:57 +0000 (19:11 -0800)
committerArunima DIvya <adivya822@student.fuhsd.org>
Thu, 26 Jan 2017 04:13:00 +0000 (20:13 -0800)
src/org/usfirst/frc/team3501/robot/Robot.java

index f2cc324f397ee78a66822887a761b5cfb65c2ec8..5b0f35e01656a4fd26370230fbd4e7eeb7a8eaec 100644 (file)
@@ -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;
@@ -11,13 +12,14 @@ public class Robot extends IterativeRobot {
   private static DriveTrain driveTrain;
   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() {
@@ -32,6 +34,10 @@ public class Robot extends IterativeRobot {
     return OI.getOI();
   }
 
+  public static Intake getIntake() {
+    return Intake.getIntake()
+  }
+
   @Override
   public void autonomousInit() {
     Scheduler.getInstance().add(new TimeDrive(1.5, 0.4));