Fix merge conflicts

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

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index b18fbca8cebb663f1f009ff0f4f718346fe77488..d1b0ac0970a5820ac91476a5d3d34c01811186a1 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -21,23 +21,25 @@ public class CameraFeeds {
     System.out.println("Enter CameraFeeds constructor");
     server = CameraServer.getInstance();
     climberCam = server.addAxisCamera("ClimberCam", "10.35.1.11");
-    // intakeCam = server.startAutomaticCapture();
+    intakeCam = server.startAutomaticCapture();
     usbCamName = intakeCam.getName();
     axisCamName = climberCam.getName();
     curCam = climberCam;
     changeCam(curCam);
+    System.out.println("Leaving CameraFeeds constructor");
   }
 
   public static CameraFeeds getCameraFeeds() {
+    System.out.println("Enter CameraFeeds.getCameraFeeds");
     if (cameraFeeds == null) {
       cameraFeeds = new CameraFeeds();
     }
+    System.out.println("Leaving CameraFeeds.getCameraFeeds");
     return cameraFeeds;
-
   }
 
   public void init() {
-    // changeCam(climberCam);
+    System.out.println("Initializing...");
   }
 
   public void toggleCamera() {
@@ -62,6 +64,7 @@ public class CameraFeeds {
    * newId for camera
    */
   public void changeCam(VideoSource cam) {
-    server.removeCamera(curCam.getName());
+    System.out.println("Changing cameras...");
+    server.getVideo(cam);
   }
 }