From: Rayan Hirech <ramine411@gmail.com>
Date: Fri, 10 Feb 2017 03:43:46 +0000 (-0800)
Subject: Check to see if axis camera is the source of the problem.
X-Git-Url: http://challenge-bot.com/repos/?a=commitdiff_plain;ds=sidebyside;h=fb2aaf9cf663e8fdc0fab4a755a2cf5fcf0054bf;p=3501%2F2017steamworks

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 9450156..2c621f0 100755
--- 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 6c3a6ad..91829b9 100644
--- 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 e7c5e5b..0732c96 100644
--- 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();