Check to see if axis camera is the source of the problem.

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index 94501567cbac31e47e2ef70a9da5ae4815b3763b..2c621f05ba4baf49d481a93df42fa999376d8006 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -18,7 +18,6 @@ public class CameraFeeds {
 
   @SuppressWarnings("deprecation")
   private CameraFeeds(/* Joystick Button */) {
-
     usbCamName = intakeCam.getName();
     axisCamName = climberCam.getName();
     server = CameraServer.getInstance();
@@ -39,19 +38,19 @@ 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.");
     } 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.");
     }
     changeCam(curCam);
   }
@@ -63,25 +62,7 @@ public class CameraFeeds {
    * newId for camera
    */
   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();
-  }
 }

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 6c3a6adabe85c45964c0fceb3a202557af99cd55..91829b9442720abbee46211442f5f7aeac90d16d 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -17,11 +17,8 @@ public class Constants {
     public final static int TOGGLE_WINCH_PORT = 0;
     public final static int TOGGLE_FLYWHEEL_PORT = 0;
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;
-
     public final static int TOGGLE_GEAR_PORT = 0;
-
-    public static final int TOGGLE_CAMERA_FEEDS = 1;
-
+    public static final int TOGGLE_CAMERA_FEEDS = 4;
   }
 
   public static class Shooter {

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index e7c5e5b1928398f30bc31fd42c0c5bc43f87634f..0732c962c599a235bf2502a97745a2ee36d25027 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -27,7 +27,7 @@ public class Robot extends IterativeRobot {
     intake = Intake.getIntake();
     cameraServer2 = CameraServer.getInstance();
     axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
-    cameraFeeds = new CameraFeeds();
+    // cameraFeeds = new CameraFeeds();
     cameraFeeds = CameraFeeds.getCameraFeeds();
 
     // usbCamera = CameraServer.getInstance().startAutomaticCapture();