X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FCameraFeeds.java;h=4e4980a14e925a01985b160ec6523b315b204adf;hb=49a54c9d8316e935790c4576bb815d1a56d36f06;hp=4ea9b161f51bf82c0339c07e32d50336f6bee632;hpb=6aa639bea4460d1d57a96d15115ef114b8a400d8;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index 4ea9b16..4e4980a 100755
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -1,58 +1,46 @@
 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;
-  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();
-    curCam = climberCam;
-    changeCam(curCam);
+    intakeCamName = intakeCam.getName();
+    climberCamName = climberCam.getName();
+    curCam = "intakeCam";
+    System.out.println("Leaving CameraFeeds constructor");
   }
 
   public static CameraFeeds getCameraFeeds() {
+    System.out.println("Enter CameraFeeds.getCameraFeeds");
     if (cameraFeeds == null) {
       cameraFeeds = new CameraFeeds();
     }
+    System.out.println("Leaving CameraFeeds.getCameraFeeds");
     return cameraFeeds;
-
   }
 
   public void init() {
-    // changeCam(climberCam);
+    System.out.println("Initializing...");
   }
 
   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();
   }
 
   /**
@@ -61,8 +49,16 @@ public class CameraFeeds {
    *
    * newId for camera
    */
-  public void changeCam(VideoSource cam) {
-    server.removeCamera(curCam.getName());
-    server.addCamera(cam);
+  public void changeCam() {
+    System.out.println("enter toggleCamera");
+    if (curCam == "intakeCam") {
+      server.getVideo(climberCamName);
+      curCam = "climberCam";
+      System.out.println("Switching to climber camera, curCam = " + curCam);
+    } else if (curCam == "climberCam") {
+      server.getVideo(intakeCamName);
+      curCam = "intakeCam";
+      System.out.println("Switching to intake camera, curCam = " + curCam);
+    }
   }
 }