Remove pointless code and add print commands.

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index 9c3de4e0c3c0d45b8111480a96d3e710f72753cf..07cf52e6a4e445150b7eb2d59c6637f475dd2b3c 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -18,24 +18,28 @@ 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("AxisCamera", "10.35.1.11");
     intakeCam = server.startAutomaticCapture();
+    usbCamName = intakeCam.getName();
+    axisCamName = climberCam.getName();
     curCam = climberCam;
+    changeCam(curCam);
+    System.out.println("Leaving CameraFeeds constructor");
   }
 
   public static CameraFeeds getCameraFeeds() {
+    System.out.println("Enter CameraFeeds.getCameraFeeds");
     if (cameraFeeds == null) {
       cameraFeeds = new CameraFeeds();
     }
+    System.out.println("Leaving CameraFeeds.getCameraFeeds");
     return cameraFeeds;
-
   }
 
   public void init() {
-    changeCam(climberCam);
+    System.out.println("Initializing...");
   }
 
   public void toggleCamera() {
@@ -58,7 +62,7 @@ public class CameraFeeds {
    * newId for camera
    */
   public void changeCam(VideoSource cam) {
-    server.removeCamera(curCam.getName());
-    server.addCamera(cam);
+    System.out.println("Changing cameras...");
+    server.getVideo(cam);
   }
 }

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 0732c962c599a235bf2502a97745a2ee36d25027..655b3427585bed2d4d8b09be073896388a956d8a 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -4,8 +4,6 @@ import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.subsystems.Intake;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 
-import edu.wpi.cscore.AxisCamera;
-import edu.wpi.first.wpilibj.CameraServer;
 import edu.wpi.first.wpilibj.IterativeRobot;
 import edu.wpi.first.wpilibj.command.Scheduler;
 
@@ -15,8 +13,8 @@ public class Robot extends IterativeRobot {
   private static OI oi;
   private static Intake intake;
   // private static UsbCamera usbCamera;
-  private static CameraServer cameraServer2;
-  private static AxisCamera axisCamera;
+  // private static CameraServer cameraServer2;
+  // private static AxisCamera axisCamera;
   private static CameraFeeds cameraFeeds;
 
   @Override
@@ -25,25 +23,9 @@ public class Robot extends IterativeRobot {
     oi = OI.getOI();
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
-    cameraServer2 = CameraServer.getInstance();
-    axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
-    // cameraFeeds = new CameraFeeds();
-    cameraFeeds = CameraFeeds.getCameraFeeds();
-
-    // usbCamera = CameraServer.getInstance().startAutomaticCapture();
-
-    // cameraServer2 = CameraServer;getInstance();
-    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
 
-    // cameraServer2 = CameraServer.getInstance();
-    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
-
-    // usbCamera = CameraServer.getInstance().startAutomaticCapture();
-    // CameraServer.getInstance().startAutomaticCapture();
-    // cameraServer2 = CameraServer.getInstance();
-    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+    cameraFeeds = CameraFeeds.getCameraFeeds();
 
-    // cameraFeeds = new CameraFeeds();
   }
 
   public static DriveTrain getDriveTrain() {