X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=4a1288a57dfa8efe048d98f534e836a71270ff21;hb=ae2aec88fb09a27a9f49988b12fea6914d6ef6f6;hp=5fbfe4043d6b58bca46b2daffc35783c2ae74251;hpb=079a8cb65ad4cfca3d0f01f1af424e6bd97c8bc9;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 5fbfe40..4a1288a 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,47 +1,55 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.commands.driving.TimeDrive;
-import org.usfirst.frc.team3501.robot.subsystems.Climber;
 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.cscore.AxisCamera;
+import edu.wpi.first.wpilibj.CameraServer;
 import edu.wpi.first.wpilibj.IterativeRobot;
 import edu.wpi.first.wpilibj.command.Scheduler;
 
 public class Robot extends IterativeRobot {
   private static DriveTrain driveTrain;
-  private static OI oi;
-  private static Climber climber;
   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() {
     driveTrain = DriveTrain.getDriveTrain();
     oi = OI.getOI();
-    climber = Climber.getClimber();
     shooter = Shooter.getShooter();
-
+    intake = Intake.getIntake();
+    // usbCamera = CameraServer.getInstance().startAutomaticCapture();
+    // CameraServer.getInstance().startAutomaticCapture();
+    // cameraServer2 = CameraServer.getInstance();
+    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+    // cameraFeeds = new CameraFeeds();
   }
 
   public static DriveTrain getDriveTrain() {
     return DriveTrain.getDriveTrain();
   }
 
-  public static OI getOI() {
-    return OI.getOI();
+  public static Shooter getShooter() {
+    return Shooter.getShooter();
   }
 
-  public static Climber getClimber() {
-    return Climber.getClimber();
+  public static OI getOI() {
+    return OI.getOI();
   }
 
-  public static Shooter getShooter() {
-    return Shooter.getShooter();
+  public static Intake getIntake() {
+    return Intake.getIntake();
   }
 
   @Override
   public void autonomousInit() {
-    Scheduler.getInstance().add(new TimeDrive(1.5, 0.4));
   }
 
   @Override
@@ -52,11 +60,13 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+    cameraFeeds.init();
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
+    
 
   }
 }