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

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index 9c3de4e0c3c0d45b8111480a96d3e710f72753cf..4ea9b161f51bf82c0339c07e32d50336f6bee632 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -18,12 +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");
+    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() {
@@ -35,7 +37,7 @@ public class CameraFeeds {
   }
 
   public void init() {
-    changeCam(climberCam);
+    // changeCam(climberCam);
   }
 
   public void toggleCamera() {
@@ -43,11 +45,13 @@ public class CameraFeeds {
     if (curCam.equals(intakeCam)) {
       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);
       curCam = intakeCam;
-      System.out.println("Switching to intake camera.");
+      System.out
+          .println("Switching to intake camera, curCam = " + curCam.getName());
     }
   }