X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FCameraFeeds.java;h=d1b0ac0970a5820ac91476a5d3d34c01811186a1;hb=3788e02d7289dbc13d2478bd94050f1c639fae7a;hp=b5e6feb7e04c14a96d8753ce12508686111e7459;hpb=2ada01fd9e9fd8415907d3eea222d40f6f910cc8;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index b5e6feb..d1b0ac0 100755
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -1,80 +1,70 @@
 package org.usfirst.frc.team3501.robot;
 
-import com.ni.vision.NIVision;
-import com.ni.vision.NIVision.Image;
-
 import edu.wpi.cscore.AxisCamera;
 import edu.wpi.cscore.UsbCamera;
+import edu.wpi.cscore.VideoSource;
 import edu.wpi.first.wpilibj.CameraServer;
 
 public class CameraFeeds {
-  private final int intakeCam;
-  private final int climberCam;
-  private int curCam;
+  // private final int intakeCam;
+  // private final int climberCam;
+  private VideoSource curCam;
   private CameraServer server;
-  // private static UsbCamera intakeCam;
-  // private static AxisCamera climberCam;
+  private static UsbCamera intakeCam;
+  private static AxisCamera climberCam;
+  private static String usbCamName;
+  private static String axisCamName;
+  private static CameraFeeds cameraFeeds = null;
 
   @SuppressWarnings("deprecation")
-  public CameraFeeds() {
-    // Get camera ids by supplying camera name ex 'cam0', found on roborio web
-    // interface
-    intakeCam = NIVision.IMAQdxOpenCamera(Constants.CameraFeeds.camNameCenter,
-        NIVision.IMAQdxCameraControlMode.CameraControlModeController);
-    climberCam = NIVision.IMAQdxOpenCamera(Constants.CameraFeeds.camNameRight,
-        NIVision.IMAQdxCameraControlMode.CameraControlModeController);
-    curCam = intakeCam;
-    // Img that will contain camera img
-    frame = NIVision.imaqCreateImage(NIVision.ImageType.IMAGE_RGB, 0);
-    // Server that we'll give the img to
+  private CameraFeeds(/* Joystick Button */) {
+    System.out.println("Enter CameraFeeds constructor");
     server = CameraServer.getInstance();
-    server.setSize(Constants.CameraFeeds.imgQuality);
+    climberCam = server.addAxisCamera("ClimberCam", "10.35.1.11");
+    intakeCam = server.startAutomaticCapture();
+    usbCamName = intakeCam.getName();
+    axisCamName = climberCam.getName();
+    curCam = climberCam;
+    changeCam(curCam);
+    System.out.println("Leaving CameraFeeds constructor");
+  }
 
-    // server = CameraServer.getInstance();
-    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
-    // cameraFeeds = new CameraFeeds();
+  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(intakeCam);
+    System.out.println("Initializing...");
   }
 
-  public void run()
-  {
-    if(/*add test for toggle*/)
-      changeCam(intakeCam);
-
-    if(/*add test for toggle*/)
+  public void toggleCamera() {
+    System.out.println("enter toggleCamera");
+    if (curCam.equals(intakeCam)) {
       changeCam(climberCam);
-
-    updateCam();
-  }
-
-  /**
-   * Stop aka close camera stream
-   */
-  public void end() {
-    NIVision.IMAQdxStopAcquisition(curCam);
+      curCam = 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, curCam = " + curCam.getName());
+    }
   }
 
   /**
-   * Change the camera to get imgs from to a different one
    *
-   * @param newId
-   *          for camera
-   */
-  public void changeCam(int newId) {
-    NIVision.IMAQdxStopAcquisition(curCam);
-    NIVision.IMAQdxConfigureGrab(newId);
-    NIVision.IMAQdxStartAcquisition(newId);
-    curCam = newId;
-  }
-
-  /**
-   * Get the img from current camera and give it to the server
+   * Change the camera to get image from to a different one
+   *
+   * newId for camera
    */
-  public void updateCam() {
-    NIVision.IMAQdxGrab(curCam, frame, 1);
-    server.setSize(frame);
+  public void changeCam(VideoSource cam) {
+    System.out.println("Changing cameras...");
+    server.getVideo(cam);
   }
 }