Commiting so I can pull

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / Robot.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index ba0f267857503dc1dce4ccecf4bd889ad64e44d6..d4f5d946eb9e987828350b694c6b0f550f3d4174 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -26,7 +26,7 @@ public class Robot extends IterativeRobot {
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
 
-    usbCamera = CameraServer.getInstance().startAutomaticCapture();
+    // usbCamera = CameraServer.getInstance().startAutomaticCapture();
 
     // cameraServer2 = CameraServer;getInstance();
     // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
@@ -40,8 +40,11 @@ public class Robot extends IterativeRobot {
     // 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,12 +81,13 @@ public class Robot extends IterativeRobot {
 
     cameraFeeds.init();
 
+    cameraFeeds.init();
+
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-    
 
   }
 }