X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=9efe44f0480b4291a5e9aa5c8275847745b856b1;hb=85c0135e3b2fd0da59a855b65a99511798157845;hp=d4f5d946eb9e987828350b694c6b0f550f3d4174;hpb=7638f542e1317fc20c57cc76f3196bfe3411d68b;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index d4f5d94..9efe44f 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -26,25 +26,11 @@ public class Robot extends IterativeRobot {
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
 
-    // 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();
 
-    // usbCamera = CameraServer.getInstance().startAutomaticCapture();
-    // CameraServer.getInstance().startAutomaticCapture();
-    // cameraServer2 = CameraServer.getInstance();
-    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
-
-    // cameraFeeds = new CameraFeeds();
-
-    cameraFeeds = new CameraFeeds();
-
   }
 
   public static DriveTrain getDriveTrain() {
@@ -78,16 +64,11 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
-
-    cameraFeeds.init();
-
     cameraFeeds.init();
-
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-
   }
 }