Solving merge conflict.

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / Robot.java.BASE.6792.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java.BASE.6792.java b/src/org/usfirst/frc/team3501/robot/Robot.java.BASE.6792.java
new file mode 100644 (file)
index 0000000..5f4715c
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java.BASE.6792.java
@@ -0,0 +1,59 @@
+package org.usfirst.frc.team3501.robot;
+
+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;
+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();
+  }
+
+  public static DriveTrain getDriveTrain() {
+    return DriveTrain.getDriveTrain();
+  }
+
+  public static Shooter getShooter() {
+    return Shooter.getShooter();
+  }
+
+  public static OI getOI() {
+    return OI.getOI();
+  }
+
+  public static Intake getIntake() {
+    return Intake.getIntake();
+  }
+
+  @Override
+  public void autonomousInit() {
+  }
+
+  @Override
+  public void autonomousPeriodic() {
+    Scheduler.getInstance().run();
+
+  }
+
+  @Override
+  public void teleopInit() {
+  }
+
+  @Override
+  public void teleopPeriodic() {
+    Scheduler.getInstance().run();
+
+  }
+}