changed order of initialized variables, among other minor edits to make toggle work

[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 ac72556eace3ca4d220091f9c8fa0170f847b9a6..4ea9b161f51bf82c0339c07e32d50336f6bee632 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -18,14 +18,14 @@ public class CameraFeeds {
 
   @SuppressWarnings("deprecation")
   private CameraFeeds(/* Joystick Button */) {
-
+    System.out.println("Enter CameraFeeds constructor");
     server = CameraServer.getInstance();
-    climberCam = server.addAxisCamera("axisCamera", "10.35.1.11");
+    climberCam = server.addAxisCamera("ClimberCam", "10.35.1.11");
     intakeCam = server.startAutomaticCapture();
-    curCam = climberCam;
     usbCamName = intakeCam.getName();
     axisCamName = climberCam.getName();
-
+    curCam = climberCam;
+    changeCam(curCam);
   }
 
   public static CameraFeeds getCameraFeeds() {
@@ -37,23 +37,21 @@ 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);
       curCam = climberCam;
-      System.out.println("Switching to climber camera.");
-      return;
-    }
-
-    if (curCam.equals(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.");
-      return;
+      System.out
+          .println("Switching to intake camera, curCam = " + curCam.getName());
     }
   }
 
@@ -64,12 +62,7 @@ public class CameraFeeds {
    * newId for camera
    */
   public void changeCam(VideoSource cam) {
-    System.out.println("change camera");
     server.removeCamera(curCam.getName());
     server.addCamera(cam);
   }
-
-  public String getCurrentCamName() {
-    return curCam.getName();
-  }
 }