fix bugs

[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 580173e19262c066bff984edfff37c9bb64478f5..908a52dcf0339b44735147d174f069500b873280 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,6 +1,9 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.commands.driving.TimeDrive;
+<<<<<<< HEAD
+=======
+import org.usfirst.frc.team3501.robot.commands.driving.DriveDistance;
+>>>>>>> fix bugs
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.subsystems.Intake;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
@@ -12,8 +15,6 @@ public class Robot extends IterativeRobot {
   private static DriveTrain driveTrain;
   private static Shooter shooter;
   private static OI oi;
-  private static Shooter shooter;
-  private static OI oi;
   private static Intake intake;
 
   @Override
@@ -36,21 +37,16 @@ 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()
+    return Intake.getIntake();
   }
 
   @Override
   public void autonomousInit() {
-    Scheduler.getInstance().add(new TimeDrive(1.5, 0.4));
+<<<<<<< HEAD
+=======
+    Scheduler.getInstance().add(new DriveDistance(25, 10));
+>>>>>>> fix bugs
   }
 
   @Override