From: Rayan Hirech <ramine411@gmail.com>
Date: Fri, 10 Feb 2017 04:20:09 +0000 (-0800)
Subject: Toggle cameras only once.
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=cee761581418841b742e7031f44abf29e85969f6

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 2c621f0..9c3de4e 100755
--- 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 4515b82..d5c9c60 100644
--- 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