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=5be99d560fe62e46627fb3a66978f879d6c2f6ec;hpb=1cac6c82d7cd42d210d46ae0edb59bc10f44ba26;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 5be99d5..655b342 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -4,9 +4,6 @@ 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.cscore.UsbCamera;
-import edu.wpi.first.wpilibj.CameraServer;
 import edu.wpi.first.wpilibj.IterativeRobot;
 import edu.wpi.first.wpilibj.command.Scheduler;
 
@@ -15,9 +12,9 @@ public class Robot extends IterativeRobot {
   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 UsbCamera usbCamera;
+  // private static CameraServer cameraServer2;
+  // private static AxisCamera axisCamera;
   private static CameraFeeds cameraFeeds;
 
   @Override
@@ -27,18 +24,8 @@ public class Robot extends IterativeRobot {
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
 
-    usbCamera = CameraServer.getInstance().startAutomaticCapture();
+    cameraFeeds = CameraFeeds.getCameraFeeds();
 
-    // cameraServer2 = CameraServer;getInstance();
-    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
-
-    cameraServer2 = CameraServer.getInstance();
-    axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
-<<<<<<< HEAD
-
-=======
-    cameraFeeds = new CameraFeeds();
->>>>>>> implement CameraFeeds into robot.java and add todos
   }
 
   public static DriveTrain getDriveTrain() {
@@ -49,6 +36,10 @@ public class Robot extends IterativeRobot {
     return Shooter.getShooter();
   }
 
+  public static CameraFeeds getCameraFeeds() {
+    return cameraFeeds;
+  }
+
   public static OI getOI() {
     return OI.getOI();
   }
@@ -72,17 +63,10 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
-<<<<<<< HEAD
-
-=======
-    cameraFeeds.init();
->>>>>>> implement CameraFeeds into robot.java and add todos
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-    cameraFeeds.run();
-
   }
 }