X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=655b3427585bed2d4d8b09be073896388a956d8a;hb=55391ba3a0860e7f96cb27d9325ad36939beca32;hp=63a11d04b6286e9e61e517e65d3785943cf1691b;hpb=7992f152f51019bc210c95cc7c0c9fd8a5eb012d;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 63a11d0..655b342 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,6 +1,5 @@
 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;
@@ -12,9 +11,11 @@ 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;
+  // private static UsbCamera usbCamera;
+  // private static CameraServer cameraServer2;
+  // private static AxisCamera axisCamera;
+  private static CameraFeeds cameraFeeds;
 
   @Override
   public void robotInit() {
@@ -22,6 +23,9 @@ public class Robot extends IterativeRobot {
     oi = OI.getOI();
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
+
+    cameraFeeds = CameraFeeds.getCameraFeeds();
+
   }
 
   public static DriveTrain getDriveTrain() {
@@ -32,8 +36,8 @@ public class Robot extends IterativeRobot {
     return Shooter.getShooter();
   }
 
-  public static OI getOI() {
-    return OI.getOI();
+  public static CameraFeeds getCameraFeeds() {
+    return cameraFeeds;
   }
 
   public static OI getOI() {
@@ -44,14 +48,11 @@ public class Robot extends IterativeRobot {
     return Intake.getIntake();
   }
 
-  public static Intake getIntake() {
-    return Intake.getIntake();
-
-  }
-
+  // If the gear values do not match in the left and right piston, then they are
+  // both set to high gear
   @Override
   public void autonomousInit() {
-    Scheduler.getInstance().add(new TimeDrive(1.5, 0.4));
+    driveTrain.setHighGear();
   }
 
   @Override
@@ -67,6 +68,5 @@ public class Robot extends IterativeRobot {
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-
   }
 }