Toggle cameras only once.

[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 2c621f05ba4baf49d481a93df42fa999376d8006..9c3de4e0c3c0d45b8111480a96d3e710f72753cf 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -23,10 +23,7 @@ public class CameraFeeds {
     server = CameraServer.getInstance();
     climberCam = server.addAxisCamera(axisCamName, "10.35.1.11");
     intakeCam = server.startAutomaticCapture();
-    curCam = intakeCam;
     curCam = climberCam;
-    usbCamName = intakeCam.getName();
-    axisCamName = climberCam.getName();
   }
 
   public static CameraFeeds getCameraFeeds() {
@@ -52,7 +49,6 @@ public class CameraFeeds {
       curCam = intakeCam;
       System.out.println("Switching to intake camera.");
     }
-    changeCam(curCam);
   }
 
   /**