Toggle cameras only once.

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);
   }
 
   /**

diff --git a/src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java b/src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java
index 4515b8284b74218ac3e8f48532ef17d5486cc217..d5c9c60f508b200b111274568c1d0d924ab8c195 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/accessories/ToggleCameraFeed.java
@@ -10,10 +10,8 @@ public class ToggleCameraFeed extends Command {
   @Override
   protected void execute() {
     CameraFeeds cf = Robot.getCameraFeeds();
-    System.out.println(cf.getCurrentCamName());
+    // System.out.println(cf.getCurrentCamName());
     cf.toggleCamera();
-    System.out.println(cf.getCurrentCamName());
-
   }
 
   @Override