Change curCam to string to try to fix toggling problems.

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index d1b0ac0970a5820ac91476a5d3d34c01811186a1..99b988be9724c8f628e94895cd0b392c48747e30 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -2,13 +2,12 @@ package org.usfirst.frc.team3501.robot;
 
 import edu.wpi.cscore.AxisCamera;
 import edu.wpi.cscore.UsbCamera;
-import edu.wpi.cscore.VideoSource;
 import edu.wpi.first.wpilibj.CameraServer;
 
 public class CameraFeeds {
   // private final int intakeCam;
   // private final int climberCam;
-  private VideoSource curCam;
+  private String curCam;
   private CameraServer server;
   private static UsbCamera intakeCam;
   private static AxisCamera climberCam;
@@ -24,8 +23,8 @@ public class CameraFeeds {
     intakeCam = server.startAutomaticCapture();
     usbCamName = intakeCam.getName();
     axisCamName = climberCam.getName();
-    curCam = climberCam;
-    changeCam(curCam);
+    curCam = "intakeCam";
+    changeCam();
     System.out.println("Leaving CameraFeeds constructor");
   }
 
@@ -43,18 +42,7 @@ public class CameraFeeds {
   }
 
   public void toggleCamera() {
-    System.out.println("enter toggleCamera");
-    if (curCam.equals(intakeCam)) {
-      changeCam(climberCam);
-      curCam = climberCam;
-      System.out
-          .println("Switching to climber camera, curCam = " + curCam.getName());
-    } else if (curCam.equals(climberCam)) {
-      changeCam(intakeCam);
-      curCam = intakeCam;
-      System.out
-          .println("Switching to intake camera, curCam = " + curCam.getName());
-    }
+    changeCam();
   }
 
   /**
@@ -63,8 +51,16 @@ public class CameraFeeds {
    *
    * newId for camera
    */
-  public void changeCam(VideoSource cam) {
-    System.out.println("Changing cameras...");
-    server.getVideo(cam);
+  public void changeCam() {
+    System.out.println("enter toggleCamera");
+    if (curCam == "intakeCam") {
+      server.getVideo(axisCamName);
+      curCam = "climberCam";
+      System.out.println("Switching to climber camera, curCam = " + curCam);
+    } else if (curCam == "climberCam") {
+      server.getVideo(usbCamName);
+      curCam = "intakeCam";
+      System.out.println("Switching to intake camera, curCam = " + curCam);
+    }
   }
 }