X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=5f4715cb6ac2e9b1fcb8a7e1bef891cc95163eae;hb=f0a71840f17c1039ce4be1f66cf324cc979a9966;hp=f2cc324f397ee78a66822887a761b5cfb65c2ec8;hpb=8024e57f4e3ab55112e52aeec1d59260dfbd92dc;p=3501%2F2017steamworks diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index f2cc324..5f4715c 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -1,7 +1,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 +11,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,9 +33,12 @@ 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)); } @Override