From: EvanYap Date: Fri, 3 Feb 2017 03:13:32 +0000 (-0800) Subject: please work/fix X-Git-Url: http://challenge-bot.com/repos/?a=commitdiff_plain;h=f93bd25563a84e7c8d4eb3668c432f8293a11a10;p=3501%2F2017steamworks please work/fix --- f93bd25563a84e7c8d4eb3668c432f8293a11a10 diff --cc src/org/usfirst/frc/team3501/robot/Robot.java index 67507dd,80d3abc..4681b19 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@@ -8,19 -6,10 +8,20 @@@ import edu.wpi.first.wpilibj.IterativeR import edu.wpi.first.wpilibj.command.Scheduler; 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(); + // init } public static DriveTrain getDriveTrain() { @@@ -35,12 -20,9 +36,13 @@@ return OI.getOI(); } + public static Intake getIntake() { + return Intake.getIntake(); + } + @Override public void autonomousInit() { + Scheduler.getInstance(); } @Override