X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=d467182080a4343d91d6fd6bcefd22ca8310659e;hb=9ea6a533269dd1a8f9f684b3bbd90ae4b17478db;hp=b0e32a72bff3b55fa6b898bcd2400821e2c6dd06;hpb=5c6d9c86b4031c75dbd98d49a27996420cf2931b;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index b0e32a7..d467182 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -26,15 +26,15 @@ public class Robot extends IterativeRobot {
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
 
+    cameraFeeds = CameraFeeds.getCameraFeeds();
+
     // usbCamera = CameraServer.getInstance().startAutomaticCapture();
 
     // cameraServer2 = CameraServer;getInstance();
     // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
 
-    cameraServer2 = CameraServer.getInstance();
-    axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
-
-    cameraFeeds = new CameraFeeds();
+    // cameraServer2 = CameraServer.getInstance();
+    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
 
     // usbCamera = CameraServer.getInstance().startAutomaticCapture();
     // CameraServer.getInstance().startAutomaticCapture();
@@ -53,6 +53,10 @@ public class Robot extends IterativeRobot {
     return Shooter.getShooter();
   }
 
+  public static CameraFeeds getCameraFeeds() {
+    return cameraFeeds;
+  }
+
   public static OI getOI() {
     return OI.getOI();
   }
@@ -77,8 +81,6 @@ public class Robot extends IterativeRobot {
   @Override
   public void teleopInit() {
 
-    cameraFeeds.init();
-
   }
 
   @Override