Change code to have 2 usb cameras instead of 1 usb and 1 axis camera.

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index 99b988be9724c8f628e94895cd0b392c48747e30..f04abbeed6bad84533cf633c1dc9ad29e1963456 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -1,6 +1,5 @@
 package org.usfirst.frc.team3501.robot;
 
-import edu.wpi.cscore.AxisCamera;
 import edu.wpi.cscore.UsbCamera;
 import edu.wpi.first.wpilibj.CameraServer;
 
@@ -10,19 +9,19 @@ public class CameraFeeds {
   private String curCam;
   private CameraServer server;
   private static UsbCamera intakeCam;
-  private static AxisCamera climberCam;
-  private static String usbCamName;
-  private static String axisCamName;
+  private static UsbCamera climberCam;
+  private static String intakeCamName;
+  private static String climberCamName;
   private static CameraFeeds cameraFeeds = null;
 
   @SuppressWarnings("deprecation")
   private CameraFeeds(/* Joystick Button */) {
     System.out.println("Enter CameraFeeds constructor");
     server = CameraServer.getInstance();
-    climberCam = server.addAxisCamera("ClimberCam", "10.35.1.11");
+    climberCam = server.startAutomaticCapture();
     intakeCam = server.startAutomaticCapture();
-    usbCamName = intakeCam.getName();
-    axisCamName = climberCam.getName();
+    intakeCamName = intakeCam.getName();
+    climberCamName = climberCam.getName();
     curCam = "intakeCam";
     changeCam();
     System.out.println("Leaving CameraFeeds constructor");
@@ -54,11 +53,11 @@ public class CameraFeeds {
   public void changeCam() {
     System.out.println("enter toggleCamera");
     if (curCam == "intakeCam") {
-      server.getVideo(axisCamName);
+      server.getVideo(climberCamName);
       curCam = "climberCam";
       System.out.println("Switching to climber camera, curCam = " + curCam);
     } else if (curCam == "climberCam") {
-      server.getVideo(usbCamName);
+      server.getVideo(intakeCamName);
       curCam = "intakeCam";
       System.out.println("Switching to intake camera, curCam = " + curCam);
     }