Minor edit

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / CameraFeeds.java

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index 94501567cbac31e47e2ef70a9da5ae4815b3763b..b18fbca8cebb663f1f009ff0f4f718346fe77488 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -18,16 +18,14 @@ public class CameraFeeds {
 
   @SuppressWarnings("deprecation")
   private CameraFeeds(/* Joystick Button */) {
-
-    usbCamName = intakeCam.getName();
-    axisCamName = climberCam.getName();
+    System.out.println("Enter CameraFeeds constructor");
     server = CameraServer.getInstance();
-    climberCam = server.addAxisCamera(axisCamName, "10.35.1.11");
-    intakeCam = server.startAutomaticCapture();
-    curCam = intakeCam;
-    curCam = climberCam;
+    climberCam = server.addAxisCamera("ClimberCam", "10.35.1.11");
+    // intakeCam = server.startAutomaticCapture();
     usbCamName = intakeCam.getName();
     axisCamName = climberCam.getName();
+    curCam = climberCam;
+    changeCam(curCam);
   }
 
   public static CameraFeeds getCameraFeeds() {
@@ -39,21 +37,22 @@ public class CameraFeeds {
   }
 
   public void init() {
-    changeCam(intakeCam);
+    // changeCam(climberCam);
   }
 
   public void toggleCamera() {
-    System.out.println("enter toggleCamer");
+    System.out.println("enter toggleCamera");
     if (curCam.equals(intakeCam)) {
-      // changeCam(climberCam);
+      changeCam(climberCam);
       curCam = climberCam;
-      // System.out.println("Switching to climber camera.");
+      System.out
+          .println("Switching to climber camera, curCam = " + curCam.getName());
     } else if (curCam.equals(climberCam)) {
-      // changeCam(intakeCam);
+      changeCam(intakeCam);
       curCam = intakeCam;
-      // System.out.println("Switching to intake camera.");
+      System.out
+          .println("Switching to intake camera, curCam = " + curCam.getName());
     }
-    changeCam(curCam);
   }
 
   /**
@@ -64,24 +63,5 @@ public class CameraFeeds {
    */
   public void changeCam(VideoSource cam) {
     server.removeCamera(curCam.getName());
-    if (curCam.equals(intakeCam)) {
-      server.addCamera(intakeCam);
-      System.out.println("Switching to climber camera.");
-      return;
-    }
-
-    if (curCam.equals(climberCam)) {
-      server.addAxisCamera(axisCamName, "10.35.1.11");
-      // server.addCamera(climberCam);
-      System.out.println("Switching to intake camera.");
-      return;
-    }
-    System.out.println("change camera");
-    server.removeCamera(curCam.getName());
-    server.addCamera(cam);
-  }
-
-  public String getCurrentCamName() {
-    return curCam.getName();
   }
 }